Skip to content

Commit b468920

Browse files
committed
cleanup
1 parent b15859a commit b468920

File tree

3 files changed

+2
-28
lines changed

3 files changed

+2
-28
lines changed

nix-tools/flake.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
nixpkgs.follows = "haskellNix/nixpkgs";
44

55
haskellNix.url = "github:input-output-hk/haskell.nix";
6-
7-
# iohkNix.url = "github:input-output-hk/iohk-nix";
86
};
97

108

nix-tools/static/outputs.nix

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,10 @@ let
1313
];
1414

1515

16-
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-
# });
16+
static-gmp-overlay = final: prev: {
2617
static-gmp = (final.gmp.override { withStatic = true; }).overrideDerivation (old: {
2718
configureFlags = old.configureFlags ++ [ "--enable-static" "--disable-shared" ];
2819
});
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; };
3520
};
3621

3722

@@ -44,13 +29,8 @@ let
4429
inherit (haskellNix) config;
4530

4631
overlays = with inputs; [
47-
# iohkNix.overlays.crypto
4832
haskellNix.overlay
49-
# iohkNix.overlays.haskell-nix-extra
50-
# iohkNix.overlays.haskell-nix-crypto
51-
# iohkNix.overlays.cardano-lib
52-
# iohkNix.overlays.utils
53-
static-libraries-overlay
33+
static-gmp-overlay
5434
(import ./packaging.nix)
5535
];
5636
};

nix-tools/static/project.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ 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"
7167
];
7268
};
7369

0 commit comments

Comments
 (0)