From 6085213bc5389fcdb64bc2649db0e7b81e914751 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 7 Jul 2015 09:20:40 -0700 Subject: [PATCH 01/52] Revert "Revert "perl: Make 5.22 the default"" This reverts commit b7ffacffef2fdf6be1b6e044a1da52efb9d89740. --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e806bb1bd14..93aab5eed531 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4953,8 +4953,7 @@ let fetchurl = fetchurlBoot; }; - # Make perl522 the default once gnulib is updated to support it. - perl = perl520; + perl = perl522; php = php56; From a31bcbfae059a704afc6010c0c4dcffa6350112c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 7 Jul 2015 09:21:00 -0700 Subject: [PATCH 02/52] Revert "Revert "gmp: Use version 6 as the default"" This reverts commit 7d299447ae584bd064ef175fa889607cb387d0c9. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93aab5eed531..0124db33895b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6315,7 +6315,8 @@ let gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; - gmp = gmp5; + gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; + gmp = gmp6; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp From f4a42ae509216463e774843ffabc75399532a717 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 11 Jun 2015 18:01:50 -0700 Subject: [PATCH 03/52] gcc: Make 5.x the default --- pkgs/stdenv/linux/default.nix | 9 ++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 12fc3fed5a5a..2436181aa7ad 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -210,14 +210,9 @@ rec { gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - isl_0_11 = pkgs.isl_0_11.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - cloog_0_18_0 = pkgs.cloog_0_18_0.override { - stdenv = pkgs.makeStaticLibraries pkgs.stdenv; - isl = isl_0_11; - }; + isl_0_14 = pkgs.isl_0_14.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; gccPlain = pkgs.gcc.cc.override { - isl = isl_0_11; - cloog = cloog_0_18_0; + isl = isl_0_14; }; }; extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0124db33895b..5a96d5c455c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3701,7 +3701,7 @@ let gambit = callPackage ../development/compilers/gambit { }; - gcc = gcc49; + gcc = gcc5; gcc_multi = if system == "x86_64-linux" then lowPrio ( From 3000e55b06243c3699e55c90bfc6ecfe409a5aae Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 17 Jul 2015 22:38:45 -0700 Subject: [PATCH 04/52] syslinux: Use gcc 4.8 until a proper fix for 5 is made --- pkgs/os-specific/linux/syslinux/default.nix | 3 +-- .../os-specific/linux/syslinux/gcc5-fix.patch | 26 ------------------- pkgs/top-level/all-packages.nix | 8 +++++- 3 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 pkgs/os-specific/linux/syslinux/gcc5-fix.patch diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 3c01516b0815..93e5d591a9d9 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { sha256 = "03l5iifwlg1wyb4yh98i0b7pd4j55a1c9y74q1frs47a5dnrilr6"; }; - # gcc5-fix should be in 6.04+, so remove if it fails to apply. - patches = [ ./perl-deps.patch ./gcc5-fix.patch ]; + patches = [ ./perl-deps.patch ]; buildInputs = [ nasm perl libuuid ]; diff --git a/pkgs/os-specific/linux/syslinux/gcc5-fix.patch b/pkgs/os-specific/linux/syslinux/gcc5-fix.patch deleted file mode 100644 index dc44b1880583..000000000000 --- a/pkgs/os-specific/linux/syslinux/gcc5-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/com32/include/menu.h b/com32/include/menu.h -index bc0182f..b0251e4 100644 ---- a/com32/include/menu.h -+++ b/com32/include/menu.h -@@ -195,7 +195,7 @@ void local_cursor_enable(bool); - - static inline int my_isspace(char c) - { -- return (unsigned char)c <= ' '; -+ return (unsigned char)c <= ' ' || (unsigned char)c == '\x7f'; - } - - int my_isxdigit(char c); -diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c -index b7814be..a433fad 100644 ---- a/com32/menu/readconfig.c -+++ b/com32/menu/readconfig.c -@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src) - char c; - - while ((c = *src++)) { -- if (c <= ' ' && c == '\x7f') { -+ if (my_isspace(c)) { - if (!was_space) - *dst++ = '_'; - was_space = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a96d5c455c5..e924feaf78e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10048,7 +10048,13 @@ let sysklogd = callPackage ../os-specific/linux/sysklogd { }; - syslinux = callPackage ../os-specific/linux/syslinux { }; + syslinux = callPackage ../os-specific/linux/syslinux { + # Using GCC5 with 6.03 creates a broken isolinux.bin + # Make sure to test booting the livecd on a bios system + # if changing this override. + # nixos.tests.bootBiosCdrom is useful for this. + stdenv = overrideCC stdenv gcc48; + }; sysstat = callPackage ../os-specific/linux/sysstat { }; From eae9889b8225a9acce42b4aa0b254ff9dca0a85c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 4 Aug 2015 15:38:29 -0700 Subject: [PATCH 05/52] openssl: Major bump 1.0.1 -> 1.0.2 --- .../development/libraries/openssl/1.0.2.x.nix | 84 ------------------- .../development/libraries/openssl/default.nix | 4 +- pkgs/development/web/iojs/default.nix | 4 +- pkgs/top-level/all-packages.nix | 8 -- 4 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/1.0.2.x.nix diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix deleted file mode 100644 index 28254cb390d4..000000000000 --- a/pkgs/development/libraries/openssl/1.0.2.x.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, fetchurl, perl -, withCryptodev ? false, cryptodevHeaders }: - -with stdenv.lib; -let - opensslCrossSystem = attrByPath [ "openssl" "system" ] - (throw "openssl needs its platform name cross building" null) - stdenv.cross; -in -stdenv.mkDerivation rec { - name = "openssl-1.0.2d"; - - src = fetchurl { - urls = [ - "http://www.openssl.org/source/${name}.tar.gz" - "http://openssl.linux-mirror.org/source/${name}.tar.gz" - ]; - sha1 = "d01d17b44663e8ffa6a33a5a30053779d9593c3d"; - }; - - patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch; - - nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; - - # On x86_64-darwin, "./config" misdetects the system as - # "darwin-i386-cc". So specify the system type explicitly. - configureScript = - if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" - else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc" - else "./config"; - - configureFlags = [ - "shared" - "--libdir=lib" - "--openssldir=etc/ssl" - ] ++ stdenv.lib.optionals withCryptodev [ - "-DHAVE_CRYPTODEV" - "-DUSE_CRYPTODEV_DIGESTS" - ]; - - makeFlags = [ - "MANDIR=$(out)/share/man" - ]; - - # Parallel building is broken in OpenSSL. - enableParallelBuilding = false; - - postInstall = '' - # If we're building dynamic libraries, then don't install static - # libraries. - if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then - rm "$out/lib/"*.a - fi - - # remove dependency on Perl at runtime - rm -r $out/etc/ssl/misc $out/bin/c_rehash - ''; - - postFixup = '' - # Check to make sure we don't depend on perl - if grep -r '${perl}' $out; then - echo "Found an erroneous dependency on perl ^^^" >&2 - exit 1 - fi - ''; - - crossAttrs = { - preConfigure='' - # It's configure does not like --build or --host - export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}" - ''; - - configureScript = "./Configure"; - }; - - meta = { - homepage = http://www.openssl.org/; - description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; - priority = 10; # resolves collision with ‘man-pages’ - }; -} diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index ca3e7999f9be..31bd7fb2d673 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -8,14 +8,14 @@ let stdenv.cross; in stdenv.mkDerivation rec { - name = "openssl-1.0.1p"; + name = "openssl-1.0.2d"; src = fetchurl { urls = [ "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "9d1977cc89242cd11471269ece2ed4650947c046"; + sha256 = "671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index 6a0c8ca512e8..a44a6d6c6c4a 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: +{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv }: let version = "3.1.0"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { # causes configure to fail, so don't add --disable-static. dontDisableStatic = true; - buildInputs = [ python openssl_1_0_2 http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); + buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); setupHook = ../nodejs/setup-hook.sh; passthru.interpreterName = "iojs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e924feaf78e9..da0a18c9ed7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7706,14 +7706,6 @@ let }; }; - openssl_1_0_2 = callPackage ../development/libraries/openssl/1.0.2.x.nix { - fetchurl = fetchurlBoot; - cryptodevHeaders = linuxPackages.cryptodev.override { - fetchurl = fetchurlBoot; - onlyHeaders = true; - }; - }; - openwsman = callPackage ../development/libraries/openwsman {}; ortp = callPackage ../development/libraries/ortp { }; From 3f1d497fbe331f731a3cb10632b7ebb99d489bf4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 20 Aug 2015 12:54:38 -0700 Subject: [PATCH 06/52] ncurses: 5.9 -> 6.0 --- .../development/libraries/ncurses/default.nix | 24 ++++------ .../development/libraries/ncurses/gcc-5.patch | 46 ------------------- 2 files changed, 10 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/libraries/ncurses/gcc-5.patch diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index c505d89a6d8f..046c7347f863 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,38 +1,39 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, pkgconfig, libtool , mouseSupport ? false , unicode ? true , gpm - -# Extra Options -, abiVersion ? "5" }: stdenv.mkDerivation rec { - name = "ncurses-5.9"; + name = "ncurses-6.0"; src = fetchurl { url = "mirror://gnu/ncurses/${name}.tar.gz"; - sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; + sha256 = "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm"; }; - # gcc-5.patch should be removed after 5.9 - patches = [ ./clang.patch ./gcc-5.patch ]; + patches = [ ./clang.patch ]; configureFlags = [ "--with-shared" + "--with-cxx-shared" + "--with-libtool" "--without-debug" + "--enable-overwrite" # Needed for proper header installation "--enable-pc-files" "--enable-symlinks" ] ++ lib.optional unicode "--enable-widec"; + nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; preConfigure = '' configureFlagsArray+=("--includedir=$out/include") export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig" mkdir -p "$PKG_CONFIG_LIBDIR" + configureFlagsArray+=("--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR") '' + lib.optionalString stdenv.isCygwin '' sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure ''; @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { for dylibtype in so dll dylib; do if [ -e "$out/lib/lib''${lib}$suffix.$dylibtype" ]; then ln -svf lib''${lib}$suffix.$dylibtype $out/lib/lib$lib$newsuffix.$dylibtype - ln -svf lib''${lib}$suffix.$dylibtype.${abiVersion} $out/lib/lib$lib$newsuffix.$dylibtype.${abiVersion} fi done for statictype in a dll.a la; do @@ -82,10 +82,6 @@ stdenv.mkDerivation rec { done ''; - preFixup = '' - rm $out/lib/*.a - ''; - meta = { description = "Free software emulation of curses in SVR4 and more"; @@ -112,6 +108,6 @@ stdenv.mkDerivation rec { passthru = { ldflags = "-lncurses"; - inherit unicode abiVersion; + inherit unicode; }; } diff --git a/pkgs/development/libraries/ncurses/gcc-5.patch b/pkgs/development/libraries/ncurses/gcc-5.patch deleted file mode 100644 index 2448229b88e1..000000000000 --- a/pkgs/development/libraries/ncurses/gcc-5.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/545114 - -extracted from the upstream change (which had many unrelated commits in one) - -From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 -From: "Thomas E. Dickey" -Date: Sun, 7 Dec 2014 03:10:09 +0000 -Subject: [PATCH] ncurses 5.9 - patch 20141206 - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - -diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh -index d8cc3c9..b91398c 100755 ---- a/ncurses/base/MKlib_gen.sh -+++ b/ncurses/base/MKlib_gen.sh -@@ -474,11 +474,22 @@ sed -n -f $ED1 \ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 < $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ From 88b814575016ae9685851aa0d78f613e7d15d700 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 20 Aug 2015 10:36:06 -0700 Subject: [PATCH 07/52] openssh: 6.9p1 -> 7.1p1 This intentionally leaves out support for using existing dsa keys as they are insecure and should not be enabled by default. If you need this support, please make the changes in your ssh_config and sshd_config. --- pkgs/tools/networking/openssh/default.nix | 6 +- .../openssh/openssh-6.9p1-security-7.0.patch | 65 ------------------- 2 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 2004e453a0d9..50d53bdff2cd 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -17,11 +17,11 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "openssh-6.9p1"; + name = "openssh-7.1p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf"; + sha256 = "0a44mnr8bvw41zg83xh4sb55d8nds29j95gxvxk5qg863lnns2pw"; }; prePatch = optionalString hpnSupport @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch]; + patches = [ ./locale_archive.patch ]; buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ optional withKerberos [ kerberos ]; diff --git a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch b/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch deleted file mode 100644 index 02e9eb3a9739..000000000000 --- a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch +++ /dev/null @@ -1,65 +0,0 @@ -http://pkgs.fedoraproject.org/cgit/openssh.git/commit/openssh-6.9p1-security-7.0.patch?h=f22&id=4776fad91e7e1f626f33e8c240d0ccecd663554d - -diff --git a/sshpty.c b/sshpty.c -index 7bb7641..15da8c6 100644 ---- a/sshpty.c -+++ b/sshpty.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */ -+/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */ - /* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland -@@ -197,7 +197,7 @@ pty_setowner(struct passwd *pw, const char *tty) - /* Determine the group to make the owner of the tty. */ - grp = getgrnam("tty"); - gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid; -- mode = (grp != NULL) ? 0622 : 0600; -+ mode = (grp != NULL) ? 0620 : 0600; - - /* - * Change owner and mode of the tty as required. -diff --git a/monitor.c b/monitor.c -index b410965..f1b873d 100644 ---- a/monitor.c -+++ b/monitor.c -@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device; - int - mm_answer_pam_init_ctx(int sock, Buffer *m) - { -- - debug3("%s", __func__); -- authctxt->user = buffer_get_string(m, NULL); - sshpam_ctxt = (sshpam_device.init_ctx)(authctxt); - sshpam_authok = NULL; - buffer_clear(m); -@@ -1166,14 +1166,16 @@ mm_answer_pam_respond(int sock, Buffer *m) - int - mm_answer_pam_free_ctx(int sock, Buffer *m) - { -+ int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt; - - debug3("%s", __func__); - (sshpam_device.free_ctx)(sshpam_ctxt); -+ sshpam_ctxt = sshpam_authok = NULL; - buffer_clear(m); - mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m); - auth_method = "keyboard-interactive"; - auth_submethod = "pam"; -- return (sshpam_authok == sshpam_ctxt); -+ return r; - } - #endif - -diff --git a/monitor_wrap.c b/monitor_wrap.c -index e6217b3..eac421b 100644 ---- a/monitor_wrap.c -+++ b/monitor_wrap.c -@@ -614,7 +614,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt) - - debug3("%s", __func__); - buffer_init(&m); -- buffer_put_cstring(&m, authctxt->user); - mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m); - debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__); - mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m); From 3acffb730aeb1bcab009dcc6ba57707462a3abaa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 4 Sep 2015 12:06:23 -0700 Subject: [PATCH 08/52] accelio: Don't build with non-stdenv gcc5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da0a18c9ed7d..6d734b21bfed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5813,7 +5813,7 @@ let aalib = callPackage ../development/libraries/aalib { }; - accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; }; + accelio = callPackage ../development/libraries/accelio { }; accounts-qt = callPackage ../development/libraries/accounts-qt { }; From ef8e002bf0a6d170ea677c2fee76f3f01a53db54 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Fri, 25 Sep 2015 15:58:25 +0100 Subject: [PATCH 09/52] heatseeker: init at 1.3.0 --- lib/maintainers.nix | 1 + pkgs/tools/misc/heatseeker/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/heatseeker/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 121fca951642..b2bdd2cd15e6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -179,6 +179,7 @@ meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; michelk = "Michel Kuhlmann "; + michaelpj = "Michael Peyton Jones "; mirdhyn = "Merlin Gaillard "; mschristiansen = "Mikkel Christiansen "; modulistic = "Pablo Costa "; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix new file mode 100644 index 000000000000..0d85554c347d --- /dev/null +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +with rustPlatform; + +buildRustPackage rec { + name = "heatseeker-${version}"; + version = "1.3.0"; + + depsSha256 = "03jap7myf85xgx9270sws8x57nl04a1wx8szrk9qx24s9vnnjcnh"; + + src = fetchFromGitHub { + owner = "rschmitt"; + repo = "heatseeker"; + rev = "v${version}"; + sha256 = "1xdvwgmh9lwv82hv1qg82bjv2iplnvva6lzbg7dyhbszhv7rhkbl"; + }; + + # some tests require a tty, this variable turns them off for Travis CI, + # which we can also make use of + TRAVIS= "true"; + + meta = with stdenv.lib; { + description = "A general-purpose fuzzy selector"; + homepage = https://github.com/rschmitt/heatseeker; + license = stdenv.lib.licenses.mit; + maintainers = [ maintainers.michaelpj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1704d4b34a8..ac9697989f3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -849,6 +849,8 @@ let gmic = callPackage ../tools/graphics/gmic { }; + heatseeker = callPackage ../tools/misc/heatseeker { }; + mathics = pythonPackages.mathics; mcrl = callPackage ../tools/misc/mcrl { }; From 89b306a7ffbd8f1108a4586f1fa55eed56df8a07 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sat, 26 Sep 2015 23:58:49 +0600 Subject: [PATCH 10/52] Enable setting extended NetworkManager hooks --- nixos/modules/services/networking/networkmanager.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index adbc6099c95a..8370eca21e52 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -71,11 +71,10 @@ let ${coreutils}/bin/rm -f $tmp $tmp.ns ''; - # pre-up and pre-down hooks were added in NM 0.9.10, but we still use 0.9.0 dispatcherTypesSubdirMap = { "basic" = ""; - /*"pre-up" = "pre-up.d/"; - "pre-down" = "pre-down.d/";*/ + "pre-up" = "pre-up.d/"; + "pre-down" = "pre-down.d/"; }; in { From 4138fa09fdc1cd385fdff67e8a9ec4bbfba0c734 Mon Sep 17 00:00:00 2001 From: laMudri Date: Mon, 28 Sep 2015 13:25:23 +0100 Subject: [PATCH 11/52] urbit: init at 2015.09.26 --- pkgs/misc/urbit/default.nix | 42 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/misc/urbit/default.nix diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix new file mode 100644 index 000000000000..e4049f07897a --- /dev/null +++ b/pkgs/misc/urbit/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchgit, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel, + cmake, re2c, libtool, ncurses, perl, zlib, python }: + +stdenv.mkDerivation rec { + + name = "urbit-${version}"; + version = "2015.09.26"; + + src = fetchgit { + url = "https://github.com/urbit/urbit.git"; + rev = "c9592664c797b2dd74f26886528656f8a7058640"; + sha256 = "0sgrxnmpqh54mgar81wlb6gff8c0pc24p53xwxr448g5shvnzjx9"; + }; + + buildInputs = with stdenv.lib; [ + gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool + ncurses perl zlib python + ]; + + configurePhase = '' + : + ''; + + buildPhase = '' + sed -i 's/-lcurses/-lncurses/' Makefile + mkdir -p $out + cp -r . $out/ + cd $out + make + ''; + + installPhase = '' + : + ''; + + meta = with stdenv.lib; { + description = "an operating function"; + homepage = http://urbit.org/preview/~2015.9.25/materials; + license = licenses.mit; + maintainers = with maintainers; [ mudri ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d342f64f857..708c154861c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14959,6 +14959,8 @@ let tvheadend = callPackage ../servers/tvheadend { }; + urbit = callPackage ../misc/urbit { }; + utf8proc = callPackage ../development/libraries/utf8proc { }; vault = goPackages.vault.bin // { outputs = [ "bin" ]; }; From d2c32179fe3e7e9d73657cc5d75b166daa1b9feb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:50:39 +0200 Subject: [PATCH 12/52] neon: 0.29.6 -> 0.30.1 --- pkgs/development/libraries/neon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index ffc409d271e0..eabb1c625cbe 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { - name = "neon-0.29.6"; + name = "neon-0.30.1"; src = fetchurl { url = "http://www.webdav.org/neon/${name}.tar.gz"; - sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; + sha256 = "1pawhk02x728xn396a1kcivy9gqm94srmgad6ymr9l0qvk02dih0"; }; patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; From f92d27d214546b0a419d469a8eb79cea27947b34 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:51:51 +0200 Subject: [PATCH 13/52] neon: Put version into own variable --- pkgs/development/libraries/neon/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index eabb1c625cbe..0ca64c9bb076 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -14,7 +14,8 @@ let in stdenv.mkDerivation rec { - name = "neon-0.30.1"; + version = "0.30.1"; + name = "neon-${version}"; src = fetchurl { url = "http://www.webdav.org/neon/${name}.tar.gz"; From cfba54975e4193389657c0e67747b1c0632e71dd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 30 Sep 2015 16:17:02 -0700 Subject: [PATCH 14/52] mesa: 10.6.8 -> 11.0.2 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 90db53ae7ebd..52268b9c3432 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -22,7 +22,7 @@ else */ let - version = "10.6.8"; + version = "11.0.2"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -36,7 +36,7 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" ]; - sha256 = "e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd"; + sha256 = "fce11fb27eb87adf1e620a76455d635c6136dfa49ae58c53b34ef8d0c7b7eae4"; }; prePatch = "patchShebangs ."; From 3e96b763d2458537e994a23478f5ce4257930f31 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 30 Sep 2015 16:17:19 -0700 Subject: [PATCH 15/52] llvm: Switch to 3.7 by default --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24bd66c1c1ee..20770b428db0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4149,7 +4149,7 @@ let llvm_34 = llvmPackages_34.llvm; llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { }; - llvmPackages = recurseIntoAttrs llvmPackages_36; + llvmPackages = recurseIntoAttrs llvmPackages_37; llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; @@ -7558,7 +7558,6 @@ let # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity grsecEnabled = true; - llvmPackages = llvmPackages_36; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( From e9fcbe67b09fd21395e10a19b967f8add0127018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 1 Oct 2015 22:22:31 +0200 Subject: [PATCH 16/52] kde4.kdesdk-kioslaves: fix by resurrecting svn-1.8 Just bringing back pre-bc54ecd811e state as well. --- .../version-management/subversion/default.nix | 16 ++++++++++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index db29360c9ecb..f563bebd9db8 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -8,6 +8,7 @@ , stdenv, fetchurl, apr, aprutil, zlib, sqlite , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null +, branch ? "1.9" }: assert bdbSupport -> aprutil.bdbSupport; @@ -15,15 +16,26 @@ assert httpServer -> apacheHttpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; +let + config = { + "1.9".ver_min = "2"; + "1.9".sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; + + "1.8".ver_min = "14"; + "1.8".sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497"; + }; +in +assert builtins.hasAttr branch config; + stdenv.mkDerivation (rec { - version = "1.9.2"; + version = "${branch}." + config.${branch}.ver_min; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; + inherit (config.${branch}) sha1; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79862d8613aa..af8de26af19b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13921,6 +13921,7 @@ let libcanberra = libcanberra_kde; boost = boost155; kdelibs = kdeApps_15_08.kdelibs; + subversionClient = subversionClient.override { branch = "1.8"; }; } ../desktops/kde-4.14; From 83a5cfb260e22027b0b9d4736f9b6ed127355864 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 1 Oct 2015 13:30:23 -0700 Subject: [PATCH 17/52] add darwin.libobjc to some ruby gems that need it --- .../interpreters/ruby/bundler-env/default-gem-config.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index b4e04f6ec904..3ae74057a54f 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -20,7 +20,7 @@ { lib, fetchurl, writeScript, ruby, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi -, cmake, libssh2, openssl, mysql +, cmake, libssh2, openssl, mysql, darwin }: let @@ -70,6 +70,7 @@ in "--with-exslt-lib=${libxslt}/lib" "--with-exslt-include=${libxslt}/include" ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; + buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; }; pg = attrs: { @@ -119,6 +120,10 @@ in ''; }; + unf_ext = attrs: { + buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; + }; + xapian-ruby = attrs: { # use the system xapian buildInputs = [ xapian pkgconfig zlib ]; From 66dd86d4ca565e2b00106443240ce02467ea7a6d Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Thu, 1 Oct 2015 22:38:50 +0100 Subject: [PATCH 18/52] iptraf-ng: init at 1.1.4 This commit adds `iptraf-ng` which is a fork of `iptraf`. The original has not been updated in ~10 years. This fork is more modern but development is a bit slow (last update to master 15 months ago). Nevertheless, unlike `iptraf` this one doesn't barf around and works properly. --- .../networking/iptraf-ng/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/networking/iptraf-ng/default.nix diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix new file mode 100644 index 000000000000..368d78a36f90 --- /dev/null +++ b/pkgs/applications/networking/iptraf-ng/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + version = "1.1.4"; + name = "iptraf-ng-${version}"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz"; + sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r"; + }; + + buildInputs = [ ncurses ]; + + configurePhase = '' + ./configure --prefix=$out/usr --sysconfdir=$out/etc \ + --localstatedir=$out/var --sbindir=$out/bin + ''; + + meta = { + description = "A console-based network monitoring utility (fork of iptraf)"; + longDescription = '' + IPTraf-ng is a console-based network monitoring utility. IPTraf-ng + gathers data like TCP connection packet and byte counts, interface + statistics and activity indicators, TCP/UDP traffic breakdowns, and LAN + station packet and byte counts. IPTraf-ng features include an IP traffic + monitor which shows TCP flag information, packet and byte counts, ICMP + details, OSPF packet types, and oversized IP packet warnings; interface + statistics showing IP, TCP, UDP, ICMP, non-IP and other IP packet counts, + IP checksum errors, interface activity and packet size counts; a TCP and + UDP service monitor showing counts of incoming and outgoing packets for + common TCP and UDP application ports, a LAN statistics module that + discovers active hosts and displays statistics about their activity; TCP, + UDP and other protocol display filters so you can view just the traffic + you want; logging; support for Ethernet, FDDI, ISDN, SLIP, PPP, and + loopback interfaces; and utilization of the built-in raw socket interface + of the Linux kernel, so it can be used on a wide variety of supported + network cards. + ''; + homepage = https://fedorahosted.org/iptraf-ng/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af8de26af19b..5e69517aa1db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11775,6 +11775,8 @@ let iptraf = callPackage ../applications/networking/iptraf { }; + iptraf-ng = callPackage ../applications/networking/iptraf-ng { }; + irssi = callPackage ../applications/networking/irc/irssi { }; irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; From 63e3ec8ce10f7cf13f9877da7ba9b2c21afa1c6a Mon Sep 17 00:00:00 2001 From: Martin Sturm Date: Tue, 29 Sep 2015 23:02:46 +0200 Subject: [PATCH 19/52] audacity: Use soundtouch This enables change pitch (without changing tempo) and change tempo (without changing pitch) effects. --- pkgs/applications/audio/audacity/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 6f25693f734e..67ec6b5a419e 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, - expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */ + expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: stdenv.mkDerivation rec { @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { rm -r lib-src-rm/ ''; + configureFlags = "--with-libsamplerate"; + buildInputs = [ pkgconfig gettext wxGTK gtk expat alsaLib libsndfile soxr libid3tag - ffmpeg libmad lame libvorbis flac - ]; #ToDo: soundtouch, detach sbsms + ffmpeg libmad lame libvorbis flac soundtouch + ]; #ToDo: detach sbsms dontDisableStatic = true; doCheck = true; From d4081c2f97fbdde94b3e8db27b089cedbcde9272 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 1 Oct 2015 16:34:26 -0700 Subject: [PATCH 20/52] fix patches for both node versions --- .../development/web/nodejs/default-arch.patch | 24 +++++++++++++++++++ pkgs/development/web/nodejs/default.nix | 7 +++--- pkgs/development/web/nodejs/no-xcode.patch | 21 ---------------- pkgs/development/web/nodejs/pkg-libpath.patch | 13 ++++++++++ pkgs/development/web/nodejs/v0_10.nix | 2 +- 5 files changed, 42 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/web/nodejs/default-arch.patch create mode 100644 pkgs/development/web/nodejs/pkg-libpath.patch diff --git a/pkgs/development/web/nodejs/default-arch.patch b/pkgs/development/web/nodejs/default-arch.patch new file mode 100644 index 000000000000..3c7eb1014dee --- /dev/null +++ b/pkgs/development/web/nodejs/default-arch.patch @@ -0,0 +1,24 @@ +diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py +--- a/tools/gyp/pylib/gyp/xcode_emulation.py 2014-01-23 06:05:51.000000000 +0100 ++++ b/tools/gyp/pylib/gyp/xcode_emulation.py 2014-02-04 17:49:48.000000000 +0100 +@@ -1018,12 +1033,16 @@ + # Since the value returned by this function is only used when ARCHS is not + # set, then on iOS we return "i386", as the default xcode project generator + # does not set ARCHS if it is not set in the .gyp file. +- if self.isIOS: ++ ++ try: ++ if self.isIOS: ++ return 'i386' ++ version, build = self._XcodeVersion() ++ if version >= '0500': ++ return 'x86_64' + return 'i386' +- version, build = self._XcodeVersion() +- if version >= '0500': ++ except: + return 'x86_64' +- return 'i386' + + class MacPrefixHeader(object): + """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature. diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 440ed7aca924..0f7f56dd5b37 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -38,12 +38,13 @@ in stdenv.mkDerivation { dontDisableStatic = true; prePatch = '' patchShebangs . + sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py ''; - patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ]; - buildInputs = [ python which http-parser zlib libuv openssl python ] - ++ (optional stdenv.isLinux utillinux) + buildInputs = [ python which zlib libuv openssl python ] + ++ optionals stdenv.isLinux [ utillinux http-parser ] ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch index e88168b68a77..244a55e9aebb 100644 --- a/pkgs/development/web/nodejs/no-xcode.patch +++ b/pkgs/development/web/nodejs/no-xcode.patch @@ -70,24 +70,3 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_ def AdjustLibraries(self, libraries, config_name=None): """Transforms entries like 'Cocoa.framework' in libraries into entries like -@@ -1018,12 +1033,16 @@ - # Since the value returned by this function is only used when ARCHS is not - # set, then on iOS we return "i386", as the default xcode project generator - # does not set ARCHS if it is not set in the .gyp file. -- if self.isIOS: -+ -+ try: -+ if self.isIOS: -+ return 'i386' -+ version, build = self._XcodeVersion() -+ if version >= '0500': -+ return 'x86_64' - return 'i386' -- version, build = self._XcodeVersion() -- if version >= '0500': -+ except: - return 'x86_64' -- return 'i386' - - class MacPrefixHeader(object): - """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature. diff --git a/pkgs/development/web/nodejs/pkg-libpath.patch b/pkgs/development/web/nodejs/pkg-libpath.patch new file mode 100644 index 000000000000..8ad94c0e3e2f --- /dev/null +++ b/pkgs/development/web/nodejs/pkg-libpath.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index d199975..66d903b 100755 +--- a/configure ++++ b/configure +@@ -734,7 +734,7 @@ def configure_library(lib, output): + # libpath needs to be provided ahead libraries + if pkg_libpath: + output['libraries'] += ( +- filter(None, map(str.strip, pkg_cflags.split('-L')))) ++ pkg_libpath.split()) + + default_libs = getattr(options, shared_lib + '_libname') + default_libs = map('-l{0}'.format, default_libs.split(',')) diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix index bf19ba646fd7..47de2e72d403 100644 --- a/pkgs/development/web/nodejs/v0_10.nix +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation { patchShebangs . ''; - patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./default-arch.patch ./no-xcode.patch ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) From 07d9b3cded757d1ffa5d1010a6eaefeb4ebf512f Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 1 Oct 2015 16:34:37 -0700 Subject: [PATCH 21/52] remove obsolete libunwindNative --- pkgs/development/libraries/libunwind/native.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/libunwind/native.nix diff --git a/pkgs/development/libraries/libunwind/native.nix b/pkgs/development/libraries/libunwind/native.nix deleted file mode 100644 index 6ce485ecaec0..000000000000 --- a/pkgs/development/libraries/libunwind/native.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv }: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "libunwind-native"; - - unpackPhase = ":"; - dontBuild = true; - - installPhase = '' - mkdir -p $out/lib - cat /usr/lib/system/libunwind.dylib > $out/lib/libunwind.dylib - ''; - - meta.platforms = stdenv.lib.platforms.darwin; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af8de26af19b..d0bf1a051098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7395,11 +7395,9 @@ let libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; libunwind = if stdenv.isDarwin - then libunwindNative + then darwin.libunwind else callPackage ../development/libraries/libunwind { }; - libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; - libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv { automake = automake113x; # fails with 14 inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; From 8c4505776438598da1b2eff675beafefe5dbafa0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 Sep 2015 15:13:43 +0200 Subject: [PATCH 22/52] enblend-enfuse: 4.1.3 -> 4.1.4 --- pkgs/tools/graphics/enblend-enfuse/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 6b65d3df0d3f..c967b73001c7 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl , boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra -, pkgconfig, perl }: +, help2man, pkgconfig, perl }: +let version = "4.1.4"; in stdenv.mkDerivation rec { - name = "enblend-enfuse-4.1.3"; + name = "enblend-enfuse-${version}"; src = fetchurl { url = "mirror://sourceforge/enblend/${name}.tar.gz"; - sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w"; + sha256 = "0208x01i129hqylmy6jh3krwdac47mx6fi8xccjm9h35c18c7xl5"; }; buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ help2man perl pkgconfig ]; enableParallelBuilding = true; meta = { + inherit version; homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = stdenv.lib.licenses.gpl2; From 4a92863fd55de5a1b73c3ba68c1dc1eb66dc841a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 Sep 2015 15:18:46 +0200 Subject: [PATCH 23/52] enblend-enfuse: rename to actual package name Retain old and unreadable "enblendenfuse" alias for compatibility. --- pkgs/applications/graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/graphics/hugin/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ea638de7925d..702911fee744 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -245,7 +245,7 @@ rec { /* =============== simple script files ==================== */ - # also have a look at enblendenfuse in all-packages.nix + # also have a look at enblend-enfuse in all-packages.nix exposureBlend = scriptDerivation { name = "exposure-blend"; src = fetchurl { diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 88912cbda55d..b11ed1a99df7 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, gnumake, pkgconfig , boost, gettext, tclap, wxGTK , freeglut, glew, libXi, libXmu, mesa -, autopanosiftc, enblendenfuse, exiv2, ilmbase, lensfun, libpng, libtiff +, autopanosiftc, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff , openexr, panotools, perlPackages }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # commandline tools needed by the hugin batch processor # you may have to tell hugin (in the preferences) where these binaries reside - propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake + propagatedUserEnvPackages = [ autopanosiftc enblend-enfuse gnumake perlPackages.ImageExifTool ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0bf1a051098..c599390157c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1366,7 +1366,7 @@ let emv = callPackage ../tools/misc/emv { }; - enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; + enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; encfs = callPackage ../tools/filesystems/encfs { }; @@ -15106,6 +15106,7 @@ aliases = with self; rec { clangAnalyzer = clang-analyzer; # added 2015-02-20 cool-old-term = cool-retro-term; # added 2015-01-31 cv = progress; # added 2015-09-06 + enblendenfuse = enblend-enfuse; # 2015-09-30 exfat-utils = exfat; # 2015-09-11 firefoxWrapper = firefox-wrapper; fuse_exfat = exfat; # 2015-09-11 From 910dfd53bdff391b7b531b6c6752ce628b94bcf7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Oct 2015 20:43:43 +0200 Subject: [PATCH 24/52] git-hub: minor clean-up Move meta out of the way; inherit the GitHub home page from src; `with platforms; linux` -> `platforms.linux`. --- .../git-and-tools/git-hub/default.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index e47d2569b109..e657215f2cd5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, docutils, python }: let version = "0.9.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "git-hub-${version}"; src = fetchFromGitHub { @@ -11,20 +11,6 @@ stdenv.mkDerivation { owner = "sociomantic"; }; - meta = with stdenv.lib; { - inherit version; - description = "Git command line interface to GitHub"; - longDescription = '' - A simple command line interface to GitHub, enabling most useful GitHub - tasks (like creating and listing pull request or issues) to be accessed - directly through the Git command line. - ''; - homepage = https://github.com/sociomantic/git-hub; - license = licenses.gpl3Plus; - platforms = with platforms; linux; - maintainers = with maintainers; [ nckx ]; - }; - buildInputs = [ python ]; nativeBuildInputs = [ docutils ]; @@ -41,4 +27,18 @@ stdenv.mkDerivation { # Remove inert ftdetect vim plugin and a README that's a man page subset: rm -r $out/share/{doc,vim} ''; + + meta = with stdenv.lib; { + inherit version; + inherit (src.meta) homepage; + description = "Git command line interface to GitHub"; + longDescription = '' + A simple command line interface to GitHub, enabling most useful GitHub + tasks (like creating and listing pull request or issues) to be accessed + directly through the Git command line. + ''; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; } From 7d78c0b84bca40dbbb21e16a594841832a396dc5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Oct 2015 19:02:27 +0200 Subject: [PATCH 25/52] perlPackages.Cairo: 1.105 -> 1.106 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ead04c0f088d..8f10c206ef08 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -715,15 +715,15 @@ let self = _self // overrides; _self = with self; { }; Cairo = buildPerlPackage rec { - name = "Cairo-1.105"; + name = "Cairo-1.106"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "0im025wy1346w7b7hi6im08bfn6x4ma0cxmjz6xnk8riizm1s84q"; + sha256 = "1i25kks408c54k2zxskvg54l5k3qadzm8n72ffga9jy7ic0h6j76"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.cairo ]; meta = { homepage = http://gtk2-perl.sourceforge.net/; - description = "Perl interface to the cairo 2d vector graphics library"; + description = "Perl interface to the cairo 2D vector graphics library"; maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; From e38fb2ea25c83af51c401044e348e03f28de8f63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Oct 2015 19:49:15 +0200 Subject: [PATCH 26/52] perlPackages.Glib: 1.313 -> 1.314 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8f10c206ef08..1057be798df0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4843,10 +4843,10 @@ let self = _self // overrides; _self = with self; { }; Glib = buildPerlPackage rec { - name = "Glib-1.313"; + name = "Glib-1.314"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "162g342bhzy2ca4xwk63j10q9jycsps0s8l8y8pda70m7zcmr7xj"; + sha256 = "13lhyksm7fgj6rgrgs06kr0hinbyhiq3lfr6gd2qal1j2w0rwzml"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ]; meta = { From ab94830c6011b058e9f5875c56e2b9d02220b921 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Oct 2015 05:20:49 +0200 Subject: [PATCH 27/52] goPackages.git-lfs: init at 1.0.0 --- pkgs/top-level/go-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 2bf0a96a5aa1..ec9ac07fe9ae 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -679,6 +679,26 @@ let subPackages = [ "./" ]; # don't try to build test fixtures }; + git-lfs = buildFromGitHub { + rev = "v1.0.0"; + owner = "github"; + repo = "git-lfs"; + sha256 = "1zlg3rm5yxak6d88brffv1wpj0iq4qgzn6sgg8xn0pbnzxjd1284"; + + # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' + excludedPackages = [ "test" ]; + + preBuild = '' + pushd go/src/github.com/github/git-lfs + go generate ./commands + popd + ''; + + postInstall = '' + rm -v $bin/bin/{man,script} + ''; + }; + glide = buildFromGitHub { rev = "0.5.0"; owner = "Masterminds"; From 9594fcf5eca4c4d97d0e76ea97982a7fb271c7ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Oct 2015 05:30:34 +0200 Subject: [PATCH 28/52] duff: 0.5.2 -> 2014-07-03 --- pkgs/tools/filesystems/duff/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 310153341669..1c4d068c4c13 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext }: -let version = "0.5.2"; in +# The last release (0.5.2) is more than 2 years old and lacks features like -D, +# limiting its usefulness. Upstream appears comatose if not dead. +let version = "2014-07-03"; in stdenv.mkDerivation { name = "duff-${version}"; src = fetchFromGitHub { - sha256 = "0yfm910wjj6z0f0cg68x59ykf4ql5m49apzy8sra00f8kv4lpn53"; - rev = version; + sha256 = "1k2dx38pjzc5d624vw1cs5ipj9fprsm5vqv55agksc29m63lswnx"; + rev = "f26d4837768b062a3f98fa075c791d9c8a0bb75c"; repo = "duff"; owner = "elmindreda"; }; @@ -14,10 +16,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook gettext ]; preAutoreconf = '' - # duff is currently badly packaged, requiring us to do extra work here that - # should be done upstream. If that is ever fixed, this entire phase can be - # removed along with all buildInputs. - # gettexttize rightly refuses to run non-interactively: cp ${gettext}/bin/gettextize . substituteInPlace gettextize \ @@ -30,14 +28,15 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { + inherit version; description = "Quickly find duplicate files"; - homepage = http://duff.dreda.org/; - license = licenses.zlib; longDescription = '' Duff is a Unix command-line utility for quickly finding duplicates in a given set of files. ''; + homepage = http://duff.dreda.org/; + license = licenses.zlib; + platforms = platforms.all; maintainers = with maintainers; [ nckx ]; - platforms = with platforms; all; }; } From 3f727911bfe81cbc623107036c76cc8af2e134dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Oct 2015 08:29:16 +0200 Subject: [PATCH 29/52] haskell-users-guide.md: document static linking --- doc/haskell-users-guide.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md index b06a81e5b36a..446f08eb697c 100644 --- a/doc/haskell-users-guide.md +++ b/doc/haskell-users-guide.md @@ -666,6 +666,27 @@ to find out the store path of the system's zlib library. Now, you can The same thing applies to `cabal configure`, of course, if you're building with `cabal-install` instead of Stack. +## Creating statically linked binaries + +There are two levels of static linking. The first option is to configure the +build with the Cabal flag `--disable-executable-dynamic`. In Nix expressions, +this can be achieved by setting the attribute: + + enableSharedExecutables = false; + +That gives you a binary with statically linked Haskell libraries and +dynamically linked system libraries. + +To link both Haskell libraries and system libraries statically, the additional +flags `--ghc-option=-optl=-static --ghc-option=-optl=-pthread` need to be used. +In Nix, this is accomplished with: + + configureFlags = [ "--ghc-option=-optl=-static" "--ghc-option=-optl=-pthread" ]; + +It's important to realize, however, that most system libraries in Nix are built +as shared libraries only, i.e. there is just no static library available that +Cabal could link! + # Other resources From ff742d5475ef79fd8788def1f1a748a78bc67220 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Thu, 1 Oct 2015 17:48:02 -0430 Subject: [PATCH 30/52] symbola: fix zip hash and adjust documentation installation --- pkgs/data/fonts/symbola/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index 5b2113dc57e8..253fd9cd3e98 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -5,11 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.zip"; - sha256 = "07bczpl3vqdpg2gakfddhzzgpb6v2wpasv7rwqxkyg9yd9lmbr0s"; - }; - docs_pdf = fetchurl { - url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; - sha256 = "1zmq1ijl0k5hrc6vpa2xp9n1x2zrrd7ng3jwc9yf0qsi3pmkpk0p"; + sha256 = "1lfs2j816332ysvpb5ibj2gwpmyqyispqdl7skkshf2gra18hmhd"; }; buildInputs = [ unzip ]; @@ -24,8 +20,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/doc/${name}" cp -v Symbola.docx "$out/doc/${name}/" - cp -v Symbola.htm "$out/doc/${name}/" - cp -v "$docs_pdf" "$out/doc/${name}/${docs_pdf.name}" + cp -v Symbola.pdf "$out/doc/${name}/" ''; meta = { From 6b84f5cd610648cbff19db22a116909af5a2fc1c Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Fri, 2 Oct 2015 10:11:04 +0300 Subject: [PATCH 31/52] snort: introducing inline snort support via nfq daq --- pkgs/applications/networking/ids/daq/default.nix | 6 ++++-- pkgs/applications/networking/ids/snort/default.nix | 10 +++++++++- pkgs/development/libraries/libdnet/default.nix | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index c4a82966238a..9339bfef6e03 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, libpcap}: +{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { name = "daq-2.0.5"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p"; }; - buildInputs = [ flex bison libpcap ]; + buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; + + configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib"; meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index ea7e09626994..4a8007796b1c 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: +{stdenv, makeWrapper, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { version = "2.9.7.2"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; + + enableParallelBuilding = true; + + configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib"; + + postInstall = '' + wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq" + ''; meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 2bdeffb204d8..8911539d7b02 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation { sha1 = "71302be302e84fc19b559e811951b5d600d976f8"; }; - configureFlags = [ "--enable-shared" ]; # shared libs required by hyenae - buildInputs = [ automake autoconf libtool ]; + CFLAGS="-fPIC"; + # .so endings are missing (quick and dirty fix) postInstall = '' for i in $out/lib/*; do From 8d8457d9aee9d8e471a0794650f1b82883432071 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Fri, 2 Oct 2015 10:18:55 +0300 Subject: [PATCH 32/52] add wrapProgram to buildInputs --- pkgs/applications/networking/ids/snort/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 4a8007796b1c..04dd87a025ed 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; - buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; + buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ]; enableParallelBuilding = true; From 0e69d85980ae94c0c8374b2f891cf4be92e53b92 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Fri, 2 Oct 2015 11:43:03 +0300 Subject: [PATCH 33/52] snort: provide dynamic preprocessor path via wrapper --- pkgs/applications/networking/ids/snort/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 04dd87a025ed..224f7152bef8 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib"; + configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib \ + --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"; postInstall = '' wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq" From 5d952d68deadca348d611e2d6fcda2c893f50b2a Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Fri, 2 Oct 2015 12:08:25 +0300 Subject: [PATCH 34/52] snort: typo fix --- pkgs/applications/networking/ids/snort/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 224f7152bef8..62c784a7fb79 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib \ - --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"; + configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"; postInstall = '' wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq" From 5a7ad7d36c27972bc6d0f9069c1343add99f8ded Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 2 Oct 2015 09:19:30 +0000 Subject: [PATCH 35/52] glpk: 4.52.1 -> 4.56 --- pkgs/development/libraries/glpk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 2b1a5b571ef0..d4ff7d9603f6 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "glpk-4.52.1"; + name = "glpk-4.56"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "0nz9ngmx23c8gbjr8l8ygnfaanxj2mwbl8awpg630bgrkxdnhc9j"; + sha256 = "0syzix6qvpn0fzp08c84c8snansf1cam5vd0dk2w91mz2c85d18h"; }; doCheck = true; From 277d44f8fb14fb12de0cfbb8dcd527e9ff95deda Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 2 Oct 2015 12:02:27 +0200 Subject: [PATCH 36/52] linux: Update to 3.14.54 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 5ea214c9eb35..4a18072d7534 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.53"; + version = "3.14.54"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0zqaqa7gs895p521c82jggak9zlmiwmkfarh2ykvh423sxjbvs5i"; + sha256 = "0jjl7xx2mkkhy3yg3mza2h7ysz48qcn0z475jldfw4fh87ajlfig"; }; features.iwlwifi = true; From 213bb5875282acb531d8e64737ab399224ec9fe8 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Fri, 2 Oct 2015 12:06:55 +0200 Subject: [PATCH 37/52] networking module: fix for wlanInterfaces --- nixos/modules/tasks/network-interfaces.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 9ffede48bf52..03e647b1b1e7 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -59,7 +59,7 @@ let # place the interface which is named after the device at the beginning. wlanListDeviceFirst = device: interfaces: if hasAttr device interfaces - then [{"${device}"=interfaces.device; _iName=device;}] ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces) + then mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n==device) interfaces) ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces) else mapAttrsToList (n: v: v // {_iName = n;}) interfaces; # udev script that configures a physical wlan device and adds virtual interfaces From 26150153baa86d3e44c31633642d47c69e2a6d3b Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Fri, 2 Oct 2015 12:07:54 +0200 Subject: [PATCH 38/52] systemd: add option to build with "--enable-kdbus" --- pkgs/os-specific/linux/systemd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4c9e0475b94e..b7f70ec3b117 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,6 +3,7 @@ , glib, kbd, libxslt, coreutils, libgcrypt , kexectools, libmicrohttpd, linuxHeaders , pythonPackages ? null, pythonSupport ? false +, enableKDbus ? false }: assert stdenv.isLinux; @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { "--with-sysvinit-path=" "--with-sysvrcnd-path=" "--with-rc-local-script-path-stop=/etc/halt.local" - ]; + ] ++ stdenv.lib.optional enableKDbus "--enable-kdbus"; preConfigure = '' From 9e33e2365eeff59e9a25701dc2cf8dbcc38a9dc8 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Fri, 2 Oct 2015 12:09:30 +0200 Subject: [PATCH 39/52] miraclecast: init at 0.0-git-20151002 --- .../os-specific/linux/miraclecast/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/linux/miraclecast/default.nix diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix new file mode 100644 index 000000000000..3d5a76144af5 --- /dev/null +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, systemd, glib, readline }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "miraclecast-0.0-git-20151002"; + + src = fetchFromGitHub { + owner = "albfan"; + repo = "miraclecast"; + rev = "30b8c2d22391423f76ba582aaaa1e0936869103a"; + sha256 = "0i076n76kq64fayc7v06gr1853pk5r6ms86m57vd1xsjd0r9wyxd"; + }; + + # INFO: It is important to list 'systemd' first as for now miraclecast + # links against a customized systemd. Otherwise, a systemd package from + # a propagatedBuildInput could take precedence. + buildInputs = [ systemd autoreconfHook pkgconfig udev glib readline ]; + + meta = { + homepage = https://github.com/albfan/miraclecast; + description = "Connect external monitors via Wi-Fi"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tstrobel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144547f6dac8..fa466cf84ced 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10006,6 +10006,10 @@ let mingetty = callPackage ../os-specific/linux/mingetty { }; + miraclecast = callPackage ../os-specific/linux/miraclecast { + systemd = systemd.override { enableKDbus = true; }; + }; + module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; aggregateModules = modules: From 4902ec1c7862a38a6a5eebb686f04ea463ad353b Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Fri, 2 Oct 2015 00:24:38 -0300 Subject: [PATCH 40/52] nvidiabl: fix for kernel >= 4 (close #10174) --- pkgs/os-specific/linux/nvidiabl/default.nix | 2 ++ .../linux/nvidiabl/linux4compat.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/linux/nvidiabl/linux4compat.patch diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index a5a43926e045..a6797608664f 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "1c7ar39wc8jpqh67sw03lwnyp0m9l6dad469ybqrgcywdiwxspwj"; }; + patches = [ ./linux4compat.patch ]; + preConfigure = '' sed -i 's|/sbin/depmod|#/sbin/depmod|' Makefile ''; diff --git a/pkgs/os-specific/linux/nvidiabl/linux4compat.patch b/pkgs/os-specific/linux/nvidiabl/linux4compat.patch new file mode 100644 index 000000000000..ad8236a2b630 --- /dev/null +++ b/pkgs/os-specific/linux/nvidiabl/linux4compat.patch @@ -0,0 +1,22 @@ +From 2bf6f08b2492cc04a2c39fdcb22a2d0c18963d1c Mon Sep 17 00:00:00 2001 +From: sonic414 +Date: Tue, 28 Apr 2015 19:30:15 +0530 +Subject: [PATCH] strnicmp to strncasecmp in Linux 4.0.0 + +--- + nvidiabl-module.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nvidiabl-module.c b/nvidiabl-module.c +index b789ea4..b306579 100644 +--- a/nvidiabl-module.c ++++ b/nvidiabl-module.c +@@ -214,7 +214,7 @@ static int __init nvidiabl_init(void) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) + + for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) { +- if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) { ++ if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) { + props.type = backlight_type_ids[iii].type; + printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id); + } From c5f2f2d8145abf1b24a08913c1df1dfea02b6d72 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2015 10:49:47 +0200 Subject: [PATCH 41/52] opensmtpd: 5.4.5p1 -> 5.7.1p1 --- pkgs/servers/mail/opensmtpd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index a95a5d81ce95..59e58811cde8 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.4.5p1"; + version = "5.7.1p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "15sicrpqsgg72igdckkwpmbgrapcjbfjsdrvm0zl8z13kgp6r4ks"; + sha256 = "67e9dd9682ca8c181e84e66c76245a4a8f6205834f915a2c021cdfeb22049e3a"; }; configureFlags = [ @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { "--with-privsep-user=smtpd" "--with-queue-user=smtpq" "--with-ca-file=/etc/ssl/certs/ca-certificates.crt" + "--with-libevent-dir=${libevent}" ]; installFlags = [ From db18b6e828c28eb191559d98acfd937930958895 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Sep 2015 09:41:12 +0200 Subject: [PATCH 42/52] opensmtpd-extras: init at 5.7.1 --- pkgs/servers/mail/opensmtpd/extras.nix | 79 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/servers/mail/opensmtpd/extras.nix diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix new file mode 100644 index 000000000000..0123d19bf3fa --- /dev/null +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchurl, openssl, libevent, libasr, + python2, pkgconfig, lua5, perl, mariadb, postgresql, sqlite, hiredis }: +stdenv.mkDerivation rec { + name = "opensmtpd-extras-${version}"; + version = "5.7.1"; + + src = fetchurl { + url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + sha256 = "1kld4hxgz792s0cb2gl7m2n618ikzqkj88w5dhaxdrxg4x2c4vdm"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl libevent + libasr python2 lua5 perl mariadb postgresql sqlite hiredis ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-privsep-user=smtpd" + "--with-libevent-dir=${libevent}" + + "--with-filter-clamav" + "--with-filter-dkim-signer" + "--with-filter-dnsbl" + "--with-filter-monkey" + "--with-filter-pause" + "--with-filter-regex" + "--with-filter-spamassassin" + "--with-filter-stub" + "--with-filter-trace" + "--with-filter-void" + "--with-queue-null" + "--with-queue-ram" + "--with-queue-stub" + "--with-table-ldap" + "--with-table-socketmap" + "--with-table-passwd" + "--with-table-stub" + "--with-scheduler-ram" + "--with-scheduler-stub" + + ] ++ stdenv.lib.optional (python2 != null) [ + "--with-python=${python2}" + "--with-filter-python" + "--with-queue-python" + "--with-table-python" + "--with-scheduler-python" + + ] ++ stdenv.lib.optional (lua5 != null) [ + "--with-lua=${pkgconfig}" + "--with-filter-lua" + + ] ++ stdenv.lib.optional (perl != null) [ + "--with-perl=${perl}" + "--with-filter-perl" + + ] ++ stdenv.lib.optional (mariadb != null) [ + "--with-table-mysql" + + ] ++ stdenv.lib.optional (postgresql != null) [ + "--with-table-postgres" + + ] ++ stdenv.lib.optional (sqlite != null) [ + "--with-table-sqlite" + + ] ++ stdenv.lib.optional (hiredis != null) [ + "--with-table-redis" + ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) [ "-I${hiredis}/include/hiredis" ]; + + meta = with stdenv.lib; { + homepage = https://www.opensmtpd.org/; + description = "Extra plugins for the OpenSMTPD mail server"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa466cf84ced..35849cdd9b9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9067,6 +9067,7 @@ let openresty = callPackage ../servers/http/openresty { }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; + opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; openxpki = callPackage ../servers/openxpki { }; From 0dfddc5a542f4da76faac77f517ca90f6bf66094 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Sep 2015 09:40:44 +0200 Subject: [PATCH 43/52] opensmtpd: support filters. --- nixos/modules/services/mail/opensmtpd.nix | 20 +++++- pkgs/servers/mail/opensmtpd/default.nix | 2 + pkgs/servers/mail/opensmtpd/proc_path.diff | 76 ++++++++++++++++++++++ 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/mail/opensmtpd/proc_path.diff diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index a3e50b422920..a1cfd84365a2 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -46,6 +46,17 @@ in { is left empty, the OpenSMTPD server will not start. ''; }; + + procPackages = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Packages to search for filters, tables, queues, and schedulers. + + Add OpenSMTPD-extras here if you want to use the filters, etc. from + that package. + ''; + }; }; }; @@ -72,12 +83,19 @@ in { }; }; - systemd.services.opensmtpd = { + systemd.services.opensmtpd = let + procEnv = pkgs.buildEnv { + name = "opensmtpd-procs"; + paths = [ opensmtpd ] ++ cfg.procPackages; + pathsToLink = [ "/libexec/opensmtpd" ]; + }; + in { wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; preStart = "mkdir -p /var/spool"; serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}"; + environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; }; environment.systemPackages = [ (pkgs.runCommand "opensmtpd-sendmail" {} '' diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 59e58811cde8..2fd3f0421b97 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "67e9dd9682ca8c181e84e66c76245a4a8f6205834f915a2c021cdfeb22049e3a"; }; + patches = [ ./proc_path.diff ]; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/servers/mail/opensmtpd/proc_path.diff new file mode 100644 index 000000000000..0e8eac0bb83b --- /dev/null +++ b/pkgs/servers/mail/opensmtpd/proc_path.diff @@ -0,0 +1,76 @@ +diff -Naur opensmtpd-5.7.1p1/smtpd/parse.y opensmtpd-5.7.1p1.patched/smtpd/parse.y +--- opensmtpd-5.7.1p1/smtpd/parse.y 2015-06-30 10:13:34.000000000 +0200 ++++ opensmtpd-5.7.1p1.patched/smtpd/parse.y 2015-09-26 08:41:17.012472516 +0200 +@@ -2519,13 +2519,19 @@ + { + struct filter_conf *f; + char *path; ++ const char *proc_path; + + if (dict_get(&conf->sc_filters, name)) { + yyerror("filter \"%s\" already defined", name); + return (NULL); + } + +- if (asprintf(&path, "%s/filter-%s", PATH_LIBEXEC, prog) == -1) { ++ proc_path = getenv("OPENSMTPD_PROC_PATH"); ++ if (proc_path == NULL) { ++ proc_path = PATH_LIBEXEC; ++ } ++ ++ if (asprintf(&path, "%s/filter-%s", proc_path, prog) == -1) { + yyerror("filter \"%s\" asprintf failed", name); + return (0); + } +diff -Naur opensmtpd-5.7.1p1/smtpd/smtpd.c opensmtpd-5.7.1p1.patched/smtpd/smtpd.c +--- opensmtpd-5.7.1p1/smtpd/smtpd.c 2015-06-30 10:13:34.000000000 +0200 ++++ opensmtpd-5.7.1p1.patched/smtpd/smtpd.c 2015-09-26 08:41:16.998472557 +0200 +@@ -854,6 +854,7 @@ + char path[PATH_MAX]; + char name[PATH_MAX]; + char *arg; ++ char *proc_path; + + if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) { + log_warnx("warn: %s-proc: conf too long", key); +@@ -864,7 +865,12 @@ + if (arg) + *arg++ = '\0'; + +- if (snprintf(path, sizeof(path), PATH_LIBEXEC "/%s-%s", key, name) >= ++ proc_path = getenv("OPENSMTPD_PROC_PATH"); ++ if (proc_path == NULL) { ++ proc_path = PATH_LIBEXEC; ++ } ++ ++ if (snprintf(path, sizeof(path), "%s/%s-%s", proc_path, key, name) >= + (ssize_t)sizeof(path)) { + log_warn("warn: %s-proc: exec path too long", key); + return (-1); +diff -Naur opensmtpd-5.7.1p1/smtpd/table.c opensmtpd-5.7.1p1.patched/smtpd/table.c +--- opensmtpd-5.7.1p1/smtpd/table.c 2015-06-30 10:13:34.000000000 +0200 ++++ opensmtpd-5.7.1p1.patched/smtpd/table.c 2015-09-26 08:41:17.005472536 +0200 +@@ -201,6 +201,7 @@ + struct table_backend *tb; + char buf[LINE_MAX]; + char path[LINE_MAX]; ++ const char *proc_path; + size_t n; + struct stat sb; + +@@ -215,8 +216,14 @@ + if (name && table_find(name, NULL)) + fatalx("table_create: table \"%s\" already defined", name); + ++ proc_path = getenv("OPENSMTPD_PROC_PATH"); ++ if (proc_path == NULL) { ++ proc_path = PATH_LIBEXEC; ++ } ++ + if ((tb = table_backend_lookup(backend)) == NULL) { +- if ((size_t)snprintf(path, sizeof(path), PATH_LIBEXEC "/table-%s", ++ if ((size_t)snprintf(path, sizeof(path), "%s/table-%s", ++ proc_path, + backend) >= sizeof(path)) { + fatalx("table_create: path too long \"" + PATH_LIBEXEC "/table-%s\"", backend); From 0e5458edace6fa066eadbf16934c0596adf7f84c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Oct 2015 18:58:32 +0200 Subject: [PATCH 44/52] tzdata: 2015f -> 2015g (cherry picked from commit 18b3295970cc5f80ece61d8e0da3b690613c3c8a) --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 8789316ccdc4..045a9eef00a6 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2015f"; in +let version = "2015g"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "07ak8ai5skgjpj6lg74pawxg0bz998k7s2ah7jqyqhp086sq37wm"; + sha256 = "0qb1awqrn3215zd2jikpqnmkzrxwfjf0d3dw2xmnk4c40yzws8xr"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "1bl4vqw6yp9199clm9aai566bmslp42g5xglj3vl24dn5fjf158c"; + sha256 = "1i3y1kzjiz2j62c7vd4wf85983sqk9x9lg3473njvbdz4kph5r0q"; }) ]; From bb7eb9829df55b7f5298fac91ce04c1400550ed7 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Wed, 30 Sep 2015 14:03:58 +0200 Subject: [PATCH 45/52] jackmix: init at version 0.5.2 Add jackmix to the nix pkgs. --- lib/maintainers.nix | 1 + pkgs/applications/audio/jackmix/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/applications/audio/jackmix/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b2bdd2cd15e6..071a4d45ba23 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -144,6 +144,7 @@ jwilberding = "Jordan Wilberding "; jzellner = "Jeff Zellner "; kamilchm = "Kamil Chmielewski "; + kampfschlaefer = "Arnold Krille "; khumba = "Bryan Gardiner "; kkallio = "Karn Kallio "; koral = "Koral "; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix new file mode 100644 index 000000000000..7d840198dc7c --- /dev/null +++ b/pkgs/applications/audio/jackmix/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgs }: + +stdenv.mkDerivation rec { + name = "jackmix-0.5.2"; + src = fetchurl { + url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; + sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; + }; + + buildInputs = [ + pkgs.pkgconfig + pkgs.scons + pkgs.kde4.qt4 + pkgs.jack1 + pkgs.lash + pkgs.libuuid # should be a propagatedBuildInput on jack1 + ]; + + buildPhase = '' + scons + ''; + installPhase = '' + mkdir -p $out/bin + cp jackmix/jackmix $out/bin + ''; + + meta = { + description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; + homepage = http://www.arnoldarts.de/jackmix/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; + platforms = stdenv.lib.platforms.linux; + }; +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35849cdd9b9d..0dcec4870b18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11802,6 +11802,8 @@ let jackmeter = callPackage ../applications/audio/jackmeter { }; + jackmix = callPackage ../applications/audio/jackmix { }; + jalv = callPackage ../applications/audio/jalv { }; jedit = callPackage ../applications/editors/jedit { }; From 48f05f7b101e8505c895540c1afca9a3221e4519 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Fri, 2 Oct 2015 14:27:04 +0200 Subject: [PATCH 46/52] jackaudio: Add libuuid as propagatedBuildInput The jack/jack.h includes uuid/uuid.h, therefox libuuid should be a propagated input for anything using jack. --- pkgs/misc/jackaudio/default.nix | 3 ++- pkgs/misc/jackaudio/jack1.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 25fd1a5cbbf7..73cb62f3e037 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper -, bash, libsamplerate, libsndfile, readline +, bash, libsamplerate, libsndfile, libuuid, readline # Optional Dependencies , dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { optDbus optPythonDBus optLibffado optAlsaLib optLibopus ]; + propagatedBuildInputs = [ libuuid ]; prePatch = '' substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 1c5c78548f5b..4250efcb6a29 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ optAlsaLib optDb optLibuuid optLibffado optCelt ]; + buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; + propagatedBuildInputs = [ optLibuuid ]; meta = with stdenv.lib; { description = "JACK audio connection kit"; From 3bce303e05f3310b19d9f47e9bb5c1ba484ee456 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Fri, 2 Oct 2015 14:30:39 +0200 Subject: [PATCH 47/52] jackmix: Build jackmix in two flavours Flavours are: - *jackmix* using jack2 (default) - *jackmix_jack1* using jack1 --- pkgs/applications/audio/jackmix/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 7d840198dc7c..8176a3404702 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: stdenv.mkDerivation rec { name = "jackmix-0.5.2"; @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { pkgs.pkgconfig pkgs.scons pkgs.kde4.qt4 - pkgs.jack1 pkgs.lash - pkgs.libuuid # should be a propagatedBuildInput on jack1 + jack ]; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dcec4870b18..9d77849bbb77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11803,6 +11803,7 @@ let jackmeter = callPackage ../applications/audio/jackmeter { }; jackmix = callPackage ../applications/audio/jackmix { }; + jackmix_jack1 = jackmix.override { jack = jack1; }; jalv = callPackage ../applications/audio/jalv { }; From b3d1184693b85e63daed01f305097b70a5dc66ba Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 2 Oct 2015 16:33:40 +0200 Subject: [PATCH 48/52] jack2: do not propagate uuid --- pkgs/misc/jackaudio/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 73cb62f3e037..25fd1a5cbbf7 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper -, bash, libsamplerate, libsndfile, libuuid, readline +, bash, libsamplerate, libsndfile, readline # Optional Dependencies , dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { optDbus optPythonDBus optLibffado optAlsaLib optLibopus ]; - propagatedBuildInputs = [ libuuid ]; prePatch = '' substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash From cd22214e0ea38c28cdcd4984116b132a61f194c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 2 Oct 2015 19:09:52 +0200 Subject: [PATCH 49/52] build-fhs-chrootenv: add missing /usr/include This patch brings the include/ directories of all specified packages to appear under /usr/include in the FHS chroot. As per spec[1]. [1] http://www.pathname.com/fhs/pub/fhs-2.3.html#USRINCLUDEDIRECTORYFORSTANDARDINCLU --- pkgs/build-support/build-fhs-chrootenv/env.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index b659655f74b9..a2ac8288e8ec 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -182,6 +182,12 @@ let setupLibDirs = if isTargetBuild then setupLibDirs_target else setupLibDirs_multi; + setupIncludeDir = '' + if [ -x "${staticUsrProfileTarget}/include" ] + then + ln -s "${staticUsrProfileTarget}/include" + fi + ''; # the target profile is the actual profile that will be used for the chroot setupTargetProfile = '' @@ -192,6 +198,7 @@ let cd usr ${linkProfile staticUsrProfileTarget} ${setupLibDirs} + ${setupIncludeDir} cd .. rm -rf usr/etc usr/var ''; From a4db37c4e984ecb3b6431f1ca96f8c01cd9afa60 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Oct 2015 19:26:54 +0200 Subject: [PATCH 50/52] smplayer: 14.9.0.6690 -> 15.9.0 --- pkgs/applications/video/smplayer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 22935064c4b4..d56ef9649679 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt5 }: stdenv.mkDerivation rec { - name = "smplayer-14.9.0.6690"; + name = "smplayer-15.9.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0nmw69kg8rqvl9icyx1r1v1pyxg6560363l0kyqyja18j79a3j2y"; + sha256 = "1yx6kikaj9v5aj8aavvrcklx283wl6wrnpl905hjc7v03kgp1ac5"; }; patches = [ ./basegui.cpp.patch ]; - buildInputs = [ qt4 ]; + buildInputs = [ qt5.script ]; preConfigure = '' makeFlags="PREFIX=$out" From 33f1ebb8f2bb9ee16494d7a84a3ea17ecbefef02 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 Oct 2015 16:08:42 -0700 Subject: [PATCH 51/52] glew: 1.11.0 -> 1.13.0 --- pkgs/development/libraries/glew/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index cbdc28311877..6595d97b01af 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "glew-1.11.0"; + name = "glew-1.13.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9"; + sha256 = "1iwb2a6wfhkzv6fa7zx2gz1lkwa0iwnd9ka1im5vdc44xm4dq9da"; }; nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; From b233ecdca68e08940024da6e4e55e6ef2a20863f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 Oct 2015 16:08:52 -0700 Subject: [PATCH 52/52] poppler: 0.34.0 -> 0.36.0 Tested building cups-filters and rendering a pdf --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index b15142dc6738..92777f001695 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -5,8 +5,8 @@ }: let # beware: updates often break cups_filters build - version = "0.34.0"; # even major numbers are stable - sha256 = "1c2wa4pfzqmvzq1jpp3ps5nmzz745gcg8dnpwqpfdccy5ydbm90v"; + version = "0.36.0"; # even major numbers are stable + sha256 = "13i440kv873wgmw50rs4d1v05cj0r7bqnghd70hp9vy44dxhdk4k"; in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}";