From c14fbcc4fcfbebc624a914ffbf57e5f4527a416c Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 28 Jan 2018 13:57:48 +0000 Subject: [PATCH 1/3] xnbd: init at 0.3.0 --- pkgs/tools/networking/xnbd/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/networking/xnbd/default.nix diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix new file mode 100644 index 00000000000..f70a5dc905c --- /dev/null +++ b/pkgs/tools/networking/xnbd/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "xnbd-0.3.0"; + + src = fetchurl { + url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tar.bz2"; + sha256 = "0jlv6cx85sjn8vjhgzmcs5mz2b6xf18mp0h61v1gl7xkbalw1flb"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ glib ]; + + meta = { + homepage = https://bitbucket.org/hirofuchi/xnbd; + description = "Yet another NBD (Network Block Device) server program"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.volth ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89ea6807abd..dbe7c8a0706 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3614,6 +3614,7 @@ with pkgs; nawk = callPackage ../tools/text/nawk { }; nbd = callPackage ../tools/networking/nbd { }; + xnbd = callPackage ../tools/networking/xnbd { }; nccl = callPackage ../development/libraries/science/math/nccl { cudatoolkit = cudatoolkit8; From 174fe14be2325725e1a76fce1ce83c813dff0d65 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 28 Jan 2018 13:58:22 +0000 Subject: [PATCH 2/3] xnbd: 0.3.0 -> 0.4.0 --- pkgs/tools/networking/xnbd/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index f70a5dc905c..40351fbd130 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson, asciidoc, libxml2, libxslt, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "xnbd-0.3.0"; + name = "xnbd-0.4.0"; src = fetchurl { - url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tar.bz2"; - sha256 = "0jlv6cx85sjn8vjhgzmcs5mz2b6xf18mp0h61v1gl7xkbalw1flb"; + url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tgz"; + sha256 = "00wkvsa0yaq4mabczcbfpj6rjvp02yahw8vdrq8hgb3wpm80x913"; }; - nativeBuildInputs = [ pkgconfig ]; + sourceRoot = "${name}/trunk"; - buildInputs = [ glib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib jansson asciidoc libxml2 libxslt docbook_xml_dtd_45 ]; meta = { homepage = https://bitbucket.org/hirofuchi/xnbd; From 10be0615c838ac4dc452b14eddde1435be9010a2 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 18 Mar 2018 10:30:13 +0000 Subject: [PATCH 3/3] xnbd: do not build html docs --- pkgs/tools/networking/xnbd/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index 40351fbd130..e898904c6d4 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson, asciidoc, libxml2, libxslt, docbook_xml_dtd_45 }: +{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }: stdenv.mkDerivation rec { name = "xnbd-0.4.0"; @@ -12,7 +12,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ glib jansson asciidoc libxml2 libxslt docbook_xml_dtd_45 ]; + buildInputs = [ glib jansson ]; + + # do not build docs, it is slow and it fails on Hydra + prePatch = '' + rm -rf doc + substituteInPlace configure.ac --replace "doc/Makefile" "" + substituteInPlace Makefile.am --replace "lib doc ." "lib ." + ''; meta = { homepage = https://bitbucket.org/hirofuchi/xnbd;