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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
This commit is contained in:
Tuomas Tynkkynen
2016-05-03 23:12:48 +03:00
parent 2362891dc8 e7d3166656
commit aadaa91379
506 changed files with 31436 additions and 5404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,12 +7,12 @@ let
in
stdenv.mkDerivation rec {
version = "8.0.0.20160411";
version = "8.0.0.20160421";
name = "ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/8.0.1-rc3/${name}-src.tar.xz";
sha256 = "0cgk0li3pwag65xcrjci8l840aphklymjfmsrq0qpdi8bpsmi97d";
url = "https://downloads.haskell.org/~ghc/8.0.1-rc4/${name}-src.tar.xz";
sha256 = "183p1ilk8rlndi1vmg2vmlx00s18q3j31kin85qpbvicsxb8j1j1";
};
patches = [