Skip to content

Commit 9fbf93e

Browse files
authored
Fix musl test configuring openssl as linux-x86_64 (#490)
See: NixOS/nixpkgs#82708
1 parent ef3ec40 commit 9fbf93e

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

overlays/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
(import ./ghc-packages.nix)
1313
(import ./windows.nix)
1414
(import ./armv6l-linux.nix)
15+
(import ./musl.nix)
1516
# Restore nixpkgs haskell and haskellPackages
1617
(_: super: { inherit (super.haskell-nix-super) haskell haskellPackages; })
1718
]

overlays/musl.nix

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
}

release.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ in allJobs // {
7575
++ collect isDerivation allJobs.R1903.x86_64-pc-mingw32
7676
++ collect isDerivation allJobs.R1909.x86_64-w64-mingw32
7777
++ 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;
8379
};
8480
}
8581

0 commit comments

Comments
 (0)