Skip to content

Commit 475893d

Browse files
committed
Remove dependency on iohkNix
1 parent c12da5b commit 475893d

File tree

5 files changed

+29
-121
lines changed

5 files changed

+29
-121
lines changed

nix-tools/flake.lock

Lines changed: 0 additions & 89 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix-tools/flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
haskellNix.url = "github:input-output-hk/haskell.nix";
66

7-
iohkNix.url = "github:input-output-hk/iohk-nix";
7+
# iohkNix.url = "github:input-output-hk/iohk-nix";
88
};
99

1010

11-
outputs = inputs@{ self, nixpkgs, haskellNix, iohkNix, ... }:
11+
outputs = inputs@{ self, nixpkgs, haskellNix, ... }:
1212
let
1313
systems = [
1414
"x86_64-linux"

nix-tools/static/outputs.nix

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
inputs@{ nixpkgs, haskellNix, iohkNix, ... }:
1+
inputs@{ nixpkgs, haskellNix, ... }:
22

33
let
44

@@ -14,30 +14,27 @@ let
1414

1515

1616
static-libraries-overlay = final: prev: {
17-
static-libsodium-vrf = final.libsodium-vrf.overrideDerivation (old: {
18-
configureFlags = old.configureFlags ++ [ "--disable-shared" ];
19-
});
20-
static-secp256k1 = final.secp256k1.overrideDerivation (old: {
21-
configureFlags = old.configureFlags ++ [ "--enable-static" "--disable-shared" ];
22-
});
23-
dyn-static-secp256k1 = final.secp256k1.overrideDerivation (old: {
24-
configureFlags = old.configureFlags ++ [ "--enable-static" "--enable-shared" ];
25-
});
17+
# static-libsodium-vrf = final.libsodium-vrf.overrideDerivation (old: {
18+
# configureFlags = old.configureFlags ++ [ "--disable-shared" ];
19+
# });
20+
# static-secp256k1 = final.secp256k1.overrideDerivation (old: {
21+
# configureFlags = old.configureFlags ++ [ "--enable-static" "--disable-shared" ];
22+
# });
23+
# dyn-static-secp256k1 = final.secp256k1.overrideDerivation (old: {
24+
# configureFlags = old.configureFlags ++ [ "--enable-static" "--enable-shared" ];
25+
# });
2626
static-gmp = (final.gmp.override { withStatic = true; }).overrideDerivation (old: {
2727
configureFlags = old.configureFlags ++ [ "--enable-static" "--disable-shared" ];
2828
});
29-
static-libblst = (final.libblst.override { enableShared = false; }).overrideDerivation (old: {
30-
postFixup = "";
31-
});
32-
static-openssl = (final.openssl.override { static = true; });
33-
static-zlib = final.zlib.override { shared = false; };
34-
static-pcre = final.pcre.override { shared = false; };
29+
# static-libblst = (final.libblst.override { enableShared = false; }).overrideDerivation (old: {
30+
# postFixup = "";
31+
# });
32+
# static-openssl = (final.openssl.override { static = true; });
33+
# static-zlib = final.zlib.override { shared = false; };
34+
# static-pcre = final.pcre.override { shared = false; };
3535
};
3636

3737

38-
# This sets up the `pkgs`, by importing the nixpkgs flake and adding the
39-
# haskellNix overlay. We need the iohkNix overlays to get the necessary cryto
40-
# packages: secp256k1, blst, and libsodium.
4138
mkNixpkgsForSystem = system: import nixpkgs {
4239

4340
inherit system;
@@ -47,12 +44,12 @@ let
4744
inherit (haskellNix) config;
4845

4946
overlays = with inputs; [
50-
iohkNix.overlays.crypto
47+
# iohkNix.overlays.crypto
5148
haskellNix.overlay
52-
iohkNix.overlays.haskell-nix-extra
53-
iohkNix.overlays.haskell-nix-crypto
54-
iohkNix.overlays.cardano-lib
55-
iohkNix.overlays.utils
49+
# iohkNix.overlays.haskell-nix-extra
50+
# iohkNix.overlays.haskell-nix-crypto
51+
# iohkNix.overlays.cardano-lib
52+
# iohkNix.overlays.utils
5653
static-libraries-overlay
5754
(import ./packaging.nix)
5855
];

nix-tools/static/project.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ let
6464
];
6565
packages.nix-tools.ghcOptions = [
6666
"-L${pkgs.lib.getLib pkgs.static-gmp}/lib"
67-
"-L${pkgs.lib.getLib pkgs.static-libsodium-vrf}/lib"
68-
"-L${pkgs.lib.getLib pkgs.static-secp256k1}/lib"
69-
"-L${pkgs.lib.getLib pkgs.static-openssl}/lib"
70-
"-L${pkgs.lib.getLib pkgs.static-libblst}/lib"
67+
# "-L${pkgs.lib.getLib pkgs.static-libsodium-vrf}/lib"
68+
# "-L${pkgs.lib.getLib pkgs.static-secp256k1}/lib"
69+
# "-L${pkgs.lib.getLib pkgs.static-openssl}/lib"
70+
# "-L${pkgs.lib.getLib pkgs.static-libblst}/lib"
7171
];
7272
};
7373

nix-tools/static/zipped.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ let
4646
nativeBuildInputs =
4747
[ pkgs.nix pkgs.gitMinimal ]
4848
++ stringifyInputs inputs
49-
++ stringifyInputs inputs.haskellNix.inputs
50-
++ stringifyInputs inputs.iohkNix.inputs;
49+
++ stringifyInputs inputs.haskellNix.inputs;
50+
# ++ stringifyInputs inputs.iohkNix.inputs;
5151
} ''
5252
export HOME=$(mktemp -d)
5353
mkdir $out

0 commit comments

Comments
 (0)