From 1785ac4a13ae699be8b8b8905416e3d8a6a40517 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Thu, 31 Aug 2017 20:27:00 +0200 Subject: [PATCH 1/2] netmask: init at 2.4.3 --- pkgs/tools/networking/netmask/default.nix | 29 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/networking/netmask/default.nix diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix new file mode 100644 index 00000000000..ae2e9cc79f6 --- /dev/null +++ b/pkgs/tools/networking/netmask/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchFromGitHub, automake, autoconf, texinfo}: + +stdenv.mkDerivation rec +{ + name = "netmask-${version}"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "tlby"; + repo = "netmask"; + rev = "v${version}"; + sha256 = "1n6b9f60j7hfdbpbppgkhz3lr7pg963bxnfrq95i1d49xmx41f87"; + }; + + buildInputs = [ automake autoconf texinfo ]; + + preConfigure = '' + ./autogen + ''; + + meta = + { + homepage = https://github.com/tlby/netmask; + description = "An IP address formatting tool "; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.jensbin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18c59c6264d..ddbca2e0ebe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2658,6 +2658,8 @@ with pkgs; ipcalc = callPackage ../tools/networking/ipcalc {}; + netmask = callPackage ../tools/networking/netmask {}; + ipv6calc = callPackage ../tools/networking/ipv6calc {}; ipxe = callPackage ../tools/misc/ipxe { }; From 79527c2196873c87056d470a0a6b7f83aba2cee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 31 Aug 2017 20:14:35 +0100 Subject: [PATCH 2/2] netmask: use autoreconfHook --- pkgs/tools/networking/netmask/default.nix | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index ae2e9cc79f6..52727163704 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -1,7 +1,6 @@ -{stdenv, fetchFromGitHub, automake, autoconf, texinfo}: +{ stdenv, fetchFromGitHub, autoreconfHook, texinfo }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { name = "netmask-${version}"; version = "2.4.3"; @@ -12,18 +11,14 @@ stdenv.mkDerivation rec sha256 = "1n6b9f60j7hfdbpbppgkhz3lr7pg963bxnfrq95i1d49xmx41f87"; }; - buildInputs = [ automake autoconf texinfo ]; + buildInputs = [ texinfo ]; + nativeBuildInputs = [ autoreconfHook ]; - preConfigure = '' - ./autogen - ''; - - meta = - { + meta = with stdenv.lib; { homepage = https://github.com/tlby/netmask; description = "An IP address formatting tool "; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jensbin ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.jensbin ]; }; }