rebase and pin nixpkgs to 22.05

fission-codes · Aug 30, 2022 · 4eff64e · 4eff64e
1 parent 640e7f9
commit 4eff64e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     haskellNix.url = "github:input-output-hk/haskell.nix";
-    nixpkgs.follows = "haskellNix/nixpkgs-unstable";
+    nixpkgs.follows = "haskellNix/nixpkgs-2205";
     flake-utils.url = "github:numtide/flake-utils";
 
     flake-compat = {
@@ -23,7 +23,7 @@
               final.haskell-nix.project' {
                 src = pkgs.haskell-nix.haskellLib.cleanSourceWith { name = "fission"; src = ./.; };
                 compiler-nix-name = "ghc8107";
-                stack-sha256 = "029kzhvljx3x13ngmb1mvf4ljf75l3ngnj95n3gxmbj7a211xs3c";
+                stack-sha256 = "0y24hd42sn2qzdcfvy892rkv1as36divjskzz2h3cx5v9mgl1i1p";
                 materialized = ./nix/materialized;
 
                 # NOTE: Currently handling devShells separately from haskell.nix

diff --git a/nix/materialized/default.nix b/nix/materialized/default.nix
@@ -8,6 +8,7 @@
         "dimensions" = (((hackage.dimensions)."2.1.1.0").revisions).default;
         "hfsevents" = (((hackage.hfsevents)."0.1.6").revisions).default;
         "lzma-clib" = (((hackage.lzma-clib)."5.2.2").revisions).default;
+        "libsecp256k1" = (((hackage.libsecp256k1)."0.1.0").revisions).default;
         "raven-haskell" = (((hackage.raven-haskell)."0.1.4.0").revisions).default;
         "rescue" = (((hackage.rescue)."0.4.2.1").revisions).default;
         "servant-ekg" = (((hackage.servant-ekg)."0.3.1").revisions).default;

diff --git a/nix/materialized/hs-ucan.nix b/nix/materialized/hs-ucan.nix
@@ -59,6 +59,7 @@
           (hsPkgs."hashable" or (errorHandler.buildDepError "hashable"))
           (hsPkgs."ipfs" or (errorHandler.buildDepError "ipfs"))
           (hsPkgs."lens" or (errorHandler.buildDepError "lens"))
+          (hsPkgs."libsecp256k1" or (errorHandler.buildDepError "libsecp256k1"))
           (hsPkgs."memory" or (errorHandler.buildDepError "memory"))
           (hsPkgs."mime-types" or (errorHandler.buildDepError "mime-types"))
           (hsPkgs."monad-control" or (errorHandler.buildDepError "monad-control"))
@@ -85,6 +86,7 @@
           (hsPkgs."x509" or (errorHandler.buildDepError "x509"))
           (hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
           ];
+        libs = [ (pkgs."secp256k1" or (errorHandler.sysDepError "secp256k1")) ];
         buildable = true;
         modules = [ "Paths_hs_ucan" ];
         hsSourceDirs = [ "library" ];
@@ -122,6 +124,7 @@
             (hsPkgs."hspec-expectations" or (errorHandler.buildDepError "hspec-expectations"))
             (hsPkgs."ipfs" or (errorHandler.buildDepError "ipfs"))
             (hsPkgs."lens" or (errorHandler.buildDepError "lens"))
+            (hsPkgs."libsecp256k1" or (errorHandler.buildDepError "libsecp256k1"))
             (hsPkgs."memory" or (errorHandler.buildDepError "memory"))
             (hsPkgs."mime-types" or (errorHandler.buildDepError "mime-types"))
             (hsPkgs."monad-control" or (errorHandler.buildDepError "monad-control"))
@@ -153,6 +156,9 @@
             (hsPkgs."x509" or (errorHandler.buildDepError "x509"))
             (hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
             ];
+          libs = [
+            (pkgs."secp256k1" or (errorHandler.sysDepError "secp256k1"))
+            ];
           buildable = true;
           modules = [ "Paths_hs_ucan" ];
           hsSourceDirs = [ "library" "test" ];