diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:46:33 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:46:33 +0200 |
commit | cff9e6429a4341e924594f5e057b03ca8101b314 (patch) | |
tree | f8c1a31c9ad11b4c417b9c331747f3b3dc47bdf4 /pkgs/tools | |
parent | a6055b7d8705d3c3a008e67cde1d43cf5727f76b (diff) | |
parent | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools')
29 files changed, 365 insertions, 164 deletions
diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix index 288a2a31ed05e..97abeadffc095 100644 --- a/pkgs/tools/archivers/ctrtool/default.nix +++ b/pkgs/tools/archivers/ctrtool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ctrtool"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { - owner = "profi200"; + owner = "jakcron"; repo = "Project_CTR"; - rev = version; - sha256 = "1l6z05x18s1crvb283yvynlwsrpa1pdx1nbijp99plw06p88h4va"; + rev = "v${version}"; + sha256 = "1n3j3fd1bqd39v5bdl9mhq4qdrcl1k4ib1yzl3qfckaz3y8bkrap"; }; sourceRoot = "source/ctrtool"; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 584a2dc46f746..6c587f5cc5c68 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.14.4"; + version = "8.14.5"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0k53yf8plkkwsgg2vk468fkhvvwxnz5jk77n1159l0g362k36p0n"; + sha256 = "1i6db49khqy8bqg21cn90b1fvyw8mh1asdswzssr6dr2g8bhdwmq"; }; configureFlags = [ diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index e9727e101a06a..572c66a01d6af 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.06.14"; + version = "2019.08.02"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "1z503k2j6504h4p205q7wjrvh5x9jhkvsapfz322m3r905l2vc2b"; + sha256 = "1iz4m86lc4nyf312qk749kgvq60g6x1zn2y70859g16ki16mk8m3"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 02b37784eaa96..e5e26169b7453 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" - ]; + ] ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"; installFlags = [ "logdir=\${out}/logdir" diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index 2fd67765aaf39..be8746932cafc 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -1,35 +1,33 @@ -{ stdenv, fetchFromGitHub, openssl, coreutils, which }: +{ stdenv, fetchFromGitHub +, openssl +, pandoc +, which +}: stdenv.mkDerivation rec { - - name = "${pname}-${version}"; pname = "bdsync"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "TargetHolding"; repo = pname; rev = "v${version}"; - sha256 = "144hlbk3k29l7sja6piwhd2jsnzzsak13fcjbahd6m8yimxyb2nf"; + sha256 = "11grdyc6fgw93jvj965awsycqw5qbzsdys7n8farqnmya8qv8gac"; }; + nativeBuildInputs = [ pandoc which ]; + buildInputs = [ openssl ]; + postPatch = '' patchShebangs ./tests.sh patchShebangs ./tests/ ''; - buildInputs = [ openssl coreutils which ]; - doCheck = true; - checkPhase = '' - make test - ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - cp bdsync $out/bin/ - cp bdsync.1 $out/share/man/man1/ + install -Dm755 bdsync -t $out/bin/ + install -Dm644 bdsync.1 -t $out/share/man/man1/ ''; meta = with stdenv.lib; { @@ -39,5 +37,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; - } diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 89016b3ff40ff..830e5f10ef6d4 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; + makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + meta = { homepage = http://zsync.moria.org.uk/; description = "File distribution system using the rsync algorithm"; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 73227b3d9f037..1e89b5729c705 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.104"; + version = "3.0.105"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "057xg7zy872w4hczk9b9ckmqyah3qhgysvxddqizr204cyadicxh"; + sha256 = "0wphpdll0j4i6d4yxykaz2bamv83y0sj7j3cfv4br1zamdyprfwx"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 679704197c65d..b66257f442ea1 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -2,7 +2,7 @@ , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText , libXdmcp, libXau, lib, openssl }: let - version = "2.1.0"; + version = "2.1.1"; in stdenv.mkDerivation rec { name = "argyllcms-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "02zxy6ipp84hrd1p5nspp3f9dzphr0qwlq8s557jn746cf866bv3"; + sha256 = "0zq3fipky44xg536kdhg9bchi6s9ka7n1q73fwf9ja766s8rj99m"; # The argyllcms web server doesn't like curl ... curlOpts = "--user-agent 'Mozilla/5.0'"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 2b2cc1a349920..2ee6944eeb3bd 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -12,14 +12,14 @@ let in stdenv.mkDerivation rec { - name = "ibus-typing-booster-${version}"; - version = "2.6.2"; + pname = "ibus-typing-booster"; + version = "2.6.4"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "0013njl539knp78iciv860fkpl15bkwarjwd2vjrmr5dbb0h15yc"; + sha256 = "1k074y9439w8v6s71i7hhmkq9bgkl836y2a409rx3mb73vidadjr"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 2bde876c68c1b..930d4dfaabace 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -30,7 +30,12 @@ buildPythonApplication rec { --replace "data_files = *.rst, *.txt" "" ''; - buildInputs = [ httpretty pytest_3 pytestcov ]; + buildInputs = [ httpretty pytest pytestcov ]; + + preCheck = '' + # fix compatibility with pytest 4 + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + ''; propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix new file mode 100644 index 0000000000000..7b275220c1976 --- /dev/null +++ b/pkgs/tools/misc/fffuu/default.nix @@ -0,0 +1,51 @@ +{ mkDerivation, haskellPackages, fetchFromGitHub, lib }: + +mkDerivation rec { + pname = "fffuu"; + version = "unstable-2018-05-26"; + + src = fetchFromGitHub { + owner = "diekmann"; + repo = "Iptables_Semantics"; + rev = "e0a2516bd885708fce875023b474ae341cbdee29"; + sha256 = "1qc7p44dqja6qrjbjdc2xn7n9v41j5v59sgjnxjj5k0mxp58y1ch"; + }; + + postPatch = '' + substituteInPlace haskell_tool/fffuu.cabal \ + --replace "containers >=0.5 && <0.6" "containers >= 0.6" \ + --replace "optparse-generic >= 1.2.3 && < 1.3" "optparse-generic >= 1.2.3" + ''; + + preCompileBuildDriver = '' + cd haskell_tool + ''; + + isLibrary = false; + + isExecutable = true; + + # fails with sandbox + doCheck = false; + + libraryHaskellDepends = with haskellPackages; [ + base + containers + split + parsec + optparse-generic + ]; + + executableHaskellDepends = with haskellPackages; [ base ]; + + testHaskellDepends = with haskellPackages; [ + tasty + tasty-hunit + tasty-golden + ]; + + description = "Fancy Formal Firewall Universal Understander"; + homepage = https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.marsam ]; +} diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix new file mode 100644 index 0000000000000..a12fa04c5fce2 --- /dev/null +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, curl +, libimobiledevice +, libirecovery +, libzip +, libusbmuxd +}: + +stdenv.mkDerivation rec { + pname = "idevicerestore"; + version = "2019-02-14"; + + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "8a882038b2b1e022fbd19eaf8bea51006a373c06"; + sha256 = "17lisl7ll43ixl1zqwchn7jljrdyl2p9q99w30i6qaci71mas37m"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + curl + libimobiledevice + libirecovery + libzip + libusbmuxd + # Not listing other dependencies specified in + # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20 + # because they are inherited `libimobiledevice`. + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libimobiledevice/idevicerestore; + description = "Restore/upgrade firmware of iOS devices"; + longDescription = '' + The idevicerestore tool allows to restore firmware files to iOS devices. + + It is a full reimplementation of all granular steps which are performed during + restore of a firmware to a device. + + In general, upgrades and downgrades are possible, however subject to + availability of SHSH blobs from Apple for signing the firmare files. + + To restore a device to some firmware, simply run the following: + $ sudo idevicerestore -l + + This will download and restore a device to the latest firmware available. + ''; + license = licenses.lgpl21Plus; + # configure.ac suggests it should work for darwin and mingw as well but not tried yet + platforms = platforms.linux; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 760f56726fab9..d79e480327c21 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, psmisc }: stdenv.mkDerivation rec { name = "tmpwatch-2.11"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; + configureFlags="--with-fuser=${psmisc}/bin/fuser"; + meta = with stdenv.lib; { homepage = https://fedorahosted.org/tmpwatch/; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index e571f53339902..1fe58f9450411 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.08.02"; + version = "2019.08.13"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "101b6jrf6ckbxrn76ppvgdyrb25p7d247kn8qgq7n476sfnkfg2p"; + sha256 = "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 6aa357dacb64e..afa6cef1524dd 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive -, pkgconfig, gettext, libssl }: +, pkgconfig, gettext, libssl, txt2man }: stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.3"; + version = "2.17.5"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "0kdd2y92plv240ba2j3xrm0f8xygvm1ijghnric4whsnxvmgym7h"; + sha256 = "0kwfbwh9g2227icgykgwa057vll5rkgac3df0pby530bivqzzzlw"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive ]; + nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; buildInputs = [ gettext libssl ]; - installFlags = [ "ETCDIR=$(out)/etc" ]; + installFlags = [ "ETCDIR=${placeholder "out"}/etc" ]; meta = with stdenv.lib; { description = "Console downloading program with some features for parallel connections for faster downloading"; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index fbf7efb693393..d2ae24c8a7101 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -3,6 +3,7 @@ let # keep this in sync with github.com/DataDog/agent-payload dependency payloadVersion = "4.7.1"; + python = pythonPackages.python; in buildGoPackage rec { name = "datadog-agent-${version}"; @@ -26,8 +27,6 @@ in buildGoPackage rec { goDeps = ./datadog-agent-deps.nix; goPackagePath = "github.com/${owner}/${repo}"; - # Explicitly set this here to allow it to be overridden. - python = pythonPackages.python; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ systemd ]; diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix deleted file mode 100644 index 81a43d672fdc7..0000000000000 --- a/pkgs/tools/networking/infiniband-diags/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core -, opensm, perl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "infiniband-diags-${version}"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "linux-rdma"; - repo = "infiniband-diags"; - rev = version; - sha256 = "0dhidwscvv8rffgjl6ygrz7daf61wbgabzhb6v8wh5kccml90mxi"; - }; - - nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; - - buildInputs = [ rdma-core opensm perl ]; - - preConfigure = '' - export CFLAGS="-I${opensm}/include/infiniband" - ./autogen.sh - ''; - - configureFlags = [ "--with-perl-installdir=\${out}/${perl.libPrefix}" "--sbindir=\${out}/bin" ]; - - postInstall = '' - rmdir $out/var/run $out/var - ''; - - postFixup = '' - for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do - echo "wrapping $pls" - wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}" - done - ''; - - meta = with stdenv.lib; { - description = "Utilities designed to help configure, debug, and maintain infiniband fabrics"; - homepage = http://linux-rdma.org/; - license = licenses.bsd2; # Or GPL 2 - maintainers = [ maintainers.aij ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index eda93c82cce85..38b2aa531e67e 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcrcon-${version}"; - version = "0.0.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Tiiffi"; repo = "mcrcon"; rev = "v${version}"; - sha256 = "1pwr1cjldjy8bxqpp7w03nvdpw8l4vqfnk6w6b3mf0qpap1k700z"; + sha256 = "0as60cgl8sflykmwihc6axy1hzx6gjgjav6c7mvlbsc43dv8fs51"; }; buildPhase = '' diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix new file mode 100644 index 0000000000000..1e5bd6b66f5d8 --- /dev/null +++ b/pkgs/tools/networking/ofono/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchgit +, autoreconfHook +, pkgconfig +, glib +, dbus +, ell +, systemd +, bluez +, mobile-broadband-provider-info +}: + +stdenv.mkDerivation rec { + pname = "ofono"; + version = "1.30"; + + outputs = [ "out" "dev" ]; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; + rev = version; + sha256 = "1qzysmzpgbh6zc3x9xh931wxcazka9wwx727c2k66z9gal2n6n66"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + glib + dbus + ell + systemd + bluez + mobile-broadband-provider-info + ]; + + configureFlags = [ + "--with-dbusconfdir=${placeholder ''out''}/etc/dbus-1/system.d" + "--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system" + "--enable-external-ell" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Infrastructure for building mobile telephony (GSM/UMTS) applications"; + homepage = https://01.org/ofono; + license = licenses.gpl2; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 03270ce878813..6a97abfab590d 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchurl, perl, ppp, iproute, which }: +{ stdenv, fetchurl, perl, ppp, iproute }: stdenv.mkDerivation rec { - name = "pptp-${version}"; + pname = "pptp"; version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/pptpclient/${name}.tar.gz"; + url = "mirror://sourceforge/pptpclient/${pname}-${version}.tar.gz"; sha256 = "1x2szfp96w7cag2rcvkdqbsl836ja5148zzfhaqp7kl7wjw2sjc2"; }; - patchPhase = - '' - sed -e 's/install -o root/install/' -i Makefile - ''; - preConfigure = - '' - makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ - BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ - PPPDIR=$out/etc/ppp ) - ''; + prePatch = '' + substituteInPlace Makefile --replace 'install -o root' 'install' + ''; - nativeBuildInputs = [ perl which ]; + preConfigure = '' + makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ + PPPDIR=$out/etc/ppp ) + ''; + + buildInputs = [ perl ]; + + postFixup = '' + patchShebangs $out + ''; meta = with stdenv.lib; { description = "PPTP client for Linux"; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 26e932fc5d5ef..254e5d3e5d321 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "shadowsocks-libev"; - version = "3.3.0"; + version = "3.3.1"; # Git tag includes CMake build files which are much more convenient. src = fetchFromGitHub { owner = "shadowsocks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0f6fk7p49b1m78v4ipacbl522nma9b3qzrvihzp2mmsa6j3cysgr"; + sha256 = "0l15mbwlzx446rn5cix9f1726by62807bhnxkzknd41j7r937vyv"; fetchSubmodules = true; }; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index f75bf6bf16255..3299ab8b63b67 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: +{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }: stdenv.mkDerivation { name = "DisnixWebService-0.8"; @@ -11,7 +11,14 @@ stdenv.mkDerivation { AXIS2_LIB = "${axis2}/lib"; AXIS2_WEBAPP = "${axis2}/webapps/axis2"; DBUS_JAVA_LIB = "${dbus_java}/share/java"; - patchPhase = '' + patches = [ + # Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged + (fetchpatch { + url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch"; + sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn"; + }) + ]; + prePatch = '' sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ scripts/disnix-soap-client diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 4e2c8a7b3a7a5..9e5a3f4d6978d 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -1,30 +1,25 @@ -{ lib, python3Packages, fetchFromGitLab }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.3.4"; + version = "0.4.1"; - src = fetchFromGitLab { - owner = "reuse"; - repo = "reuse"; + src = fetchFromGitHub { + owner = "fsfe"; + repo = "reuse-tool"; rev = "v${version}"; - sha256 = "07acv02wignrsfhym2i3dhlcs501yj426lnff2cjampl6m5cgsk3"; + sha256 = "0gwipwikhxsk0p8wvdl90xm7chfi2jywb1namzznyymifl1vsbgh"; }; - propagatedBuildInputs = [ chardet debian pygit2 ]; + propagatedBuildInputs = [ debian license-expression requests ]; - checkInputs = [ pytest jinja2 ]; - - # Some path based tests are currently broken under nix - checkPhase = '' - pytest tests -k "not test_lint_none and not test_lint_ignore_debian and not test_lint_twice_path" - ''; + checkInputs = [ pytest ]; meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; - license = with licenses; [ cc-by-sa-40 cc0 gpl3 ]; + license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3 ]; maintainers = [ maintainers.FlorianFranzen ]; }; } diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 6b1d8e6c4f88a..296080cbd8e74 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -21,6 +21,9 @@ pythonPackages.buildPythonApplication { --replace /usr/sbin/sendmail sendmail \ --replace /usr/bin/whois whois done + + substituteInPlace config/filter.d/dovecot.conf \ + --replace dovecot.service dovecot2.service ''; doCheck = false; diff --git a/pkgs/tools/security/sequoia-tool/default.nix b/pkgs/tools/security/sequoia-tool/default.nix deleted file mode 100644 index 00472c1a3aa4f..0000000000000 --- a/pkgs/tools/security/sequoia-tool/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitLab, rustPlatform, darwin -, pkgconfig, capnproto, clang, libclang, nettle, openssl, sqlite }: - -rustPlatform.buildRustPackage rec { - pname = "sequoia-tool"; - version = "0.9.0"; - - src = fetchFromGitLab { - owner = "sequoia-pgp"; - repo = "sequoia"; - rev = "v${version}"; - sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj"; - }; - - nativeBuildInputs = [ pkgconfig clang libclang ]; - buildInputs = [ capnproto nettle openssl sqlite ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - - LIBCLANG_PATH = libclang + "/lib"; - - cargoBuildFlags = [ "--package=sequoia-tool" ]; - - cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi"; - - meta = with stdenv.lib; { - description = "A command-line frontend for Sequoia, an implementation of OpenPGP"; - homepage = https://sequoia-pgp.org/; - license = licenses.gpl3; - maintainers = with maintainers; [ minijackson ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix new file mode 100644 index 0000000000000..5d9ffca69375e --- /dev/null +++ b/pkgs/tools/security/sequoia/default.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchFromGitLab, lib, darwin +, git, nettle, llvmPackages, cargo, rustc +, rustPlatform, pkgconfig, glib +, openssl, sqlite, capnproto +, ensureNewerSourcesForZipFilesHook, pythonSupport ? true, pythonPackages ? null +}: + +assert pythonSupport -> pythonPackages != null; + +rustPlatform.buildRustPackage rec { + pname = "sequoia"; + version = "0.9.0"; + + src = fetchFromGitLab { + owner = "sequoia-pgp"; + repo = pname; + rev = "v${version}"; + sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj"; + }; + + cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi"; + + nativeBuildInputs = [ + pkgconfig + cargo + rustc + git + llvmPackages.libclang + llvmPackages.clang + ensureNewerSourcesForZipFilesHook + ] ++ + lib.optionals pythonSupport [ pythonPackages.setuptools ] + ; + + checkInputs = lib.optionals pythonSupport [ + pythonPackages.pytest + pythonPackages.pytestrunner + ]; + + buildInputs = [ + openssl + sqlite + nettle + capnproto + ] + ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ] + ; + + makeFlags = [ + "PREFIX=${placeholder ''out''}" + ]; + + buildFlags = [ + "build-release" + ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + postPatch = '' + # otherwise, the check fails because we delete the `.git` in the unpack phase + substituteInPlace openpgp-ffi/Makefile \ + --replace 'git grep' 'grep -R' + # Without this, the check fails + substituteInPlace openpgp-ffi/examples/Makefile \ + --replace '-O0 -g -Wall -Werror' '-g' + substituteInPlace ffi/examples/Makefile \ + --replace '-O0 -g -Wall -Werror' '-g' + ''; + + preInstall = lib.optionalString pythonSupport '' + export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" + '' + lib.optionalString (!pythonSupport) '' + export installFlags="PYTHON=disable" + ''; + + # Don't use buildRustPackage phases, only use it for rust deps setup + configurePhase = null; + buildPhase = null; + doCheck = true; + checkPhase = null; + installPhase = null; + + meta = with stdenv.lib; { + description = "A cool new OpenPGP implementation"; + homepage = "https://sequoia-pgp.org/"; + license = licenses.gpl3; + maintainers = with maintainers; [ minijackson doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index e77d44875820a..5c9b0292e5c04 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchFromGitHub, pkgconfig, popt }: +{ stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }: stdenv.mkDerivation rec { name = "efivar-${version}"; @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1z2dw5x74wgvqgd8jvibfff0qhwkc53kxg54v12pzymyibagwf09"; }; + patches = [ + (fetchurl { + name = "r13y.patch"; + url = "https://patch-diff.githubusercontent.com/raw/rhboot/efivar/pull/133.patch"; + sha256 = "038cwldb8sqnal5l6mhys92cqv8x7j8rgsl8i4fiv9ih9znw26i6"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt ]; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index c1345fc9537fe..87306a61e0d45 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.9.0"; + version = "3.10.5"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0326fh72nihq4svgw7zvacij193ya66p102y1c7glpjq75kcx6a1"; + sha256 = "0bxz1a0ak6b6zj5xpkzwy8ikxf45kkxdj64sf4ilj43yaqicm0bw"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 1435fd2bde0eb..e8e6a76a7a264 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,23 +1,26 @@ { buildGoPackage, fetchFromGitHub, lib }: -buildGoPackage -rec { +buildGoPackage rec { pname = "cri-tools"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { - owner = "kubernetes-incubator"; + owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "0v5i7shbn7b6av1d2z6r5czyjdll9i7xim9975lpnz1136xb6li7"; + sha256 = "03fhddncwqrdyxz43m3bak9dlrsqzibqqja3p94nic4ydk2hry62"; }; - goPackagePath = "github.com/kubernetes-incubator/cri-tools"; - subPackages = [ "cmd/crictl" "cmd/critest" ]; + goPackagePath = "github.com/kubernetes-sigs/cri-tools"; - meta = { + buildPhase = '' + pushd go/src/${goPackagePath} + make + ''; + + meta = with lib; { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; homepage = https://github.com/kubernetes-sigs/cri-tools; license = lib.licenses.asl20; + maintainers = with maintainers; [ saschagrunert ]; }; } - |