File tree Expand file tree Collapse file tree 4 files changed +14
-9
lines changed Expand file tree Collapse file tree 4 files changed +14
-9
lines changed Original file line number Diff line number Diff line change 1
1
{ nixpkgs ? import <nixpkgs> { config . allowBroken = true ; }
2
- , compiler ? "ghc864 "
2
+ , compiler ? "ghc883 "
3
3
} :
4
4
with nixpkgs ;
5
5
let
Original file line number Diff line number Diff line change 1
1
{ nixpkgs ? import <nixpkgs> { config . allowBroken = true ; }
2
- , compiler ? "ghc864 "
2
+ , compiler ? "ghc883 "
3
3
, haskellPackages ? nixpkgs . haskell . packages . ${ compiler }
4
4
} :
5
5
with nixpkgs ;
Original file line number Diff line number Diff line change 17
17
tasty-quickcheck = ease hspkgs . tasty-quickcheck ;
18
18
scientific = ease hspkgs . scientific ;
19
19
temporary = ease hspkgs . temporary ;
20
+ time-compat = ease hspkgs . time-compat ;
20
21
} ) ;
21
22
} ) ;
22
23
Original file line number Diff line number Diff line change 51
51
buildStatic = drv : with pkgs . haskell . lib ;
52
52
( disableSharedExecutables
53
53
( 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
+ } )
60
64
( drv
61
- ) ) ) ) ;
65
+ ) ) ) ) ) ;
62
66
63
67
haskellEnv = haskellPackages . ghcWithPackages ( ps : with ps ; [
64
68
( buildStatic language-powerquery-ast )
You can’t perform that action at this time.
0 commit comments