diff options
| author | Peter Simons <simons@cryp.to> | 2012-02-21 10:58:15 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-02-21 10:58:15 +0000 |
| commit | 4e76d21c848d19eb3f7074e87689ed120bd5c9fb (patch) | |
| tree | 3975b4d47d3eb3eafd7e7e06af67ba8ed2093ba4 /pkgs/tools/networking/nbd | |
| parent | f8703e3b25bd6938a6b68e4bc662b5add10549a6 (diff) | |
| download | nixlib-4e76d21c848d19eb3f7074e87689ed120bd5c9fb.tar nixlib-4e76d21c848d19eb3f7074e87689ed120bd5c9fb.tar.gz nixlib-4e76d21c848d19eb3f7074e87689ed120bd5c9fb.tar.bz2 nixlib-4e76d21c848d19eb3f7074e87689ed120bd5c9fb.tar.lz nixlib-4e76d21c848d19eb3f7074e87689ed120bd5c9fb.tar.xz nixlib-4e76d21c848d19eb3f7074e87689ed120bd5c9fb.tar.zst nixlib-4e76d21c848d19eb3f7074e87689ed120bd5c9fb.zip | |
nbd: updated to version 3.0
svn path=/nixpkgs/trunk/; revision=32450
Diffstat (limited to 'pkgs/tools/networking/nbd')
| -rw-r--r-- | pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch | 25 | ||||
| -rw-r--r-- | pkgs/tools/networking/nbd/default.nix | 6 |
2 files changed, 2 insertions, 29 deletions
diff --git a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch b/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch deleted file mode 100644 index e4bb0db3abf8..000000000000 --- a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 42d3c4e7e95ea0e0dda9b502b2de2c4ed9ed9467 Mon Sep 17 00:00:00 2001 -From: "T.M. Abraham" <tabraham@novell.com> -Date: Fri, 6 Jan 2012 21:58:55 -0500 -Subject: [PATCH] properly check for HAVE_FALLOC_PH in both occurrences - ---- - nbd-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/nbd-server.c b/nbd-server.c -index 0ecf0e8..2cd066d 100644 ---- a/nbd-server.c -+++ b/nbd-server.c -@@ -1461,7 +1461,7 @@ int expflush(CLIENT *client) { - * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM) - */ - int exptrim(struct nbd_request* req, CLIENT* client) { --#ifdef HAVE_FALLOC_PH -+#if HAVE_FALLOC_PH - FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0); - FILE_INFO cur = prev; - int i = 1; --- -1.7.8 - diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index ea2fbe5bc574..cf3f41f7accb 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-2.9.25"; + name = "nbd-3.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4"; + sha256 = "f7210edfa858f5ae69bdbf76f5467ac9dcaa97074d945e55e2a683e7aa228b93"; }; - patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ]; - buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; |