diff options
author | Robin Gloster <mail@glob.in> | 2016-04-07 21:52:26 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-04-07 21:52:26 +0000 |
commit | 3e68106afd95df012ddb548575f0133681687a90 (patch) | |
tree | e2919b6900e6de13a3f52756acc02058a1ef0421 /pkgs/tools | |
parent | a73a28de7b16734d8e28da8be43a06b92eeb6bc3 (diff) | |
parent | 25cc1c12febf74c66d661528e2fc2b00caff1bf1 (diff) | |
download | nixpkgs-3e68106afd95df012ddb548575f0133681687a90.tar nixpkgs-3e68106afd95df012ddb548575f0133681687a90.tar.gz nixpkgs-3e68106afd95df012ddb548575f0133681687a90.tar.bz2 nixpkgs-3e68106afd95df012ddb548575f0133681687a90.tar.lz nixpkgs-3e68106afd95df012ddb548575f0133681687a90.tar.xz nixpkgs-3e68106afd95df012ddb548575f0133681687a90.tar.zst nixpkgs-3e68106afd95df012ddb548575f0133681687a90.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/archivers/zpaq/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/audio/playerctl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/graphics/wkhtmltopdf/default.nix | 116 | ||||
-rw-r--r-- | pkgs/tools/misc/tldr/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/networking/snabb/default.nix (renamed from pkgs/tools/networking/snabbswitch/default.nix) | 18 | ||||
-rw-r--r-- | pkgs/tools/system/rsyslog/default.nix | 8 |
8 files changed, 116 insertions, 70 deletions
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 011793248cd..ed0cd808634 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="707"; + version="708"; name="${baseName}-${version}"; - hash="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; - url="http://mattmahoney.net/dc/zpaq707.zip"; - sha256="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3"; + hash="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6"; + url="http://mattmahoney.net/dc/zpaq708.zip"; + sha256="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6"; }; in stdenv.mkDerivation { diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 0e2b11a1f06..bd5a6b1d592 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -2,14 +2,14 @@ pkgconfig, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "playerctl"; - version = "0.4.2"; + name = "playerctl-${version}"; + version = "0.5.0"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "0dy6wc7qr00p53hlhpbg9x40w4ag95r2i7r1nsyb4ym3wzrvskzh"; + sha256 = "0b4pg5pwblgbf6kvvynzh9dshfikxy5c2ks7733n7wza5wkpgmng"; }; buildInputs = [ diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 89ea0e94444..bcb7803785b 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,72 +1,114 @@ -{ stdenv, fetchgit, qt4, fontconfig, freetype, libpng, zlib, libjpeg +{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg , openssl, libX11, libXext, libXrender, overrideDerivation }: stdenv.mkDerivation rec { - version = "0.12.2.4"; + version = "0.12.3.2"; name = "wkhtmltopdf-${version}"; - src = fetchgit { - url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git"; - rev = "refs/tags/${version}"; - sha256 = "0g96vgi3s633j4myjfzakkyiml1zspvdvbc0q1vhw8fp5n1xdknm"; - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "wkhtmltopdf"; + repo = "wkhtmltopdf"; + rev = "${version}"; + sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s"; }; wkQt = overrideDerivation qt4 (deriv: { - name = "qt-mod-4.8.6"; + name = "qt-mod-4.8.7"; enableParallelBuilding = true; - src = fetchgit { - url = "https://github.com/wkhtmltopdf/qt.git"; - rev = "48e71c19c7fc67517fb3dca6d42eacb57341c9ba"; # From git submodule spec in wkhtml repo. - sha256 = "1ygr7g3k900zjf54ji6kkfppqnxaqwbh8npr53g2krdw3bmny6fx"; + src = fetchFromGitHub { + owner = "wkhtmltopdf"; + repo = "qt"; + rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo. + sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23"; }; configureFlags = '' - -v -no-separate-debug-info -release -confirm-license -opensource - -qdbus -glib -dbus-linked -openssl-linked + -dbus-linked + -glib + -no-separate-debug-info + -openssl-linked + -qdbus + -v '' + # This is taken from the wkhtml build script that we don't run '' - -fast - -static + -confirm-license -exceptions - -xmlpatterns - -webkit - -system-zlib - -system-libpng - -system-libjpeg + -fast + -graphicssystem raster + -iconv + -largefile + -no-3dnow + -no-accessibility + -no-audio-backend + -no-avx + -no-cups + -no-dbus + -no-declarative + -no-glib + -no-gstreamer + -no-gtkstyle + -no-icu + -no-javascript-jit -no-libmng -no-libtiff - -no-accessibility - -no-stl - -no-qt3support + -nomake demos + -nomake docs + -nomake examples + -nomake tests + -nomake tools + -nomake translations + -no-mitshm + -no-mmx + -no-multimedia + -no-nas-sound + -no-neon + -no-nis + -no-opengl + -no-openvg + -no-pch -no-phonon -no-phonon-backend - -no-opengl - -no-declarative + -no-qt3support + -no-rpath + -no-scripttools + -no-sm -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 - -no-mmx - -no-3dnow -no-sse -no-sse2 - -no-multimedia - -nomake demos - -nomake docs - -nomake examples - -nomake tools - -nomake tests - -nomake translations + -no-sse3 + -no-sse4.1 + -no-sse4.2 + -no-ssse3 + -no-stl + -no-xcursor + -no-xfixes + -no-xinerama + -no-xinput + -no-xkb + -no-xrandr + -no-xshape + -no-xsync + -opensource + -openssl + -release + -static + -system-libjpeg + -system-libpng + -system-zlib + -webkit + -xmlpatterns ''; }); buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl - libX11 libXext libXrender - ]; + libX11 libXext libXrender + ]; configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index f223a97520b..39a7dc25c09 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "tldr-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { - sha256 = "0hxkrzp5njhy7c19v8i3svcb148f1jni7dlv36gc1nmcrz5izsiz"; + sha256 = "1dyvmxdxm92bfs5i6cngk8isa65qp6xlpim4yizs5rnm0rynf9kr"; rev = "v${version}"; repo = "tldr-cpp-client"; owner = "tldr-pages"; @@ -14,13 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl clang libzip ]; nativeBuildInputs = [ pkgconfig ]; - preConfigure = '' - cd src - ''; - - installPhase = '' - install -Dm755 {.,$out/bin}/tldr - ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Simplified and community-driven man pages"; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 93ab1266c6b..d2e2215831b 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -6,7 +6,9 @@ let pn = "network-manager-applet"; major = "1.0"; - version = networkmanager.version; + # With version 1.0.12 of NM, we are no longer in sync + # version = "${networkmanager.version}.10"; + version = "${major}.10"; in stdenv.mkDerivation rec { @@ -14,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "1yj0m6fb9v12d0di0rfmk3hx1vmygjkiff2c476rf792sbh56kax"; + sha256 = "1szh5jyijxm6z55irkp5s44pwah0nikss40mx7pvpk38m8zaqidh"; }; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c23b818e048..7403490e58f 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,20 +2,24 @@ , udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused }: +, ethtool, gnused, coreutils, file, inetutils }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.0.6"; + version = "1.0.12"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz"; - sha256 = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd"; + sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; }; preConfigure = '' - substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl + substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname + substituteInPlace configure --replace /usr/bin/file ${file}/bin/file + substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe + substituteInPlace data/84-nm-drivers.rules \ + --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ --replace /bin/sh ${stdenv.shell} \ --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ diff --git a/pkgs/tools/networking/snabbswitch/default.nix b/pkgs/tools/networking/snabb/default.nix index f7cd1a4300a..8ba9cfa6dad 100644 --- a/pkgs/tools/networking/snabbswitch/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, bash, makeWrapper, git, mariadb, diffutils }: +{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools }: stdenv.mkDerivation rec { name = "snabb-${version}"; - version = "2015.12"; + version = "2016.04"; - src = fetchurl { - url = "https://github.com/SnabbCo/snabbswitch/archive/v${version}.tar.gz"; - sha256 = "1949a6d3hqdr2hdfmrr1na9gvjdwdahadbhmvz2pg7azmpq6ssmr"; + src = fetchFromGitHub { + owner = "snabbco"; + repo = "snabb"; + rev = "v${version}"; + sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx"; }; buildInputs = [ makeWrapper ]; @@ -18,13 +20,15 @@ stdenv.mkDerivation rec { for f in $(find src/program/snabbnfv/ -type f); do substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" done + + # We need a way to pass $PATH to the scripts + sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; installPhase = '' mkdir -p $out/bin cp src/snabb $out/bin - - wrapProgram $out/bin/snabb --prefix PATH : "${ lib.makeBinPath [ git mariadb diffutils ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index e19dbb02847..f3e6b15ed2c 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages +{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null @@ -11,18 +11,18 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.14.0"; + name = "rsyslog-8.17.0"; src = fetchurl { url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1hp7ga543m6vhijcnjb4z8v26ddjgypk1lh6km1cvxc45cfmnfs4"; + sha256 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc"; }; #patches = [ ./fix-gnutls-detection.patch ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql + fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis |