done

Author: zeme-wana

nix-tools/flake.lock

@@ -1,8 +1,19 @@
 {
-  inputs.nixpkgs.follows = "haskellNix/nixpkgs";
-  inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
+  inputs = {
+    nixpkgs.follows = "haskellNix/nixpkgs";
 
-  outputs = { self, nixpkgs, haskellNix, ... }:
+    haskellNix.url = "github:input-output-hk/haskell.nix";
+  
+    iohkNix.url = "github:input-output-hk/iohk-nix";
+
+    CHaP = {
+      url = "github:input-output-hk/cardano-haskell-packages?ref=repo";
+      flake = false;
+    };
+  };
+
+  
+  outputs = inputs@{ self, nixpkgs, haskellNix, iohkNix, ... }:
     let
       systems = [
         "x86_64-linux"
@@ -40,8 +51,12 @@
             mkdir -p $out/nix-support
             echo "file binary-dist $out/${tarball-filename}" >> $out/nix-support/hydra-build-products
           '';
+    
     in
     {
+
+      static-nix-tools-outputs = import ./static/outputs.nix inputs;
+
       # this is not per-system!
       overlays.default = import ./overlay.nix;
 
@@ -51,6 +66,7 @@
         nix-tools = system: (haskellNix.legacyPackages.${system}.extend self.overlays.default).nix-tools;
         haskell-nix = system: (haskellNix.legacyPackages.${system}.extend self.overlays.default).haskell-nix;
       };
+
       project = forAllSystems (pkgs: pkgs.nix-tools.project);
 
       packages = forAllSystems (pkgs:

nix-tools/flake.nix

@@ -110,7 +110,7 @@
         hashable.revision = import ./cabal-files/hashable.nix;
         hashable.flags.random-initial-seed = false;
         hashable.flags.integer-gmp = true;
-        };
+      };
       compiler = {
         version = "9.4.5";
         nix-name = "ghc945";
@@ -133,14 +133,14 @@
           "deepseq" = "1.4.8.0";
           "binary" = "0.8.9.1";
           "containers" = "0.6.7";
-          };
         };
       };
+    };
   extras = _hackage:
-    { packages = {}; };
+    { packages = { }; };
   modules = [
     ({ lib, ... }:
-      { packages = {}; })
+      { packages = { }; })
     ({ lib, ... }:
       {
         packages = {
@@ -196,7 +196,7 @@
           "hashable".components.library.planned = lib.mkOverride 900 true;
           "semigroups".components.library.planned = lib.mkOverride 900 true;
           "void".components.library.planned = lib.mkOverride 900 true;
-          };
-        })
-    ];
-  }
+        };
+      })
+  ];
+}

nix-tools/nix-tools/tests/golden/test1.pkgs.nix

@@ -0,0 +1,74 @@
+inputs@{ nixpkgs, haskellNix, iohkNix, ... }:
+
+let
+
+  inherit (nixpkgs) lib;
+
+
+  supported-systems = [
+    "x86_64-linux"
+    "x86_64-darwin"
+    "aarch64-linux"
+    "aarch64-darwin"
+  ];
+
+
+  static-libraries-overlay = final: prev: {
+    static-libsodium-vrf = final.libsodium-vrf.overrideDerivation (old: {
+      configureFlags = old.configureFlags ++ [ "--disable-shared" ];
+    });
+    static-secp256k1 = final.secp256k1.overrideDerivation (old: {
+      configureFlags = old.configureFlags ++ [ "--enable-static" "--disable-shared" ];
+    });
+    dyn-static-secp256k1 = final.secp256k1.overrideDerivation (old: {
+      configureFlags = old.configureFlags ++ [ "--enable-static" "--enable-shared" ];
+    });
+    static-gmp = (final.gmp.override { withStatic = true; }).overrideDerivation (old: {
+      configureFlags = old.configureFlags ++ [ "--enable-static" "--disable-shared" ];
+    });
+    static-libblst = (final.libblst.override { enableShared = false; }).overrideDerivation (old: {
+      postFixup = "";
+    });
+    static-openssl = (final.openssl.override { static = true; });
+    static-zlib = final.zlib.override { shared = false; };
+    static-pcre = final.pcre.override { shared = false; };
+  };
+
+
+  # This sets up the `pkgs`, by importing the nixpkgs flake and adding the 
+  # haskellNix overlay. We need the iohkNix overlays to get the necessary cryto 
+  # packages: secp256k1, blst, and libsodium.
+  mkNixpkgsForSystem = system: import nixpkgs {
+
+    inherit system;
+
+    # Also ensure we are using haskellNix config. Otherwise we won't be
+    # selecting the correct wine version for cross compilation.
+    inherit (haskellNix) config;
+
+    overlays = with inputs; [
+      iohkNix.overlays.crypto
+      haskellNix.overlay
+      iohkNix.overlays.haskell-nix-extra
+      iohkNix.overlays.haskell-nix-crypto
+      iohkNix.overlays.cardano-lib
+      iohkNix.overlays.utils
+      static-libraries-overlay
+      (import ./packaging.nix)
+    ];
+  };
+
+
+  # Keep it simple (from https://ayats.org/blog/no-flake-utils/)
+  forAllSystems = f:
+    nixpkgs.lib.genAttrs supported-systems 
+      (system: f (mkNixpkgsForSystem system));
+
+
+  outputs = {
+    zipped = forAllSystems (import ./zipped.nix inputs);
+  };
+
+in
+
+  outputs