public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into stdenv-updates

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2013-12-28 23:28:30 +01:00
parent cb639302df 9f735bdf57
commit e740b565cf
395 changed files with 5580 additions and 3281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/filesystems/archivemount/default.nix
View File

@@ -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 ];

10
pkgs/tools/filesystems/netatalk/default.nix
View File

@@ -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}"
];