diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-16 21:13:24 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-16 21:13:24 +0100 |
| commit | 45e8de9a7d457e5202d17fcbf4a6c58afa3388e8 (patch) | |
| tree | 35ce6756899dca5d77087fa2f06c781f42a9a6a3 /pkgs/tools/filesystems | |
| parent | 2bc29e4e6d3713d106de670b55e8789267f7acc7 (diff) | |
| parent | 60103a4bd99cce63dab60be358e0ba90724b8b21 (diff) | |
| download | nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.gz nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.bz2 nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.lz nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.xz nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.zst nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.zip | |
Merge branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/tools/misc/less/default.nix
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/httpfs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/xfsprogs/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index bbb6d2efc7b2..6f68a798ede9 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -2,11 +2,11 @@ , docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }: stdenv.mkDerivation rec { - name = "httpfs2-0.1.4"; + name = "httpfs2-0.1.5"; src = fetchurl { url = "mirror://sourceforge/httpfs/httpfs2/${name}.tar.gz"; - sha256 = "0vlp6i119lz4ybnrd26hvvwms3h5d7x3jly5nzyyfcw24ngvpk7p"; + sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"; }; buildInputs = diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 229802d1d78f..400890e95f30 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libtool, gettext, libuuid }: stdenv.mkDerivation rec { - name = "xfsprogs-3.1.8"; + name = "xfsprogs-3.1.11"; src = fetchurl { urls = [ "ftp://oss.sgi.com/projects/xfs/cmd_tars/${name}.tar.gz" "ftp://oss.sgi.com/projects/xfs/previous/${name}.tar.gz" ]; - sha256 = "1aryr6w76hyc1dznfzk0sc5rlr914rr0zh15vyclj1s86wp9wh3l"; + sha256 = "1gnnyhy3khl08a24c5y0pyakz6nnwkiw1fc6rb0r1j5mfw0rix5d"; }; patchPhase = '' |