File tree Expand file tree Collapse file tree 3 files changed +12
-5
lines changed Expand file tree Collapse file tree 3 files changed +12
-5
lines changed Original file line number Diff line number Diff line change 12
12
( import ./ghc-packages.nix )
13
13
( import ./windows.nix )
14
14
( import ./armv6l-linux.nix )
15
+ ( import ./musl.nix )
15
16
# Restore nixpkgs haskell and haskellPackages
16
17
( _ : super : { inherit ( super . haskell-nix-super ) haskell haskellPackages ; } )
17
18
]
Original file line number Diff line number Diff line change
1
+ self : super : super . lib . optionalAttrs super . stdenv . hostPlatform . isMusl {
2
+ # On nixpkgs 19.09 openssl is configured as `linux-generic64` instead
3
+ # of `linux-x86_64` and as a result the `asm` parts of of openssl
4
+ # are not built. Because the `no_asm` configure flag is also not passed
5
+ # the c versions of the functions are also not included.
6
+ openssl = super . openssl . overrideAttrs ( attrs :
7
+ super . lib . optionalAttrs super . stdenv . hostPlatform . isx86_64 {
8
+ configureScript = "./Configure linux-x86_64" ;
9
+ } ) ;
10
+ }
Original file line number Diff line number Diff line change @@ -75,11 +75,7 @@ in allJobs // {
75
75
++ collect isDerivation allJobs . R1903 . x86_64-pc-mingw32
76
76
++ collect isDerivation allJobs . R1909 . x86_64-w64-mingw32
77
77
++ collect isDerivation allJobs . R1903 . x86_64-unknown-linux-musl
78
- ++ collect isDerivation ( allJobs . R1909 . x86_64-unknown-linux-musl
79
- // {
80
- # Exclude failing test (openssl issue in nixpkgs R1909 with musl)
81
- tests = filterAttrs ( n : _ : n != "fully-static" ) allJobs . R1909 . x86_64-unknown-linux-musl . tests ;
82
- } ) ;
78
+ ++ collect isDerivation allJobs . R1909 . x86_64-unknown-linux-musl ;
83
79
} ;
84
80
}
85
81
You can’t perform that action at this time.
0 commit comments