More debian shenangigans.

Author: angerman

flake.nix

@@ -46,9 +46,10 @@
     #    nix eval --json .#lib-srcs
     #
     lib-srcs = {
-      secp256k1 = pkgs.secp256k1.src.rev;
-      sodium    = pkgs.libsodium-vrf.src.rev;
-      blst      = pkgs.libblst.src.rev;
+      secp256k1 = pkgs.secp256k1.version;
+      sodium-vrf= pkgs.libsodium-vrf.version;
+      sodium    = pkgs.libsodium.version;
+      blst      = pkgs.libblst.version;
     };
 
     dist = let
@@ -57,7 +58,7 @@
       mkDebianPkg = prefix: drv: let
         control = pkgs.writeText "control" ''
         Package: ${drv.pname}
-        Version: 0:${drv.version}
+        Version: 0:0+${drv.version}
         Architecture: amd64
         Maintainer: IOG <[email protected]>
         Description: ${drv.meta.description}

overlays/crypto/default.nix

@@ -1,4 +1,4 @@
-inputs: final: prev: {
+inputs: final: prev: rec {
   # We pin our own crypto libraries here, so that we have control over
   # the specific revisions we use (assuming a recent enough iohk-nix).
   #
@@ -9,6 +9,9 @@ inputs: final: prev: {
   libsodium-vrf = final.callPackage ./libsodium.nix { inherit inputs; };
   libblst = final.callPackage ./libblst.nix { inherit inputs; };
   libsecp256k1 = final.callPackage ./libsecp256k1.nix { inherit inputs; };
+
+  # override the nixpkgs ones which do not have the `lib` prefix.
+  secp256k1 = libsecp256k1;
 }
 # Make these libraries also available to haskell-nix's pkg-config
 # map when solving for dependencies with cabal.

overlays/crypto/libsecp256k1.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "secp256k1";
   version = inputs.secp256k1.shortRev;
 
-  src = inputs.shortRev;
+  src = inputs.secp256k1;
 
   nativeBuildInputs = [ autoreconfHook ];