From 06716f310ab8e037ffbccc3c3a993c8cdfbab18a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:55:25 -0500 Subject: zstmdt: fix macOS build --- pkgs/tools/compression/zstdmt/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix index 14dd4f21b2d..5cf88e68c64 100644 --- a/pkgs/tools/compression/zstdmt/default.nix +++ b/pkgs/tools/compression/zstdmt/default.nix @@ -17,9 +17,7 @@ stdenv.mkDerivation rec { zstd lz4 ]; - buildPhase = '' - make zstdmt lz4mt - ''; + makeFlags = [ "CC=cc" "zstdmt" "lz4mt" ]; installPhase = '' mkdir -p $out/bin/ -- cgit 1.4.1 From 65d9a8e4fb6fc889b52e94cdbface3a21f051e8a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:55:49 -0500 Subject: rrdtool: fix macOS build --- pkgs/tools/misc/rrdtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index de4c97731ef..3d2666add42 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff -, tcl-8_5 }: +, tcl-8_5, darwin }: stdenv.mkDerivation rec { name = "rrdtool-1.6.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] - ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5; + ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' # for munin and rrdtool support -- cgit 1.4.1 From d98323515562d564f53dedc12d35707b0be3f43b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:56:09 -0500 Subject: nuttcp: fix macOS build --- pkgs/tools/networking/nuttcp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 70f3d7e9c70..23cce602875 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { unpackPhase = ":"; buildPhase = '' - gcc -O2 -o nuttcp $src + cc -O2 -o nuttcp $src ''; installPhase = '' -- cgit 1.4.1 From 8dbefea7149d3c47924ac31f97189e7485e1e218 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:57:13 -0500 Subject: lout: fix macOS build --- pkgs/tools/typesetting/lout/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh index ec52adc225b..cd3b9c67e3c 100755 --- a/pkgs/tools/typesetting/lout/builder.sh +++ b/pkgs/tools/typesetting/lout/builder.sh @@ -39,6 +39,6 @@ cat makefile | \ > "$nixMakefile" && \ mkdir -p "$out/bin" && mkdir -p "$out/lib" \ mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \ -make -f "$nixMakefile" install installman && \ +make -f "$nixMakefile" CC=cc install installman && \ installDoc && \ fixupPhase -- cgit 1.4.1 From f4ff67099b1685703ca83d71e8f1aa46fb7db051 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sun, 9 Apr 2017 22:28:27 -0700 Subject: keychain: add sigma as maintainer --- lib/maintainers.nix | 1 + pkgs/tools/misc/keychain/default.nix | 1 + 2 files changed, 2 insertions(+) (limited to 'pkgs/tools') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 231574b7bb5..450d880663c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -477,6 +477,7 @@ shell = "Shell Turner "; shlevy = "Shea Levy "; siddharthist = "Langston Barrett "; + sigma = "Yann Hodique "; simonvandel = "Simon Vandel Sillesen "; sjagoe = "Simon Jagoe "; sjmackenzie = "Stewart Mackenzie "; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index d32ed0b0d83..9abfdea5f7b 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib; platforms.linux ++ platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ sigma ]; }; } -- cgit 1.4.1 From c334daa5c226b611a9e21f8e54d9834ffc728a82 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 10 Apr 2017 14:44:29 +0300 Subject: f2fs-tools: Cleanup a bit --- pkgs/tools/filesystems/f2fs-tools/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index acc3b5183fe..2a590d44e21 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, autoreconfHook, libselinux, libuuid, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }: stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; version = "1.7.0"; - src = fetchurl { - url = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${name}.tar.gz"; - sha256 = "1m6bn1ibq0p53m0n97il91xqgjgn2pzlz74lb5bfzassx7159m1k"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; + rev = "refs/tags/v${version}"; + sha256 = "0wpzklw8smnngng0dm25jdmi7v5zfhpz02dksyxpz0a7kzzvnqqm"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libselinux libuuid pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libselinux libuuid ]; meta = with stdenv.lib; { homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; -- cgit 1.4.1 From 183279002d5098ad0346e4cd341d05fcdee33df5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 10 Apr 2017 14:45:36 +0300 Subject: f2fs-tools: 1.7.0 -> 1.8.0 --- pkgs/tools/filesystems/f2fs-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 2a590d44e21..d56c5e2ed9a 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.7.0"; + version = "1.8.0"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; - sha256 = "0wpzklw8smnngng0dm25jdmi7v5zfhpz02dksyxpz0a7kzzvnqqm"; + sha256 = "0mbpg6mng6jcm5vxq0ivhklgpkwvjbhjwgkhzxr50ln46h5kbd2f"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- cgit 1.4.1 From 199be99c6fa7232fd32cca4329337ff37b69961e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 10 Apr 2017 14:46:40 +0300 Subject: dosfstools: 3.0.28 -> 4.1 --- pkgs/tools/filesystems/dosfstools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 76df4f41257..8b01ea15dc7 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { name = "dosfstools-${version}"; - version = "3.0.28"; + version = "4.1"; src = fetchFromGitHub { owner = "dosfstools"; repo = "dosfstools"; rev = "v${version}"; - sha256 = "0lqirpxcn8ml0anq8aqmaljfsji9h6mdzz0jrs0yqqfhgg90bkg2"; + sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1"; }; - makeFlags = "PREFIX=$(out)"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; -- cgit 1.4.1 From c0cef0425eff1db8ddc07e78ea5aa16eb4a9666b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 10 Apr 2017 14:49:28 +0300 Subject: btrfs-progs: 4.8.2 -> 4.10.2 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 525aa2fec28..411d0c99f20 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.2"; in +let version = "4.10.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; + sha256 = "02p63nz78lrr156cmbb759z76cn95hv6mmz7v592lmiq0dkxy2gd"; }; buildInputs = [ -- cgit 1.4.1 From 9ae8ce813e7ed78c138e432c2f04995d5f56dd62 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 04:45:33 +0300 Subject: dosfstools: Use --enable-compat-symlinks http://hydra.nixos.org/build/51461475 --- pkgs/tools/filesystems/dosfstools/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/tools') diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 8b01ea15dc7..d6a4e83a533 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; + configureFlags = [ "--enable-compat-symlinks" ]; + meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; -- cgit 1.4.1 From e09b950f5423904562c98e31417683a2b5560ea7 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Tue, 11 Apr 2017 08:46:58 +0200 Subject: openvpn: remove no longer correct systemd-notify.patch This patch was only necessary for 2.3.x, while 2.4.0 improved its own systemd notify support. See: https://github.com/NixOS/nixpkgs/issues/24817 --- pkgs/tools/networking/openvpn/default.nix | 2 -- pkgs/tools/networking/openvpn/systemd-notify.patch | 22 ---------------------- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/tools/networking/openvpn/systemd-notify.patch (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f609c90ad50..a8f3a5a19ae 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { sha256 = "0zpqnbhjaifdalyxwmvk5kcyd7cpxbcigbn7967nbsyvl54vl8vg"; }; - patches = optional stdenv.isLinux ./systemd-notify.patch; - buildInputs = [ lzo openssl pkgconfig ] ++ optionals stdenv.isLinux [ pam systemd iproute ] ++ optional pkcs11Support pkcs11helper; diff --git a/pkgs/tools/networking/openvpn/systemd-notify.patch b/pkgs/tools/networking/openvpn/systemd-notify.patch deleted file mode 100644 index c0ac8ae89d3..00000000000 --- a/pkgs/tools/networking/openvpn/systemd-notify.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn/init.c ---- openvpn-2.3.1-orig/src/openvpn/init.c 2013-03-20 09:28:14.000000000 +0100 -+++ openvpn-2.3.1/src/openvpn/init.c 2014-04-22 13:02:21.351026640 +0200 -@@ -48,6 +48,8 @@ - - #include "occ-inline.h" - -+#include -+ - static struct context *static_context; /* GLOBAL */ - - /* -@@ -1375,6 +1375,9 @@ - /* Reset the unsuccessful connection counter on complete initialisation */ - c->options.unsuccessful_attempts = 0; - -+ /* Tell systemd we're ready. */ -+ sd_notify(0, "READY=1"); -+ - /* If we delayed UID/GID downgrade or chroot, do it now */ - do_uid_gid_chroot (c, true); - -- cgit 1.4.1 From b002d6a8681e4961d9f5c3ee8ca1b06d1a31c450 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 11 Apr 2017 09:45:50 +0300 Subject: Revert "btrfs-progs: 4.8.2 -> 4.10.2" This reverts commit c0cef0425eff1db8ddc07e78ea5aa16eb4a9666b. The output of the command-line tool has changed somewhat and at least nixos-generate-config.pl needs modifications to match. I'm leaving that to someone who knows a bit more about btrfs. Issue #24810. --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 411d0c99f20..525aa2fec28 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.10.2"; in +let version = "4.8.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "02p63nz78lrr156cmbb759z76cn95hv6mmz7v592lmiq0dkxy2gd"; + sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; }; buildInputs = [ -- cgit 1.4.1