Skip to content

Commit a521f90

Browse files
luispedroluispedro
committed
BLD Update haskell.nix to fix static building
1 parent 9570b0f commit a521f90

File tree

9 files changed

+75
-75
lines changed

9 files changed

+75
-75
lines changed

‎build-scripts/ngless-static-embed-dependencies.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ let
33
sources = {
44
haskellNix = builtins.fetchTarball {
55
name = "haskell-nix-snap";
6-
url = "https://github.com/input-output-hk/haskell.nix/archive/c689f01730e5b6c6c16d3947a15689569844c38c.tar.gz";
7-
sha256 = "09lw2419a5dd9g0ja31hjfqf6d4bzcgr5mrqx0vrvlksmp7a1kzk";
6+
url = "https://github.com/input-output-hk/haskell.nix/archive/a7f031ac146666657824f3c4603bf87d3507c1a6.tar.gz";
7+
sha256 = "1p4rrq2apw2lnswj6km7ni9zc6gvr1ly03pkparyjslmcf5d57n4";
88
};
99
};
1010

@@ -24,7 +24,7 @@ let
2424
in pkgs.haskell-nix.stackProject {
2525
name = "NGLess";
2626
src = (import ./sources-with-static-dependencies.nix) ;
27-
stack-sha256 = "1lcj0vvrsyfq2fj014hf6q8qlg0rxvc387wkpb4kgclkhkwx7jg3";
27+
stack-sha256 = "0i2r2kiacb3n0m6yjfzil5rh6dhdq9jjvy7a2czidr4dnnp0swxn";
2828
materialized = ./sources-with-static-dependencies.materialized;
2929
inherit checkMaterialization;
3030
}

‎build-scripts/release.materialized/.stack-to-nix.cache.0

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
synopsis = "Interval map";
2222
description = "";
2323
buildType = "Simple";
24-
};
24+
};
2525
components = {
2626
"library" = {
2727
depends = [
@@ -32,9 +32,9 @@
3232
(hsPkgs."primitive" or (errorHandler.buildDepError "primitive"))
3333
(hsPkgs."vector" or (errorHandler.buildDepError "vector"))
3434
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
35-
];
35+
];
3636
buildable = true;
37-
};
37+
};
3838
tests = {
3939
"interval-int-map-test" = {
4040
depends = [
@@ -51,11 +51,11 @@
5151
(hsPkgs."tasty-th" or (errorHandler.buildDepError "tasty-th"))
5252
(hsPkgs."vector" or (errorHandler.buildDepError "vector"))
5353
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
54-
];
54+
];
5555
buildable = true;
56-
};
5756
};
5857
};
59-
} // rec {
60-
src = (pkgs.lib).mkDefault /nix/store/ga5a6bgyvkh1mhkwx8n518hx07js4rg7-interval-to-int-78289f6;
61-
}
58+
};
59+
} // rec {
60+
src = pkgs.lib.mkDefault /nix/store/ga5a6bgyvkh1mhkwx8n518hx07js4rg7-interval-to-int-78289f6;
61+
}

‎build-scripts/release.materialized/NGLess.nix

+21-21
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
"test_samples/data_set_repeated.fq"
3535
"test_samples/very_short.gtf"
3636
"Makefile"
37-
];
37+
];
3838
extraTmpFiles = [];
3939
extraDocFiles = [];
40-
};
40+
};
4141
components = {
4242
"library" = {
4343
depends = [
@@ -101,21 +101,21 @@
101101
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
102102
(hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
103103
(hsPkgs."zlib" or (errorHandler.buildDepError "zlib"))
104-
] ++ (if system.isWindows
104+
] ++ (if system.isWindows
105105
then [
106106
(hsPkgs."atomic-write" or (errorHandler.buildDepError "atomic-write"))
107-
]
107+
]
108108
else [
109109
(hsPkgs."bzlib-conduit" or (errorHandler.buildDepError "bzlib-conduit"))
110110
(hsPkgs."double-conversion" or (errorHandler.buildDepError "double-conversion"))
111111
(hsPkgs."safeio" or (errorHandler.buildDepError "safeio"))
112112
(hsPkgs."unix" or (errorHandler.buildDepError "unix"))
113-
]);
113+
]);
114114
buildable = true;
115115
modules = [ "Paths_NGLess" ];
116116
cSources = [ "NGLess/Data/FastQ.c" "NGLess/Dependencies/embedded.c" ];
117117
hsSourceDirs = [ "NGLess/" ];
118-
};
118+
};
119119
exes = {
120120
"ngless" = {
121121
depends = [
@@ -180,23 +180,23 @@
180180
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
181181
(hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
182182
(hsPkgs."zlib" or (errorHandler.buildDepError "zlib"))
183-
] ++ (if system.isWindows
183+
] ++ (if system.isWindows
184184
then [
185185
(hsPkgs."atomic-write" or (errorHandler.buildDepError "atomic-write"))
186-
]
186+
]
187187
else [
188188
(hsPkgs."bzlib-conduit" or (errorHandler.buildDepError "bzlib-conduit"))
189189
(hsPkgs."double-conversion" or (errorHandler.buildDepError "double-conversion"))
190190
(hsPkgs."safeio" or (errorHandler.buildDepError "safeio"))
191191
(hsPkgs."unix" or (errorHandler.buildDepError "unix"))
192-
]);
192+
]);
193193
buildable = true;
194194
hsSourceDirs = [ "Execs" ];
195195
mainPath = (([ "Main.hs" ] ++ [
196196
""
197-
]) ++ (pkgs.lib).optional (flags.static) "") ++ (pkgs.lib).optional (flags.embed) "";
198-
};
197+
]) ++ pkgs.lib.optional (flags.static) "") ++ pkgs.lib.optional (flags.embed) "";
199198
};
199+
};
200200
tests = {
201201
"nglesstest" = {
202202
depends = [
@@ -266,23 +266,23 @@
266266
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
267267
(hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
268268
(hsPkgs."zlib" or (errorHandler.buildDepError "zlib"))
269-
] ++ (if system.isWindows
269+
] ++ (if system.isWindows
270270
then [
271271
(hsPkgs."atomic-write" or (errorHandler.buildDepError "atomic-write"))
272-
]
272+
]
273273
else [
274274
(hsPkgs."bzlib-conduit" or (errorHandler.buildDepError "bzlib-conduit"))
275275
(hsPkgs."double-conversion" or (errorHandler.buildDepError "double-conversion"))
276276
(hsPkgs."safeio" or (errorHandler.buildDepError "safeio"))
277277
(hsPkgs."unix" or (errorHandler.buildDepError "unix"))
278-
]);
278+
]);
279279
buildable = true;
280280
modules = [ "Paths_NGLess" ];
281281
cSources = [ "NGLess/Data/FastQ.c" "NGLess/Dependencies/embedded.c" ];
282282
hsSourceDirs = [ "NGLess" "Tests-Src/" ];
283283
mainPath = [ "Tests.hs" ];
284-
};
285284
};
285+
};
286286
benchmarks = {
287287
"nglessbench" = {
288288
depends = [
@@ -349,21 +349,21 @@
349349
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
350350
(hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
351351
(hsPkgs."zlib" or (errorHandler.buildDepError "zlib"))
352-
] ++ (if system.isWindows
352+
] ++ (if system.isWindows
353353
then [
354354
(hsPkgs."atomic-write" or (errorHandler.buildDepError "atomic-write"))
355-
]
355+
]
356356
else [
357357
(hsPkgs."bzlib-conduit" or (errorHandler.buildDepError "bzlib-conduit"))
358358
(hsPkgs."double-conversion" or (errorHandler.buildDepError "double-conversion"))
359359
(hsPkgs."safeio" or (errorHandler.buildDepError "safeio"))
360360
(hsPkgs."unix" or (errorHandler.buildDepError "unix"))
361-
]);
361+
]);
362362
buildable = true;
363363
hsSourceDirs = [ "Execs/" ];
364-
};
365364
};
366365
};
367-
} // rec { src = (pkgs.lib).mkDefault ./.; }) // {
366+
};
367+
} // rec { src = pkgs.lib.mkDefault ./.; }) // {
368368
cabal-generator = "hpack";
369-
}
369+
}

‎build-scripts/release.materialized/default.nix

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
extras = hackage:
33
{
44
packages = {
5-
"conduit-algorithms" = (((hackage.conduit-algorithms)."0.0.14.0").revisions).default;
5+
"conduit-algorithms" = hackage.conduit-algorithms."0.0.14.0".revisions.default;
66
NGLess = ./NGLess.nix;
77
int-interval-map = ./.stack-to-nix.cache.0;
8-
};
98
};
10-
resolver = "lts-22.6";
9+
};
10+
resolver = "lts-22.30";
1111
modules = [
1212
({ lib, ... }:
1313
{ packages = {}; })
1414
{ packages = {}; }
1515
({ lib, ... }:
1616
{ planned = lib.mkOverride 900 true; })
17-
];
18-
}
17+
];
18+
}

‎build-scripts/sources-with-static-dependencies.materialized/.stack-to-nix.cache.0

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
synopsis = "Interval map";
2222
description = "";
2323
buildType = "Simple";
24-
};
24+
};
2525
components = {
2626
"library" = {
2727
depends = [
@@ -32,9 +32,9 @@
3232
(hsPkgs."primitive" or (errorHandler.buildDepError "primitive"))
3333
(hsPkgs."vector" or (errorHandler.buildDepError "vector"))
3434
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
35-
];
35+
];
3636
buildable = true;
37-
};
37+
};
3838
tests = {
3939
"interval-int-map-test" = {
4040
depends = [
@@ -51,11 +51,11 @@
5151
(hsPkgs."tasty-th" or (errorHandler.buildDepError "tasty-th"))
5252
(hsPkgs."vector" or (errorHandler.buildDepError "vector"))
5353
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
54-
];
54+
];
5555
buildable = true;
56-
};
5756
};
5857
};
59-
} // rec {
60-
src = (pkgs.lib).mkDefault /nix/store/ga5a6bgyvkh1mhkwx8n518hx07js4rg7-interval-to-int-78289f6;
61-
}
58+
};
59+
} // rec {
60+
src = pkgs.lib.mkDefault /nix/store/ga5a6bgyvkh1mhkwx8n518hx07js4rg7-interval-to-int-78289f6;
61+
}

‎build-scripts/sources-with-static-dependencies.materialized/NGLess.nix

+21-21
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
"test_samples/data_set_repeated.fq"
3535
"test_samples/very_short.gtf"
3636
"Makefile"
37-
];
37+
];
3838
extraTmpFiles = [];
3939
extraDocFiles = [];
40-
};
40+
};
4141
components = {
4242
"library" = {
4343
depends = [
@@ -101,21 +101,21 @@
101101
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
102102
(hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
103103
(hsPkgs."zlib" or (errorHandler.buildDepError "zlib"))
104-
] ++ (if system.isWindows
104+
] ++ (if system.isWindows
105105
then [
106106
(hsPkgs."atomic-write" or (errorHandler.buildDepError "atomic-write"))
107-
]
107+
]
108108
else [
109109
(hsPkgs."bzlib-conduit" or (errorHandler.buildDepError "bzlib-conduit"))
110110
(hsPkgs."double-conversion" or (errorHandler.buildDepError "double-conversion"))
111111
(hsPkgs."safeio" or (errorHandler.buildDepError "safeio"))
112112
(hsPkgs."unix" or (errorHandler.buildDepError "unix"))
113-
]);
113+
]);
114114
buildable = true;
115115
modules = [ "Paths_NGLess" ];
116116
cSources = [ "NGLess/Data/FastQ.c" "NGLess/Dependencies/embedded.c" ];
117117
hsSourceDirs = [ "NGLess/" ];
118-
};
118+
};
119119
exes = {
120120
"ngless" = {
121121
depends = [
@@ -180,23 +180,23 @@
180180
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
181181
(hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
182182
(hsPkgs."zlib" or (errorHandler.buildDepError "zlib"))
183-
] ++ (if system.isWindows
183+
] ++ (if system.isWindows
184184
then [
185185
(hsPkgs."atomic-write" or (errorHandler.buildDepError "atomic-write"))
186-
]
186+
]
187187
else [
188188
(hsPkgs."bzlib-conduit" or (errorHandler.buildDepError "bzlib-conduit"))
189189
(hsPkgs."double-conversion" or (errorHandler.buildDepError "double-conversion"))
190190
(hsPkgs."safeio" or (errorHandler.buildDepError "safeio"))
191191
(hsPkgs."unix" or (errorHandler.buildDepError "unix"))
192-
]);
192+
]);
193193
buildable = true;
194194
hsSourceDirs = [ "Execs" ];
195195
mainPath = (([ "Main.hs" ] ++ [
196196
""
197-
]) ++ (pkgs.lib).optional (flags.static) "") ++ (pkgs.lib).optional (flags.embed) "";
198-
};
197+
]) ++ pkgs.lib.optional (flags.static) "") ++ pkgs.lib.optional (flags.embed) "";
199198
};
199+
};
200200
tests = {
201201
"nglesstest" = {
202202
depends = [
@@ -266,23 +266,23 @@
266266
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
267267
(hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
268268
(hsPkgs."zlib" or (errorHandler.buildDepError "zlib"))
269-
] ++ (if system.isWindows
269+
] ++ (if system.isWindows
270270
then [
271271
(hsPkgs."atomic-write" or (errorHandler.buildDepError "atomic-write"))
272-
]
272+
]
273273
else [
274274
(hsPkgs."bzlib-conduit" or (errorHandler.buildDepError "bzlib-conduit"))
275275
(hsPkgs."double-conversion" or (errorHandler.buildDepError "double-conversion"))
276276
(hsPkgs."safeio" or (errorHandler.buildDepError "safeio"))
277277
(hsPkgs."unix" or (errorHandler.buildDepError "unix"))
278-
]);
278+
]);
279279
buildable = true;
280280
modules = [ "Paths_NGLess" ];
281281
cSources = [ "NGLess/Data/FastQ.c" "NGLess/Dependencies/embedded.c" ];
282282
hsSourceDirs = [ "NGLess" "Tests-Src/" ];
283283
mainPath = [ "Tests.hs" ];
284-
};
285284
};
285+
};
286286
benchmarks = {
287287
"nglessbench" = {
288288
depends = [
@@ -349,21 +349,21 @@
349349
(hsPkgs."vector-algorithms" or (errorHandler.buildDepError "vector-algorithms"))
350350
(hsPkgs."yaml" or (errorHandler.buildDepError "yaml"))
351351
(hsPkgs."zlib" or (errorHandler.buildDepError "zlib"))
352-
] ++ (if system.isWindows
352+
] ++ (if system.isWindows
353353
then [
354354
(hsPkgs."atomic-write" or (errorHandler.buildDepError "atomic-write"))
355-
]
355+
]
356356
else [
357357
(hsPkgs."bzlib-conduit" or (errorHandler.buildDepError "bzlib-conduit"))
358358
(hsPkgs."double-conversion" or (errorHandler.buildDepError "double-conversion"))
359359
(hsPkgs."safeio" or (errorHandler.buildDepError "safeio"))
360360
(hsPkgs."unix" or (errorHandler.buildDepError "unix"))
361-
]);
361+
]);
362362
buildable = true;
363363
hsSourceDirs = [ "Execs/" ];
364-
};
365364
};
366365
};
367-
} // rec { src = (pkgs.lib).mkDefault ./.; }) // {
366+
};
367+
} // rec { src = pkgs.lib.mkDefault ./.; }) // {
368368
cabal-generator = "hpack";
369-
}
369+
}

‎build-scripts/sources-with-static-dependencies.materialized/default.nix

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
extras = hackage:
33
{
44
packages = {
5-
"conduit-algorithms" = (((hackage.conduit-algorithms)."0.0.14.0").revisions).default;
5+
"conduit-algorithms" = hackage.conduit-algorithms."0.0.14.0".revisions.default;
66
NGLess = ./NGLess.nix;
77
int-interval-map = ./.stack-to-nix.cache.0;
8-
};
98
};
10-
resolver = "lts-22.6";
9+
};
10+
resolver = "lts-22.30";
1111
modules = [
1212
({ lib, ... }:
1313
{ packages = {}; })
1414
{ packages = {}; }
1515
({ lib, ... }:
1616
{ planned = lib.mkOverride 900 true; })
17-
];
18-
}
17+
];
18+
}

0 commit comments

Comments
 (0)