git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
thread hackage
3a6d9e7Moritz Angermann
compat/default.nix+2−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -1 +1,2 @@
1+hackage:
1−{ license-map = import ./cabal-licenses.nix; platform-map = import ./cabal-os-arch-comp.nix; host-map = import ./host-map.nix; driver = import ./driver.nix; }
2+{ license-map = import ./cabal-licenses.nix; platform-map = import ./cabal-os-arch-comp.nix; host-map = import ./host-map.nix; driver = import ./driver.nix hackage; }
compat/driver.nix+2−1
@@ -1,3 +1,4 @@
1+hackage:
1{ cabalexpr, pkgs, compiler ? "Ghc", version, os ? "Osx", arch ? "X86_64" }:
2{ cabalexpr, pkgs, compiler ? "Ghc", version, os ? "Osx", arch ? "X86_64" }:
2assert (builtins.elem compiler ["Ghc" "Ghcjs" "Nhc" "Yhc" "Hugs" "Hbc" "Helium" "Jhc" "Lhc" "Uhc" "Eta"]);
3assert (builtins.elem compiler ["Ghc" "Ghcjs" "Nhc" "Yhc" "Hugs" "Hbc" "Helium" "Jhc" "Lhc" "Uhc" "Eta"]);
3assert (builtins.elem os ["Linux" "Windows" "Osx" "FreeBSD" "OpenBSD" "NetBSD" "DragonFly" "Solaris" "AIX" "HPUX" "IRIX" "HaLVM" "Hurd" "IOS" "Android" "Ghcjs"]);
4assert (builtins.elem os ["Linux" "Windows" "Osx" "FreeBSD" "OpenBSD" "NetBSD" "DragonFly" "Solaris" "AIX" "HPUX" "IRIX" "HaLVM" "Hurd" "IOS" "Android" "Ghcjs"]);
@@ -50,7 +51,7 @@ let expr = expr0 flags;
50in mkDerivation ({
51in mkDerivation ({
51 inherit pname;
52 inherit pname;
52 version = pversion;
53 version = pversion;
53− sha256 = (import <hackage/all-cabal-hashes.nix>).${pname}.${pversion} or null;
54+ sha256 = hackage.hashes.${pname}.${pversion} or null;
54
55
55 isLibrary = builtins.hasAttr pname expr.components;
56 isLibrary = builtins.hasAttr pname expr.components;
56 isExecutable = builtins.hasAttr "exes" expr.components;
57 isExecutable = builtins.hasAttr "exes" expr.components;
default.nix+1−1
@@ -1 +1 @@
1−{ compat = import ./compat; }
1+hackage: { compat = import ./compat hackage; }