Merge pull request #114 from mlabs-haskell/bladyjoker/plutustx-flakep…

…arts

Enable PlutusTx.Eq code generation plus massive Nix flake-partsify effort

README.md

@@ -49,7 +49,7 @@ Visit [LambdaBuffers Github Pages](https://mlabs-haskell.github.io/lambda-buffer
 
 ## Acknowledgements
 
-This project was graciously funded by the Cardano Treasury in [Catalyst Fund 9](https://cardano.ideascale.com/c/idea/421376).
+This project was graciously funded by the Cardano Treasury in [Catalyst Fund 9](https://cardano.ideascale.com/c/idea/421376) and [Catalyst Fund 10](https://cardano.ideascale.com/c/idea/105975).
 
 Authors:
 

api/.envrc

@@ -1 +1 @@
-use flake ..#dev-protos
+use flake ..#dev-api

api/build.nix

@@ -1,50 +1,57 @@
-{ pkgs, pbnix-lib, commonTools, shellHook }:
-rec {
- devShell = pkgs.mkShell {
- name = "protos-env";
- buildInputs = [
- pkgs.protobuf
- pkgs.haskellPackages.proto-lens-protoc
- pkgs.protoc-gen-doc
- ] ++ builtins.attrValues commonTools;
+{ inputs, ... }:
+{
+ perSystem = { pkgs, system, config, ... }:
+ let
+ pbnix-lib = inputs.protobufs-nix.lib.${system};
+ in
+ rec {
 
- inherit shellHook;
- };
+ devShells.dev-api = pkgs.mkShell {
+ name = "protos-env";
+ buildInputs = [
+ pkgs.protobuf
+ pkgs.haskellPackages.proto-lens-protoc
+ pkgs.protoc-gen-doc
+ ] ++ config.settings.shell.tools;
 
- packages = {
- lambda-buffers-lang-hs-pb = pbnix-lib.haskellProto {
- inherit pkgs;
- src = ./.;
- proto = "lang.proto";
- cabalPackageName = "lambda-buffers-lang-pb";
- };
+ shellHook = config.settings.shell.hook;
+ };
 
- lambda-buffers-compiler-hs-pb = pbnix-lib.haskellProto {
- inherit pkgs;
- src = ./.;
- proto = "compiler.proto";
- cabalBuildDepends = [ packages.lambda-buffers-lang-hs-pb ];
- cabalPackageName = "lambda-buffers-compiler-pb";
- };
+  packages = {
+  lambda-buffers-lang-hs-pb = pbnix-lib.haskellProto {
+  inherit pkgs;
+  src = ./.;
+  proto = "lang.proto";
+  cabalPackageName = "lambda-buffers-lang-pb";
+  };
 
- lambda-buffers-codegen-hs-pb = pbnix-lib.haskellProto {
- inherit pkgs;
- src = ./.;
- proto = "codegen.proto";
- cabalBuildDepends = [ packages.lambda-buffers-lang-hs-pb ];
- cabalPackageName = "lambda-buffers-codegen-pb";
- };
+ lambda-buffers-compiler-hs-pb = pbnix-lib.haskellProto {
+ inherit pkgs;
+ src = ./.;
+ proto = "compiler.proto";
+ cabalBuildDepends = [ packages.lambda-buffers-lang-hs-pb ];
+ cabalPackageName = "lambda-buffers-compiler-pb";
+ };
+
+ lambda-buffers-codegen-hs-pb = pbnix-lib.haskellProto {
+ inherit pkgs;
+ src = ./.;
+ proto = "codegen.proto";
+ cabalBuildDepends = [ packages.lambda-buffers-lang-hs-pb ];
+ cabalPackageName = "lambda-buffers-codegen-pb";
+ };
 
- lambda-buffers-api-docs = pkgs.stdenv.mkDerivation {
- src = ./.;
- name = "lambdabuffers-api-docs";
- buildInputs = [
- pkgs.protobuf
- ];
- buildPhase = ''
- mkdir $out;
- protoc --plugin=${pkgs.protoc-gen-doc}/bin/protoc-gen-doc lang.proto compiler.proto codegen.proto --doc_out=$out --doc_opt=markdown,api.md;
- '';
+ lambda-buffers-api-docs = pkgs.stdenv.mkDerivation {
+ src = ./.;
+ name = "lambdabuffers-api-docs";
+ buildInputs = [
+ pkgs.protobuf
+ ];
+ buildPhase = ''
+ mkdir $out;
+ protoc --plugin=${pkgs.protoc-gen-doc}/bin/protoc-gen-doc lang.proto compiler.proto codegen.proto --doc_out=$out --doc_opt=markdown,api.md;
+ '';
+ };
+ };
  };
- };
 }

docs/build.nix

@@ -1,5 +1,5 @@
-{ inputs, lib, ... }: {
- perSystem = { pkgs, system, inputs', config, ... }:
+_: {
+ perSystem = { pkgs, config, ... }:
  {
  devShells.dev-docs = pkgs.mkShell {
  name = "docs-env";

experimental/build.nix

@@ -1,22 +1,28 @@
-{ pkgs, commonTools, shellHook }:
-pkgs.mkShell {
- name = "experimental-env";
- buildInputs = [
- pkgs.dhall
- pkgs.dhall-lsp-server
- pkgs.dhall-json
+_: {
+ perSystem = { pkgs, config, ... }:
+ {
 
- (pkgs.haskellPackages.ghcWithPackages (pkgs: [
- pkgs.text
- pkgs.unification-fd
- pkgs.HUnit
- ]))
- pkgs.haskell-language-server
+  devShells.dev-experimental = pkgs.mkShell {
+  name = "experimental-env";
+  buildInputs = [
+  pkgs.dhall
+  pkgs.dhall-lsp-server
+  pkgs.dhall-json
 
- pkgs.protobuf
- pkgs.haskellPackages.proto-lens-protoc
- pkgs.swiPrologWithGui
- ] ++ builtins.attrValues commonTools;
+ (pkgs.haskellPackages.ghcWithPackages (pkgs: [
+ pkgs.text
+ pkgs.unification-fd
+ pkgs.HUnit
+ ]))
+ pkgs.haskell-language-server
 
- inherit shellHook;
+ pkgs.protobuf
+ pkgs.haskellPackages.proto-lens-protoc
+ pkgs.swiPrologWithGui
+ ] ++ config.settings.shell.tools;
+
+ shellHook = config.settings.shell.hook;
+ };
+
+ };
 }

extras/build.nix

@@ -0,0 +1,17 @@
+# TODO(bladyjoker): Using overlayAttrs here as a hack to share functions -.- Do this properly.
+{ inputs, ... }: {
+ imports = [
+ inputs.flake-parts.flakeModules.easyOverlay # Adds perSystem.overlayAttrs
+ ];
+ perSystem = { pkgs, ... }:
+ {
+
+ overlayAttrs = {
+ extras = {
+ purescriptFlake = import ./flake-purescript.nix pkgs;
+ haskellData = import ./haskell-data.nix pkgs;
+ };
+ };
+
+ };
+}

extras/flake-purescript.nix

@@ -1,7 +1,13 @@
-pursProjOpts:
+pkgs: pursProjOpts:
 let
  mkFlake = projectName: purs: {
  packages = {
+ "purescript:${projectName}:src" = pkgs.stdenv.mkDerivation {
+ name = projectName;
+ inherit (pursProjOpts) src;
+ phases = "installPhase";
+ installPhase = "ln -s $src $out";
+ };
  "purescript:${projectName}:lib" = purs.compiled;
  "purescript:${projectName}:node-modules" = purs.nodeModules;
  "purescript:${projectName}:bundle" = purs.bundlePursProject { main = "Test.Main"; entrypoint = "app/index.js"; bundledModuleName = "dist/output.js"; };
@@ -16,4 +22,4 @@ let
  devShell = purs.devShell;
  };
 in
-mkFlake pursProjOpts.projectName (pursProjOpts.pkgs.purescriptProject pursProjOpts)
+mkFlake pursProjOpts.projectName (pkgs.purescriptProject pursProjOpts)

extras/haskell-data.nix

@@ -1,4 +1,5 @@
-{ pkgs, srcs, cabalDataPatterns, cabalPackageName, cabalPackageVersion ? "0.1.0.0" }:
+# Makes a Cabal package with just a 'data' directory with proper 'data-filers' stanza
+pkgs: { srcs, cabalDataPatterns, cabalPackageName, cabalPackageVersion ? "0.1.0.0" }:
 let
  cabalTemplate = pkgs.writeTextFile {
  name = "haskell-data.nix-cabal-template";

extras/lbf-nix/build.nix

@@ -0,0 +1,22 @@
+# TODO(bladyjoker): Using overlayAttrs here as a hack to share functions -.- Do this properly.
+{ inputs, ... }: {
+ imports = [
+ inputs.flake-parts.flakeModules.easyOverlay # Adds perSystem.overlayAttrs
+ ];
+ perSystem = { pkgs, config, ... }:
+ {
+
+ overlayAttrs = {
+ lbf-nix = {
+ lbfBuild = import ./lbf-build.nix pkgs config.packages.lbf;
+ lbfHaskell = import ./lbf-haskell.nix pkgs config.packages.lbf config.packages.lbg-haskell;
+ lbfPreludeHaskell = import ./lbf-prelude-hs.nix pkgs config.packages.lbf config.packages.lbg-haskell;
+ lbfPlutusHaskell = import ./lbf-plutus-hs-plutustx.nix pkgs config.packages.lbf config.packages.lbg-haskell;
+ lbfPurescript = import ./lbf-purescript.nix pkgs config.packages.lbf config.packages.lbg-purescript;
+ lbfPreludePurescript = import ./lbf-prelude-purescript.nix pkgs config.packages.lbf config.packages.lbg-purescript;
+ lbfPlutusPurescript = import ./lbf-plutus-purescript.nix pkgs config.packages.lbf config.packages.lbg-purescript;
+ };
+ };
+
+ };
+}