git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
minor fixes
commit6d673b0fd092f0898c4be408ad4a1aca5d395aeb authorMoritz Angermann <moritz.angermann@gmail.com> dateSat 21 Apr 2018, 17:59 (9 years ago) parent511db5f
4 files changed+31−12
compare with iko/ghcjs-patch-master
unifiedsplit
compat/cabal-licenses.nix+6 compat/cabal-os-arch-comp.nix+4−4 compat/driver.nix+16−3 compat/host-map.nix+5−5
compat/cabal-licenses.nix+6
@@ -2,4 +2,10 @@ stdenv: with stdenv.lib.licenses;
22{ BSD-3-Clause = bsd3;
33 BSD-2-Clause = bsd2;
44 MIT = mit;
5+ ISC = isc;
6+ "LGPL-3.0-only" = lgpl3;
7+ # Generic
8+ LicenseRef-LGPL = "LGPL";
9+ LicenseRef-PublicDomain = publicDomain;
10+ LicenseRef-OtherLicense = null;
511}
compat/cabal-os-arch-comp.nix+4−4
@@ -19,10 +19,10 @@
1919 # OSs
2020 isLinux = false;
2121 isWindows = false;
22− isOSX = false;
23− isFreeBSD = false;
24− isOpenBSD = false;
25− isNetBSD = false;
22+ isOsx = false;
23+ isFreebsd = false;
24+ isOpenbsd = false;
25+ isNetbsd = false;
2626 isDragonFly = false;
2727 isSolaris = false;
2828 isAIX = false;
compat/driver.nix+16−3
@@ -1,6 +1,6 @@
1−{ cabalexpr, pkgs, compiler ? "Ghc", os ? "OSX", arch ? "X86_64" }:
1+{ cabalexpr, pkgs, compiler ? "Ghc", version, os ? "Osx", arch ? "X86_64" }:
22assert (builtins.elem compiler ["Ghc" "Ghcjs" "Nhc" "Yhc" "Hugs" "Hbc" "Helium" "Jhc" "Lhc" "Uhc" "Eta"]);
3−assert (builtins.elem os ["Linux" "Windows" "OSX" "FreeBSD" "OpenBSD" "NetBSD" "DragonFly" "Solaris" "AIX" "HPUX" "IRIX" "HaLVM" "Hurd" "IOS" "Android" "Ghcjs"]);
3+assert (builtins.elem os ["Linux" "Windows" "Osx" "FreeBSD" "OpenBSD" "NetBSD" "DragonFly" "Solaris" "AIX" "HPUX" "IRIX" "HaLVM" "Hurd" "IOS" "Android" "Ghcjs"]);
44assert (builtins.elem arch ["I386" "X86_64" "PPC" "PPC64" "Sparc" "Arm" "Aarch64" "Mips" "SH" "IA64" "S390" "Alpha" "Hppa" "Rs6000" "M68k" "Vax" "JavaScript"]);
55
66with rec {
@@ -26,7 +26,16 @@ with rec {
2626 # pkgconfig name -> nix package
2727 pkgconfPkgs = { libpcre = pkgs.pcre; };
2828
29− compiler = cabal.compiler // { "is${compiler}" = true; };
29+ compiler = cabal.compiler // {
30+ "is${compiler}" = true;
31+ version = rec {
32+ eq = v: builtins.compareVersions version v == 0;
33+ lt = v: builtins.compareVersions version v == -1;
34+ gt = v: builtins.compareVersions version v == 1;
35+ le = v: eq v || lt v;
36+ ge = v: eq v || gt v;
37+ };
38+ };
3039 system = cabal.os // { "is${os}" = true; }
3140 // cabal.arch // { "is${arch}" = true; };
3241 }; in e;
@@ -50,10 +59,14 @@ in mkDerivation ({
5059} // pkgs.lib.optionalAttrs (builtins.hasAttr pname expr.components) {
5160 libraryHaskellDepends = expr.components.${pname}.depends;
5261 libraryPkgconfigDepends = expr.components.${pname}.pkgconfig or [];
62+ librarySystemDepends = expr.components.${pname}.libs or [];
63+ libraryToolDepends = expr.components.${pname}.build-tools or [];
5364} // pkgs.lib.optionalAttrs (builtins.hasAttr "exes" expr.components) {
5465 executableHaskellDepends = collectAttr "depends" expr.components.exes;
5566} // pkgs.lib.optionalAttrs (builtins.hasAttr "tests" expr.components) {
5667 testHaskellDepends = collectAttr "depends" expr.components.tests;
5768} // pkgs.lib.optionalAttrs (builtins.hasAttr "benchmarks" expr.components) {
5869 benchmarkHaskellDepends = collectAttr "depends" expr.components.benchmarks;
70+} // pkgs.lib.optionalAttrs (builtins.hasAttr "src" expr) {
71+ inherit (expr) src;
5972})
compat/host-map.nix+5−5
@@ -1,12 +1,12 @@
11stdenv: with stdenv.hostPlatform; {
22 os = if isLinux then "Linux" else
33 if isWindows then "Windows" else
4− if isMacOS then "OSX" else
5− if isFreeBSD then "FreeBSD" else
6− if isOpenBSD then "OpenBSD" else
7− if isNetBSD then "NetBSD" else
4+ if isMacOS then "Osx" else
5+ if isFreeBSD then "Freebsd" else
6+ if isOpenBSD then "Openbsd" else
7+ if isNetBSD then "Netbsd" else
88 if isHurd then "Hurd" else
9− if isiOS then "IOS" else
9+ if isiOS then "Ios" else
1010 if isAndroid then "Android" else
1111 throw "Unknown OS";
1212 arch = if isx86 && is32bit then "I386" else