From eae9889b8225a9acce42b4aa0b254ff9dca0a85c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 4 Aug 2015 15:38:29 -0700 Subject: openssl: Major bump 1.0.1 -> 1.0.2 --- pkgs/development/libraries/openssl/1.0.2.x.nix | 84 -------------------------- pkgs/development/libraries/openssl/default.nix | 4 +- pkgs/development/web/iojs/default.nix | 4 +- 3 files changed, 4 insertions(+), 88 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/1.0.2.x.nix (limited to 'pkgs/development') 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"; -- cgit 1.4.1 From 3f1d497fbe331f731a3cb10632b7ebb99d489bf4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 20 Aug 2015 12:54:38 -0700 Subject: ncurses: 5.9 -> 6.0 --- pkgs/development/libraries/ncurses/default.nix | 24 ++++++-------- pkgs/development/libraries/ncurses/gcc-5.patch | 46 -------------------------- 2 files changed, 10 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/libraries/ncurses/gcc-5.patch (limited to 'pkgs/development') 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 \ -- cgit 1.4.1 From d2c32179fe3e7e9d73657cc5d75b166daa1b9feb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:50:39 +0200 Subject: neon: 0.29.6 -> 0.30.1 --- pkgs/development/libraries/neon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') 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 ]; -- cgit 1.4.1 From f92d27d214546b0a419d469a8eb79cea27947b34 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:51:51 +0200 Subject: neon: Put version into own variable --- pkgs/development/libraries/neon/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development') 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"; -- cgit 1.4.1 From 83a5cfb260e22027b0b9d4736f9b6ed127355864 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 1 Oct 2015 13:30:23 -0700 Subject: 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(-) (limited to 'pkgs/development') 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 ]; -- cgit 1.4.1 From d4081c2f97fbdde94b3e8db27b089cedbcde9272 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 1 Oct 2015 16:34:26 -0700 Subject: fix patches for both node versions --- pkgs/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 (limited to 'pkgs/development') 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}) -- cgit 1.4.1 From 07d9b3cded757d1ffa5d1010a6eaefeb4ebf512f Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 1 Oct 2015 16:34:37 -0700 Subject: 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 (limited to 'pkgs/development') 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; -- cgit 1.4.1 From 6b84f5cd610648cbff19db22a116909af5a2fc1c Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Fri, 2 Oct 2015 10:11:04 +0300 Subject: 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(-) (limited to 'pkgs/development') 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 -- cgit 1.4.1 From 5a7ad7d36c27972bc6d0f9069c1343add99f8ded Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 2 Oct 2015 09:19:30 +0000 Subject: glpk: 4.52.1 -> 4.56 --- pkgs/development/libraries/glpk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') 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; -- cgit 1.4.1