diff options
| author | Peter Simons <simons@cryp.to> | 2013-10-26 18:28:05 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-10-26 18:28:05 +0200 |
| commit | 91f2c362dee33f74bd6941f3b480dde30833a375 (patch) | |
| tree | 49eaa78856da07d2aee812ac743c319126cf7b74 /pkgs/tools/filesystems | |
| parent | f7bec094e62a64580fdcd7a46283cea0c94c70a9 (diff) | |
| parent | e1c9c133b0fc244794194bbf5bcee32c6d777dee (diff) | |
| download | nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.gz nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.bz2 nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.lz nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.xz nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.tar.zst nixlib-91f2c362dee33f74bd6941f3b480dde30833a375.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index b855fce17d0f..83d9c25a3e62 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.7"; + name = "e2fsprogs-1.42.8"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0ibkkvp6kan0hn0d1anq4n2md70j5gcm7mwna515w82xwyr02rfw"; + sha256 = "b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97"; }; buildInputs = [ pkgconfig libuuid ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 7cae84a19c71..9d4168b2d7da 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.3.1"; - name="glusterfs-3.3.1"; - hash="06bmnyl3vh8s21kk98idm2fl7kq38na94k5l67l9l1grl3iyzahr"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.3/3.3.1/glusterfs-3.3.1.tar.gz"; - sha256="06bmnyl3vh8s21kk98idm2fl7kq38na94k5l67l9l1grl3iyzahr"; + version="3.4.1"; + name="${baseName}-${version}"; + hash="0fdp3bifd7n20xlmsmj374pbp11k7np71f7ibzycsvmqqviv9wdm"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.1/glusterfs-3.4.1.tar.gz"; + sha256="0fdp3bifd7n20xlmsmj374pbp11k7np71f7ibzycsvmqqviv9wdm"; }; buildInputs = [ fuse bison flex openssl python ncurses readline |