ilyakooo0/haskell.nix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/haskell.nix.git synced 2024-09-11 06:55:40 +03:00
Code Issues Projects Releases Wiki Activity

Fix musl test configuring openssl as linux-x86_64 (#490)

Browse Source 
See: https://github.com/NixOS/nixpkgs/pull/82708
This commit is contained in:
Hamish Mackenzie 2020-03-17 17:28:09 +13:00 committed by GitHub
parent ef3ec408ae
commit 9fbf93e3c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
overlays/default.nix
View File

@ -12,6 +12,7 @@
(import ./ghc-packages.nix)
(import ./windows.nix)
(import ./armv6l-linux.nix)
(import ./musl.nix)
# Restore nixpkgs haskell and haskellPackages
(_: super: { inherit (super.haskell-nix-super) haskell haskellPackages; })
]

10
overlays/musl.nix Normal file
View File

@ -0,0 +1,10 @@
self: super: super.lib.optionalAttrs super.stdenv.hostPlatform.isMusl {
# On nixpkgs 19.09 openssl is configured as `linux-generic64` instead
# of `linux-x86_64` and as a result the `asm` parts of of openssl
# are not built. Because the `no_asm` configure flag is also not passed
# the c versions of the functions are also not included.
openssl = super.openssl.overrideAttrs (attrs:
super.lib.optionalAttrs super.stdenv.hostPlatform.isx86_64 {
configureScript = "./Configure linux-x86_64";
});
}

6
release.nix
View File

@ -75,11 +75,7 @@ in allJobs // {
++ collect isDerivation allJobs.R1903.x86_64-pc-mingw32
++ collect isDerivation allJobs.R1909.x86_64-w64-mingw32
++ collect isDerivation allJobs.R1903.x86_64-unknown-linux-musl
++ collect isDerivation (allJobs.R1909.x86_64-unknown-linux-musl
// {
# Exclude failing test (openssl issue in nixpkgs R1909 with musl)
tests = filterAttrs (n: _: n != "fully-static") allJobs.R1909.x86_64-unknown-linux-musl.tests;
});
++ collect isDerivation allJobs.R1909.x86_64-unknown-linux-musl;
};
}