summary refs log tree commit diff
path: root/pkgs/tools/networking/nbd/default.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-09-19 15:41:45 +0200
committerPeter Simons <simons@cryp.to>2016-09-19 15:45:12 +0200
commit545040811b1fd20354d8d8e88447774c3fa61237 (patch)
treec3b9931669fce559aed89c47b0481dfcc7eb5106 /pkgs/tools/networking/nbd/default.nix
parent5a6d6d445173dc9671be5d59207596e454d99ef6 (diff)
downloadnixpkgs-545040811b1fd20354d8d8e88447774c3fa61237.tar
nixpkgs-545040811b1fd20354d8d8e88447774c3fa61237.tar.gz
nixpkgs-545040811b1fd20354d8d8e88447774c3fa61237.tar.bz2
nixpkgs-545040811b1fd20354d8d8e88447774c3fa61237.tar.lz
nixpkgs-545040811b1fd20354d8d8e88447774c3fa61237.tar.xz
nixpkgs-545040811b1fd20354d8d8e88447774c3fa61237.tar.zst
nixpkgs-545040811b1fd20354d8d8e88447774c3fa61237.zip
nbd: update to version 3.14
Diffstat (limited to 'pkgs/tools/networking/nbd/default.nix')
-rw-r--r--pkgs/tools/networking/nbd/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index b8f88656671..4dea88190d4 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "nbd-3.12.1";
+  name = "nbd-3.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.xz";
-    sha256 = "1pkkid657zgjymwxv3fm32cxnq9llfz29rl15vp6mn42vnzbj1di";
+    sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad";
   };
 
+  patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ];
+
   buildInputs =
     [ pkgconfig glib ]
     ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
@@ -17,8 +19,7 @@ stdenv.mkDerivation rec {
     cp README.md "$out/share/doc/${name}/"
   '';
 
-  # The test suite doesn't succeed in chroot builds.
-  doCheck = false;
+  doCheck = true;
 
   # Glib calls `clock_gettime', which is in librt. Linking that library
   # here ensures that a proper rpath is added to the executable so that