diff options
Diffstat (limited to 'pkgs/tools')
224 files changed, 2222 insertions, 607 deletions
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index 4860311fa73..cbd76b2e7b7 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,7 +1,7 @@ { stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }: let pkgName = "dehydrated"; - version = "0.4.0"; + version = "0.5.0"; in stdenv.mkDerivation rec { name = pkgName + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "lukas2511"; repo = "dehydrated"; rev = "v${version}"; - sha256 = "0nxs6l5i6409dzgiyjn8cnzjcblwj4rqcpxxb766vcvb8d4kqwby"; + sha256 = "0ysfsz1ny3gcc4r9szrr09dg63zd7ppv6aih13wmai806yapwxrr"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 77451a6bc9e..029c09afdad 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -1,17 +1,18 @@ { lib, fetchFromGitHub, python }: python.pkgs.buildPythonApplication rec { - name = "gixy-${version}"; - version = "0.1.8"; + pname = "gixy"; + version = "0.1.9"; # package is only compatible with python 2.7 and 3.5+ disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27); + # fetching from GitHub because the PyPi source is missing the tests src = fetchFromGitHub { owner = "yandex"; repo = "gixy"; rev = "v${version}"; - sha256 = "0dg8j8pqlzdvmyfkphrizfqzggr64npb9mnm1dcwm6c3z6k2b0ii"; + sha256 = "11aps8a8xg1nlw36jgrmnaf38imfz2rj67wnlalrrsqb616xipcv"; }; postPatch = '' diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index bee9c53d02a..608a9e5a65b 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "nxproxy-${version}"; - version = "3.5.0.32"; + version = "3.5.0.33"; src = fetchurl { - sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm"; + sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74"; url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index ff9590c79a5..24e59a35553 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -5,10 +5,10 @@ python2Packages.buildPythonApplication rec { name = "salt-pepper-${version}"; - version = "0.5.0"; + version = "0.5.5"; src = fetchurl { url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz"; - sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck"; + sha256 = "1wj1k64ly6af6qsmiizlx32jxh23a37smd9wb57l5zl0x8sfqq1n"; }; doCheck = false; # no tests available diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index 9b3dee728eb..f7b6aaa76c6 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,11 +1,11 @@ { fetchurl, perl, stdenv }: stdenv.mkDerivation rec { - name = "sec-2.7.7"; + name = "sec-2.7.12"; src = fetchurl { url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz"; - sha256 = "116nn8fg24nwcimm8gcfp52bsgh1ckrspjr8sk4i0arvpl3d12m9"; + sha256 = "0f5a2nkd5cmg1rziizz2gmgdwb5dz99x9pbxw30p384rjh79zcaa"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 1c8d8367793..189035a8c8b 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }: +{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }: stdenv.mkDerivation rec { version = "0.5.4.12"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 intltool libxslt ]; + buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 6915f8a9071..0aaf018cb22 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 = "2018.02.07"; + version = "2018.02.22"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "16hdv114hs5agg288kpbijqw53wdiswjmprpbhy7kgdjnp9ijwxw"; + sha256 = "03ln05012yhlq8aalm00af6pidb44phmmidlc953453isfllg82a"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix index 70ae1f84643..ca41c8a9eb3 100644 --- a/pkgs/tools/audio/mpdas/default.nix +++ b/pkgs/tools/audio/mpdas/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mpdas-${version}"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "mpdas"; rev = version; - sha256 = "1i6i36jd582y3nm5plcrswqljf528hd23whp8zw06hwqnsgca5b6"; + sha256 = "0fcqc4w6iwbi1n3cllcgj0k61zffhqkbr8668myxap21m35x8y1r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 5540822c99b..24065f7308b 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.1.28"; + version = "2.1.30"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "1i8j15pmnn9cn6cd4dnp28qbisq8cl9l4y3chsmil4xqljr9fi5x"; + sha256 = "0l9zcw50zr081ddspl6vnh6d6cwyzgqzg7n5pq92dwbmd64qpz9p"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 4a51a65b406..931fcea4a44 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.8.2"; + version = "0.8.3"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "1prk8r0kmcscj79fc53a0qjvik6ygjr50xwnahs0amlyh03pyb46"; + sha256 = "0vbwbxly3p1wj25ai1xak1bmhibh2ilxl55gsbnaaq7pcznc3ad9"; }; buildPhase = '' diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix new file mode 100644 index 00000000000..96bbea4791e --- /dev/null +++ b/pkgs/tools/backup/rsbep/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, coreutils, gnused, gawk, fetchurl }: + +stdenv.mkDerivation rec { + name = "rsbep-${version}"; + version = "0.1.0"; + + src = fetchurl { + url = "https://www.thanassis.space/rsbep-0.1.0-ttsiodras.tar.bz2"; + sha256 = "1zji34kc9srxp0h1s1m7k60mvgsir1wrx1n3wc990jszfplr32zc"; + }; + + postFixup = '' + cd $out/bin + + # Move internal tool 'rsbep_chopper' to libexec + libexecDir=$out/libexec/rsbep + mkdir -p $libexecDir + mv rsbep_chopper $libexecDir + + # Fix store dependencies in scripts + path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gnused gawk ]}" + sed -i "2i$path" freeze.sh + sed -i "2i$path" melt.sh + + substituteInPlace freeze.sh --replace /bin/ls ls + + # Remove unneded binary + rm poorZFS.py + ''; + + meta = with lib; { + description = "Create resilient backups with Reed-Solomon error correction and byte-spreading"; + homepage = https://www.thanassis.space/rsbep.html; + license = licenses.gpl3; + maintainers = [ maintainers.earvstedt ]; + }; +} diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 71df4a1b5a5..394f3fe5b98 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp -, hicolor_icon_theme, librsvg, wrapGAppsHook, gobjectIntrospection +, hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: let @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "blueman-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; - sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9"; + sha256 = "1jl83z56c01ypvv98mxn74kpbv58yrccggp1rbmnw1dnvjxvjbic"; }; nativeBuildInputs = [ @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { pythonPackages.wrapPython wrapGAppsHook ]; - buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ] + buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor-icon-theme ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 53a193749d3..ffc7ee192c9 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex, dbus_libs }: +{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus_libs }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb glib dbus_glib bluez openobex dbus_libs ]; + buildInputs = [ libusb glib dbus-glib bluez openobex dbus_libs ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index ec5ca0706f4..e3a360818e6 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }: stdenv.mkDerivation rec { - name = "openobex-1.7.1"; + name = "openobex-1.7.2"; src = fetchurl { url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; - sha256 = "0mza0mrdrbcw4yix6qvl31kqy7bdkgxjycr0yx7yl089v5jlc9iv"; + sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index d62f2c25623..8223ba2be4b 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs -, vcdimager, wrapGAppsHook, hicolor_icon_theme }: +, libcanberra-gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs +, vcdimager, wrapGAppsHook, hicolor-icon-theme }: # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 @@ -20,8 +20,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; - buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs - hicolor_icon_theme + buildInputs = [ gtk3 libxml2 libnotify libcanberra-gtk3 libburn libisofs + hicolor-icon-theme gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ]; diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 31ce1a986fb..db1e1dbfd85 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "advancecomp-${version}"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "amadvance"; repo = "advancecomp"; rev = "v${version}"; - sha256 = "1lvrcxcxbxac47j0ml11nikx38zan7bbr3dfjssm52r5v4cmh8j9"; + sha256 = "1pd6czamamrd0ppk5a3a65hcgdlqwja98aandhqiajhnibwldv8x"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 4d7ee75c006..c558c9e8a32 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.12.6"; + version = "1.13.9"; name = "bindfs-${version}"; src = fetchurl { url = "http://bindfs.org/downloads/${name}.tar.gz"; - sha256 = "0s90n1n4rvpcg51ixr5wx8ixml1xnc7w28xlbnms34v19pzghm59"; + sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc"; }; dontStrip = true; diff --git a/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch b/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch new file mode 100644 index 00000000000..01aa194dddf --- /dev/null +++ b/pkgs/tools/filesystems/ceph/0002-fix-absolute-include-path.patch @@ -0,0 +1,19 @@ +diff -ru ceph/src/key_value_store/kv_flat_btree_async.cc ceph-copy/src/key_value_store/kv_flat_btree_async.cc +--- ceph/src/key_value_store/kv_flat_btree_async.cc 1980-01-02 00:00:00.000000000 +0100 ++++ ceph-copy/src/key_value_store/kv_flat_btree_async.cc 2018-02-13 21:49:59.232860487 +0100 +@@ -15,13 +15,13 @@ + #include "key_value_store/kv_flat_btree_async.h" + #include "key_value_store/kvs_arg_types.h" + #include "include/rados/librados.hpp" +-#include "/usr/include/asm-generic/errno.h" +-#include "/usr/include/asm-generic/errno-base.h" + #include "common/ceph_context.h" + #include "common/Clock.h" + #include "include/types.h" + + ++#include <asm-generic/errno.h> ++#include <asm-generic/errno-base.h> + #include <string> + #include <iostream> + #include <cassert> diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index a18051f9c12..32b85eaa681 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -86,12 +86,17 @@ let }; ceph-python-env = python2Packages.python.withPackages (ps: [ - ps.sphinx - ps.flask - ps.argparse - ps.cython - ps.setuptools - ps.pip + ps.sphinx + ps.flask + ps.argparse + ps.cython + ps.setuptools + ps.pip + # Libraries needed by the python tools + ps.Mako + ps.pecan + ps.prettytable + ps.webob ]); in @@ -103,11 +108,13 @@ stdenv.mkDerivation { patches = [ # ./ceph-patch-cmake-path.patch ./0001-kv-RocksDBStore-API-break-additional.patch + ] ++ optionals stdenv.isLinux [ + ./0002-fix-absolute-include-path.patch ]; nativeBuildInputs = [ cmake - pkgconfig which git + pkgconfig which git python2Packages.wrapPython (ensureNewerSourcesHook { year = "1980"; }) ]; @@ -122,6 +129,7 @@ stdenv.mkDerivation { ] ++ optionals hasKinetic [ optKinetic-cpp-client ]; + preConfigure ='' # rip off submodule that interfer with system libs @@ -149,6 +157,10 @@ stdenv.mkDerivation { "-DWITH_LIBCEPHFS=OFF" ]; + postFixup = '' + wrapPythonPrograms + ''; + enableParallelBuilding = true; outputs = [ "dev" "lib" "out" "doc" ]; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index e415f57e707..03da84f7c73 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "encfs-${version}"; - version = "1.9.2"; + version = "1.9.4"; src = fetchFromGitHub { - sha256 = "0isx7n4r8znk02464s0wvlzk6ry5mlnq3kgnd0rapnhjwdvwqr5y"; + sha256 = "1hp2l4yk7fsimlrrd6a675vigmyikd323l1n3mybcdng58skj2ag"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index e9d3df026b0..4594aa9370c 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hubicfuse-${version}"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "TurboGit"; repo = "hubicfuse"; rev = "v${version}"; - sha256 = "1y4n63bk9vd6n1l5psjb9xm9h042kw4yh2ni33z7agixkanajv1s"; + sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 681fc1c80ef..59d8e8aa438 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libaal}: -let version = "1.1.0"; in +let version = "1.2.1"; in stdenv.mkDerivation rec { name = "reiser4progs-${version}"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; - sha256 = "18bgv0wd75q53642x5dsk4g0mil1hw1zrp7a4xkb0pxx4bzjlbqg"; + sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7"; }; buildInputs = [libaal]; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 9d7e9eaee95..11d836e66bc 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "s3fs-fuse-${version}"; - version = "1.82"; + version = "1.83"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "0bammbb8h10n51qk5141gabsd5p91qbaqq7cwa1q8yf5qglwlp10"; + sha256 = "0rh0lkvjjy19lixqq07hjp4k9mhahmwc0pbp5cr3m59qbwwcprvx"; }; buildInputs = [ curl openssl libxml2 fuse ]; diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 233034792e1..6fc7ba6499e 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "securefs-${version}"; - version = "0.3.2"; + version = "0.8.1"; src = fetchFromGitHub { - sha256 = "1drksvwfgfpgcn2mzb65ljqlg2kgn6nald9fnz60hliw8f1wiqvh"; + sha256 = "065n3mskv0b2dlk9w4b3pa70h5ymrnanydbanwyx74mf7n8c80r2"; rev = version; repo = "securefs"; owner = "netheril96"; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 593715b2068..3283d6789f7 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zerofree-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "http://frippery.org/uml/${name}.tgz"; - sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf"; + sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm"; }; buildInputs = [ e2fsprogs ]; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 8c53882ff1b..a4d49edcb44 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { name = "cfdg-${version}"; - version = "3.0.2"; + version = "3.0.9"; src = fetchurl { - sha256 = "1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; + sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl"; url = "http://www.contextfreeart.org/download/ContextFreeSource${version}.tgz"; }; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 7261326633a..dc703cf02f7 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp -, libxkbcommon, epoxy, at_spi2_core, dbus, libdbusmenu-glib +, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake autoreconfHook gtk glib pcre libappindicator libpthreadstubs - libXdmcp libxkbcommon epoxy at_spi2_core + libXdmcp libxkbcommon epoxy at-spi2-core dbus libdbusmenu-glib ]; diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 69ae03d6750..e9f1ad5dacd 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -2,14 +2,14 @@ let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.4"; name = "imgur-screenshot-${version}"; src = fetchFromGitHub { owner = "jomo"; repo = "imgur-screenshot"; rev = "v${version}"; - sha256 = "01wiqrc7xxvk7kzgw756jahwa0szb200l8030iwfcgxb679k3v0j"; + sha256 = "1bhi9sk8v7szh2fj13qwvdwzy5dw2w4kml86sy1ns1rn0xin0cgr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index e767b7564ec..0fa99163845 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "logstalgia-${version}"; - version = "1.0.7"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz"; - sha256 = "1qghz1j3jmfj093br2hfyibayg3fmhg8fvp5ix9n9rbvzc1zslsm"; + sha256 = "0nvnk8q9m2ignzwxak0vch88blywbx4znk70xf9fg38xa4rf94yn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 42ca4cf2e27..5dfed3722e0 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "povray-${version}"; - version = "3.7.0.4"; + version = "3.7.0.7"; src = fetchFromGitHub { owner = "POV-Ray"; repo = "povray"; rev = "v${version}"; - sha256 = "1wkwb43w5r9pa79yazy4w4s8n6g280igag97hgl7dyi289q39n0q"; + sha256 = "0gqbc4ycjfqpnixzzqxlygmargk6sm77b0k3xzff9dxdrak3xng7"; }; diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index ba376af1c3c..402628f0fc8 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "scanbd-${version}"; - version = "1.4.4"; + version = "1.5.1"; src = fetchurl { - sha256 = "07a59jk9b2hh49v5lcpckp64f5lny9sq8h0h2p2jcs9cqazf6q9s"; + sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n"; url = "mirror://sourceforge/scanbd/${name}.tgz"; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index e9e2e29f7fa..2bd4bf1c878 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }: +{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "fcitx-rime-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; }; - buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ]; + buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ]; # cmake cannont automatically find our nonstandard brise install location cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 1ea7ef4251f..e31d1ddfaa8 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa"; }; - propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ]; + propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein pygobject3 ]; nativeBuildInputs = [ python3Packages.wrapPython ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index f71a21b914f..59ddab7294f 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig , vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 -, gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true +, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh - cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make . + cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; preAutoreconf = "touch ChangeLog"; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gconf - gtk_doc + gtk-doc intltool makeWrapper pkgconfig @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { gtk2 gtk3 isocodes - json_glib + json-glib libnotify ] ++ optionals withWayland [ libxkbcommon diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index d41ba1e791f..2b93274b79a 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, makeWrapper, lndir -, dconf, hicolor_icon_theme, ibus, librsvg, plugins +, dconf, hicolor-icon-theme, ibus, librsvg, plugins }: let @@ -7,7 +7,7 @@ let env = { buildInputs = [ ibus ] ++ plugins; nativeBuildInputs = [ lndir makeWrapper ]; - propagatedUserEnvPackages = [ hicolor_icon_theme ]; + propagatedUserEnvPackages = [ hicolor-icon-theme ]; paths = [ ibus ] ++ plugins; inherit (ibus) meta; }; @@ -37,7 +37,7 @@ let --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" done for prog in ibus-daemon; do @@ -56,7 +56,7 @@ let --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \ + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --add-flags "--cache=refresh" done ''; diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch new file mode 100644 index 00000000000..b694fcabbd0 --- /dev/null +++ b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch @@ -0,0 +1,13 @@ +diff --git a/libinput-gestures b/libinput-gestures +index f337ba3..fe56d66 100755 +--- a/libinput-gestures ++++ b/libinput-gestures +@@ -6,7 +6,7 @@ from collections import OrderedDict + from pathlib import Path + from distutils.version import LooseVersion as Version + +-PROG = Path(sys.argv[0]).stem ++PROG = "libinput-gestures" + + # Conf file containing gesture commands. + # Search first for user file then system file. diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch new file mode 100644 index 00000000000..c6ee123db8b --- /dev/null +++ b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch @@ -0,0 +1,43 @@ +diff --git a/libinput-gestures b/libinput-gestures +index f337ba3..5f5b05d 100755 +--- a/libinput-gestures ++++ b/libinput-gestures +@@ -75,17 +75,13 @@ def get_libinput_vers(): + 'Return the libinput installed version number string' + # Try to use newer libinput interface then fall back to old + # (depreciated) interface. +- res = run(('libinput', '--version'), check=False) ++ res = run(('@libinput@', '--version'), check=False) + return res.strip() if res else run(('libinput-list-devices', '--version')) + + # Libinput changed the way in which it's utilities are called + libvers = get_libinput_vers() +-if Version(libvers) >= Version('1.8'): +- cmd_debug_events = 'libinput debug-events' +- cmd_list_devices = 'libinput list-devices' +-else: +- cmd_debug_events = 'libinput-debug-events' +- cmd_list_devices = 'libinput-list-devices' ++cmd_debug_events = '@libinput@ debug-events' ++cmd_list_devices = '@libinput@ list-devices' + + def get_devices_list(): + 'Get list of devices and their attributes (as a dict) from libinput' +@@ -187,7 +183,7 @@ class COMMAND_internal(COMMAND): + + def run(self): + 'Get list of current workspaces and select next one' +- stdout = run(('wmctrl', '-d'), check=False) ++ stdout = run(('@wmctrl@', '-d'), check=False) + if not stdout: + # This command can fail on GNOME when you have only a single + # dynamic workspace using Xorg (probably a GNOME bug) so let's +@@ -220,7 +216,7 @@ class COMMAND_internal(COMMAND): + + # Switch to desired workspace + if index >= minindex and index < maxindex: +- run(('wmctrl', '-s', str(index))) ++ run(('@wmctrl@', '-s', str(index))) + + # Table of gesture handlers + handlers = OrderedDict() diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix new file mode 100644 index 00000000000..e58cabc6791 --- /dev/null +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, + libinput, wmctrl, + xdotool ? null, + extraUtilsPath ? lib.optional (xdotool != null) xdotool +}: +stdenv.mkDerivation rec { + pname = "libinput-gestures"; + version = "2.32"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "bulletmark"; + repo = "libinput-gestures"; + rev = version; + sha256 = "1by6sabx0s8sd9w5675gc26q7yccxnxxsjg4dqlb6nbs0vcg81s7"; + }; + patches = [ + ./0001-hardcode-name.patch + ./0002-paths.patch + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = + '' + substituteInPlace libinput-gestures-setup --replace /usr/ / + + substituteInPlace libinput-gestures \ + --replace /etc "$out/etc" \ + --subst-var-by libinput "${libinput}/bin/libinput" \ + --subst-var-by wmctrl "${wmctrl}/bin/wmctrl" + ''; + installPhase = + '' + runHook preInstall + ${stdenv.shell} libinput-gestures-setup -d "$out" install + runHook postInstall + ''; + postFixup = + '' + rm "$out/bin/libinput-gestures-setup" + substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out" + chmod +x "$out/share/applications/libinput-gestures.desktop" + wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath extraUtilsPath}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/bulletmark/libinput-gestures; + description = "Gesture mapper for libinput"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ teozkr ]; + }; +} diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 6214bc216f8..168a3f88772 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,14 +2,14 @@ let - version = "1.1.1"; + version = "1.2.0"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; owner = "smira"; repo = "aptly"; - sha256 = "197a7nh8li20slqxgn8s8xm13x5b8ansmabk8rx32sngb73hp4av"; + sha256 = "1acnkmgarz9rp0skkh7zzwkhisjlmbl74jqjmqd3mn42y528c34b"; }; aptlyCompletionSrc = fetchFromGitHub { diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 4d6e90a347e..0808704ecb7 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -4,7 +4,7 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { name = "asciinema-${version}"; - version = "1.4.0"; + version = "2.0.0"; buildInputs = with pythonPackages; [ nose ]; propagatedBuildInputs = with pythonPackages; [ requests ]; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { owner = "asciinema"; repo = "asciinema"; rev = "v${version}"; - sha256 = "1m2gjqxb5gqyz19lvp7jmwp7cxjc6nb0b2rrlsg3z2bl6vmi1xn2"; + sha256 = "1f92hv9w58jf1f7igspjxvrxqn3n21kgya2zb56spqyydr4jzwdk"; }; patchPhase = '' diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 974b7691cb9..859112d29bc 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,42 +1,27 @@ -{ stdenv, fetchurl, - boost, clasp, cmake, gringo, re2c +{ stdenv, fetchzip +, boost, clasp, cmake, gringo, re2c }: -let - version = "1.9.1"; -in - stdenv.mkDerivation rec { + version = "1.9.4"; name = "aspcud-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; - sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0"; + src = fetchzip { + url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; + sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; }; buildInputs = [ boost clasp cmake gringo re2c ]; - buildPhase = '' - cmake -DCMAKE_BUILD_TYPE=Release \ - -DGRINGO_LOC=${gringo}/bin/gringo \ - -DCLASP_LOC=${clasp}/bin/clasp \ - -DENCODING_LOC=$out/share/aspcud/specification.lp \ - . - - make - ''; - - installPhase = '' - mkdir -p $out/bin - cp bin/{aspcud,cudf2lp,lemon} $out/bin - - mkdir -p $out/share/aspcud - cp ../share/aspcud/specification.lp $out/share/aspcud - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo" + "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp" + ]; meta = with stdenv.lib; { description = "Solver for package problems in CUDF format using ASP"; - homepage = http://potasssco.sourceforge.net/; + homepage = "https://potassco.org/aspcud/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ba38a55dda0..4d3376108b7 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, python, bash }: let - version = "22.5.0"; + version = "22.5.1"; in stdenv.mkDerivation rec { name = "autojump-${version}"; @@ -9,7 +9,7 @@ in src = fetchurl { url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd"; + sha256 = "17z9j9936x0nizwrzf664bngh60x5qbvrrf1s5qdzd0f2gdanpvn"; }; buildInputs = [ python bash ]; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index 02caf6e33f9..75c7b258a44 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "autorevision-${version}"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; - sha256 = "1xlp7wn2vv17rp848ai272sifi6fmwdr6dg4im53hrf32j3gzlhy"; + sha256 = "07ssirjy2mgbqxr792n3rqa408hm7qnhwfjzd73rqfwvjcahy1q8"; }; buildInputs = [ diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 899fb5f643a..a8b6d5f3c25 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "bandwidth-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { url = "http://zsmith.co/archives/${name}.tar.gz"; - sha256 = "1p1kp5s3fdgy667q7mc9ywnps0sbj4lpr42561yhi59m69n8c3kd"; + sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; buildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 7ea3b1fd279..e06c2dee000 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.175"; + version = "1.178"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1bbj6wxdpjhy7n2614z0qx2310vhaxlvism6v6lxancb5bwwgdnf"; + sha256 = "1ngxa7hzfhvfhkvyc2qib3qyql5zz8rjg559wpi2jsi4hibj84vc"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 8dbcd08fba6..6635f293195 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -4,11 +4,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-5.5"; + name = "brltty-5.6"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; + sha256 = "06by51n35w0jq14w1vimxk3ssrlmiiw49wpxw29rasc106mpysfn"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 6a76906a805..e6ff7e99353 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "convmv-1.15"; + name = "convmv-2.04"; src = fetchurl { url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; - sha256 = "0daiiapsrca8zlbmlz2kw2fn4vmkh48cblb70h08idchhk3sw5f3"; + sha256 = "075xn1ill26hbhg4nl54sp75b55db3ikl7lvhqb9ijvkpi67j6yy"; }; preBuild='' diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index ec9ca37c082..052f52e2ebd 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "127a5v545gvfgxqqjxqafsg1p8i4qd5wnpdwccr38jbsphl6yzl4"; + sha256 = "1c4cl9cac90xf9rap6ss2d4yshcmhdq8pdfjz3g4cns789fs1vcf"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 418d5e38fd7..894079fad84 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, python3Packages, docutils, help2man -, acl, apktool, libbfd, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc +, acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar , gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite , squashfsTools, tcpdump, unoconv, unzip, xxd, xz @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "90"; + version = "91"; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "1w16667j6ag2iim1xcy8y9v9965mq50k64wnf693mivddll62704"; + sha256 = "16xqy71115cj4kws6bkcjm98nlaff3a32fz82rn2l1xk9w9n3dnz"; }; patches = [ @@ -27,12 +27,12 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ docutils help2man ]; - # Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript + # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ - acl libbfd bzip2 cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils - fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump sng sqlite - squashfsTools unzip xxd xz + acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils + dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip + libarchive libcaca pgpdump sng sqlite squashfsTools unzip xxd xz ] ++ lib.optionals enableBloat [ apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv diff --git a/pkgs/tools/misc/diffoscope/list-tools.sh b/pkgs/tools/misc/diffoscope/list-tools.sh new file mode 100755 index 00000000000..9af7f0e3889 --- /dev/null +++ b/pkgs/tools/misc/diffoscope/list-tools.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +diffoscope=$(nix-build --no-out-link -E 'with import ./. {}; diffoscope.override { enableBloat = true; }')/bin/diffoscope + +required=$($diffoscope --list-tools | \ + grep '^External-Tools-Required:' | \ + cut -d ' ' -f2- | \ + tr -d ,) + +# Uber-hacky! +pathScript=$(cat $diffoscope | grep PATH) + +export PATH=$(nix-build --no-out-link -A which)/bin +eval "$pathScript" + +for tool in $required; do + if ! which $tool >/dev/null 2>&1; then + echo $tool + fi +done | sort diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 4598655092f..15d8647ff82 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.15.0"; + version = "2.15.1"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "09mys14acjbrkvjy9zl2k521k3xcs6b0brg8zlhh8qadhbirfkp3"; + sha256 = "07kzfkv5ssys788j0f1bp73gd7b53vwv2jsxkd85zwb3kby1145v"; }; postConfigure = '' diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index e1024d70bce..9449b7759a8 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diskscan-${version}"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "baruch"; repo = "diskscan"; rev = "${version}"; - sha256 = "0yqpaxfahbjr8hr9xw7nngncwigy7yncdwnyp5wy9s9wdp8mrjra"; + sha256 = "1s2df082yrnr3gqnapdsqz0yd0ld75bin37g0rms83ymzkh4ysgv"; }; buildInputs = [ ncurses zlib ]; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index d37655134c5..b8791f5f32a 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.9"; + version = "4.0"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "0xk8y8asy0wxi5jx03c521p9919gjr8053lxpfzn83jkmqc8zmq2"; + sha256 = "12vc3xp0z0abmsy5kbix0wmn0sca39c8miyga6cijydi128zxm2a"; }; postPatch = '' diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 33624302ebc..1d7c47c2c9a 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,23 +2,23 @@ python3.pkgs.buildPythonApplication rec { name = "esptool-${version}"; - version = "2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "137p0kcscly95qpjzgx1yxm8k2wf5y9v3srvlhp2ajniirgv8ijv"; + sha256 = "0gwnl6z5s2ax07l3n38h9hdyz71pn8lzn4fybcwyrii0bj2kapvc"; }; - buildInputs = with python3.pkgs; [ flake8 flake8-future-import ]; + checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa openssl ]; meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = https://github.com/espressif/esptool; license = licenses.gpl2; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 503f0df331c..c07420821ed 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib +, darwin, libiconv +}: with rustPlatform; @@ -16,7 +18,10 @@ buildRustPackage rec { }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv darwin.apple_sdk.frameworks.Security ] + ; # Some tests fail, but Travis ensures a proper build doCheck = false; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 0d1c81c00a6..ed210783db1 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, tcl, makeWrapper }: stdenv.mkDerivation rec { - version = "5.45"; + version = "5.45.4"; name = "expect-${version}"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; - sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj"; + sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"; }; buildInputs = [ tcl ]; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 55aa146d301..5356f8ad065 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "flameshot-${version}"; - version = "0.5.0"; + version = "0.5.1"; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtbase ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "lupoDharkael"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1fy4il7rdj294l9cs642hx23bry25j9phn37274r2b87hwzy1rrv"; + sha256 = "13h77np93r796jf289v4r687cmnpqkyqs34dm9gif4akaig74ky0"; }; enableParallelBuilding = true; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/lupoDharkael/flameshot; maintainers = [ maintainers.scode ]; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index b29e7641310..394310e572d 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fpart-${version}"; - version = "0.9.3"; + version = "1.0.0"; src = fetchurl { url = "http://contribs.martymac.org/fpart/${name}.tar.gz"; - sha256 = "0f1vm7c7v9nrd0mnz6qivpnngni6y53b11kvniclqfd25hhw6ggq"; + sha256 = "1p0ajmry18lcg82znfp8nxs4w3izic775l7df08hywlq4vfa66pg"; }; postInstall = '' diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 71cfedcaec7..99c54b6d396 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme +, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor-icon-theme , gpart, hdparm, procps, utillinux }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ]; + buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor-icon-theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 40d122242ff..9719ea6fe55 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-12-24"; + version = "0.4.6a-2018-02-20"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "ca0371bb1e2365bfe4e44031a3b8b59e8c58ce0d"; - sha256 = "0a9m7n5la3dmbfx6n5iqlfbm607r1mww0wkimn29mlsc30d8aamr"; + rev = "74f6c862c73a4d21e61832174f4ab2f1d7f8b12a"; + sha256 = "0p85y5adnlcs4cdi9dg6f5fzzc1y12bmfhx13qs0576izx2rma3q"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index b8b7666934b..7fd9897a71b 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "keychain-${version}"; - version = "2.8.3"; + version = "2.8.5"; src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; rev = "${version}"; - sha256 = "0za2fi4g7ixzj3izgwlv71b3cviz3qhz43y4bhdkglg16x5cnzcb"; + sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; buildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index d74e2b4e12a..f511e013f36 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,14 +6,14 @@ let pname = "kronometer"; - version = "2.1.3"; + version = "2.2.1"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i"; + sha256 = "18b2qi5b9hn8jy3yhav72n14z5l9w3p5fv5kslhbxc7rfvjr4h3x"; }; meta = with lib; { diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 57d29437a21..b7963c3ed81 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "latex2html-${version}"; - version = "2016"; + version = "2018"; src = fetchurl { url = "http://mirrors.ctan.org/support/latex2html/latex2html-${version}.tar.gz"; - sha256 = "028k0ypbq94mlhydf1sbqlphlfl2fhmlzhgqq5jjzihfmccbq7db"; + sha256 = "1qnlg8ajh0amy9gy8rh8sp1l224ak54264i3dhk7rrv9s4k7bqq9"; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 5ab05c92135..4d7c27a3944 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "1jdjn64cxgbhhyg73cisrfrk7vjg1hr9nvkmfdk8gxc4g82y3xxc"; + sha256 = "0hq9ri6a18z682gihxlbh1rndka0v6brkdqsyfsgh4c2fgib4fb7"; inherit name; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.2"; + version = "0.8.3"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index fb4093d89b8..f9983cc0a7f 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mc-${version}"; - version = "4.8.19"; + version = "4.8.20"; src = fetchurl { url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; - sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb"; + sha256 = "072h7n9b3j79fqn48xaw0xhlcjavpsmfpz6nyh20lhmfz3sffzh1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 6289c35f35a..2116815ed0c 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoreconfHook, which, txt2man, gnome_doc_utils, scrollkeeper }: + libiconv, autoreconfHook, which, txt2man, gnome-doc-utils, scrollkeeper }: stdenv.mkDerivation { name = "mdbtools-git-2014-07-25"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib readline bison flex autoreconfHook which txt2man - gnome_doc_utils scrollkeeper libiconv + gnome-doc-utils scrollkeeper libiconv ]; preAutoreconf = '' diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 81d6d29b2bf..52f685b22ca 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, desktop_file_utils, file, python3Packages }: +{ stdenv, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z"; }; - buildInputs = [ file desktop_file_utils ]; + buildInputs = [ file desktop-file-utils ]; propagatedBuildInputs = [ python3Packages.pyxdg ]; preConfigure = '' substituteInPlace Mimeo.py \ --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \ - "EXE_UPDATE_DESKTOP_DATABASE = '${desktop_file_utils}/bin/update-desktop-database'" \ + "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \ --replace "EXE_FILE = 'file'" \ "EXE_FILE = '${file}/bin/file'" ''; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index a8332ad494d..3b220153f17 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse , libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - autoconf automake libtool pkgconfig gtk_doc gobjectIntrospection which yacc + autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index cb55226109b..37073daa699 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, gtk2, hicolor_icon_theme, intltool, pkgconfig +, gtk2, hicolor-icon-theme, intltool, pkgconfig , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; preFixup = '' # Need which and xdotool on path to fix auto-pasting. diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index fd5004302df..a5e45dc259b 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.5"; name = "pastebinit-${version}"; src = fetchurl { url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1rl854izwn1fpaaib6zj7a1a9bis8n7w4zfxcapgfffj37zj0dy2"; + sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; }; buildInputs = [ python3 ]; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index d5908210cbd..b4cfe7b26c0 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "phraseapp-client-${version}"; - version = "1.4.5"; + version = "1.6.0"; goPackagePath = "github.com/phrase/phraseapp-client"; subPackages = [ "." ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "phrase"; repo = "phraseapp-client"; rev = version; - sha256 = "0zky7jcs7h6zmvkb0na4la6h7g63jlrziifqk831fd1gspdzgajp"; + sha256 = "0rgwl0rgkci045hg36s0q8jwkni1hzapqpi0mc0gk3rl7nagw622"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 0f5c1524143..e366a03a7f4 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3, texinfo, makeWrapper }: stdenv.mkDerivation rec { - name = "ponysay-3.0.2"; + name = "ponysay-3.0.3"; src = fetchurl { - url = "https://github.com/erkin/ponysay/archive/3.0.2.tar.gz"; - sha256 = "03avcbl96rv718lgg6yyrq5mvg3xxzccrnnb6brf4g9mcrwqmsb9"; + url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz"; + sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; }; buildInputs = [ python3 texinfo makeWrapper ]; diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix index a13f7160aa6..dfcefe09200 100644 --- a/pkgs/tools/misc/quota/default.nix +++ b/pkgs/tools/misc/quota/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: stdenv.mkDerivation rec { - version = "4.03"; + version = "4.04"; name = "quota-${version}"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "0jv7vhxhjp3gc4hwgmrhg448sbzzqib80gdas9nm0c5zwyd4sv4w"; + sha256 = "1pwfxza923j75z5lx0w89pj09745zi1swy77cm0zalbzgs4f2nvk"; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 2ff86f5cbdf..640e641dd47 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, - gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }: + gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }: with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configurePhase = "scons config"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext glib json_glib libelf scons sphinx utillinux ]; + buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ]; buildPhase = "scons"; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index d6cad51ce75..8c2845dc8eb 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json_glib, libarchive, libsolv, librepo, gtk_doc, elfutils, + libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils, gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: let @@ -31,7 +31,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ which autoconf automake libtool libcap ostree rpm glib libgsystem gperf - json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 + json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 cmake pcre check python # FIXME: get rid of this once libarchive properly propagates this acl diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix new file mode 100644 index 00000000000..a310135727d --- /dev/null +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: + +buildPythonApplication rec { + name = "scfbuild-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eosrei"; + repo = "scfbuild"; + rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318"; + sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46"; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + propagatedBuildInputs = [ pyyaml fonttools fontforge ]; + + installPhase = '' + mkdir -p $out/${python.sitePackages} + cp -r scfbuild $out/${python.sitePackages} + cp -r bin $out + ''; + + meta = with lib; { + description = "SVGinOT color font builder"; + homepage = https://github.com/eosrei/scfbuild; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix new file mode 100644 index 00000000000..709cbbe0791 --- /dev/null +++ b/pkgs/tools/misc/skim/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "skim-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lotabout"; + repo = "skim"; + rev = "v${version}"; + sha256 = "0spkkgjjrch1grb0115rn0wxzsh8pzmm96a7j69zy5pc1il2m5lp"; + }; + + outputs = [ "out" "vim" ]; + + cargoSha256 = "0zbjnii8r41ih2m2vqhm3wdiwgi13kipvxx75sg4vm4maf4wpmhv"; + + patchPhase = '' + sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim + ''; + + postInstall = '' + install -D -m 555 bin/sk-tmux -t $out/bin + install -D -m 444 shell/* -t $out/share/skim + install -D -m 444 plugin/skim.vim -t $vim/plugin + + cat <<SCRIPT > $out/bin/sk-share + #! ${stdenv.shell} + # Run this script to find the skim shared folder where all the shell + # integration scripts are living. + echo $out/share/skim + SCRIPT + chmod +x $out/bin/sk-share + ''; + + meta = with stdenv.lib; { + description = "Fuzzy Finder in rust!"; + homepage = https://github.com/lotabout/skim; + license = licenses.mit; + maintainers = []; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index f0fa1c19888..3042dfb215f 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.7"; + version = "1.9.9"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0zj102ir08s9knqqv8y6vy9rkrgk77xs7kqp00v9fzrlqyspf68r"; + sha256 = "1iam2pdcrlpcgk2hx3m7zawznp2p939xdv8cpll6sd6n0l4hpdc9"; }; pythonPaths = [ pycrypto requests ]; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 11d61cfe30f..90a17bdff70 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl -, libxml2, desktop_file_utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify -, gobjectIntrospection, libgnome_keyring3 +, libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify +, gobjectIntrospection, libgnome-keyring3 , cups-filters , pythonPackages , withGUI ? true @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig glib udev libusb1 cups xmlto - libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils + libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils pythonPackages.python pythonPackages.wrapPython libnotify gobjectIntrospection gdk_pixbuf pango atk - libgnome_keyring3 + libgnome-keyring3 ]; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index fa45b0f8bd2..3baafa29677 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ttylog-${version}"; - version = "0.29"; + version = "0.31"; src = fetchFromGitHub { owner = "rocasa"; repo = "ttylog"; rev = version; - sha256 = "035i9slmdgds5azwxqwp6skxykvaq3mq4jckvm49fng8jq09z7zr"; + sha256 = "0c746bpjpa77vsr88fxk8h1803p5np1di1mpjf4jy5bv5x3zwm07"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index dd13a0d9adc..9f43a7bd699 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -2,7 +2,7 @@ xlibsWrapper, libev, libXi, libXfixes, pkgconfig, asciidoc, libxslt, docbook_xsl }: -let version = "1.2"; in +let version = "1.3"; in stdenv.mkDerivation { name = "unclutter-xfixes-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Airblader"; repo = "unclutter-xfixes"; rev = "v${version}"; - sha256 = "1pw567mj7mq5kr8mqnyrvy7jj62qfg6zgqfyzz21nncslddnjzg8"; + sha256 = "1iikrz0023wygv29ny20xj1hlv9ry7hghlwjii6rj4jm59vl0mlz"; }; nativeBuildInputs = [pkgconfig]; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix new file mode 100644 index 00000000000..411e0324457 --- /dev/null +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" }: + +rustPlatform.buildRustPackage { + name = "uutils-coreutils-2018-02-09"; + src = fetchFromGitHub { + owner = "uutils"; + repo = "coreutils"; + rev = "f333ab26b03294a32a10c1c203a03c6b5cf8a89a"; + sha256 = "0nkggs5nqvc1mxzzgcsqm1ahchh4ll11xh0xqmcljrr5yg1rhhzf"; + }; + + # too many impure/platform-dependent tests + doCheck = false; + + cargoSha256 = "0qv2wz1bxhm5xhzbic7cqmn8jj8fyap0s18ylia4fbwpmv89nkc5"; + + makeFlags = + [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] + ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ cargo sphinx ]; + + # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults + buildPhase = ""; + installPhase = ""; + + meta = with stdenv.lib; { + description = "Cross-platform Rust rewrite of the GNU coreutils"; + longDescription = '' + uutils is an attempt at writing universal (as in cross-platform) + CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. + ''; + homepage = https://github.com/uutils/coreutils; + maintainers = with maintainers; [ ma27 ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 820c5a65c74..e5bb23016ae 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vmtouch"; - version = "1.1.0"; + version = "1.3.0"; name = "${pname}-git-${version}"; src = fetchFromGitHub { owner = "hoytech"; repo = "vmtouch"; rev = "v${version}"; - sha256 = "1cr8bw3favdvc3kc05n1r7f5fibqqv54bn3z2jwj70br8s5g0qx0"; + sha256 = "0xpigfpwidk25k605y2m2g1952nzl5fgp0wn65hhn7hbra7srglf"; }; buildInputs = [perl]; diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index b3c97207b1d..c33e01fa0e7 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xdo-${version}"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "baskerville"; repo = "xdo"; rev = version; - sha256 = "1i8xlsp36ji7cvyh66ajqsf59hxpwm0xvnn9laq7nbajcx3qqlnh"; + sha256 = "1h3jrygcjjbavdbkpx2hscsf0yf97gk487lzjdlvymd7dxdv9hy9"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 4be86399390..708675fb651 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation rec { - name = "xtitle-0.3"; + name = "xtitle-0.4.3"; src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/0.3.tar.gz"; - sha256 = "07r36f4ad1q0dpkx3ykd49xlmi24d8mjqwh40j228k81wsvzayl1"; + url = "https://github.com/baskerville/xtitle/archive/0.4.3.tar.gz"; + sha256 = "0bk4mxx0vky37f66b2y34nggi1f7fnrmsprkxyc8mskj6qcrbm5h"; }; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 8dfd73ef20c..31b8d673a98 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, hicolor_icon_theme +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, hicolor-icon-theme , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # for gcc5: c11 inline semantics breaks the build NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 3d0338febcd..36aa4ab09c4 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "0nf9y3jsvfjxa3mgigywnyirznn1m4zjm1glnwndrjsjrkcpnzb5"; + sha256 = "0v5aynrilm4fj7gz03q0yz6806ssjxhlv4bsa0213bgkin5iiws7"; inherit name; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.8.2"; + version = "0.8.3"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 3a917040863..5ae99d23939 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1011"; + version = "0.4.1025"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0h6aspnfic30s89xsv6qss1jfka9px4ll60bqrjbds4y0k3h818g"; + sha256 = "1dbalpwhzn39kgswjy84720wfjssa087adavbwig53krsjdvhj6k"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 0386896d97f..4f082f28a7d 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2018.02.08"; + version = "2018.02.22"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0iq5mav782gz0gm00rry3v7gdxkkx4y1k0p20pvz32ga4id5k1mg"; + sha256 = "112qmwrkd0cpyx2h20k6y07lw7iixvj8yya7r97h3k1y1py9vbz8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 31f39b887c5..e6a1c93d2bb 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }: stdenv.mkDerivation rec { - name = "yubikey-personalization-gui-3.1.24"; + name = "yubikey-personalization-gui-3.1.25"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; - sha256 = "0aj8cvajswkwzig0py0mjnfw0m8xsilisdcnixpjx9xxsxz5yacq"; + sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; nativeBuildInputs = [ pkgconfig qmake4Hook ]; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index e3a147b20b1..7af7a8f551d 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "assh-${version}"; - version = "2.6.0"; + version = "2.7.0"; goPackagePath = "github.com/moul/advanced-ssh-config"; subPackages = [ "cmd/assh" ]; @@ -18,7 +18,7 @@ buildGoPackage rec { repo = "advanced-ssh-config"; owner = "moul"; rev = "v${version}"; - sha256 = "1vv98dz5822k51xklnmky0lwfjw8nc6ryvn8lmv9n63ppwh9s2s6"; + sha256 = "0jfpcr8990lb7kacadbishdkz5l8spw24ksdlb79x34sdbbp3fm6"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index d8316c66203..95e3193fd0f 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { + # when updating this to >=7, check, see previous reverts: + # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix name = "dhcpcd-6.11.5"; src = fetchurl { diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index 1282c72452f..cb12300d51e 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dnscrypt-wrapper-${version}"; - version = "0.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Cofyc"; repo = "dnscrypt-wrapper"; rev = "v${version}"; - sha256 = "0wnkgn0ajx1qmfyb264jvpqxlbravdcq4m485iaa3wjp82g8xlca"; + sha256 = "121y93sb06qc50fj7vv47r6dpzv77hh7ywl7sgrfp8i4jf4kaspa"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index b021201a4d4..97aad141239 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bind, libseccomp, zlib }: +{ stdenv, fetchurl, bind, libseccomp, zlib, openssl }: stdenv.mkDerivation rec { name = "dnsperf-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - buildInputs = [ bind libseccomp zlib ]; + buildInputs = [ bind libseccomp zlib openssl ]; postInstall = '' mkdir -p "$out/share/doc/" diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 709fb9540d1..b7ef3b8fa75 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2017.75"; + name = "dropbear-2018.76"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1309cm2aw62n9m3h38prvgsqr8bj85hfasgnvwkd42cp3k5ivg3c"; + sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index ff5a6c1eaee..4a358255b10 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "5.4"; + version = "5.5"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "1iwss9z94p165gxr2yw7s9q12a0bn71fcdbikzkykr5s7xxnz2ds"; + sha256 = "0l43lbnrnyyrq8mlnw37saq6v0mh3nkirdq1dwnsrihykzjjwf70"; }; doCheck = false; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index fcbf5a4e1b2..e008c9183c9 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, gnome2, makeWrapper}: +{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, gnome2, makeWrapper}: stdenv.mkDerivation rec { name = "gupnp-tools-${version}"; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp_av + buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp-av gnome2.gnome_icon_theme makeWrapper]; postInstall = '' for program in gupnp-av-cp gupnp-universal-cp; do wrapProgram "$out/bin/$program" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" done ''; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 06c595f7c6d..598557380e2 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -9,14 +9,12 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - majorVersion = "1.7"; - minorVersion = "9"; - version = "${majorVersion}.${minorVersion}"; + version = "1.8.4"; name = "${pname}-${version}"; src = fetchurl { - url = "https://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz"; - sha256 = "1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e"; + url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; + sha256 = "19l4i0p92ahm3vaw42gz3rmmidfivk36mvqyhir81h6ywyjb01g3"; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index fb50ddc9eb4..8ec0ce2847d 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "httplab-${version}"; - version = "0.1.0"; + version = "0.3.0"; rev = "v${version}"; goPackagePath = "github.com/gchaincl/httplab"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "gchaincl"; repo = "httplab"; inherit rev; - sha256 = "19d0aasaxayvw25m9n2gahyq590dwym7k0fng8pqvrgc2mpl0ncw"; + sha256 = "1q9rp43z59nryfm79gci5a1gmqw552rqd4cki81rymbj3f6xvrf9"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix new file mode 100644 index 00000000000..f769a3fcffa --- /dev/null +++ b/pkgs/tools/networking/infiniband-diags/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core, + glib, opensm, perl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "infiniband-diags-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "linux-rdma"; + repo = "infiniband-diags"; + rev = version; + sha256 = "06x8yy3ly1vzraznc9r8pfsal9mjavxzhgrla3q2493j5jz0sx76"; + }; + + nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; + + buildInputs = [ rdma-core glib opensm perl ]; + + preConfigure = '' + export CFLAGS="-I${opensm}/include/infiniband" + ./autogen.sh + ''; + + configureFlags = "--with-perl-installdir=\${out}/lib/perl5/site_perl --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/lib/perl5/site_perl" + 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/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 28b53a8c247..ece7ea3c95e 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { - name = "iperf-3.4"; + name = "iperf-3.5"; src = fetchurl { url = "http://downloads.es.net/pub/iperf/${name}.tar.gz"; - sha256 = "04ciywjhklzfrnp40675ssnkqxv90ad4v56i8vh8bpsiswr86lki"; + sha256 = "1m9cyycv70s8nlbgr1lqwr155ixk17np0nzqgwaw3f51vkndk6sk"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 140ea6860fc..185e8636681 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "keepalived-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "1d3jnfhj9mpnc27wvgsiz2vr4lnvvccw3v128z16jpyibyv20ph0"; + sha256 = "154yxs6kwpi9yc4pa45ba3z3bfwzgmmmja5nk3d9mxq6w6s1swcy"; }; buildInputs = [ diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index a59aee83b93..f6a75011287 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking +{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib-networking , asciidoc, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ]; - buildInputs = [ glib glib_networking fuse curl ]; + buildInputs = [ glib glib-networking fuse curl ]; meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index e81297e6dd8..a451750503a 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "minissdpd-${version}"; - version = "1.5.20160301"; + version = "1.5.20180203"; src = fetchurl { - sha256 = "053icnb25jg2vvjxirkznks3ipbbdjxac278y19rk2w9cirgi9lv"; + sha256 = "1yiri887s8wxh4zrjc5dw19gyypqg63962aimcgd19blvpbwnfcv"; url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index a623b9fbfe9..1e020079430 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20171212"; + name = "miniupnpd-2.0.20180203"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0jdcll1nd8jf356fpl0n2yw8sww58nfz6hkx052d77l34afq6sn7"; + sha256 = "1djb0w76yd5jyqm5mzmxlxikxzzwqzjgy75h8saxc3rlz3r1a346"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 131021704a2..c969119e1d7 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,60 +1,47 @@ -{ stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: - -let - # When overrides are not needed, then only remove the contents of this set. - packageOverrides = self: super: { - ldap3 = super.ldap3.overridePythonAttrs (oldAttrs: rec { - version = "2.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "c056b3756076e15aa71c963c7c5a44d5d9bbd430263ee49598d4454223a766ac"; - }; - }); - pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { - version = "0.3.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "187f2a66d617683f8e82d5c00033b7c8a0287e1da88a9d577aebec321cad4965"; - }; - }); - }; +{ stdenv, fetchFromGitHub, python3Packages, glibcLocales }: - pythonPackages = (python3.override {inherit packageOverrides; }).pkgs; -in with pythonPackages; +with python3Packages; buildPythonPackage rec { - baseName = "mitmproxy"; - name = "${baseName}-unstable-2017-10-31"; + pname = "mitmproxy"; + version = "3.0.2"; src = fetchFromGitHub { - owner = baseName; - repo = baseName; - rev = "80a8eaa708ea31dd9c5e7e1ab6b02c69079039c0"; + owner = pname; + repo = pname; + rev = "v${version}"; sha256 = "0rvwm11yryzlp3c1i42rk2iv1m38yn6r83k41jb51hwg6wzbwzvw"; }; + postPatch = '' + # remove dependency constraints + sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py + ''; + checkPhase = '' export HOME=$(mktemp -d) + export LC_CTYPE=en_US.UTF-8 # test_echo resolves hostnames - LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs ' + pytest -k 'not test_echo and not test_find_unclaimed_URLs ' ''; propagatedBuildInputs = [ blinker click certifi cryptography - h2 hyperframe - kaitaistruct passlib pyasn1 pyopenssl - pyparsing pyperclip requests ruamel_yaml tornado - urwid brotlipy sortedcontainers ldap3 + h2 hyperframe kaitaistruct passlib + pyasn1 pyopenssl pyparsing pyperclip + requests ruamel_yaml tornado urwid + brotlipy sortedcontainers ldap3 ]; buildInputs = [ - beautifulsoup4 flask pytest pytestrunner glibcLocales + beautifulsoup4 flask pytest + pytestrunner glibcLocales ]; meta = with stdenv.lib; { description = "Man-in-the-middle proxy"; - homepage = https://mitmproxy.org/; - license = licenses.mit; + homepage = https://mitmproxy.org/; + license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; }; } diff --git a/pkgs/tools/networking/mitmproxy/tornado-4.6.patch b/pkgs/tools/networking/mitmproxy/tornado-4.6.patch deleted file mode 100644 index 879b8a4c379..00000000000 --- a/pkgs/tools/networking/mitmproxy/tornado-4.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mitmproxy-v2.0.2-src.org/setup.py 2017-08-28 07:31:51.727424688 +0100 -+++ mitmproxy-v2.0.2-src/setup.py 2017-08-28 07:35:55.608919302 +0100 -@@ -78,7 +78,7 @@ - "pyperclip>=1.5.22, <1.6", - "requests>=2.9.1, <3", - "ruamel.yaml>=0.13.2, <0.14", -- "tornado>=4.3, <4.5", -+ "tornado>=4.3, <4.6", - "urwid>=1.3.1, <1.4", - "watchdog>=0.8.3, <0.9", - "brotlipy>=0.5.1, <0.7", diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 36c56ac9847..f4631d39b01 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, udev, libgudev, polkit, dbus_glib, ppp, intltool, pkgconfig +{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, intltool, pkgconfig , libmbim, libqmi, systemd }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; - buildInputs = [ udev libgudev polkit dbus_glib ppp libmbim libqmi systemd ]; + buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ]; configureFlags = [ "--with-polkit" diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index aca7643e7ac..60f7b647eea 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.3"; + version = "0.6.4"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "0g3105c5ha897bpwsnrp72gx4n61gspxmld594i37g8k7vwzny4l"; + sha256 = "0nip1gmzxq5kak41n0y0qzbhk2876fypk83q14ssy32fk49lxjly"; }; patches = [ ./glibc-2.26.patch ]; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index f2c0bb13afe..20bab09c2a7 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager -, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk +, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas +, udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }: stdenv.mkDerivation rec { @@ -24,18 +24,18 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ - gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas - polkit isocodes udev libgudev gnome3.libgnome_keyring - modemmanager jansson glib_networking + gnome3.gtk libglade networkmanager libnotify libsecret gsettings-desktop-schemas + polkit isocodes udev libgudev gnome3.libgnome-keyring + modemmanager jansson glib-networking libindicator-gtk3 libappindicator-gtk3 ] ++ stdenv.lib.optional withGnome webkitgtk; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - propagatedUserEnvPkgs = [ gnome3.gnome_keyring hicolor_icon_theme ]; + propagatedUserEnvPkgs = [ gnome3.gnome-keyring hicolor-icon-theme ]; makeFlags = [ - ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' + ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; preInstall = '' diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 0c791631daa..c5613341aab 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, dbus_glib +{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib , udev, libnl, libuuid, gnutls, dhcp , libgcrypt, perl, libgudev, avahi, ppp, kmod }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ udev libnl libuuid gnutls libgcrypt libgudev ]; - propagatedBuildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ dbus-glib ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index b6201e308d9..c0471601917 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, dbus_glib +{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; - propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ]; + propagatedBuildInputs = [ dbus-glib gnutls libgcrypt python3Packages.pygobject3 ]; nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ]; diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix index 864af033a39..5f1e0790b0b 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf gnome3.networkmanagerapplet ]; nativeBuildInputs = [ automake autoconf intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix index 0cfc8bbba7d..9e6ba581a94 100644 --- a/pkgs/tools/networking/network-manager/iodine.nix +++ b/pkgs/tools/networking/network-manager/iodine.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ iodine networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index b40afa605e3..54670ff1bce 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -15,13 +15,16 @@ stdenv.mkDerivation rec { }; buildInputs = [ networkmanager ppp libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring networkmanagerapplet ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; postPatch = '' sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c + substituteInPlace ./Makefile.am \ + --replace '$(sysconfdir)/dbus-1/system.d' "$out/etc/dbus-1/system.d" + substituteInPlace ./src/nm-l2tp-service.c \ --replace /sbin/ipsec ${strongswan}/bin/ipsec \ --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index e1a5f954986..5a215529d83 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ openconnect networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 47dca561d6c..49411f77845 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ openvpn networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index 6cc8107f2c8..08f591b117e 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ networkmanager pptp ppp libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 365aec88a7d..4fc9c904f5f 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps -, gnome3, libgnome_keyring, libsecret }: +, gnome3, libgnome-keyring, libsecret }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ networkmanager strongswanNM libsecret ] - ++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]); + ++ (with gnome3; [ gtk libgnome-keyring networkmanagerapplet ]); nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 44233b35129..8d69415313d 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ vpnc networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index f7a04eff046..7af85209512 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, bzip2, yacc, flex }: -let version = "1.6.15"; in +let version = "1.6.16"; in stdenv.mkDerivation rec { name = "nfdump-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "07grsfkfjy05yfqfcmgp5xpavpck9ps6q7x8x8j79fym5d8gwak5"; + sha256 = "0dgrzf9m4rg5ygibjw21gjdm9am3570wys7wdh5k16nsnyai1gqm"; }; nativeBuildInputs = [yacc flex]; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index b1ecc6cba89..6eafdde1082 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.5.0"; + version = "1.6.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "0fm0z73afghwmbshpsn5jfbyyfzz1v8s7scwycnvsk2cgv5f4r86"; + sha256 = "0ca80i8m88f4vhwiq548wjyqwwszpbap92l83bl0wdppvp4nk192"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index d63df830d0e..a540120de2f 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "6.2p1"; + version = "6.2p3"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "1g6hi03ylhv47sbar3xxgsrar8schqfwn4glckh6m6lni67ndq85"; + sha256 = "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv"; }; prePatch = '' diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix new file mode 100644 index 00000000000..a053c82a826 --- /dev/null +++ b/pkgs/tools/networking/opensm/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex, rdma-core }: + +stdenv.mkDerivation rec { + name = "opensm-${version}"; + version = "3.3.20"; + + src = fetchgit { + url = git://git.openfabrics.org/~halr/opensm.git; + rev = name; + sha256 = "1hlrn5z32yd4w8bj4z6bsfv84pk178s4rnppbabyjqv1rg3c58wl"; + }; + + nativeBuildInputs = [ autoconf automake libtool bison flex ]; + + buildInputs = [ rdma-core ]; + + preConfigure = "bash ./autogen.sh"; + + meta = with stdenv.lib; { + description = "Infiniband subnet manager"; + homepage = https://www.openfabrics.org/; + license = licenses.gpl2; # dual licensed as 2-clause BSD + maintainers = [ maintainers.aij ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index aa9e5483408..f2c92d689f3 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "par2cmdline-${version}"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Parchive"; repo = "par2cmdline"; rev = "v${version}"; - sha256 = "1hkb1brz70p79rv7dlzhnl1invjmkll81rcpnhwvafv1yriklfai"; + sha256 = "0f1jsd5sw2wynjzi7yjqjaf13yhyjfdid91p8yh0jn32y03kjyrz"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index ee47a6cb2ea..98113551c0c 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.0"; + name = "pcapfix-1.1.1"; src = fetchurl { url = "https://f00l.de/pcapfix/${name}.tar.gz"; - sha256 = "025jpsqav9wg9lql7jfpd67z1113j8gzmjc5nqf5q07b01nnpfgj"; + sha256 = "07dfgl99iv88mgpnpfcb9y7h0zjq9fcf4sp5s7d0d3d5a5sshjay"; }; postPatch = ''sed -i "s|/usr|$out|" Makefile''; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 6185f66b80e..d8a633f0332 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pptp-${version}"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "mirror://sourceforge/pptpclient/${name}.tar.gz"; - sha256 = "00cj3jqj1hqri856jif4kkzan684qv1cb1zf2amzblvqqnzqq7hb"; + sha256 = "1x2szfp96w7cag2rcvkdqbsl836ja5148zzfhaqp7kl7wjw2sjc2"; }; patchPhase = diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 2a72a530cab..37f542319da 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/share/man/man1" ''; + NIX_CFLAGS_COMPILE=" -Wno-error "; + meta = with stdenv.lib; { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 887cd09b6eb..c3d60d8e87b 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { name = "s3cmd-${version}"; - version = "1.6.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; rev = "v${version}"; - sha256 = "0aan6v1qj0pdkddhhkbaky44d54irm1pa8mkn52i2j86nb2rkcf9"; + sha256 = "198hzzplci57sb8hdan30nbakslawmijfw0j71wjvq85n3xn6qsl"; }; propagatedBuildInputs = with python2Packages; [ python_magic dateutil ]; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 592a173df7e..ad3c3a806b3 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "1.0.6"; + version = "2.0.0"; src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "008a0wymn06h93gdkxwlgxg8039ybdni96i4blhpayj52jkbflnv"; + sha256 = "06fini7bqf5paphp8dpck1zpmb33cdxlf4hg6xg2g9k4bdm2k26d"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index 8c413174cfb..a3f08cb5a07 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "srelay-0.4.8b6"; + name = "srelay-0.4.8"; src = fetchurl { - url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz"; - sha256 = "1az9ds10hpmpw6bqk7fcd1w70001kz0mm48v3vgg2z6vrbmgn0qj"; + url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-0.4.8/srelay-0.4.8.tar.gz"; + sha256 = "1sn6005aqyfvrlkm5445cyyaj6h6wfyskfncfmds55x34hfyxpvl"; }; patches = [ ./arm.patch ]; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index eff498a174e..042f8bea3d6 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "0lxbyiary8iapx3ysw40czrmxf983fhfzs5mvz2hk1j1mpc85hp0"; + sha256 = "14ifqay54brw2b2hbmm517bxw8bs9631d7jm4g139igkxcq0m9p0"; }; dontPatchELF = true; @@ -76,6 +76,11 @@ stdenv.mkDerivation rec { "--enable-sqlite" ] ++ optional enableNetworkManager "--enable-nm"; + postInstall = '' + # this is needed for l2tp + echo "include /etc/ipsec.secrets" >> $out/etc/ipsec.secrets + ''; + NIX_LDFLAGS = "-lgcc_s" ; meta = { diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix new file mode 100644 index 00000000000..bd611af2426 --- /dev/null +++ b/pkgs/tools/networking/stubby/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, getdns, libtool, m4, file , doxygen +, autoreconfHook, automake, check, libbsd, libyaml, darwin }: + +stdenv.mkDerivation rec { + pname = "stubby"; + name = "${pname}-${version}"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "getdnsapi"; + repo = pname; + rev = "v${version}"; + sha256 = "1zq7h3jx6v821phcbjp348ncdicx9s4gqkj7mcz8kd6ps902iag8"; + }; + + nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ]; + + buildInputs = [ doxygen getdns automake file check ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; + + meta = with stdenv.lib; { + description = "A local DNS Privacy stub resolver (using DNS-over-TLS)"; + longDescription = '' + Stubby is an application that acts as a local DNS Privacy stub + resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS + queries sent from a client machine (desktop or laptop) to a DNS + Privacy resolver increasing end user privacy. Stubby is developed by + the getdns team. +''; + homepage = https://dnsprivacy.org/wiki/x/JYAT; + downloadPage = "https://github.com/getdnsapi/stubby"; + maintainers = with maintainers; [ leenaars ]; + license = licenses.bsd3; platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index 8624efeb3f7..b23616c57e9 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "surfraw-2.2.9"; + name = "surfraw-2.3.0"; src = fetchurl { - url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.9.tar.gz"; - sha256 = "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa"; + url = "http://surfraw.alioth.debian.org/dist/surfraw-2.3.0.tar.gz"; + sha256 = "099nbif0x5cbcf18snc58nx1a3q7z0v9br9p2jiq9pcc7ic2015d"; }; configureFlags = [ diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index 0c3af79628e..4fc456523f7 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.3.1"; pname = "swagger-codegen"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oss.sonatype.org/content/repositories/releases/io/swagger/${pname}-cli/${version}/${jarfilename}"; - sha256 = "1pwxkl3r93c8hsif9xm0h1hmbjrxz1q7hr5qn5n0sni1x3c3k0d1"; + sha256 = "171qr0zx7i6cykv54vqjf3mplrf7w4a1fpq47wsj861lbf8xm322"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 236faa067ad..11500a51d92 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tcpreplay-${version}"; - version = "4.2.5"; + version = "4.2.6"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "1mw9r97blczm70rjf7p83sd1fxpzdzfvsbnjsc0m3nz16jz2c44l"; + sha256 = "07aklkc1s13hwrd098bqj8izfh8kdgs7wl9swcmkxffs6b2mcdq4"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 1f94702e830..fe728dbbd0a 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -16,14 +16,14 @@ let }); in stdenv.mkDerivation rec { pname = "telepresence"; - version = "0.65"; + version = "0.67"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "datawire"; repo = "telepresence"; rev = version; - sha256 = "01hwaybhdmfzmyzvwdx19nc5px2grf4k1vbbj9jdmsh5pmzfrby4"; + sha256 = "1bpyzgvrf43yvhwp5bzkp2qf3z9dhjma165w8ssca9g00v4b5vg9"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 2a6de71a007..ce9ed7ef53a 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -2,7 +2,7 @@ , docbook_xsl }: let - version = "1.0.63"; + version = "1.0.73"; in stdenv.mkDerivation rec { name = "tgt-${version}"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { owner = "fujita"; repo = "tgt"; rev = "v${version}"; - sha256 = "1x3irnbfikdqhlikhwqazg0g0hc1df5r2bp001f13sr0nvw28y1n"; + sha256 = "0alrdrklh5wq8x4xbp30zwnxkp0brx1mjkbp70dhaz0zbzvyydr0"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 80bac726457..02d3f2c2948 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11_kit, +{ pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11-kit, libtasn1, db, openldap, libmemcached, cyrus_sasl, openssl, softhsm, bash, python, libkrb5, quickder, unbound, ldns, gnupg, gnutls-kdh, useSystemd ? true, systemd, swig @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1qyq6da5bsgb8y9f3jhfrnhbvjns4k80lpkrydkvfx83bg494370"; }; - propagatedBuildInputs = [ python softhsm openldap p11_kit.dev p11_kit.out gnupg ]; + propagatedBuildInputs = [ python softhsm openldap p11-kit.dev p11-kit.out gnupg ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ unbound unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ] diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 0457c1ce623..a4c70744234 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }: stdenv.mkDerivation rec { - version = "0.8.1"; + version = "0.8.2"; baseName = "wavemon"; name = "${baseName}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "0mx61rzl8a66pmigv2fh75zgdalxx75a5s1b7ydbviz18ihhjyls"; + sha256 = "0rqpp7rhl9rlwnihsapaiy62v33h45fm3d0ia2nhdjw7fwkwcqvs"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 05dcf6dc594..5dd2f3b74fd 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wrk-${version}"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "wg"; repo = "wrk"; rev = version; - sha256 = "1qg6w8xz4pr227h1gxrbm6ylhqvspk95hvq2f9iakni7s56pkh1w"; + sha256 = "0dblb3qdg8mbgb8iiks0g420pza13npbr33b2xkc5dgv7kcwmvqj"; }; buildInputs = [ luajit openssl perl ]; diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index e50f208e95f..f34b01fb484 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xl2tpd-${version}"; - version = "1.3.10"; + version = "1.3.10.1"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "1z8a33hz82nla1342lfxdihssbhw9lzkgavdhl275im5byj8qgkg"; + sha256 = "0rz31bcjl7na89abn9bj5p3dbgqd6q6xsympzki15axxhyy57qan"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 6ee463cac13..263a4461530 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "zap-${version}"; - version = "2.5.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "zaproxy"; repo = "zaproxy"; rev ="${version}"; - sha256 = "12bd0f2zrs7cvcyy2xj31m3szxrr2ifdjyd24z047qm465z3hj33"; + sha256 = "1bz4pgq66v6kxmgj99llacm1d85vj8z78jlgc2z9hv0ha5i57y32"; }; buildInputs = [ jdk ant ]; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 16c0034e46f..ac64e135c2f 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, deepin-terminal }: +{ stdenv, fetchurl, readline, deepin }: let version = "1.5c"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { description = "SSH and Telnet client with ZMODEM file transfer capability"; homepage = http://zssh.sourceforge.net/; license = stdenv.lib.licenses.gpl2; - maintainers = deepin-terminal.meta.maintainers; # required by deepin-terminal + maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 152dc7dcc04..f75bf6bf162 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: stdenv.mkDerivation { - name = "DisnixWebService-0.7"; + name = "DisnixWebService-0.8"; src = fetchurl { - url = https://github.com/svanderburg/DisnixWebService/files/842861/DisnixWebService-0.7.tar.gz; - sha256 = "1zqy0badqqw8pzp9ky2aayi27v6znd64zafacvywjrn185fjz17g"; + url = https://github.com/svanderburg/DisnixWebService/files/1756703/DisnixWebService-0.8.tar.gz; + sha256 = "05hmyz17rmqlph0i321kmhabnpw84kqz32lgc5cd4shxyzsal9hz"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 830c576c406..03831f9b8b8 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.7.2"; + name = "disnix-0.8"; src = fetchurl { - url = https://github.com/svanderburg/disnix/releases/download/disnix-0.7.2/disnix-0.7.2.tar.gz; - sha256 = "1cgf7hgqrwsqgyc77sis0hr7cwgk3vx8cd4msgq11qbwywi3b6id"; + url = https://github.com/svanderburg/disnix/files/1756701/disnix-0.8.tar.gz; + sha256 = "02cmj1jqk5i90szjsn5csr7qb7n42v04rvl9syx0zi9sx9ldnb0w"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 98d1802f881..3604d011dec 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.6.1"; + name = "disnixos-0.7"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.6.1/disnixos-0.6.1.tar.gz; - sha256 = "0pqv8n9942vjwmb32m1af29fi0vjlsbwkj2c7h1xs28z6wahr7wa"; + url = https://github.com/svanderburg/disnixos/files/1756702/disnixos-0.7.tar.gz; + sha256 = "1qf9h3q1r27vg1ry55lj01knq6i0c213f6vlg7wj958mml7fk37b"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 042d2c314b1..ab0ce5d7521 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); stdenv.mkDerivation { - name = "dysnomia-0.7.1"; + name = "dysnomia-0.8"; src = fetchurl { - url = https://github.com/svanderburg/dysnomia/files/1576949/dysnomia-0.7.1.tar.gz; - sha256 = "0fyyn6654p10mrm2rlgv017d74wjb8z9h2xzv8gwdly34kifj9dh"; + url = https://github.com/svanderburg/dysnomia/files/1756700/dysnomia-0.8.tar.gz; + sha256 = "0pc4zwmmlsz02a6a4srpwdwhqrfvn3wkn22sz3fg7lwxbdbd5k0z"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 1b8c1b2f640..74c2fd59d4e 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "mynewt-newt-${version}"; - version = "1.0.0"; + version = "1.3.0"; goPackagePath = "mynewt.apache.org/newt"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "apache"; repo = "incubator-mynewt-newt"; rev = "mynewt_${builtins.replaceStrings ["."] ["_"] version}_tag"; - sha256 = "1ixqxqizd957prd4j2nijgnkv84rffj8cx5f7aqyjq9nkawjksf6"; + sha256 = "0ia6q1wf3ki2yw8ngw5gnbdrb7268qwi078j05f8gs1sppb3g563"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e8eb3050c6d..b634969c8ac 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -30,7 +30,7 @@ let buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals fromGit [ brotli ] # Since 1.12 - ++ lib.optional (stdenv.isLinux && !hostPlatform.isRiscV) libseccomp + ++ lib.optional (hostPlatform.isSeccomputable) libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) (aws-sdk-cpp.override { apis = ["s3"]; @@ -57,7 +57,7 @@ let hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system ) ''--with-system=${hostPlatform.nix.system}'' # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 - ++ lib.optional hostPlatform.isRiscV "--disable-seccomp-sandboxing"; + ++ lib.optional (!hostPlatform.isSeccomputable) "--disable-seccomp-sandboxing"; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -116,7 +116,7 @@ in rec { nix = nixStable; - nixStable = (common rec { + nix1 = (common rec { name = "nix-1.11.16"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; @@ -124,6 +124,14 @@ in rec { }; }) // { perl-bindings = nixStable; }; + nixStable = (common rec { + name = "nix-2.0"; + src = fetchurl { + url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14"; + }; + }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; + nixUnstable = (lib.lowPrio (common rec { name = "nix-2.0${suffix}"; suffix = "pre5968_a6c0b773"; diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh index e3a7d9f69e4..c7a93a71673 100755 --- a/pkgs/tools/package-management/nixui/generate.sh +++ b/pkgs/tools/package-management/nixui/generate.sh @@ -1,3 +1,4 @@ -#!/bin/sh -e +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix -node2nix -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env +exec node2nix -6 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index ee4dab5ad64..ade19b52162 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! +# This file has been generated by node2nix 1.5.1. Do not edit! {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index cdb2df80804..4973223c0ac 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,9 +1,27 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! +# This file has been generated by node2nix 1.5.1. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + }; + "binary-search-tree-0.2.4" = { + name = "binary-search-tree"; + packageName = "binary-search-tree"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz"; + sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510"; + }; + }; "isnumber-1.0.0" = { name = "isnumber"; packageName = "isnumber"; @@ -13,6 +31,15 @@ let sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01"; }; }; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + }; "nedb-1.0.2" = { name = "nedb"; packageName = "nedb"; @@ -22,24 +49,6 @@ let sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593"; }; }; - "underscore-1.8.3" = { - name = "underscore"; - packageName = "underscore"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - }; "underscore-1.4.4" = { name = "underscore"; packageName = "underscore"; @@ -49,22 +58,13 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; - "binary-search-tree-0.2.4" = { - name = "binary-search-tree"; - packageName = "binary-search-tree"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz"; - sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510"; - }; - }; - "mkdirp-0.3.5" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.5"; + "underscore-1.8.3" = { + name = "underscore"; + packageName = "underscore"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; }; }; @@ -80,13 +80,13 @@ in sha256 = "2a2b1dcd9201e306242688c6c86f520ac47ef5de841ae0d7ea6ae8ff2889c3ab"; }; dependencies = [ + sources."async-0.2.10" + sources."binary-search-tree-0.2.4" sources."isnumber-1.0.0" + sources."mkdirp-0.3.5" (sources."nedb-1.0.2" // { dependencies = [ - sources."async-0.2.10" sources."underscore-1.4.4" - sources."binary-search-tree-0.2.4" - sources."mkdirp-0.3.5" ]; }) sources."underscore-1.8.3" @@ -98,5 +98,6 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; } \ No newline at end of file diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 4f027560547..cdc035072da 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite, systemd -, gobjectIntrospection, vala_0_38, gtk_doc, autoreconfHook, autoconf-archive +, gobjectIntrospection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ]; + nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' gtkdocize diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix new file mode 100644 index 00000000000..cdee8c15d8b --- /dev/null +++ b/pkgs/tools/package-management/pacman/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl, +zlib, bzip2, lzma }: + +stdenv.mkDerivation rec { + name = "pacman-${version}"; + version = "5.0.2"; + + src = fetchurl { + url = "https://git.archlinux.org/pacman.git/snapshot/pacman-${version}.tar.gz"; + sha256 = "1lk54k7d281v55fryqsajl4xav7rhpk8x8pxcms2v6dapp959hgi"; + }; + + # trying to build docs fails with a2x errors, unable to fix through asciidoc + configureFlags = [ "--disable-doc" ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ perl libarchive openssl zlib bzip2 lzma ]; + + meta = with lib; { + description = "A simple library-based package manager"; + homepage = https://www.archlinux.org/pacman/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ mt-caret ]; + }; +} diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index edebd95303a..af1bb14d02a 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "browserpass-${version}"; - version = "2.0.10"; + version = "2.0.11"; goPackagePath = "github.com/dannyvankooten/browserpass"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "0clkalw2wz2zs0p5hsq57iqp2bdp7y17zf5l2d0y7xfddff9sd82"; + sha256 = "0d6rpkka27a57nv69yiw71jj3m6axdj5hygsz36dznnn8w76vvyv"; }; postInstall = '' diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix new file mode 100644 index 00000000000..ce7f1d0e1b4 --- /dev/null +++ b/pkgs/tools/security/diceware/default.nix @@ -0,0 +1,32 @@ +{ lib +, pythonPackages +, fetchpatch +}: + +with pythonPackages; + +buildPythonApplication rec { + pname = "diceware"; + version = "0.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0855n4dh16ws1dhw1ixxwk3wx7qr45xff7pn32pjg58p4z4cx168"; + }; + + nativeBuildInputs = [ pytestrunner ]; + + checkInputs = [ coverage pytest ]; + + # see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733 + checkPhase = '' + py.test -m 'not packaging' + ''; + + meta = with lib; { + description = "Generates passphrases by concatenating words randomly picked from wordlists"; + homepage = https://github.com/ulif/diceware; + license = licenses.gpl3; + maintainers = with maintainers; [ asymmetric ]; + }; +} diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 727fc1ccb8e..effdaaecb18 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool -, libfprint, glib, dbus_glib, polkit, nss, pam, systemd }: +, libfprint, glib, dbus-glib, polkit, nss, pam, systemd }: stdenv.mkDerivation rec { name = "fprintd-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5"; }; - buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ]; + buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ]; nativeBuildInputs = [ pkgconfig intltool ]; configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ]; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 51fff4c59ec..7f6f28593d2 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs -, glib , gnome3, gtk3, libgnome_keyring, vala, wrapGAppsHook, xorg +, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake intltool libtool vala glib encfs - gtk3 libgnome_keyring gnome3.libgee xorg.libSM xorg.libICE + gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE wrapGAppsHook ]; patches = [ ./makefile-mkdir.patch ]; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index abe7aa1fc7c..db58c6011f0 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }: buildGoPackage rec { - version = "1.6.7"; + version = "1.6.11"; name = "gopass-${version}"; goPackagePath = "github.com/justwatchcom/gopass"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "justwatchcom"; repo = "gopass"; rev = "v${version}"; - sha256 = "0al2avdvmnnz7h21hnvlacr20k50my5l67plgf4cphy52p9461vp"; + sha256 = "12pih414232bsdj1qqc04vck2p9254wjy044n5kbbdqbmfgap7sj"; }; wrapperPath = with stdenv.lib; makeBinPath ([ diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 781a988619c..725f913734d 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "1pafjwibppylfgs3rck6724dhd3vwwndb9lkc29gd64pxd3l98kz"; + sha256 = "170i2y32ykgzb1qf1wz3klwn31c09bviz4x3bnrwia65adqrj8xx"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index dbd372275bc..9e1f664f5d8 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "1.0.40"; + version = "1.0.44"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "kbfs"; rev = "v${version}"; - sha256 = "1bgbzk3ykjb6y5sa5i9f6hwcp8b21dndq7iw9m8fdxh4n4mm6n9p"; + sha256 = "1vjgzif8ki9xrlcghpzkvqwfwvaq63llf52s03m3d2vkyigmgp78"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index b0db3eea5b9..53b871306d7 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -37,10 +37,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "1.0.40-20180127033950.76a4b90c9"; + version = "1.0.44-20180223200436.9a9ccec79"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "1pskmwif5nx32d53kz8vbijv61i50kpjwyy53a37rz5nx3hgj3ar"; + sha256 = "0dmi0fw39924kpahlsk853hbmpy8a6nj78lrh1wharayjpvj6jv3"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index c221a46d5f9..331375273ed 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.40"; + version = "1.0.44"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "05x0h87dinl8zaqikr1sx38bv1n6ymxqp440b384d8y76w66rphi"; + sha256 = "1np8fk15wwqkswzcyygga52r74dp101ny63i3m1wypgfky4hvsbb"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 3776c883ac7..2a81b85482e 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - version = "3.1"; + version = "3.2"; name = "kpcli-${version}"; src = fetchurl { url = "mirror://sourceforge/kpcli/${name}.pl"; - sha256 = "06m276if13w6gd54wi8nqd1yvk2csbhdmm8pcw9aw3hdlc27gw7i"; + sha256 = "11z6zbnsmqgjw73ai4nrq4idr83flrib22d8fqh1637d36p1nnk1"; }; buildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index c655e9aecf8..2831ffd3141 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -7,14 +7,14 @@ let pname = "kwalletcli"; - version = "3.00"; + version = "3.01"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz"; - sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98"; + sha256 = "03jd7m868dc5dkmm7wbr6dj1h1kp4cb2x8ay8jwvlcbnf7srjzcs"; }; postPatch = '' diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 5e13674bb77..cbbb9b4dd3c 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.5.7"; + version = "2.6.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "19rfkiri73bi43i4yxpqrxjzpqn5rfrkq2picja5filjv14hbyly"; + sha256 = "0jymp44dmc22cdrsd5hfyv9wc8a5sq92yh9p9c0rg22g53733910"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index 6a8f6d79fe1..f5bc7a60839 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "minisign-${version}"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { repo = "minisign"; owner = "jedisct1"; rev = version; - sha256 = "15w8fgplkxiw9757qahwmgnl4bwx9mm0rnwp1izs2jcy1wy35vp8"; + sha256 = "0rgg9jb5108hd5psivlrfd8cxnjylawm0glcry8ba6zlmkv949r8"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix index f04f67c7a43..2e83c691dc7 100644 --- a/pkgs/tools/security/munge/default.nix +++ b/pkgs/tools/security/munge/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "munge-0.5.12"; + name = "munge-0.5.13"; src = fetchFromGitHub { owner = "dun"; repo = "munge"; rev = "${name}"; - sha256 = "1wvkc63bqclpm5xmp3rn199x3jqd99255yicyydgz83cixp7wdbh"; + sha256 = "1c4ff3d8ad3inbliszr4slym3b4cn19bn6mxm13mzy20jyi2rm70"; }; nativeBuildInputs = [ autoreconfHook gawk gnused ]; diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index e41ca6f0501..9bd3f372672 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,34 +1,39 @@ -{ stdenv, fetchgit, pam, xmlsec, autoconf, automake, libtool, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: +{ stdenv, fetchFromGitLab, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: let securityDependency = if stdenv.isDarwin then xmlsec else pam; -in -stdenv.mkDerivation rec { + +in stdenv.mkDerivation rec { name = "oath-toolkit-2.6.2"; - src = fetchgit { - url = "https://gitlab.com/oath-toolkit/oath-toolkit.git"; - sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; + src = fetchFromGitLab { + owner = "oath-toolkit"; + repo = "oath-toolkit"; rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414"; + sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; }; - buildInputs = [ securityDependency automake autoconf libtool pkgconfig libxml2 gtkdoc perl gengetopt bison help2man ]; + buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; + + nativeBuildInputs = [ autoreconfHook gtkdoc help2man pkgconfig ]; + + # man file generation fails when true + enableParallelBuilding = false; configureFlags = [ "--disable-pskc" ]; - preConfigure = '' - # Replicate the steps from cfg.mk - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc - touch ChangeLog - autoreconf --force --install + # Replicate the steps from cfg.mk + preAutoreconf = '' + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc + touch ChangeLog ''; - meta = { - homepage = http://www.nongnu.org/oath-toolkit/; + meta = with stdenv.lib; { description = "Components for building one-time password authentication systems"; - platforms = with stdenv.lib.platforms; linux ++ darwin; + homepage = http://www.nongnu.org/oath-toolkit/; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index f2929f3e22b..eff2211a71c 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "opencryptoki-${version}"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "opencryptoki"; repo = "opencryptoki"; rev = "v${version}"; - sha256 = "1m618pjfzw18irmh6i4pfq1gvcxgyfh9ikjn33nrdj55v2l27g31"; + sha256 = "1rf7cmibmx636vzv7p54g212478a8wim2lfjf2861hfd0m96nv4l"; }; nativeBuildInputs = [ autoreconfHook libtool bison flex ]; diff --git a/pkgs/tools/security/pass-otp/default.nix b/pkgs/tools/security/pass-otp/default.nix index 327a9680f98..7f0f44bdfa4 100644 --- a/pkgs/tools/security/pass-otp/default.nix +++ b/pkgs/tools/security/pass-otp/default.nix @@ -1,12 +1,13 @@ { stdenv, pass, fetchFromGitHub, oathToolkit }: -stdenv.mkDerivation { - name = "pass-otp"; +stdenv.mkDerivation rec { + name = "pass-otp-${version}"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tadfisher"; repo = "pass-otp"; - rev = "f2feb3082324a91089782af9b7fbb71d34aa213d"; - sha256 = "0iklvcfgw1320dggdr02lq3bc7xvnd2934l1w9kkjpbsfmhs955c"; + rev = "v${version}"; + sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb"; }; buildInputs = [ pass oathToolkit ]; @@ -23,7 +24,7 @@ stdenv.mkDerivation { description = "A pass extension for managing one-time-password (OTP) tokens"; homepage = https://github.com/tadfisher/pass-otp; license = licenses.gpl3; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with maintainers; [ jwiegley tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 24922db2e77..ad2afa8ed91 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -4,6 +4,7 @@ , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin +, tombPluginSupport ? false, tomb }: with lib; @@ -17,10 +18,19 @@ let owner = "roddhjav"; repo = "pass-${p.name}"; inherit (p) rev sha256; - })) [ - { name = "import"; rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } - { name = "update"; rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } - ]; + })) + ([ + { name = "import"; + rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; + sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } + { name = "update"; + rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; + sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } + ] ++ stdenv.lib.optional tombPluginSupport { + name = "tomb"; + rev = "3368134898a42c1b758fabac625ec240e125c6be"; + sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; } + ); in stdenv.mkDerivation rec { version = "1.7.1"; @@ -64,7 +74,8 @@ in stdenv.mkDerivation rec { tree which qrencode - ] ++ stdenv.lib.optional stdenv.isLinux procps + ] ++ optional tombPluginSupport tomb + ++ optional stdenv.isLinux procps ++ ifEnable x11Support [ dmenu xclip xdotool ]); postFixup = '' diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index c551a8161aa..ac00c1fd544 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patches = lib.optionals (gtk2 != null) [ (fetchpatch { url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch; - sha256 = "046jy7k0n7fj74s5w1h6sq1ljg8y77i0xwi301kv53bhsp0xsirx"; + sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd"; }) ]; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 87c9fc59a5b..8d520f90c65 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite -, hicolor_icon_theme, libdigidocpp, opensc, shared_mime_info, openldap -, gettext, desktop_file_utils, makeWrapper }: +, hicolor-icon-theme, libdigidocpp, opensc, shared-mime-info, openldap +, gettext, desktop-file-utils, makeWrapper }: stdenv.mkDerivation rec { @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ccid qttools pcsclite qttranslations - hicolor_icon_theme libdigidocpp opensc shared_mime_info - openldap gettext desktop_file_utils makeWrapper + hicolor-icon-theme libdigidocpp opensc shared-mime-info + openldap gettext desktop-file-utils makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index f99a9b6e556..0c6d15e7d77 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , cmake, ccid, qttools, qttranslations -, pkgconfig, pcsclite, hicolor_icon_theme +, pkgconfig, pcsclite, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ccid qttools pcsclite qttranslations - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index 5348ecce647..9c7b24be69c 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "shc-${version}"; - version = "3.9.3"; + version = "3.9.6"; rev = "${version}"; src = fetchFromGitHub { inherit rev; owner = "neurobin"; repo = "shc"; - sha256 = "00fqzg4a0f4kp4wr8swhi5zqds3gh3gf7cgi1cipn16av0818xsa"; + sha256 = "07l6m24ivjnvbglxkx9mvarpzc453qrlq5ybkyz7jdilh481aj33"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 4d355bd86b8..44c11d2814a 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,13 +1,25 @@ { stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks , libseccomp, systemd, libcap + +# for update.nix +, writeScript +, runCommand +, common-updater-scripts +, bash +, coreutils +, curl +, gnugrep +, gnupg +, gnused +, nix }: stdenv.mkDerivation rec { - name = "tor-0.3.2.9"; + name = "tor-0.3.2.10"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "03qn55c969zynnx71r82iaqnadpzq0qclq0zmjhb3n4qma8pnnj3"; + sha256 = "1vnb2wkcmm8rnz0fqi3k7arl60mpycs8rjn8hvbgv56g3p1pgpv0"; }; outputs = [ "out" "geoip" ]; @@ -34,6 +46,22 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.updateScript = import ./update.nix { + inherit (stdenv) lib; + inherit + writeScript + runCommand + common-updater-scripts + bash + coreutils + curl + gnupg + gnugrep + gnused + nix + ; + }; + meta = with stdenv.lib; { homepage = https://www.torproject.org/; repositories.git = https://git.torproject.org/git/tor; diff --git a/pkgs/tools/security/tor/update.nix b/pkgs/tools/security/tor/update.nix new file mode 100644 index 00000000000..6a7682a8f57 --- /dev/null +++ b/pkgs/tools/security/tor/update.nix @@ -0,0 +1,72 @@ +{ lib +, writeScript +, runCommand +, common-updater-scripts +, bash +, coreutils +, curl +, gnugrep +, gnupg +, gnused +, nix +}: + +with lib; + +let + downloadPageUrl = "https://dist.torproject.org"; + + # See https://www.torproject.org/docs/signing-keys.html + signingKeys = [ + # Roger Dingledine + "B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5" + "F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451" + # Nick Mathewson + "2133 BC60 0AB1 33E1 D826 D173 FE43 009C 4607 B1FB" + "B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5" + ]; +in + +writeScript "update-tor" '' +#! ${bash}/bin/bash + +set -eu -o pipefail + +export PATH=${makeBinPath [ + common-updater-scripts + coreutils + curl + gnugrep + gnupg + gnused + nix +]} + +srcBase=$(curl -L --list-only -- "${downloadPageUrl}" \ + | grep -Eo 'tor-([[:digit:]]+\.?)+\.tar\.gz' \ + | sort -Vu \ + | tail -n1) +srcFile=$srcBase +srcUrl=${downloadPageUrl}/$srcBase + +srcName=''${srcBase/.tar.gz/} +srcVers=(''${srcName//-/ }) +version=''${srcVers[1]} + +sigUrl=$srcUrl.asc +sigFile=''${sigUrl##*/} + +# upstream does not support byte ranges ... +[[ -e "$srcFile" ]] || curl -L -o "$srcFile" -- "$srcUrl" +[[ -e "$sigFile" ]] || curl -L -o "$sigFile" -- "$sigUrl" + +export GNUPGHOME=$PWD/gnupg +mkdir -m 700 -p "$GNUPGHOME" + +gpg --batch --recv-keys ${concatStringsSep " " (map (x: "'${x}'") signingKeys)} +gpg --batch --verify "$sigFile" "$srcFile" + +sha256=$(nix-hash --type sha256 --flat --base32 "$srcFile") + +update-source-version tor "$version" "$sha256" +'' diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index 7ffe8e51eac..1541575aed7 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tpm-quote-tools-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz"; - sha256 = "1d6ry2c78sgv0z4phfrwrbvgag83xnnfri2cdzrd86w4yfgnfwdf"; + sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h"; }; buildInputs = [ trousers openssl ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 002400e2c94..8118e830675 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,13 +9,13 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.9.0"; + version = "0.9.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1c3jaajf3wpjczbncvdpyy5vaa62gb9287bj2zi2khvqzvii36b0"; + sha256 = "1a12pfzln6qdff08j9l1807anrsgn3ggnaqda020p6y9zg1p8xzd"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index e9ce2913a6c..bb9fa2dd877 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, darwin +{ stdenv, fetchurl, fetchpatch, darwin # optional: , pkgconfig ? null # most of the extra deps need pkgconfig to be found , curl ? null @@ -65,6 +65,13 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.ApplicationServices ]; + # Patch fixes broken build on 18.03 + # Should be included in the next release of this package + patches = fetchpatch { + name = "collectd_kafka_fix"; + url = "https://github.com/collectd/collectd/commit/6c2eb3ad28f08f7e774b6eaea5ae01b0857cf884.patch"; + sha256 = "14wsyj5xghij9lz7c61bzdyh45zg8pv5xn490cvbqiaci948zzv6"; + }; configureFlags = [ "--localstatedir=/var" ]; # do not create directories in /var during installPhase diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index dee99586c31..e664c0ef8e2 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-template-${version}"; - version = "0.18.1"; + version = "0.19.4"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul-template"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "consul-template"; - sha256 = "0swyhc5smjbp5wql43qhpxrcbg47v89l5icb1s60gszhxizlkk7d"; + sha256 = "06agjzpax45gw7s9b69cz9w523nx7ksikqcg0z0vipwrp7pwrydd"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix index f6b9863d1be..1067e524788 100644 --- a/pkgs/tools/system/daemonize/default.nix +++ b/pkgs/tools/system/daemonize/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "daemonize-${version}"; - version = "1.7.7"; + version = "1.7.8"; src = fetchurl { url = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz"; - sha256 = "01gabcc8m4jkymd31p6v5883ii3g7126cici6rd03maf4jizxjmk"; + sha256 = "0q2c3i3si3k7wfhl6fyckkmkc81yp67pz52p3ggis79p4nczri10"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index fcc3f217d64..5f013157e32 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "envconsul-${version}"; - version = "0.6.2"; + version = "0.7.3"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/envconsul"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "envconsul"; - sha256 = "176jbicyg7vwd0kgawz859gq7ldrxyw1gx55wig7azakiidkl731"; + sha256 = "03cgxkyyynr067dg5b0lhvaxn60318fj9fh55p1n43vj5nrzgnbc"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 57cbb44cebf..9ff5f58f558 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.9.3"; + version = "3.10.0"; src = fetchFromGitHub { - sha256 = "1qd0xsw49nbj22czddxk90di31gx43hacvnmh08gp3001a8g0qcj"; + sha256 = "0qj23n5h98iirwhnjpcqzmirqf92sjd8mws5dky0pap359j6w792"; rev = version; repo = "facter"; owner = "puppetlabs"; }; CXXFLAGS = "-fpermissive"; - NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_LDFLAGS = "-lblkid"; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index eca3977f459..8ffa85a5084 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch, getopt, libcap }: stdenv.mkDerivation rec { - version = "1.20.2"; + version = "1.22"; name = "fakeroot-${version}"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2"; - sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw"; + sha256 = "1zn67sp066q63vx95r671v0ki878i40a2wa57pmh64k43r56m05x"; }; patches = stdenv.lib.optional stdenv.isLinux ./einval.patch diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 5de03199fa5..2bcab1c36b2 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "fcron-${version}"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { url = "http://fcron.free.fr/archives/${name}.src.tar.gz"; - sha256 = "0sjz7r050myj6zgixzx3pk5ff819v6b0zfn0q1lkd19jkaix0531"; + sha256 = "0q5b1fdq1rpsd4lj7v717x47pmn62hhm13394g0yxqi614xd7sls"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 08b6b480ef8..67258399d8b 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.50"; + version = "21.52"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1kkq979qqdalxdm6f0gyl3l9nk5rm6i6rbms43rmy52jfda5f5bv"; + sha256 = "1kva5bhylxbxgp2lv48av8mzcyybigj45rbwl9736l1kiv58i21r"; }; patchPhase = '' diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index ae8a1b44937..fdefb508fe5 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.0.7"; + version = "3.0.8"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "0bsl4czbwmz1f42b15y0fabys50bbfll4z73nm9xk161i2njzz6y"; + sha256 = "0pqi63v9l95px1k0dh68gmbd4pbbpwy0pcg6nr5bi0zy898if135"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 1c8b386fc8c..fa5df06dae3 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "logrotate-${version}"; - version = "3.12.3"; + version = "3.13.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "04ygb709fj4ai8m2f1c6imzcmkdvr3ib5zf5qw2lif4fsb30jvyi"; + sha256 = "0b7dnch74pddml3ysavizq26jgwdv0rjmwc8lf6zfvn9fjz19vvs"; }; # Logrotate wants to access the 'mail' program; to be done. diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix index 2663f3b852a..d34fb939822 100644 --- a/pkgs/tools/system/memtester/default.nix +++ b/pkgs/tools/system/memtester/default.nix @@ -4,6 +4,11 @@ stdenv.mkDerivation rec { name = "memtester-${version}"; version = "4.3.0"; + preConfigure = '' + echo "$CC" > conf-cc + echo "$CC" > conf-ld + ''; + src = fetchurl { url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz"; sha256 = "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr"; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 71a4db63c84..9057e5bc9c5 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.23.0"; + name = "monit-5.25.1"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "04v7sp2vc1q6h8c5j8h4izffn9d97cdj0k64m4ml00lw6wxgwffx"; + sha256 = "1g417cf6j0v6z233a3625fw1cxsh45xql7ag83jz2988n772ap2b"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index e8e487694bd..59980566290 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "nq-${version}"; - version = "0.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "nq"; rev = "v${version}"; - sha256 = "17n0yqhpsys3s872ki5rf82ky73ylahz6xi9x0rfrv7fqr5nzsz4"; + sha256 = "0348r3j5y445psm8lj35z100cfvbfp05s7ji6bxd0gg4n66l2c4l"; }; makeFlags = "PREFIX=$(out)"; postPatch = '' diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index c4347da4460..61649859397 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.5.0"; + version = "4.6.0"; name = "sleuthkit-${version}"; src = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = name; - sha256 = "0h9l9yl5ibbgriq12gizg8k0r6jw6bnii3iljjp4p963wc0ms9b9"; + sha256 = "0m5ll5sx0pxkn58y582b3v90rsfdrh8dm02kmv61psd0k6q0p91x"; }; postPatch = '' diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index ef92bdfe47e..c90c67c7737 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "balabit"; repo = "syslog-ng-incubator"; rev = name; - sha256 = "1wiv289lc5kxsd3ydyn1zvvgjrj1mv2jghv0cm425wsdsfr7fjb0"; + sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s"; }; nativeBuildInputs = [ pkgconfig autoreconfHook yacc ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 397ba053841..a629e493c92 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.11.1"; + version = "3.13.2"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "1sa51bh3rs4gq4zpgkyv94lqcx3qvxa41d2dsa7hyxidkp1rs2b4"; + sha256 = "1s6kg91sb8h2w4n60v22zis6pl2rggarpjjp00c81039jggk2gcs"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 67dd3588b00..1300a6a8765 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus-glib, libxml2 }: stdenv.mkDerivation rec { name = "thermald-${version}"; - version = "1.6"; + version = "1.7.1"; src = fetchFromGitHub { owner = "01org"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "1qzvmzkzdrmwrzfbxb2rz1i39j5zskjxiiv1w9m0xyg08p2wr7h3"; + sha256 = "0y0r8zcaxcnim3axc7kh5pm4py33pgv5mwh002cbrw6h90l2qzq1"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus_libs dbus_glib libxml2 ]; + buildInputs = [ autoconf automake libtool dbus_libs dbus-glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 0e51b061091..79ba7d89304 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { - name = "ts-0.7.6"; + name = "ts-1.0"; installPhase=''make install "PREFIX=$out"''; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://viric.name/~viric/soft/ts/${name}.tar.gz"; - sha256 = "07b61sx3hqpdxlg5a1xrz9sxww9yqdix3bmr0sm917r3rzk87lwk"; + sha256 = "15dkzczx10fhl0zs9bmcgkxfbwq2znc7bpscljm4rchbzx7y6lsg"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index e410ef1cee5..ba885555cde 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" + "HOST_ARCH=${stdenv.hostPlatform.parsed.cpu.name}" ]; postInstall = '' @@ -32,9 +33,10 @@ stdenv.mkDerivation rec { cp -r tests/devkeys* $out/share/vboot/ ''; - meta = { + meta = with stdenv.lib; { description = "Chrome OS partitioning and kernel signing tools"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ lheckemann ]; }; } diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 571dd41244b..ccd92700246 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "html-tidy-${version}"; - version = "5.4.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "htacg"; repo = "tidy-html5"; rev = version; - sha256 = "1q9ag2dh2j636fw9vyz6gg0kiss8p6lvj22h25nqsw0daan57c32"; + sha256 = "0w175c5d1babq0w1zzdzw9gl6iqbgyq58v8587s7srp05y3hwy9k"; }; nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix new file mode 100644 index 00000000000..b2219d1e66d --- /dev/null +++ b/pkgs/tools/text/ispell/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, bison, ncurses }: + +stdenv.mkDerivation rec { + name = "ispell-3.3.02"; + src = fetchurl { + url = "http://fmg-www.cs.ucla.edu/geoff/tars/${name}.tar.gz"; + sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz"; + }; + buildInputs = [ bison ncurses ]; + patches = [ + ./patches/0005-Do-not-reorder-words.patch + ./patches/0007-Use-termios.patch + ./patches/0008-Tex-backslash.patch + ./patches/0009-Fix-FTBFS-on-glibc.patch + ./patches/0011-Missing-prototypes.patch + ./patches/0012-Fix-getline.patch + ./patches/0013-Fix-man-pages.patch + ./patches/0021-Fix-gcc-warnings.patch + ./patches/0023-Exclusive-options.patch + ./patches/0024-Check-tempdir-creation.patch + ./patches/0025-Languages.patch + ./patches/0030-Display-whole-multibyte-character.patch + ]; + postPatch = '' + cat >> local.h <<EOF + #define USG + #define TERMLIB "-lncurses" + #define LANGUAGES "{american,MASTERDICTS=american.med,HASHFILES=americanmed.hash}" + #define MASTERHASH "americanmed.hash" + #define BINDIR "$out/bin" + #define LIBDIR "$out/lib" + #define ELISPDIR "{$out}/share/emacs/site-lisp" + #define TEXINFODIR "$out/share/info" + #define MAN1DIR "$out/share/man/man1" + #define MAN4DIR "$out/share/man/man4" + #define MAN45DIR "$out/share/man/man5" + #define MINIMENU + #define HAS_RENAME + EOF + + ''; + preBuild = '' + for dir in $out/share/emacs/site-lisp $out/share/info $out/share/man/man1 $out/share/man/man4 $out/bin $out/lib; do + mkdir -p $dir + done + ''; +} diff --git a/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch b/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch new file mode 100644 index 00000000000..2d74c078601 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch @@ -0,0 +1,52 @@ +From: Geoff Kuenning <geoff@cs.hmc.edu> +Date: Thu, 3 Nov 2005 14:14:15 -0800 +Subject: 0005 Do not reorder words + +ispell reorders words in personal dictionary without good reason. + +The correct approach is to build the internal data structure with variant +spellings stored in the same order as they appear in the personal dictionary. +Fortunately, this is easy, though the patch is to a different file. This one +has been tested (That's what I get for trying to rush out a fix before a +meeting!). +--- + makedent.c | 18 +++++++++++------- + 1 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/makedent.c b/makedent.c +index 0453d11..d121345 100644 +--- a/makedent.c ++++ b/makedent.c +@@ -447,9 +447,10 @@ int combinecaps (hdrp, newp) + if (retval == 0) + { + /* +- ** Couldn't combine the two entries. Add a new variant. For +- ** ease, we'll stick it right behind the header, rather than +- ** at the end of the list. ++ ** Couldn't combine the two entries. Add a new variant. We ++ ** stick it at the end of the variant list because it's ++ ** important to maintain order; this causes the personal ++ ** dictionary to have a stable ordering. + */ + forcevheader (hdrp, oldp, newp); + tdent = (struct dent *) mymalloc (sizeof (struct dent)); +@@ -460,10 +461,13 @@ int combinecaps (hdrp, newp) + return -1; + } + *tdent = *newp; +- tdent->next = hdrp->next; +- hdrp->next = tdent; +- tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS); +- hdrp->flagfield |= MOREVARIANTS; ++ for (oldp = hdrp; ++ oldp->next != NULL && oldp->flagfield & MOREVARIANTS; ++ oldp = oldp->next) ++ ; ++ tdent->next = oldp->next; ++ oldp->next = tdent; ++ oldp->flagfield |= MOREVARIANTS; + combineaffixes (hdrp, newp); + hdrp->flagfield |= (newp->flagfield & KEEP); + if (captype (newp->flagfield) == FOLLOWCASE) +-- diff --git a/pkgs/tools/text/ispell/patches/0007-Use-termios.patch b/pkgs/tools/text/ispell/patches/0007-Use-termios.patch new file mode 100644 index 00000000000..299e3c01ab1 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0007-Use-termios.patch @@ -0,0 +1,188 @@ +From: Torsten Landschoff <t.landschoff@gmx.net> +Date: Tue, 30 Mar 1999 21:05:09 +0100 +Subject: 0007 Use termios + +Use termios instead of termio (Closes: #35288). + +Patch updated on Mon, 07 Mar 2011 20:40:53 +0100 based on +ispell-3.3.02-terminal.patch from ispell-3.3.02-102.1.src.rpm +--- + term.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 58 insertions(+), 0 deletions(-) + +diff --git a/term.c b/term.c +index 4923844..47c1aa0 100644 +--- a/term.c ++++ b/term.c +@@ -87,13 +87,22 @@ static char Rcs_Id[] = + #include "proto.h" + #include "msgs.h" + #ifdef USG ++#if defined(__GLIBC__) && __GLIBC__ >= 2 ++/* Use termios under at least glibc */ ++ #include <termios.h> ++ #define USE_TERMIOS ++#else + #include <termio.h> ++#endif + #else + #ifndef __DJGPP__ + #include <sgtty.h> + #endif + #endif + #include <signal.h> ++#include <unistd.h> ++#include <sys/types.h> ++#include <sys/wait.h> + + void ierase P ((void)); + void imove P ((int row, int col)); +@@ -166,8 +175,13 @@ static int iputch (c) + } + + #ifdef USG ++#ifdef USE_TERMIOS ++static struct termios sbuf; ++static struct termios osbuf; ++#else + static struct termio sbuf; + static struct termio osbuf; ++#endif + #else + static struct sgttyb sbuf; + static struct sgttyb osbuf; +@@ -190,9 +204,13 @@ void terminit () + int tpgrp; + #else + #ifdef TIOCGPGRP ++#ifdef USE_TERMIOS ++ pid_t tpgrp; ++#else + int tpgrp; + #endif + #endif ++#endif + #ifdef TIOCGWINSZ + struct winsize wsize; + #endif /* TIOCGWINSZ */ +@@ -276,7 +294,11 @@ retry: + (void) fprintf (stderr, TERM_C_NO_BATCH); + exit (1); + } ++#ifdef USE_TERMIOS ++ (void) tcgetattr (0, &osbuf); ++#else + (void) ioctl (0, TCGETA, (char *) &osbuf); ++#endif + termchanged = 1; + + sbuf = osbuf; +@@ -285,7 +307,11 @@ retry: + sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL); + sbuf.c_cc[VMIN] = 1; + sbuf.c_cc[VTIME] = 1; ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &sbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &sbuf); ++#endif + + uerasechar = osbuf.c_cc[VERASE]; + ukillchar = osbuf.c_cc[VKILL]; +@@ -298,7 +324,11 @@ retry: + #endif + #endif + #ifdef TIOCGPGRP ++#ifdef USE_TERMIOS ++ if ((tpgrp = tcgetpgrp (0)) == -1) ++#else + if (ioctl (0, TIOCGPGRP, (char *) &tpgrp) != 0) ++#endif + { + (void) fprintf (stderr, TERM_C_NO_BATCH); + exit (1); +@@ -373,7 +403,11 @@ SIGNAL_TYPE done (signo) + if (te) + tputs (te, 1, iputch); + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &osbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &osbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &osbuf); + #ifdef TIOCSLTC +@@ -394,7 +428,11 @@ static SIGNAL_TYPE onstop (signo) + if (te) + tputs (te, 1, iputch); + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSANOW, &osbuf); /* OpenSuse: TCSADRAIN */ ++#else + (void) ioctl (0, TCSETAW, (char *) &osbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &osbuf); + #ifdef TIOCSLTC +@@ -413,7 +451,11 @@ static SIGNAL_TYPE onstop (signo) + if (termchanged) + { + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSANOW, &sbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &sbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &sbuf); + #ifdef TIOCSLTC +@@ -481,7 +523,11 @@ int shellescape (buf) + argv[i] = NULL; + + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &osbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &osbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &osbuf); + #ifdef TIOCSLTC +@@ -527,7 +573,11 @@ int shellescape (buf) + #endif + + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &sbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &sbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &sbuf); + #ifdef TIOCSLTC +@@ -563,7 +613,11 @@ void shescape (buf) + #endif + + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &osbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &osbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &osbuf); + #ifdef TIOCSLTC +@@ -611,7 +665,11 @@ void shescape (buf) + #endif + + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &sbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &sbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &sbuf); + #ifdef TIOCSLTC +-- diff --git a/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch b/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch new file mode 100644 index 00000000000..21b44d505db --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch @@ -0,0 +1,48 @@ +From: Ken Stevens <kstevens@ece.utah.edu> +Date: Sat, 15 Jul 2000 22:10:53 -0400 +Subject: 0008 Tex backslash + +Version 3.1.20 contains an irritating bug when using latex that causes all +sorts of problems when the backslash is used. (The backslash is a common +character in latex that is used, among other things, to create a forced space +similar to the tilde character.) In the current version, 3.1.20, the next TWO +characters are skipped after a backslash. This can results in misspellings and +the file being incorrectly parsed. (For example, if the text contains the +sequence `\ $' math mode will not be entered until the matching $ which should +end it, resulting in the body of the text not being spell checked and the math +region being checked.) + +Make sure to undefine NO8BIT and use a larger number for MASKBITS if you are +using iso character sets. + +http://www.kdstevens.com/~stevens/ispell-faq.html#bslash +--- + defmt.c | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/defmt.c b/defmt.c +index 35f93e4..7499752 100644 +--- a/defmt.c ++++ b/defmt.c +@@ -884,6 +884,8 @@ static int TeX_math_end (bufp) + return 0; + } + ++/* Updates bufp to point to the next character to skip. */ ++/* Should only be called on non-word characters. */ + static int TeX_math_begin (bufp) + unsigned char ** bufp; + { +@@ -902,10 +904,7 @@ static int TeX_math_begin (bufp) + if (**bufp == TEXLEFTPAREN || **bufp == TEXLEFTSQUARE) + return 1; + else if (!isalpha(**bufp) && **bufp != '@') +- { +- (*bufp)++; +- continue; +- } ++ return 0; + else if (TeX_strncmp (*bufp, "begin", 5) == 0) + { + if (TeX_math_check ('b', bufp)) +-- diff --git a/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch b/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch new file mode 100644 index 00000000000..dbe0db9a053 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch @@ -0,0 +1,23 @@ +From: Richard Braakman <dark@dark.wapit.fi> +Date: Fri, 2 Feb 2001 17:22:53 +0200 +Subject: 0009 Fix FTBFS on glibc + +Fix FTBFS on glibc (Closes: #75377) +--- + config.X | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config.X b/config.X +index 18bf621..0a47cb2 100644 +--- a/config.X ++++ b/config.X +@@ -531,7 +531,7 @@ + #endif /* NO_MKSTEMP */ + + /* Aliases for some routines */ +-#ifdef USG ++#if defined (USG) && !defined(__GLIBC__) + #define BCOPY(s, d, n) memcpy (d, s, n) + #define BZERO(d, n) memset (d, 0, n) + #define index strchr +-- diff --git a/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch b/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch new file mode 100644 index 00000000000..5e77b6a4f37 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch @@ -0,0 +1,84 @@ +From: Doug Porter <dsp@debian.org> +Date: Tue, 22 Jan 2002 10:28:44 -0500 +Subject: 0011 Missing prototypes + +Fixing implicit declarations (Closes: #130405). +--- + correct.c | 1 + + ijoin.c | 2 +- + ispell.c | 2 ++ + lookup.c | 2 ++ + tree.c | 1 + + 5 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/correct.c b/correct.c +index e2b63c8..661bf57 100644 +--- a/correct.c ++++ b/correct.c +@@ -201,6 +201,7 @@ static char Rcs_Id[] = + */ + + #include <ctype.h> ++#include <unistd.h> + #include "config.h" + #include "ispell.h" + #include "proto.h" +diff --git a/ijoin.c b/ijoin.c +index edb18d1..5da039a 100644 +--- a/ijoin.c ++++ b/ijoin.c +@@ -115,6 +115,7 @@ static char Rcs_Id[] = + */ + + #include <stdio.h> ++#include <string.h> + #include "config.h" + #include "ispell.h" + #include "proto.h" +@@ -169,7 +170,6 @@ static char * tabchar = " \t"; /* Field separator character(s) */ + static int unpairable1 = 0; /* NZ if -a1 */ + static int unpairable2 = 0; /* NZ if -a2 */ + +-extern int strcmp (); + + int main (argc, argv) /* Join files */ + int argc; /* Argument count */ +diff --git a/ispell.c b/ispell.c +index 9b509d0..59fe358 100644 +--- a/ispell.c ++++ b/ispell.c +@@ -235,6 +235,8 @@ static char Rcs_Id[] = + #include <fcntl.h> + #endif /* NO_FCNTL_H */ + #include <sys/stat.h> ++#include <ctype.h> ++#include <unistd.h> + + static void usage P ((void)); + int main P ((int argc, char * argv[])); +diff --git a/lookup.c b/lookup.c +index 648f9c8..8bf1f6c 100644 +--- a/lookup.c ++++ b/lookup.c +@@ -87,6 +87,8 @@ static char Rcs_Id[] = + + #include <fcntl.h> + ++#include <sys/types.h> ++#include <unistd.h> + #include "config.h" + #include "ispell.h" + #include "proto.h" +diff --git a/tree.c b/tree.c +index 073a6a6..c26f635 100644 +--- a/tree.c ++++ b/tree.c +@@ -94,6 +94,7 @@ static char Rcs_Id[] = + + #include <ctype.h> + #include <errno.h> ++#include <unistd.h> + #include "config.h" + #include "ispell.h" + #include "proto.h" +-- diff --git a/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch b/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch new file mode 100644 index 00000000000..ea966d67792 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch @@ -0,0 +1,62 @@ +From: Stefan Potyra <sistpoty@ubuntu.com> +Date: Sat, 3 Oct 2009 04:00:34 +0200 +Subject: 0012 Fix getline + +getline is not provided by eglibc, avoid conflict + +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549401 +Forwarded: no +--- + correct.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/correct.c b/correct.c +index 661bf57..ff7cb99 100644 +--- a/correct.c ++++ b/correct.c +@@ -246,7 +246,7 @@ static void save_root_cap P ((ichar_t * word, ichar_t * pattern, + struct flagent * sufent, + ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN], + int * nsaved)); +-static char * getline P ((char * buf, int bufsize)); ++static char * getline_ispell P ((char * buf, int bufsize)); + void askmode P ((void)); + void copyout P ((unsigned char ** cc, int cnt)); + static void lookharder P ((unsigned char * string)); +@@ -572,7 +572,7 @@ checkagain: + + imove (li - 1, 0); + (void) putchar ('!'); +- if (getline ((char *) buf, sizeof buf) == NULL) ++ if (getline_ispell ((char *) buf, sizeof buf) == NULL) + { + (void) putchar (7); + ierase (); +@@ -597,7 +597,7 @@ checkagain: + (void) printf ("%s ", CORR_C_READONLY); + } + (void) printf (CORR_C_REPLACE_WITH); +- if (getline ((char *) ctok, ctokl) == NULL) ++ if (getline_ispell ((char *) ctok, ctokl) == NULL) + { + (void) putchar (7); + /* Put it back */ +@@ -665,7 +665,7 @@ checkagain: + unsigned char buf[100]; + imove (li - 1, 0); + (void) printf (CORR_C_LOOKUP_PROMPT); +- if (getline ((char *) buf, sizeof buf) == NULL) ++ if (getline_ispell ((char *) buf, sizeof buf) == NULL) + { + (void) putchar (7); + ierase (); +@@ -1584,7 +1584,7 @@ static void save_root_cap (word, pattern, prestrip, preadd, sufstrip, sufadd, + return; + } + +-static char * getline (s, len) ++static char * getline_ispell(s, len) + register char * s; + register int len; + { +-- diff --git a/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch b/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch new file mode 100644 index 00000000000..9c0aedb67d7 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch @@ -0,0 +1,227 @@ +From: David Paleino <d.paleino@gmail.com> +Date: Mon, 9 Nov 2009 09:22:12 +0000 +Subject: 0013 Fix man pages + +Fix man pages, manpage-has-errors-from-man and hyphen-used-as-minus-sign + +Forwarded: no +--- + ispell.1X | 26 +++++++++++++------------- + ispell.5X | 26 +++++++++++++------------- + 2 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/ispell.1X b/ispell.1X +index b27b120..79894d4 100644 +--- a/ispell.1X ++++ b/ispell.1X +@@ -236,8 +236,8 @@ count affix-file + .RB [ \-p | \-s] + .RB [ \-c ] + .I expanded-file +-.IR affix [ +addition ] +-... ++.IR affix ++.RI [ +addition ] + .PP + .B icombine + .RB [ \-T +@@ -336,7 +336,7 @@ The amount of context is subject to a system-imposed limit. + If the + .B \-V + flag is given, characters that are not in the 7-bit ANSI printable +-character set will always be displayed in the style of "cat -v", even if ++character set will always be displayed in the style of "cat \-v", even if + .I ispell + thinks that these characters are legal ISO Latin-1 on your system. + This is useful when working with older terminals. +@@ -542,7 +542,7 @@ option is used to specify an alternate hashed dictionary file, + other than the default. + If the filename does not contain a "/", + the library directory for the default dictionary file is prefixed; +-thus, to use a dictionary in the local directory "-d ./xxx.hash" must ++thus, to use a dictionary in the local directory "\-d ./xxx.hash" must + be used. + This is useful to allow dictionaries for alternate languages. + Unlike previous versions of +@@ -615,7 +615,7 @@ alphabetics have no meaning - alphabetics are already accepted. + .I Ispell + will typically be used with input from a file, meaning that preserving + parity for possible 8 bit characters from the input text is OK. If you +-specify the -l option, and actually type text from the terminal, this may ++specify the \-l option, and actually type text from the terminal, this may + create problems if your stty settings preserve parity. + .PP + It is not possible to use +@@ -799,7 +799,7 @@ that the '&' is replaced by '?' (and the near-miss count is always zero). + The suggested derivations following the near misses are in the form: + .PP + .RS +-[prefix+] root [-prefix] [-suffix] [+suffix] ++[prefix+] root [\-prefix] [\-suffix] [+suffix] + .RE + .PP + (e.g., "re+fry-y+ies" to get "refries") +@@ -841,7 +841,7 @@ These output lines can be summarized as follows: + .PP + For example, a dummy dictionary containing the words "fray", "Frey", + "fry", and "refried" might produce the following response to the +-command "echo 'frqy refries | ispell -a -m -d ./test.hash": ++command "echo 'frqy refries | ispell \-a \-m \-d ./test.hash": + .RS + .nf + (#) International Ispell Version 3.0.05 (beta), 08/10/91 +@@ -1036,7 +1036,7 @@ script does this. + As an example, the command: + .PP + .RS +-echo BOTHER | ispell -c ++echo BOTHER | ispell \-c + .RE + .PP + produces: +@@ -1055,7 +1055,7 @@ it expands affix flags to produce a list of words. + For example, the command: + .PP + .RS +-echo BOTH/R | ispell -e ++echo BOTH/R | ispell \-e + .RE + .PP + produces: +@@ -1268,7 +1268,7 @@ hash file if it were added to the language table. + Only affixes that generate legal roots (found in the original input) + are listed. + .PP +-If the "-c" option is not given, the output lines are in the ++If the "\-c" option is not given, the output lines are in the + following format: + .IP + strip/add/count/bytes +@@ -1298,7 +1298,7 @@ If the + the output is made visually cleaner (but harder to post-process) + by changing it to: + .IP +--strip+add<tab>count<tab>bytes ++\-strip+add<tab>count<tab>bytes + .PP + where + .IR strip , +@@ -1313,7 +1313,7 @@ represents the ASCII tab character. + The method used to generate possible affixes will also generate + longer affixes which have common headers or trailers. For example, + the two words "moth" and "mother" will generate not only the obvious +-substitution "+er" but also "-h+her" and "-th+ther" (and possibly ++substitution "+er" but also "\-h+her" and "\-th+ther" (and possibly + even longer ones, depending on the value of + .IR min ). + To prevent +@@ -1621,7 +1621,7 @@ redirected. + However, a lot of the temporary space needed is for sorting, so TMPDIR + is only a partial help on systems with an uncooperative + .IR sort (1). +-("Cooperative" is defined as accepting the undocumented -T switch). ++("Cooperative" is defined as accepting the undocumented \-T switch). + At its peak usage, + .I munchlist + takes 10 to 40 times the original +diff --git a/ispell.5X b/ispell.5X +index ab526ed..7a1c2e5 100644 +--- a/ispell.5X ++++ b/ispell.5X +@@ -137,8 +137,8 @@ This feature can be used to convert an entire dictionary if necessary:) + echo qqqqq > dummy.dict + buildhash dummy.dict \fIaffix-file\fP dummy.hash + awk '{print "*"}END{print "#"}' \fIold-dict-file\fP \e +- | ispell -a -T \fIold-dict-string-type\fP \e +- -d ./dummy.hash -p ./\fInew-dict-file\fP \e ++ | ispell \-a \-T \fIold-dict-string-type\fP \e ++ \-d ./dummy.hash \-p ./\fInew-dict-file\fP \e + > /dev/null + rm dummy.* + .fi +@@ -622,7 +622,7 @@ or + .B stringchar + statements. + For example, if the hyphen is a boundary character (useful in French), +-the string "foo-bar" would be a single word, but "-foo" would be the ++the string "foo-bar" would be a single word, but "\-foo" would be the + same as "foo", and "foo--bar" would be two words separated by non-word + characters. + .PP +@@ -916,7 +916,7 @@ The following (suffix) replacements: + .RS + .nf + \&. > MENT +-Y > -Y,IES ++Y > \-Y,IES + .fi + .RE + .PP +@@ -956,8 +956,8 @@ Instead, you must use two separate rules: + .PP + .RS + .nf +-E > -E,IES +-Y > -Y,IES ++E > \-E,IES ++Y > \-Y,IES + .fi + .RE + .PP +@@ -1005,7 +1005,7 @@ For example, to specify words ending in "ED", write: + .PP + .RS + .nf +-E D > -ED,ING # As in covered > covering ++E D > \-ED,ING # As in covered > covering + .fi + .RE + .PP +@@ -1013,7 +1013,7 @@ If you write: + .PP + .RS + .nf +-ED > -ED,ING ++ED > \-ED,ING + .fi + .RE + .PP +@@ -1021,7 +1021,7 @@ the effect will be the same as: + .PP + .RS + .nf +-[ED] > -ED,ING ++[ED] > \-ED,ING + .fi + .RE + .PP +@@ -1047,7 +1047,7 @@ is useful, as in the following example: + .PP + .RS + .nf +-$ munchlist -c oldaffixes -l newaffixes olddict > newdict ++$ munchlist \-c oldaffixes \-l newaffixes olddict > newdict + .fi + .RE + .PP +@@ -1070,7 +1070,7 @@ flag from the English affix file: + .RS + .nf + flag *S: +- [^AEIOU]Y > -Y,IES # As in imply > implies ++ [^AEIOU]Y > \-Y,IES # As in imply > implies + [AEIOU]Y > S # As in convey > conveys + [SXZH] > ES # As in fix > fixes + [^SXZHY] > S # As in bat > bats +@@ -1099,8 +1099,8 @@ For example, we could extend the English "R" flag as follows: + flag *R: + E > R # As in skate > skater + E > RS # As in skate > skaters +- [^AEIOU]Y > -Y,IER # As in multiply > multiplier +- [^AEIOU]Y > -Y,IERS # As in multiply > multipliers ++ [^AEIOU]Y > \-Y,IER # As in multiply > multiplier ++ [^AEIOU]Y > \-Y,IERS # As in multiply > multipliers + [AEIOU]Y > ER # As in convey > conveyer + [AEIOU]Y > ERS # As in convey > conveyers + [^EY] > ER # As in build > builder +-- diff --git a/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch b/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch new file mode 100644 index 00000000000..8902018dab5 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch @@ -0,0 +1,57 @@ +From: Robert Luberda <robert@debian.org> +Date: Mon, 7 Mar 2011 22:23:56 +0100 +Subject: 0021 Fix gcc warnings + +Fix some gcc warnings. +--- + correct.c | 2 +- + languages/english/msgs.h | 8 ++++---- + tree.c | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/correct.c b/correct.c +index 79b259f..982b7c6 100644 +--- a/correct.c ++++ b/correct.c +@@ -825,7 +825,7 @@ static void inserttoken (buf, start, tok, curchar, oktochange) + for (p = start; p != *curchar; p++) + (void) putc (*p, logfile); + (void) putc (' ', logfile); +- (void) fputs (tok, logfile); ++ (void) fputs ((char*) tok, logfile); + (void) putc ('\n', logfile); + (void) fflush (logfile); + } +diff --git a/languages/english/msgs.h b/languages/english/msgs.h +index d33b42b..f9c87ca 100644 +--- a/languages/english/msgs.h ++++ b/languages/english/msgs.h +@@ -182,10 +182,10 @@ + #define CORR_C_HELP_4 "next to each one. You have the option of replacing the word%s\n" + #define CORR_C_HELP_5 "completely, or choosing one of the suggested words.%s\n" + /* You may add HELP_6 through HELP_9 if your language needs more lines */ +-#define CORR_C_HELP_6 "" +-#define CORR_C_HELP_7 "" +-#define CORR_C_HELP_8 "" +-#define CORR_C_HELP_9 "" ++#define CORR_C_HELP_6 "%s" ++#define CORR_C_HELP_7 "%s" ++#define CORR_C_HELP_8 "%s" ++#define CORR_C_HELP_9 "%s" + #define CORR_C_HELP_COMMANDS "%s\nCommands are:%s\n%s\n" + #define CORR_C_HELP_R_CMD "R Replace the misspelled word completely.%s\n" + #define CORR_C_HELP_BLANK "Space Accept the word this time only.%s\n" +diff --git a/tree.c b/tree.c +index 05a6918..229ae16 100644 +--- a/tree.c ++++ b/tree.c +@@ -351,7 +351,7 @@ void treeinsert (word, wordlen, keep) + struct dent * oldhtab; + unsigned int oldhsize; + ichar_t nword[INPUTWORDLEN + MAXAFFIXLEN]; +- int isvariant; ++ MASKTYPE isvariant; + + /* + * Expand hash table when it is MAXPCT % full. +-- diff --git a/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch b/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch new file mode 100644 index 00000000000..392d94d27d3 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch @@ -0,0 +1,38 @@ +From: Robert Luberda <robert@debian.org> +Date: Tue, 8 Mar 2011 21:12:23 +0100 +Subject: 0023 Exclusive options + +Make options -x and -b mutually exclusive +--- + ispell.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ispell.c b/ispell.c +index d130a0e..cd5802a 100644 +--- a/ispell.c ++++ b/ispell.c +@@ -279,6 +279,7 @@ int main (argc, argv) + static char outbuf[BUFSIZ]; + int argno; + int arglen; ++ int bflag = 0; + + Cmd = *argv; + +@@ -728,12 +729,13 @@ int main (argc, argv) + nodictflag++; + break; + case 'b': +- if (arglen > 2) ++ if (arglen > 2 || xflag == 1) + usage (); + xflag = 0; /* Keep a backup file */ ++ bflag = 1; + break; + case 'x': +- if (arglen > 2) ++ if (arglen > 2 || bflag == 1) + usage (); + xflag = 1; /* Don't keep a backup file */ + break; +-- diff --git a/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch b/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch new file mode 100644 index 00000000000..fd35ee34ec1 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch @@ -0,0 +1,69 @@ +From: Robert Luberda <robert@debian.org> +Date: Tue, 8 Mar 2011 21:00:31 +0100 +Subject: 0024 Check tempdir creation + +Fail if temporary directory cannot be created. +--- + findaffix.X | 3 ++- + munchlist.X | 3 ++- + subset.X | 3 ++- + zapdups.X | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/findaffix.X b/findaffix.X +index 2c253e2..58cabab 100755 +--- a/findaffix.X ++++ b/findaffix.X +@@ -179,7 +179,8 @@ TEMPDIR=`mktemp -d ${TDIR}/faffXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" + TMP=${TEMPDIR}/faff$$ + if [ "$TEMPDIR" = "$TDIR" ] + then +- TOREMOVE="${TMP}*" ++ echo "Failed to create temporary directory; exiting" ++ exit 1 + else + TOREMOVE="$TEMPDIR" + fi +diff --git a/munchlist.X b/munchlist.X +index ada3f1d..47bb908 100755 +--- a/munchlist.X ++++ b/munchlist.X +@@ -180,7 +180,8 @@ MUNCHDIR=`mktemp -d ${TDIR}/munchXXXXXXXXXX 2>/dev/null` || MUNCHDIR="$TDIR" + TMP=${MUNCHDIR}/munch$$ + if [ "$MUNCHDIR" = "$TDIR" ] + then +- TOREMOVE="${TMP}*" ++ echo "$0: Failed to create temporary directory, exiting..." ++ exit 1 + else + TOREMOVE="$MUNCHDIR" + fi +diff --git a/subset.X b/subset.X +index cc748ec..9c904cc 100755 +--- a/subset.X ++++ b/subset.X +@@ -125,7 +125,8 @@ TEMPDIR=`mktemp -d ${TDIR}/ssetXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" + TMP=${TEMPDIR}/sset$$ + if [ "$TEMPDIR" = "$TDIR" ] + then +- TOREMOVE="${TMP}*" ++ echo "$0: Failed to create temporary directory, exiting..." ++ exit 1 + else + TOREMOVE="$TEMPDIR" + fi +diff --git a/zapdups.X b/zapdups.X +index a68852a..1c610d4 100755 +--- a/zapdups.X ++++ b/zapdups.X +@@ -111,7 +111,8 @@ TEMPDIR=`mktemp -d ${TDIR}/zapdXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" + TMP=${TEMPDIR}/zapd$$ + if [ "$TEMPDIR" = "$TDIR" ] + then +- TOREMOVE="${TMP}*" ++ echo "$0: Failed to create temporary directory, exiting..." ++ exit 1 + else + TOREMOVE="$TEMPDIR" + fi +-- diff --git a/pkgs/tools/text/ispell/patches/0025-Languages.patch b/pkgs/tools/text/ispell/patches/0025-Languages.patch new file mode 100644 index 00000000000..ffa114d28a1 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0025-Languages.patch @@ -0,0 +1,81 @@ +From: Robert Luberda <robert@debian.org> +Date: Tue, 8 Mar 2011 21:02:47 +0100 +Subject: 0025 Languages + +Fix a few words. +--- + languages/english/british.0 | 1 + + languages/english/english.0 | 8 ++++++-- + languages/english/english.1 | 3 ++- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/languages/english/british.0 b/languages/english/british.0 +index dc4caa7..04d9177 100644 +--- a/languages/english/british.0 ++++ b/languages/english/british.0 +@@ -46,6 +46,7 @@ armour/DGMRSZ + armoured/U + armourer/MS + armoury/DMS ++artefact/MS + atomisation/MS + atomise/DGRSZ + authorisation/AMS +diff --git a/languages/english/english.0 b/languages/english/english.0 +index fc13212..f85e15a 100644 +--- a/languages/english/english.0 ++++ b/languages/english/english.0 +@@ -3502,6 +3502,7 @@ closure/DGMS + cloth/DGS + clothe/DGS + clothed/U ++cloths + cloud/DGS + clouded/U + cloudless/PY +@@ -10019,9 +10020,10 @@ mystery/MS + mystic/MS + mystical/Y + mysticism/S +-myth/MS ++myth/M + mythical/Y + mythology/MS ++myths + nag/MS + nail/DGRS + naive/PRY +@@ -14818,6 +14820,7 @@ tent/DGRS + tentacle/DS + tentative/PY + tented/U ++tenth + tenths + tenure/DS + tenured/U +@@ -16511,8 +16514,9 @@ youngster/MS + your/MS + yourself + yourselves +-youth/MS ++youth/M + youthful/PY ++youths + yuck + Yugoslavian/MS + yummy/R +diff --git a/languages/english/english.1 b/languages/english/english.1 +index 2bfac86..78a7edf 100644 +--- a/languages/english/english.1 ++++ b/languages/english/english.1 +@@ -7449,7 +7449,8 @@ metalloid + metallurgic + metallurgical/Y + metallurgists +-metalsmith/S ++metalsmith ++metalsmiths + metalwork/GJR + metamorphic + metamorphism +-- diff --git a/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch b/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch new file mode 100644 index 00000000000..bf687f04413 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch @@ -0,0 +1,35 @@ +From: Robert Luberda <robert@debian.org> +Date: Mon, 21 Mar 2011 10:36:15 +0100 +Subject: 0030 Display whole multibyte character + +Display all bytes from multibyte characters instead of converting them +into `cat -v' format. This fixes an ugly screen content shown while +checking UTF-8 files. +--- + correct.c | 11 +++++++---- + 1 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/correct.c b/correct.c +index 982b7c6..c91b41b 100644 +--- a/correct.c ++++ b/correct.c +@@ -733,11 +733,14 @@ static int show_char (cp, linew, output, maxw) + ichar = SET_SIZE + laststringch; + else + ichar = chartoichar (ch); +- if (!vflag && iswordch (ichar) && len == 1) ++ if (!vflag && iswordch (ichar) && len >= 1) + { +- if (output) +- (void) putchar (ch); +- (*cp)++; ++ for (i = 0; i < len; ++i) ++ { ++ if (output) ++ (void) putchar (**cp); ++ (*cp)++; ++ } + return 1; + } + if (ch == '\t') +-- diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index d8db034f151..e72824db627 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, bison, flex }: stdenv.mkDerivation rec { - name = "mairix-0.23"; + name = "mairix-0.24"; src = fetchurl { url = "mirror://sourceforge/mairix/${name}.tar.gz"; - sha256 = "1yzjpmsih6c60ks0d0ia153z9g35nj7dmk98383m0crw31dj6kl0"; + sha256 = "0msaxz5c5hf7k1ci16i67m4ynrbrpsxbqzk84nz6z2vnkh3jww50"; }; buildInputs = [ zlib bzip2 bison flex ]; diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index 9f181094ea0..7b87fd1e492 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "peco-${version}"; - version = "0.5.1"; + version = "0.5.2"; goPackagePath = "github.com/peco/peco"; subPackages = [ "cmd/peco" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "peco"; repo = "peco"; rev = "v${version}"; - sha256 = "0jnlpr3nxx8xmjb6w4jlwshzz0p9hlww9919qbkm66afv16k0vm8"; + sha256 = "0cgfwbnz4jp2nvmqf2i03xf69by8g0xgd3k5k9aj46y9hps1ka92"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 91cecce6122..e1a0a5abf96 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "xidel-${version}"; - version = "0.8.4"; + version = "0.9.6"; ## Source archive lacks file (manageUtils.sh), using pre-built package for now. #src = fetchurl { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = "mirror://sourceforge/videlibri/Xidel/Xidel%20${version}/xidel_${version}-1_amd64.deb"; - sha256 = "0gq95ag2661hsw8b7ii6z07ian832cz8g21lvq2cvps4a80ql1gi"; + sha256 = "0hskc74y7p4j1x33yx0w4fvr610p2yimas8pxhr6bs7mb9b300h7"; } else if stdenv.system == "i686-linux" then fetchurl { diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index e2445e39e3c..987d192bafc 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "html-xml-utils-${version}"; - version = "7.1"; + version = "7.6"; src = fetchurl { url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; - sha256 = "0vnmcrbnc7irrszx5h71s3mqlp9wqh19zig519zbnr5qccigs3pc"; + sha256 = "0l97ps089byy62838wf2jwvvc465iw29z9r5kwmwcq7f3bn11y3m"; }; buildInputs = [curl libiconv]; diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index a0c6a66634b..1ab00945840 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, emacs, texlive, ghostscript }: let auctex = stdenv.mkDerivation ( rec { - version = "11.90"; + version = "12.1"; name = "${pname}-${version}"; # Make this a valid tex(live-new) package; @@ -14,7 +14,7 @@ let auctex = stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "13zimbyar3159arrcklmnmjxjvibrjpkac6d53mfv03pwpc2y8rw"; + sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69"; }; buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ]; diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix deleted file mode 100644 index dc2d3e052e8..00000000000 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, tetex, unzip}: - -stdenv.mkDerivation rec { - name = "tex4ht-1.0.2009_06_11_1038"; - - src = fetchurl { - url = "http://tug.org/applications/tex4ht/tex4ht.zip"; - sha256 = "15gj18ihds6530af42clpa4zskak5kah9wzs2hd19a9ymwjsccd6"; - }; - - buildInputs = [ tetex unzip ]; - - hardeningDisable = [ "format" ]; - - buildPhase = '' - cd src - for f in tex4ht t4ht htcmd ; do - # -DENVFILE="$out/share/texmf-nix/tex4ht/base/unix/tex4ht.env" - ''${CC:-gcc} -o $f $f.c -I${tetex}/include -L${tetex}/lib -DHAVE_DIRENT_H -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea - done - cd - - ''; - - installPhase = '' - mkdir -p $out/bin - for f in src/tex4ht src/t4ht src/htcmd "bin/unix/"*; do - mv $f $out/bin/ - done - mv texmf $out/texmf-dist - ''; - - meta = { - homepage = http://tug.org/tex4ht/; - description = "A system to convert (La)TeX documents to HTML and various other formats"; - license = stdenv.lib.licenses.lppl12; - platforms = stdenv.lib.platforms.unix; - broken = true; # use the one from texlive.tex4ht - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 44c2dc16317..f022ccb829a 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -168,6 +168,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex # http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex ]; + patches = [ ./luatex-gcc7.patch ]; + configureScript = ":"; # we use static libtexlua, because it's only used by a single binary diff --git a/pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch b/pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch new file mode 100644 index 00000000000..cdaa968bd42 --- /dev/null +++ b/pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch @@ -0,0 +1,30 @@ +https://www.tug.org/pipermail/tex-live/2017-June/040192.html +--- + texk/web2c/luatexdir/luaffi/ctype.c | 4 ++++ + texk/web2c/luatexdir/luaffi/ffi.h | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +--- a/texk/web2c/luatexdir/luaffi/ctype.c ++++ b/texk/web2c/luatexdir/luaffi/ctype.c 2017-05-31 13:08:25.421741873 +0000 +@@ -245,6 +245,10 @@ void* to_cdata(lua_State* L, int idx, st + + lua_pop(L, 1); /* mt */ + cd = (struct cdata*) lua_touserdata(L, idx); ++ if (!cd) { ++ lua_pushnil(L); ++ return NULL; ++ } + *ct = cd->type; + lua_getuservalue(L, idx); + +--- a/texk/web2c/luatexdir/luaffi/ffi.h ++++ b/texk/web2c/luatexdir/luaffi/ffi.h 2017-06-01 09:12:45.128442092 +0000 +@@ -370,7 +370,7 @@ __declspec(align(16)) + #endif + struct cdata { + const struct ctype type +-#ifdef __GNUC__ ++#if 0 /* def __GNUC__ */ + __attribute__ ((aligned(16))) + #endif + ; diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix new file mode 100644 index 00000000000..c51c23d62f0 --- /dev/null +++ b/pkgs/tools/video/untrunc/default.nix @@ -0,0 +1,39 @@ +{ stdenv, gcc, libav_12, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "untrunc-${version}"; + version = "2018.01.13"; + + src = fetchFromGitHub { + owner = "ponchio"; + repo = "untrunc"; + rev = "3a2e6d0718faf06589f7b9d95c8f966348e537f7"; + sha256 = "03ka4lr69k7mikfpcpd95smzdj62v851ididnjyps5a0j06f8087"; + }; + + buildInputs = [ gcc libav_12 ]; + + # Untrunc uses the internal libav headers 'h264dec.h' and 'config.h'. + # The latter must be created through 'configure'. + libavConfiguredSrc = libav_12.overrideAttrs (oldAttrs: { + name = "libav-configured-src"; + outputs = [ "out" ]; + phases = [ "unpackPhase" "patchPhase" "configurePhase" "installPhase" ]; + installPhase = "cp -r . $out"; + }); + + buildCommand = '' + mkdir -p $out/bin + g++ -o $out/bin/untrunc \ + -Wno-deprecated-declarations \ + $src/file.cpp $src/main.cpp $src/track.cpp $src/atom.cpp $src/mp4.cpp \ + -I$libavConfiguredSrc -lavformat -lavcodec -lavutil + ''; + + meta = with stdenv.lib; { + description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video"; + license = licenses.gpl2; + homepage = https://github.com/ponchio/untrunc; + maintainers = [ maintainers.earvstedt ]; + }; +} diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index f380b62e6a4..3b3bda0f22d 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -2,12 +2,10 @@ let localPython = python.override { - packageOverrides = self: super: rec { + packageOverrides = self: super: { cement = super.cement.overridePythonAttrs (oldAttrs: rec { version = "2.8.2"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; + src = oldAttrs.src.override { inherit version; sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; }; @@ -15,30 +13,15 @@ let colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { version = "0.3.7"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; + src = oldAttrs.src.override { inherit version; sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; }; }); - docker = super.docker.overridePythonAttrs (oldAttrs: rec { - pname = "docker-py"; - version = "1.7.2"; - name = "${pname}-${version}"; - - src = super.fetchPypi { - inherit pname version; - sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm"; - }; - }); - requests = super.requests.overridePythonAttrs (oldAttrs: rec { version = "2.9.1"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; + src = oldAttrs.src.override { inherit version; sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5"; }; @@ -46,18 +29,15 @@ let semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; inherit version; + src = oldAttrs.src.override { + inherit version; sha256 = "0p5n3d6blgkncxdz00yxqav0cis87fisdkirjm0ljjh7rdfx7aiv"; }; }); tabulate = super.tabulate.overridePythonAttrs (oldAttrs: rec { version = "0.7.5"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; + src = oldAttrs.src.override { inherit version; sha256 = "03l1r7ddd1a0j2snv1yd0hlnghjad3fg1an1jr8936ksv75slwch"; }; @@ -65,7 +45,6 @@ let }; }; in with localPython.pkgs; buildPythonApplication rec { - name = "${pname}-${version}"; pname = "awsebcli"; version = "3.12.3"; @@ -81,7 +60,10 @@ in with localPython.pkgs; buildPythonApplication rec { doCheck = false; propagatedBuildInputs = [ - blessed botocore cement colorama docker dockerpty docopt pathspec pyyaml + # FIXME: Add optional docker dependency, which requires requests >= 2.14.2. + # Otherwise, awsebcli will try to install it using pip when using some + # commands (like "eb local run"). + blessed botocore cement colorama dockerpty docopt pathspec pyyaml requests semantic-version setuptools tabulate termcolor websocket_client ]; @@ -92,7 +74,7 @@ in with localPython.pkgs; buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://aws.amazon.com/elasticbeanstalk/; - description = "A command line interface for Elastic Beanstalk."; + description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; }; |