diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-24 08:27:04 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-24 08:27:04 +0200 |
| commit | 32389de159a0983f4daf7de446da6439a92a29a2 (patch) | |
| tree | d670ccdd2e24a6a6f0dee7ff3c252b593377deb4 | |
| parent | 09c9a2de7e75191bebfb3397364809f94195224c (diff) | |
| parent | 7044058ef779e8050aa4684a8f73114fdf39b849 (diff) | |
| download | nixlib-32389de159a0983f4daf7de446da6439a92a29a2.tar nixlib-32389de159a0983f4daf7de446da6439a92a29a2.tar.gz nixlib-32389de159a0983f4daf7de446da6439a92a29a2.tar.bz2 nixlib-32389de159a0983f4daf7de446da6439a92a29a2.tar.lz nixlib-32389de159a0983f4daf7de446da6439a92a29a2.tar.xz nixlib-32389de159a0983f4daf7de446da6439a92a29a2.tar.zst nixlib-32389de159a0983f4daf7de446da6439a92a29a2.zip | |
Merge master into staging-next
66 files changed, 496 insertions, 300 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0b005dfdac28..6feb3ddd1aa4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6708,6 +6708,11 @@ githubId = 483735; name = "Dmitry Geurkov"; }; + tscholak = { + email = "torsten.scholak@googlemail.com"; + github = "tscholak"; + name = "Torsten Scholak"; + }; tstrobel = { email = "4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains"; name = "Thomas Strobel"; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index ba79bd3d6ecc..ae3bdeb00e64 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -251,7 +251,7 @@ let default = []; example = literalExample "[ pkgs.firefox pkgs.thunderbird ]"; description = '' - The set of packages that should be made availabe to the user. + The set of packages that should be made available to the user. This is in contrast to <option>environment.systemPackages</option>, which adds packages to all users. ''; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index c1754c0e0ecb..dcec4d4fc6cd 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -61,7 +61,7 @@ let '' else '' echo "Checking that Nix can read nix.conf..." ln -s $out ./nix.conf - NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net"} >/dev/null + NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config ${optionalString isNix23 "--no-net --option experimental-features nix-command"} >/dev/null '') ); diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index d4d0594a9cdd..b48b0b3a9d6b 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -299,7 +299,8 @@ in mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data rm -f ${smokepingHome}/cropper ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper - cp ${cgiHome} ${smokepingHome}/smokeping.fcgi + rm -f ${smokepingHome}/smokeping.fcgi + ln -s ${cgiHome} ${smokepingHome}/smokeping.fcgi ${cfg.package}/bin/smokeping --check --config=${configPath} ${cfg.package}/bin/smokeping --static --config=${configPath} ''; @@ -314,5 +315,7 @@ in serviceConfig.Restart = "always"; }; }; + + meta.maintainers = with lib.maintainers; [ erictapen ]; } diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index a5248e2a89ef..2df54fa7fb46 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "2.2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "0i9rpnlmgrnkgmr9hyx9sky9gzj2cjhay84a0yaijwcb9nmr8nnc"; + sha256 = "1qdflxr0an6l2m3j90h55bzyj7rjlkkwmxx945hwv8xi472rcgdj"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 2e504a3c9ec2..dee9b8f20c89 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0qlbccdxyfy0f09y6qg1xkg12fm67bf2f2c27c22cg8lzk9ang5j"; + sha256 = "00fj762qdna4bm8hshdhkwfa48s01bi5sk4f030rfk77mivl09jk"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix index c2789c78542a..6910bef7814a 100644 --- a/pkgs/applications/blockchains/jormungandr/default.nix +++ b/pkgs/applications/blockchains/jormungandr/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "jormungandr"; - version = "0.6.5"; + version = "0.7.0-alpha.dev.1"; src = fetchgit { url = "https://github.com/input-output-hk/${pname}"; rev = "v${version}"; - sha256 = "16s6ks63194w35xlgzbhjdb3h606hkj049bap52sd6qf637bw2p7"; + sha256 = "0r3icx42glrpa68sjxz4gr0z5660gh4n79lncy720s04cmgjcjci"; fetchSubmodules = true; }; - cargoSha256 = "1kba65rnm2vyqsjhcnfwy1m44x1w3xxlzinykmb89jy6qr8gvp42"; + cargoSha256 = "0f9b2lr2xxlcn9j33b5ahzbndz6sjm8ybhqm472bv5hzisqm4lg4"; nativeBuildInputs = [ pkgconfig protobuf ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 244f37b10dff..82c625310e7a 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "OpenOrienteering-Mapper"; - version = "0.8.4"; + version = "0.9.0"; buildInputs = [ gdal qtbase qttools qtlocation qtimageformats qtsensors clipper zlib proj doxygen cups]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "0rw34kp2vd1la97vnk9plwvis6lvyib2bvs7lgkhpnm4p5l7dp1g"; + sha256 = "0wnxj2xf529941dwss6ygb1krfx18lzl6rf67060b0zndc7n6l8f"; }; cmakeFlags = @@ -40,9 +40,6 @@ stdenv.mkDerivation rec { "-DMapper_PACKAGE_GDAL=0" ]); - # Needs to be available when proj_api.h gets evaluted by CPP - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' # Fixes "This application failed to start because it could not find or load the Qt @@ -60,6 +57,6 @@ stdenv.mkDerivation rec { homepage = https://www.openorienteering.org/apps/mapper/; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [mpickering]; + maintainers = with maintainers; [ mpickering sikmir ]; }; } diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 6aa94b2fecb8..756c8e259718 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -42,6 +42,7 @@ with python3.pkgs; buildPythonApplication rec { install -D misc/__khal $out/share/zsh/site-functions/__khal # man page + PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \ make -C doc man install -Dm755 doc/build/man/khal.1 -t $out/share/man/man1 diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index e6e0860f7ec6..1256bb96608f 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qtpass"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08"; + sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x"; }; buildInputs = [ git gnupg pass qtbase qtsvg ]; diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 7bb443e22c33..b09be81cc418 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.20"; + version = "2.20.2"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "0bchwqa87dc8cb55spyybkqpc456pp4x2n9aw587wr7pn96cvp9v"; + sha256 = "097ll98ympzfx7qfdyhc52yzvsp167x5nnjs6v8ih496wv80fksb"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 40c66dd699d8..854a62a5538d 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ott"; - version = "0.28"; + version = "0.29"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "0mzbrvqayqpns9zzg4m1scxx24dv9askhn51dawyb9pisvlyvai0"; + sha256 = "0saznk2mjbhp3j57imy2p2j0938026bw5m5gqbj59vcvk1rwwl22"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 33297d6b2f04..9b6583d6cb84 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -4,7 +4,7 @@ , srht, redis, celery, pyyaml, markdown }: let - version = "0.47.8"; + version = "0.47.9"; buildWorker = src: buildGoModule { inherit src version; @@ -20,7 +20,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; rev = version; - sha256 = "0agnxf118nlfykxbja8mnk4cal56rb2z8mhvyphnxm0ac28iq6jx"; + sha256 = "1zgaba58svhksxb1pzz8bym9p0pm7fnxsj5k6jz86095xmfijp34"; }; patches = [ diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index d810274c628b..a284873f0032 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "srht"; - version = "0.54.2"; + version = "0.54.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "1m9nblm0ygjjdzcf79jk5v8p74dgyby15mqkggw9i3smz9r3afim"; + sha256 = "1f4srhp5g6652anifs1vyijzi2v23l2rnfpf3x96j9r8rdap42rq"; }; node_modules = fetchNodeModules { diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 24974aeb2e7e..9b0b5e2c8e45 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -4,7 +4,7 @@ , srht, pygit2, scmsrht }: let - version = "0.33.1"; + version = "0.34.2"; buildDispatcher = src: buildGoModule { inherit src version; @@ -20,7 +20,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; rev = version; - sha256 = "0vwjkpvgscr01xhbzmhizqmg1wjhnj7jw9qcsv0s190fqach7ml8"; + sha256 = "1z10r2d9x71n1n36g55j4cswh0dqnzmgj2qiy1h92wwgq8azpiyy"; }; patches = [ diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 9d5d3596b847..dc9ced49cea5 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "hgsrht"; - version = "0.15.2"; + version = "0.16.0"; src = fetchhg { url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; rev = version; - sha256 = "097ikrr8bks4lag1lbaznj0zr1c56lmm5lgm5rfjq0k20l7n2bk0"; + sha256 = "0ncrj1cbls9ix2ig3qqwbzs6q6cmpqy3zs21p9fw3idfw703j3g0"; }; patches = [ diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index a1160c8ed3aa..8aa6128819f1 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "listssrht"; - version = "0.38.1"; + version = "0.38.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; rev = version; - sha256 = "02nfl9xnqx0p98kmcy8bzdwzlnl57k5a04i6gnvimc84c11a9chz"; + sha256 = "020s6kglm7620pjn2j7fxvaqd5lpz7y7x0wf014jsrm71l6w0rla"; }; patches = [ diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 199aed5b917c..bac369088a6d 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "metasrht"; - version = "0.35.2"; + version = "0.35.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; rev = version; - sha256 = "10x00lydnrcgk7s27fddbrdb8bwc5ivwlpswkcrsi302qcjdff9w"; + sha256 = "1kcmlmdk9v59fr3r0g2q2gfkb735xza0wni9s942wh418dr66x2f"; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 404b592a1cd2..4a86285f50dd 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.5.2"; + version = "0.7.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; rev = version; - sha256 = "16d0qviw3qifyqn94fj03mwxd65abf8bhrvn1fn6ramaq8zpx794"; + sha256 = "19y9ghhi4llyg7kd3a888gbjc698vdamin4hb8dk1j6pd2f0qmjp"; }; patches = [ diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index efd7a9bcd287..baccfb1b94b8 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.14.2"; + version = "0.15.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; rev = version; - sha256 = "1xi4l1ycdglfm22ybawh5nbwgday0nfb1vqsjqvp2y7ysizwdxc1"; + sha256 = "1rzm3r280211w51sjngm5a3pdlzg07c64324k99bqs1fkc2yrfy6"; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index 26b55b364f17..e39877df8291 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }: +{ stdenv, lib, fetchFromGitHub, Hypervisor, vmnet, xpc, libobjc, zlib }: stdenv.mkDerivation rec { pname = "xhyve"; - version = "20190124"; + version = "20191001"; - src = fetchurl { - url = "https://github.com/machyve/xhyve/archive/1dd9a5165848c7ed56dafc41932c553ea56a12af.tar.gz"; - sha256 = "18zd74pd0azf43csbqb14srbyclfgx28dpgm8ygjmbcazbnipc1k"; + src = fetchFromGitHub { + owner = "machyve"; + repo = "xhyve"; + rev = "1f46a3d0bbeb6c90883f302425844fcc3800a776"; + sha256 = "0mm9xa0v6n7xl2qypnppq5abdncd31vffiklrhcrlni5ymyh9ia5"; }; buildInputs = [ Hypervisor vmnet xpc libobjc zlib ]; diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 8dbe0dbdbd03..2cd4f1af022b 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -92,13 +92,15 @@ rec { PATH=${makeBinPath [ pkgs.binutils-unwrapped pkgs.coreutils + pkgs.findutils pkgs.gcc pkgs.pkgconfig ]} + export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries} gcc \ ${optionalString (libraries != []) "$(pkg-config --cflags --libs ${ - concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgsconfig -name \*.pc -exec basename {} \;)") libraries + concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgconfig -name \\*.pc)") libraries })" } \ -O \ diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index d7c347a559ef..3cd0a080ae8f 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -1,4 +1,16 @@ -{ stdenv, lib, runCommand, haskellPackages, nodePackages, perlPackages, python2Packages, python3Packages, writers, writeText }: +{ + glib, + haskellPackages, + lib, + nodePackages, + perlPackages, + python2Packages, + python3Packages, + runCommand, + stdenv, + writers, + writeText +}: with writers; let @@ -49,9 +61,11 @@ let python2 = writePython2Bin "test_writers" { libraries = [ python2Packages.enum ]; } '' from enum import Enum + class Test(Enum): a = "success" + print Test.a ''; @@ -70,9 +84,19 @@ let if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeC "test_c" { libraries = [ ]; } '' + c = writeC "test_c" { libraries = [ glib.dev ]; } '' + #include <gio/gio.h> #include <stdio.h> int main() { + GApplication *application = g_application_new ("hello.world", G_APPLICATION_FLAGS_NONE); + g_application_register (application, NULL, NULL); + GNotification *notification = g_notification_new ("Hello world!"); + g_notification_set_body (notification, "This is an example notification."); + GIcon *icon = g_themed_icon_new ("dialog-information"); + g_notification_set_icon (notification, icon); + g_object_unref (icon); + g_object_unref (notification); + g_object_unref (application); printf("success\n"); return 0; } @@ -112,9 +136,11 @@ let python2 = writePython2 "test_python2" { libraries = [ python2Packages.enum ]; } '' from enum import Enum + class Test(Enum): a = "success" + print Test.a ''; diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index 33e7283147ac..83779e7618eb 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.10"; + version = "3.11"; in fetchzip { name = "inter-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "029fjpgdml8qx2cqn4rnh2xm3z4cnh74jlzjb8pbfm2azsnvi6r1"; + sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1"; meta = with lib; { homepage = https://rsms.me/inter/; diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index e886ad7578e3..74f851d77b53 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -2,7 +2,7 @@ let pname = "victor-mono"; - version = "1.2.5"; + version = "1.2.7"; in fetchFromGitHub rec { name = "${pname}-${version}"; @@ -18,7 +18,7 @@ in fetchFromGitHub rec { # Both methods produce the same file, but this way # we can safely reason about what version it is. postFetch = '' - tar xvf $downloadedFile --strip-components=2 ${name}/public/VictorMonoAll.zip + tar xvf $downloadedFile --strip-components=2 ${pname}-${version}/public/VictorMonoAll.zip mkdir -p $out/share/fonts/{true,open}type/${pname} @@ -26,7 +26,7 @@ in fetchFromGitHub rec { unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname} ''; - sha256 = "0dj5h45qk6abggj6mgm19sb0a7q0v4x41f2zds1ab79yd22gbjns"; + sha256 = "0x4ydp11ry94wkkspnmy1xpzqq3m45xg60z1hq4ll9gmlccaknj0"; meta = with lib; { description = "Free programming font with cursive italics and ligatures"; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index 80b167aaa98a..67441e9cdd8d 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -11,11 +11,16 @@ let params = { rev = "0.1"; sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7"; }; - "8.9" = { - version = "0.1"; - rev = "a69551a49543b22a7d4e6a2484356b56bd05068e"; + "8.9" = rec { + version = "0.2"; + rev = version; sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73"; }; + "8.10" = rec { + version = "0.3"; + rev = version; + sha256 = "0pzs5nsakh4l8ffwgn4ryxbnxdv2x0r1i7bc598ij621haxdirrr"; + }; }; param = params.${coq.coq-version}; in @@ -31,7 +36,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which ]; - buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib ]) + ++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10") + coq.ocamlPackages.camlp5 + ; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix index ce7d615f4d31..78f1f66623a4 100644 --- a/pkgs/development/libraries/libfsm/default.nix +++ b/pkgs/development/libraries/libfsm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libfsm"; - version = "0.1pre1869_${builtins.substring 0 7 src.rev}"; + version = "0.1pre1905_${builtins.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "katef"; - repo = "libfsm"; - rev = "f70c3c5778a79eeecb52f9fd35c7cbc241db0ed6"; - sha256 = "1hgv272jdv6dwnsdjajyky537z84q0cwzspw9br46qj51h8gkwvx"; + repo = pname; + rev = "bd5937fad42b26a86bac1fe3ec49eff73581bd1d"; + sha256 = "1q3grbmvjnnvc2sshswbd40cc2j2hnwibmljcqx9jqgda0wd6pgv"; fetchSubmodules = true; }; @@ -22,12 +22,16 @@ stdenv.mkDerivation rec { # if we use stdenv vs clangStdenv, we don't know which, and CC=cc in all # cases.) it's unclear exactly what should be done if we want those flags, # but the defaults work fine. - buildPhase = "PREFIX=$out bmake -r install"; + buildPhase = "PREFIX=$out bmake -r -j$NIX_BUILD_CORES"; + installPhase = '' + PREFIX=$out bmake -r install + runHook postInstall + ''; # fix up multi-output install. we also have to fix the pkgconfig libdir # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in # our case; libdir should really be set to the $lib output. - installPhase = '' + postInstall = '' mkdir -p $lib $dev/lib mv $out/lib $lib/lib diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 6c958feab77f..02a8abb7c856 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "librsync"; - version = "2.1.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "03ncx7a2zd93b3jaq7b62nwn8qcwmf04jfvljnpxj5wsxl2agkp7"; + sha256 = "08wdlxsa9zg2pyasz1lwg70d5psi4amv81v4yxwffx67ndzb9yp5"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index 0ef96f675055..b48bd15909de 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "strophe"; - repo = "libstrophe"; + repo = pname; rev = version; - sha256 = "1milna92h8wzxax8ll362zvb70091nmfks5lmd105vk0478zraca"; + sha256 = "1g1l0w9z9hdy5ncdvd9097gi7k7783did6py5h9camlpb2fnk5mk"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf openssl expat libtool check ]; + nativeBuildInputs = [ automake autoconf pkgconfig libtool check ]; + buildInputs = [ openssl expat ]; dontDisableStatic = true; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { minimal dependencies and is configurable for various environments. It runs well on both Linux, Unix, and Windows based platforms. ''; - homepage = http://strophe.im/libstrophe/; - license = with stdenv.lib.licenses; [gpl3 mit]; + homepage = "http://strophe.im/libstrophe/"; + license = with stdenv.lib.licenses; [ gpl3 mit ]; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [devhell flosse]; + maintainers = with stdenv.lib.maintainers; [ devhell flosse ]; }; } diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 2a293e0b8562..5996dda1e74e 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl -, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget +, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget, symlinkJoin + +# Enable CUDA support +, cudaSupport ? false, cudatoolkit ? null # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -8,9 +11,15 @@ , enablePrefix ? false }: +assert !cudaSupport || cudatoolkit != null; + let version = "4.0.2"; + cudatoolkit_joined = symlinkJoin { + name = "${cudatoolkit.name}-unsplit"; + paths = [ cudatoolkit.out cudatoolkit.lib ]; + }; in stdenv.mkDerivation rec { pname = "openmpi"; inherit version; @@ -33,15 +42,20 @@ in stdenv.mkDerivation rec { buildInputs = with stdenv; [ gfortran zlib ] ++ lib.optionals isLinux [ libnl numactl ] + ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; - configureFlags = with stdenv; [ "--disable-mca-dso" ] + configureFlags = with stdenv; lib.optional (!cudaSupport) "--disable-mca-dso" ++ lib.optional isLinux "--with-libnl=${libnl.dev}" ++ lib.optional enableSGE "--with-sge" ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default" + # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build + # https://github.com/openucx/ucx + # https://www.open-mpi.org/faq/?category=buildcuda + ++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ] ; enableParallelBuilding = true; @@ -69,6 +83,10 @@ in stdenv.mkDerivation rec { doCheck = true; + passthru = { + inherit cudaSupport cudatoolkit; + }; + meta = with stdenv.lib; { homepage = https://www.open-mpi.org/; description = "Open source MPI-3 implementation"; diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index e2be8ded31cb..4482a9cd312d 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "packr"; - version = "2.6.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "gobuffalo"; repo = pname; rev = "v${version}"; - sha256 = "11bd0s3hyzvhcg1q0iahv2w9f0w1k57jfxgswhz7dyndxvvr2b8i"; + sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; }; subPackages = [ "packr" "v2/packr2" ]; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index ef4e89aecb84..6a07ebdb862f 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -24,6 +24,10 @@ in stdenv.mkDerivation { MKLROOT = optionalString mklSupport mkl; + preConfigure = '' + export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ + ''; + enableParallelBuilding=true; buildFlags = [ "magma" "magma_sparse" ]; diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix index 74a3ffdfcc82..97befe7190ac 100644 --- a/pkgs/development/python-modules/Logbook/default.nix +++ b/pkgs/development/python-modules/Logbook/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Logbook"; - version = "1.5.2"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "0mvsig6sk4dywpw5naah1npf6h621qzhg0sd427j5znr06a2ksqs"; + sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36"; }; checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 42443c873d7d..5b03f8ce9cc2 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "colored"; - version = "1.3.93"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0xbhq9nd9xz3b6w0c4q33jfgnv8jid023v2fyhi7hsrz1scym5l2"; + sha256 = "0wlsg7z406q31r5fpwkqfpyfpigazbmq9qm856wfbn861k2773zf"; }; # No proper test suite diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 407988b6c73a..f949120db0cf 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "6.3.0"; + version = "6.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1q38riv63110ch170c1pyhq5jfbg8y0qmcdsqn8vb9sb79amvg93"; + sha256 = "126waa1jiynq00glr1hq86sgwwmakq009crfsn8qqgrj4c4clw6a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 1e9a6ac764d3..911a313aefd6 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "2.1.9"; + version = "2.2.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "08vggm6wrn5cbf8brfprif0rjrkqz06wddsw0ir1skkk8q2sp1b2"; + sha256 = "19bln9z25dmz1waqcxivlwg20dlm033c7f4z3h3mkhzkbk928y71"; }; postPatch = '' diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 693e733e73a8..23c5c5d3a372 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "3.23.0"; + version = "3.24.0"; src = fetchPypi { inherit pname version; - sha256 = "05nf94dp80i68gs61pf67qj1y6i56jgdxmibqmns5wz6z33fi7wj"; + sha256 = "1znqjp780nrp94hjcrcx0945izzl3zsrqkmdac44d2fmlnbdp2by"; }; propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index f7b3ff63c53c..0e5134eeb26b 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -15,10 +15,10 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.5.0"; + version = "2.6.1"; src = fetchPypi { - sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2"; + sha256 = "1bk7pijmrspdfj9nnlbnw1yiww9w1kyjvlpzy9s5hj6zp4qv4kpl"; inherit pname version; }; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index b772d820a8b3..a5b6cc6cda0b 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.2.5"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0fb448b95643a708d25d2394183a2f3a84eefb55fb64917152a46826990113ea"; + sha256 = "0m5kj6jd1jkxv3npr2s6bczp5m592iryl9ysl5gbil0wszqyrmm0"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 79bf4636b500..abd3a491b20a 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.7.5"; + version = "0.7.7"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1k9s62ddv6pghzp1yak2ld6sk92zm4sz1xqp8zkzyh3xqdsmfa0f"; + sha256 = "1b0dvvqqasir8dfpqj4jch7wxxk43csbv0wa80fiqsdlymxxj2dj"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index d2cd79419a4b..2c7832f6ab4b 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.11.1"; + version = "3.11.2"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "0q84r9x99h9a3kqs3i12bgk8rz5my8vpjngg8yaqd2kzsb6gynp8"; + sha256 = "097cafqgk46bf0innwm7xnmsfs6z37hv3alyvrfz6d0iy4scshm5"; }; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 30631e06b5fe..fec9de45f681 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.11"; + version = "1.6.12"; src = fetchPypi { inherit pname version; - sha256 = "034170w0qh20qkfaha2rpnccm31f7snhb4r9cd079v4v2x2swybk"; + sha256 = "13q83yba01hzm9mlk5y1klqirxdmsm2yx1yll5zdik9fd8hg0rf6"; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index a4e3cada1fc1..895a06ce558a 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.43.8"; + version = "1.44"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "1625v558xga5mwhl9jqmibywy5qafmg1vqrirqz6zfq1la1d22mw"; + sha256 = "067iyarllgdp40bzjxskzrixvmz350yj1qf8wvbddka504bcbh9r"; }; propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 1034c9d844d9..c6c1afdcc95f 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }: buildPythonPackage rec { - version = "0.3.15"; + version = "0.3.21"; pname = "pyaxmlparser"; # the PyPI tarball doesn't ship tests. @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "appknox"; repo = pname; rev = "v${version}"; - sha256 = "0p4x21rg8h7alrg2zk6rbgc3fj77fiyky4zzvziz2bp5jpx1pvzp"; + sha256 = "1bphd2vl9akk78yqvvxcz36wmr47hp3nh6xyrdc8w1avy1aby1ij"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 92afa80852af..d55be70ae490 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,18 +1,101 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonOlder, - cudaSupport ? false, cudatoolkit ? null, cudnn ? null, - fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl, +{ stdenv, fetchurl, fetchgit, buildPythonPackage, python, pythonOlder, + cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null, + mklSupport ? false, mkl ? null, + openMPISupport ? false, openmpi ? null, + buildNamedTensor ? false, + buildBinaries ? false, + cudaArchList ? null, + fetchFromGitHub, lib, numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, linkFarm, symlinkJoin, + + # ninja (https://ninja-build.org) must be available to run C++ extensions tests, + ninja, + + # dependencies for torch.utils.tensorboard + tensorboardSupport ? true, pillow, six, future, tensorflow-tensorboard, + utillinux, which, isPy3k }: -assert cudnn == null || cudatoolkit != null; +assert !openMPISupport || openmpi != null; +assert !tensorboardSupport || tensorflow-tensorboard != null; + +# assert that everything needed for cuda is present and that the correct cuda versions are used assert !cudaSupport || cudatoolkit != null; +assert cudnn == null || cudatoolkit != null; +assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; + in majorIs == "9" || majorIs == "10"); + +let + hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs; + matchesCudatoolkit = hasDependency cudatoolkit; + matchesMkl = hasDependency mkl; +in +# confirm that cudatoolkits are sync'd across dependencies +assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi; +assert !cudaSupport || matchesCudatoolkit magma; + +# confirm that mkl is sync'd across dependencies +assert !mklSupport || mkl != null; +assert !(mklSupport && cudaSupport) || matchesMkl magma; +assert !mklSupport || (numpy.blasImplementation == "mkl" && numpy.blas == mkl); let cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; - paths = [ cudatoolkit.out cudatoolkit.lib ]; + # nccl is here purely for semantic grouping it could be moved to nativeBuildInputs + paths = [ cudatoolkit.out cudatoolkit.lib nccl.dev nccl.out ]; }; + # Give an explicit list of supported architectures for the build, See: + # - pytorch bug report: https://github.com/pytorch/pytorch/issues/23573 + # - pytorch-1.2.0 build on nixpks: https://github.com/NixOS/nixpkgs/pull/65041 + # + # This list was selected by omitting the TORCH_CUDA_ARCH_LIST parameter, + # observing the fallback option (which selected all architectures known + # from cudatoolkit_10_0, pytorch-1.2, and python-3.6), and doing a binary + # searching to find offending architectures. + # + # NOTE: Because of sandboxing, this derivation can't auto-detect the hardware's + # cuda architecture, so there is also now a problem around new architectures + # not being supported until explicitly added to this derivation. + # + # FIXME: CMake is throwing the following warning on python-1.2: + # + # ``` + # CMake Warning at cmake/public/utils.cmake:172 (message): + # In the future we will require one to explicitly pass TORCH_CUDA_ARCH_LIST + # to cmake instead of implicitly setting it as an env variable. This will + # become a FATAL_ERROR in future version of pytorch. + # ``` + # If this is causing problems for your build, this derivation may have to strip + # away the standard `buildPythonPackage` and use the + # [*Adjust Build Options*](https://github.com/pytorch/pytorch/tree/v1.2.0#adjust-build-options-optional) + # instructions. This will also add more flexibility around configurations + # (allowing FBGEMM to be built in pytorch-1.1), and may future proof this + # derivation. + brokenArchs = [ "3.0" ]; # this variable is only used as documentation. + cuda9ArchList = [ + "3.5" + "5.0" + "5.2" + "6.0" + "6.1" + "7.0" + "7.0+PTX" # I am getting a "undefined architecture compute_75" on cuda 9 + # which leads me to believe this is the final cuda-9-compatible architecture. + ]; + cuda10ArchList = cuda9ArchList ++ [ + "7.5" + "7.5+PTX" # < most recent architecture as of cudatoolkit_10_0 and pytorch-1.2.0 + ]; + final_cudaArchList = + if !cudaSupport || cudaArchList != null + then cudaArchList + else + if lib.versions.major cudatoolkit.version == "9" + then cuda9ArchList + else cuda10ArchList; # the assert above removes any ambiguity here. + # Normally libcuda.so.1 is provided at runtime by nvidia-x11 via # LD_LIBRARY_PATH=/run/opengl-driver/lib. We only use the stub # libcuda.so from cudatoolkit for running tests, so that we don’t have @@ -25,28 +108,27 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} "; in buildPythonPackage rec { - version = "1.0.0"; + version = "1.2.0"; pname = "pytorch"; disabled = !isPy3k; + outputs = [ + "out" # output standard python package + "dev" # output libtorch only + ]; + src = fetchFromGitHub { owner = "pytorch"; repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "076cpbig4sywn9vv674c0xdg832sdrd5pk1d0725pjkm436kpvlm"; + sha256 = "1biyq2p48chakf2xw7hazzqmr5ps1nx475ql8vkmxjg5zaa071cz"; }; - patches = - [ # Skips two tests that are only meant to run on multi GPUs - (fetchurl { - url = "https://github.com/pytorch/pytorch/commit/bfa666eb0deebac21b03486e26642fd70d66e478.patch"; - sha256 = "1fgblcj02gjc0y62svwc5gnml879q3x2z7m69c9gax79dpr37s9i"; - }) - ]; - dontUseCmakeConfigure = true; + preConfigure = lib.optionalString cudaSupport '' + export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ '' + lib.optionalString (cudaSupport && cudnn != null) '' export CUDNN_INCLUDE_DIR=${cudnn}/include @@ -61,7 +143,6 @@ in buildPythonPackage rec { RP_NEW=$(join_by : ''${RP[@]:2}) patchelf --set-rpath \$ORIGIN:''${RP_NEW} "$1" } - for f in $(find ''${out} -name 'libcaffe2*.so') do strip2 $f @@ -74,38 +155,84 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; + BUILD_NAMEDTENSOR = buildNamedTensor; # experimental feature + USE_SYSTEM_NCCL=true; # don't build pytorch's third_party NCCL + # Suppress a weird warning in mkl-dnn, part of ideep in pytorch # (upstream seems to have fixed this in the wrong place?) # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc - NIX_CFLAGS_COMPILE = lib.optionals (numpy.blasImplementation == "mkl") [ "-Wno-error=array-bounds" ]; + # https://github.com/pytorch/pytorch/issues/22346 + # + # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: + # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17 + NIX_CFLAGS_COMPILE = lib.optionals (numpy.blas == mkl) [ "-Wno-error=array-bounds" ]; nativeBuildInputs = [ - cmake - utillinux - which + cmake + utillinux + which + ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; buildInputs = [ - numpy.blas - ] ++ lib.optionals cudaSupport [ cudnn ] + numpy.blas + ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; propagatedBuildInputs = [ cffi + click numpy pyyaml - ] ++ lib.optional (pythonOlder "3.5") typing; + ] ++ lib.optionals openMPISupport [ openmpi ] + ++ lib.optional (pythonOlder "3.5") typing + ++ lib.optionals tensorboardSupport [pillow six future tensorflow-tensorboard]; + + checkInputs = [ hypothesis ninja ]; + + doCheck = false; # tests take a long time for channel release, so doCheck should be overridden only when developing + checkPhase = "${cudaStubEnv}python test/run_test.py" + + " --exclude utils" # utils requires git, which is not allowed in the check phase + + # Other tests which have been disabled in previous nix derivations of pytorch. + # --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions + ; + postInstall = '' + mkdir $dev + cp -r $out/${python.sitePackages}/torch/lib $dev/lib + cp -r $out/${python.sitePackages}/torch/include $dev/include + ''; + + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + for f in $(ls $dev/lib/*.dylib); do + install_name_tool -id $dev/lib/$(basename $f) $f || true + done + + install_name_tool -change @rpath/libshm.dylib $dev/lib/libshm.dylib $dev/lib/libtorch_python.dylib + install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libtorch_python.dylib + install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libtorch_python.dylib - checkInputs = [ hypothesis ]; - checkPhase = '' - ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions + install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libtorch.dylib + + install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libcaffe2_observers.dylib + + install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libcaffe2_module_test_dynamic.dylib + + install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libcaffe2_detectron_ops.dylib + + install_name_tool -change @rpath/libtorch.dylib $dev/lib/libtorch.dylib $dev/lib/libshm.dylib + install_name_tool -change @rpath/libc10.dylib $dev/lib/libc10.dylib $dev/lib/libshm.dylib ''; + meta = { description = "Open source, prototype-to-production deep learning platform"; homepage = https://pytorch.org/; license = lib.licenses.bsd3; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ teh thoughtpolice ]; + platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; + maintainers = with lib.maintainers; [ teh thoughtpolice stites tscholak ]; # tscholak esp. for darwin-related builds }; } diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 143b5bea1558..42b03849283b 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.28"; + version = "1.1.0"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "05rn2ijjv64a765gkpwcq3bb933gzp35zj4l9sk0agh19462myjx"; + sha256 = "0xa9jazsgsf7is4dbf2bbnfga8q8nmqy0qq4i7jj3riiccwlm6xw"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index ae9f9e42ecf0..7202b3cf70e2 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.17.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "1sh7a2dsal3kzcl4s9xbpl7hxhm9k55s5hiqdqqnafhvhnh0vmbz"; + sha256 = "1i4zrzamvgy3g117a2x66gyi7pzh27slc2w9pqysc0ldfcibi2wx"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 3f0d16cc8a86..cb38711ff91d 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "soco"; - version = "0.17"; + version = "0.18"; src = fetchPypi { inherit pname version; - sha256 = "15zw6i5z5p8vsa3lp20rjizhv4lzz935r73im0xm6zsl71bsgvj8"; + sha256 = "0bf55mqnz3l3ii26dvx33d35fv7jn7p5kmfwnr0xbpj38sxvhfr4"; }; postPatch = '' diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index f41452b4b61d..f33143a0f020 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ssdeep"; - version = "3.3"; + version = "3.4"; src = fetchPypi { inherit pname version; - sha256 = "255de1f034652b3ed21920221017e70e570b1644f9436fea120ae416175f4ef5"; + sha256 = "0px8k4fjbkjb717bg2v7rjhm4iclrxzq7sh0hfqs55f4ddqi0m8v"; }; buildInputs = [ pkgs.ssdeep pytestrunner ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 5c738c11f84c..0406f6fe5a0c 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.17.0"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "04xarlbh59f9ah53jxrcpqpzladyfxaw6cb2g8clw9aid0qzi9kh"; + sha256 = "076hqf189ww95n9vcbkkn8an42nx79cy8pf2qnl251yjncsvnbfl"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index a4a6a7998b06..17dbcc7ff1f1 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -4,15 +4,6 @@ buildGoModule rec { pname = "conftest"; version = "0.14.0"; - # Something subtle in the go sum db is causing every download to - # get a new sum (and thus breaking the hash). This disables the - # fetching of the sum from the go sum database. - modBuildPhase = '' - runHook preBuild - GONOSUMDB=* go mod download - runHook postBuild - ''; - src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 939b065a55c2..22887a44aff1 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.16.3"; - sha256 = "1gbblbmvx7a0wkgp3fs2pf5c1hymdpnfc7zqp1slg5hmfhyi5wbv"; + version = "10.17.0"; + sha256 = "13n5cvb340ba7vwm8il7bjrmpz89h6cibhk9rc3kq9ymdgbnf9j1"; } diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 05b8c1f7046a..7e3b4b952f18 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.25.6"; + version = "1.25.11"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; - sha256 = "1pgjk7j2p8m17pwynqd86hxgvz9lyb09ivx18lv6inmygij0pm4j"; + sha256 = "0ni8krr4rf5833livn9401cd41gspjvxj0iiqnc1rfg3x90i0fxh"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index cac04261dcca..a951fe27b69f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-10-09"; + version = "2019-10-21"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "3fe2223a48465c58c48a5a6a30ecf13ab92f7b97"; - sha256 = "1nzh34n1kix1fzfz3vnk5pajajj10k449m6wn3458d5mpyp7lrsh"; + rev = "67d0ccc398ca7650bb2c774a94d098bee3049169"; + sha256 = "0n61iv8lv4kq2dzz36s2hv9srkn0qvxvyslyqgccz84cbcndmh9z"; }; }; @@ -292,23 +292,23 @@ let coc-eslint = buildVimPluginFrom2Nix { pname = "coc-eslint"; - version = "2019-09-10"; + version = "2019-10-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-eslint"; - rev = "943f22365e2b50e7372058c39e5b85d4d5254beb"; - sha256 = "1p9gn5y9sk7jl6j1nfxhqk1h1xs1lhq2cg5pbilwsb42q5dzr79s"; + rev = "a84833d95ab641f0576dec5bf0ffde845055188a"; + sha256 = "1r3sy5bmnl4hbsb6ln47ahxqqbcfycca0zn6b2qnqrb64ynb30y1"; }; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-10-05"; + version = "2019-10-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "fea9b887936590e58f179d38e88005454e150673"; - sha256 = "19vhlhrzzijxkxn1c6azp8s2khdckxgp0vk4rdlhjhc6j14110p5"; + rev = "702c366bafd6d172427b7216936f209d58d818fc"; + sha256 = "0qc5gzyjg2pc328vf6jqycbgvq8qdczyd8g9dkigy6i81j4xd8za"; }; }; @@ -325,12 +325,12 @@ let coc-highlight = buildVimPluginFrom2Nix { pname = "coc-highlight"; - version = "2019-09-20"; + version = "2019-10-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-highlight"; - rev = "775dd5e0a2c8f6e3834e002ca855a305ca267422"; - sha256 = "0dmzpfvxj8kw6knnsbfjzx1d3n9i5rff9nw7j9pl1brmgk2r5r77"; + rev = "b4e82ebd5fe855d004dd481e2ecf2fa88faed284"; + sha256 = "06h64jq8cgj5hc19inidns046kkb76750179jsw7xv5zbp93ygap"; }; }; @@ -391,12 +391,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-10-04"; + version = "2019-10-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "3c117046b54130157006f8ddf048304507499260"; - sha256 = "1wv3ryih2f3hdcb78yy0r20wzlpqf4jv3j4mllb9vay0lcgyx90b"; + rev = "25cd38285df23766fa8c543c307f9ddf65120902"; + sha256 = "0smilk9mi6d4v1p03wqigvri8vk0k30fb8gqlqz5gpxdf3wwn90v"; }; }; @@ -821,12 +821,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-10-04"; + version = "2019-10-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7e15b1ffed251ef68ec3796676fe37ee57c786ca"; - sha256 = "08c0m8jkdi21r2wxqqkar411ydvmfpwqdmnklpzzs4hznxfqxpf3"; + rev = "15ee41069c8f5978e47d7aa845f4e21c7708b998"; + sha256 = "1yxf336db3y10wngngwx7z8r8y0fvdhp3xkza5xjbfbq0mh600c6"; }; }; @@ -945,12 +945,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-10-07"; + version = "2019-10-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "70a11ee67f3c4353e48aad69812c34b5c8489f07"; - sha256 = "1zwhsk30nq5p82px2z4gri8pxgkri26x488fi20pdkpabgg5dh8g"; + rev = "2a6236d9d73f2cbbde4b802787d37cb8cbca2b33"; + sha256 = "196kka23cidgbig86kvapzv58wqp5qgql8c0m1wkgig1v8gldssv"; }; }; @@ -1057,12 +1057,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-09-24"; + version = "2019-10-20"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "346587418bc7a1b39bdf65dce2a85a1058ed87b5"; - sha256 = "17qa5xhqjy43sg1nmm83z90dk8nfkd64n98ijx04kqprk6jp90rq"; + rev = "95ea5ae8b0f1766237438f28ecce56414ee6432a"; + sha256 = "1qn825py75cdh414h9gcdf41w7wv84y38m5h39p0w04qz4p585xc"; }; }; @@ -1355,12 +1355,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2019-02-22"; + version = "2019-10-23"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "47648734706fb2cd0e4d4350f12157d1e5f4c465"; - sha256 = "0739hdvdfa1lm209q4sl75jvmf2k03cvlka7wv1gwnfl00krvszs"; + rev = "9c6f8fe0b34adf3813a866bff16b031537cc346c"; + sha256 = "0r3jppigc6i562par0l36z7g5zyk2djvjvbl61vjzi0jk1d0gvjn"; }; }; @@ -1377,12 +1377,12 @@ let iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2019-09-04"; + version = "2019-10-21"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "f9e6b5e8a72c4b3c542074d881e694daa60c79df"; - sha256 = "1l9p8hxrv3rybbv9w3f74l4wngjyjw7jzylw38jbmsn7bgr1m336"; + rev = "088293c426c398b2655f01026cd146f536a703c7"; + sha256 = "1ib4p3r8qnlybfw53asn8xk0y9w5ppjpkn2c51bsx1v5an82jjbl"; }; }; @@ -1410,12 +1410,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-09-28"; + version = "2019-10-20"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "b4b2f3ef54c02d6f8fb09cf1eb0f139d3a45bdb8"; - sha256 = "0947003kyy0hpymhnl13mgv2in3q5q26y3d1gqqx4hy63plcxi14"; + rev = "08f13af066fad3a60cf241b37ac1878b8cfafa46"; + sha256 = "0ghdbxmmw1s67vb4l4ap6n6dy69lpp8k1sln27abxhympi2fs2dg"; fetchSubmodules = true; }; }; @@ -1554,12 +1554,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-09-09"; + version = "2019-10-18"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "c9ab296e856bed4e694180efb6ffb692cf18ed8f"; - sha256 = "1sw71fyihcyjb6vlwzw5wah6q1dz2mfcswm594wrdkjxm71i0c0d"; + rev = "d7fd8d7a7465194e8eb67ce759c9fe392035f939"; + sha256 = "0dg0m5ff1gwqn8l4il2yykgmi71vjyp1z9dwil9jn74xk1zhwszp"; }; }; @@ -1774,12 +1774,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-10-14"; + version = "2019-10-19"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "0e03a4497ef01fd17b34232830285cb506701abd"; - sha256 = "1l9s9zhmdhf0s5ps2f9y2b5fgl8kvkfs69v97rgrd51h9m4mk0jb"; + rev = "75b50f8ab8dbf57c193cfe5f8ca4edd975ccd314"; + sha256 = "16c6zjqskfdcrdk08cxjpbc1kyixnbmzy7d4mz0xrkxh3bczqgff"; }; }; @@ -1884,12 +1884,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-10-14"; + version = "2019-10-22"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "42455176896560bf8cf7fc8457232131231b358f"; - sha256 = "08nmzgr536yqv1rnlf6m5xj176wfamcd4zjp4pc4r9b955r874c0"; + rev = "fec3e57ad23e4c268d07181d6afb858925b647a1"; + sha256 = "1s5rmzl2rlqgxms5gi8gj6nnk18qqfsz6r40kk84cgqkf0ip13xv"; }; }; @@ -2005,12 +2005,12 @@ let open-browser-github-vim = buildVimPluginFrom2Nix { pname = "open-browser-github-vim"; - version = "2018-03-14"; + version = "2019-10-17"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser-github.vim"; - rev = "6f63e9c8b9482858af12c2dc60f6df2854e57f28"; - sha256 = "06wvj6sqqzf52ng0k0p9g8wnlrljnia6h4d65681plqyxakbvi2w"; + rev = "b252c5cf717865b61945f5c7fad0fb950a947db8"; + sha256 = "1n562h3g7ri4ifcbfzjiz2yq0a5v9aad3di24xc3kriz4pwlkgbr"; }; }; @@ -2060,12 +2060,12 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2019-10-12"; + version = "2019-10-17"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "ea0d44c725b3bed5dc37ab88d62279c6066add06"; - sha256 = "1f5dljfqk69f77r94kxaz8pi35n7hc53h5gfcs3ba0jsjz19mpnv"; + rev = "08f69d9dfc314021eef8802f1acbce051bf7fda0"; + sha256 = "040ya0grhalylnaqrjgdlw0f7mfl87pz5y3f624gqq73pcf36skk"; }; }; @@ -2280,12 +2280,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-10-13"; + version = "2019-10-20"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "8293adcd9c5645379133bea4d77de30b1476528c"; - sha256 = "1cc1wq2lbsl7jxh3mal0yhj3z2fn1q60ip4666kshx5yryikhs3p"; + rev = "97fdc4e4975515d8e8a5a82380dd85628d59a005"; + sha256 = "1ggnl9h0jqb3zf8n8vpvlizxb3fikmghwpj8d3xq3ny54wfjgx78"; }; }; @@ -2467,12 +2467,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-10-02"; + version = "2019-10-23"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "3b3f4ee8abf81191d1eca4350448148b86e8a741"; - sha256 = "0spksh2pafp9lzx9mybnx3whm9jgjg3yh2lfi5f5kk6gypfnwc4y"; + rev = "eff1f1b67971f144165dd009cd895b241ec66a0c"; + sha256 = "040xp6cwv0jzr0kwzr00dcjw7sj1q549g451358qsi25bf29nmwg"; }; }; @@ -2511,12 +2511,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2017-12-17"; + version = "2019-10-23"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; - sha256 = "130rxvlkqzlqh09w6fpmq7x3b7s4s56qxly9m4jh6s2jrab1cxak"; + rev = "dcd5f446c34d453b86639f9ca77cad46ac12a32d"; + sha256 = "07fd8n9prldbmk3rr23bxsx7i275883ql31faksxrs0jgg8f4l4l"; }; }; @@ -2666,12 +2666,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2019-05-05"; + version = "2019-10-20"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "1a99766b73783bafb08cfa07d7e29e5387c55189"; - sha256 = "08vxvx6fabqg725jv7cbdickrxlcw45885jai0hhgclm4hfqvawx"; + rev = "8ff301c651d6df806c0f9305273a6c62a693bc48"; + sha256 = "0ckgwfchxxd5va9ils2d0518irlsjkc0pzncn357dfihh2mgg01s"; }; }; @@ -2732,12 +2732,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-10-06"; + version = "2019-10-21"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "f6dd7c17f71d2b6a1fad1e84e6cb28861af0e978"; - sha256 = "1407gl1rki5nj7rwiab61j579cih6shkgl02z4cmrvyb0dcq0vq8"; + rev = "c8c0a9325407c487fd702eca39d987d67123c98b"; + sha256 = "054q6lk91x7dghvvzb51j7923bdy317iya5msv9as76nwzdrk5dp"; }; }; @@ -2963,12 +2963,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-10-11"; + version = "2019-10-23"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "297ca3d00406064004be5f2a9923fe8c2406e6e9"; - sha256 = "1fmd0rjgrhsngpml885lybzibrpsszcc80iwm6qvydddhcp35jdi"; + rev = "3736132370580e1fad22c081cedf4eb80a5ef6d8"; + sha256 = "0n47p0anlszzhh7crl1a2x2yiw7hpk7b1sjaf8803dx1p88baqfv"; }; }; @@ -3293,12 +3293,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-08-27"; + version = "2019-10-19"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "e8a213d9d0a21f03fc03319fa7560521b6cd6928"; - sha256 = "1vhjlpjjg5bdfcalf10z9gjnrnc98yf5r3ink9dhljj5vnx23zaw"; + rev = "79ffe5c6cf0a56d693659b6b98e92a82daf105f4"; + sha256 = "1s1rqc7ai5a7al4sqavsng7pa3hx8fxgdkq8ww119bwfx5p43v4z"; }; }; @@ -3524,12 +3524,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-10-11"; + version = "2019-10-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "06e34204af04643d96d30132de6ba9066368de15"; - sha256 = "1322pr6zv2yv1y9gvwb8d7an4iyvi4yxbbivy1y8hl9pcy8ni989"; + rev = "b09c5d2523f9964add241a04862c2f8bbd7d428f"; + sha256 = "0x6j4z85z23wk1j7ni1558iyssiimixv26rhbsp9n26a4g8mm042"; }; }; @@ -3568,12 +3568,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-10-01"; + version = "2019-10-15"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "1725c13add66c6981d9406f109dcd64dff5fbf59"; - sha256 = "0xv1w9csl63kl7pm0inkzfjas1q477cpxqxyxa3x1wbmmar6sn46"; + rev = "5c73edb3c2fd8794661d7c7ac72eed1fc9d36761"; + sha256 = "0k93phv42195i3gdm4dwz5l5vni7mpqhpj7d4n0znn21kgwwca38"; }; }; @@ -3601,12 +3601,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-10-13"; + version = "2019-10-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "17c53d38f17b0978323868ac12573f33a6fb8100"; - sha256 = "1fal9w1xkwbsidj9rskxkl7406n92rwghas6vw5nx3v95pn8lb7k"; + rev = "2f7a00e9f2ac4ec3c49bfe6234ccd290bfb782ac"; + sha256 = "0b1j44gphfmpi13h9rxd0fn2z5wiwvg2mfihj8i0ij7265l1wq3q"; }; }; @@ -3678,12 +3678,12 @@ let vim-haskellConcealPlus = buildVimPluginFrom2Nix { pname = "vim-haskellConcealPlus"; - version = "2018-12-26"; + version = "2019-10-21"; src = fetchFromGitHub { owner = "enomsg"; repo = "vim-haskellConcealPlus"; - rev = "1d64dd2cdd1e99689e3d79e7ada151213acd5450"; - sha256 = "0jsfg941qdpibzcg0ypf0nvabmv1bpwgzgzda7hjy1jcai4yrw1g"; + rev = "c76b73b17a5eaf4fd535b6bd1f533ea847fd20f7"; + sha256 = "01p9rjpp9g859axlq2mpj89dg3d7n40rmqx2x66aql87m8rzjmam"; }; }; @@ -3920,12 +3920,12 @@ let vim-jsbeautify = buildVimPluginFrom2Nix { pname = "vim-jsbeautify"; - version = "2019-03-01"; + version = "2019-10-18"; src = fetchFromGitHub { owner = "maksimr"; repo = "vim-jsbeautify"; - rev = "aa96718ddc74bc20dd6b44a179eb0ee66443339f"; - sha256 = "1v7h7xdhkiifcjk1bqiw7nfz4bxbrbaqghmi31564xdgckqfqcqk"; + rev = "6003f9d420d56b91f5664ec5ed5a9a3a6d8df22b"; + sha256 = "06gxmqyxkw2mgdy6m7b248w0gzkwsjcpyihpnyf5cajb5aw4wk13"; fetchSubmodules = true; }; }; @@ -3965,12 +3965,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-09-18"; + version = "2019-10-16"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "89c30c0defe8ddb31bc0d3cfa5f22f3f6d8eb24f"; - sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir"; + rev = "8f8c9edba37310d17e59a625b177ec6a37c07035"; + sha256 = "1hk3003ypiw62vra8vdjx2gzrv23b642w1nhq0zvgmh6yv8l33nz"; }; }; @@ -4086,12 +4086,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-10-01"; + version = "2019-10-21"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "8d1691f9f191b7cfab3fe7c4606c0bb8dd7bd47d"; - sha256 = "016589m1g7fn0705fiikgg4ypbncg8i6mvw4wm58v80s2d84az6m"; + rev = "576c07a77570fee7b5e724516f9a3bb3de7d4a8a"; + sha256 = "1qnpjb5rciv2c6zklhfn1flj2r8dj72wmv2wdmslh7csdqf3fyki"; }; }; @@ -4306,12 +4306,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-08-26"; + version = "2019-10-14"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "53f14ea43997e46c2c4686a1d89bcebfec1c8c50"; - sha256 = "1qcng9hszv4fcqhzdq7sfvdhl0x4zv91blk328n2jrqp831c0ds1"; + rev = "cbf8fef9803bcbb50b92ccf9ea050f821e98b478"; + sha256 = "03zvganc2f95iwddlghw991ygw0z9zqlnsxjh6akafm4s31b66pi"; }; }; @@ -4394,12 +4394,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-10-14"; + version = "2019-10-21"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "fcfd5b7e1f2ac9f90e933037cd2ef1d0ef2ff992"; - sha256 = "1j4jwy84pypick27gisw3z1gqa54zamlfhl2dpy4ixgqxgvrdf6k"; + rev = "eee50c55bf691bf6bf04c981c1d1cfed3ffc4588"; + sha256 = "12awz68lzckh4c2ffhp3gv45f123bsb9jghv5g8ypzrj3ch6im0c"; }; }; @@ -4416,12 +4416,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-09-27"; + version = "2019-10-16"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "f95026252c5a31242903a98c741887696dfbb11f"; - sha256 = "0lzzlrwcic3vbn6rk3vcakwg6fl6nkvhamxcind6jx43pr1ylwwv"; + rev = "31c55b85a03d96252bba14d64911cc78a20369a1"; + sha256 = "0f6kywmk7id6yglqf59qrfb1swrw3f7b7pxqj4zr0q6xmjq233n0"; }; }; @@ -4603,12 +4603,12 @@ let vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-09-01"; + version = "2019-10-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "5dc6eb2d8026b4ce812a5a9c966d232b1f50c9c7"; - sha256 = "05mig86l1hi0q1y5sj7bp09i1lwbyn7v9xp3hd853fv7z026fza0"; + rev = "4a7159a30061b26aec9ac367823094e7fd0f6a5b"; + sha256 = "08qlxa22kfqv4r2vdl8gfzayxir4cw78p8acah6dq3svksk2b2ib"; }; }; @@ -4625,12 +4625,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-10-07"; + version = "2019-10-22"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "80f64eace5694413f9dfd8e70e4a7018b56c42b6"; - sha256 = "1v8zhs240d4z87sryn14dn29i9a2aigwz197c5ag8l4zg4b466z0"; + rev = "ad755bb72953d02d01046b606962db727766d096"; + sha256 = "1l46ar2v1000l44dwbybzy60nqw76hiczdfh370n3sr5vpp4ynda"; }; }; @@ -4691,12 +4691,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-10-12"; + version = "2019-10-23"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "5ee6d319bb895bb6672f253798263f53a93c2a06"; - sha256 = "1id8vghf09ahpv0kkvvg9v498i4xvv499z0b3ynjjqgpda44fh2i"; + rev = "9ccd2ac19010b80deb7bebe36d91c70bae26e259"; + sha256 = "18x8l420zj2lpa8fwg98gz4ffh02gm0shwvf3a6lp10a41gk4ymf"; }; }; @@ -4856,12 +4856,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-10-12"; + version = "2019-10-22"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "7e0269621f8e408a75a548171445a5612a7a2094"; - sha256 = "1w7b9dp6a3h2iqlxp12bfyq6q4hximagcgllq7j06h2wnp7jbkw2"; + rev = "18619b98d8fc16c6d23ccbefc5e9ce335c499d42"; + sha256 = "0aja7qfv3mcg7skagrd73xj9hncv35a9l554sjmm072wbi682p5l"; }; }; @@ -4911,12 +4911,12 @@ let vim-textobj-user = buildVimPluginFrom2Nix { pname = "vim-textobj-user"; - version = "2018-11-19"; + version = "2019-10-16"; src = fetchFromGitHub { owner = "kana"; repo = "vim-textobj-user"; - rev = "074ce2575543f790290b189860597a3dcac1f79d"; - sha256 = "15wnqkxjjksgn8a7d3lkbf8d97r4w159bajrcf1adpxw8hhli1vc"; + rev = "9861dc6829a0ce253e40b4d947a9432b58eb499b"; + sha256 = "1gyz6y5f9bf5hnmb54lqmddy3g9y7bc28k9mrqfr49cd9nziywa5"; }; }; @@ -5241,12 +5241,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-10-14"; + version = "2019-10-22"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "335dbe97ce6f3aae311396f9567d2457270589b1"; - sha256 = "1q8jjxab87lfa1sp6sxh7540i01nbbh9inh66zv5fshgga95vv0j"; + rev = "76c7c32f0b5e1cbedb5bc17d76ef7392cc88f8ba"; + sha256 = "1klv48nbp0v0ik9xizx0kzswiygdkgbv5mgh07ly5zbsfsvz2hg1"; }; }; @@ -5384,24 +5384,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-10-03"; + version = "2019-10-17"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "88edbffd4f1149d308340321f1d0bbe620b1b252"; - sha256 = "1s90kx5a2r1azc0chrq84c9pwaifndc4lzi5l7j8lrfq6saj8q1s"; + rev = "7ea1a4da5ab0d3ae73ea6af80b7252ae960e126f"; + sha256 = "0vhgmwycmscd7v10nzcb8q7wqx4g2lrc9jb6zgd9dnkd8dzhmz3h"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-10-01"; + version = "2019-10-22"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "94cfacd11ff97643a32409671fed072e3b1412d6"; - sha256 = "0zrypbd8cwrcasg8pf7zxm7v64vq0jjqa3gwkywp76x9shxi6dk5"; + rev = "123f0c0794eb8e36b24649059090a2deeb34d1d5"; + sha256 = "1rb35m6x3i692ln15a42g7dnc7lpg6lvf6kfdl67ygsgigcwflff"; fetchSubmodules = true; }; }; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index d5272e9b08a2..83b7433b14ae 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "riemann"; - version = "0.3.3"; + version = "0.3.4"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq"; + sha256 = "1c31higrsmpkvl956rrw1hpwjyvypgrjzl6vky0gn55zgvisasn4"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 5ecf34282d7c..5b0f4eceaed9 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "01a1vf0rgncmhk7v9vnj4gdx0j8jfiy95f2hr4iwqdch7jy5q367"; + sha256 = "1g9g9c95ypfa9dv53ga3hjqxrrlqmcf1lmpxgrifl2l34q4zzfln"; }; postPatch = '' diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 76b35a345b5b..f71afc2b674e 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0w3y53kwnkcm9fmf28zbjvqk6ivfic5f2k3nflvca1i8iaj2z044"; + sha256 = "0gi7ggmyjqd4kxdwm5csmzmjmfrjx7q20dfzk3da1bvc6xj6ag0v"; }; - buildInputs = [ libevent openssl c-ares pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libevent openssl c-ares ]; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://pgbouncer.github.io; + homepage = "https://pgbouncer.github.io"; description = "Lightweight connection pooler for PostgreSQL"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 07ba47dda4d5..1afefc71465d 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "6.5"; + version = "7.0"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "17vdrw71ys1n5g9pdmzipmr706bslq0gbxxjhacxnrgsz8r4rl6a"; + sha256 = "0ynh7wrgpnmwah9r2ll32dmicdivz13ijjxg2vj1qcaxgy0b5ivm"; }; buildInputs = [ diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 44b00adf5c17..7edfb280e430 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,18 +3,19 @@ } : stdenv.mkDerivation rec { - version = "20190725"; + version = "20191016"; pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "1hjhyh3q0q22czq3s2wk5mcky1jrq9xw8fppw6r7cix1riq74m91"; + sha256 = "05xyvmbs2x5gbj2njgg7hsj3alb5dh96xhab0w0qkhb58x2i1hld"; }; buildInputs = [ openssl ]; + doCheck = true; meta = { - homepage = http://www.maier-komor.de/mbuffer.html; + homepage = "http://www.maier-komor.de/mbuffer.html"; description = "A tool for buffering data streams with a large set of unique features"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ tokudan ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 099c55989581..ca769be02d8a 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,24 +2,22 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "2.0.4"; + version = "2.1.8"; src = fetchFromGitHub { owner = "okbob"; - repo = "pspg"; + repo = pname; rev = version; - sha256 = "1xiyshz56qpx3bv0mzx73rqr7wmyamyj8jbqdv05wjb72npkjmzl"; + sha256 = "0nfc1cv2l2v1rav5jj7jz5wyb2df5l3iwrvvpkvxxpv3qll8kcfv"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gnugrep ncurses readline ]; - preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { - homepage = https://github.com/okbob/pspg; + homepage = "https://github.com/okbob/pspg"; description = "Postgres Pager"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/q-text-as-data/default.nix b/pkgs/tools/misc/q-text-as-data/default.nix index dbd4a4c465ca..e70b8274d364 100644 --- a/pkgs/tools/misc/q-text-as-data/default.nix +++ b/pkgs/tools/misc/q-text-as-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "q-text-as-data"; - version = "1.7.1"; + version = "1.7.4"; src = fetchFromGitHub { owner = "harelba"; repo = "q"; rev = version; - sha256 = "021c2sd6qscz1ipwzzjf43pfd311dcay7yralksl25rs0r7h3li2"; + sha256 = "0p8rbfwwcqjyrix51v52zp9b03z4xg1fv2raf2ygqp9a4l27dca8"; }; buildInputs = [ python2 ]; diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 0c9079240d0c..6a816615e9c1 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://oss.oetiker.ch/smokeping; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 49ceacadcb7d..2cf9b92745fd 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "11467kk8blg777vss0hsgz6k8f5m43p50zqs7yhx2sgbh9ygnn6y"; + sha256 = "097i2dsnbndpnyc4nx1j76qkx1bxwwlxnzmp1h3j4raghddgiq0g"; }; buildInputs = [ pam openssl zlib ]; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index ab2de77b6b16..41a00306f695 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -12,6 +12,8 @@ , nss , pam , systemd +, autoreconfHook +, gtk-doc }: stdenv.mkDerivation rec { @@ -33,6 +35,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig + autoreconfHook # Drop with above patch + gtk-doc # Drop with above patch ]; buildInputs = [ diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 306bd0574c9c..07fcf0eca8b5 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "amazon-ecs-cli"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "0mj0y2hrl7yp8mfjgi68gvbravgwp5v58hhcclr49mdjnr4v6i9x"; + sha256 = "0dqnxzfdic3v10rr8k83zfbv7qc3yanajd81a0amzs778sqp7x9f"; }; dontUnpack = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a53f6ecb48d..bca0342c2808 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23671,7 +23671,9 @@ in # Since version 8 Eagle requires an Autodesk account and a subscription # in contrast to single payment for the charged editions. # This is the last version with the old model. - eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix { }; + eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix { + openssl = openssl_1_0_2; + }; eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; |