diff options
Diffstat (limited to 'pkgs/tools')
114 files changed, 993 insertions, 775 deletions
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 0af945317530..3e0680cac449 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }: stdenv.mkDerivation rec { - name = "xdg-user-dirs-0.16"; + name = "xdg-user-dirs-0.17"; src = fetchurl { url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1rp3c94hxjlfsryvwajklynfnrcvxplhwnjqc7395l89i0nb83vp"; + sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"; }; buildInputs = [ libxslt docbook_xsl makeWrapper ]; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 52ecdc267340..28839891aa55 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto -, w3m, which, gnugrep, gnused, coreutils +, w3m, which, gnugrep, gnused, coreutils, xset , mimiSupport ? false, gawk ? null }: assert mimiSupport -> gawk != null; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { file() { ${file}/bin/file "$@"; }\ awk() { ${gawk}/bin/awk "$@"; }\ sort() { ${coreutils}/bin/sort "$@"; }\ + xset() { ${xset}/bin/xset "$@"; }\ &#' -i "$out"/bin/* substituteInPlace $out/bin/xdg-open \ diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 93bbe1ce0bc5..50d0ac4f2b9a 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -1,13 +1,13 @@ { stdenv, xorg, fetchFromGitHub }: stdenv.mkDerivation rec { name = "xpointerbarrier-${version}"; - version = "17.10"; + version = "17.11"; src = fetchFromGitHub { owner = "vain"; repo = "xpointerbarrier"; rev = "v${version}"; - sha256 = "0p4qc7ggndf74d2xdf38659prx3r3lfi5jc8nmqx52c9fqdshcrk"; + sha256 = "0s6bd58xjyc2nqzjq6aglx6z64x9xavda3i6p8vrmxqmcpik54nm"; }; buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 805e5c03816c..b931f270dee2 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "0v8yflvisk94bfj0zg4ggdfwrig0f3ss9kjnws3zflsr33cb2hxy"; + sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 629c10f867fa..7e620e0c2c81 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { name = "xpra-${version}"; - version = "2.1.3"; + version = "2.2.5"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm"; + sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; }; patchPhase = '' diff --git a/pkgs/tools/admin/aws-auth/default.nix b/pkgs/tools/admin/aws-auth/default.nix deleted file mode 100644 index 9f36a6403a17..000000000000 --- a/pkgs/tools/admin/aws-auth/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, makeWrapper, jq, awscli }: - -stdenv.mkDerivation rec { - version = "unstable-2017-07-24"; - name = "aws-auth-${version}"; - - src = fetchFromGitHub { - owner = "alphagov"; - repo = "aws-auth"; - rev = "5a4c9673f9f00ebaa4bb538827e1c2f277c475e1"; - sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontBuild = true; - - # copy script and set $PATH - installPhase = '' - install -D $src/aws-auth.sh $out/bin/aws-auth - wrapProgram $out/bin/aws-auth \ - --prefix PATH : ${stdenv.lib.makeBinPath [ awscli jq ]} - ''; - - meta = { - homepage = https://github.com/alphagov/aws-auth; - description = "AWS authentication wrapper to handle MFA and IAM roles"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ris ]; - }; -} diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index eb735a04abb9..23908a8b66f9 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.14.47"; + version = "1.14.50"; src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8"; + sha256 = "1yiwj7cl9r1k9226mdq6pcmrs044k7p3d133lzgv9rb1dgp4053c"; }; # No tests included diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 78a38e07cc29..bf2b4ac6799d 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -1,19 +1,19 @@ -{ stdenv, python2Packages, fetchFromGitHub, dialog }: +{ stdenv, pythonPackages, fetchFromGitHub, dialog }: # Latest version of certbot supports python3 and python3 version of pythondialog -python2Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "certbot-${version}"; - version = "0.19.0"; + version = "0.22.2"; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; rev = "v${version}"; - sha256 = "14i3q59v7j0q2pa1dri420fhil4h0vgl4vb471hp81f4y14gq6h7"; + sha256 = "08x80x9d71j84mwjm5wzd0x5gcw6gwyvkvadi2js39js6hfnc6jg"; }; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = with pythonPackages; [ ConfigArgParse acme configobj @@ -28,7 +28,7 @@ python2Packages.buildPythonApplication rec { zope_component zope_interface ]; - buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]); + buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]); patchPhase = '' substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index ce416e7cd250..b618e71568d3 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages }: - +{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, bash }: + pythonPackages.buildPythonApplication rec { pname = "simp_le-client"; - version = "0.6.1"; - name = "${pname}-${version}"; + version = "0.8.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0x4fky9jizs3xi55cdy217cvm3ikpghiabysan71b07ackkdfj6k"; + sha256 = "0nv9mm99rm8i9flgfgwvmajbsxb5rm162nfxlq3wk66bbbyr6y1i"; }; + postPatch = '' + substituteInPlace simp_le.py \ + --replace "/bin/sh" "${bash}/bin/sh" + ''; + checkPhase = '' $out/bin/simp_le --test ''; - propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ]; + propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy ]; meta = with stdenv.lib; { homepage = https://github.com/zenhack/simp_le; description = "Simple Let's Encrypt client"; license = licenses.gpl3; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner makefu ]; platforms = platforms.all; }; } + diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index e98667b8c04a..23a33122c9fb 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -15,16 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ sqlite glib curl ]; - configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out - ''; - meta = with stdenv.lib; { license = licenses.lgpl3; description = "A music related metadata searchengine"; homepage = https://github.com/sahib/glyr; maintainers = [ maintainers.sternenseemann ]; - platforms = platforms.linux; # TODO macOS would be possible + platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 4af20f76449a..691568673df3 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -12,14 +12,14 @@ let in stdenv.mkDerivation rec { name = "bareos-${version}"; - version = "15.2.4"; + version = "17.2.5"; src = fetchFromGitHub { owner = "bareos"; repo = "bareos"; rev = "Release/${version}"; name = "${name}-src"; - sha256 = "02k6wmr2n12dc6vwda8xczmbqidg6fs8nfg9n2cwwpm3k1a21qnd"; + sha256 = "1mgh25lhd05m26sq1sj5ir2b4n7560x93ib25cvf9vmmypm1c7pn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/pkgs/tools/backup/lvmsync/Gemfile new file mode 100644 index 000000000000..a87462e2b8a2 --- /dev/null +++ b/pkgs/tools/backup/lvmsync/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org/' +gem 'lvmsync' diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/tools/backup/lvmsync/Gemfile.lock new file mode 100644 index 000000000000..1fe903f15088 --- /dev/null +++ b/pkgs/tools/backup/lvmsync/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + git-version-bump (0.15.1) + lvmsync (3.3.2) + git-version-bump (~> 0.10) + treetop + polyglot (0.3.5) + treetop (1.6.9) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + lvmsync + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix new file mode 100644 index 000000000000..dc589316a585 --- /dev/null +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -0,0 +1,37 @@ +{ stdenv, bundlerEnv, ruby, makeWrapper }: + +let + + pname = "lvmsync"; + version = (import ./gemset.nix)."${pname}".version; + +in stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + env = bundlerEnv { + name = "${pname}-${version}-gems"; + ruby = ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + + buildInputs = [ makeWrapper ]; + + phases = ["installPhase"]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/lvmsync $out/bin/lvmsync + ''; + + meta = with stdenv.lib; { + description = "Optimised synchronisation of LVM snapshots over a network"; + homepage = http://theshed.hezmatt.org/lvmsync/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/tools/backup/lvmsync/gemset.nix new file mode 100644 index 000000000000..7f80e928660b --- /dev/null +++ b/pkgs/tools/backup/lvmsync/gemset.nix @@ -0,0 +1,36 @@ +{ + git-version-bump = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xcj20gmbpqn2gcpid4pxpnimfdg2ip9jnl1572naz0magcrwl2s"; + type = "gem"; + }; + version = "0.15.1"; + }; + lvmsync = { + dependencies = ["git-version-bump" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02mdrvfibvab4p4yrdzxvndhy8drss3ri7izybcwgpbyc7isk8mv"; + type = "gem"; + }; + version = "3.3.2"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + treetop = { + dependencies = ["polyglot"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd"; + type = "gem"; + }; + version = "1.6.9"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 457170013ce5..8fa2d181de5e 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchFromGitHub, gnugrep +, fixDarwinDylibNames , legacySupport ? false }: stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { - sha256 = "15h9i9ygry0znlmvll5r21lzwgyqzynaw9q2wbj4bcn7zjy4c1pn"; + sha256 = "090ba7dnv5z2v4vlb8b275b0n7cqsdzjqvr3b6a0w65z13mgy2nw"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; }; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + makeFlags = [ "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}" ]; @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { speed is preserved and remain roughly the same at all settings, a property shared by most LZ compression algorithms, such as zlib. ''; - homepage = http://www.zstd.net/; + homepage = https://facebook.github.io/zstd/; # The licence of the CLI programme is GPLv2+, that of the library BSD-2. license = with licenses; [ gpl2Plus bsd2 ]; diff --git a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch new file mode 100644 index 000000000000..812f9954cf20 --- /dev/null +++ b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index af7a206..553ac70 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr) + INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools + else + ROOT_SBINDIR=$(PREFIX)/sbin +- INITRAMFS_DIR=/etc/initramfs-tools ++ INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools + endif + + .PHONY: all diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 0a5017de53c4..3684b216cd75 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,17 +1,19 @@ { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium -, keyutils, liburcu, zlib, libaio }: +, keyutils, liburcu, zlib, libaio, zstd }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-02-08"; + name = "bcachefs-tools-unstable-2018-03-20"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "fc96071b58c28ea492103e7649c0efd5bab50ead"; - sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy"; + rev = "ff5e165532a2eed87700649d03f91a612a58e92a"; + sha256 = "1mikhffkr4a1yhy36yh70dhgcimcpvdm5mjl5fyni0bpgqrw67dn"; }; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; + buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ]; + patches = [ ./Makefile.patch ]; installFlags = [ "PREFIX=$(out)" ]; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { description = "Tool for managing bcachefs filesystems"; homepage = https://bcachefs.org/; license = licenses.gpl2; - maintainers = with maintainers; [ davidak ]; + maintainers = with maintainers; [ davidak chiiruno]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index c558c9e8a320..a83ee771d699 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "bindfs-${version}"; src = fetchurl { - url = "http://bindfs.org/downloads/${name}.tar.gz"; + url = "https://bindfs.org/downloads/${name}.tar.gz"; sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc"; }; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 3d35a10f3b3b..4325a9355366 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -5,7 +5,7 @@ , openldap, lttngUst , babeltrace, gperf , cunit, snappy -, rocksdb +, rocksdb, makeWrapper # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -96,6 +96,7 @@ let ps.pecan ps.prettytable ps.webob + ps.cherrypy ]); in @@ -113,7 +114,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig which git python2Packages.wrapPython + pkgconfig which git python2Packages.wrapPython makeWrapper (ensureNewerSourcesHook { year = "1980"; }) ]; @@ -158,6 +159,7 @@ stdenv.mkDerivation { postFixup = '' wrapPythonPrograms + wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages} ''; enableParallelBuilding = true; @@ -165,7 +167,7 @@ stdenv.mkDerivation { outputs = [ "dev" "lib" "out" "doc" ]; meta = { - homepage = http://ceph.com/; + homepage = https://ceph.com/; description = "Distributed storage system"; license = licenses.lgpl21; maintainers = with maintainers; [ adev ak wkennington ]; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 3e4425847fa0..75a94400627d 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, help2man}: stdenv.mkDerivation rec { - version = "1.3.365"; + version = "1.4.2.439"; name = "fatsort-${version}"; src = fetchurl { - url = "mirror://sourceforge/fatsort/${name}.tar.gz"; - sha256 = "0g9zn2ns86g7zmy0y8hw1w1zhnd51hy8yl6kflyhxs49n5sc7b3p"; + url = "mirror://sourceforge/fatsort/${name}.tar.xz"; + sha256 = "1q51qq69854kr12knhyqjv7skj95qld6j04pv5v3xvxs0y9zkg5x"; }; patches = [ ./fatsort-Makefiles.patch ]; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 6ac152cb7b8c..cbfdd56cca10 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.9"; + version = "2.2.0"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0cvi5kmcrrg5pm774ligyy33fasgsfp3mr6ingjzd99rn4710bqm"; + sha256 = "0yvb9iwwmjxvck2in3ymqszaddz502v2ryk50qs0wskhbhdh96c7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index 7617d544d296..1a3352676b15 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/fcitx/fcitx-qt5; + homepage = https://github.com/fcitx/fcitx-qt5; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 27eb35ce6ae5..c7d0eecb763c 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/fcitx/fcitx; + homepage = https://github.com/fcitx/fcitx; description = "A Flexible Input Method Framework"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 53b2a3abf28e..c7f7369ba88d 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ibus-anthy-${version}"; - version = "1.5.9"; + version = "1.5.10"; meta = with stdenv.lib; { isIbusEngine = true; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; - sha256 = "1y8sf837rmp662bv6zakny0xcm7c9c5qda7f9kq9riv9ywpcbw6x"; + sha256 = "0jpqz7pb9brlqiwrbr3i6wvj3b39a9bs9lljl3qa3r77mz8y0cyc"; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 85399bffd3fe..bd22aefe2a95 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ibus-libpinyin-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; rev = version; - sha256 = "067w926gcf0kwwn71yshhjmyzkad0qsdm1dsi2xwz1j633qd4xlb"; + sha256 = "02rwddv1lxzk70946v3rjsx1p7hx1d9bnwb7cx406cbws73yb2r9"; }; buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 328c803e7dbc..ff01c8419260 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ibus-table-others-${version}"; - version = "1.3.7"; + version = "1.3.9"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz"; - sha256 = "0vmz82il796062jbla5pawsr5dqyhs7ald7xjp84zfccc09dg9kx"; + sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 8c552799432b..04a0a1e36dbc 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ibus-table-${version}"; - version = "1.9.16"; + version = "1.9.18"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "1gkb6nsibk59kp404b394sg638jgah2a2b6ffq3gkacqg5j30wjb"; + sha256 = "0isxgz7f6xhrcv5qrdd6gm3ysmqp3mi5ngnbqz08f7pclllaridp"; }; postPatch = '' diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index 982f35a9fe68..12b669c87777 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, m17n_db}: stdenv.mkDerivation rec { - name = "m17n-lib-1.7.0"; + name = "m17n-lib-1.8.0"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; - sha256 = "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f"; + sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"; }; buildInputs = [ m17n_db ]; diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix index 76f42b1976ae..6b1512e854b0 100644 --- a/pkgs/tools/misc/argtable/default.nix +++ b/pkgs/tools/misc/argtable/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.argtable.org/; + homepage = https://www.argtable.org/; description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library"; license = licenses.bsd3; maintainers = with maintainers; [ artuuge ]; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index d4ee1661801f..f66cc60c9267 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.1.10"; + version = "3.1.12"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "12phmirx0fgvykvkl8frv5agxqi7n04sxf5bpwjwq12mydq2x7kc"; + sha256 = "0k59wnch2gmbsr5dh5swbjp4rkf5c1ml0n4sxf196wdasraismc6"; }; buildInputs = [ diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 9af7de8b35e4..9b6330140097 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus -, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 +, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40 , libgudev, sane-backends, udev, gnome3, makeWrapper }: stdenv.mkDerivation rec { - name = "colord-1.4.1"; + name = "colord-1.4.2"; src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib"; + sha256 = "19zc9gldz469jshl16av7na459kwr5nhvs2pz98xm5lw582xaw2c"; }; - enableParallelBuilding = true; - mesonFlags = [ "-Denable-sane=true" "-Denable-vala=true" @@ -23,19 +21,20 @@ stdenv.mkDerivation rec { "-Denable-docs=false" ]; - patches = [ - ./fix-build-paths.patch - ]; - - nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection makeWrapper ]; + nativeBuildInputs = [ meson pkgconfig vala_0_40 ninja gettext libxml2 gobjectIntrospection makeWrapper ]; - buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus - bash-completion argyllcms libgudev sane-backends ]; + buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ]; postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; + PKG_CONFIG_SYSTEMD_TMPFILESDIR = "lib/tmpfiles.d"; + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "share/bash-completion/completions"; + PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + postFixup = '' wrapProgram "$out/libexec/colord-session" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch deleted file mode 100644 index d4bf0f36ad74..000000000000 --- a/pkgs/tools/misc/colord/fix-build-paths.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/contrib/session-helper/meson.build -+++ b/contrib/session-helper/meson.build -@@ -21,7 +21,7 @@ - output : 'colord-session.service', - configuration : con2, - install: true, -- install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'), -+ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'), - ) - endif - ---- a/data/meson.build -+++ b/data/meson.build -@@ -8,13 +8,13 @@ - - if get_option('enable-systemd') - install_data('colord.conf', -- install_dir: systemd.get_pkgconfig_variable('tmpfilesdir') -+ install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d') - ) - endif - - if get_option('enable-bash-completion') - install_data('colormgr', -- install_dir: bash_completion.get_pkgconfig_variable('completionsdir') -+ install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d') - ) - endif - -@@ -31,7 +31,7 @@ - output : 'colord.service', - configuration : con2, - install: true, -- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), -+ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'), - ) - endif - -@@ -50,5 +50,5 @@ - output : 'org.freedesktop.ColorManager.conf', - configuration : con2, - install: true, -- install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d') , -+ install_dir: join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d') , - ) ---- a/meson.build -+++ b/meson.build -@@ -258,6 +258,3 @@ - subdir('policy') - subdir('rules') - subdir('src') -- --meson.add_install_script('meson_post_install.sh', -- localstatedir, get_option('with-daemon-user')) ---- a/rules/meson.build -+++ b/rules/meson.build -@@ -9,5 +9,5 @@ - sensor_rules_in, - '95-cd-devices.rules', - ], -- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') -+ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') - ) ---- a/src/plugins/meson.build -+++ b/src/plugins/meson.build -@@ -66,7 +66,7 @@ - install_dir: join_paths(get_option('libdir'), 'colord-plugins'), - c_args : [ - cargs, -- '-DCOLORD_SANE_BINARY="' + join_paths(get_option('libexecdir'), 'colord-sane' + '"'), -+ '-DCOLORD_SANE_BINARY="' + join_paths(get_option('prefix'), get_option('libexecdir'), 'colord-sane' + '"'), - ], - dependencies : [ - gio, diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index e6ff7e99353b..253e6a50b361 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-2.04"; + name = "convmv-2.05"; src = fetchurl { url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; - sha256 = "075xn1ill26hbhg4nl54sp75b55db3ikl7lvhqb9ijvkpi67j6yy"; + sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk"; }; preBuild='' diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 810bf06527b0..a08f465d6cd7 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -54,7 +54,8 @@ in stdenv.mkDerivation rec { wrapProgram "$i" \ --prefix PERL5LIB : "$PERL5LIB" \ --prefix PERL5LIB : "$out/share/devscripts" \ - --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" + --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" \ + --prefix PATH : "${dpkg}/bin" done ''; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index e4968b12e6cc..246898a72317 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { meta = { description = "EDID decoder and conformance tester"; - homepage = http://cgit.freedesktop.org/xorg/app/edid-decode/; + homepage = https://cgit.freedesktop.org/xorg/app/edid-decode/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.chiiruno ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 3c8262068693..889f9d56d93c 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "6.3.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1q666k7rssjd2cbkm8bm2gsn5shlkh756qpam53kibi5ahrwa7dc"; + sha256 = "0qykzkwrj4w3i5h1a328kadd7fgd91w0z2n4xr6i3csyaiwwgd1x"; }; - cargoSha256 = "1dikix9d46f0ydi81ray2vdvsy6y326w8ql6c89zx0p9cjm8m83r"; + cargoSha256 = "1qicgfaqzjm7sjzgxkci6bg495n227pyicj4ycds5z6mfy15hi4q"; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 592707be20ab..e7e40bc851e2 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "0.18.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "0qdld8jy1rkpfzbfhnssr58q1gciln3pw9m6fj0jarfgja4gj31l"; + sha256 = "1v79q5s4lm8scrz9nmqcszyh40is6k7hkr15r4aljyfbp1gamsfs"; }; doCheck = true; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 99c54b6d3964..451bcae1efd1 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.30.0"; + name = "gparted-0.31.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${name}.tar.gz"; - sha256 = "0jngbsbvg8k8vbpsphqbk8br2cbmxhabbm2c5bmxm2q5zvpr64fk"; + sha256 = "1fh7rpgb4xxdhgyjsirb83zvjfc5mfngb8a1pjbv7r6r6jj4jyrv"; }; configureFlags = [ "--disable-doc" ]; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index d4322f051d0a..f7cdf5ca608b 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,18 +1,28 @@ -{ fetchurl, stdenv, smartmontools, gtkmm2, libglademm, pkgconfig, pcre }: +{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }: stdenv.mkDerivation rec { - version="0.8.7"; + version="1.1.3"; name = "gsmartcontrol-${version}"; src = fetchurl { - url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; - sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh"; + url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; + sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ smartmontools gtkmm2 libglademm pcre ]; + patches = [ + ./fix-paths.patch + ]; - #installTargets = "install datainstall"; + nativeBuildInputs = [ autoreconfHook gettext pkgconfig wrapGAppsHook ]; + buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ]; + + enableParallelBuilding = true; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}" + ) + ''; meta = { description = "Hard disk drive health inspection tool"; @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { It allows you to inspect the drive's SMART data to determine its health, as well as run various tests on it. ''; - homepage = http://gsmartcontrol.sourceforge.net/; + homepage = https://gsmartcontrol.sourceforge.io/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch new file mode 100644 index 000000000000..905b63bee0c4 --- /dev/null +++ b/pkgs/tools/misc/gsmartcontrol/fix-paths.patch @@ -0,0 +1,58 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -475,6 +475,7 @@ + + + AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \ ++ data/org.gsmartcontrol.policy \ + data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \ + debian.dist/changelog \ + src/gsc_winres.rc src/gsmartcontrol.exe.manifest \ +diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in +--- a/data/gsmartcontrol-root.in ++++ b/data/gsmartcontrol-root.in +@@ -8,7 +8,7 @@ + # Run gsmartcontrol with root, asking for root password first. + # export GSMARTCONTROL_SU to override a su command (e.g. "kdesu -c"). + +-EXEC_BIN="@prefix@/sbin/gsmartcontrol"; ++EXEC_BIN="@prefix@/bin/gsmartcontrol"; + prog_name="gsmartcontrol" + + +@@ -118,7 +118,7 @@ + # Add @prefix@/sbin as well (freebsd seems to require it). + # Note that beesu won't show a GUI login box if /usr/sbin is before /usr/bin, + # so add it first as well. +-EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/sbin"; ++EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/bin"; + export PATH="$EXTRA_PATHS:$PATH" + + +diff --git a/data/org.gsmartcontrol.policy b/data/org.gsmartcontrol.policy.in +rename from data/org.gsmartcontrol.policy +rename to data/org.gsmartcontrol.policy.in +--- a/data/org.gsmartcontrol.policy ++++ b/data/org.gsmartcontrol.policy.in +@@ -12,7 +12,7 @@ + <allow_inactive>auth_admin</allow_inactive> + <allow_active>auth_admin</allow_active> + </defaults> +- <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gsmartcontrol</annotate> ++ <annotate key="org.freedesktop.policykit.exec.path">@prefix@/bin/gsmartcontrol</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> + +diff --git a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -24,7 +24,7 @@ + # endif + + +-sbin_PROGRAMS = gsmartcontrol ++bin_PROGRAMS = gsmartcontrol + + gsmartcontrol_LDADD = $(top_builddir)/src/applib/libapplib.a \ + $(top_builddir)/src/libdebug/libdebug.a \ diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix new file mode 100644 index 000000000000..db18cae77b1f --- /dev/null +++ b/pkgs/tools/misc/h5utils/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, lib +, hdf5, libpng, libjpeg +, hdf4 ? null +, libmatheval ? null +}: + +stdenv.mkDerivation rec { + version = "1.13.1"; + name = "h5utils-${version}"; + + # fetchurl is used instead of fetchFromGitHub because the git repo version requires + # additional tools to build compared to the tarball release; see the README for details. + src = fetchurl { + url = "https://github.com/stevengj/h5utils/releases/download/${version}/h5utils-${version}.tar.gz"; + sha256 = "0rbx3m8p5am8z5m0f3sryryfc41541hjpkixb1jkxakd9l36z9y5"; + }; + + # libdf is an alternative name for libhdf (hdf4) + preConfigure = lib.optionalString (hdf4 != null) + '' + substituteInPlace configure \ + --replace "-ldf" "-lhdf" \ + ''; + + preBuild = lib.optionalString hdf5.mpiSupport "export CC=${hdf5.mpi}/bin/mpicc"; + + buildInputs = with lib; [ hdf5 libjpeg libpng ] ++ optional hdf5.mpiSupport hdf5.mpi + ++ optional (hdf4 != null) hdf4 + ++ optional (libmatheval != null) libmatheval; + + meta = with lib; { + description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; + homepage = https://github.com/stevengj/h5utils; + license = with licenses; [ mit gpl2 ]; + maintainers = with maintainers; [ sfrijters ]; + }; + +} diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index bc8ea769e8be..1946cbeb3f01 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { name = "hdf-${version}"; - version = "4.2.12"; + version = "4.2.13"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; - sha256 = "020jh563sjyxsgml8l809d2i1d4ms9shivwj3gbm7n0ilxbll8id"; + sha256 = "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm"; }; buildInputs = [ diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 322151739843..0b04ee1e2811 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "hyperfine-${version}"; - version = "0.4.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "hyperfine"; rev = "refs/tags/v${version}"; - sha256 = "1ynqyacbx0x971lyd1k406asms58bc7vzl8gca3sg34rx0hx3wzi"; + sha256 = "0prmnhyp20w71l3mjqgdr38q94cqr1xayzgj7ibbq2hdick4w5nn"; }; - cargoSha256 = "109yv1618bi19vh1jjv2ki06mafhcrv35a3a1zsr34kg3gsjv0rb"; + cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s"; meta = with stdenv.lib; { description = "Command-line benchmarking tool"; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 7e5a464764ab..0a7073f4d489 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -1,19 +1,33 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "lf-unstable-${version}"; - version = "2018-01-11"; + name = "lf-${version}"; + version = "1"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "58538c802044a3a2590ebe4979f3c85d807ea2d9"; # nightly - sha256 = "0xp5accliwz1d0nbsc6cnsv38czcfqn5nyxfndkpw8jkh8w2pm9p"; + rev = "r${version}"; + sha256 = "0mq83m7mvavd0dzhk8g6ffldy57i22n0846yzqnlz733chiy3anz"; }; goPackagePath = "github.com/gokcehan/lf"; goDeps = ./deps.nix; + # TODO: Setting buildFlags probably isn't working properly. I've tried a few + # variants, e.g.: + # - buildFlags = "-ldflags \"-s -w -X 'main.gVersion=${version}'\""; + # - buildFlags = "-ldflags \\\"-X ${goPackagePath}/main.gVersion=${version}\\\""; + + # Override the build phase (to set buildFlags): + buildPhase = '' + runHook preBuild + runHook renameImports + cd go/src/${goPackagePath} + go install -ldflags="-s -w -X main.gVersion=${version}" + runHook postBuild + ''; + meta = with stdenv.lib; { description = "A terminal file manager written in Go and heavily inspired by ranger"; longDescription = '' diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 6c1e07667b35..ec9dc30e0cd6 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "aa4a75b1c20a2b03751b1a9f7e41d58bd6f71c43"; # master - sha256 = "1xfd0mq6jkq55dx14nksyyfc66qla7cz0xxscpw07b25qmww9518"; + rev = "e2050e41c8847748ec5288741c0b19a8cb26d084"; # master + sha256 = "181b1df2b6fcn5wizq2qqxl1kwqbih5k15n08rx3bcz36q34n23s"; }; } { diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index d2f988396ca7..8d55b2cdc00e 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin-client"; - version = "3.4.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "1vdp6qgpxshh6nhdvr81z3nvh42wgmsm4prli4ajigwp970y8p56"; + sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index e9f4c977779f..e49614834ae3 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin-explorer"; - version = "3.4.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "0rxiimklzqyp9vswznz9aia71dn6jxm2pxx5ljlhzs5rs583cj00"; + sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 5fbc2f403087..fbfcfc100740 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin-protocol"; - version = "3.4.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "1wrlzani3wdjkmxqwjh30i8lg3clrzwcx2di7c9sdpnsbda985gb"; + sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 623f34e8b615..f8910f83ec57 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin"; - version = "3.4.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1h6h7cxbwkdk8bzbkfvnrrdzajw1d4lr8wqs66is735bksh6gk1y"; + sha256 = "1qy637hpv6kkhf602yxxi5b9j0qhsp644fazljcqbnxzp7vv2qyd"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index ed6c08d55545..664c5cc8e78e 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20171011"; + version = "20180318"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1z6is359dnlf61n6ida9ivghafzz5m8cf4hzdhma8nxv12brfbzb"; + sha256 = "1sh0ipf77aav1k17dgl9dcjlb17zygs07x01g0nn0cg7yw5y5hfk"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/nixbot/default.nix b/pkgs/tools/misc/nixbot/default.nix deleted file mode 100644 index 554aa0bccee2..000000000000 --- a/pkgs/tools/misc/nixbot/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, python3Packages, fetchFromGitHub }: - -python3Packages.buildPythonApplication rec { - name = "nixbot-unstable-2016-10-09"; - - src = fetchFromGitHub { - owner = "domenkozar"; - repo = "nixbot"; - rev = "dc490e4954cb08f0eff97f74ad39dedb54670aa9"; - sha256 = "1l8rlhd2b7x5m79vb2vgszachygasv0pk8drnwgxyvsn0k88xcan"; - }; - - propagatedBuildInputs = with python3Packages; [ - pygit2 pyramid waitress github3_py - ]; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Github bot for reviewing/testing pull requests with the help of Hydra"; - maintainers = with maintainers; [ domenkozar fpletz globin ]; - license = licenses.asl20; - homepage = https://github.com/domenkozar/nixbot; - }; -} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 7287da2079a1..e42a45b260eb 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180222"; + name = "parallel-20180322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1bwx1rcrqz04d8fajlllhrfkjqxg0mfvsd86wf6p067gmgdrf6g8"; + sha256 = "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 447ef9dd5ec5..2eb6f1aa8e6d 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { # "java -jar plantuml.jar -license" says GPLv3 or later license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index e0fefe85b9fd..72ea7f2ea0b0 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "recoverjpeg-${version}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz"; - sha256 = "00zi23l4nq9nfjg1zzbpsfxf1s47r5w713aws90w13fd19jqn0rj"; + sha256 = "01vayn2b3mqmyqz2ka2j3k4a93bjdvkhv5ry9207v04r83r7iwfp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index 83c384e5ec0a..e0d1ff208353 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "smc-6.6.0"; + name = "smc-6.6.3"; src = fetchurl { - url = "mirror://sourceforge/project/smc/smc/6_6_0/smc_6_6_0.tgz"; - sha256 = "14lf286dslm7ymkr4my1xgjvwvqc9181mwkfr65ab49cxl0q85wz"; + url = "mirror://sourceforge/project/smc/smc/6_6_3/smc_6_6_3.tgz"; + sha256 = "1gv0hrgdl4wp562virpf9sib6pdhapwv4zvwbl0d5f5xyx04il11"; }; # Prebuilt Java package. diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/tools/misc/t/Gemfile.lock index d85f5a1a7526..6506d32b0ce9 100644 --- a/pkgs/tools/misc/t/Gemfile.lock +++ b/pkgs/tools/misc/t/Gemfile.lock @@ -1,52 +1,63 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.3.7) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) buftok (0.2.0) - equalizer (0.0.9) - faraday (0.9.1) - multipart-post (>= 1.2, < 3) - geokit (1.9.0) - multi_json (>= 1.3.2) - htmlentities (4.3.3) - http (0.6.3) + domain_name (0.5.20170404) + unf (>= 0.0.5, < 1.0.0) + equalizer (0.0.11) + geokit (1.11.0) + htmlentities (4.3.4) + http (3.0.0) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (>= 2.0.0.pre.pre2, < 3) http_parser.rb (~> 0.6.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + http-form_data (2.1.0) http_parser.rb (0.6.0) - json (1.8.2) launchy (2.4.3) addressable (~> 2.3) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - multi_json (1.11.0) multipart-post (2.0.0) - naught (1.0.0) - oauth (0.4.7) - retryable (2.0.1) + naught (1.1.0) + oauth (0.5.4) + public_suffix (3.0.2) + retryable (2.0.4) simple_oauth (0.3.1) - t (2.9.0) - geokit (>= 1.8.3, < 2) + t (3.1.0) + geokit (~> 1.9) htmlentities (~> 4.3) launchy (~> 2.4) - oauth (~> 0.4.7) + oauth (~> 0.5.1) retryable (~> 2.0) thor (>= 0.19.1, < 2) - twitter (~> 5.13) - thor (0.19.1) - thread_safe (0.3.5) - twitter (5.14.0) + twitter (~> 6.0) + thor (0.20.0) + thread_safe (0.3.6) + twitter (6.2.0) addressable (~> 2.3) buftok (~> 0.2.0) - equalizer (~> 0.0.9) - faraday (~> 0.9.0) - http (~> 0.6.0) + equalizer (~> 0.0.11) + http (~> 3.0) + http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) - json (~> 1.8) memoizable (~> 0.4.0) + multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.5) PLATFORMS ruby DEPENDENCIES t + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index ad9e0949ce87..b9c93c639549 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, ruby }: bundlerEnv { - name = "t-2.9.0"; + name = "t-3.1.0"; inherit ruby; gemfile = ./Gemfile; diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/tools/misc/t/gemset.nix index 6c721111c67e..268cbae5e80e 100644 --- a/pkgs/tools/misc/t/gemset.nix +++ b/pkgs/tools/misc/t/gemset.nix @@ -1,185 +1,203 @@ { - "addressable" = { - version = "2.3.7"; + addressable = { + dependencies = ["public_suffix"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; - sha256 = "1x1401m59snw59c2bxr10jj10z1n4r4jvz8c55d0c3sh2smbl8kh"; }; + version = "2.5.2"; }; - "buftok" = { + buftok = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; + type = "gem"; + }; version = "0.2.0"; + }; + domain_name = { + dependencies = ["unf"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; type = "gem"; - sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; }; + version = "0.5.20170404"; }; - "equalizer" = { - version = "0.0.9"; + equalizer = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; type = "gem"; - sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr"; }; + version = "0.0.11"; }; - "faraday" = { - version = "0.9.1"; + geokit = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iryy9gcrayd4c2xfxnb0acnmqcz5bv7pp6ilaifwlwl6jnc40dm"; type = "gem"; - sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn"; }; - dependencies = [ - "multipart-post" - ]; + version = "1.11.0"; }; - "geokit" = { - version = "1.9.0"; + htmlentities = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; type = "gem"; - sha256 = "1bpkjz2q8hm7i4mrrp1if51zq6fz3qkqj55qwlb7jh9jlgyvjmqy"; }; - dependencies = [ - "multi_json" - ]; + version = "4.3.4"; }; - "htmlentities" = { - version = "4.3.3"; + http = { + dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mqjjqgdq83rz3nvq69bn0n5x45hnwd4794fmfbi0wrd1n47syfs"; type = "gem"; - sha256 = "0v4m2pn6q2h7iqdkxk9z3j4828harcjgk1h77v9i4x87avv5130p"; }; + version = "3.0.0"; }; - "http" = { - version = "0.6.3"; + http-cookie = { + dependencies = ["domain_name"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; type = "gem"; - sha256 = "0wmj5i1l0f6ajhs8wi1h3sdwhrl00llrpsmh6xs9dwjm2amvdvxv"; }; - dependencies = [ - "http_parser.rb" - ]; + version = "1.0.3"; + }; + http-form_data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j90dydw36h9s09n760aid8asabigqcgi7agsyqh53iz5s3qv9v0"; + type = "gem"; + }; + version = "2.1.0"; }; "http_parser.rb" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; version = "0.6.0"; + }; + launchy = { + dependencies = ["addressable"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; type = "gem"; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; }; + version = "2.4.3"; }; - "json" = { - version = "1.8.2"; + memoizable = { + dependencies = ["thread_safe"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; type = "gem"; - sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; }; + version = "0.4.2"; }; - "launchy" = { - version = "2.4.3"; + multipart-post = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; type = "gem"; - sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; }; - dependencies = [ - "addressable" - ]; + version = "2.0.0"; }; - "memoizable" = { - version = "0.4.2"; + naught = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wwjx35zgbc0nplp8a866iafk4zsrbhwwz4pav5gydr2wm26nksg"; type = "gem"; - sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; }; - dependencies = [ - "thread_safe" - ]; + version = "1.1.0"; }; - "multi_json" = { - version = "1.11.0"; + oauth = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; type = "gem"; - sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; }; + version = "0.5.4"; }; - "multipart-post" = { - version = "2.0.0"; + public_suffix = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; }; + version = "3.0.2"; }; - "naught" = { - version = "1.0.0"; + retryable = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pxv5xgr08s9gv5npj7h3raxibywznrv2wcrb85ibhlhzgzcxggf"; type = "gem"; - sha256 = "04m6hh63c96kcnzwy5mpl826yn6sm465zz1z87mmsig86gqi1izd"; }; + version = "2.0.4"; }; - "oauth" = { - version = "0.4.7"; + simple_oauth = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l"; type = "gem"; - sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w"; }; + version = "0.3.1"; }; - "retryable" = { - version = "2.0.1"; + t = { + dependencies = ["geokit" "htmlentities" "launchy" "oauth" "retryable" "thor" "twitter"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qj5zqc819yiscqbyb93alxillyli5ajvrr4gzq52clgkvyap7bd"; type = "gem"; - sha256 = "0wg4vh76cmhwzwrgd0k6kbx4dlp4r98l8yizr72lmzph187dg48f"; }; + version = "3.1.0"; }; - "simple_oauth" = { - version = "0.3.1"; + thor = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl"; type = "gem"; - sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l"; }; + version = "0.20.0"; }; - "t" = { - version = "2.9.0"; + thread_safe = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; type = "gem"; - sha256 = "0qdsyblnnan2wcvql2mzg10jaj3gfv5pbfac54b1y7qkr56dc4dv"; }; - dependencies = [ - "geokit" - "htmlentities" - "launchy" - "oauth" - "retryable" - "thor" - "twitter" - ]; + version = "0.3.6"; }; - "thor" = { - version = "0.19.1"; + twitter = { + dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjyz3viabz3xs5d9aad18zgdbhfwm51jsnzigc8kxk77p1x58n5"; type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; }; + version = "6.2.0"; }; - "thread_safe" = { - version = "0.3.5"; + unf = { + dependencies = ["unf_ext"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; type = "gem"; - sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; }; + version = "0.1.4"; }; - "twitter" = { - version = "5.14.0"; + unf_ext = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; type = "gem"; - sha256 = "0vx7x3fmwgk3axqyw9hyf6yh99kx3ssdy14w2686hz7c4v3qwlc5"; }; - dependencies = [ - "addressable" - "buftok" - "equalizer" - "faraday" - "http" - "http_parser.rb" - "json" - "memoizable" - "naught" - "simple_oauth" - ]; + version = "0.0.7.5"; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index 29bd3235dfb9..f37892a231a5 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, coreutils, gawk }: stdenv.mkDerivation rec { - name = "txt2man-1.5.6"; + name = "txt2man-${version}"; + version = "1.6.0"; src = fetchurl { - url = "http://mvertes.free.fr/download/${name}.tar.gz"; - sha256 = "0ammlb4pwc4ya1kc9791vjl830074zrpfcmzc18lkcqczp2jaj4q"; + url = "https://github.com/mvertes/txt2man/archive/${name}.tar.gz"; + sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn"; }; preConfigure = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 316d3f181fef..cbfbf77739ba 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 { pname = "youtube-dl"; - version = "2018.03.14"; + version = "2018.03.26.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0j8j797gqc29fd5ra3cjvwkp8dgvigdydsj0zzjs05zccfqrj9lh"; + sha256 = "1sbapwx2zdhprvmljqs6rzxnhiyfpxgin7qyjdrg6h25hhq63vss"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 9ff0376c8bcf..452837ef2e4f 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssh}: stdenv.mkDerivation rec { - name = "autossh-1.4e"; + name = "autossh-1.4f"; src = fetchurl { url = "http://www.harding.motd.ca/autossh/${name}.tgz"; - sha256 = "0mlicw28vq2jxa0jf0dys5ja75v0fxpjavlq9dpif6bnknji13ly"; + sha256 = "1wpqwa2872nqgqbhnb6nnkrlzpdawd5k69gh1qp68354pvhyawh1"; }; buildInputs = [ openssh ]; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 02d5a3073f4b..93529fe4ce53 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ udev ]; + preConfigure = "patchShebangs ./configure"; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index e008c9183c98..1b306bc5e363 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,26 +1,30 @@ -{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, gnome2, makeWrapper}: +{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, wrapGAppsHook}: + +let + pname = "gupnp-tools"; + version = "0.8.13"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; -stdenv.mkDerivation rec { - name = "gupnp-tools-${version}"; - majorVersion = "0.8"; - version = "${majorVersion}.13"; src = fetchurl { - url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp-av - gnome2.gnome_icon_theme makeWrapper]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gnome3.defaultIconTheme ]; - 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" - done - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Set of utilities and demos to work with UPnP"; + homepage = https://wiki.gnome.org/Projects/GUPnP; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix new file mode 100644 index 000000000000..ae8d3d964832 --- /dev/null +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, autoreconfHook +, pkgconfig, libevent, pcre, zlib, openssl +}: + +stdenv.mkDerivation rec { + name = "memtier-benchmark-${version}"; + version = "1.2.11"; + + src = fetchFromGitHub { + owner = "redislabs"; + repo = "memtier_benchmark"; + rev = "refs/tags/${version}"; + sha256 = "0a1lz4j9whj6yf94xn7rna00abgrv2qs30vmpns1n9zqlpaj6b6a"; + }; + + patchPhase = '' + substituteInPlace ./configure.ac \ + --replace '1.2.8' '${version}' + ''; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libevent pcre zlib openssl ]; + + meta = { + description = "Redis and Memcached traffic generation and benchmarking tool"; + homepage = https://github.com/redislabs/memtier_benchmark; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index a451750503ab..9809b330faba 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.20180203"; + version = "1.5.20180223"; src = fetchurl { - sha256 = "1yiri887s8wxh4zrjc5dw19gyypqg63962aimcgd19blvpbwnfcv"; + sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv"; 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 1e0200794305..a9e67701eb03 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.20180203"; + name = "miniupnpd-2.0.20180222"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1djb0w76yd5jyqm5mzmxlxikxzzwqzjgy75h8saxc3rlz3r1a346"; + sha256 = "1hdpyvz1z6crpa7as3srmbl64fx0k4wjra57jw7qaysdsb1b2kqr"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix new file mode 100644 index 000000000000..e9af9dc980e7 --- /dev/null +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig +, libmbim, libqmi, systemd, fetchpatch }: + +stdenv.mkDerivation rec { + name = "modem-manager-${version}"; + pname = "ModemManager"; + version = "1.7.990"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; + }; + + nativeBuildInputs = [ gettext pkgconfig ]; + + buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ]; + + patches = [ + # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt) + (fetchpatch { + url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609"; + sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j"; + }) + ]; + + configureFlags = [ + "--with-polkit" + "--with-udev-base-dir=$(out)/lib/udev" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-suspend-resume=systemd" + ]; + + installFlags = [ "DESTDIR=\${out}" ]; + + preInstall = '' + mkdir -p $out/etc/systemd/system + ''; + + postInstall = '' + # rename to modem-manager to be in style + mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service + rm -rf $out/$out/etc + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish + # aliases ourselves. + ln -s $out/etc/systemd/system/modem-manager.service \ + $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service + ''; + + meta = with stdenv.lib; { + description = "WWAN modem manager, part of NetworkManager"; + homepage = https://www.freedesktop.org/wiki/Software/ModemManager/; + license = licenses.gpl2Plus; + maintainers = [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix deleted file mode 100644 index f4631d39b010..000000000000 --- a/pkgs/tools/networking/modemmanager/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, intltool, pkgconfig -, libmbim, libqmi, systemd }: - -stdenv.mkDerivation rec { - name = "ModemManager-${version}"; - version = "1.6.8"; - - src = fetchurl { - url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz"; - sha256 = "0xj3ng7qcqxkib5qkprwghcivaz0mn449fw08l67h1zbpz23bh7z"; - }; - - nativeBuildInputs = [ intltool pkgconfig ]; - - buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ]; - - configureFlags = [ - "--with-polkit" - "--with-udev-base-dir=$(out)/lib/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-suspend-resume=systemd" - ]; - - installFlags = [ "DESTDIR=\${out}" ]; - - preInstall = '' - mkdir -p $out/etc/systemd/system - ''; - - postInstall = '' - mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system - rm -rf $out/$out/etc - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - - # systemd in NixOS doesn't use `systemctl enable`, so we need to establish - # aliases ourselves. - ln -s $out/etc/systemd/system/ModemManager.service \ - $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service - ''; - - meta = { - description = "WWAN modem manager, part of NetworkManager"; - maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index d0fd7af12902..f8c3d7541008 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -5,28 +5,32 @@ stdenv.mkDerivation rec { name = "mu-${version}"; - version = "0.9.18"; + version = "1.0"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; - rev = version; - sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y"; + rev = "v${version}"; + sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc"; }; - # as of 0.9.18 2 tests are failing but previously we had no tests + # 0.9.18 and 1.0 have 2 failing tests but previously we had no tests patches = [ ./failing_tests.patch ]; - # pmccabe should be a checkInput instead, but configure looks for it + # test-utils coredumps so don't run those + postPatch = '' + sed -i -e '/test-utils/d' lib/parser/Makefile.am + ''; + buildInputs = [ sqlite xapian glib gmime texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - checkInputs = [ pmccabe ]; - doCheck = true; + nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; + + enableParallelBuilding = true; preBuild = '' # Fix mu4e-builddir (set it to $out) @@ -45,6 +49,8 @@ stdenv.mkDerivation rec { done ''; + doCheck = true; + meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 4c632899ac2e..0a0eadbfcba4 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, ncurses, coreutils }: -let version = "3.2.6"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ncftp-${version}"; + version = "3.2.6"; src = fetchurl { url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.xz"; @@ -11,24 +11,29 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; + enableParallelBuilding = true; + preConfigure = '' - find . -name "*.sh" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i - find . -name "*.in" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i - find . -name "*.c" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i - sed 's@/bin/ls@${coreutils}/bin/ls@g' -i configure - - find . -name "*.sh" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i - find . -name "*.in" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i - find . -name "*.c" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i - sed 's@/bin/rm@${coreutils}/bin/rm@g' -i configure + find . -name '*.sh' -or -name '*.in' -or -name '*.c' -or -name configure | xargs sed -i \ + -e 's@/bin/ls@${coreutils}/bin/ls@g' \ + -e 's@/bin/rm@${coreutils}/bin/rm@g' + ''; + + postInstall = '' + rmdir $out/etc + mkdir -p $out/share/doc + cp -r doc $out/share/doc/ncftp ''; - configureFlags = [ "--mandir=$out/share/man/" ]; + configureFlags = [ + "--enable-ssp" + "--mandir=$(out)/share/man/" + ]; meta = with stdenv.lib; { description = "Command line FTP (File Transfer Protocol) client"; - homepage = http://www.ncftp.com/ncftp/; + homepage = https://www.ncftp.com/ncftp/; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 578505f1e247..dd32cebea111 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,45 +1,46 @@ -{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager +{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 +, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk +, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }: let - pname = "network-manager-applet"; + pname = "network-manager-applet"; version = "1.8.10"; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a"; }; - configureFlags = [ - "--sysconfdir=/etc" - "--without-selinux" - "--with-appindicator" + mesonFlags = [ + "-Dselinux=false" + "-Dappindicator=true" + "-Dgcr=${if withGnome then "true" else "false"}" ]; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; buildInputs = [ - gnome3.gtk libglade networkmanager libnotify libsecret gsettings-desktop-schemas - polkit isocodes udev libgudev gnome3.libgnome-keyring + gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas + polkit isocodes libgudev modemmanager jansson glib-networking libindicator-gtk3 libappindicator-gtk3 - ] ++ stdenv.lib.optional withGnome webkitgtk; + ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ]; - nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; - propagatedUserEnvPkgs = [ gnome3.gnome-keyring hicolor-icon-theme ]; + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; - makeFlags = [ - ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' + NIX_CFLAGS = [ + ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; - preInstall = '' - installFlagsArray=( "sysconfdir=$out/etc" ) + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py ''; passthru = { @@ -50,10 +51,10 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = https://wiki.gnome.org/Projects/NetworkManager; description = "NetworkManager control applet for GNOME"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ phreedom rickynils ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index fc7d352757db..ebe40c6192cd 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -7,13 +7,13 @@ let pname = "NetworkManager"; - version = "1.10.2"; + version = "1.10.6"; in stdenv.mkDerivation rec { name = "network-manager-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n"; + sha256 = "0xmc3x41dbcaxjm85wfv405xq1a1n3xw8m8zg645ywm3avlb3w3a"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch new file mode 100644 index 000000000000..b735da28dca1 --- /dev/null +++ b/pkgs/tools/networking/network-manager/fix-paths.patch @@ -0,0 +1,34 @@ +--- a/properties/nm-openvpn-editor.c ++++ b/properties/nm-openvpn-editor.c +@@ -775,8 +775,7 @@ + nm_find_openvpn (void) + { + static const char *openvpn_binary_paths[] = { +- "/usr/sbin/openvpn", +- "/sbin/openvpn", ++ "@openvpn@/bin/openvpn", + NULL + }; + const char **openvpn_binary = openvpn_binary_paths; +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -522,9 +522,7 @@ + openvpn_binary_find_exepath (void) + { + static const char *paths[] = { +- "/usr/sbin/openvpn", +- "/sbin/openvpn", +- "/usr/local/sbin/openvpn", ++ "@openvpn@/bin/openvpn", + }; + int i; + +@@ -2326,7 +2324,7 @@ + _LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting..."); + + if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS) +- && (system ("/sbin/modprobe tun") == -1)) ++ && (system ("@kmod@/bin/modprobe tun") == -1)) + return EXIT_FAILURE; + + plugin = nm_openvpn_plugin_new (bus_name); diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix index b924a02438fd..73aaea06c917 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -3,13 +3,13 @@ networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }: let pname = "NetworkManager-fortisslvpn"; - version = "1.2.4"; + version = "1.2.8"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr"; + sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w"; }; buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index edda84ab43e2..b1ee3da1b058 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret +{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret , withGnome ? true, gnome3, procps, kmod }: let pname = "NetworkManager-openvpn"; - version = "1.8.0"; + version = "1.8.2"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1973n89g66a3jfx8r45a811fga4kadh6r1w35cb25cz1mlii2vhn"; + sha256 = "0p9pjk81h1j1dk9jkkvvk17cq21wyq5kfa4j49fmx9b9yg8syqc8"; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit kmod openvpn; + }) + ]; + buildInputs = [ openvpn networkmanager libsecret ] ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig libxml2 ]; configureFlags = [ "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}" @@ -24,16 +31,6 @@ in stdenv.mkDerivation rec { "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; - preConfigure = '' - substituteInPlace "configure" \ - --replace "/sbin/sysctl" "${procps}/sbin/sysctl" - substituteInPlace "src/nm-openvpn-service.c" \ - --replace "/sbin/openvpn" "${openvpn}/bin/openvpn" \ - --replace "/sbin/modprobe" "${kmod}/bin/modprobe" - substituteInPlace "properties/auth-helpers.c" \ - --replace "/sbin/openvpn" "${openvpn}/bin/openvpn" - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix deleted file mode 100644 index 6844ca53456f..000000000000 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig -, libsecret, withGnome ? true, gnome3 }: - -let - pname = "NetworkManager-pptp"; - version = "1.2.4"; -in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e"; - }; - - buildInputs = [ networkmanager pptp ppp libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; - - nativeBuildInputs = [ intltool pkgconfig ]; - - postPatch = '' - sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-pptp-service.c - - substituteInPlace ./src/nm-pptp-service.c \ - --replace /sbin/pptp ${pptp}/bin/pptp \ - --replace /sbin/pppd ${ppp}/bin/pppd - ''; - - configureFlags = - if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanager-pptp"; - }; - }; - - meta = { - description = "PPtP plugin for NetworkManager"; - inherit (networkmanager.meta) maintainers platforms; - }; -} diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 4fc9c904f5f9..cfa304901b48 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "NetworkManager-strongswan"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; - sha256 = "0r5j8cr4x01d2cdy970990292n7p9v617cw103kdczw646xwcxs8"; + sha256 = "0jzl52wmh2q2djb1s546kxliy7s6akhi5bx6rp2ppjfk3wbi2a2l"; }; postPatch = '' diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index d72ee844c0ec..ef65444ae331 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "19.0"; + version = "19.1"; src = fetchurl { url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "08kgi4zmh4h1pvxh8x4c3ydf9xl2s6ncm579f0wdm2zknvpf0j16"; + sha256 = "1rjwv555zc2hiagf00k8l1pzav91qglsnqbqkyy3pmn2d8sl5pq6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 46580c0b802c..cdf14f5af33f 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,14 +1,18 @@ -{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }: +{ stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools +,supportOpenstack ? true +}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "snabb-${version}"; - version = "2016.04"; + version = "2018.01.2"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx"; + sha256 = "0n6bjf5g4imy0aql8fa55c0db3w8h944ia1dk10167x5pqvkgdgm"; }; buildInputs = [ makeWrapper ]; @@ -20,10 +24,14 @@ stdenv.mkDerivation rec { for f in $(find src/program/snabbnfv/ -type f); do substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" done - + '' + optionalString supportOpenstack '' # We need a way to pass $PATH to the scripts - sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc - sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc + sed -i '2iexport PATH=${git}/bin:${mysql}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc + ''; + + preBuild = '' + make clean ''; installPhase = '' @@ -35,7 +43,7 @@ stdenv.mkDerivation rec { # "Fatal error: can't create obj/arch/sse2_c.o: No such file or directory". enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/SnabbCo/snabbswitch; description = "Simple and fast packet networking toolkit"; longDescription = '' diff --git a/pkgs/tools/networking/tlspool/configvar-fix.patch b/pkgs/tools/networking/tlspool/configvar-fix.patch deleted file mode 100644 index 424fef20dcfd..000000000000 --- a/pkgs/tools/networking/tlspool/configvar-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8561789ba70ae5d741992b143ee288b8e11a5e2b Mon Sep 17 00:00:00 2001 -From: joachim schiele <js@lastlog.de> -Date: Wed, 1 Mar 2017 15:15:22 +0100 -Subject: [PATCH] fix to - https://github.com/arpa2/tlspool/issues/58#issuecomment-283333738 - ---- - tool/Makefile | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/tool/Makefile b/tool/Makefile -index 9a15012..0f655e9 100644 ---- a/tool/Makefile -+++ b/tool/Makefile -@@ -38,7 +38,6 @@ pgp11genkey_LIBS = $(P11KIT_LIBS) -lcrypto - - configvar_CFLAGS = $(tlspool_CFLAGS) - configvar_LDFLAGS = $(tlspool_LDFLAGS) --configvar_LIBS = $(tlspool_LIBS) - - P11KIT_CFLAGS = $(shell pkg-config --cflags p11-kit-1) - P11KIT_LIBS = $(shell pkg-config --libs p11-kit-1) -@@ -96,8 +95,8 @@ have_db: have_db.c - pgp11_genkey: pgp11_genkey.c - gcc -std=gnu11 $(CFLAGS) $(pgp11genkey_CFLAGS) -o "$@" "$<" $(pgp11genkey_LIBS) - --configvar: configvar.c $(configvar_LIBS) -- gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<" $(configvar_LIBS) -+configvar: configvar.c -+ gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<" - - $(tlspool_LIBS): - $(MAKE) -C ../lib `basename $(tlspool_LIBS)` --- -2.12.0 - diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 02d3f2c29488..b992fef2253f 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -1,56 +1,51 @@ -{ 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 +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, arpa2cm +, openldap, p11-kit, unbound, libtasn1, db, openssl, quickder, libkrb5, ldns, gnutls-kdh +, softhsm }: let pname = "tlspool"; - version = "20170123"; + version = "20180227"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "arpa2"; repo = "tlspool"; - rev = "90cfa0758b02849114ba6373f280a4f2d3e534bf"; - sha256 = "1qyq6da5bsgb8y9f3jhfrnhbvjns4k80lpkrydkvfx83bg494370"; + rev = "b4459637d71c7602e94d455e23c74f3973b9cf30"; + sha256 = "0x78f2bdsiglwicwn3injm5ysfjlfa0yzdpnc0r3iw4z0n89rj2r"; }; - 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 ] - ++ stdenv.lib.optional useSystemd systemd; + nativeBuildInputs = [ + cmake pkgconfig arpa2cm + ]; - patches = [ ./fixing-rpath.patch ./configvar-fix.patch ]; + buildInputs = [ + openldap p11-kit unbound libtasn1 db openssl quickder libkrb5 ldns gnutls-kdh + ]; postPatch = '' + # CMake is probably confused because the current version isn't 1.2.6, but 1.2-6 + substituteInPlace CMakeLists.txt \ + --replace "Quick-DER 1.2.4" "Quick-DER 1.2" substituteInPlace etc/tlspool.conf \ --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \ --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so" - substituteInPlace lib/Makefile \ - --replace "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX)" "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX) SWIG=${swig}/bin/swig" ''; - buildPhase = '' - make clean - make DESTDIR=$out PREFIX=/ all - ''; - - installPhase = '' - mkdir -p $out/bin $out/lib $out/sbin $out/etc/tlspool/ $out/include/${pname}/pulleyback - make DESTDIR=$out PREFIX=/ install - cp -R etc/* $out/etc/tlspool/ - cp include/tlspool/*.h $out/include/${pname} - cp pulleyback/*.h $out/include/${pname}/pulleyback/ - cp src/*.h $out/include/${pname} + postInstall = '' + mkdir -p $out/include/${pname}/pulleyback $out/etc/tlspool + cp -R $src/etc/* $out/etc/tlspool/ + cp $src/include/tlspool/*.h $out/include/${pname} + cp $src/pulleyback/*.h $out/include/${pname}/pulleyback/ + cp $src/src/*.h $out/include/${pname} ''; meta = with stdenv.lib; { description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment"; - license = licenses.bsd2; + license = licenses.gpl3; homepage = http://www.tlspool.org; maintainers = with maintainers; [ leenaars qknight ]; }; diff --git a/pkgs/tools/networking/tlspool/fixing-rpath.patch b/pkgs/tools/networking/tlspool/fixing-rpath.patch deleted file mode 100644 index 6a434f3e4008..000000000000 --- a/pkgs/tools/networking/tlspool/fixing-rpath.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8082f050794f771d1afb8e5c3d08862fc633922b Mon Sep 17 00:00:00 2001 -From: joachim schiele <js@lastlog.de> -Date: Wed, 1 Mar 2017 13:12:19 +0100 -Subject: [PATCH] RPATH is back - https://github.com/arpa2/tlspool/issues/58#issuecomment-283318767 - ---- - tool/Makefile | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/tool/Makefile b/tool/Makefile -index c1e6ce9..9a15012 100644 ---- a/tool/Makefile -+++ b/tool/Makefile -@@ -18,9 +18,17 @@ LIBS = - - PREFIX = /usr/local - -+DIR := ${CURDIR} -+LIBDIR := "" -+ifndef DESTDIR -+ LIBDIR=$(DIR)/../lib/ -+else -+ LIBDIR=$(DESTDIR)/lib -+endif -+ - tlspool_CFLAGS = - tlspool_LIBS = ../lib/libtlspool.so --tlspool_LDFLAGS = -L ../lib -ltlspool -+tlspool_LDFLAGS = -L ../lib -ltlspool -Wl,-rpath,$(LIBDIR) - - donai_CFLAGS = -DDONAI_ONLY_TEXTPROC - donai_SRC = ../src/donai.c --- -2.11.1 - diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 0c37043de9bb..3e77117e55f0 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1nja7n6pc45azd3l1xyvav89855lvcgwabrvf34rps81dbl8cnl4"; + sha256 = "0biy02vyhdwghy9qjmjwlfd8hzaz9gfsssd53ng6zpww4wkkiydz"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix new file mode 100644 index 000000000000..5caad0874f7c --- /dev/null +++ b/pkgs/tools/networking/wrk2/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, luajit, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "wrk2-${version}"; + version = "4.0.0-${builtins.substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "giltene"; + repo = "wrk2"; + rev = "e0109df5b9de09251adb5f5848f223fbee2aa9f5"; + sha256 = "1aqdwmgdd74wq73f1zp28yqj91gd6p6nf9nbdfibl7mlklbzvak8"; + }; + + buildInputs = [ luajit openssl zlib ]; + + patchPhase = '' + rm -rf deps/luajit && mkdir deps/luajit + + substituteInPlace ./Makefile \ + --replace '-lluajit' '-lluajit-5.1' \ + --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' \ + --replace 'cd $(LDIR) && ./luajit' '${luajit}/bin/luajit' \ + --replace 'config.h Makefile $(LDIR)/libluajit.a' 'config.h Makefile' + + substituteInPlace ./src/script.c \ + --replace 'struct luaL_reg ' 'struct luaL_Reg ' + ''; + + configurePhase = ":"; + installPhase = '' + mkdir -p $out/bin + mv ./wrk $out/bin/wrk2 + ''; + + meta = { + description = "Constant throughput, correct latency recording variant of wrk"; + homepage = https://github.com/giltene/wrk2; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index dadcab1ea4f5..d03e6f614e57 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, +{ stdenv, fetchFromGitHub, fetchpatch, bzip2, nix, perl, perlPackages, }: with stdenv.lib; let - rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d"; - sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj"; + rev = "e4675e38ab54942e351c7686e40fabec822120b9"; + sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr"; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5140ddd0283d..677c3896fc12 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 is20 [ brotli ] # Since 1.12 - ++ lib.optional (hostPlatform.isSeccomputable) libseccomp + ++ lib.meta.enableIfAvailable libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) (aws-sdk-cpp.override { apis = ["s3"]; @@ -60,7 +60,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.isSeccomputable) "--disable-seccomp-sandboxing"; + ++ lib.optional (!libseccomp.meta.available) "--disable-seccomp-sandboxing"; makeFlags = "profiledir=$(out)/etc/profile.d"; diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index daecb8746eaf..ec82115087b7 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.5.2"; + version = "1.6"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb"; + sha256 = "0f8ql1a9maf9swl8q054b1haxqckdn78p2xgpwl7paxc98l67i7x"; }; }) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index d9c9661d41a4..f392e0f50ed1 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -25,6 +25,7 @@ python2Packages.buildPythonApplication { pysqlite datadog digital-ocean + libvirt ]; doCheck = false; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index cdc035072daf..b40c8ea26aa2 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0bn9flsjbzlwmlbv2gphqwgzy9sx8ahch28z6dzgak4csbz5wcws"; + sha256 = "1zs7xkk3b2izdnis7ir5h93p8f2i9513663h2xhxb0sh6i2h18y4"; }; buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index c6d4a78e6b4b..a4656b5db046 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -1,9 +1,9 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "browserpass-${version}"; - version = "2.0.13"; + version = "2.0.18"; goPackagePath = "github.com/dannyvankooten/browserpass"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "0pch0jddphgaaw208ddqjhnkiy5916n0kjxfza1cpc78fa8zw82l"; + sha256 = "0wszjpxfa0krr2zdx7a33vl1r86k74dpy5c940r6ww1zbgqzcibg"; }; postInstall = '' diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 976c58eb1e32..8c12e4e30c3e 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.99.3"; + version = "0.99.4"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; - sha256 = "114f7qk3h0klgm0zzn2394n5spcn91vjc9mq6m03l2p0ls955yh0"; + sha256 = "0q94iwi729id9pyc72w6zlllbaz37qvpi6gc51g2x3fy7ckw6anp"; }; # don't install sample config files into the absolute sysconfdir folder @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; - patches = [ ./fd-leak.patch ]; - configureFlags = [ "--sysconfdir=/etc/clamav" "--disable-llvm" # enabling breaks the build at the moment diff --git a/pkgs/tools/security/clamav/fd-leak.patch b/pkgs/tools/security/clamav/fd-leak.patch deleted file mode 100644 index 2c147901e446..000000000000 --- a/pkgs/tools/security/clamav/fd-leak.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/libclamav/scanners.c 2018-01-26 16:59:00.820231425 +0100 -+++ b/libclamav/scanners.c 2018-01-26 17:39:07.523633805 +0100 -@@ -1366,12 +1366,14 @@ - - if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) { - free(tmpname); -+ free(normalized); - return ret; - } - - if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) { - cli_ac_freedata(&tmdata); - free(tmpname); -+ free(normalized); - return ret; - } - -@@ -1390,6 +1392,7 @@ - cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname); - close(ofd); - free(tmpname); -+ free(normalized); - return CL_EWRITE; - } - text_normalize_reset(&state); -@@ -1424,6 +1427,8 @@ - if (ret) { - cli_ac_freedata(&tmdata); - free(tmpname); -+ free(normalized); -+ close(ofd); - return ret; - } - } -@@ -1466,11 +1471,9 @@ - - } - -- if(ctx->engine->keeptmp) { -- free(tmpname); -- if (ofd >= 0) -- close(ofd); -- } -+ if (ofd >= 0) -+ close(ofd); -+ free(tmpname); - free(normalized); - - if(ret != CL_VIRUS || SCAN_ALL) { diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index a8de8742dd5c..23061b6962e8 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -26,6 +26,8 @@ pythonPackages.buildPythonApplication { doCheck = false; preInstall = '' + substituteInPlace setup.py --replace /usr/share/doc/ share/doc/ + # see https://github.com/NixOS/nixpkgs/issues/4968 ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out ''; diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index 53b871306d7e..1d50f5498c83 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups -, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr -, nss, pango, systemd, xorg, utillinuxMinimal }: +, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2 +, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }: let libPath = stdenv.lib.makeLibraryPath [ @@ -17,6 +17,7 @@ let glib gnome2.GConf gtk2 + libnotify nspr nss pango diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 9395d4acb8b9..e9dffa5dbfa9 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "0041z2awpmwq2fk8lbgp4fcia0r6wss2csvq5bxps0cx7fq69wc1"; + sha256 = "0k3vnlibv05wnn6qn3qjlcyj2s07di7zkmdnijd6cp1hfk76z2r5"; }; nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index cbbb9b4dd3c2..e0a11f574181 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.6.2"; + version = "2.6.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "0jymp44dmc22cdrsd5hfyv9wc8a5sq92yh9p9c0rg22g53733910"; + sha256 = "17xfs0jr0rf8xvk860l2wpxg0h1m2c1dq41lqnq6wga9jifxmzqd"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 22a452ccabdd..26497659d23d 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -11,9 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ]; + makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ]; + + preInstall = '' + mkdir -p $out/bin + ''; postInstall = '' mkdir -p $out/share/man/man8 diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix new file mode 100644 index 000000000000..10efe0e7f21d --- /dev/null +++ b/pkgs/tools/security/neopg/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchgit +, cmake +, sqlite +, botan2 +, boost164 +, curl +, gettext +, pkgconfig +, libusb +, gnutls }: + +stdenv.mkDerivation rec { + name = "neopg"; + version = "0.0.4"; + + # no fetchFromGitHub, as repo contains submodules + src = fetchgit { + url = "https://github.com/das-labor/neopg.git"; + rev = "refs/tags/v${version}"; + sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ]; + + doCheck = true; + checkTarget = "test"; + + postInstall = '' + mkdir -p $out/bin + cp src/neopg $out/bin/neopg + ''; + + meta = with stdenv.lib; { + homepage = https://neopg.io/; + description = "Modern replacement for GnuPG 2"; + license = licenses.gpl3; + longDescription = '' + NeoPG starts as an opiniated fork of GnuPG 2 to clean up the code and make it easier to develop. + It is written in C++11. + ''; + maintainers = with maintainers; [ erictapen ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 3d31596a43fc..a81fffa20357 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.60"; + version = "7.70"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8"; + sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4"; }; patches = ./zenmap.patch; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index eba707b7d07c..1c235c9d8839 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.jabberwocky.com/software/paperkey/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ skeidel ]; }; } diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 61f51973ed32..3928f61fa96a 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.5.3"; + version = "2.0.1"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; rev = version; - sha256 = "1fn1j2rf3abc5qb44zfc8z8ffw6rva4xfp7597hwr1g3szacazpq"; + sha256 = "1r5z9g2kc6qf9r2d7vanzdc594apf8fgyn1rh30fvxygl2976yrw"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 908a47e6326f..eb05c3748078 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, pythonPackages, gnupg }: -let version = "2.2.4"; in +let version = "2.2.6"; in pythonPackages.buildPythonApplication { name = "pius-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "jaymzh"; repo = "pius"; rev = "v${version}"; - sha256 = "1yk6ngpk55yjdnzhm5sj675xbzwp7rir816a3aris647gsph1vlx"; + sha256 = "1rffwyjd84rwx1w5yyqckirm1kdj80ldfwjlw91kk74swhpbpzzj"; }; patchPhase = '' diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 13bebe10c623..0baa1538ea15 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.35"; + version = "0.36"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0pzs6iznrar5zkg92gsh6d0zhdi715zwqcb8hh1aaykx9igjb1xw"; + sha256 = "0pcw300hizzm130d0ip7j0ivf53sjlv6qzsdk9l68bj2lpx9n3kd"; }; prePatch = '' diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index fd81933fb587..9782d00267f5 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://srm.sourceforge.net; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 9ff5f58f558a..42d34c9a8230 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { - sha256 = "0qj23n5h98iirwhnjpcqzmirqf92sjd8mws5dky0pap359j6w792"; + sha256 = "15cqn09ng23k6a70xvxbpjjqlxw46838k7qr9216lcvxwl2banih"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix index b914ffaa0cb6..20951fe52406 100644 --- a/pkgs/tools/system/journalbeat/default.nix +++ b/pkgs/tools/system/journalbeat/default.nix @@ -7,7 +7,7 @@ let in buildGoPackage rec { name = "journalbeat-${version}"; - version = "5.6.0"; + version = "5.6.8"; goPackagePath = "github.com/mheese/journalbeat"; @@ -23,7 +23,7 @@ in buildGoPackage rec { owner = "mheese"; repo = "journalbeat"; rev = "v${version}"; - sha256 = "0b5yqzw1h945mwwyy7cza6bc7kzv3x1p9w2xkzmvr7rw3pd32r06"; + sha256 = "1vgpwnwqjc93nvdpcd52748bwl3r371jb55l17bsgdzrmlcyfm8a"; }; meta = with lib; { diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index fa5df06dae37..75e25bcc6730 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.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "0b7dnch74pddml3ysavizq26jgwdv0rjmwc8lf6zfvn9fjz19vvs"; + sha256 = "1wdjqbly97y1i11nl6cmlfpld3yqak270ixf29wixjgrjn8p4xzh"; }; # Logrotate wants to access the 'mail' program; to be done. diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 7eced6973731..aa2f50f2df07 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; homepage = http://smarden.org/runit; maintainers = with maintainers; [ rickynils joachifm ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix index bf27fc3de5d3..cfb627d70428 100644 --- a/pkgs/tools/text/diction/default.nix +++ b/pkgs/tools/text/diction/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "diction-1.11"; + name = "diction-${version}"; + version = "1.13"; src = fetchurl { - url = "mirror://gnu/diction/${name}.tar.gz"; - sha256 = "1xi4l1x1vvzmzmbhpx0ghmfnwwrhabjwizrpyylmy3fzinzz3him"; + url = "http://www.moria.de/~michael/diction/${name}.tar.gz"; + sha256 = "08fi971b8qa4xycxbgb42i6b5ms3qx9zpp5hwpbxy2vypfs0wph9"; }; meta = { diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix index b22d58939151..4e3be9e17e0c 100644 --- a/pkgs/tools/text/mir-qualia/default.nix +++ b/pkgs/tools/text/mir-qualia/default.nix @@ -2,14 +2,14 @@ pythonPackages.buildPythonApplication rec { name = "mir.qualia-${version}"; - version = "1.0.0"; - doCheck = false; # 1.0.0-released pytests are broken + version = "2.0.0"; + doCheck = false; # 2.0.0-released pytests are broken buildInputs = with pythonPackages; [ pytest ]; src = fetchurl { url = "mirror://pypi/m/mir.qualia/mir.qualia-${version}.tar.gz"; - sha256 = "1g0nwncwk4nq7b7zszqi1q4d2bdga1q50g9nkxigdaq647wqdf7x"; + sha256 = "1ybq6jb5clh9hw0sp3idp4hjv2gkm9yiaph48gcc208affflc8m9"; }; meta = { diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index ec99e8b4a27a..b1671ad38b53 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "untex-${version}"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://www.ctan.org/tex-archive/support/untex/${name}.tar.gz"; - sha256 = "07p836jydd5yjy905m5ylnnac1h4cc4jsr41panqb808mlsiwmmy"; + url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${name}.tar.gz"; + sha256 = "1jww43pl9qvg6kwh4h8imp966fzd62dk99pb4s93786lmp3kgdjv"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix new file mode 100644 index 000000000000..337aa61af13a --- /dev/null +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -0,0 +1,52 @@ +{ stdenv, lib, makeWrapper, dev_only_shellcheck ? null, +fetchFromGitHub, + +fzf, coreutils, libxml2, libxslt, jing, findutils, gnugrep, gnused, +docbook5 +}: +stdenv.mkDerivation rec { + name = "xmloscopy-${version}"; + version = "v0.1.2"; + + buildInputs = [ + makeWrapper + dev_only_shellcheck + ]; + + spath = lib.makeBinPath [ + fzf + coreutils + libxml2 + libxslt + jing + findutils + gnugrep + gnused + ]; + + src = fetchFromGitHub { + owner = "grahamc"; + repo = "xmloscopy"; + rev = version; + sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456"; + }; + + installPhase = '' + sed -i "s/hard to say/${version}/" ./xmloscopy + type -P shellcheck && shellcheck ./xmloscopy + chmod +x ./xmloscopy + patchShebangs ./xmloscopy + mkdir -p $out/bin + cp ./xmloscopy $out/bin/ + wrapProgram $out/bin/xmloscopy \ + --set RNG "${docbook5}/xml/rng/docbook/docbook.rng" \ + --set PATH "${spath}" + ''; + + meta = { + description = "wtf is my docbook broken?"; + homepage = https://github.com/grahamc/xmloscopy; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 8318ad2afe99..92778c5eed1c 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -144,6 +144,9 @@ core = stdenv.mkDerivation rec { mv "$out"/share/{man,info} "$doc"/doc '' + cleanBrokenLinks; + # needed for poppler and xpdf + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references) passthru = { inherit version buildInputs; }; |