diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 23:28:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-29 10:01:22 +0100 |
| commit | e740b565cf01082be314dff8833c4a65a834bcff (patch) | |
| tree | 59e8ce4fd4ecf004581e1f1eed533970fd6eba69 /pkgs/tools/filesystems | |
| parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
| parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) | |
| download | nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.gz nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.bz2 nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.lz nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.xz nixlib-e740b565cf01082be314dff8833c4a65a834bcff.tar.zst nixlib-e740b565cf01082be314dff8833c4a65a834bcff.zip | |
Merge master into stdenv-updates
Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/archivemount/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/netatalk/default.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 8c7593121bbe..4c00252fc2a1 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.6.1"; + name = "archivemount-0.8.3"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "9235d6377a70a7c25aa288dab6b0e8ef906d1d219d43e5b8fcdb8cf3ace98e01"; + sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277"; }; buildInputs = [ pkgconfig fuse libarchive ]; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 21a93774758f..26ffc9d50c25 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,17 +1,17 @@ -{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }: +{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }: stdenv.mkDerivation rec { - name = "netatalk-3.0.5"; + name = "netatalk-3.1.0"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; - sha256 = "1adlcj509czxsx60r1s96qlznspp5nz7dxc5fws11danidr4fhl8"; + sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq"; }; - buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ]; + buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ]; configureFlags = [ - "--with-bdb=${db48}" + "--with-bdb=${db4}" "--with-openssl=${openssl}" ]; |