From 92e1aeae573fa71fc3ae299e8905067eecdb9f06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Apr 2020 12:00:53 +0000 Subject: [PATCH 01/26] felix: 5.6.1 -> 6.0.3 --- pkgs/servers/felix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 38dad5e6fe8..486474a46b0 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-felix"; - version = "5.6.1"; + version = "6.0.3"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; - sha256 = "0kis26iajzdid162j4i7g558q09x4hn9z7pqqys6ipb0fj84hz1x"; + sha256 = "1yk04q8rfbbabacbhmrsw5ywr96496x1cz4icdqimb1cfxixv1q0"; }; buildCommand = '' From 5e587fc8e817908a86d5ca0cf68c5b44188d3199 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Apr 2020 10:27:55 +0000 Subject: [PATCH 02/26] vertcoind: 0.14.0 -> 0.15.0.1 --- pkgs/applications/blockchains/vertcoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin.nix index 1b8b0376331..21104012f4d 100644 --- a/pkgs/applications/blockchains/vertcoin.nix +++ b/pkgs/applications/blockchains/vertcoin.nix @@ -19,7 +19,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vertcoin"; - version = "0.14.0"; + version = "0.15.0.1"; name = pname + toString (optional (!withGui) "d") + "-" + version; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = pname + "-project"; repo = pname + "-core"; rev = version; - sha256 = "00vnmrhn5mad58dyiz8rxgsrn0663ii6fdbcqm20mv1l313k4882"; + sha256 = "09q7qicw52gv225hq6wlpsf4zr4hjc8miyim5cygi5nxxrlw7kd3"; }; nativeBuildInputs = [ From d092232a91a5012d3353f921c9a600afe34a46e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Apr 2020 11:54:43 +0000 Subject: [PATCH 03/26] qmidinet: 0.6.1 -> 0.6.2 --- pkgs/applications/audio/qmidinet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 10cbcb5d5b1..479a8a2bb04 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }: mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; pname = "qmidinet"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; - sha256 = "1nvbvx3wg2s6s7r4x6m2pm9nx7pdz00ghw9h10wfqi2s474mwip0"; + sha256 = "0siqzyhwg3l9av7jbca3bqdww7xspjlpi9ya4mkj211xc3a3a1d6"; }; hardeningDisable = [ "format" ]; From 40886adad8f3509dac6098b75fe4ec851a1c4d6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 12:39:05 +0000 Subject: [PATCH 04/26] eventstore: 5.0.7 -> 5.0.8 --- pkgs/servers/nosql/eventstore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index d1f4938197c..239c6875c34 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "EventStore"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "0yvprql73g4lc88b6kp1kk8h64az2hn4am5hc4gyiaxfavaww3ci"; + sha256 = "021m610gzmrp2drywl1q3y6xxpy4qayn580d855ag952z9s6w9nj"; }; buildInputs = [ From 51b1533b378b724f2c6f14c1a220ecd2c497b38a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 06:21:39 +0000 Subject: [PATCH 05/26] suitesparse-graphblas: 3.2.1 -> 3.2.2 --- .../libraries/science/math/suitesparse-graphblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 599c1be6646..5a2c28d3c02 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.2.1"; + version = "3.2.2"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "AAwwzrpKFHy40Ldm6hTO6L0FWPYwi3kJj3zrshFwYas="; + sha256 = "04hprrgj0f44ml2f0w4jfwgrvy8l2s6ya0c9xc8gwlbmkc7a4c62"; }; nativeBuildInputs = [ From 73772f37c57011fa8972ec379c4c0ddcaed486a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 11:40:55 +0000 Subject: [PATCH 06/26] collectd: 5.10.0 -> 5.11.0 --- pkgs/tools/system/collectd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 9118fc55ea9..f625a441ba3 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -8,12 +8,12 @@ let plugins = callPackage ./plugins.nix args; in stdenv.mkDerivation rec { - version = "5.10.0"; + version = "5.11.0"; pname = "collectd"; src = fetchurl { url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; - sha256 = "0nrpq09q6vbbv0hjc1vfa36z8j5802500hy75m678gh2cgsmjcx0"; + sha256 = "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 2bd71ff7211731333951b66330bf5a27c24e33d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 12:31:53 +0000 Subject: [PATCH 07/26] duplicity: 0.8.11.1596 -> 0.8.12.1612 --- pkgs/tools/backup/duplicity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index e49d87c697c..8e4014eea9d 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -19,11 +19,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.11.1596"; + version = "0.8.12.1612"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "1qdaaybwdc13nfwnwrqij4lc23iwy73lyqn5lb4iznq6axp6m0h9"; + sha256 = "06n58pwqg6kfigckjlslz2kx1lsykz1kn9a0r1cl8r3kn93zhk07"; }; patches = [ From b385b215fab483ecf9c62f4ad827630910c810df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Apr 2020 19:25:43 +0000 Subject: [PATCH 08/26] libtirpc: 1.2.5 -> 1.2.6 --- pkgs/development/libraries/ti-rpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 8bc3c0a6e09..db434a5e62e 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-1.2.5"; + name = "libtirpc-1.2.6"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "1jl6a5kkw2vrp4gb6pmvf72rqimywvwfb9f7iz2xjg4wgq63bdpk"; + sha256 = "1k6i6wma3xs7gmp54z587nd4yi5wrvg2ycl5g36zjnhx32jyjy22"; }; outputs = [ "out" "dev" ]; From 7333b8cd6d2f3d42fd6f8403add7a311459611ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Apr 2020 09:01:13 +0000 Subject: [PATCH 09/26] eagle: 9.6.0 -> 9.6.1 --- pkgs/applications/science/electronics/eagle/eagle.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 7c5942d825a..58bdd5c722d 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in mkDerivation rec { pname = "eagle"; - version = "9.6.0"; + version = "9.6.1"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "1crkyc7ws2zz5dfs00h6rj4z2hyqb97kp6r4hxhmcgg5647ij4z8"; + sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw"; }; desktopItem = makeDesktopItem { From 7ad2de54d7248d7d27f716dbb03aa283a9690a88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Mar 2020 20:37:18 +0000 Subject: [PATCH 10/26] libmwaw: 0.3.15 -> 0.3.16 --- pkgs/development/libraries/libmwaw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index a7e52376e3f..fbba02fcd0c 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.15"; + version="0.3.16"; name="${baseName}-${version}"; - hash="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.15/libmwaw-0.3.15.tar.xz"; - sha256="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; + hash="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.16/libmwaw-0.3.16.tar.xz"; + sha256="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; }; nativeBuildInputs = [ pkgconfig ]; From ea18da4bc431240aaef756635688f4bfc30a1619 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Mar 2020 22:25:59 +0000 Subject: [PATCH 11/26] mercurial: 5.3 -> 5.3.1 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 85c54614748..ffbd9879135 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.3"; + version = "5.3.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1fgr8k2ra7hs2dm8048pw01anmd41as246a5vm4m2sb7dcfzczz5"; + sha256 = "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp"; }; format = "other"; From a3f27a2720feab66b37c6b7ee0f23517cde544b6 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 30 Apr 2020 17:54:40 -0700 Subject: [PATCH 12/26] qimgv: 0.8.9 -> 0.9 https://github.com/easymodo/qimgv/compare/v0.8.9...v0.9 --- pkgs/applications/graphics/qimgv/default.nix | 17 +++++++++++++++-- .../graphics/qimgv/qt5-12-compat.diff | 13 +++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/graphics/qimgv/qt5-12-compat.diff diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 2756d659edf..4bbf6aa31d3 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -1,12 +1,14 @@ { mkDerivation , lib , fetchFromGitHub +, fetchpatch , cmake , pkgconfig , exiv2 , mpv +, opencv4 , qtbase , qtimageformats , qtsvg @@ -14,15 +16,25 @@ mkDerivation rec { pname = "qimgv"; - version = "0.8.9"; + version = "0.9"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6"; + sha256 = "1yynjk47gjf2kjfb0ak4blxpb5irgqc1k59z726lwjd6gvg689fl"; }; + patches = [ + # QtAtomicInt's `storeRelaxed` was introduced in Qt 5.14, while nixpkgs only + # has Qt 5.12. This appears to be the only instance of Qt 5.12 + # incompatibility, and will be fixed in the next release. + (fetchpatch { + url = "https://github.com/easymodo/qimgv/commit/a39d6086ceb9445d2c16943e0719096a99920bf8.patch"; + sha256 = "1z3ngv6i316hrdcdzig4jg6bcdbgfxjaxvm2jcfcw2dnfbfiq47s"; + }) + ]; + nativeBuildInputs = [ cmake pkgconfig @@ -31,6 +43,7 @@ mkDerivation rec { buildInputs = [ exiv2 mpv + opencv4 qtbase qtimageformats qtsvg diff --git a/pkgs/applications/graphics/qimgv/qt5-12-compat.diff b/pkgs/applications/graphics/qimgv/qt5-12-compat.diff new file mode 100644 index 00000000000..da64759e22d --- /dev/null +++ b/pkgs/applications/graphics/qimgv/qt5-12-compat.diff @@ -0,0 +1,13 @@ +diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp +index 96ec9d3..6d95d08 100644 +--- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp ++++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp +@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) { + + void LinuxWorker::run() { + emit started(); +- isRunning.storeRelaxed(true); ++ isRunning.store(true); + + if (fd == -1) { + qDebug() << TAG << "File descriptor isn't set! Stopping"; From 95b6a6d5fd3139d65a04fc22b693dc53e29e54ba Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Fri, 1 May 2020 00:20:52 +0200 Subject: [PATCH 13/26] clipit: 1.4.4 -> 1.4.5 --- pkgs/applications/misc/clipit/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 82d6272aadc..02207fb9580 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { pname = "clipit"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { - owner = "shantzu"; + owner = "CristianHenzel"; repo = "ClipIt"; - rev = "v${version}"; - sha256 = "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"; + rev = "45e2ea386d04dbfc411ea370299502450d589d0c"; + sha256 = "0byqz9hanwmdc7i55xszdby2iqrk93lws7hmjda2kv17g34apwl7"; }; - patches = [ - # gtk3 support, can be removed in the next release - (fetchpatch { - url = "https://github.com/CristianHenzel/ClipIt/commit/22e012c7d406436e1785b6dd3c4c138b25f68431.patch"; - sha256 = "0la4gc324dzxpx6nk2lqg5fmjgjpm2pyvzwddmfz1il8hqvrqg3j"; - }) - ]; - preConfigure = '' intltoolize --copy --force --automake ''; @@ -38,5 +30,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl3; platforms = platforms.linux; + maintainers = with maintainers; [ kamilchm ]; }; } From 21708823ffb4461fe9f831340ba38fcea1f9de1d Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 29 Apr 2020 13:34:26 +0300 Subject: [PATCH 14/26] tuir: 1.28.3 -> 1.29.0 --- pkgs/applications/misc/tuir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index e479dc26f17..11bf70cb56b 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "tuir"; - version = "1.28.3"; + version = "1.29.0"; src = fetchFromGitLab { owner = "ajak"; repo = pname; rev = "v${version}"; - sha256 = "0nhpbb0vdngwb0fhlimjgm3wq2s67m4rb3vv920zyllnmfplk0lk"; + sha256 = "1fqp6bvq8kzdsf3nna4mn1phdcixpx76bya43xrivxjbzsfl59ib"; }; # Tests try to access network From ced27b2a587c92d6a1fd9b2be2aa8ecfde9dbc34 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 29 Apr 2020 13:14:05 +0300 Subject: [PATCH 15/26] fselect: 0.6.9 -> 0.6.10 --- pkgs/tools/misc/fselect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index e508eb02ad0..d979e1e1a00 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.6.9"; + version = "0.6.10"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "0cgzvzdsy8vbiapgk1l5dp48c3kq0xmx53yfi486mx8nwvz3ksc0"; + sha256 = "17dz0qj2981plvzp72yisyrjnyz1sy3pqyvhx76ws2754vjgq4ra"; }; - cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb"; + cargoSha256 = "19b05gx717xjg4arn4zgrqh7ckzgzx0ygg9gkfzsg7phz7f01626"; nativeBuildInputs = [ installShellFiles ]; From ae5c4ed886e13daec7f8ee90cd1d3a72102c4d8a Mon Sep 17 00:00:00 2001 From: squalus Date: Tue, 28 Apr 2020 15:40:08 -0700 Subject: [PATCH 16/26] ungoogled-chromium: 81.0.4044.92-2 -> 81.0.4044.122-2 --- .../browsers/ungoogled-chromium/common.nix | 17 ++++--- .../browsers/ungoogled-chromium/default.nix | 24 +++++++--- ... => enable-vdpau-support-for-nvidia.patch} | 0 .../enable-video-acceleration-on-linux.patch | 48 +++++++++++++++++++ .../browsers/ungoogled-chromium/plugins.nix | 4 +- .../ungoogled-chromium/ungoogled-src.nix | 6 +-- .../ungoogled-chromium/upstream-info.nix | 18 +++---- 7 files changed, 90 insertions(+), 27 deletions(-) rename pkgs/applications/networking/browsers/ungoogled-chromium/patches/{vaapi-fix.patch => enable-vdpau-support-for-nvidia.patch} (100%) create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index d07da2b3b07..25ee5462b29 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -24,8 +24,13 @@ , libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone # package customization -, useVaapi ? false , useOzone ? false +, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper +# VA-API TODOs: +# - Ozone: M81 fails to build due to "ozone_platform_gbm = false" +# - Possible solutions: Write a patch to fix the build (wrong gn dependencies) +# or build with minigbm +# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879) , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -134,10 +139,10 @@ let libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jre - ] ++ optional gnomeKeyringSupport libgnome-keyring3 + ] ++ optional useVaapi libva + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional useVaapi libva ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; @@ -156,9 +161,9 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) ([ - # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi - ./patches/vaapi-fix.patch + ] ++ optionals (useVaapi) ([ # Fixes for the VA-API build: + ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi + ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) ] ++ optionals (versionRange "81" "82") [ (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902") (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064") diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix index f172e7c09ce..9d6c7fada70 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -6,14 +6,16 @@ , lib # package customization +# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false +, useVaapi ? false # Deprecated, use enableVaapi instead! +, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon , ungoogled ? true -, useVaapi ? false # test video on radeon, before enabling this , useOzone ? false , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux @@ -21,7 +23,7 @@ }: let - llvmPackages = if channel == "dev" + llvmPackages = if channel != "stable" then llvmPackages_10 else llvmPackages_9; stdenv = llvmPackages.stdenv; @@ -34,9 +36,10 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix ({ - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone ungoogled; + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; + inherit ungoogled; gnChromium = gn; - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (channel != "stable") { # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-03-23"; @@ -130,6 +133,14 @@ let cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ '' else browser; + + optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09: + then throw '' + Chromium's useVaapi was replaced by enableVaapi and you don't need to pass + "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore). + '' else lib.optionalString + (!enableVaapi) + "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode"; in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -149,15 +160,14 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath ([] - ++ stdenv.lib.optional useVaapi libva - ); + libPath = stdenv.lib.makeLibraryPath [ libva ]; in with stdenv.lib; '' mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + ${optionalVaapiFlags} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch similarity index 100% rename from pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch rename to pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch new file mode 100644 index 00000000000..bd278633f67 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch @@ -0,0 +1,48 @@ +From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Tue, 14 Apr 2020 14:16:10 +0200 +Subject: [PATCH] Enable accelerated video decode on Linux + +This will enable accelerated video decode on Linux by default (i.e. +without "--ignore-gpu-blacklist"), but on NixOS we'll provide +"--disable-accelerated-video-decode" and +"--disable-accelerated-video-encode" by default to avoid regressions +(e.g. VA-API doesn't work properly for some radeon drivers). + +Video acceleration can then be enabled via: +chromium.override { enableVaapi = true; } +without rebuilding Chromium. +--- + gpu/config/software_rendering_list.json | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json +index 22712bdbf38f..a06dd19a50e4 100644 +--- a/gpu/config/software_rendering_list.json ++++ b/gpu/config/software_rendering_list.json +@@ -336,22 +336,6 @@ + ] + }, + { +- "id": 48, +- "description": "Accelerated video decode is unavailable on Linux", +- "cr_bugs": [137247, 1032907], +- "os": { +- "type": "linux" +- }, +- "exceptions": [ +- { +- "machine_model_name": ["Chromecast"] +- } +- ], +- "features": [ +- "accelerated_video_decode" +- ] +- }, +- { + "id": 50, + "description": "Disable VMware software renderer on older Mesa", + "cr_bugs": [145531, 332596, 571899, 629434], +-- +2.11.0 + diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index 434bd77b6d1..1dd9baa628a 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.344"; + version = "32.0.0.363"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq"; + sha256 = "0znk8an892mykgbz56hyv3gz65vc9mhb3vn96c6bsvicwl1fn460"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix index 9b5c76f5342..f6f3c06e937 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -1,6 +1,6 @@ { - "81.0.4044.92" = { - rev = "81.0.4044.92-2"; - sha256 = "071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l"; + "81.0.4044.122" = { + rev = "81.0.4044.122-2"; + sha256 = "0bbr4a2gkgm3ykdgpj8x58sd3dwam6qkifhzfs2997681g7b2v2q"; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix index c5f9d60122d..77505b47d85 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; - version = "81.0.4044.92"; + sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; + sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; + version = "83.0.4103.14"; }; dev = { - sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; - sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; - version = "83.0.4100.3"; + sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; + sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; + version = "84.0.4115.5"; }; stable = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72"; - version = "81.0.4044.92"; + sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg"; + sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w"; + version = "81.0.4044.122"; }; } From 7e48da8d72d5511fbcb96df5a5fd75e3dd09d0da Mon Sep 17 00:00:00 2001 From: Mat Marini Date: Tue, 28 Apr 2020 12:53:19 -0400 Subject: [PATCH 17/26] kubie: 0.7.3 -> 0.8.4 --- pkgs/development/tools/kubie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index c1fc313fbc1..2d7460b59af 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { pname = "kubie"; - version = "0.7.3"; + version = "0.8.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "186h5fng16gwqhsy2nxswbrrxsx0ysqrb4pqznyygbiz5cd9bgxp"; + sha256 = "1f82xlhhxbjadjw609kr1kdm4n69c9mqjia4b3k505wjh7cc55n0"; }; - cargoSha256 = "1yllpi8dp1fy39z4zmhyf1hdjpl62vwh8b8qlj0g778qsdrm9p98"; + cargoSha256 = "0mish7wqwq5ynl98n6swdn5i6mg62aih5rfykbl3wx39b468n481"; meta = with stdenv.lib; { description = From 4b43216acc4833fde1e53f3c3372e935976233a5 Mon Sep 17 00:00:00 2001 From: Mat Marini Date: Tue, 28 Apr 2020 12:53:55 -0400 Subject: [PATCH 18/26] kubie: add bash completion --- pkgs/development/tools/kubie/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 2d7460b59af..de45ff50c03 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -15,6 +15,11 @@ buildRustPackage rec { cargoSha256 = "0mish7wqwq5ynl98n6swdn5i6mg62aih5rfykbl3wx39b468n481"; + installPhase = '' + mkdir -p $out/share/bash-completion/completions + cp -v ${src}/completion/kubie.bash $out/share/bash-completion/completions/kubie + ''; + meta = with stdenv.lib; { description = "Shell independent context and namespace switcher for kubectl"; From 2cde8af5f51b5b26fa42c7208966974312bbfce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 28 Apr 2020 11:09:59 +0200 Subject: [PATCH 19/26] sentencepiece: 0.1.85 -> 0.1.86 Changelog: https://github.com/google/sentencepiece/releases/tag/v0.1.86 --- pkgs/development/libraries/sentencepiece/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 1c74ced309d..52b39ddc25b 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.85"; + version = "0.1.86"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w"; + sha256 = "0r4z5n3dx0bg1pm2kgfllyj65s7ljn2ny7i7c5bz618r7h8bax9p"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; From 839e958f14c00e0a89db8a57d1cd56ef83590989 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 28 Apr 2020 10:38:57 +0800 Subject: [PATCH 20/26] eksctl: 0.17.0 -> 0.18.0 --- pkgs/tools/admin/eksctl/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 6bdcedd97ae..9fec8ec9047 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,23 +2,22 @@ buildGoModule rec { pname = "eksctl"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0ck096qfj4wp166bymvync8qyb0q2az86hckjk3hrzqdj8vwhrza"; + sha256 = "15dzivnndzsiw7g6qzccpk1hqb5amfn0zba1rzkvcslhl1y9gsfi"; }; - modSha256 = "024fqknv6f1zzcpxfl3c12d7ya7ynsyy7hf7zsnmpsnrksvbkfvc"; + modSha256 = "13gqvr1y1b2yi2iar0p8y9hpajgy5w9xp4az5n6b5xhzcbn19f2k"; subPackages = [ "cmd/eksctl" ]; buildFlags = [ "-tags netgo" "-tags release" ]; - postInstall = - '' + postInstall = '' mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" From 229cdf3d9948b58eee79d1cee81d14eedb3a157b Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Tue, 28 Apr 2020 00:03:56 +0100 Subject: [PATCH 21/26] metamath: 0.181 -> 0.182 Also includes a fix to the makefile that lets the autoconf stuff Just Work(tm) --- pkgs/development/interpreters/metamath/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 680e4106695..66352cfdda4 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -2,23 +2,17 @@ stdenv.mkDerivation { pname = "metamath"; - version = "0.181"; + version = "0.182"; buildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "metamath"; repo = "metamath-exe"; - rev = "67cbfa8468deb6f8ad5bedafc6399bee59064764"; - sha256 = "1mk3g41qz26j38j68i9qmnl8khkd8jwrzj4vxkb855h4b819s000"; + rev = "5df616efe4119ff88daf77e7041d45b6fa39c578"; + sha256 = "0amjdgy42c7jypf6sz98iczlxcyl9bqx67ws1q8w2zdqk2izsyjp"; }; - # the files necessary to build the DATA target are not in this distribution - # luckily, they're not really needed so we don't build it. - makeFlags = [ "DATA=" ]; - - installTargets = [ "install-exec" ]; - meta = with stdenv.lib; { description = "Interpreter for the metamath proof language"; longDescription = '' From e16494a7db324d54eb3534d061a11a97ff2f6279 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 23 Apr 2020 07:40:46 +0300 Subject: [PATCH 22/26] gjo: 1.0.2 -> 1.0.3 --- pkgs/tools/text/gjo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index fd9a150feee..fd06129acfa 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gjo"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "skanehira"; repo = "gjo"; rev = version; - sha256 = "1m5nkv42ri150fgj590nrl24wp90p7ygg9xdh9zblibmnqrvbz4z"; + sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw"; }; doCheck = true; From 861a342a328e0038182a2e2eb3d008f60cfb4e1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 Apr 2020 18:00:00 -0500 Subject: [PATCH 23/26] nushell: 0.12.0 -> 0.13.0 Release notes: https://www.nushell.sh/blog/2020/04/21/nushell_0_13_0.html --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 43e0d2cb56a..9dbce58d093 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0cy3rm0yr4ay4hcgw202w5k1sqw09kd75a0yyk0s0v0cxpmssf5n"; + sha256 = "1n92wcd3f6p38iwp9sc4bfhmaxb61ff6vvn0zvy3h4q8wmvxpiky"; }; - cargoSha256 = "0q89841jwbsvl4c90sl8wgnjjl8q0bb3kw7sl7k9dpnfmj5j144x"; + cargoSha256 = "0dyszvy0nmbjill3wfyqprqkh911r070rvkxc1ls9s3yhxhwlhzq"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; From 45c0523b77144e4378f659e1093562e448704bd5 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 21 Apr 2020 14:06:25 -0400 Subject: [PATCH 24/26] rtl8812au: 5.2.20.2_28373.20190903 -> 5.6.4.2_35491.20200318 --- pkgs/os-specific/linux/rtl8812au/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 99afd575eee..cb93c635afe 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; - version = "5.2.20.2_28373.20190903"; + version = "5.6.4.2_35491.20200318"; src = fetchFromGitHub { - owner = "zebulon2"; - repo = "rtl8812au-driver-5.2.20"; - rev = "30d47a0a3f43ccb19e8fd59fe93d74a955147bf2"; - sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr"; + owner = "gordboy"; + repo = "rtl8812au-5.6.4.2"; + rev = "49e98ff9bfdbe2ddce843808713de383132002e0"; + sha256 = "0f4isqasm9rli5v6a7xpphyh509wdxs1zcfvgdsnyhnv8amhqxgs"; }; nativeBuildInputs = [ bc nukeReferences ]; From 8762b2aca4436524a46fdc5b69a59b144044f2db Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 17:05:46 -0400 Subject: [PATCH 25/26] pythonPackages.pep8-naming: 0.9.1 -> 0.10.0 --- pkgs/development/python-modules/pep8-naming/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 1c972b00275..4b85ba47ab3 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "a33d38177056321a167decd6ba70b890856ba5025f0a8eca6a3eda607da93caf"; + sha256 = "0fmzccbmr0jn9ynamdb9ly2ai8qs5qfk8alfgnzr3fbjvpwsbd7k"; }; propagatedBuildInputs = [ From ebb63137ad245d0b9851d8a4de3be49f645b099c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 17:06:02 -0400 Subject: [PATCH 26/26] pythonPackages.sqlalchemy-utils: 0.36.0 -> 0.36.3 --- pkgs/development/python-modules/sqlalchemy-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 3ca0423bd1d..db23e2ab7db 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.36.0"; + version = "0.36.3"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "1wkk6jj0jkp2hi3ziqw95q0b19zabpvzm6v5kixgnssj027hq0yv"; + sha256 = "0fj9qiz5hq8gf9pnir077sl58chry7jz63fnj1vgx5rmq1dsys7j"; }; propagatedBuildInputs = [