diff options
| -rw-r--r-- | pkgs/development/libraries/libcli/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/duff/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/mp3fs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/eid-mw/default.nix | 2 |
5 files changed, 26 insertions, 16 deletions
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index d85b0d0dff9..dd0de49a4bd 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: +let version = "1.9.7"; in stdenv.mkDerivation rec { - version = "1.9.7"; name = "libcli-${version}"; - src = fetchurl { - url = "https://github.com/dparrish/libcli/archive/v${version}.tar.gz"; - sha256 = "0v4867jbach5zd1nq0sspq5q95vvbpnljzm2yf64k8a4w2vadpbx"; + src = fetchFromGitHub { + sha256 = "08pmjhqkwldhmcwjhi2l27slf1fk6nxxfaihnk2637pqkycy8z0c"; + rev = "v${version}"; + repo = "libcli"; + owner = "dparrish"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index d7d9fc0c0a2..26e82886b6f 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, valgrind }: +{ stdenv, fetchFromGitHub, valgrind }: +let version = "128"; in stdenv.mkDerivation rec { - version = "128"; name = "lz4-${version}"; - src = fetchurl { - url = "https://github.com/Cyan4973/lz4/archive/r${version}.tar.gz"; - sha256 = "1lf7a0gqm2q7p1qs28lmajmls3pwfk2p0w3hljjlmshbkndaj26b"; + src = fetchFromGitHub { + sha256 = "00jrnic2jddj81av8jjipf4rdkx6x6cdf8zpsz3mp5kbmqzd0h9a"; + rev = "r${version}"; + repo = "lz4"; + owner = "Cyan4973"; }; # valgrind is required only by `make test` diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index d178be0f0fa..0f9bff82967 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, autoreconfHook, gettext }: +{ stdenv, fetchFromGitHub, autoreconfHook, gettext }: +let version = "0.5.2"; in stdenv.mkDerivation rec { name = "duff-${version}"; - version = "0.5.2"; - src = fetchurl { - url = "https://github.com/elmindreda/duff/archive/${version}.tar.gz"; - sha256 = "149dd80f9758085ed199c37aa32ad869409fa5e2c8da8a51294bd64ca886e058"; + src = fetchFromGitHub { + sha256 = "0yfm910wjj6z0f0cg68x59ykf4ql5m49apzy8sra00f8kv4lpn53"; + rev = version; + repo = "duff"; + owner = "elmindreda"; }; buildInputs = [ autoreconfHook gettext ]; @@ -25,6 +27,8 @@ stdenv.mkDerivation rec { -i configure.ac ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Quickly find duplicate files."; homepage = http://duff.dreda.org/; diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 5bcb738d709..253f335ae4a 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }: +let version = "0.91"; in stdenv.mkDerivation rec { - version = "0.91"; name = "mp3fs-${version}"; src = fetchurl { diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 88f6e359d2b..a8f6ae81e04 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook gtk2 pcsclite pkgconfig ]; + enableParallelBuilding = true; + doCheck = true; postInstall = '' |