Merge pull request #20 from mlabs-haskell/bladyjoker/migrate-haskellFlake

Migrates haskellFlake

Author: jaredponn

.gitignore

@@ -24,7 +24,6 @@ cabal.sandbox.config
 *.hp
 *.eventlog
 .stack-work/
-cabal.project.local
-cabal.project.local~
 .HTF/
 .ghc.environment.*
+.direnv/

flake-lang/build.nix

@@ -50,6 +50,22 @@
             '';
           };
 
+          haskellData = lib.mkOption {
+            type = lib.types.functionTo lib.types.attrs;
+            default = import ./haskell-data.nix pkgs;
+            readOnly = true;
+            description = lib.mdDoc ''Makes a derivation containing a Haskell Cabal package with data modules (using Cabal data stanzas)'';
+            example = lib.mdDoc ''
+              ```haskell
+                haskellData {
+                  srcs = [ ./. ];
+                  cabalDataPatterns = [ "**/*.json" ];
+                  cabalPackageName = "golden-json-data";
+                };
+              ```
+            '';
+          };
+
           haskellFlake = lib.mkOption {
             type = lib.types.functionTo lib.types.attrs;
             default = import ./flake-haskell.nix pkgsForHaskellNix;

flake-lang/haskell-data.nix

@@ -0,0 +1,39 @@
+# Makes a Cabal package with just a 'data' directory with proper 'data-files' stanza
+pkgs: { srcs, cabalDataPatterns, cabalPackageName, cabalPackageVersion ? "0.1.0.0" }:
+let
+  cabalTemplate = pkgs.writeTextFile {
+    name = "haskell-data.nix-cabal-template";
+    text = ''
+      cabal-version:      3.0
+      name:               ${cabalPackageName}
+      version:            ${cabalPackageVersion}
+      synopsis:           A Cabal project that contains data files
+      build-type:         Simple
+      data-files: ${builtins.concatStringsSep ", " (builtins.map (d: "data/${d}") cabalDataPatterns)}
+
+      library
+          default-language: Haskell2010
+          build-depends: base >=4.16
+          exposed-modules: Paths_${builtins.replaceStrings ["-"] ["_"] cabalPackageName}
+    '';
+  };
+in
+pkgs.stdenv.mkDerivation {
+  inherit srcs;
+  name = cabalPackageName;
+  buildInputs = [
+    pkgs.cabal-install
+  ];
+  sourceRoot = ".";
+  buildPhase = ''
+    mkdir data;
+    cp -r -t data ${builtins.concatStringsSep " " (builtins.map (src: "${src}/*") srcs)};
+    cat ${cabalTemplate} > ${cabalPackageName}.cabal;
+  '';
+
+  installPhase = ''
+    mkdir $out;
+    cp -r data $out/;
+    mv ${cabalPackageName}.cabal $out/;
+  '';
+}

flake-lang/haskell.nix/cabal.project.local

@@ -0,0 +1,41 @@
+repository cardano-haskell-packages
+  url: https://input-output-hk.github.io/cardano-haskell-packages
+  secure: True
+  root-keys:
+    3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
+    443abb7fb497a134c343faf52f0b659bd7999bc06b7f63fa76dc99d631f9bea1
+    a86a1f6ce86c449c46666bda44268677abf29b5b2d2eb5ec7af903ec2f117a82
+    bcec67e8e99cabfa7764d75ad9b158d72bfacf70ca1d0ec8bc6b4406d1bf8413
+    c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
+    d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
+
+allow-newer:
+  *:base,
+  *:flat,
+  *:foundation,
+  *:containers,
+  *:directory,
+  *:time,
+  *:bytestring,
+  *:aeson,
+  *:protolude,
+  *:template-haskell,
+  *:ghc-prim,
+  *:ghc,
+  *:cryptonite,
+  *:formatting,
+  monoidal-containers:aeson,
+  size-based:template-haskell,
+  snap-server:attoparsec,
+  *:hashable,
+  *:text
+
+constraints:
+  text >= 2
+  , aeson >= 2
+  , protolude >= 0.3.2
+  , nothunks >= 0.1.3
+  , plutus-core >= 1.7
+
+package nothunks
+  flags: +vector +bytestring +text

flake-lang/haskell.nix/extra-hackage.nix

@@ -122,7 +122,7 @@ let
   nlib = pkgs.lib;
 in
 {
-  _file = "lambda-buffers/extras/haskell.nix/extra-hackage.nix";
+  _file = "flake-lang.nix/flake-lang/haskell.nix/extra-hackage.nix";
   options = with lib.types; {
     extraHackage = lib.mkOption {
       type = listOf str; # FIXME: Allow passing in a tuple of the src and cabal file instead.

flake-lang/haskell.nix/plutus.nix

@@ -3,49 +3,6 @@ compiler-nix-name: cardano-haskell-packages:
 { lib, config, pkgs, ... }:
 let
   pkgs' = pkgs;
-  # https://github.com/input-output-hk/haskell.nix/issues/1177
-  nonReinstallablePkgs = [
-    "array"
-    "base"
-    "binary"
-    "bytestring"
-    "Cabal"
-    "containers"
-    "deepseq"
-    "directory"
-    "exceptions"
-    "filepath"
-    "ghc"
-    "ghc-bignum"
-    "ghc-boot"
-    "ghc-boot"
-    "ghc-boot-th"
-    "ghc-compact"
-    "ghc-heap"
-    # "ghci"
-    # "haskeline"
-    "ghcjs-prim"
-    "ghcjs-th"
-    "ghc-prim"
-    "ghc-prim"
-    "hpc"
-    "integer-gmp"
-    "integer-simple"
-    "mtl"
-    "parsec"
-    "pretty"
-    "process"
-    "rts"
-    "stm"
-    "template-haskell"
-    "terminfo"
-    "text"
-    "time"
-    "transformers"
-    "unix"
-    "Win32"
-    "xhtml"
-  ];
   brokenLibsModule =
     let
       responseFile = builtins.toFile "response-file" ''
@@ -66,66 +23,32 @@ let
       ];
     in
     {
-      _file = "lambda-buffers/extras/haskell.nix/plutus.nix:brokenLibsModule";
+      _file = "flake-lang.nix/flake-lang/haskell.nix/plutus.nix:brokenLibsModule";
       packages = builtins.listToAttrs (builtins.map
         (name: {
           inherit name;
-          value.components.library.setupHaddockFlags = [ "--haddock-options=@${responseFile}" ];
-          value.components.library.ghcOptions = [ "-XFlexibleContexts" "-Wwarn" "-fplugin-opt=PlutusTx.Plugin:defer-errors" ];
-          value.components.library.extraSrcFiles = [ responseFile ];
+          value.components.library = {
+            setupHaddockFlags = [ "--haddock-options=@${responseFile}" ];
+            ghcOptions = [ "-XFlexibleContexts" "-Wwarn" "-fplugin-opt=PlutusTx.Plugin:defer-errors" ];
+            extraSrcFiles = [ responseFile ];
+          };
         })
         l);
     };
   module = { pkgs, ... }: {
-    _file = "lambda-buffers/extras/haskell.nix/plutus.nix:module";
+    _file = "flake-lang.nix/flake-lang/haskell.nix/plutus.nix:module";
     # FIXME: contentAddressed = true;
-    inherit nonReinstallablePkgs; # Needed for a lot of different things
+    reinstallableLibGhc = false; # See https://github.com/input-output-hk/haskell.nix/issues/1939
     packages = {
-      cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf pkgs.secp256k1 ] ];
+      cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf pkgs.secp256k1 pkgs.libblst ] ];
       cardano-crypto-praos.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf ] ];
     };
   };
 in
 {
-  _file = "lambda-buffers/extras/haskell.nix/plutus.nix";
+  _file = "flake-lang.nix/flake-lang/haskell.nix/plutus.nix";
   config = {
-    cabalProjectLocal = ''
-      repository cardano-haskell-packages
-        url: https://input-output-hk.github.io/cardano-haskell-packages
-        secure: True
-        root-keys:
-        key-threshold: 0
-
-      allow-newer:
-        *:base,
-        *:containers,
-        *:directory,
-        *:time,
-        *:bytestring,
-        *:aeson,
-        *:protolude,
-        *:template-haskell,
-        *:ghc-prim,
-        *:ghc,
-        *:cryptonite,
-        *:formatting,
-        monoidal-containers:aeson,
-        size-based:template-haskell,
-        snap-server:attoparsec,
-      --  tasty-hedgehog:hedgehog,
-        *:hashable,
-        *:text
-
-      constraints:
-        text >= 2
-        , aeson >= 2
-        , dependent-sum >= 0.7
-        , protolude >= 0.3.2
-        , nothunks >= 0.1.3
-
-      package nothunks
-        flags: +vector +bytestring +text
-    '';
+    cabalProjectLocal = builtins.readFile ./cabal.project.local;
     inherit compiler-nix-name;
     modules = [ module brokenLibsModule ];
     inputMap."https://input-output-hk.github.io/cardano-haskell-packages" = "${cardano-haskell-packages}";