dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Move definitions of 'uhc' and 'jhc' to 'haskell.compiler' attribute set.

Browse Source
This commit is contained in:
Peter Simons 2015-05-15 15:25:53 +02:00
parent 4b09501f23
commit 92312e17e8
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/all-packages.nix
View File

@ -3757,15 +3757,6 @@ let
}; };
}; };
jhc = callPackage ../development/compilers/jhc {
inherit (haskell.packages.ghc763) ghcWithPackages;
};
uhc = callPackage ../development/compilers/uhc/default.nix ({
stdenv = clangStdenv;
inherit (haskellPackages) ghcWithPackages;
});
gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
version = "4.7-2013q3-20130916"; version = "4.7-2013q3-20130916";
releaseType = "update"; releaseType = "update";
@ -14577,6 +14568,7 @@ let
rssglx = rss-glx; #added 2015-03-25 rssglx = rss-glx; #added 2015-03-25
haskell-ng = haskell; # 2015-04-19 haskell-ng = haskell; # 2015-04-19
haskellngPackages = haskellPackages; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19
inherit (haskell.compiler) jhc uhc; # 2015-05-15
opentsdb = callPackage ../tools/misc/opentsdb {}; opentsdb = callPackage ../tools/misc/opentsdb {};

10
pkgs/top-level/haskell-packages.nix
View File

@ -41,6 +41,16 @@ rec {
ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs { ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
ghc = compiler.ghc7101; ghc = compiler.ghc7101;
}; };
jhc = callPackage ../development/compilers/jhc {
inherit (packages.ghc763) ghcWithPackages;
};
uhc = callPackage ../development/compilers/uhc/default.nix ({
stdenv = pkgs.clangStdenv;
inherit (pkgs.haskellPackages) ghcWithPackages;
});
}; };
packages = { packages = {