diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-07 00:09:37 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-07 00:09:37 +0200 |
| commit | a85dcf4a00c1ac354eda3b84209b8fa6b2133259 (patch) | |
| tree | 16bbf46e3cd5d7ea259783ee8b1ea8d5c7048e0d /pkgs/shells/bash | |
| parent | 4b2ce84872a0903b9800d3ed23915f48ecedc565 (diff) | |
| parent | 46a9e805efeee40d360605fa5987866ca45fed23 (diff) | |
| download | nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.gz nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.bz2 nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.lz nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.xz nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.zst nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/shells/bash')
| -rw-r--r-- | pkgs/shells/bash/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 6a6b8563a555..ca12c26f256c 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -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 + |