diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-16 19:02:37 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-16 19:02:37 +0100 |
commit | e962a3c95f7d3ee9226d45b9565fb702c5d82cae (patch) | |
tree | d3b6a6a99b9fb4bd36e21fb852538722fd6eedec /pkgs/tools | |
parent | 55cc7700e968001c9ac79190fbcf25ed3620680a (diff) | |
parent | 19a9099eb25795a8caa408f842a5254920157456 (diff) | |
download | nixlib-e962a3c95f7d3ee9226d45b9565fb702c5d82cae.tar nixlib-e962a3c95f7d3ee9226d45b9565fb702c5d82cae.tar.gz nixlib-e962a3c95f7d3ee9226d45b9565fb702c5d82cae.tar.bz2 nixlib-e962a3c95f7d3ee9226d45b9565fb702c5d82cae.tar.lz nixlib-e962a3c95f7d3ee9226d45b9565fb702c5d82cae.tar.xz nixlib-e962a3c95f7d3ee9226d45b9565fb702c5d82cae.tar.zst nixlib-e962a3c95f7d3ee9226d45b9565fb702c5d82cae.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/gtk-vnc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/bluetooth/blueman/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/graphviz/2.0.nix | 40 | ||||
-rw-r--r-- | pkgs/tools/misc/aspcud/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/toxvpn/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixops/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixops/generic.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixops/unstable.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/security/ecryptfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/syslog-ng-incubator/default.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/system/syslog-ng/default.nix | 51 |
13 files changed, 81 insertions, 94 deletions
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index b6185631551a..da269049b2ca 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -8,11 +8,11 @@ let inherit (pythonPackages) pygobject3 python; in stdenv.mkDerivation rec { name = "gtk-vnc-${version}"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "mirror://gnome/sources/gtk-vnc/0.6/${name}.tar.xz"; - sha256 = "9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433"; + url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.strings.substring 0 3 version}/${name}.tar.xz"; + sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw"; }; buildInputs = [ diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 1c1085ff8146..508fc7810690 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 , obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp -, hicolor_icon_theme , withPulseAudio ? true, libpulseaudio }: +, hicolor_icon_theme, librsvg +, withPulseAudio ? true, libpulseaudio }: let binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ]; @@ -16,7 +17,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ]; - buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf + buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg gsettings_desktop_schemas hicolor_icon_theme ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix deleted file mode 100644 index 32cc283bc3c9..000000000000 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, libwebp -}: - -assert libpng != null && libjpeg != null && expat != null; - -stdenv.mkDerivation rec { - name = "graphviz-2.0"; - - src = fetchurl { - url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; - sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; - }; - - buildInputs = [ - pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc - libtool fontconfig pango gd libwebp - ]; - - hardeningDisable = [ "format" "fortify" ]; - - configureFlags = - [ "--with-pngincludedir=${libpng.dev}/include" - "--with-pnglibdir=${libpng.out}/lib" - "--with-jpegincludedir=${libjpeg.dev}/include" - "--with-jpeglibdir=${libjpeg.out}/lib" - "--with-expatincludedir=${expat.dev}/include" - "--with-expatlibdir=${expat.out}/lib" - "--with-ltdl-include=${libtool}/include" - "--with-ltdl-lib=${libtool.lib}/lib" - ] - ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; - - meta = { - description = "A program for visualising graphs"; - homepage = http://www.graphviz.org/; - branch = "2.0"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 577c0a33b3ee..f3d2cbca6516 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.9.0"; + version = "1.9.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; - sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; + sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0"; }; buildInputs = [ boost clasp cmake gringo re2c ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index efc73e5aa4f2..307b1a1592a5 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.02.04.1"; + version = "2017.02.16"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1aqca4mxgdjiv1qfnzqxx6lpwggfxsaahvvs235pyz0j3kywa4nj"; + sha256 = "21a5014f25d8ad2882999dd8cbf8cc2fd13c42116f5fe7b4781c982421ea59b0"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index 29b1ec5f39c4..05e833f2f8ef 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,31 +1,23 @@ -{ stdenv, fetchFromGitHub, libtoxcore, cmake, jsoncpp, lib, stdenvAdapters, libsodium, systemd, enableDebugging, libcap }: +{ stdenv, fetchFromGitHub, cmake, lib +, libtoxcore, jsoncpp, libsodium, systemd, libcap }: with lib; -let - libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: { - name = "libtoxcore-2016-09-07"; - src = fetchFromGitHub { - owner = "TokTok"; - repo = "toxcore"; - rev = "3521898b0cbf398d882496f6382f6c4ea1c23bc1"; - sha256 = "1jvf0v9cqwd4ssj1iarhgsr05qg48v7yvmbnn3k01jy0lqci8iaq"; - }; - }); - -in stdenv.mkDerivation { - name = "toxvpn-2016-09-09"; +stdenv.mkDerivation rec { + name = "toxvpn-${version}"; + version = "20161230"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "6e188f26fff8bddc1014ee3cc7a7423f9f344a09"; - sha256 = "1bshc6pzk7z7q7g17cwx9gmlcyzn4szqvdiy0ihbk2xmx9k31c6p"; + rev = "4b7498a5fae680484cb5779ac01fb08ad3089bdd"; + sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp"; }; - buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium libcap ] ++ optional (systemd != null) systemd; + buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd; + nativeBuildInputs = [ cmake ]; - cmakeFlags = optional (systemd != null) [ "-DSYSTEMD=1" ]; + cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; meta = with stdenv.lib; { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 6c5cb467a8fb..f37940c65c1e 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -37,12 +37,11 @@ in rec { nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils]; nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [mercurial]; nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out]; - nix-prefetch-zip = mkPrefetchScript "zip" ../../../build-support/fetchzip/nix-prefetch-zip [unzip curl.bin]; nix-prefetch-scripts = buildEnv { name = "nix-prefetch-scripts"; - paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn nix-prefetch-zip ]; + paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn ]; meta = with stdenv.lib; { description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index bba392e30e76..820bcbb9a35a 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.4"; + version = "1.5"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd"; + sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd"; }; }) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 87ed6295977f..4d67e8a5d6f5 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -23,8 +23,10 @@ python2Packages.buildPythonApplication { azure-mgmt-resource azure-mgmt-storage adal - pysqlite # Go back to builtin sqlite once Python 2.7.13 is released + # Go back to sqlite once Python 2.7.13 is released + pysqlite datadog + digital-ocean ]; doCheck = false; diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index fb5791be2397..820bcbb9a35a 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,10 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "2016-11-23"; + version = "1.5"; src = fetchurl { - # Hydra doesn't serve production outputs anymore :( - url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2"; - sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz"; + url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; + sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd"; }; }) diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index ab4867a4cc81..f8ef409813cc 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)" for file in $FILES; do substituteInPlace "$file" \ + --replace /bin/mount ${utillinux}/bin/mount \ + --replace /bin/umount ${utillinux}/bin/umount \ --replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \ --replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \ --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \ @@ -26,8 +28,6 @@ stdenv.mkDerivation rec { --replace /usr/bin/ecryptfs-setup-private $out/bin/ecryptfs-setup-private \ --replace /sbin/cryptsetup ${cryptsetup}/sbin/cryptsetup \ --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \ - --replace /bin/mount ${utillinux}/bin/mount \ - --replace /bin/umount ${utillinux}/bin/umount \ --replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \ --replace /bin/bash ${bash}/bin/bash done diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 004b2b58fa37..b72673167bc3 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng -, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc +, eventlog, perl, python, yacc, protobufc, libivykis }: stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "141106-54179c5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "balabit"; repo = "syslog-ng-incubator"; - rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a"; - sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam"; + rev = name; + sha256 = "00j123ya0xfj1jicaqnk1liffx07mhhf0r406pabxjjj97gy8nlk"; }; + nativeBuildInputs = [ pkgconfig autoreconfHook yacc ]; + buildInputs = [ - autoreconfHook pkgconfig glib syslogng eventlog perl python - yacc riemann_c_client libivykis protobufc + glib syslogng eventlog perl python protobufc libivykis ]; configureFlags = [ - "--without-ivykis" "--with-module-dir=$(out)/lib/syslog-ng" ]; @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; platforms = platforms.linux; + broken = true; # does not work with our new syslog-ng version yet }; } diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 7c7d5df4df8f..4e1fb6719573 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,29 +1,62 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl -, riemann_c_client, protobufc, pcre, yacc }: +{ stdenv, fetchurl, openssl, libcap, curl, which +, eventlog, pkgconfig, glib, python, systemd, perl +, riemann_c_client, protobufc, pcre, libnet +, json_c, libuuid, libivykis, mongoc, rabbitmq-c }: -stdenv.mkDerivation rec { - name = "syslog-ng-${version}"; +let + pname = "syslog-ng"; +in - version = "3.6.2"; +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "3.9.1"; src = fetchurl { - url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg"; + url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; + sha256 = "05qaqw115py5iz55vmc0j1xcwcpr8wa9vpmbixhr1rqaamm8ay2n"; }; - buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ]; + nativeBuildInputs = [ pkgconfig which ]; + + buildInputs = [ + libcap + curl + openssl + eventlog + glib + perl + python + systemd + riemann_c_client + protobufc + pcre + libnet + json_c + libuuid + libivykis + mongoc + rabbitmq-c + ]; configureFlags = [ + "--enable-manpages" "--enable-dynamic-linking" "--enable-systemd" + "--with-ivykis=system" + "--with-librabbitmq-client=system" + "--with-mongoc=system" + "--with-jsonc=system" + "--with-systemd-journal=system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + outputs = [ "out" "man" ]; + meta = with stdenv.lib; { homepage = "http://www.balabit.com/network-security/syslog-ng/"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; - maintainers = [ maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils fpletz ]; platforms = platforms.linux; }; } |