public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-08-05 16:24:57 -07:00
parent e2c9270eb6 3944e4f980
commit 0ecc61b4d7
68 changed files with 1942 additions and 1078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ghc/7.10.2.nix
View File

@@ -16,12 +16,12 @@ let
in
stdenv.mkDerivation rec {
version = "7.10.1.20150630";
version = "7.10.2";
name = "ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/7.10.2-rc2/${name}-src.tar.xz";
sha256 = "1wxf7jkkgpvvrg3q311c4rca4vsxrqrmnrqg4j4klgj445yj82gb";
url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz";
sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
};
buildInputs = [ ghc perl ];

12
pkgs/development/compilers/ghcjs/default.nix
View File

@@ -41,22 +41,22 @@ let
version = "0.1.0";
ghcjsBoot = fetchgit {
url = git://github.com/ghcjs/ghcjs-boot.git;
rev = "d3581514d0a5073f8220a2f5baafe6866faa35a0"; # 7.10 branch
sha256 = "1p13ifidpi7y1mjq5qv9229isfnsiklizci7i55sf83mp6wqdyvr";
rev = "d435c60b62d24b7a4117493f7aaecbfa09968fe6"; # 7.10 branch
sha256 = "07vhmjz21ccnqccms003550xacmwb08pjdkhnjcwcbl2603v4na1";
fetchSubmodules = true;
};
shims = fetchgit {
url = git://github.com/ghcjs/shims.git;
rev = "9b196ff5ff13a24997011009b37c980c5534e24f"; # master branch
sha256 = "1zsfxka692fr3zb710il7g1sj64xwaxmasimciylb4wx84h7c30w";
rev = "0b670ca27fff3f0bad515c37e56ccb8b4d6758fb"; # master branch
sha256 = "19zq79f2y59lw7c8m100awh3rcra5yhbsvpb5xmp3mq6grac7h08";
};
in mkDerivation (rec {
pname = "ghcjs";
inherit version;
src = fetchgit {
url = git://github.com/ghcjs/ghcjs.git;
rev = "c1b6239b0289371dc6b8d17dfd845c14bd4dc490"; # master branch
sha256 = "0ncbk7m1l7cpdgmabm14d7f97fw3vy0hmpj4vs4kkwhhfjf6kp8s";
rev = "fb1faa9cb0a11a8b27b0033dfdb07aafb6add35e"; # master branch
sha256 = "1vqf19059j86h3rnbvzcp55bdqd5dkw3krb5vkw5mgsmva2g8sch";
};
isLibrary = true;
isExecutable = true;