Skip to content

Commit e396e2c

Browse files
committed
build: updates
1 parent 14acd32 commit e396e2c

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

build/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ nixpkgs ? import <nixpkgs> { config.allowBroken = true; }
2-
, compiler ? "ghc864"
2+
, compiler ? "ghc883"
33
}:
44
with nixpkgs;
55
let

build/haskell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ nixpkgs ? import <nixpkgs> { config.allowBroken = true; }
2-
, compiler ? "ghc864"
2+
, compiler ? "ghc883"
33
, haskellPackages ? nixpkgs.haskell.packages.${compiler}
44
}:
55
with nixpkgs;

build/nodejs.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ let
1717
tasty-quickcheck = ease hspkgs.tasty-quickcheck;
1818
scientific = ease hspkgs.scientific;
1919
temporary = ease hspkgs.temporary;
20+
time-compat = ease hspkgs.time-compat;
2021
});
2122
});
2223

build/static.nix

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,18 @@ let
5151
buildStatic = drv: with pkgs.haskell.lib;
5252
( disableSharedExecutables
5353
( disableSharedLibraries
54-
( nixpkgs.lib.flip appendConfigureFlags
55-
[ "--ghc-option=-optl=-static"
56-
"--extra-lib-dirs=${pkgs.gmp6.override { withStatic = true; }}/lib"
57-
"--extra-lib-dirs=${pkgs.zlib.static}/lib"
58-
"--extra-lib-dirs=${pkgs.libffi.overrideAttrs (old: { dontDisableStatic = true; })}/lib"
59-
]
54+
( justStaticExecutables
55+
( nixpkgs.lib.flip overrideCabal (old: {
56+
configureFlags =
57+
[ "--ghc-option=-optl=-static"
58+
"--extra-lib-dirs=${pkgs.gmp6.override { withStatic = true; }}/lib"
59+
"--extra-lib-dirs=${pkgs.zlib.static}/lib"
60+
"--extra-lib-dirs=${pkgs.libffi.overrideAttrs (old: { dontDisableStatic = true; })}/lib"
61+
"--disable-executable-stripping"
62+
];
63+
})
6064
( drv
61-
))));
65+
)))));
6266

6367
haskellEnv = haskellPackages.ghcWithPackages (ps: with ps; [
6468
(buildStatic language-powerquery-ast)

0 commit comments

Comments
 (0)