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

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

Browse Source 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
This commit is contained in:
Eelco Dolstra
2014-10-07 00:09:37 +02:00
parent 4b2ce84872 46a9e805ef
commit a85dcf4a00
1001 changed files with 20043 additions and 5648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/shells/bash/default.nix
View File

@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
patchFlags = "-p0";
patches =
let
(let
patch = nr: sha256:
fetchurl {
url = "mirror://gnu/bash/bash-4.2-patches/bash42-${nr}";
inherit sha256;
};
in
import ./bash-4.2-patches.nix patch;
import ./bash-4.2-patches.nix patch);
crossAttrs = {
configureFlags = baseConfigureFlags +