diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-12-18 15:42:54 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-12-18 15:42:54 +0100 |
commit | 134ba27ea2437b5e783025bab307bde43cea1f7b (patch) | |
tree | 2fb99e3a9088a6e281fdb690b4ecfb572119495b /pkgs/tools/filesystems | |
parent | 04c364d181cad9e0bd196885ee3e0f3bb139168d (diff) | |
parent | 580c339699b6e17cb98aec28158fadd31d062297 (diff) |
Merge remote-tracking branch 'origin/master' into glibc-2.18
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/dosfstools/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/filesystems/httpfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/xfsprogs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/yandex-disk/default.nix | 11 |
4 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index a98def3283529..b9f1010591861 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dosfstools-3.0.21"; + name = "dosfstools-3.0.24"; src = fetchurl { url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz"; - sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960"; + sha256 = "1hblhb98wm9gm60y32psdqm5jprs4a6dqzrapzgb6bw7r3kvf88y"; }; makeFlags = "PREFIX=$(out)"; meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; + repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; homepage = http://www.daniel-baumann.ch/software/dosfstools/; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index bbb6d2efc7b24..6f68a798ede96 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 229802d1d78f0..400890e95f300 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 = '' diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 31b1471fb7fc7..24dbae08fab32 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cp -r -t $out/share usr/share/* cp -r -t $out/etc etc/* - sed -i 's@have@${which}/bin/which >/dev/null 2>&1@' \ + sed -i 's@have@${which}/bin/which >/dev/null 2>\&1@' \ $out/etc/bash_completion.d/yandex-disk-completion.bash ${patchelf}/bin/patchelf \ @@ -49,6 +49,15 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [smironov]; platforms = ["i686-linux" "x86_64-linux"]; license = stdenv.lib.licenses.unfree; + longDescription = '' + Yandex.Disk console client for Linux lets you manage files on Disk without + using a window interface or programs that support WebDAV. The advantages + of the console client compared to a WebDAV connection: + * low system resource requirements; + * faster file reading and writing speeds; + * faster syncing with Disk's server; + * no need to be constantly connected to work with files. + ''; }; } |