diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
commit | dc33419285c09720de70fe8edf5434736a2462b9 (patch) | |
tree | 58b20bca2075a06ad5b720c6ebf0dc55635e6b10 /pkgs/tools | |
parent | b59847b848079ba872e18b5f0683c1bff7e924ba (diff) | |
parent | b56c66e7e8565b16a4964840ef40243e07f78e84 (diff) | |
download | nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.gz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.bz2 nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.lz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.xz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.zst nixlib-dc33419285c09720de70fe8edf5434736a2462b9.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/backup/borg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/hactool/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/moosefs/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/filesystems/netatalk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/yafaray-core/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/chafa/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/cowsay/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/graylog/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/graylog/plugins.nix | 58 | ||||
-rw-r--r-- | pkgs/tools/misc/sdate/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/isync/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/privoxy/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/tinyproxy/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/bitwarden_rs/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/snippetpixie/default.nix | 4 |
15 files changed, 77 insertions, 26 deletions
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index de69a8db3de1..900903675860 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.11"; + version = "1.1.13"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "190gjzx83b6p64nqj840x382dgz9gfv0gm7wj585lnkrpa90j29n"; + sha256 = "089q3flmwbz7dc28zlscwylf64kgck3jf1n6lqpwww8hlrk8cjhn"; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index c0bcca2d8cdc..d34ca73556bb 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "hactool"; version = "1.4.0"; src = fetchFromGitHub { owner = "SciresM"; repo = "hactool"; - rev = "1.4.0"; + rev = version; sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d"; }; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index af09cafe1dea..8ceb3d7c0aac 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -5,7 +5,7 @@ , fuse , pkgconfig , libpcap -, zlib +, zlib }: stdenv.mkDerivation rec { @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { [ fuse libpcap zlib ]; postInstall = '' + substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\"" wrapProgram $out/sbin/mfscgiserv \ --prefix PATH ":" "${python}/bin" ''; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index faa0a1ebfe86..f7732cd76fd7 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -3,7 +3,7 @@ , ed, glibc, libevent }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "netatalk-3.1.12"; src = fetchurl { diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index 8e15cd0d3280..a02a97739bad 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, opencv, zlib , libxml2, freetype, libjpeg, libtiff, swig, openexr , ilmbase, boost165 -, withPython ? true, python35 +, withPython ? true, python3 }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig boost165 opencv zlib libxml2 freetype libjpeg libtiff swig openexr ilmbase - ] ++ stdenv.lib.optional withPython python35; + ] ++ stdenv.lib.optional withPython python3; meta = with stdenv.lib; { description = "A free, open source raytracer"; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 9e1671aec9de..9afdd93ad0a5 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { version = "1.4.1"; pname = "chafa"; diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index d2a27fa9cb0b..972b2997d810 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { version = "3.03+dfsg2"; pname = "cowsay"; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index df645789c582..17ea28724782 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.5"; + version = "3.3.0"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1sbws735w0qww3nj8ai105a743nyrf1iprmcl89w5h8yirq2z1r9"; + sha256 = "1ydplg2lifql5s4bh64a4lwqp1q5vrvbljhn1pnxv9vz0ab73q1k"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 1f351b662038..5dbcc7479e5d 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -38,10 +38,10 @@ in { auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "3.1.0"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2"; + sha256 = "1g47hlld8vzicd47b5i9n2816rbrhv18vjq8gp765c7mdg4a2jn8"; }; meta = { homepage = "https://github.com/Graylog2/graylog-plugin-auth-sso"; @@ -61,6 +61,25 @@ in { description = "Message filter plugin can be used to do DNS lookups for the source field in Graylog messages"; }; }; + enterprise-integrations = glPlugin rec { + name = "graylog-enterprise-integrations-${version}"; + pluginName = "graylog-plugin-enterprise-integrations"; + version = "3.3.0"; + src = fetchurl { + url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz"; + sha256 = "1480ccii3nzvm0jp1xm2iddgc789zcwbgd19201q7p3v0ph02yj8"; + }; + installPhase = '' + mkdir -p $out/bin + tar --strip-components=2 -xf $src + cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar + ''; + meta = { + homepage = "https://docs.graylog.org/en/3.2/pages/integrations.html#enterprise"; + description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)"; + license = stdenv.lib.licenses.unfree; + }; + }; filter-messagesize = glPlugin rec { name = "graylog-filter-messagesize-${version}"; pluginName = "graylog-plugin-filter-messagesize"; @@ -74,6 +93,24 @@ in { description = "Prints out all messages that have an estimated size crossing a configured threshold during processing"; }; }; + integrations = glPlugin rec { + name = "graylog-integrations-${version}"; + pluginName = "graylog-plugin-integrations"; + version = "3.3.0"; + src = fetchurl { + url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz"; + sha256 = "08cpxviwk2p4zsgbr2h3symr88rf3fjfz1kkg4iglvdc5mqf71xx"; + }; + installPhase = '' + mkdir -p $out/bin + tar --strip-components=2 -xf $src + cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar + ''; + meta = { + homepage = https://github.com/Graylog2/graylog-plugin-integrations; + description = "A collection of open source Graylog integrations that will be released together"; + }; + }; internal-logs = glPlugin rec { name = "graylog-internal-logs-${version}"; pluginName = "graylog-plugin-internal-logs"; @@ -142,10 +179,10 @@ in { pagerduty = glPlugin rec { name = "graylog-pagerduty-${version}"; pluginName = "graylog-plugin-pagerduty"; - version = "1.3.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1g63c6rm5pkz7f0d73wb2lmk4zm430jqnhihbyq112cm4i7ymglh"; + sha256 = "0xhcwfwn7c77giwjilv7k7aijnj9azrjbjgd0r3p6wdrw970f27r"; }; meta = { homepage = "https://github.com/graylog-labs/graylog-plugin-pagerduty"; @@ -178,6 +215,19 @@ in { description = "Can notify Slack or Mattermost channels about triggered alerts in Graylog (Alarm Callback)"; }; }; + snmp = glPlugin rec { + name = "graylog-snmp-${version}"; + pluginName = "graylog-plugin-snmp"; + version = "0.3.0"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1hkaklwzcsvqq45b98chwqxqdgnnbj4dg68agsll13yq4zx37qpp"; + }; + meta = { + homepage = https://github.com/graylog-labs/graylog-plugin-snmp; + description = "Graylog plugin to receive SNMP traps"; + }; + }; spaceweather = glPlugin rec { name = "graylog-spaceweather-${version}"; pluginName = "graylog-plugin-spaceweather"; diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 6c52aa217df6..06b5360086c1 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "sdate"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; - sha256 = "11irlbbhlzkg6y621smk351jl8ay3yjhl2j9hila0xa72hs4n7gz"; + sha256 = "1lfnsb8prac8rspnxcawd138jyhyivwf35rrmfvwq6dhsx23c6vy"; }; buildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 49efeac02a97..9ce1183d060c 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 331295ffd1f4..10a25d5bf8b2 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "privoxy"; version = "3.0.28"; diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 1a476676a258..7d3c49db7b79 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, asciidoc, libxml2, libxslt, docbook_xsl }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "tinyproxy"; version = "1.10.0"; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 6d3c4bccef9f..158485dc982f 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "0413yjbnj4k917x48h1gnj64kygbr6c1n55f23qkvj0hgbxpgssz"; + sha256 = "12mr7d0mjlh7za4nc3s7cizzbd6v0zfmd7q9s0f7pqz56vw5m21s"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "09747f9g7yyq9c8wbfdb3hwxii5xq23ynhba0vc01nhjpjyn0ksd"; + cargoSha256 = "0nacc8xvbkdzbyx4c17hdh03v9ykpis74pbpxkn6v95njw14wq53"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 863e4764b69b..991b496777c2 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "0jhc47g5x34c36y4d32lcn32bpw4axxf1sydawgy4886hmkvb6kf"; + sha256 = "0ml57j6jagqvjlpgn1bcyx08h71kcxalh69y03y2lj84x5ib8qz3"; }; nativeBuildInputs = [ |