diff --git a/flake.lock b/flake.lock index 775c0eb7..8b95bae4 100644 --- a/flake.lock +++ b/flake.lock @@ -172,11 +172,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1686011121, - "narHash": "sha256-X3Y62tv813/6JJ9VjT5y8s5+f2QBP6eTkY81/N9KxNg=", + "lastModified": 1686529586, + "narHash": "sha256-gq4MjkfEbm99QELt42aSLgLIEDK/DOkHDGV7MtcF62I=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "2d80060cbd948d851b473f4ff596d58419aebc4c", + "rev": "221dc7ae886b7b45aecb6febba0d78724e619d5c", "type": "github" }, "original": { @@ -216,15 +216,16 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1686041216, - "narHash": "sha256-RP0i9YtZbUkPtPVRz3GuBt9bwfoWCKcJ8888vocTiyg=", + "lastModified": 1686554362, + "narHash": "sha256-fVX3hLca2D4lHUnu25xjs4xVcRMZXDS1ttSebla8FGI=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "bc3f8b660a3b40f52139f59213652e083e6d2418", + "rev": "20957f9e9442f5e116517f22ebfce5a6ae4fd398", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "angerman-patch-3", "repo": "haskell.nix", "type": "github" } @@ -602,11 +603,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1685923834, - "narHash": "sha256-5oTnK+dXt1elpbLwVUYiyKroFcCMvRzEPz/PBKRtIIA=", + "lastModified": 1686528643, + "narHash": "sha256-O2AGyKLS0xlzcW74QpMQ3RfVXP0TRxwtWwou7TPOi4k=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "fe1d92917a72ec690dbe61a81318931052be6179", + "rev": "a14880d2b7e2feac132eb676ad114af8465686cc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c0d4b89c..a2ea9357 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Minimal devshell flake for haskell"; - inputs.haskellNix.url = "github:input-output-hk/haskell.nix"; + inputs.haskellNix.url = "github:input-output-hk/haskell.nix/angerman-patch-3"; inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable"; inputs.flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; inputs.iohk-nix.url = "github:input-output-hk/iohk-nix"; diff --git a/static.nix b/static.nix index 3588b542..04888a62 100644 --- a/static.nix +++ b/static.nix @@ -36,6 +36,7 @@ let tool-version-map = import ./tool-map.nix; "$@" \ $NIX_CABAL_FLAGS \ --disable-shared --enable-static \ + --ghc-option=-fPIC \ --ghc-option=-L${lib.getLib static-gmp}/lib \ --ghc-option=-L${lib.getLib static-libsodium-vrf}/lib \ --ghc-option=-L${lib.getLib static-secp256k1}/lib \ @@ -136,7 +137,7 @@ pkgs.mkShell (rec { fixup-nix-deps # We are happy to use a _shared_ compiler; we only want the build # products to be static. - (compiler.override { enableShared = true; }) + (compiler.override { enableShared = true; enableRelocatedStaticLibs = true; enableNUMA = false; }) ] ++ (with pkgs; [ pkgconfig stdenv.cc.cc.lib ]) ++ (with pkgs.buildPackages; [