diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
commit | 595a72589f038e4512ca12232009c97a47fba044 (patch) | |
tree | 079cdeab0e7722d19292fb7532adc42d77533d1f /pkgs/tools | |
parent | f9e17ca3f68b040bd0cf68c26104e4a5c9bc7b4f (diff) | |
parent | 62dc989963c67fe5564b30a2b4bf21ba49446eee (diff) | |
download | nixlib-595a72589f038e4512ca12232009c97a47fba044.tar nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.gz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.bz2 nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.lz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.xz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.zst nixlib-595a72589f038e4512ca12232009c97a47fba044.zip |
Merge master into staging
Diffstat (limited to 'pkgs/tools')
24 files changed, 100 insertions, 35 deletions
diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index bc1f584f1c02..46f213a6ef4c 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/mtx/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.redvers ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index b7ade4c5abc2..e720634ca44a 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.8.9"; + name = "archivemount-0.8.12"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg"; + sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 04863d6ce625..ce66402d09fc 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,11 +9,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.41"; + version="2.42"; name="${baseName}-${version}"; - hash="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx"; - url="https://freefr.dl.sourceforge.net/project/asymptote/2.41/asymptote-2.41.src.tgz"; - sha256="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx"; + hash="0dprc4shzdpvp87kc97ggh5ay2zmskjjaciay7mnblx63rhk1d95"; + url="https://freefr.dl.sourceforge.net/project/asymptote/2.42/asymptote-2.42.src.tgz"; + sha256="0dprc4shzdpvp87kc97ggh5ay2zmskjjaciay7mnblx63rhk1d95"; }; buildInputs = [ ghostscriptX imagemagick fftw diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix new file mode 100644 index 000000000000..95f7c547b559 --- /dev/null +++ b/pkgs/tools/graphics/pywal/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }: + +python3Packages.buildPythonApplication rec { + pname = "pywal"; + version = "2.0.5"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "117f61db013409ee2657aab9230cc5c2cb2b428c17f7fbcf664909122962165e"; + }; + + # necessary for imagemagick to be found during tests + buildInputs = [ imagemagick ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ imagemagick feh ]}" ]; + + preCheck = '' + mkdir tmp + HOME=$PWD/tmp + ''; + + meta = with lib; { + description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3."; + homepage = https://github.com/dylanaraps/pywal; + license = licenses.mit; + maintainers = with maintainers; [ Fresheyeball ]; + }; +} diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index db2e1fc622fa..9a51553ae43a 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.4"; + version = "1.5"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "08i71r221ilc8k1c59w89g3iq5m7zwhnjjzapavhqxlr8y9dcpf5"; + sha256 = "01pij2r73f190qk7q3cgf5cmk0w59g9l9v4vah5vf4ddn7nnk7yq"; }; meta = { diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 0a7073f4d489..8ef5bd1c07cf 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "1"; + version = "2"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0mq83m7mvavd0dzhk8g6ffldy57i22n0846yzqnlz733chiy3anz"; + sha256 = "0g9fy6x3wc5hda886ci79wj7rnjwvaidbwhsrckqgiqymbzvrdb8"; }; goPackagePath = "github.com/gokcehan/lf"; @@ -24,7 +24,7 @@ buildGoPackage rec { runHook preBuild runHook renameImports cd go/src/${goPackagePath} - go install -ldflags="-s -w -X main.gVersion=${version}" + go install -ldflags="-s -w -X main.gVersion=r${version}" runHook postBuild ''; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 56684848ebaa..47eec54e127e 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index bd446395bc78..82155eb51c7f 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.vanheusden.com/multitail/; description = "tail on Steroids"; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index de4a22ee9e47..097eb2408f85 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "1f1hvd635wv81qg802jdi0yggi4631w9nlznipaxkvk4y1zpdq5j"; + sha256 = "10h4f7n6bllbq459nm9wppvk65n81zzv556njfqplzw3mpdrbiyx"; }; dontBuild = true; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix new file mode 100644 index 000000000000..b9543dc143cf --- /dev/null +++ b/pkgs/tools/misc/pspg/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig }: + +stdenv.mkDerivation rec { + name = "pspg-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "okbob"; + repo = "pspg"; + rev = "${version}"; + sha256 = "1swrg4bg7i4xpdrsg8dsfldbxaffni04x8i1s0g6h691qcin675v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnugrep ncurses ]; + + preBuild = '' + makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/okbob/pspg; + description = "Postgres Pager"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.jlesquembre ]; + }; +} diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 061a6c58d237..3db0ee9af267 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { your selection will be sent to standard output. ''; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index ad5b259eb77a..9d1e4096776a 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index a655aa9502e5..7ccc6e9dc271 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in an existing instance of GVim or MacVim. ''; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 31b8d673a988..2c5a2b808a57 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -2,11 +2,11 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "yad-0.37.0"; + name = "yad-0.40.0"; src = fetchurl { url = "http://sourceforge.net/projects/yad-dialog/files/${name}.tar.xz"; - sha256 = "0fhqsgml1axaa9avd0hbam5wm77c2c7q1bz4hs7fvyvdnljazvwi"; + sha256 = "1x0fsv8nfkm8lchdawnf3zw79jaqbnvhv87sk5r8g86knv8vgl62"; }; configureFlags = [ diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index c9d689b8b2c1..2155d3c1b3d8 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Console downloading program with some features for parallel connections for faster downloading"; homepage = http://axel.alioth.debian.org/; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index d4a279bcc424..408fd0f8c8fe 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: stdenv.mkDerivation rec { - version = "6.1.0"; - seafileVersion = "6.1.0"; + version = "6.1.7"; + seafileVersion = "6.1.7"; name = "ccnet-${version}"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; - sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; + sha256 = "1kkzdxa9r7sw1niwniznfkvilgvb7q039wq07cfk73qs3231bj7r"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ]; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 4a358255b10c..224c7a4ab484 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "5.5"; + version = "5.6"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0l43lbnrnyyrq8mlnw37saq6v0mh3nkirdq1dwnsrihykzjjwf70"; + sha256 = "16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6"; }; doCheck = false; diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index f0bb4ab46fae..c8e14ad7f697 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to fetch time and set the system clock over HTTP"; homepage = http://www.vervest.org/htp/; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index b1f83c8b2161..37f4f96a3172 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; homepage = https://github.com/eliangcs/http-prompt; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index fe411edfcdac..c906ad3c8cf1 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = ''Command-line interface to IPMI-enabled devices''; license = licenses.bsd3; homepage = https://sourceforge.net/projects/ipmitool/; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index d9cfc77203e1..c49054f3a67c 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, go, systemd, polkit, fetchFromGitHub, m4 }: +{ stdenv, go, systemd, polkit, fetchFromGitHub, m4, removeReferencesTo }: stdenv.mkDerivation { name = "localtime-2017-11-07"; @@ -10,10 +10,15 @@ stdenv.mkDerivation { sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8"; }; - buildInputs = [ go systemd polkit m4 ]; + buildInputs = [ go systemd polkit m4 removeReferencesTo ]; + disallowedRequisites = [ go ]; makeFlags = [ "PREFIX=$(out)" ]; + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + ''; + meta = { description = "A daemon for keeping the system timezone up-to-date based on the current location"; homepage = https://github.com/Stebalien/localtime; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 13ce2414abf0..ed1da8d450dc 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://skarnet.org/software/s6-rc/; description = "A service manager for s6-based systems"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index c1c4527d0a0a..ca1af7a74e4b 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sg.danny.cz/sg/; description = "Utilities that send SCSI commands to devices"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index a2230503551f..b356cd1d484a 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, openssl, libcap, curl, which , eventlog, pkgconfig, glib, python, systemd, perl , riemann_c_client, protobufc, pcre, libnet -, json_c, libuuid, libivykis, mongoc, rabbitmq-c }: +, json_c, libuuid, libivykis, mongoc, rabbitmq-c +, libesmtp +}: let pname = "syslog-ng"; @@ -36,12 +38,14 @@ stdenv.mkDerivation rec { libivykis mongoc rabbitmq-c + libesmtp ]; configureFlags = [ "--enable-manpages" "--enable-dynamic-linking" "--enable-systemd" + "--enable-smtp" "--with-ivykis=system" "--with-librabbitmq-client=system" "--with-mongoc=system" |