about summary refs log tree commit diff
path: root/pkgs/shells/bash
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2006-10-24 23:05:12 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2006-10-24 23:05:12 +0000
commit4d3059721df7164445e384c5644f32623df0d664 (patch)
tree95c37e97221fb777d8abbde8b849550c7385d89e /pkgs/shells/bash
parentf86c11815f1377fdda2c1ee71d65d1e89d2adffe (diff)
downloadnixlib-4d3059721df7164445e384c5644f32623df0d664.tar
nixlib-4d3059721df7164445e384c5644f32623df0d664.tar.gz
nixlib-4d3059721df7164445e384c5644f32623df0d664.tar.bz2
nixlib-4d3059721df7164445e384c5644f32623df0d664.tar.lz
nixlib-4d3059721df7164445e384c5644f32623df0d664.tar.xz
nixlib-4d3059721df7164445e384c5644f32623df0d664.tar.zst
nixlib-4d3059721df7164445e384c5644f32623df0d664.zip
* bash 2.0, findutils 4.2.28.
* Some Nix expression simplifications.  Sense and simplicity!

svn path=/nixpkgs/trunk/; revision=6836
Diffstat (limited to 'pkgs/shells/bash')
-rw-r--r--pkgs/shells/bash/default.nix16
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 77fc114878a5..64f996cc0e5a 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -1,20 +1,16 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation ({
-  name = "bash-3.1";
+stdenv.mkDerivation {
+  name = "bash-3.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bash-3.1.tar.gz;
-    md5 = "ef5304c4b22aaa5088972c792ed45d72";
+    url = http://ftp.gnu.org/pub/gnu/bash/bash-3.2.tar.gz;
+    md5 = "00bfa16d58e034e3c2aa27f390390d30";
   };
 
+  patches = [./winsize.patch];
+
   meta = {
     description = "GNU Bourne-Again Shell, the de facto standard shell on Linux";
   };
 }
-
-// (if stdenv ? isDietLibC then {
-  patches = [./winsize.patch];
-} else {})
-
-)