From 732b9d9943bf304682ac564618146284e68846db Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 22 Jun 2018 18:34:07 +0200 Subject: [PATCH] nbd: 3.14 -> 3.17 remove deprecated patch --- pkgs/tools/networking/nbd/default.nix | 6 ++---- .../nbd/dont-run-make-in-broken-systemd-subdir.patch | 12 ------------ 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index bbd003a6256..6b6d99e745e 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.14"; + name = "nbd-3.17"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad"; + sha256 = "12fil2hb3gkxslr3nl9kak93n4iyhfs3zdwrmx9vjcxblfqnnp6r"; }; - patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ]; - buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; diff --git a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch deleted file mode 100644 index ad0a7a6f66d..00000000000 --- a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ubr nbd-3.14-orig/Makefile.in nbd-3.14-new/Makefile.in ---- nbd-3.14-orig/Makefile.in 2016-09-19 15:37:30.904176475 +0200 -+++ nbd-3.14-new/Makefile.in 2016-09-19 15:39:43.813543062 +0200 -@@ -403,7 +403,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = . man doc tests systemd gznbd -+SUBDIRS = . man doc tests gznbd - sbin_PROGRAMS = @NBD_CLIENT_NAME@ - noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la - libcliserv_la_SOURCES = cliserv.h cliserv.c