From 36c59877d340ce0f2392678d34cf0c08cdc74905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 10 Aug 2021 17:08:12 +0200 Subject: [PATCH 001/703] krb5: 1.18 -> 1.19.2 --- ...Fix-Linux-build-error-with-musl-libc.patch | 32 ------------------- .../krb5-Fix-typo-in-musl-build-fix.patch | 28 ---------------- pkgs/development/libraries/kerberos/krb5.nix | 16 ++-------- 3 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch delete mode 100644 pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch b/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch deleted file mode 100644 index 0f33815b6e91..000000000000 --- a/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 Mon Sep 17 00:00:00 2001 -From: TBK -Date: Wed, 26 Feb 2020 21:12:45 +0100 -Subject: [PATCH] Fix Linux build error with musl libc - -Commit bf5953c549a6d279977df69ffe89b2ba51460eaf caused a build failure -on non-glibc Linux build environments. Change the conditionalization -so that __GLIBC_PREREQ will only be used if it is defined. - -[ghudson@mit.edu: simplified conditionals; rewrote commit message] - -ticket: 8880 (new) -tags: pullup -target_version: 1.18-next ---- - src/util/support/plugins.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c -index 3329db7dc3..1644d16fd0 100644 ---- a/src/util/support/plugins.c -+++ b/src/util/support/plugins.c -@@ -62,8 +62,7 @@ - * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects - * anyway. - */ --#ifdef __linux__ --#include -+#ifdef __GLIBC__PREREQ - #if ! __GLIBC_PREREQ(2, 25) - #define dlclose(x) - #endif diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch b/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch deleted file mode 100644 index f8718606a7f8..000000000000 --- a/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b009cca2026b615ef5386faa4c0230bc27c4161d Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Thu, 12 Mar 2020 00:44:10 -0400 -Subject: [PATCH] Fix typo in musl build fix - -Commit cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 checked for -__GLIBC__PREREQ instead of __GLIBC_PREREQ, thus accidentally reverting -the workaround introduced in commit -bf5953c549a6d279977df69ffe89b2ba51460eaf. Fix the typo. - -ticket: 8880 ---- - src/util/support/plugins.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c -index 1644d16fd0..1ff10c354d 100644 ---- a/src/util/support/plugins.c -+++ b/src/util/support/plugins.c -@@ -62,7 +62,7 @@ - * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects - * anyway. - */ --#ifdef __GLIBC__PREREQ -+#ifdef __GLIBC_PREREQ - #if ! __GLIBC_PREREQ(2, 25) - #define dlclose(x) - #endif diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 5ef9e496b94d..01bcc2ae570f 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -19,23 +19,13 @@ in with lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - majorVersion = "1.18"; # remove patches below with next upgrade - version = majorVersion; + version = "1.19.2"; src = fetchurl { - url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; - sha256 = "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk"; + url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz"; + sha256 = "0snz1jm2w4dkk65zcz953jmmv9mqa30fanch2bk8r3rs9vp3yi8h"; }; - patches = optionals stdenv.hostPlatform.isMusl [ - # TODO: Remove with next release > 1.18 - # Patches to fix musl build with 1.18. - # Not using `fetchpatch` for these for now to avoid infinite recursion - # errors in downstream projects (unclear if it's a nixpkgs issue so far). - ./krb5-Fix-Linux-build-error-with-musl-libc.patch - ./krb5-Fix-typo-in-musl-build-fix.patch - ]; - outputs = [ "out" "dev" ]; configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] From 55ba42e3342b8d83594d714de87584978f6bf6d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 21:44:08 +0000 Subject: [PATCH 002/703] srt: 1.4.3 -> 1.4.4 --- pkgs/development/libraries/srt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 49c761231015..c74780148a1b 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "1f60vlfxhh9bhafws82c3301whjlz5gy92jz9a9ymwfg5h53bv1j"; + sha256 = "sha256-OfcMHH+MSOGY9pxpXt19EIGdP4FJFssSv/lENX+iIf8="; }; nativeBuildInputs = [ cmake ]; From 70f93547e3302eb92482ceb7664766443f2f9cdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 17:37:19 +0000 Subject: [PATCH 003/703] libpsm2: 11.2.185 -> 11.2.203 --- pkgs/os-specific/linux/libpsm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index 8b979d479562..aeb261aaaca5 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libpsm2"; - version = "11.2.185"; + version = "11.2.203"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "opa-psm2"; rev = "PSM2_${version}"; - sha256 = "062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg"; + sha256 = "sha256-W5Mg5ATUARMFAy1VVpMKPar0VpbKfrkxa6bDhqVYpoc="; }; postInstall = '' From f237b2ea75e67a3f55966b06dc7285228da0205b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 14:24:03 +0000 Subject: [PATCH 004/703] sysstat: 12.4.3 -> 12.4.4 --- pkgs/os-specific/linux/sysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 2d5b3e2ab558..5389caaa33fb 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sysstat"; - version = "12.4.3"; + version = "12.4.4"; src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; - sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0="; + sha256 = "sha256-lRLnR54E+S4lHFxrS9lLj2Q9ISvQ6Yao6k0Uem6UPSQ="; }; buildInputs = [ gettext ]; From 79fb9f824ede89150e8c4df52e4ae02697cb437f Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 26 Dec 2021 12:00:00 +0000 Subject: [PATCH 005/703] ocamlPackages.findlib: don't wait configurePhase to set OCAMLFIND_DESTDIR this fixes ocamlfind printconf destdir inside nix-shell fixes #152028 the regression was introduced by a3ab43d3a45338f845a0f8a12ed34e84c8b79dae which was meant to fix building ocamlPackages.ocamlbuild with strictDeps. This commit keeps ocamlbuild building. --- pkgs/development/tools/ocaml/findlib/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 497a8ce91c1d..d42441db6225 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -36,15 +36,21 @@ stdenv.mkDerivation rec { export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" fi } - createOcamlDestDir () { + exportOcamlDestDir () { export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" + } + createOcamlDestDir () { if test -n "''${createFindlibDestdir-}"; then mkdir -p $OCAMLFIND_DESTDIR fi } + # run for every buildInput addEnvHooks "$targetOffset" addOCamlPath + # run before configurePhase, even without buildInputs, and not in nix-shell preConfigureHooks+=(createOcamlDestDir) + # run even in nix-shell, and even without buildInputs + addEnvHooks "$hostOffset" exportOcamlDestDir ''; meta = { From f8fa83ff137e5d56d8defb0c47f0a48831104064 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 8 Jan 2022 17:59:14 -0800 Subject: [PATCH 006/703] tracker: Unconditionally add checkInputs to nativeBuildInputs `gi` is required by the main `meson.build` and checked at the start of the build process, regardless of whether tests are enabled or not. As a result, builds are broken when `doCheck = false`. Also removing tappy which is no longer needed: https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/385 --- pkgs/development/libraries/tracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 7dbe0d410f75..3e20d8483fbf 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -61,7 +61,8 @@ stdenv.mkDerivation rec { python3 # for data-generators systemd # used for checks to install systemd user service dbus # used for checks and pkg-config to install dbus service/s - ]; + ] ++ checkInputs; # gi is in the main meson.build and checked regardless of + # whether tests are enabled buildInputs = [ glib @@ -77,7 +78,6 @@ stdenv.mkDerivation rec { checkInputs = with python3.pkgs; [ pygobject3 - tappy ]; mesonFlags = [ From b5e392c3e7ce57c7ffedffa884d4aec87f818393 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Jan 2022 00:32:12 +0100 Subject: [PATCH 007/703] python310Packages.urllib3: 1.26.7 -> 1.26.8 --- pkgs/development/python-modules/urllib3/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 91bc6e68eb36..4c1a61b09fc6 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -18,11 +18,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.7"; + version = "1.26.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SYfGVVT3otvzDBj9SHeO8SSvb6t3GjdxA9oFheIzbs4="; + hash = "sha256-Dnwz2aY+fd/LhngKrIe+/C+930bFjbtIfghV987sKDw="; }; propagatedBuildInputs = [ @@ -61,7 +62,9 @@ buildPythonPackage rec { export CI # Increases LONG_TIMEOUT ''; - pythonImportsCheck = [ "urllib3" ]; + pythonImportsCheck = [ + "urllib3" + ]; meta = with lib; { description = "Powerful, sanity-friendly HTTP client for Python"; From 8b43fd7c78dbfb1cc5bab2950c2c98364f1e31bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Sat, 8 Jan 2022 20:41:15 -0500 Subject: [PATCH 008/703] kde/frameworks: 5.89 -> 5.90 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 333 insertions(+), 333 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 825e757c7a8e..50204bc0ec0e 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.89/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.90/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 3465fc63da29..1ffc5df68c36 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/attica-5.89.0.tar.xz"; - sha256 = "03q2ajvwrl1x6h0jcvc6nh0avj7dqhx4k1lx5qa3xgfxwk01kgp9"; - name = "attica-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/attica-5.90.0.tar.xz"; + sha256 = "0zs37qyh9biafk76ps2xfc41hbd1n4dq42qqqcvbqcrwfgqz2wlk"; + name = "attica-5.90.0.tar.xz"; }; }; baloo = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/baloo-5.89.0.tar.xz"; - sha256 = "091gjzn4armm4xs61csavwgij54mv8v9hx3gvva18g06gjkajyis"; - name = "baloo-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/baloo-5.90.0.tar.xz"; + sha256 = "1nnfys8dyiivd2if81qrgrmpprfni77an9l3wff0l5k85ac86i56"; + name = "baloo-5.90.0.tar.xz"; }; }; bluez-qt = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/bluez-qt-5.89.0.tar.xz"; - sha256 = "00wczjvvhxzi12ijf65d66x36gm0x6j5z3b6cwqgdz2s66wr0jw5"; - name = "bluez-qt-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/bluez-qt-5.90.0.tar.xz"; + sha256 = "056i5ndrg5fqm1bx49a0plfhlladphha128wi766zdhcm6np11z3"; + name = "bluez-qt-5.90.0.tar.xz"; }; }; breeze-icons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/breeze-icons-5.89.0.tar.xz"; - sha256 = "12l2wzc3pah5qapznriaffh4wz97s6nqxlj9i119k9qw295d6wfw"; - name = "breeze-icons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/breeze-icons-5.90.0.tar.xz"; + sha256 = "06dfh571rf8gp4gnnqn13xqgc1bpc4ycn6bmxf38x53fxxfl3fnn"; + name = "breeze-icons-5.90.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/extra-cmake-modules-5.89.0.tar.xz"; - sha256 = "0bzhd6xcphrcnbg8ylx91rq5y3vvl3jfcgik19bvh8sr4ad25mrx"; - name = "extra-cmake-modules-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/extra-cmake-modules-5.90.0.tar.xz"; + sha256 = "1c5wza7srib3mdkf29ygmyj5b6jq322s6h7k5hlljqm5xhy7q07k"; + name = "extra-cmake-modules-5.90.0.tar.xz"; }; }; frameworkintegration = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/frameworkintegration-5.89.0.tar.xz"; - sha256 = "0f7cqxmgnwi4n8fa8vifqaysbk7839x1qbmp9qfa998jxnn1w92f"; - name = "frameworkintegration-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/frameworkintegration-5.90.0.tar.xz"; + sha256 = "1v7vlq2gk7j5b6gzbawgnpii7csh2zclp5v24qhx4qrmpfssylan"; + name = "frameworkintegration-5.90.0.tar.xz"; }; }; kactivities = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kactivities-5.89.0.tar.xz"; - sha256 = "1dhxl487246kpx4w5zhhdgk94jwns09dvragvh2bb787mszqq5v9"; - name = "kactivities-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kactivities-5.90.0.tar.xz"; + sha256 = "0wf7nnf3bjz2iq2wqxnyay1100ks0zscsh7sa8xfcijrl7pp305w"; + name = "kactivities-5.90.0.tar.xz"; }; }; kactivities-stats = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kactivities-stats-5.89.0.tar.xz"; - sha256 = "1pp3vkkadaday0pzd09hdhccw6hbrqp481hcdzzyqj1x2ckb59bj"; - name = "kactivities-stats-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kactivities-stats-5.90.0.tar.xz"; + sha256 = "0qamy8xggjlnm8pkv6vxbaagcp1hg9vgi2ws2yb9xpqk8mdlfbvp"; + name = "kactivities-stats-5.90.0.tar.xz"; }; }; kapidox = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kapidox-5.89.0.tar.xz"; - sha256 = "0a3vwh3rzpcaylz77fs4biiadljchs2lfh6svg149yg95yqwng3b"; - name = "kapidox-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kapidox-5.90.0.tar.xz"; + sha256 = "16jl519sx7pirjp5x57x5gbgv477457063rrbwpvyf2ldb6lc29p"; + name = "kapidox-5.90.0.tar.xz"; }; }; karchive = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/karchive-5.89.0.tar.xz"; - sha256 = "1s45mns9km1fy2d07d2nmslf4dc2pl5i169ncq2dc7vabjvyh59b"; - name = "karchive-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/karchive-5.90.0.tar.xz"; + sha256 = "0411rpgr9dy0zf9mmhj7n7ax0afrn7zvkpzpnjvpvvqsrfkz7qm6"; + name = "karchive-5.90.0.tar.xz"; }; }; kauth = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kauth-5.89.0.tar.xz"; - sha256 = "1ys9xr7js8rj07ff7ncp9d52rcn10bg49jcyg4ldam07bfpq36nz"; - name = "kauth-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kauth-5.90.0.tar.xz"; + sha256 = "1g4i1prspcczpx25wvd8lgdk8c3my7kp3wv489gvcci40rl5z913"; + name = "kauth-5.90.0.tar.xz"; }; }; kbookmarks = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kbookmarks-5.89.0.tar.xz"; - sha256 = "16bh5daimpjwy0gz56v32vslnmzmyfsf8z92s5gi13bkjfp03syn"; - name = "kbookmarks-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kbookmarks-5.90.0.tar.xz"; + sha256 = "1svc1i9zxbxf65crfhnv6sz5gknb7x87lzjd8cn11y5lwnsw36kx"; + name = "kbookmarks-5.90.0.tar.xz"; }; }; kcalendarcore = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcalendarcore-5.89.0.tar.xz"; - sha256 = "1xy045d5jl3qk9ka13ximk7x70q5pswh143kqk7cf6x0f7bvgpap"; - name = "kcalendarcore-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcalendarcore-5.90.0.tar.xz"; + sha256 = "0qbds2ysjv9rqwpvrhisvdd6wyhq5qwhbw5xcbj7ndxwpf8lpa8w"; + name = "kcalendarcore-5.90.0.tar.xz"; }; }; kcmutils = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcmutils-5.89.0.tar.xz"; - sha256 = "0za9x8v9lnwyib1gip6wbmda19wfjaf2yh6yiqlszxcbsfq7kzhm"; - name = "kcmutils-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcmutils-5.90.0.tar.xz"; + sha256 = "04crq3j48xwlvp047p3waqrv1gg5sv1950jh02w85q00yjjh0qxk"; + name = "kcmutils-5.90.0.tar.xz"; }; }; kcodecs = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcodecs-5.89.0.tar.xz"; - sha256 = "1j2pmsyi8lvhnzhrrvsm98x7inf503vr2b58yl070zp293fyhd9q"; - name = "kcodecs-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcodecs-5.90.0.tar.xz"; + sha256 = "0kwqyhjs63pqslqcmv3sngyqvl6ah8iaa6nn045sb8a58xb09inh"; + name = "kcodecs-5.90.0.tar.xz"; }; }; kcompletion = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcompletion-5.89.0.tar.xz"; - sha256 = "0bv9kxrdprk1jvsf9mqkag0pkq7h1wngdpvdx9wfy4kkbj7y46zf"; - name = "kcompletion-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcompletion-5.90.0.tar.xz"; + sha256 = "0hd3nsixibw5z846mpib2lap3ar65rqvasifdnlmqsrvxfmw0ggk"; + name = "kcompletion-5.90.0.tar.xz"; }; }; kconfig = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kconfig-5.89.0.tar.xz"; - sha256 = "0ixil0qyd8byn4ix5w9mp5kdvkscnwhamknrnbqzikhmmknprccf"; - name = "kconfig-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kconfig-5.90.0.tar.xz"; + sha256 = "0yqs3ydxzhhb7rrl01swjc9xw8j1bs3n204bf9slb2bs7lfz56rn"; + name = "kconfig-5.90.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kconfigwidgets-5.89.0.tar.xz"; - sha256 = "0rzqx2knc8bc26jyislb1dw5qdhmkga3cqlyiyynbawx3scind60"; - name = "kconfigwidgets-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kconfigwidgets-5.90.0.tar.xz"; + sha256 = "1sm1x64x2v3xfcz9ia6qk8d8y1q02fggrc2q0yy5ag5xh1yr9zwq"; + name = "kconfigwidgets-5.90.0.tar.xz"; }; }; kcontacts = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcontacts-5.89.0.tar.xz"; - sha256 = "1yjgrzn3bx8fzmr6mjd2c99gxlh0nqm1fi3sgmcn1bj07jdrp52r"; - name = "kcontacts-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcontacts-5.90.0.tar.xz"; + sha256 = "0vv2136da5a6lwdj2x38jx2qwrk96hgn8iwaad4yynvc2csx6dim"; + name = "kcontacts-5.90.0.tar.xz"; }; }; kcoreaddons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcoreaddons-5.89.0.tar.xz"; - sha256 = "0ss27wz8z2lfhn0njads2rwd62aciamr0vcbj4gyfiv2ddw8bl71"; - name = "kcoreaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcoreaddons-5.90.0.tar.xz"; + sha256 = "02m4h4r0kdy94zq8c6d2fhnd8qwrp4a0v5i4wf6khk4yf4fqy5kf"; + name = "kcoreaddons-5.90.0.tar.xz"; }; }; kcrash = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcrash-5.89.0.tar.xz"; - sha256 = "07pc449qqvz6rfs1wk6r2jgfncpliig8c1cxzhbkzqrkcf1gj6ba"; - name = "kcrash-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kcrash-5.90.0.tar.xz"; + sha256 = "0634jqzbvr8xkv53n2q3fcqlkcmq843w7g455v3swnlaqi92l04f"; + name = "kcrash-5.90.0.tar.xz"; }; }; kdav = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdav-5.89.0.tar.xz"; - sha256 = "1wyg6bxfp1r1snk40y6q70ix00aqwx4sl4z7jrg12h38cnc8sa6v"; - name = "kdav-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdav-5.90.0.tar.xz"; + sha256 = "0181ray8vigmwlamx4j5dinw10al0g4l965kyx4wjq9k59nxxgbi"; + name = "kdav-5.90.0.tar.xz"; }; }; kdbusaddons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdbusaddons-5.89.0.tar.xz"; - sha256 = "1yh5xx01wsjcj6axcw1r94p32rrs111078prssgnngbrihbhbjzh"; - name = "kdbusaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdbusaddons-5.90.0.tar.xz"; + sha256 = "0g609bymfixwaic30y7i0q96anf7pi3galipmjbbfg85ghj9rsa4"; + name = "kdbusaddons-5.90.0.tar.xz"; }; }; kdeclarative = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdeclarative-5.89.0.tar.xz"; - sha256 = "18a4rcx60h5j44d79bhr2l46f3lhgnf2x0sb64dr7dcc0m5rmsay"; - name = "kdeclarative-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdeclarative-5.90.0.tar.xz"; + sha256 = "1z7zyj6pw2ym3izi19kpgy12mqpar6mbdbsn6jpxy36l6m3jld1y"; + name = "kdeclarative-5.90.0.tar.xz"; }; }; kded = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kded-5.89.0.tar.xz"; - sha256 = "1rr3g7b60zlx8j7d7k2hlhhv2wa67lakfpyd1zgpy2y3k281hbfl"; - name = "kded-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kded-5.90.0.tar.xz"; + sha256 = "094g6p87nd5cxcars71315w6zrxjgiw2080p6cf6g72ww54k7sps"; + name = "kded-5.90.0.tar.xz"; }; }; kdelibs4support = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kdelibs4support-5.89.0.tar.xz"; - sha256 = "1672f75f0wmdrqhx9vynzgflm3ssmngkpp1r5li53ppb11wg6sbr"; - name = "kdelibs4support-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kdelibs4support-5.90.0.tar.xz"; + sha256 = "0zxc11jbg06qz79ljrd6wl36jp73hafcmbk29d0hcvxnkscg3k29"; + name = "kdelibs4support-5.90.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kdesignerplugin-5.89.0.tar.xz"; - sha256 = "0g8y51i70m8s7y829qyqnki57s8d4l3xdpdbn1p2rr1szglj8hvf"; - name = "kdesignerplugin-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kdesignerplugin-5.90.0.tar.xz"; + sha256 = "18gsy8f32hjadzjnavi3dsknc6hflcnfpr0107lwfc735fd2x2iq"; + name = "kdesignerplugin-5.90.0.tar.xz"; }; }; kdesu = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdesu-5.89.0.tar.xz"; - sha256 = "0jmww11l6709cpfriwklhij5izsh948mki9grzzq3jijw8zs0mrx"; - name = "kdesu-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdesu-5.90.0.tar.xz"; + sha256 = "1q8k2q7c41fzw9gwx9nq4zjpjdwvh29zyh3zd0w3r2kxf6vhf1wp"; + name = "kdesu-5.90.0.tar.xz"; }; }; kdewebkit = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kdewebkit-5.89.0.tar.xz"; - sha256 = "0xwd346z928yk4iwykgashc36m2xqnwn49jix5jbk1w57dbia2da"; - name = "kdewebkit-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kdewebkit-5.90.0.tar.xz"; + sha256 = "19dqlxy2sl822aldqy1jj7fvxabmg97a0av7d5ayzhnbhhy5izx1"; + name = "kdewebkit-5.90.0.tar.xz"; }; }; kdnssd = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdnssd-5.89.0.tar.xz"; - sha256 = "0v72g137l8kl2xapfrcrw8w6zmn94h08hvwdggzr9fvgswzdbvsh"; - name = "kdnssd-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdnssd-5.90.0.tar.xz"; + sha256 = "17szlqsafz6p4h7s9wascaggn5909c1ig452wy6y4z4402s2lsrr"; + name = "kdnssd-5.90.0.tar.xz"; }; }; kdoctools = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdoctools-5.89.0.tar.xz"; - sha256 = "1x8q45y2sgi3d9j79qcx02z2939j52mp1jrs3rjqq42xxvvrlcg1"; - name = "kdoctools-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kdoctools-5.90.0.tar.xz"; + sha256 = "1l2a9mlcm8np3s8myq0hj08l82284r90yhx3z2gn7h68b8fzyx0s"; + name = "kdoctools-5.90.0.tar.xz"; }; }; kemoticons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kemoticons-5.89.0.tar.xz"; - sha256 = "0mcyq20ca6x73jhwwhhwq8jzqpadnazjy5y9dyfa2wz8ijbnjqzw"; - name = "kemoticons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kemoticons-5.90.0.tar.xz"; + sha256 = "08mgk56dafj3q9gs69qcx17qfc45s8ifkjrpzg44p8zs0q51q6cb"; + name = "kemoticons-5.90.0.tar.xz"; }; }; kfilemetadata = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kfilemetadata-5.89.0.tar.xz"; - sha256 = "04abysdijmpdd05grihawpbw8f9h3fhlv3y7wjz76kl66gyqg035"; - name = "kfilemetadata-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kfilemetadata-5.90.0.tar.xz"; + sha256 = "18y4bn6hz8xa68m0nxv88a1f3xkkks7c7pbiqb1vkrp9bbh52yax"; + name = "kfilemetadata-5.90.0.tar.xz"; }; }; kglobalaccel = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kglobalaccel-5.89.0.tar.xz"; - sha256 = "0jxxlhmwsgrx1p6w1al9c11bglxn5im181wqih7ds5h2naa7b8kj"; - name = "kglobalaccel-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kglobalaccel-5.90.0.tar.xz"; + sha256 = "04qd1fcc22x70jacqzrv44q1jg5ldzynlfpw5cg2679409r0wnxw"; + name = "kglobalaccel-5.90.0.tar.xz"; }; }; kguiaddons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kguiaddons-5.89.0.tar.xz"; - sha256 = "17mxkk4w4q6bkqblkdinw2b0jdfxhk7xkfy5hw730gjm6is6p861"; - name = "kguiaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kguiaddons-5.90.0.tar.xz"; + sha256 = "0m9l8xyc7xyj29fzxwp8ahr2l1rzs5rw1c26x446kb7smxvy8awx"; + name = "kguiaddons-5.90.0.tar.xz"; }; }; kholidays = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kholidays-5.89.0.tar.xz"; - sha256 = "0ry0n73dkjxv7ani753mh8ymy4yblhj841ca5y5kci8wr9h6358w"; - name = "kholidays-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kholidays-5.90.0.tar.xz"; + sha256 = "1p1kgy110ijk5a3ix4g9y1i7w0gsnzf82jdkwbdza95vibm82iz8"; + name = "kholidays-5.90.0.tar.xz"; }; }; khtml = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/khtml-5.89.0.tar.xz"; - sha256 = "072pawwp62mx5shh8x4mcpr8h6a24qr82zyyiricz4jba0r7z3yr"; - name = "khtml-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/khtml-5.90.0.tar.xz"; + sha256 = "1bi839x4dhlkqxmv98pq01725b8i8szdxf9b1hf1jv37fk468mja"; + name = "khtml-5.90.0.tar.xz"; }; }; ki18n = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/ki18n-5.89.0.tar.xz"; - sha256 = "1zlq0ywd8hnaniwdv3vd76xmv91cdn6pqs6k9y6dz3fayl15p0g6"; - name = "ki18n-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/ki18n-5.90.0.tar.xz"; + sha256 = "13k8kbkmgdywclcdbfj5ri3gmdblv8yzalmvqd0hn7sym6pkdqfw"; + name = "ki18n-5.90.0.tar.xz"; }; }; kiconthemes = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kiconthemes-5.89.0.tar.xz"; - sha256 = "1hv8blvvg12agjynl0yvvsl8dfsyk2aa9clmq60igcs5lm4jpvaa"; - name = "kiconthemes-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kiconthemes-5.90.0.tar.xz"; + sha256 = "0w3wi4xy1yy2s1a927cj4my63q0fqhw06ghy9zjw830m31xwpx1k"; + name = "kiconthemes-5.90.0.tar.xz"; }; }; kidletime = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kidletime-5.89.0.tar.xz"; - sha256 = "0547yj8yn9nly3bkq3in38ljhwbg0bvj0wp3yxp2dl05wpyvzqfz"; - name = "kidletime-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kidletime-5.90.0.tar.xz"; + sha256 = "1xzwmk0aqv1lcdi51nl1k0lyiinnqxwla6w0xxmsh6193qa3fpvq"; + name = "kidletime-5.90.0.tar.xz"; }; }; kimageformats = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kimageformats-5.89.0.tar.xz"; - sha256 = "1m3fl14lzsfl0fam38nnalapc1xhpryf1ibvcm7bgh4g1cm1bvnw"; - name = "kimageformats-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kimageformats-5.90.0.tar.xz"; + sha256 = "0r3ihkly0hf20aqbn7b9171mzqjna078rksdp96z6f7f1qy99v1v"; + name = "kimageformats-5.90.0.tar.xz"; }; }; kinit = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kinit-5.89.0.tar.xz"; - sha256 = "1llaqz7yv011k4g1fvy1rzlff8bdgvqwqvh3s3nrqahwq2gx2rr9"; - name = "kinit-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kinit-5.90.0.tar.xz"; + sha256 = "0z65hfhj68ahjm558p2pj7dlrczcww8f2xyw9f44w10bp3p5hf1a"; + name = "kinit-5.90.0.tar.xz"; }; }; kio = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kio-5.89.0.tar.xz"; - sha256 = "1ka8s6cj7ms74w4xj6x91hx1ijlh883x3ibjwmbhva6mbzk1z0nx"; - name = "kio-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kio-5.90.0.tar.xz"; + sha256 = "0ds6465fyzjj2azwdghrkxr9wvih0m96lv4kp6syqwii8nv2w7rs"; + name = "kio-5.90.0.tar.xz"; }; }; kirigami2 = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kirigami2-5.89.0.tar.xz"; - sha256 = "1jn5c0lhh7hcp81278kagw0r96nri80x9vrg51jg7cs42h7pfp98"; - name = "kirigami2-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kirigami2-5.90.0.tar.xz"; + sha256 = "0r48n11pv3yqsf11phl19cs52ph5ldabrfmq3xmsvxsknm6c4f9b"; + name = "kirigami2-5.90.0.tar.xz"; }; }; kitemmodels = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kitemmodels-5.89.0.tar.xz"; - sha256 = "10bag80kjz4x22097z9w1liw73kkirk72266vr0qplyr00jwqi33"; - name = "kitemmodels-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kitemmodels-5.90.0.tar.xz"; + sha256 = "0f7zlif7kskbwpw8yrzlfyl954b623icdd9qn0algjcc2i9gqbzi"; + name = "kitemmodels-5.90.0.tar.xz"; }; }; kitemviews = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kitemviews-5.89.0.tar.xz"; - sha256 = "180n41gkv6vgmljcqh2sg5922glq59z56zq7y299vwnkgix9aqns"; - name = "kitemviews-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kitemviews-5.90.0.tar.xz"; + sha256 = "10s285vxaaxjcy3am4bvch5wd7wv64wwcjvj7lqk2866aql9hmzp"; + name = "kitemviews-5.90.0.tar.xz"; }; }; kjobwidgets = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kjobwidgets-5.89.0.tar.xz"; - sha256 = "02ysdzn25a9lms70fawnz3h5vdxy9p528qmbxslsnpz29r5h2wb8"; - name = "kjobwidgets-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kjobwidgets-5.90.0.tar.xz"; + sha256 = "1jv3c68mlsxhnd6jgqw5d4qqd66jf8bh6zbcs6bq0bad52ad2r8d"; + name = "kjobwidgets-5.90.0.tar.xz"; }; }; kjs = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kjs-5.89.0.tar.xz"; - sha256 = "0yxk4qwl4cxv3kklvla5q3xx2vgj4lwp4pb3bplkkbighm01naih"; - name = "kjs-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kjs-5.90.0.tar.xz"; + sha256 = "1z5d1ixzvaq6x9x0jhmh5bdrdqpsl1x7mh3s8wnycfxwmln6bawv"; + name = "kjs-5.90.0.tar.xz"; }; }; kjsembed = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kjsembed-5.89.0.tar.xz"; - sha256 = "08ajxgh1lfbx8nf4vsljzcwkfjih8fyqp9nr2xbv2a9dbv51x1sf"; - name = "kjsembed-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kjsembed-5.90.0.tar.xz"; + sha256 = "0ydrsg7z1b5hkskjvkb0b9lhx60aqcby2alhfbmkac197sf2frn4"; + name = "kjsembed-5.90.0.tar.xz"; }; }; kmediaplayer = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kmediaplayer-5.89.0.tar.xz"; - sha256 = "0hf44hij1bqcfvxhs7ka00habgh3lc39xajnblpm9br8xybgkaz0"; - name = "kmediaplayer-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kmediaplayer-5.90.0.tar.xz"; + sha256 = "010m5qrn41hcxsmxsq72m83qxikfvn3mgibkgy4bn2x8kxibzmlq"; + name = "kmediaplayer-5.90.0.tar.xz"; }; }; knewstuff = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/knewstuff-5.89.0.tar.xz"; - sha256 = "1qw3lm4vjxal7r314y0zqj59fmzj4b9z2dsd10r3mxpiwjra0s45"; - name = "knewstuff-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/knewstuff-5.90.0.tar.xz"; + sha256 = "0q30p7z5zg3p24gp8q83i7my5bg4yfcdwsblmhl230kih8aap2cg"; + name = "knewstuff-5.90.0.tar.xz"; }; }; knotifications = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/knotifications-5.89.0.tar.xz"; - sha256 = "1jghpawqp0zy1scs2l0dqz2sqv4xd65xiavabpjwhycx5pxpvbhs"; - name = "knotifications-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/knotifications-5.90.0.tar.xz"; + sha256 = "15qb3jh5y1z84dp6wddwid4bk3ks05knkxlwv79hb9cdj8m4m7gi"; + name = "knotifications-5.90.0.tar.xz"; }; }; knotifyconfig = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/knotifyconfig-5.89.0.tar.xz"; - sha256 = "041qnnxhsi35xygyzlppvpghfd8fxraas824dz7rfjiym2zid7jh"; - name = "knotifyconfig-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/knotifyconfig-5.90.0.tar.xz"; + sha256 = "1qss40sr7az9x4yvl59mblzzgjm3hd8nvxgqmqlylargvggw496c"; + name = "knotifyconfig-5.90.0.tar.xz"; }; }; kpackage = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kpackage-5.89.0.tar.xz"; - sha256 = "198n0gr2v9r11ml2vkx9xazxf3rbw3qgc44l7x134rpn1jv9b0s3"; - name = "kpackage-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kpackage-5.90.0.tar.xz"; + sha256 = "1rig9aws8530sav0pmginqmdcrnz10qjbxfc5lw6mmb3sfig53z0"; + name = "kpackage-5.90.0.tar.xz"; }; }; kparts = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kparts-5.89.0.tar.xz"; - sha256 = "0vdz1sxqkx2nynlsywyp8j2ciq226cs40c3m70lqs0j5w283i5ra"; - name = "kparts-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kparts-5.90.0.tar.xz"; + sha256 = "1x8kxd8kgzabd9dyqx2yx1qrrzl1mms4hm3lyg3f1nxki7xl6ra2"; + name = "kparts-5.90.0.tar.xz"; }; }; kpeople = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kpeople-5.89.0.tar.xz"; - sha256 = "12bry15lr7xpgmfgpw1mdd805n1af6050vaa3pk4mbf0vc6clg5y"; - name = "kpeople-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kpeople-5.90.0.tar.xz"; + sha256 = "1632k365bn9n3n8babq620v0px2hmapk8fprx28xpfp27zakhfgw"; + name = "kpeople-5.90.0.tar.xz"; }; }; kplotting = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kplotting-5.89.0.tar.xz"; - sha256 = "1asqzv5jl2nb9ml5vwlpcsi9f2vw7y8rcihlvkf569s7kxsrswns"; - name = "kplotting-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kplotting-5.90.0.tar.xz"; + sha256 = "0i5ganvpzkpkd2p1avw0fpbp3mgbbifg8mmpvdf28ayh75dvrh9y"; + name = "kplotting-5.90.0.tar.xz"; }; }; kpty = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kpty-5.89.0.tar.xz"; - sha256 = "0053sx30d1w2m03wqv3mhkjrxdf7ps1xj8h74fv0a0clf9ab0i4x"; - name = "kpty-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kpty-5.90.0.tar.xz"; + sha256 = "1p5ny9ry0wwwprhpj9s9xg96h9476rldly7mawvfp5q3ihys8c4a"; + name = "kpty-5.90.0.tar.xz"; }; }; kquickcharts = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kquickcharts-5.89.0.tar.xz"; - sha256 = "05syj1162j1zhg9wws81kk9z2ri3jvlvnq95l3gv29zf582j7h91"; - name = "kquickcharts-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kquickcharts-5.90.0.tar.xz"; + sha256 = "1vf9vwrb03z6f19xyc1dc50s3kz21s4mkrv85mmyia0by4qvq5fi"; + name = "kquickcharts-5.90.0.tar.xz"; }; }; kross = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kross-5.89.0.tar.xz"; - sha256 = "0j88ikhxypyy4yickcz3hcdfaj8g7qjinf5va7g5ghzjar7q9x4y"; - name = "kross-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kross-5.90.0.tar.xz"; + sha256 = "1gs7h03j753pq78q0fmajgd5pw8j3mc105rsph1c22l23vccya3z"; + name = "kross-5.90.0.tar.xz"; }; }; krunner = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/krunner-5.89.0.tar.xz"; - sha256 = "11wzn33k6gwfiwc6idhsr8fj441c82bbzz8bx8i228ymvnqrdcqx"; - name = "krunner-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/krunner-5.90.0.tar.xz"; + sha256 = "1q3hsml5274v8dy8rnqpnwxliad2q7a8mbs8k6kpqzih9z94crgi"; + name = "krunner-5.90.0.tar.xz"; }; }; kservice = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kservice-5.89.0.tar.xz"; - sha256 = "0srbjazz302w7zsxh5zcq5zhgz8ad09zxld1rpfkyxg5z820lrq5"; - name = "kservice-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kservice-5.90.0.tar.xz"; + sha256 = "121y8bbq3m4pv5m9pj753v2nk914216a86ksmdqbgffw217qckdd"; + name = "kservice-5.90.0.tar.xz"; }; }; ktexteditor = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/ktexteditor-5.89.0.tar.xz"; - sha256 = "02bg84dmqadjlwfmccviz0d0wj0qf9fy2i9igq4mv150hqy93bb7"; - name = "ktexteditor-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/ktexteditor-5.90.0.tar.xz"; + sha256 = "1g1dky9bgr2zjr0rw9c730shz588ykyw7qw3sgf0dr3sh8aq222n"; + name = "ktexteditor-5.90.0.tar.xz"; }; }; ktextwidgets = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/ktextwidgets-5.89.0.tar.xz"; - sha256 = "0yz2y111hjs1zq1f8887sn334gpf0sv4lrfq3i5dj0x3vcjgmccl"; - name = "ktextwidgets-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/ktextwidgets-5.90.0.tar.xz"; + sha256 = "02g85zahh6hfsw3fcac7hp8kv4d1ha2asmmhnknqd054yl0adxjg"; + name = "ktextwidgets-5.90.0.tar.xz"; }; }; kunitconversion = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kunitconversion-5.89.0.tar.xz"; - sha256 = "1bmnlcsi8qbba38ywr3f4vd7kddiwzmrnn9n69c6626jg4aj3g1q"; - name = "kunitconversion-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kunitconversion-5.90.0.tar.xz"; + sha256 = "1vrvbsd8limfsmgjcv5kvzyf7g62rv1a0rvbdyq15z23zf4rsmf3"; + name = "kunitconversion-5.90.0.tar.xz"; }; }; kwallet = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwallet-5.89.0.tar.xz"; - sha256 = "1yy34asal5jni78jxywddh3hjpzsr1myck0f89h78a2zc28xnd1h"; - name = "kwallet-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kwallet-5.90.0.tar.xz"; + sha256 = "06ffg84jvrc8xhymg1g5j311vq3ajfqg3arx2cxa98aqld213akl"; + name = "kwallet-5.90.0.tar.xz"; }; }; kwayland = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwayland-5.89.0.tar.xz"; - sha256 = "1sq4zy9bifbqlg8s3af2vwxyyg84kmxfyvdi479cn46vdavylp2j"; - name = "kwayland-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kwayland-5.90.0.tar.xz"; + sha256 = "0n7f4rx695q889j8g4sdpdi3jhk29z8zc4wrk5srs2diqi4y0qqi"; + name = "kwayland-5.90.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwidgetsaddons-5.89.0.tar.xz"; - sha256 = "1rs30ialmrhwvxah6rvzbavjnp4ziaaf0j0jcm63kyqbb5nywgmk"; - name = "kwidgetsaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kwidgetsaddons-5.90.0.tar.xz"; + sha256 = "1c17iq0q2w80p7v7k32db0pc5sbzqhvh0w5d145a1nkgr3nbnk6a"; + name = "kwidgetsaddons-5.90.0.tar.xz"; }; }; kwindowsystem = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwindowsystem-5.89.0.tar.xz"; - sha256 = "1h0v72mb7s36ggw8nv70rpk16q0cflbhgvqwzlfqvh68kbs35a4q"; - name = "kwindowsystem-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kwindowsystem-5.90.0.tar.xz"; + sha256 = "0fj7a86dk833ld76c3b1s4ri47bhpvjsi6ryfgdv5q7h2fwh6ia5"; + name = "kwindowsystem-5.90.0.tar.xz"; }; }; kxmlgui = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kxmlgui-5.89.0.tar.xz"; - sha256 = "0mjfg0hd9rswz3jpmc8xjw5jqgip58cx3bavijdlnp7pla7r7j56"; - name = "kxmlgui-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/kxmlgui-5.90.0.tar.xz"; + sha256 = "1q8v1wrx67c37jnd874ilkk8kfk3zvf3f86qg51k16ml0nrwjysg"; + name = "kxmlgui-5.90.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kxmlrpcclient-5.89.0.tar.xz"; - sha256 = "0ri3z76r1v1vfp3j0mrpvan6jzmp57a5g4vwshv4zgyvr484qhlp"; - name = "kxmlrpcclient-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/portingAids/kxmlrpcclient-5.90.0.tar.xz"; + sha256 = "0mq2wgi4qnvscjdkis7jhs004k3s1b3wg0vijjai7xzy772kvclc"; + name = "kxmlrpcclient-5.90.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/modemmanager-qt-5.89.0.tar.xz"; - sha256 = "1sam8cr638h9gyp60dhgmrpddy6y7waf9xaij46kvc0xdan501fi"; - name = "modemmanager-qt-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/modemmanager-qt-5.90.0.tar.xz"; + sha256 = "08nlvg5lwvl3rspi848gp2b2b5pki6sy8c3ww9nn4afy4lk7p609"; + name = "modemmanager-qt-5.90.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/networkmanager-qt-5.89.0.tar.xz"; - sha256 = "1x1pxsf4dm8h0bj6my9rg2j95nnn81919fv9apvqglf6i3xd2pq4"; - name = "networkmanager-qt-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/networkmanager-qt-5.90.0.tar.xz"; + sha256 = "0i9wvrxbkbil21zndiq4cmnldbqsrdp9gnhmp2ns78xdih8wysa7"; + name = "networkmanager-qt-5.90.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/oxygen-icons5-5.89.0.tar.xz"; - sha256 = "1gmx2k5hqfa0lap2y9sv7csi09s8nl3rvab5nz731wr3s9m2frpr"; - name = "oxygen-icons5-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/oxygen-icons5-5.90.0.tar.xz"; + sha256 = "1izfh6cxivmwiymy7lwbmf9j1hxy2skv6z1lbjr0c4snmx6pqx1g"; + name = "oxygen-icons5-5.90.0.tar.xz"; }; }; plasma-framework = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/plasma-framework-5.89.0.tar.xz"; - sha256 = "0wx6a3agplfmf2p86ljhgd3pjx7f15g1hp660i62zw84zvpsh2dp"; - name = "plasma-framework-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/plasma-framework-5.90.0.tar.xz"; + sha256 = "1msqjnwvb815kii0rjhn1lvsnvq5wr8iprdjzsviw67va6gaz4p1"; + name = "plasma-framework-5.90.0.tar.xz"; }; }; prison = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/prison-5.89.0.tar.xz"; - sha256 = "0jd3qfj5k4fxqpbkjpr81mvni9kqppcq0gn5yyc9nys4wk4nr934"; - name = "prison-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/prison-5.90.0.tar.xz"; + sha256 = "0z2k2hyjj86va5rqgd8qrvhflfppcl2d3f9smxb5w9pp19ashvyk"; + name = "prison-5.90.0.tar.xz"; }; }; purpose = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/purpose-5.89.0.tar.xz"; - sha256 = "1sfhwzw1ghr1yg4fkrz0r2myd5569mscsr98pnc3plr78ppq9lwy"; - name = "purpose-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/purpose-5.90.0.tar.xz"; + sha256 = "182196hj3mdy1k7wfgadfxy7m1kbqzk6kksn7yd681h2gpky82l1"; + name = "purpose-5.90.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/qqc2-desktop-style-5.89.0.tar.xz"; - sha256 = "1q2y0hb69f3ldaslbpw8v0xapchqndjp4wzgmghd1zqab8lqjl5c"; - name = "qqc2-desktop-style-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/qqc2-desktop-style-5.90.0.tar.xz"; + sha256 = "05g1rydx0innmiz28mslix4bjsrhsnci227gadngzijncp2v288r"; + name = "qqc2-desktop-style-5.90.0.tar.xz"; }; }; solid = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/solid-5.89.0.tar.xz"; - sha256 = "1gy8ddg5803fpdifg68gkjrl9l2dwjrmwyzq5jzsfr6yabcfih93"; - name = "solid-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/solid-5.90.0.tar.xz"; + sha256 = "10hk4mh426dhi7is5hxa1varn15ijzra5a420zk297pzkphvx0ip"; + name = "solid-5.90.0.tar.xz"; }; }; sonnet = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/sonnet-5.89.0.tar.xz"; - sha256 = "0fdkx68hyp5fq0fyfbq0691vcx70qm7md2nd4028gmpcbxxaixa1"; - name = "sonnet-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/sonnet-5.90.0.tar.xz"; + sha256 = "0d4xxm9vw1rc2mypv4z0yihcn679sab0afxr2kbzq01wr6p759y7"; + name = "sonnet-5.90.0.tar.xz"; }; }; syndication = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/syndication-5.89.0.tar.xz"; - sha256 = "186dw32jhgfwz7dz9payx645gvhgzcf6qy5qiad6ifkvda50g9cw"; - name = "syndication-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/syndication-5.90.0.tar.xz"; + sha256 = "0a9j443w42jwvlzjh5mfxn25kwjrz1ya6sgy0c4y3n5xbg031zmx"; + name = "syndication-5.90.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/syntax-highlighting-5.89.0.tar.xz"; - sha256 = "0iy9ryjf6bcxwp9kni00p82mx1bg101z8331ykixffn41vfgxb9a"; - name = "syntax-highlighting-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/syntax-highlighting-5.90.0.tar.xz"; + sha256 = "19mckdfdxb5i26y75cgmda91s864jbh1wmf98bv8xa1iqxwkwj5z"; + name = "syntax-highlighting-5.90.0.tar.xz"; }; }; threadweaver = { - version = "5.89.0"; + version = "5.90.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/threadweaver-5.89.0.tar.xz"; - sha256 = "03yrlp9ixfb3wsrfmgxfhryzy2jsfnk4wnphmlk5nh98nxa9706x"; - name = "threadweaver-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.90/threadweaver-5.90.0.tar.xz"; + sha256 = "1frhzlzmnrp5y3lrl0ahzxh8syj4vlkjvaypsmbm2bkkn4akizg3"; + name = "threadweaver-5.90.0.tar.xz"; }; }; } From 3a0643bb39c19f0c0dbfdf385827a83a7d4db6c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 00:48:39 +0000 Subject: [PATCH 009/703] xapian: 1.4.18 -> 1.4.19 --- pkgs/development/libraries/xapian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index e2d049cd7b3c..4d23752b2420 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.18" "sha256-GW3btK0QRQEA8JkaWZ5O2UTLrZLkpv6BO+bc4WAkS3c="; + xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM="; } From fc6de4f30ec6bb4cd96c158a15790c84113a50f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Jan 2022 01:58:07 +0100 Subject: [PATCH 010/703] python3Packages.responses: 0.16.0 -> 0.17.0 --- .../python-modules/responses/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index cff31f782c5a..a87655d7147d 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -1,33 +1,28 @@ { lib , buildPythonPackage -, cookies , fetchPypi -, mock , pytest-localserver , pytestCheckHook , pythonOlder , requests -, six , urllib3 }: buildPythonPackage rec { pname = "responses"; - version = "0.16.0"; + version = "0.17.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ouOsoqgnfmElfNOxwVSx3Q14Kxrj04t/o3y+P+tTF5E="; + hash = "sha256-7GdeCA0Gv40fteWmih5c0N9GsJx4IwMV9lCvXkA2vsc="; }; propagatedBuildInputs = [ requests urllib3 - six - ] ++ lib.optionals (pythonOlder "3.4") [ - cookies - ] ++ lib.optionals (pythonOlder "3.3") [ - mock ]; checkInputs = [ @@ -35,7 +30,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "responses" ]; + pythonImportsCheck = [ + "responses" + ]; meta = with lib; { description = "Python module for mocking out the requests Python library"; From 3ab27b62139366df1ca3f3d86e240bd29eb3d9ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 02:52:56 +0000 Subject: [PATCH 011/703] liburcu: 0.13.0 -> 0.13.1 --- pkgs/development/libraries/liburcu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index b00b4cf9ac85..e2dc63609c41 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.13.0"; + version = "0.13.1"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "sha256-y7INvhqJLCpNiJi6xDFhduWFOSaT1Jh2bMu8aM8guiA="; + sha256 = "sha256-MhPzPSuPcQ65IOsauyeewEv4rmNh9E8lE8KMINM2MIM="; }; checkInputs = [ perl ]; From 081066c6d6e948a4494927cd29217b2fc9e7f459 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 12:34:31 +0000 Subject: [PATCH 012/703] harfbuzz: 3.1.2 -> 3.2.0 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index cc6287eace70..1e36f1e7f0f7 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -24,7 +24,7 @@ }: let - version = "3.1.2"; + version = "3.2.0"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "sha256-1xndbJhx+1AzJNnpvvdEcBHPZMPaMI03h6sG2h1d3qs="; + sha256 = "sha256-iNYp/hyJTaaF6e09YpUL7ktBhq2wRN9zKiEH59WLbYU="; }; postPatch = '' From 92fc46ea9c76f9e309d1a35eb7129d675a90299e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 12:48:37 +0000 Subject: [PATCH 013/703] hidapi: 0.11.0 -> 0.11.2 --- pkgs/development/libraries/hidapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 70e9a39e03fe..ffe534ede4af 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "0dzigvmwbg20b33xn0sklnf489m8g84yrcm8kqlrsd7x8iymsg63"; + sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko="; }; nativeBuildInputs = [ cmake pkg-config ]; From 886235de96e2bdd5d29bd1b7bff9f7358c7ff329 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 14:40:15 +0000 Subject: [PATCH 014/703] samba: 4.15.2 -> 4.15.3 --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2001ae005271..f70c33156c3a 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.2"; + version = "4.15.3"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-YoHXxqjEn3mQqfJJpmeEs1GA/iSVV+8RR82KbRZqIRM="; + sha256 = "sha256-UZOZQEORVQNFhGdo6k3Q/n/LBOIMK4kbXusC5VVBN9s="; }; outputs = [ "out" "dev" "man" ]; From 1674e25fb15f3dd83a7338f4b252a6789ded5fc0 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 17 Nov 2021 08:53:45 +0100 Subject: [PATCH 015/703] openalSoft: support cross-compilation It failed with 'missing gnu/stubs-32.h'. Adding glibc to buildInputs helps. Co-authored-by: symphorien+git@xlumurb.eu --- pkgs/development/libraries/openal-soft/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index d28f7b25792e..d2cdebdf3553 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -23,9 +23,12 @@ stdenv.mkDerivation rec { --replace "@OUT@" $out ''; + strictDeps = true; + nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional alsaSupport alsa-lib + buildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.cc.libc + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; From f18712645601593b532996592debbcb6e18bff15 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 12 Jan 2022 04:20:00 +0000 Subject: [PATCH 016/703] protobuf3_16: 3.16.0 -> 3.16.1 https://github.com/protocolbuffers/protobuf/releases/tag/v3.16.1 --- pkgs/development/libraries/protobuf/3.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.16.nix b/pkgs/development/libraries/protobuf/3.16.nix index df8d53b9f1c3..fdbbed733d85 100644 --- a/pkgs/development/libraries/protobuf/3.16.nix +++ b/pkgs/development/libraries/protobuf/3.16.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.16.0"; - sha256 = "0jc523ys6xh1fk3l52f5mfqxhb4g8aim1js7330v0fdc3fjr8ncf"; + version = "3.16.1"; + sha256 = "sha256-eOwUyZtrmyh3HwLQ1kLnk+briaXQPrlUqtbFol/nGBo="; } From 9e394f8fb1ac96f948686f40fc222510d1a90a8c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 12 Jan 2022 04:20:00 +0000 Subject: [PATCH 017/703] protobuf3_18: 3.18.1 -> 3.18.2 https://github.com/protocolbuffers/protobuf/releases/tag/v3.18.2 --- pkgs/development/libraries/protobuf/3.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.18.nix b/pkgs/development/libraries/protobuf/3.18.nix index 63fc9b218d30..0d5d2c652cba 100644 --- a/pkgs/development/libraries/protobuf/3.18.nix +++ b/pkgs/development/libraries/protobuf/3.18.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.18.1"; - sha256 = "sha256-5PK0uuk7Du9hX/hHy0gninHIKu6b8THdfVh87Gn7y2Q="; + version = "3.18.2"; + sha256 = "sha256-IXxVTZOAKVMuGCJtD32rVQRBJRWUJMEK2d+fPEmgzRU="; } From e55ed8fae10fcba324356f32d69369f74ccf1aaa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 12 Jan 2022 04:20:00 +0000 Subject: [PATCH 018/703] protobuf3_19: 3.19.0 -> 3.19.3 https://github.com/protocolbuffers/protobuf/releases/tag/v3.19.1 https://github.com/protocolbuffers/protobuf/releases/tag/v3.19.2 https://github.com/protocolbuffers/protobuf/releases/tag/v3.19.3 --- pkgs/development/libraries/protobuf/3.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix index 727bf511d581..7e2be4bec04c 100644 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ b/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.19.0"; - sha256 = "0rx4r4d7hqr0gi3v90jbkm2lnkj9p37dhgwx9d0w7kgh3rvr4i7g"; + version = "3.19.3"; + sha256 = "sha256-nA6L064MuyP5Si4MCLk2yg8PDM7RWggFEGQyibputYQ="; } From f6e92bd1fb2d888fcba58a44b7ae698a9557a11b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2022 22:14:14 +0100 Subject: [PATCH 019/703] python3Packages.requests-file: add pythonImportsCheck --- .../python-modules/requests-file/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index 374627a1bb9a..d8cd9d81c94d 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -1,22 +1,38 @@ -{ lib, fetchPypi, buildPythonPackage, pytestCheckHook, requests, six }: +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +, requests +, six +}: buildPythonPackage rec { - pname = "requests-file"; + pname = "requests-file"; version = "1.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e"; + hash = "sha256-B9dCCNM4nQHDirie9AOvDP7GOVfVOgCB2OynONAkfY4="; }; - propagatedBuildInputs = [ requests six ]; + propagatedBuildInputs = [ + requests + six + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - meta = { - homepage = "https://github.com/dashea/requests-file"; + pythonImportsCheck = [ + "requests_file" + ]; + + meta = with lib; { description = "Transport adapter for fetching file:// URLs with the requests python library"; - license = lib.licenses.asl20; + homepage = "https://github.com/dashea/requests-file"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } From 1059fcaf8524152caf499faa017575be8bf26276 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2022 22:16:13 +0100 Subject: [PATCH 020/703] python3Packages.requests-http-signature: update meta --- .../requests-http-signature/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 7a27055aba2a..c51e24e0ac9d 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "requests-http-signature"; version = "0.2.0"; + format = "setuptools"; - # .pem files for tests aren't present on PyPI src = fetchFromGitHub { owner = "pyauth"; repo = pname; rev = "v${version}"; - sha256 = "1jsplqrxadjsc86f0kb6dgpblgwplxrpi0ql1a714w8pbbz4z3h7"; + hash = "sha256-B45P/loXcRKOChSDeHOnlz+67mtmTeAMYlo21TOmV8s="; }; propagatedBuildInputs = [ @@ -27,17 +27,21 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + pytestFlagsArray = [ + "test/test.py" + ]; disabledTests = [ # Test require network access "test_readme_example" ]; - pythonImportsCheck = [ "requests_http_signature" ]; + pythonImportsCheck = [ + "requests_http_signature" + ]; meta = with lib; { - description = "A Requests auth module for HTTP Signature"; + description = "Requests authentication module for HTTP Signature"; homepage = "https://github.com/kislyuk/requests-http-signature"; license = licenses.asl20; maintainers = with maintainers; [ mmai ]; From 850f63feebfc1d804bd7cb3809b838115d74bf69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2022 22:21:48 +0100 Subject: [PATCH 021/703] python3Packages.requests-kerberos: disable on older Python releases --- .../requests-kerberos/default.nix | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index 40bbb1aa6cb1..3a1382061bd7 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -1,33 +1,29 @@ { lib -, fetchFromGitHub , buildPythonPackage , cryptography -, requests +, fetchFromGitHub , pykerberos , pyspnego -, pytestCheckHook , pytest-mock -, mock +, pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { pname = "requests-kerberos"; version = "0.14.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; - # tests are not present in the PyPI version src = fetchFromGitHub { owner = "requests"; repo = pname; rev = "v${version}"; - sha256 = "0s30pcnlir3j2jmf7yh065f294cf3x0x5i3ldskn8mm0a3657mv3"; + hash = "sha256-Y9dTzFCgVmSnbnTE0kEfjpEkXDEA+uOqFHLkSC27YGg="; }; - # avoid needing to package krb5 - postPatch = '' - substituteInPlace setup.py \ - --replace "pyspnego[kerberos]" "pyspnego" - ''; - propagatedBuildInputs = [ cryptography requests @@ -36,12 +32,19 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook pytest-mock ]; - pythonImportsCheck = [ "requests_kerberos" ]; + # avoid needing to package krb5 + postPatch = '' + substituteInPlace setup.py \ + --replace "pyspnego[kerberos]" "pyspnego" + ''; + + pythonImportsCheck = [ + "requests_kerberos" + ]; meta = with lib; { description = "An authentication handler for using Kerberos with Python Requests"; From 9e01fa6e294d51f4c69c08c207737c87f36dccb0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2022 22:27:42 +0100 Subject: [PATCH 022/703] python3Packages.requests-unixsocket: 0.2.0 -> 0.3.0 --- .../requests-unixsocket/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index 946e406c8bf6..57f4d5787c67 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -9,26 +9,35 @@ buildPythonPackage rec { pname = "requests-unixsocket"; - version = "0.2.0"; + version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9e5c1a20afc3cf786197ae59c79bcdb0e7565f218f27df5f891307ee8817c1ea"; + hash = "sha256-KDBCg+qTV9Rf/1itWxHkdwjPv1gGgXqlmyo2Mijulx4="; }; - nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + pbr + ]; - checkInputs = [ pytestCheckHook waitress ]; + propagatedBuildInputs = [ + requests + ]; - preCheck = '' - rm pytest.ini - ''; + checkInputs = [ + pytestCheckHook + waitress + ]; + + pythonImportsCheck = [ + "requests_unixsocket" + ]; meta = with lib; { description = "Use requests to talk HTTP via a UNIX domain socket"; homepage = "https://github.com/msabramo/requests-unixsocket"; license = licenses.asl20; - maintainers = [ maintainers.catern ]; + maintainers = with maintainers; [ catern ]; }; } From bdd74b0264b835e3bb4065e4f6379b5f3fbde351 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2022 22:29:04 +0100 Subject: [PATCH 023/703] python3Packages.requests: 2.26.0 -> 2.27.0 --- .../python-modules/requests/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 8ba7aef46074..bcd47e16ed6f 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -7,22 +7,23 @@ , charset-normalizer , fetchPypi , idna +, isPy27 +, isPy3k +, pysocks , pytest-mock , pytest-xdist , pytestCheckHook -, urllib3 -, isPy27 -, isPy3k , trustme +, urllib3 }: buildPythonPackage rec { pname = "requests"; - version = "2.26.0"; + version = "2.27.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; + hash = "sha256-jlZDkFvyCjCOJeTB3TeRF8CQAL+KguvMxGLPsbNKFrU="; }; patches = [ @@ -32,7 +33,8 @@ buildPythonPackage rec { postPatch = '' # Use latest idna - substituteInPlace setup.py --replace ",<3" "" + substituteInPlace setup.py \ + --replace ",<3" "" ''; propagatedBuildInputs = [ @@ -48,6 +50,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pysocks pytest-mock pytest-xdist pytestCheckHook @@ -73,11 +76,13 @@ buildPythonPackage rec { "TestTimeout" ]; - pythonImportsCheck = [ "requests" ]; + pythonImportsCheck = [ + "requests" + ]; meta = with lib; { - description = "Simple HTTP library for Python"; - homepage = "http://docs.python-requests.org/en/latest/"; + description = "HTTP library for Python"; + homepage = "http://docs.python-requests.org/"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 84785d3ba1e781452ad7b54fbcd1b69f0f37b441 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 22:37:49 +0100 Subject: [PATCH 024/703] python3Packages.weconnect: 0.29.0 -> 0.29.0 --- pkgs/development/python-modules/weconnect/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 70da78edb603..6de4dca39489 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.28.0"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-J7T62L6wT9rkl/Ukf2y5kBbJEdzh2XnGgCgedkxVEmA="; + sha256 = "sha256-eAOEl7KBa7wZkoJxGPtK/6W2dq1n2X+APU2mHIlz9K0="; }; propagatedBuildInputs = [ @@ -40,6 +40,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," + substituteInPlace requirements.txt \ + --replace "pillow~=9.0.0" "pillow" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" From 3384a403d930cb5dd25a2378ae397b50b53606c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 22:38:25 +0100 Subject: [PATCH 025/703] python3Packages.weconnect-mqtt: 0.21.0 -> 0.22.0 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 0e00a08145e6..9b354025feab 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.21.0"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-wagFjVXTjYFryaUiVeqU+T9ya+NzUFMX3uPlRZGe1v0="; + sha256 = "sha256-cNEV9PNBv7mL7QG3p8GIwjz0pUhzz55QV6HmCkv6MSg="; }; propagatedBuildInputs = [ From 791721a640117ab3dc2d5462ff4df606772a7ec2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Jan 2022 22:23:16 +0100 Subject: [PATCH 026/703] python3Packages.requests: 2.27.0 -> 2.27.1 --- pkgs/development/python-modules/requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index bcd47e16ed6f..f5b021801f41 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "requests"; - version = "2.27.0"; + version = "2.27.1"; src = fetchPypi { inherit pname version; - hash = "sha256-jlZDkFvyCjCOJeTB3TeRF8CQAL+KguvMxGLPsbNKFrU="; + hash = "sha256-aNfFb9WomZiHco7zBKbRLtx7508c+kdxT8i0FFJcmmE="; }; patches = [ From d958c3095853e4d49a896dd63ac66a8ebbed4c9f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 12 Jan 2022 19:52:48 +0000 Subject: [PATCH 027/703] python3Packages.pillow: 8.4.0 -> 9.0.0 --- pkgs/development/python-modules/pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index e0f29d366e10..57b085a54051 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.4.0"; + version = "9.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed"; + sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf"; }; meta = with lib; { From e0951f8c03468b5ba1cebc385fe10b92fccbfc01 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 12 Jan 2022 22:08:03 +0000 Subject: [PATCH 028/703] python3Packages.imageio: 2.13.2 -> 2.13.5 include patch to fix behaviour with pillow 9 --- .../development/python-modules/imageio/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 0a97a27d17f8..5727b52755a6 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi +, fetchpatch , imageio-ffmpeg , numpy , pillow @@ -12,14 +13,23 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.13.2"; + version = "2.13.5"; disabled = isPy27; src = fetchPypi { - sha256 = "5b7a55d07de88a2fd70f18a1608ca05ba2b55596a942fb2c390240201009a6c3"; + sha256 = "0gc41aiz2i0napk1y00v9bgb4m7dd21sz3lghfm6w6s0ivjjpv67"; inherit pname version; }; + patches = [ + # already present in master, remove on next bump + (fetchpatch { + name = "pillow-9-gif-rgba.patch"; + url = "https://github.com/imageio/imageio/commit/836b7a9b077a96de8adab5b67ea53b1292048275.patch"; + sha256 = "0rlyppa4w16n6qn5hr4wrg8xiy7ifs8c5dhmq8a9yncypx87glpv"; + }) + ]; + propagatedBuildInputs = [ imageio-ffmpeg numpy From 81dd9e384a3f840b323b7e02c3d9f484e16bbf3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Jan 2022 01:23:53 +0100 Subject: [PATCH 029/703] python3Packages.ruamel-yaml-clib: 0.2.4 -> 0.2.6 --- pkgs/development/python-modules/ruamel-yaml-clib/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index b12920fc7640..143452274abb 100644 --- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -5,12 +5,13 @@ buildPythonPackage rec { pname = "ruamel-yaml-clib"; - version = "0.2.4"; + version = "0.2.6"; + format = "setuptools"; src = fetchhg { url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; rev = version; - sha256 = "sha256-HQZY1opUvVQdXUHmsZmcYX2vfgjKsl6xATmVIXjnBlc="; + sha256 = "sha256-mpkh9JhYKRX47jfKprjt1Vpm9DMz8LcWzkotJ+/xoxY="; }; # no tests From c2534bb5a47edf358daad45b1d801eefa18c8c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Jan 2022 13:37:40 +0100 Subject: [PATCH 030/703] python39Packages.ruamel-yaml: 0.17.17 -> 0.17.20 --- pkgs/development/python-modules/ruamel-yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 4b6774a4f9fa..79f21ba6aabd 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.17.17"; + version = "0.17.20"; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - sha256 = "9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be"; + sha256 = "sha256-S4ozwe+ytEOpP8qvz6TS5EX46MKcUo2fXNr7fMnkAEw="; }; # Tests use relative paths From e4a63a3a443589f2074410981e4f8d1ad2499aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Nov 2021 01:05:21 +0100 Subject: [PATCH 031/703] fftw: convert to pname+version, use https for fetching, expose withDoc, remove ? null from inputs --- pkgs/development/libraries/fftw/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index f4b30129e610..4f3d685c1fa4 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -3,7 +3,7 @@ , lib , gfortran , perl -, llvmPackages ? null +, llvmPackages , precision ? "double" , enableAvx ? stdenv.hostPlatform.avxSupport , enableAvx2 ? stdenv.hostPlatform.avx2Support @@ -11,24 +11,20 @@ , enableFma ? stdenv.hostPlatform.fmaSupport , enableMpi ? false , mpi +, withDoc ? stdenv.cc.isGNU }: with lib; -assert stdenv.cc.isClang -> llvmPackages != null; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; -let +stdenv.mkDerivation rec { + pname = "fftw-${precision}"; version = "3.3.10"; - withDoc = stdenv.cc.isGNU; -in - -stdenv.mkDerivation { - name = "fftw-${precision}-${version}"; src = fetchurl { urls = [ - "http://fftw.org/fftw-${version}.tar.gz" + "https://fftw.org/fftw-${version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz" ]; sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; From 3cf29cf0cf53434511ba6505065c0b3b87513388 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 11 Jan 2022 18:35:59 +0000 Subject: [PATCH 032/703] linuxHeaders: 5.15.5 -> 5.16 Fixes: https://github.com/NixOS/nixpkgs/pull/149243 ("[staging] linuxHeaders: fix missing include in swab.h") --- pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 3c7e899cba71..833598448878 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -81,12 +81,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.15.5"; in + linuxHeaders = let version = "5.16"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "sha256-6VZaMBUlrIHBQs64MvkFPdVoXhB9vPdT0N5MWLyYhR8="; + sha256 = "1fq86dbx2p124vi4j8nan68gj4zyw4xnqh4jxq9aqsdvi24pwz82"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms From 4bca1c847156c878e974061861a101203095b08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jan 2022 13:28:15 +0100 Subject: [PATCH 033/703] python310Packages.unittest2: mark broken, minor formatting --- pkgs/development/python-modules/unittest2/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix index ae8cab53b0c5..e044176242d5 100644 --- a/pkgs/development/python-modules/unittest2/default.nix +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -3,6 +3,7 @@ , fetchPypi , six , traceback2 +, pythonAtLeast }: buildPythonPackage rec { @@ -16,14 +17,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ six traceback2 ]; - # # 1.0.0 and up create a circle dependency with traceback2/pbr + # 1.0.0 and up create a circle dependency with traceback2/pbr doCheck = false; postPatch = '' # argparse is needed for python < 2.7, which we do not support anymore. substituteInPlace setup.py --replace "argparse" "" - # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 + # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 sed -i '510i\ return None, False' unittest2/loader.py # https://github.com/pypa/packaging/pull/36 sed -i 's/version=VERSION/version=str(VERSION)/' setup.py @@ -31,8 +32,9 @@ buildPythonPackage rec { meta = with lib; { description = "A backport of the new features added to the unittest testing framework"; - homepage = "https://pypi.python.org/pypi/unittest2"; + homepage = "https://pypi.org/project/unittest2/"; license = licenses.bsd0; + # AttributeError: module 'collections' has no attribute 'MutableMapping' + broken = pythonAtLeast "3.10"; }; - } From 560b3f416efcf5e03448acdebede54ee3f95b5bf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 12:48:39 -0800 Subject: [PATCH 034/703] rustc: 1.57.0 -> 1.58.0 --- .../compilers/rust/{1_57.nix => 1_58.nix} | 30 +++++++++---------- pkgs/top-level/all-packages.nix | 8 ++--- 2 files changed, 19 insertions(+), 19 deletions(-) rename pkgs/development/compilers/rust/{1_57.nix => 1_58.nix} (58%) diff --git a/pkgs/development/compilers/rust/1_57.nix b/pkgs/development/compilers/rust/1_58.nix similarity index 58% rename from pkgs/development/compilers/rust/1_57.nix rename to pkgs/development/compilers/rust/1_58.nix index f6b9d3c72a32..73f4d2ea8b17 100644 --- a/pkgs/development/compilers/rust/1_57.nix +++ b/pkgs/development/compilers/rust/1_58.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.57.0"; - rustcSha256 = "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim"; + rustcVersion = "1.58.0"; + rustcSha256 = "sha256-CtUxoy88LplrkyLGtyYqnP5Vfkn/M2Ot6ge1dRBs13A="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; @@ -37,24 +37,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.56.1"; + bootstrapVersion = "1.57.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "84db34603ce22d93312ff8bccd5580fe112e932bbeb0361e7cc37668a9803a27"; - x86_64-unknown-linux-gnu = "a6be5d045183a0b12dddf0d81633e2a64e63e4c2dfa44eb7593970c1ef93a98f"; - x86_64-unknown-linux-musl = "3c09058d104d9a88943fb343af1fb70422f9c4a987e6703666ee8a8051211190"; - arm-unknown-linux-gnueabihf = "c445706d109bb74de4c889687ae08a48af5808676fda15b84b7ef5970a82a5f6"; - armv7-unknown-linux-gnueabihf = "29ec65af502370c0c1a49faecd7131f1243fe3005b419ead4b40b267af2b2db0"; - aarch64-unknown-linux-gnu = "69792887357c8dd78c5424f0b4a624578296796d99edf6c30ebe2acc2b939aa3"; - aarch64-unknown-linux-musl = "971d13d41657e50e3ac54f17f52b4198c3d8bc25ec489a6a9e6d12c18226dda5"; - x86_64-apple-darwin = "8d65ef02a123c23be00101fb204d28b60498b9145dd2ee8edabf0afde6e01e55"; - aarch64-apple-darwin = "e71c14c1368048a22e4d1851f301872ac2e6f4c574f04d2a7ae4d64b0e7c7235"; - powerpc64le-unknown-linux-gnu = "fa78b28fe1ef3cd4add9ec151e5eab756dfc83c8bc3e5a576a6eddd350c4de7a"; - riscv64gc-unknown-linux-gnu = "5ec327d1bd3ba8d00afbe9be4a1f0fb8ab845063fcf9be479be9493c52a4dbb6"; + i686-unknown-linux-gnu = "7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa"; + x86_64-unknown-linux-gnu = "ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda"; + x86_64-unknown-linux-musl = "56876ebca0e46236208c8bd3c3425dba553abe49639e1040ee8b95bc66a45d33"; + arm-unknown-linux-gnueabihf = "b4448f7a96da4feee99a2c4b16b5738b99ab7e86e22d284ea6f7dca5921bca9b"; + armv7-unknown-linux-gnueabihf = "577682b1405e8901f971839407daaad06d8ae68ad370305b75d569ba293c4fb4"; + aarch64-unknown-linux-gnu = "d66847f7cf7b548ecb328c400ac4f691ee2aea6ff5cd9286ad8733239569556c"; + aarch64-unknown-linux-musl = "91c8e5171e5715261f7f635142a10a9415a4e5ba55374daf76f0b713c8b08132"; + x86_64-apple-darwin = "15ceffc4743434c19d08f73fb4edd6642b7fd8162ed7101d3e6ca2c691fcb699"; + aarch64-apple-darwin = "7511075e28b715e2d9c7ee74221779f8444681a4bb60ac3a0270a5fdf08bdd5a"; + powerpc64le-unknown-linux-gnu = "3ddc1abed6b7535c4150bf54291901fa856806c948bc21b711e24a3c8d810be7"; + riscv64gc-unknown-linux-gnu = "f809df1c6ac0adc9bd37eb871dfb0d9809f3ed7f61ba611f9305e9eb8f8c9226"; }; - selectRustPackage = pkgs: pkgs.rust_1_57; + selectRustPackage = pkgs: pkgs.rust_1_58; rustcPatches = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1c7f48b5ea..4224b130b6bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12920,18 +12920,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_57 = callPackage ../development/compilers/rust/1_57.nix { + rust_1_58 = callPackage ../development/compilers/rust/1_58.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_13 = llvmPackages_13.libllvm; }; - rust = rust_1_57; + rust = rust_1_58; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_57 = rust_1_57.packages.stable; - rustPackages = rustPackages_1_57; + rustPackages_1_58 = rust_1_58.packages.stable; + rustPackages = rustPackages_1_58; inherit (rustPackages) cargo clippy rustc rustPlatform; From cf47e66aab1d42a0fb8c773b1ac5ff1d67d1b2a6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 11 Jan 2022 13:28:02 -0800 Subject: [PATCH 035/703] python3Packages.funcsigs: disable tests, avoid unittest2 --- pkgs/development/python-modules/funcsigs/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index 8a7335accda4..115d358cb786 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPyPy, isPy3k, unittest2 +, isPyPy, isPy3k }: buildPythonPackage rec { @@ -11,11 +11,14 @@ buildPythonPackage rec { sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7"; }; - buildInputs = [ unittest2 ]; - # https://github.com/testing-cabal/funcsigs/issues/10 patches = lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ]; + # requires, unittest2 and package hasn't been maintained since 2013 + doCheck = false; + + pythonImportsCheck = [ "funcsigs" ]; + meta = with lib; { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; homepage = "https://github.com/aliles/funcsigs"; From e35d74c3ecff7f579cb7c60d3eb96b6db774721b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Jan 2022 11:19:02 +0800 Subject: [PATCH 036/703] gobject-introspection: prepare for meson 0.61 --- .../libraries/gobject-introspection/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 25b7770101d1..667d50ca4d8b 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -46,6 +46,15 @@ stdenv.mkDerivation rec { src = ./absolute_shlib_path.patch; inherit nixStoreDir; }) + # Fix build with meson 0.61.0 + (fetchurl { + url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/827494d6415b696a98fa195cbd883b50cc893bfc.patch"; + sha256 = "sha256-imVWzU760FRsX+eXREQDQ6mDcmzZ5ASLT9rBf4oyBGQ="; + }) + (fetchurl { + url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2.patch"; + sha256 = "sha256-o7a0qDT5IYcYcz8toeZu+nPj3SwS52sNgmxgzsmlp4Q="; + }) ] ++ lib.optionals x11Support [ # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080 From 0ffdadc27165e644c481027689647efb3a795f83 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 15 Jan 2022 09:50:12 +0100 Subject: [PATCH 037/703] python39: 3.9.9 -> 3.9.10 --- pkgs/development/interpreters/python/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 852a11594efa..59b5a03d704c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -133,10 +133,11 @@ with pkgs; sourceVersion = { major = "3"; minor = "9"; - patch = "9"; + patch = "10"; suffix = ""; }; - sha256 = "sha256-BoKMBKVzwHOk5RxCkqJ8G+SuJmIcPtx8+TGEGM47bSc="; + sha256 = "sha256-Co+/tSh+vDoT6brz1U4I+gZ3j/7M9jEa74Ibs6ZYbMg="; + }; }; }; From 8dabcce399d3a090679cd2180d6c30df99c97dc7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 15 Jan 2022 09:50:35 +0100 Subject: [PATCH 038/703] python310: 3.10.1 -> 3.10.2 --- .../interpreters/python/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 59b5a03d704c..0324bd2f9af2 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -138,6 +138,14 @@ with pkgs; }; sha256 = "sha256-Co+/tSh+vDoT6brz1U4I+gZ3j/7M9jEa74Ibs6ZYbMg="; }; + python310 = { + sourceVersion = { + major = "3"; + minor = "10"; + patch = "2"; + suffix = ""; + }; + sha256 = "sha256-F946x9qfJRmqnWQ3jGA6c6DprVjf+ogS5FFgwIbeZMc="; }; }; @@ -181,18 +189,11 @@ in { inherit passthruFun; } // sources.python39); - python310 = callPackage ./cpython { + python310 = callPackage ./cpython ({ self = python310; - sourceVersion = { - major = "3"; - minor = "10"; - patch = "1"; - suffix = ""; - }; - sha256 = "0xz1wrd6xi20sbli30vm6jclc4rlnnd03irybknf2p8sdrdjdwd7"; inherit (darwin) configd; inherit passthruFun; - }; + } // sources.python310); python311 = callPackage ./cpython { self = python311; From b9ccf979d25058161060bbf6c044a9e7a3ad9ad1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jan 2022 12:41:18 +0100 Subject: [PATCH 039/703] python3Packages.html-sanitizer: 1.9.2 -> 1.9.3 --- pkgs/development/python-modules/html-sanitizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index ef029586bebf..111d7e00d1b2 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "html-sanitizer"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "matthiask"; repo = pname; rev = version; - sha256 = "sha256-ZPyGF7N+EZHfgqZfRQx4x1r83BMur+Zg2kdtVISn3I8="; + sha256 = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw="; }; propagatedBuildInputs = [ From 890ea19c1b74a68f4f3937048403136e5598933f Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 16 Jan 2022 20:08:53 +0100 Subject: [PATCH 040/703] expat: 2.4.2 -> 2.4.3 (security) --- pkgs/development/libraries/expat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index d44783079f0f..6abbd9567478 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "expat"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vC/1j0nCmqx7/3BabBZ6gh8mxRIHn/CKxDL9D9ybsZk="; + sha256 = "sha256-sfnxsaXrsKyqiMn/eb+k4UWCO3iqUYXlxdhfBggkd4o="; }; outputs = [ "out" "dev" ]; # TODO: fix referrers From 7110bb89ed1afef81495605841dc1e87a783936e Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Jan 2022 20:37:39 +0300 Subject: [PATCH 041/703] flask: depend on setuptools The `flask` CLI uses `setuptools` (or more specifically `pkg_resources`) [here](https://github.com/pallets/flask/blob/fdac8a5404e3e3a316568107a293f134707c75bb/src/flask/cli.py#L498) to discover third party commands, and just does nothing silently if it's not found. Add the dependency so custom commands start working. --- pkgs/development/python-modules/flask/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 2fe71c2d6db9..cf1079166b08 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -7,6 +7,7 @@ , jinja2 , python-dotenv , werkzeug +, setuptools , pytestCheckHook }: @@ -26,6 +27,10 @@ buildPythonPackage rec { itsdangerous jinja2 werkzeug + + # required for CLI subcommand autodiscovery + # see: https://github.com/pallets/flask/blob/fdac8a5404e3e3a316568107a293f134707c75bb/src/flask/cli.py#L498 + setuptools ]; checkInputs = [ From b036da1cf311806454452fe063d4a3c6c6e99662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Jan 2022 02:08:16 +0100 Subject: [PATCH 042/703] python39Packages.rfc3986: 1.5.0 -> 2.0.0 --- pkgs/development/python-modules/rfc3986/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 71a7d0730bdf..76cdb9bb7755 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -1,12 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, idna, pytestCheckHook }: buildPythonPackage rec { pname = "rfc3986"; - version = "1.5.0"; + version = "2.0.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"; + sha256 = "sha256-l6rPnb1L/YKbqtbmMJ+mVzqvG+P2+nNcirBeRs7LJhw="; }; propagatedBuildInputs = [ idna ]; From 4f1480eb2967f2e0f3929ad85bd162765edfda88 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 12 Jul 2021 17:38:08 +0200 Subject: [PATCH 043/703] Qt5: WebEngine turn off warning causing errors --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 68945625f5b4..65b740573fcb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -115,6 +115,7 @@ qtModule { ] ++ lib.optionals stdenv.isDarwin [ "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12" "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12" + "-Wno-elaborated-enum-base" # # Prevent errors like From bf0962385217abd159088b7eb9ce982a02379a02 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 21 Dec 2021 21:48:18 +0100 Subject: [PATCH 044/703] llvmPackages: Update Linux default to 11 Update the default LLVM version on Linux to stay synchronized with Darwin, where LLVM is tied to the stdenv. --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe1c97840eb7..037140ac51c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12607,10 +12607,7 @@ with pkgs; /**/ if platform.isDarwin then 11 else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 - else if platform.isLinux then - /**/ if platform.isRiscV then 11 - else if platform.isMusl then 11 - else 7 + else if platform.isLinux then 11 else if platform.isWasm then 8 else latest_version; # We take the "max of the mins". Why? Since those are lower bounds of the From a0283ba0cbe8cc411bdaa130e8d9f9af122ac207 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:05:52 +0100 Subject: [PATCH 045/703] bear: Darwin stdenv is now LLVM 11 by default --- pkgs/top-level/all-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 037140ac51c3..b1b7ba4059e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14198,13 +14198,7 @@ with pkgs; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; - bear = callPackage ../development/tools/build-managers/bear { - # error: no viable constructor or deduction guide for deduction of template arguments of 'map' - stdenv = if stdenv.hostPlatform.system == "x86_64-darwin" then - llvmPackages_11.stdenv - else - stdenv; - }; + bear = callPackage ../development/tools/build-managers/bear { }; bingrep = callPackage ../development/tools/analysis/bingrep { }; From 54ac4a7ff2b997fe96e61279857f51e08523bc39 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:09:36 +0100 Subject: [PATCH 046/703] c3c: llvmPackages defaults to LLVM 11 on the main platforms --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1b7ba4059e7..795cac11b7d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15477,9 +15477,7 @@ with pkgs; c2ffi = callPackage ../development/tools/misc/c2ffi { }; - c3c = callPackage ../development/compilers/c3c { - llvmPackages = llvmPackages_11; - }; + c3c = callPackage ../development/compilers/c3c { }; swfmill = callPackage ../tools/video/swfmill { }; From 6113b0fe410436d1b1a00881b86e2b42e6e61946 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 17 Jan 2022 19:36:23 +0200 Subject: [PATCH 047/703] ncurses: add --with-versioned-syms --- pkgs/development/libraries/ncurses/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 6c97b37a25fe..efab246bb1f0 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { "--enable-symlinks" "--with-manpage-format=normal" "--disable-stripping" + "--with-versioned-syms" ] ++ lib.optional unicodeSupport "--enable-widec" ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5" From 377515c87709d35d5de390970d9f0e4b78be965f Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:17:00 +0100 Subject: [PATCH 048/703] ispc: LLVM defaults to 11 on the main platforms --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 795cac11b7d2..fedeac9995a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17239,8 +17239,7 @@ with pkgs; iso-flags = callPackage ../data/icons/iso-flags { }; ispc = callPackage ../development/compilers/ispc { - stdenv = llvmPackages_11.stdenv; - llvmPackages = llvmPackages_11; + inherit (llvmPackages) stdenv; }; isso = callPackage ../servers/isso { }; From 194b23e6db7a8b94cc5d9df4ef84c1083fc91090 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 8 Jan 2022 16:09:57 -0600 Subject: [PATCH 049/703] extra-cmake-modules: Use associative array to recognize paths Fixes #99308. Use an associative array to recognize paths that have already been seen by the host path hook. This takes advantage of fast lookup of associative array keys in Bash. The previous solution scanned a linear array, which was accidentally quadratic. --- .../extra-cmake-modules/setup-hook.sh | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index 4135f6bfd7aa..ac077b73d6a6 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -59,23 +59,24 @@ xdgDataSubdirs=( \ "wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \ ) -ecmHostPathSeen=( ) +# ecmHostPathsSeen is an associative array of the paths that have already been +# seen by ecmHostPathHook. +declare -gA ecmHostPathsSeen -ecmUnseenHostPath() { - for pkg in "${ecmHostPathSeen[@]}" - do - if [ "${pkg:?}" == "$1" ] - then - return 1 - fi - done - - ecmHostPathSeen+=("$1") - return 0 +ecmHostPathIsNotSeen() { + if [[ -n "${ecmHostPathsSeen["$1"]:-}" ]]; then + # The path has been seen before. + return 1 + else + # The path has not been seen before. + # Now it is seen, so record it. + ecmHostPathsSeen["$1"]=1 + return 0 + fi } ecmHostPathHook() { - ecmUnseenHostPath "$1" || return 0 + ecmHostPathIsNotSeen "$1" || return 0 local xdgConfigDir="$1/etc/xdg" if [ -d "$xdgConfigDir" ] From b5d14534cc4c397fda362e179c211482fb40567c Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:17:59 +0100 Subject: [PATCH 050/703] odin: LLVM defaults to 11 on the main platforms --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fedeac9995a3..0a5a4dad1cf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22691,9 +22691,7 @@ with pkgs; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { - llvmPackages = llvmPackages_11; - }; + odin = callPackage ../development/compilers/odin { }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; From cba9e999dd76eb5ece67041c3cedb8e92cc8dd39 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:21:35 +0100 Subject: [PATCH 051/703] zcash: LLVM defaults to 11 on the main platforms --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a5a4dad1cf0..d33a05f7c86d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30152,7 +30152,7 @@ with pkgs; boost = boost175; }; - zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; + zcash = callPackage ../applications/blockchains/zcash { }; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; From dc56a79224bdae4ad59a7d8a7c68747155ad1b8e Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 27 Dec 2021 15:25:42 +0100 Subject: [PATCH 052/703] beamerpresenter: Darwin's clang is now 11 by default --- pkgs/top-level/all-packages.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d33a05f7c86d..eed90f06aeb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3847,14 +3847,7 @@ with pkgs; bdsync = callPackage ../tools/backup/bdsync { }; - beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { - # developed for a compiler with C++20 support - stdenv = - if stdenv.isDarwin then - overrideCC stdenv clang_10 - else - stdenv; - }; + beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { }; beanstalkd = callPackage ../servers/beanstalkd { }; From 357a1d14817f86bd1369a434e082ecaaaa5aff52 Mon Sep 17 00:00:00 2001 From: "florian on nixos (Florian Brandes)" Date: Sun, 16 Jan 2022 11:17:10 +0100 Subject: [PATCH 053/703] python3Packages.dnspython: 2.1.0 -> 2.2.0 needed for pgadmin4 init https://github.com/NixOS/nixpkgs/pull/154764 include fix for missing /etc/protocols https://github.com/rthalley/dnspython/issues/662 --- .../python-modules/dnspython/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index e4a319b31a89..40b3d7a36dec 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -2,26 +2,40 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools-scm +, pytestCheckHook }: buildPythonPackage rec { pname = "dnspython"; - version = "2.1.0"; + version = "2.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4"; + extension = "tar.gz"; + sha256 = "1mi6l2n766y1gic3x1swp2jk2nr7wbkb191qinwhddnh6bh534z7"; }; - # needs networking for some tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # dns.exception.SyntaxError: protocol not found + "test_misc_good_WKS_text" + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + pythonImportsCheck = [ "dns" ]; meta = with lib; { description = "A DNS toolkit for Python"; homepage = "https://www.dnspython.org"; license = with licenses; [ isc ]; + maintainers = with maintainers; [ gador ]; }; } From 88f3d370aa037f316c071d9f9d64a8299dbe360e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Jan 2022 17:04:56 +0000 Subject: [PATCH 054/703] e2fsprogs: 1.46.4 -> 1.46.5 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 5f1775e77e09..939e9067b80f 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.46.4"; + version = "1.46.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ra2d1wasksy1zy3rgviwdni40dnamchisjrrqqi940y545m493m"; + sha256 = "1fgvwbj9ihz5svzrd2l0s18k16r4qg3wimrniv71fn3vdcg0shxp"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; From 8fd298a93a28aed4dfcea6d59714c8b50452d310 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Jan 2022 17:09:02 +0000 Subject: [PATCH 055/703] e2fsprogs: add meta.changelog --- pkgs/tools/filesystems/e2fsprogs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 939e9067b80f..d630c7d43f61 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://e2fsprogs.sourceforge.net/"; + changelog = "http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; license = with licenses; [ gpl2Plus From b3a7dc22d12e8c7007a71e965ee24f6b609fe212 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 16 Jan 2022 15:42:07 +0000 Subject: [PATCH 056/703] libredirect: add support for unlink, unlinkat, rmdir add coverage of these and mkdir functions in tests --- pkgs/build-support/libredirect/default.nix | 4 ++-- pkgs/build-support/libredirect/libredirect.c | 24 ++++++++++++++++++++ pkgs/build-support/libredirect/test.c | 18 +++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 5545c93c19e1..9a35db97c9ff 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -57,7 +57,7 @@ else stdenv.mkDerivation rec { ''} if [ -n "$doInstallCheck" ]; then - $CC -Wall -std=c99 -O3 test.c -o test + $CC -Wall -std=c99 -D_POSIX_C_SOURCE=200809L -O3 test.c -o test fi runHook postBuild @@ -91,7 +91,7 @@ else stdenv.mkDerivation rec { installCheckPhase = '' ( source "$hook/nix-support/setup-hook" - NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true" ./test + NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true:/bar/baz=$(mktemp -d)" ./test ) ''; diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index 0dc7feb382c3..e33199402c4b 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -354,3 +354,27 @@ WRAPPER(int, mkdirat)(int dirfd, const char *path, mode_t mode) return mkdirat_real(dirfd, rewrite(path, buf), mode); } WRAPPER_DEF(mkdirat) + +WRAPPER(int, unlink)(const char *path) +{ + int (*unlink_real) (const char *path) = LOOKUP_REAL(unlink); + char buf[PATH_MAX]; + return unlink_real(rewrite(path, buf)); +} +WRAPPER_DEF(unlink) + +WRAPPER(int, unlinkat)(int dirfd, const char *path, int flags) +{ + int (*unlinkat_real) (int dirfd, const char *path, int flags) = LOOKUP_REAL(unlinkat); + char buf[PATH_MAX]; + return unlinkat_real(dirfd, rewrite(path, buf), flags); +} +WRAPPER_DEF(unlinkat) + +WRAPPER(int, rmdir)(const char *path) +{ + int (*rmdir_real) (const char *path) = LOOKUP_REAL(rmdir); + char buf[PATH_MAX]; + return rmdir_real(rewrite(path, buf)); +} +WRAPPER_DEF(rmdir) diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/build-support/libredirect/test.c index 853f26bb5209..c546a8958288 100644 --- a/pkgs/build-support/libredirect/test.c +++ b/pkgs/build-support/libredirect/test.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -9,6 +10,7 @@ #include #include +#define TESTDIR "/bar/baz" #define TESTPATH "/foo/bar/test" #define SUBTEST "./test sub" @@ -59,6 +61,22 @@ int main(int argc, char *argv[]) assert(stat(TESTPATH, &testsb) != -1); + assert(mkdir(TESTDIR "/dir-mkdir", 0777) == 0); + assert(unlink(TESTDIR "/dir-mkdir") == -1); // it's a directory! +#ifndef __APPLE__ + assert(errno == EISDIR); +#endif + assert(rmdir(TESTDIR "/dir-mkdir") == 0); + assert(unlink(TESTDIR "/dir-mkdir") == -1); + assert(errno == ENOENT); + + assert(mkdirat(123, TESTDIR "/dir-mkdirat", 0777) == 0); + assert(unlinkat(123, TESTDIR "/dir-mkdirat", 0) == -1); // it's a directory! +#ifndef __APPLE__ + assert(errno == EISDIR); +#endif + assert(unlinkat(123, TESTDIR "/dir-mkdirat", AT_REMOVEDIR) == 0); + test_spawn(); test_system(); From 2185a70fa4eec7a42dc3c0cce61ece4b71b0a7a0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 16 Jan 2022 21:41:41 +0000 Subject: [PATCH 057/703] libredirect: add support for mkstemp family of functions --- pkgs/build-support/libredirect/default.nix | 4 +- pkgs/build-support/libredirect/libredirect.c | 65 ++++++++++++++++++++ pkgs/build-support/libredirect/test.c | 40 ++++++++++++ 3 files changed, 108 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 9a35db97c9ff..4c344a24b93b 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -57,7 +57,9 @@ else stdenv.mkDerivation rec { ''} if [ -n "$doInstallCheck" ]; then - $CC -Wall -std=c99 -D_POSIX_C_SOURCE=200809L -O3 test.c -o test + $CC -Wall -std=c99 \ + ${lib.optionalString (!stdenv.isDarwin) "-D_GNU_SOURCE"} \ + -O3 test.c -o test fi runHook postBuild diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index e33199402c4b..a59bc1bbaa32 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -84,6 +84,13 @@ static const char * rewrite(const char * path, char * buf) return path; } +static char * rewrite_non_const(char * path, char * buf) +{ + // as long as the argument `path` is non-const, we can consider discarding + // the const qualifier of the return value to be safe. + return (char *)rewrite(path, buf); +} + static int open_needs_mode(int flags) { #ifdef O_TMPFILE @@ -378,3 +385,61 @@ WRAPPER(int, rmdir)(const char *path) return rmdir_real(rewrite(path, buf)); } WRAPPER_DEF(rmdir) + +static void copy_temp_wildcard(char * dest, char * src, int suffixlen) { + int dest_len = strnlen(dest, PATH_MAX); + int src_len = strnlen(src, PATH_MAX); + memcpy(dest + dest_len - (6 + suffixlen), src + src_len - (6 + suffixlen), 6); +} + +WRAPPER(int, mkstemp)(char *template) +{ + int (*mkstemp_real) (char *template) = LOOKUP_REAL(mkstemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkstemp_real(rewritten); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return retval; +} +WRAPPER_DEF(mkstemp) + +WRAPPER(int, mkostemp)(char *template, int flags) +{ + int (*mkostemp_real) (char *template, int flags) = LOOKUP_REAL(mkostemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkostemp_real(rewritten, flags); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return retval; +} +WRAPPER_DEF(mkostemp) + +WRAPPER(int, mkstemps)(char *template, int suffixlen) +{ + int (*mkstemps_real) (char *template, int suffixlen) = LOOKUP_REAL(mkstemps); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkstemps_real(rewritten, suffixlen); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, suffixlen); + } + return retval; +} +WRAPPER_DEF(mkstemps) + +WRAPPER(int, mkostemps)(char *template, int suffixlen, int flags) +{ + int (*mkostemps_real) (char *template, int suffixlen, int flags) = LOOKUP_REAL(mkostemps); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkostemps_real(rewritten, suffixlen, flags); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, suffixlen); + } + return retval; +} +WRAPPER_DEF(mkostemps) diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/build-support/libredirect/test.c index c546a8958288..f15b44ff3d86 100644 --- a/pkgs/build-support/libredirect/test.c +++ b/pkgs/build-support/libredirect/test.c @@ -1,9 +1,11 @@ #include #include #include +#include #include #include #include +#include #include #include @@ -43,11 +45,25 @@ void test_subprocess(void) { assert(system(SUBTEST) == 0); } +void assert_mktemp_path( + const char * orig_prefix, + const char * orig_suffix, + const char * updated +) { + // prefix unchanged + assert(strncmp(updated, orig_prefix, strlen(orig_prefix)) == 0); + // wildcards replaced + assert(strcmp(updated + strlen(orig_prefix), "XXXXXX") != 0); + // suffix unchanged + assert(strcmp(updated + strlen(orig_prefix) + 6, orig_suffix) == 0); +} + int main(int argc, char *argv[]) { FILE *testfp; int testfd; struct stat testsb; + char buf[PATH_MAX]; testfp = fopen(TESTPATH, "r"); assert(testfp != NULL); @@ -77,6 +93,30 @@ int main(int argc, char *argv[]) #endif assert(unlinkat(123, TESTDIR "/dir-mkdirat", AT_REMOVEDIR) == 0); + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + testfd = mkstemp(buf); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", "", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + testfd = mkostemp(buf, 0); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", "", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX.test", PATH_MAX); + testfd = mkstemps(buf, strlen(".test")); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", ".test", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX.test", PATH_MAX); + testfd = mkostemps(buf, strlen(".test"), 0); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", ".test", buf); + close(testfd); + test_spawn(); test_system(); From d38832ace04e150c85e681ece903517cd95a5baa Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 16 Jan 2022 22:37:37 +0000 Subject: [PATCH 058/703] libredirect: add support for mkdtemp --- pkgs/build-support/libredirect/libredirect.c | 16 ++++++++++++++++ pkgs/build-support/libredirect/test.c | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index a59bc1bbaa32..07eca43810ca 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -443,3 +443,19 @@ WRAPPER(int, mkostemps)(char *template, int suffixlen, int flags) return retval; } WRAPPER_DEF(mkostemps) + +WRAPPER(char *, mkdtemp)(char *template) +{ + char * (*mkdtemp_real) (char *template) = LOOKUP_REAL(mkdtemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + char * retval = mkdtemp_real(rewritten); + if (retval == NULL) { + return retval; + }; + if (rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return template; +} +WRAPPER_DEF(mkdtemp) diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/build-support/libredirect/test.c index f15b44ff3d86..012e4aa4b283 100644 --- a/pkgs/build-support/libredirect/test.c +++ b/pkgs/build-support/libredirect/test.c @@ -117,6 +117,10 @@ int main(int argc, char *argv[]) assert_mktemp_path(TESTDIR "/temp", ".test", buf); close(testfd); + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + assert(mkdtemp(buf) == buf); + assert_mktemp_path(TESTDIR "/temp", "", buf); + test_spawn(); test_system(); From 86783a69c22e7d8434d1d3d94a95134510d5239c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 16 Jan 2022 23:09:14 +0000 Subject: [PATCH 059/703] libredirect: add support for mktemp --- pkgs/build-support/libredirect/libredirect.c | 16 ++++++++++++++++ pkgs/build-support/libredirect/test.c | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index 07eca43810ca..1222d2ee75c6 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -459,3 +459,19 @@ WRAPPER(char *, mkdtemp)(char *template) return template; } WRAPPER_DEF(mkdtemp) + +WRAPPER(char *, mktemp)(char *template) +{ + char * (*mktemp_real) (char *template) = LOOKUP_REAL(mktemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + char * retval = mktemp_real(rewritten); + if (retval == NULL) { + return retval; + }; + if (rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return template; +} +WRAPPER_DEF(mktemp) diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/build-support/libredirect/test.c index 012e4aa4b283..144e6d3d66dd 100644 --- a/pkgs/build-support/libredirect/test.c +++ b/pkgs/build-support/libredirect/test.c @@ -121,6 +121,10 @@ int main(int argc, char *argv[]) assert(mkdtemp(buf) == buf); assert_mktemp_path(TESTDIR "/temp", "", buf); + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + assert(mktemp(buf) == buf); + assert_mktemp_path(TESTDIR "/temp", "", buf); + test_spawn(); test_system(); From 8dd2546e75caa3cefb147a4443eac68019d4d988 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 19 Jan 2022 04:14:10 +0000 Subject: [PATCH 060/703] glibc: 2.33-62 -> 2.33-71 https://sourceware.org/bugzilla/show_bug.cgi?id=22542 https://nvd.nist.gov/vuln/detail/CVE-2022-23219 https://sourceware.org/bugzilla/show_bug.cgi?id=28768 https://nvd.nist.gov/vuln/detail/CVE-2022-23218 --- .../libraries/glibc/2.33-master.patch.gz | Bin 69704 -> 78002 bytes pkgs/development/libraries/glibc/common.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index aecf1550feffdb6cce55dad4088b4f6f0fe6dbae..fd78d3a5e8a86a00658b8049fb2ec5bf76a09e0f 100644 GIT binary patch delta 8877 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 delta 513 zcmdn=kmbYzmWC~iVSM$yv9a0B1|qfZ_MZsOTqt~*b?pZ8@EbSSTz603J0;?5*o$3@ zw449_y4x?Id+yryTSr#^JaA`rbrIjZMf>%)IdN$Q8an>G?(mi`@Zd_PXPgOJ4onZO z`g+Ou>pZunYh6DNz0t7X4#_UQu;#@qm;X%LA9}L)1ufVkbv^n<-s4#lpRcVyvX{NC zEp_1=hWT^OgzcSHWOn!1y`J{tQ>QObI)C!aUi+Gr3!ap0=~w>d*r8pvbL)Y9Oj=V6 z^&eX&{av_M^jq(1k1A8K1dFM)y4#Dqd&^F)ySjVF%8$VXXI$C}7MW~u77;BzG-J!9 zHCZvz*BbuyEc>iA)pvg&*QG+q8NxfZ=1#0{Ha$Jn^z95&-bb66-wEwm%sKzJ{gb?O zCbz;{#i#5q9_NpJbF{nSwyc)K)!m<_*ZnzuvRrrJ(r%8UE@xsgm!_(nwF%hyWhvj% zdG6h3W<ja~)!K!gzW37)zmD>^b^rL_LPPSq%AN8ei4r+mrHSp z!H^@h@=>M#5|kR7KXku7u%pLL@L{wbhq0FuL%*g)|Kv~A{EX)-c=joKGaSg;7j?Ap zR?afrM1~*Nd+nwyIQSz`(*9w{?Ir8Am$Znds?;#wKg~TsOGCD$lIi!_lRV{LojR&? d@0Iwfoi?2*yx7O%v5Vk8hQL~(Y>peu3;>ja1Zn^P diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 1bc5bf08ee46..7cf5f8c536bc 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.33"; - patchSuffix = "-62"; + patchSuffix = "-71"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-62-gc493f6a0e4 + glibc-2.33-71-gac148bdd88 $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. From aea6dc90dc40f58f6ea2d83ddee27eb2dc214923 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Jan 2022 05:48:59 +0000 Subject: [PATCH 061/703] networkmanager: 1.32.12 -> 1.34.0 --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index ac261f83d570..67cd874d6fd4 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.32.12"; + version = "1.34.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-qKs2oKUC/nPNjjustlhfl/u5Tr73nids268Rwz/49Us="; + sha256 = "sha256-gZeV0ImQdiBPVnJCGljxsdnjk1Nu6Hu4RLkR5iQ78L0="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From 7a3b6ff951dbef6c6ff3e02a3a895fe468480435 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 19 Jan 2022 09:31:53 -0800 Subject: [PATCH 062/703] s2n-tls: 1.3.0 -> 1.3.4 * s2n-tls: 1.3.0 -> 1.3.1 (#151273) * s2n-tls: 1.3.1 -> 1.3.4 Co-authored-by: Renaud --- pkgs/development/libraries/s2n-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 35a37fbddb86..395e5d0c75d6 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.0"; + version = "1.3.4"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gd91thIcJO6Bhn1ENkW0k2iDzu1CvSYwWVv0VEM9umU="; + hash = "sha256-/kZI/NOZO8T5jlG9Qtfr14aCJDKrP7wEQLgJ6qe9VzY="; }; nativeBuildInputs = [ cmake ]; From 8e49e6168afb1c2e61b3cdf676b09b3e72705d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Wygoda?= Date: Mon, 17 Jan 2022 21:42:34 +0100 Subject: [PATCH 063/703] modemmanager: 1.18.2 -> 1.18.4 Since release 1.18.4, the ModemManager daemon no longer automatically performs the FCC unlock procedure by default. The user must, under their own responsibility, enable the automatic FCC unlock as shipped by ModemManager. --- .../from_md/release-notes/rl-2205.section.xml | 11 +++++++++++ .../doc/manual/release-notes/rl-2205.section.md | 6 ++++++ .../services/networking/networkmanager.nix | 17 +++++++++++++++++ pkgs/tools/networking/modemmanager/default.nix | 4 ++-- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index ce45b0d79775..79fc675ff0ce 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -623,6 +623,17 @@ warning. + + + The option + services.networking.networkmanager.enableFccUnlock + was added to support FCC unlock procedures. Since release + 1.18.4, the ModemManager daemon no longer automatically + performs the FCC unlock procedure by default. See + the + docs for more details. + + diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 25b3ada2c563..90b6d39c6052 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -214,4 +214,10 @@ In addition to numerous new and upgraded packages, this release has the followin Reason is that the old name has been deprecated upstream. Using the old option name will still work, but produce a warning. +- The option + [services.networking.networkmanager.enableFccUnlock](#opt-services.networking.networkmanager.enableFccUnlock) + was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager + daemon no longer automatically performs the FCC unlock procedure by default. See + [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details. + diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 73e63e2ee99b..a9801036b00c 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -384,6 +384,17 @@ in { so you don't need to to that yourself. ''; }; + + enableFccUnlock = mkOption { + type = types.bool; + default = false; + description = '' + Enable FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer + automatically performs the FCC unlock procedure by default. See + the docs + for more details. + ''; + }; }; }; @@ -438,7 +449,13 @@ in { "NetworkManager/VPN/nm-sstp-service.name".source = "${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name"; + } + // optionalAttrs cfg.enableFccUnlock + { + "ModemManager/fcc-unlock.d".source = + "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/*"; + } // optionalAttrs (cfg.appendNameservers != [] || cfg.insertNameservers != []) { "NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 299342197897..126b3b513a86 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.18.2"; + version = "1.18.4"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-N0vhWK4cH7OKKe7xzDzfif81NrSP8TINIIqyBOpsX4o="; + sha256 = "sha256-EfuXD2Pi2ojfS22HWeTuZJlExRUkS5eb9Qp6bfHX8Zk="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; From fa8354bd59396b9badb59fc2a97c687aa5cbd60b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Jan 2022 13:15:43 +0000 Subject: [PATCH 064/703] rpcsvc-proto: 1.4.2 -> 1.4.3 --- pkgs/tools/misc/rpcsvc-proto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix index 400a63f7dfe3..4b56dec9d521 100644 --- a/pkgs/tools/misc/rpcsvc-proto/default.nix +++ b/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rpcsvc-proto"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "006l1f824r9bcbwn1s1vbs33cdwhs66jn6v97yas597y884y40z9"; + sha256 = "sha256-DXRLEpOanWcxCSTC8OxEw5SWKpgFz7oTPukzfnPrAOk="; }; outputs = [ "out" "man" ]; From 95edf58e150f60137b9c9ebca423d9cf281e88ee Mon Sep 17 00:00:00 2001 From: embr Date: Thu, 20 Jan 2022 15:00:19 +0100 Subject: [PATCH 065/703] pcre2: 10.37 -> 10.39 --- pkgs/development/libraries/pcre2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 724a1b1247a2..8393cb8c5910 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.37"; + version = "10.39"; src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-TZWpbouAUpiTtFYr4SZI15i5V7G6Gq45YGu8KrlW0nA="; + hash = "sha256-DwPK9X+B2f82KsKM04nAVewr8GeNJ3NJoaS+4ArW1EA="; }; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 From db71beb1b264ece6c18057831ae9f10f2554991a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Jan 2022 14:24:48 +0000 Subject: [PATCH 066/703] rav1e: 0.5.0 -> 0.5.1 --- pkgs/tools/video/rav1e/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index e35057fb888f..ed6a8f542343 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -4,14 +4,14 @@ let rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; in rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.5.0"; + version = "0.5.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-3g2wqQJk26KUfzmneKdTxfNSRI/ioMa5MR6AEeR7eKs="; + sha256 = "sha256-v2i/dMWos+nB3cRDOkROSOPb1ONRosbmp9RDZI2DLeI="; }; - cargoSha256 = "sha256-sPUAWQj8UDHV7IvYnerASltSPPGVB7f1tThqFYBu6t4="; + cargoSha256 = "sha256-V9QbztkFj3t5yBV+yySysDy3Q6IUY4gNzBL8h23aEg4="; nativeBuildInputs = [ nasm cargo-c ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 6c92b6516a43803e988ec962eae163bfb315b420 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 18 Nov 2021 12:36:15 +0000 Subject: [PATCH 067/703] qemu: 6.1.0 -> 6.2.0 QEMU now supports automatically detecting which audio drivers to build, so we don't need to pass --audio-drv-list anymore. pkgsMusl.qemu* doesn't build at the moment because of dependency issues, but with a lot of hacks I was able to do enough of a build to be confident the changes to patches etc. are correct for Musl. --- .../virtualization/qemu/default.nix | 65 +------------------ .../virtualization/qemu/sigrtminmax.patch | 30 --------- 2 files changed, 3 insertions(+), 92 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/sigrtminmax.patch diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 059057bc497b..4ff96a973e57 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -33,24 +33,16 @@ , nixosTestRunner ? false }: -let - audio = lib.optionalString alsaSupport "alsa," - + lib.optionalString pulseSupport "pa," - + lib.optionalString sdlSupport "sdl," - + lib.optionalString jackSupport "jack,"; - -in - stdenv.mkDerivation rec { pname = "qemu" + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f"; + sha256 = "0iavlsy9hin8k38230j8lfmyipx3965zljls1dp34mmc8n75vqb8"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -101,55 +93,7 @@ stdenv.mkDerivation rec { sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2"; revert = true; }) - (fetchpatch { - name = "CVE-2021-3713.patch"; # remove with next release - url = "https://gitlab.com/qemu-project/qemu/-/commit/13b250b12ad3c59114a6a17d59caf073ce45b33a.patch"; - sha256 = "0lkzfc7gdlvj4rz9wk07fskidaqysmx8911g914ds1jnczgk71mf"; - }) - # Fixes a crash that frequently happens in some setups that share /nix/store over 9p like nixos tests - # on some systems. Remove with next release. - (fetchpatch { - name = "fix-crash-in-v9fs_walk.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/f83df00900816476cca41bb536e4d532b297d76e.patch"; - sha256 = "sha256-LYGbBLS5YVgq8Bf7NVk7HBFxXq34NmZRPCEG79JPwk8="; - }) - # Fixes an io error on discard/unmap operation for aio/file backend. Remove with next release. - (fetchpatch { - name = "fix-aio-discard-return-value.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch"; - sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M="; - }) - # Fixes managedsave (snapshot creation) with QXL video device. Remove with next release. - (fetchpatch { - name = "qxl-fix-pre-save-logic.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch"; - sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8="; - }) - # Fixes socket_sockaddr_to_address_unix assertion errors in some setups. Remove with next release. - (fetchpatch { - name = "fix-unix-socket-path-copy-again.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/118d527f2e4baec5fe8060b22a6212468b8e4d3f.patch"; - sha256 = "sha256-ox+JSpc0pqd3bMi5Ot7ljQyk70SX8g+BLufR06mZPps="; - }) - ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch - ++ lib.optionals stdenv.hostPlatform.isMusl [ - ./sigrtminmax.patch - (fetchpatch { - url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch"; - sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; - }) - ] ++ lib.optionals stdenv.isDarwin [ - # The Hypervisor.framework support patch converted something that can be applied: - # * https://patchwork.kernel.org/project/qemu-devel/list/?series=548227 - # The base revision is whatever commit there is before the series starts: - # * https://github.com/patchew-project/qemu/commits/patchew/20210916155404.86958-1-agraf%40csgraf.de - # The target revision is what patchew has as the series tag from patchwork: - # * https://github.com/patchew-project/qemu/releases/tag/patchew%2F20210916155404.86958-1-agraf%40csgraf.de - (fetchpatch { - url = "https://github.com/patchew-project/qemu/compare/7adb961995a3744f51396502b33ad04a56a317c3..d2603c06d9c4a28e714b9b70fe5a9d0c7b0f934d.diff"; - sha256 = "sha256-nSi5pFf9+EefUmyJzSEKeuxOt39ztgkXQyUB8fTHlcY="; - }) - ]; + ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; postPatch = '' # Otherwise tries to ensure /var/run exists. @@ -180,12 +124,9 @@ stdenv.mkDerivation rec { --replace '$source_path/VERSION' '$source_path/QEMU_VERSION' substituteInPlace meson.build \ --replace "'VERSION'" "'QEMU_VERSION'" - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H" ''; configureFlags = [ - "--audio-drv-list=${audio}" "--disable-strip" # We'll strip ourselves after separating debug info. "--enable-docs" "--enable-tools" diff --git a/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/pkgs/applications/virtualization/qemu/sigrtminmax.patch deleted file mode 100644 index 41050447ac64..000000000000 --- a/pkgs/applications/virtualization/qemu/sigrtminmax.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Fri, 17 Aug 2018 00:22:35 -0500 -Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0 - ---- - linux-user/signal.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/linux-user/signal.c b/linux-user/signal.c -index 602b631b92..87f9240134 100644 ---- a/linux-user/signal.c -+++ b/linux-user/signal.c -@@ -26,6 +26,13 @@ - #include "trace.h" - #include "signal-common.h" - -+#ifndef __SIGRTMIN -+#define __SIGRTMIN 32 -+#endif -+#ifndef __SIGRTMAX -+#define __SIGRTMAX (NSIG-1) -+#endif -+ - struct target_sigaltstack target_sigaltstack_used = { - .ss_sp = 0, - .ss_size = 0, --- -2.18.0 - From 464d6108b0c5fefbf881a077823a3fbd1d6d0416 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 1 Dec 2021 18:42:52 +0000 Subject: [PATCH 068/703] Revert "qemu, runInLinuxVM: change default cpu to qemu64" This reverts commit af180d554b5a81878cd030f65a470f56116c7566. The bug we were working around with this change has been fixed in QEMU 6.2.0. --- nixos/lib/qemu-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 964814e8c602..20bbe9ff5d99 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -22,7 +22,7 @@ rec { else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; From 3f76d236af600c777bf12f5d6e52c246c59808b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Tue, 4 Jan 2022 15:02:02 +0100 Subject: [PATCH 069/703] lzip: License is GPL-2 or later According to the homepage and `COPYING` file inside the source archive. --- pkgs/tools/compression/lzip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index aa6b6d31a897..55bdce538f96 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/lzip/lzip.html"; description = "A lossless data compressor based on the LZMA algorithm"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; } From 076314a1744567a39b5e4887b913479830c420d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:23:32 +0100 Subject: [PATCH 070/703] lzip: simplify configureFlags It is not an issue if $CXX variable is always set to an absolute value, there is no need to set it conditionally. --- pkgs/tools/compression/lzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 55bdce538f96..c06a6f5eaefc 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { "CPPFLAGS=-DNDEBUG" "CFLAGS=-O3" "CXXFLAGS=-O3" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "CXX=${stdenv.cc.targetPrefix}c++"; + "CXX=${stdenv.cc.targetPrefix}c++" + ]; setupHook = ./lzip-setup-hook.sh; From beac526f0d16904a2690ed8882ecb88e895cb9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:25:08 +0100 Subject: [PATCH 071/703] lzip: nominate myself as maintainer --- pkgs/tools/compression/lzip/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index c06a6f5eaefc..17abb6503c9b 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -28,10 +28,11 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = "https://www.nongnu.org/lzip/lzip.html"; description = "A lossless data compressor based on the LZMA algorithm"; license = lib.licenses.gpl2Plus; + maintainers = with maintainers; [ vlaci ]; platforms = lib.platforms.all; }; } From 8c3f139a9ae9ad974d61d172a482d596687ea920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Tue, 4 Jan 2022 15:03:45 +0100 Subject: [PATCH 072/703] lziprecover: init at 1.22 Companion package to `lzip` --- .../tools/compression/lziprecover/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/compression/lziprecover/default.nix diff --git a/pkgs/tools/compression/lziprecover/default.nix b/pkgs/tools/compression/lziprecover/default.nix new file mode 100644 index 000000000000..0d8a700e1622 --- /dev/null +++ b/pkgs/tools/compression/lziprecover/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, lzip }: + +stdenv.mkDerivation rec { + pname = "lziprecover"; + version = "1.22"; + + src = fetchurl { + url = "mirror://savannah/lzip/lziprecover/${pname}-${version}.tar.gz"; + sha256 = "sha256-/ZWKCXX3cpxE87eE5WaJH3NsPcaDdNvSFJ7mkqFtCGI="; + }; + + configureFlags = [ + "CPPFLAGS=-DNDEBUG" + "CFLAGS=-O3" + "CXXFLAGS=-O3" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + doCheck = true; + checkInputs = [ lzip ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.nongnu.org/lzip/lziprecover.html"; + description = "Data recovery tool for lzip compressed files"; + license = lib.licenses.gpl2Plus; + maintainers = with maintainers; [ vlaci ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43495799e3e3..10f08b7df1c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7544,6 +7544,8 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; + lziprecover = callPackage ../tools/compression/lziprecover { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { openimagedenoise = openimagedenoise_1_2_x; }; From 89f2ffcf565d63b16ba4ef1fc539de1c4011c3bb Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Thu, 20 Jan 2022 23:05:37 +0100 Subject: [PATCH 073/703] rustc: 1.58.0 -> 1.58.1 --- pkgs/development/compilers/rust/1_58.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/1_58.nix b/pkgs/development/compilers/rust/1_58.nix index 73f4d2ea8b17..c854bfdd37a4 100644 --- a/pkgs/development/compilers/rust/1_58.nix +++ b/pkgs/development/compilers/rust/1_58.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.58.0"; - rustcSha256 = "sha256-CtUxoy88LplrkyLGtyYqnP5Vfkn/M2Ot6ge1dRBs13A="; + rustcVersion = "1.58.1"; + rustcSha256 = "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; From 87e4cf09dcc972ee78af4e1d388214c1ee267af5 Mon Sep 17 00:00:00 2001 From: schnusch Date: Thu, 20 Jan 2022 18:26:04 +0100 Subject: [PATCH 074/703] mariadb-connector-c: remove broken src url --- pkgs/servers/sql/mariadb/connector-c/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 3f0697bd2cc2..dbf8e36e9e7d 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -11,10 +11,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - urls = [ - "https://downloads.mariadb.org/f/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz" - "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz" - ]; + url = "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"; inherit sha256; }; From db051013edf143dd6cc37422e9e01ab069424561 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 21 Jan 2022 02:40:44 +0100 Subject: [PATCH 075/703] mariadb-connector-c: 3.2.3 -> 3.2.5 https://mariadb.com/kb/en/mariadb-connector-c-324-release-notes/ https://kb-mirror.mariadb.com/kb/en/mariadb-connector-c-325-release-notes/ --- pkgs/servers/sql/mariadb/connector-c/3_2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/connector-c/3_2.nix b/pkgs/servers/sql/mariadb/connector-c/3_2.nix index 8b1c8b04bdce..1e9884eb7333 100644 --- a/pkgs/servers/sql/mariadb/connector-c/3_2.nix +++ b/pkgs/servers/sql/mariadb/connector-c/3_2.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.2.3"; - sha256 = "1x1i4ck4c3sgkw083v02zk3rbkm5h0x1vl4m58j95q1qcijkiamn"; + version = "3.2.5"; + sha256 = "0w0fimdiiqrrm012iflz8l4rnafryq7y0qqijzxn7nwzxhm9jsr9"; }) From 3f471afb632637305b69016a6a1d0b28b4e040f6 Mon Sep 17 00:00:00 2001 From: Renaud Date: Fri, 21 Jan 2022 10:34:20 +0100 Subject: [PATCH 076/703] =?UTF-8?q?x265:=203.4=20=E2=86=92=203.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (#154347) * Lib update * Refactor to eliminate code duplication and crust * Don't use mkDerivation to build 10bits and 12bits static libs as we don't want to install them in the nix store forever (only needed during the build) * Enable check phase when possible * Split headers into a "dev" output * Use SPDX 3.0 license identifier --- pkgs/development/libraries/x265/default.nix | 167 ++++++++++++-------- 1 file changed, 101 insertions(+), 66 deletions(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 4610aa5309fb..8ddcedf198b5 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,103 +1,138 @@ -{ lib, stdenv, fetchFromBitbucket, cmake, nasm, numactl -, numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms -, debugSupport ? false # Run-time sanity checks (debugging) -, werrorSupport ? false # Warnings as errors -, ppaSupport ? false # PPA profiling instrumentation -, vtuneSupport ? false # Vtune profiling instrumentation -, custatsSupport ? false # Internal profiling of encoder work +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, nasm + +# NUMA support enabled by default on NUMA platforms: +, numaSupport ? (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64)) +, numactl + +# Multi bit-depth support (8bit+10bit+12bit): +, multibitdepthSupport ? (stdenv.is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) + +# Other options: , cliSupport ? true # Build standalone CLI application -, unittestsSupport ? false # Unit tests +, custatsSupport ? false # Internal profiling of encoder work +, debugSupport ? false # Run-time sanity checks (debugging) +, ppaSupport ? false # PPA profiling instrumentation +, unittestsSupport ? (!stdenv.is32bit) # Unit tests - only testing x64 assembly +, vtuneSupport ? false # Vtune profiling instrumentation +, werrorSupport ? false # Warnings as errors }: let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; - inherit (stdenv) is64bit; - cmakeFlagsAll = [ - "-DSTATIC_LINK_CRT=OFF" + cmakeCommonFlags = [ + "-Wno-dev" + (mkFlag custatsSupport "DETAILED_CU_STATS") (mkFlag debugSupport "CHECKED_BUILD") (mkFlag ppaSupport "ENABLE_PPA") (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag unittestsSupport "ENABLE_TESTS") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" ]; - version = "3.4"; + cmakeStaticLibFlags = [ + "-DHIGH_BIT_DEPTH=ON" + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DEXPORT_C_API=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ]; - src = fetchFromBitbucket { - owner = "multicoreware"; - repo = "x265_git"; - rev = version; - sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; - }; - - buildLib = has12Bit: stdenv.mkDerivation rec { - name = "libx265-${if has12Bit then "12" else "10"}-${version}"; - inherit src; - - postPatch = '' - sed -i 's/unknown/${version}/g' source/cmake/version.cmake - sed -i 's/0.0/${version}/g' source/cmake/version.cmake - ''; - - cmakeLibFlags = [ - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DENABLE_HDR10_PLUS=ON" - "-DEXPORT_C_API=OFF" - "-DHIGH_BIT_DEPTH=ON" - ]; - cmakeFlags = [(mkFlag has12Bit "MAIN12")] ++ cmakeLibFlags ++ cmakeFlagsAll; - - preConfigure = '' - cd source - ''; - - nativeBuildInputs = [cmake nasm] ++ lib.optional numaSupport numactl; - }; - - libx265-10 = buildLib false; - libx265-12 = buildLib true; in stdenv.mkDerivation rec { pname = "x265"; - inherit version src; + version = "3.5"; + + outputs = [ "out" "dev" ]; + + # Check that x265Version.txt contains the expected version number + # whether we fetch a source tarball or a tag from the git repo + src = fetchurl { + url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${version}.tar.gz"; + hash = "sha256-5wozNcrKy7oLOiDsb+zWeDkyKI68gWOtdLzJYGR3yug="; + }; + + sourceRoot = "x265_${version}/source"; + + patches = [ + # More aliases for ARM platforms + do not force CLFAGS for ARM : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/arm-r1.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "1hgzq5vxkwh0nyikxjfz8gz3jvx2nq3yy12mz3fn13qvzdlb5ilp"; + }) + # use proper check to avoid undefined symbols when enabling assembly on ARM : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/neon.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "1mmshpbyldrfqxfmdajqal4l647zvlrwdai8pxw99qg4v8gajfii"; + }) + # More complete PPC64 matches : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/x265-3.3-ppc64.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "1mvw678xfm0vr59n5jilq56qzcgk1gmcip2afyafkqiv21nbms8c"; + }) + # Namespace functions for multi-bitdepth builds so that libraries are self-contained (and tests succeeds) : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/test-ns.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "0zg3g53l07yh7ar5c241x50y5zp7g8nh8rh63ad4bdpchpc2f52d"; + }) + ]; postPatch = '' - sed -i 's/unknown/${version}/g' source/cmake/version.cmake - sed -i 's/0.0/${version}/g' source/cmake/version.cmake + substituteInPlace cmake/Version.cmake \ + --replace "unknown" "${version}" \ + --replace "0.0" "${version}" ''; - cmakeFlags = [ + nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; + + # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted + # (we are in x265_/source/build) + preBuild = lib.optionalString (multibitdepthSupport) '' + cmake -S ../ -B ../build-10bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} + make -C ../build-10bits -j $NIX_BUILD_CORES + cmake -S ../ -B ../build-12bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} -DMAIN12=ON + make -C ../build-12bits -j $NIX_BUILD_CORES + ln -s ../build-10bits/libx265.a ./libx265-10.a + ln -s ../build-12bits/libx265.a ./libx265-12.a + ''; + + cmakeFlags = cmakeCommonFlags ++ [ + "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116 "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" - "-DENABLE_HDR10_PLUS=OFF" - ] ++ lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ - "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" - "-DLINKED_10BIT=ON" - "-DLINKED_12BIT=ON" + "-DENABLE_HDR10_PLUS=ON" ] ++ [ (mkFlag cliSupport "ENABLE_CLI") - ] ++ cmakeFlagsAll; + (mkFlag unittestsSupport "ENABLE_TESTS") + ] ++ lib.optionals (multibitdepthSupport) [ + "-DEXTRA_LIB=x265-10.a;x265-12.a" + "-DEXTRA_LINK_FLAGS=-L." + "-DLINKED_10BIT=ON" + "-DLINKED_12BIT=ON" + ]; - preConfigure = '' - cd source + doCheck = unittestsSupport; + checkPhase = '' + runHook preCheck + ./test/TestBench + runHook postCheck ''; postInstall = '' - rm $out/lib/*.a + rm -f ${placeholder "out"}/lib/*.a ''; - nativeBuildInputs = [ cmake nasm ] ++ lib.optional numaSupport numactl; - meta = with lib; { description = "Library for encoding H.265/HEVC video streams"; homepage = "https://www.x265.org/"; - license = licenses.gpl2; + changelog = "https://x265.readthedocs.io/en/master/releasenotes.html#version-${lib.strings.replaceStrings ["."] ["-"] version}"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; From 8a1b44741b08c9c06364056988f50713cf67928a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Jan 2022 10:40:18 +0000 Subject: [PATCH 077/703] librsvg: 2.52.4 -> 2.52.5 --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 8b1213e6377e..6d9de1856237 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.52.4"; + version = "2.52.5"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Zg7Ig2o6kVh7yThJIBMtTDjR0XGMZ/4WDFIT/k3sKSg="; + sha256 = "QHy7q1GBN+oYo/MiC+oYD77nXz5b1roQp6hiwab3TYI="; }; cargoVendorDir = "vendor"; From 7f881b8c63d141c302b697e7d103142e12307525 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Tue, 18 Jan 2022 22:02:24 +0100 Subject: [PATCH 078/703] p11-kit: 0.24.0 -> 0.24.1 * move binaries into bin output * install Bash shell completions * provides man pages --- .../development/libraries/flatpak/default.nix | 2 +- .../development/libraries/p11-kit/default.nix | 55 +++++++++++++++---- 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 40e07c590742..72b652e1be46 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { # Hardcode paths used by Flatpak itself. (substituteAll { src = ./fix-paths.patch; - p11kit = "${p11-kit.dev}/bin/p11-kit"; + p11kit = "${p11-kit.bin}/bin/p11-kit"; }) # Adapt paths exposed to sandbox for NixOS. diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 34a3788d7860..df6e364d2e9a 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,34 +1,61 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, which -, gettext, libffi, libiconv, libtasn1 +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, docbook-xsl-nons +, gtk-doc +, installShellFiles +, libxslt # for xsltproc +, pkg-config +, which +, libffi +, libiconv +, libintl +, libtasn1 }: stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "sha256-jvUzOhMvbq05SxQ+kjKQHDDMzNwo4U6nFHu3JjygJHw="; + hash = "sha256-1QIMEGBZsqLYU3v5ZswD5K9VcIGLBovJlC10lBHhH7c="; }; - outputs = [ "out" "dev"]; - outputBin = "dev"; + outputs = [ "out" "bin" "dev"]; - # for cross platform builds of p11-kit, libtasn1 in nativeBuildInputs + # For cross platform builds of p11-kit, libtasn1 in nativeBuildInputs # provides the asn1Parser binary on the hostPlatform needed for building. # at the same time, libtasn1 in buildInputs provides the libasn1 library # to link against for the target platform. - # hence, libtasn1 is required in both native and build inputs. - nativeBuildInputs = [ autoreconfHook pkg-config which libtasn1 ]; - buildInputs = [ gettext libffi libiconv libtasn1 ]; + # Hence, libtasn1 is required in both native and build inputs. + nativeBuildInputs = [ + autoreconfHook + docbook-xsl-nons + gtk-doc + installShellFiles + libtasn1 + libxslt.bin + pkg-config + which + ]; + + buildInputs = [ + libffi + libiconv + libintl + libtasn1 + ]; autoreconfPhase = '' NOCONFIGURE=1 ./autogen.sh ''; configureFlags = [ + "--enable-doc" "--sysconfdir=/etc" "--localstatedir=/var" "--with-trust-paths=${lib.concatStringsSep ":" [ @@ -53,6 +80,10 @@ stdenv.mkDerivation rec { "exampledir=${placeholder "out"}/etc/pkcs11" ]; + postInstall = '' + installShellCompletion --bash bash-completion/{p11-kit,trust} + ''; + meta = with lib; { description = "Library for loading and sharing PKCS#11 modules"; longDescription = '' @@ -61,6 +92,10 @@ stdenv.mkDerivation rec { PKCS#11 modules in such a way that they're discoverable. ''; homepage = "https://p11-glue.github.io/p11-glue/p11-kit.html"; + changelog = [ + "https://github.com/p11-glue/p11-kit/raw/${version}/NEWS" + "https://github.com/p11-glue/p11-kit/releases/tag/${version}" + ]; platforms = platforms.all; license = licenses.bsd3; }; From 3ec5a9f36b37774542fd49a75649b32f6bf3c540 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 22 Jan 2022 18:50:40 +0100 Subject: [PATCH 079/703] lib.licenses: add Imlib2 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index d305001a5c19..d07a6449b8fa 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -460,6 +460,11 @@ in mkLicense lset) ({ spdxId = "imagemagick"; }; + imlib2 = { + spdxId = "Imlib2"; + fullName = "Imlib2 License"; + }; + inria-compcert = { fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler"; url = "https://compcert.org/doc/LICENSE.txt"; From 02dcdf714b134441708fc4633ebebea3ed269ae7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:56:50 -0800 Subject: [PATCH 080/703] python3Packages.absl-py: 0.15.0 -> 1.0.0 --- pkgs/development/python-modules/absl-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 30a0e68dea0c..bda6c950d598 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.15.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81"; + sha256 = "ac511215c01ee9ae47b19716599e8ccfa746f2e18de72bdf641b79b22afa27ea"; }; propagatedBuildInputs = [ From 0a9f3ce2a5f0126dd26785f6eb7f83953e188782 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:04 -0800 Subject: [PATCH 081/703] python3Packages.aiobotocore: 1.4.2 -> 2.1.0 --- pkgs/development/python-modules/aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 9fbbbac43ef8..9988f1da26e6 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.4.2"; + version = "2.1.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c2f4ef325aaa839e9e2a53346b4c1c203656783a4985ab36fd4c2a9ef2dc1d2b"; + sha256 = "5fd4d7aefa0896fe4dd32815ead8a52ed5ccb8016c7c5743fe8ff71c3c074120"; }; # relax version constraints: aiobotocore works with newer botocore versions From 4e4fbd132f2c1962de3db35400458aa71cce84d9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:04 -0800 Subject: [PATCH 082/703] python3Packages.aiohttp-remotes: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/aiohttp-remotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 1867567178e4..3b44383082fb 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohttp-remotes"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "aiohttp_remotes"; inherit version; - sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174"; + sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c"; }; propagatedBuildInputs = [ From 76c889d67bf70bc43a2deb48707c5bb8ad71d3dc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:05 -0800 Subject: [PATCH 083/703] python3Packages.aioredis: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/aioredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 807b112772cf..5ea482278944 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "aioredis"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db"; + sha256 = "eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e"; }; propagatedBuildInputs = [ From 389840d3a11cfb04be4a97aab558b70ba5cd27b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:05 -0800 Subject: [PATCH 084/703] python3Packages.altair: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/altair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 6e686d9fc907..0d5dd95c8333 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "4.1.0"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0c99q5dy6f275yg1f137ird08wmwc1z8wmvjickkf2mvyka31p9y"; + sha256 = "d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026"; }; propagatedBuildInputs = [ From da8814dd160f8ad54ed8ff7861e8fad18958190e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:05 -0800 Subject: [PATCH 085/703] python3Packages.anonip: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/anonip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index 0663fddd6fb0..45a61a12bb07 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "anonip"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "DigitaleGesellschaft"; repo = "Anonip"; rev = "v${version}"; - sha256 = "0y5xqivcinp6pwx4whc8ca1n2wxrvff7a2lpbz2dhivilfanmljs"; + sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc"; }; propagatedBuildInputs = lib.optionals isPy27 [ ipaddress ]; From 33b02f6b53e64da0494d78a744290382f31e7ae2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:06 -0800 Subject: [PATCH 086/703] python3Packages.apache-airflow: 2.1.4 -> 2.2.3 --- pkgs/development/python-modules/apache-airflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 2fe6fe08ef18..4ac03a8820fb 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ , mkYarnPackage }: let - version = "2.1.4"; + version = "2.2.3"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "12nxjaz4afkq30s42x3rbsci8jiw2k5zjngsc8i190fasbacbnbs"; + sha256 = "02y3az7yj4g4qaamq5s1bcvy3knd6xmvnhbfqs3kbm51irkba1zq"; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. From 0b3eb6c60b9518217ce27433ee5ccf555c76591a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:06 -0800 Subject: [PATCH 087/703] python3Packages.apipkg: 1.5 -> 2.1.0 --- pkgs/development/python-modules/apipkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 5e7ae3860a93..241ddfaa11ab 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "apipkg"; - version = "1.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; + sha256 = "a4be31cf8081e660d2cdea6edfb8a0f39f385866abdcfcfa45e5a0887345cb70"; }; nativeBuildInputs = [ setuptools-scm ]; From 9da1d354fe927d5e16f21e90e340e84cc813eb25 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:06 -0800 Subject: [PATCH 088/703] python3Packages.approvaltests: 0.2.6 -> 3.3.2 --- pkgs/development/python-modules/approvaltests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 35e6c90f216d..5bb9a5bf9e8a 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, pyperclip }: buildPythonPackage rec { - version = "0.2.6"; + version = "3.3.2"; pname = "approvaltests"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = version; - sha256 = "1k1bj8q1qm89a8xm4az6qk4qswwmgxw5jpdjcxmf93zh5hrcy9h9"; + sha256 = "15blwjzd6nwh0kzxa9xxscxdn0vqwb1bax8d46wk01dcywdyd6ni"; }; propagatedBuildInputs = [ pyperclip ]; From 0a96f7bb99fa081d2b95a4c1def328db51e05b06 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:06 -0800 Subject: [PATCH 089/703] python3Packages.apsw: 3.36.0-r1 -> 3.37.0-r1 --- pkgs/development/python-modules/apsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 034e3e0df256..46ae3fc34e56 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.36.0-r1"; + version = "3.37.0-r1"; format = "setuptools"; disabled = isPyPy; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "sha256-kQqJqDikvEC0+PNhQxSNTcjQc+RwvaOSGz9VL3FCetg="; + sha256 = "0p6rlbk7p6hj5mbmk1a8phazw3ym6hf5103zkxzg4p1jgjgi0xpl"; }; buildInputs = [ From 28f61bf3a06ed6851633fd6b8428e0d1c3d2021a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:06 -0800 Subject: [PATCH 090/703] python3Packages.argcomplete: 1.12.3 -> 2.0.0 --- pkgs/development/python-modules/argcomplete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index cf2f92557206..0aa3e8c1b948 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.12.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445"; + sha256 = "6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20"; }; doCheck = false; # meant to be ran with interactive interpreter From 986559bac000f79d1897fe9cbd95225ad8a19417 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:06 -0800 Subject: [PATCH 091/703] python3Packages.argon2_cffi: 21.1.0 -> 21.3.0 --- pkgs/development/python-modules/argon2_cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index a40fb806845e..c27ae0ad6955 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "argon2_cffi"; - version = "21.1.0"; + version = "21.3.0"; src = fetchPypi { pname = "argon2-cffi"; inherit version; - sha256 = "sha256-9xC2EQPRofaSyj7L0Tc+KKpeVFrGJboGf/L+yhsruHA="; + sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; }; propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; From c3a7b1eca61bfd07692a55b40a587a4c28767648 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:07 -0800 Subject: [PATCH 092/703] python3Packages.asdf: 2.8.1 -> 2.8.3 --- pkgs/development/python-modules/asdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 363d8900163a..1a9ba2dd0963 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.8.1"; + version = "2.8.3"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bp3fME3FTa5vcj7qUoUEGqvuI2uwSpI13zDcFgWvbJw="; + sha256 = "de0f70ffb2e0d539461940d6f7529c3548541fa098d8edc37af256af61c09b44"; }; nativeBuildInputs = [ setuptools-scm ]; From b3d2c06cc3fe9080dbf06c43ad0e976e1ab19f00 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:07 -0800 Subject: [PATCH 093/703] python3Packages.astroid: 2.9.0 -> 2.9.3 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 101f84b4fcea..ab62a565ce67 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.9.0"; # Check whether the version is compatible with pylint + version = "2.9.3"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6.2"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sImWiWULZ1HS3JyQHfEhc4ZRZ6anOUTqZZGNIYj2MaY="; + sha256 = "1x77faggk1dgxy48ng31xj9h6p51w312kvk5zqgvd5f19nvznxyi"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b974e881da71e62a0452f093d5bc9db645881b2e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:07 -0800 Subject: [PATCH 094/703] python3Packages.astropy: 4.3.1 -> 5.0 --- pkgs/development/python-modules/astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 889c69d5313b..bbfc336213d2 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "astropy"; - version = "4.3.1"; + version = "5.0"; format = "pyproject"; disabled = !isPy3k; # according to setup.py src = fetchPypi { inherit pname version; - sha256 = "sha256-LTlRIjtOt/No/K2Mg0DSc3TF2OO2NaY2J1rNs481zVE="; + sha256 = "70203e151e13292586a817b4069ce1aad4643567aff38b1d191c173bc54f3927"; }; nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ]; From b2b767ba6789b5d29de0b90f266f72f8b86adcd8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:07 -0800 Subject: [PATCH 095/703] python3Packages.astroquery: 0.4.1 -> 0.4.5 --- pkgs/development/python-modules/astroquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index f7764149a663..8853b1e9e08d 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.4.1"; + version = "0.4.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0xpqrl9h7sg55mql38xsfpbz9rxsm3mxfha1biqyly1gmxpmd47a"; + sha256 = "20002f84b61fb11ceeae408a4cd23b379490e174054ec777f946df8a3f06be1b"; }; disabled = !isPy3k; From ca96a45646bdc797c8d6b6ec8a984d206e8b6070 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:07 -0800 Subject: [PATCH 096/703] python3Packages.asyncio-mqtt: 0.11.0 -> 0.11.1 --- pkgs/development/python-modules/asyncio_mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index fd8a52f5a6ae..0744f757e03a 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; src = fetchPypi { pname = "asyncio_mqtt"; inherit version; - sha256 = "sha256-uJown3bNA+pLJlorJcCjpMMFosX94gt/2tLAjIkuXLA="; + sha256 = "6fc2ec01288a6ee0df88fa5a2f18439c4f8a7fe926339e4ecdf874e8da4ce45a"; }; propagatedBuildInputs = [ From aca0ac6311b94b6043bf4d7dd4b940fc2063fdee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:07 -0800 Subject: [PATCH 097/703] python3Packages.async-timeout: 4.0.1 -> 4.0.2 --- pkgs/development/python-modules/async_timeout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index ae8bacc94415..2a67ed1d6710 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "4.0.1"; + version = "4.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uTDLFho5BC+SIvbvtzATmch+6rOUcn7FQ3kko21u71E="; + sha256 = "2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15"; }; propagatedBuildInputs = [ From 9f988e9faf45ed64a255c51da491922acc0282f3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:08 -0800 Subject: [PATCH 098/703] python3Packages.atpublic: 2.3 -> 3.0.1 --- pkgs/development/python-modules/atpublic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 8bf81556770a..13f9276f8f30 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "atpublic"; - version = "2.3"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d6b9167fc3e09a2de2d2adcfc9a1b48d84eab70753c97de3800362e1703e3367"; + sha256 = "bb072b50e6484490404e5cb4034e782aaa339fdd6ac36434e53c10791aef18bf"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ From bd90b6ba137ad4a350b8dcd5ebdb91a58870ced5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:08 -0800 Subject: [PATCH 099/703] python3Packages.awesomeversion: 21.11.0 -> 22.1.0 --- pkgs/development/python-modules/awesomeversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index f99407030cdd..1d5ead33ab2a 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.11.0"; + version = "22.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-qxN5AdLlzadG0/raeAyJ/37PLgYLndl1JQSVkgdLv/4="; + sha256 = "1z9b7bxd5spp2yvjka3ay44crrpgs7xk6x4ppnkhp6iw8zdkv1ks"; }; postPatch = '' From f517a2f7417cbc602a1d3f471c9e676e5705dbfe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:10 -0800 Subject: [PATCH 100/703] python3Packages.basemap: 1.2.1 -> 1.3.0 --- pkgs/development/python-modules/basemap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index c3d29d932442..30ca58fed319 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; - rev = "v${version}rel"; - sha256 = "13lw1iwa8hadpvqdgb06nh881l8c17awzvvwbfwblvb9q9s0lnzp"; + rev = "v${version}"; + sha256 = "0nwpd6zx2q2fc556ppz71ra6ad9z0d5bz8hcld64i91dcy0f0zs3"; }; propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; From b624b0d757cd0a6020feca3ed9fa4f73abc61909 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:11 -0800 Subject: [PATCH 101/703] python3Packages.bip_utils: 1.11.1 -> 2.1.0 --- pkgs/development/python-modules/bip_utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index 3d3c85eea3b4..a4430b655ce1 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "1.11.1"; + version = "2.1.0"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = pname; rev = "v${version}"; - sha256 = "0r8h979rklq7cvl0b449mfrx62dv367s31zgwfqn81kj72i3ndg4"; + sha256 = "1n677z6rvcny1vyfzwnvcmzbqp9m4kfpdjfvkf1q6310zr2ybp7m"; }; propagatedBuildInputs = [ ecdsa pysha3 ]; From 738d7d5e55c7491398e199ab041dc3eaaafd962b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:11 -0800 Subject: [PATCH 102/703] python3Packages.bleak: 0.14.0 -> 0.14.1 --- pkgs/development/python-modules/bleak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 431edac75dfa..2190b34410ec 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.14.0"; + version = "0.14.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b449cc63f769c2d219c67e23ffb9f3a5b5f23eb2d68d05878743dbed83a14360"; + sha256 = "9794685d25f8f71d48fef04e2ca8ce8cc243b070f5b08ed70e70ae98341d24bb"; }; postPatch = '' From 5727b4aa1de1818e58f703abdc74aa5708c470a1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:11 -0800 Subject: [PATCH 103/703] python3Packages.boto3: 1.20.21 -> 1.20.35 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index af358a61f181..c6fdc8c9981c 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.20.21"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.20.35"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "2fb05cbe81b9ce11d9394fc6c4ffa5fd1cceb114dc1d2887dc61081707e44522"; + sha256 = "42dd9fcb9e033ab19c9dfaeaba745ef9d2db6efe4e9f1e1f547b3e3e0b1f4a82"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From c5f8c730805a1866afb0b13acea1e07d1f1d86b6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:11 -0800 Subject: [PATCH 104/703] python3Packages.botocore: 1.23.21 -> 1.23.35 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 43fad7124553..6d5c11665c2c 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.23.21"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.23.35"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "d7f8e82cba38aa1e66015cab0a5ca3204503e90afc4695e97228e28329a14c04"; + sha256 = "5be6ba6c5ea71c256da8a5023bf9c278847c4b90fdb40f2c4c3bdb21ca11ff28"; }; propagatedBuildInputs = [ From cb9cc349a1307885821299380d9b2fbab8d93d11 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:12 -0800 Subject: [PATCH 105/703] python3Packages.cachelib: 0.3.0 -> 0.5.0 --- pkgs/development/python-modules/cachelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 0838558e116a..ed6f03fa5b0b 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.3.0"; + version = "0.5.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pallets"; repo = pname; rev = version; - sha256 = "sha256-ssyHNlrSrG8YHRS131jJtmgl6eMTNdet1Hf0nTxL8sM="; + sha256 = "0sry5kn52hc742400xff99zpij0dxlvbd5m8il7k9ihpywrfvzd5"; }; checkInputs = [ From 79e31ecc8b78cedaeac1852295df092d54a927e9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:12 -0800 Subject: [PATCH 106/703] python3Packages.cartopy: 0.20.1 -> 0.20.2 --- pkgs/development/python-modules/cartopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index d55c1e9b0c53..1ffc1049e0e2 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.20.1"; + version = "0.20.2"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "91f87b130e2574547a20cd634498df97d797abd12dcfd0235bc0cdbcec8b05e3"; + sha256 = "4d08c198ecaa50a6a6b109d0f14c070e813defc046a83ac5d7ab494f85599e35"; }; postPatch = '' From 800a0caebf844b34da25cb5c449891ccb54d12a7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:12 -0800 Subject: [PATCH 107/703] python3Packages.casbin: 1.15.2 -> 1.15.4 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 815bc8ae36cb..12ea06a5c4f7 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.15.2"; + version = "1.15.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0mrk6b16f4ds666qa4884kjjbmb55kpfvvqsznfmyg9iii6dir50"; + sha256 = "0vczml14dvvrj401r08d6b0rfn5p5kfm1wr0vrfi8rqk2z5x1w0g"; }; propagatedBuildInputs = [ From cd9a75390982351355d2b4c038c193b94761749d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:12 -0800 Subject: [PATCH 108/703] python3Packages.censys: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/censys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 8bf70f95c0f8..4a00155a4ec6 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.1"; + version = "2.1.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-S3sxYCGMg/O5ICr9z4NqjmpPCF7e5F8G2q2EX4bRN+8="; + sha256 = "0qxqd5ip98d6q1d48vcprpr38sa47ky3cr6lprd01nzibdmf2r2d"; }; nativeBuildInputs = [ From 12485530d6b7a5c90d7b046980db05ab385804ad Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:12 -0800 Subject: [PATCH 109/703] python3Packages.cfn-lint: 0.56.3 -> 0.56.4 --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 94a4ea5e10f2..3695ae9ebcb6 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.56.3"; + version = "0.56.4"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "12r0zxwidf4vdbbpzlhlmgc2as5bn45yf663f00iv6px0glq02zs"; + sha256 = "0li8zkdvmgfxqzqs1rvd48mwim0bhjwmxlywqxjix0a43kvkvh77"; }; postPatch = '' From dab7bd45f507de809852dd07181a4d2cb6f34a34 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:13 -0800 Subject: [PATCH 110/703] python3Packages.cheroot: 8.5.2 -> 8.6.0 --- pkgs/development/python-modules/cheroot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 6e9256ffacfe..4d46ec81ada0 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.5.2"; + version = "8.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f137d03fd5155b1364bea557a7c98168665c239f6c8cedd8f80e81cdfac01567"; + sha256 = "366adf6e7cac9555486c2d1be6297993022eff6f8c4655c1443268cca3f08e25"; }; nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; From b0df3864c20b53b0c31cbf2187d628847c393e3d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:13 -0800 Subject: [PATCH 111/703] python3Packages.cloudpickle: 1.6.0 -> 2.0.0 --- pkgs/development/python-modules/cloudpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index f525b6e7f1df..0e0debe93291 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "1.6.0"; + version = "2.0.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "9bc994f9e9447593bd0a45371f0e7ac7333710fcf64a4eb9834bf149f4ef2f32"; + sha256 = "5cd02f3b417a783ba84a4ec3e290ff7929009fe51f6405423cfccfadd43ba4a4"; }; buildInputs = [ pytest mock ]; From 0a91aae4aacd86a9f22ff974e8c476866e4dbdb3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:14 -0800 Subject: [PATCH 112/703] python3Packages.configargparse: 1.5.2 -> 1.5.3 --- pkgs/development/python-modules/configargparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 1bb036b97df5..3e345b3dcd41 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; rev = version; - sha256 = "1hgd0gfxycfnlddwsr8sl6ybxzp8rqhin16vphbl8q32wp5hhjd2"; + sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; }; checkInputs = [ From b8332cf00d179aa1c1a6b5eff74f8795fce826a8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:14 -0800 Subject: [PATCH 113/703] python3Packages.coverage: 5.5 -> 6.2 --- pkgs/development/python-modules/coverage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index f93d32d392f7..875b47ce50f9 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "5.5"; + version = "6.2"; src = fetchPypi { inherit pname version; - sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"; + sha256 = "e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"; }; # No tests in archive From bcb7974c44f65a5a305b5b52c04ab2b39e6627de Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:14 -0800 Subject: [PATCH 114/703] python3Packages.cupy: 9.6.0 -> 10.0.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 6336fc0bdc01..7d60e350a4c4 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "9.6.0"; + version = "10.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "22469ea1ad51ffbb4af2b139ed0820ac5d0b78f1265b2a095ed5e5d5299aab91"; + sha256 = "f54fb758746a21f3292deaa7de21e3204ff7ae1ef9c2bd5de2f67952ea51237e"; }; preConfigure = '' From a81ec01bb5e866d8e9a710155c7dfd15a3a51040 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:14 -0800 Subject: [PATCH 115/703] python3Packages.cwcwidth: 0.1.4 -> 0.1.6 --- pkgs/development/python-modules/cwcwidth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index ede96fc3b41d..c3778415e570 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cwcwidth"; - version = "0.1.4"; + version = "0.1.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1azrphpkcyggg38xvkfb9dpc4xmmm90p02kf8dkqd4d6j5w96aj8"; + sha256 = "1b31da599c9f0cf41f39ed10c1ceaa01d6024e31c6cd9aea2885b1f2a6d15fba"; }; nativeBuildInputs = [ cython ]; From 97570ca5bbb624573c99ff44128d0edde69ee860 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:15 -0800 Subject: [PATCH 116/703] python3Packages.datasets: 1.16.1 -> 1.17.0 --- pkgs/development/python-modules/datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index b4b60da17f9f..ab5e929818c6 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "sha256-5J2hhy52eZqVSaeJNIOM9RzZatq3aewAulS3OX76+Io="; + sha256 = "0bsk3jldvcxak64dhlxkqax7mf83z6qpwfgfk32rni1gpnz5pqbd"; }; propagatedBuildInputs = [ From 34c7a5fd0be6a1e056b6ae76929704a28e3a476f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:15 -0800 Subject: [PATCH 117/703] python3Packages.decorator: 5.1.0 -> 5.1.1 --- pkgs/development/python-modules/decorator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index 0c1889963157..e26c1a108188 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "5.1.0"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7"; + sha256 = "637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"; }; meta = with lib; { From e60c91a33faf7f6630f1df5aef602207c6e1f589 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:15 -0800 Subject: [PATCH 118/703] python3Packages.diff-cover: 5.5.0 -> 6.4.4 --- pkgs/development/python-modules/diff-cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 1751271a2221..e9735402fe33 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "5.5.0"; + version = "6.4.4"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "diff_cover"; inherit version; - sha256 = "e2d36131c13f571d9f5c4109b9e08b71ed00757eabec0156de74e33f6ef5627f"; + sha256 = "b1d782c1ce53ad4b2c5545f8b7aa799eb61a0b12a62b376a18e2313c6f2d77f1"; }; propagatedBuildInputs = [ From 0caa0ccd99c8f5847afe76a1ab6c38a7bcdb5e2e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:15 -0800 Subject: [PATCH 119/703] python3Packages.distlib: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/distlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index 1c565b3f158b..ec4e8ecdc6f5 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05"; + sha256 = "e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"; extension = "zip"; }; From e57fde956916fcf258ce8900b03bea9611c69071 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:15 -0800 Subject: [PATCH 120/703] python3Packages.distributed: 2021.11.2 -> 2021.12.0 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 6dfb531a78b6..08e38f2a1498 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.11.2"; + version = "2021.12.0"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "f86a01a2e1e678865d2e42300c47552b5012cd81a2d354e47827a1fd074cc302"; + sha256 = "c6119a2cf1fb2d8ac60337915bb9a790af6530afcb5d7a809a3308323b874714"; }; postPatch = '' From 10bbf7ff4a966e2a08e705031cc4d2bb28318133 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:16 -0800 Subject: [PATCH 121/703] python3Packages.django-auth-ldap: 3.0.0 -> 4.0.0 --- pkgs/development/python-modules/django-auth-ldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index ab329cd37aba..62aefed5913a 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "3.0.0"; + version = "4.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1f2d5c562d9ba9a5e9a64099ae9798e1a63840a11afe4d1c4a9c74121f066eaa"; + sha256 = "276f79e624ce083ce13f161387f65ff1c0efe83ef8a42f2b9830d43317b15239"; }; propagatedBuildInputs = [ ldap django ]; From 2fa674f1a17a9645202d1bd50ed49192314fbe8b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:16 -0800 Subject: [PATCH 122/703] python3Packages.djangoql: 0.16.0 -> 0.17.0 --- pkgs/development/python-modules/djangoql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index facfc2fafcdb..92469eb41207 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.16.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "23cea52eca76e605fa2f34b13ae8d2bf60240737ee9ed3f60c667a4f64d28adf"; + sha256 = "e8f06f1fc3a07dfabee75a99852693537805e580f21f3d81abe9e46269503438"; }; propagatedBuildInputs = [ ply ]; From 94142315185d558f72784f5216d10f73f91ddb67 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:17 -0800 Subject: [PATCH 123/703] python3Packages.django-widget-tweaks: 1.4.8 -> 1.4.12 --- .../python-modules/django-widget-tweaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix index 853e12327d32..63e575b63454 100644 --- a/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "django-widget-tweaks"; - version = "1.4.8"; + version = "1.4.12"; src = fetchFromGitHub { # package from Pypi missing runtests.py owner = "jazzband"; repo = pname; rev = version; - sha256 = "00w1ja56dc7cyw7a3mph69ax6mkch1lsh4p98ijdhzfpjdy36rbg"; + sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h"; }; checkPhase = "${python.interpreter} runtests.py"; From 54b80f30289d42b40c77779f4f1e81c023d3b41f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:17 -0800 Subject: [PATCH 124/703] python3Packages.downloader-cli: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/downloader-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/downloader-cli/default.nix b/pkgs/development/python-modules/downloader-cli/default.nix index e0c25c77e53c..9d99709c9166 100644 --- a/pkgs/development/python-modules/downloader-cli/default.nix +++ b/pkgs/development/python-modules/downloader-cli/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "downloader-cli"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "0gbbjxb9vf5g890cls3mwzl8lmcn6jkpgm5cbrif740mn2b4q228"; + sha256 = "0hjwy3qa6al6p35pv01sdl3szh7asf6vlmhwjbkpppn4zi239k0y"; }; propagatedBuildInputs = [ urllib3 ]; From b86f3cbcd71389f2cb6eccc0c1ff74413778513f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:17 -0800 Subject: [PATCH 125/703] python3Packages.dsmr-parser: 0.31 -> 0.32 --- pkgs/development/python-modules/dsmr-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index b666e4c210f5..e8a94fb5e859 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "0.31"; + version = "0.32"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "v${version}"; - sha256 = "sha256-A+fyAAV62Dg28RDiivKEjrC1bCXzkuIvpATR+oUytRU="; + sha256 = "0hi69gdcmsp5yaspsfbpc3x76iybg20cylxyaxm131fpd5wwan9l"; }; propagatedBuildInputs = [ From fd748545fcbe8ca002bcbfb3314185b649862fa1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:18 -0800 Subject: [PATCH 126/703] python3Packages.elasticsearch: 7.16.2 -> 7.16.3 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 601c5b68864d..73a3882927c2 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -12,11 +12,11 @@ buildPythonPackage (rec { # there's a clear path forward. See # https://github.com/elastic/elasticsearch-py/issues/1639 for more # info. - version = "7.16.2"; + version = "7.16.3"; src = fetchPypi { inherit pname version; - sha256 = "23ac0afb4398c48990e359ac73ab6963741bd05321345299c62d9d23e209eee2"; + sha256 = "8adf8bc351ed55df7296be1009d38a1c999c0abc7d8700fa88533f1ad6087c5e"; }; # Check is disabled because running them destroy the content of the local cluster! From 8fe34988f91e2b74aea3c6be9e700abd92272d10 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:18 -0800 Subject: [PATCH 127/703] python3Packages.enlighten: 1.10.1 -> 1.10.2 --- pkgs/development/python-modules/enlighten/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 8f58720bd264..3c786d869155 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984"; + sha256 = "7a5b83cd0f4d095e59d80c648ebb5f7ffca0cd8bcf7ae6639828ee1ad000632a"; }; propagatedBuildInputs = [ From d3b73ac79035ec1b236dfd528ce107ede7e7b2b0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:18 -0800 Subject: [PATCH 128/703] python3Packages.faker: 9.9.0 -> 11.3.0 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 28caec986dcc..048edf64d38f 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "9.9.0"; + version = "11.3.0"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-cidwOj2zbtgkEQhUdUREX0WqRdsvP2PohcubVpk4Pw4="; + hash = "sha256-rb5WfmTaahCX/qyraZAA4a0W4Xplkqjwrh7gt/vxmIc="; }; propagatedBuildInputs = [ From 0f8ff80baff39adbcc3e220858d7192cbb922503 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:19 -0800 Subject: [PATCH 129/703] python3Packages.feedgenerator: 1.9.2 -> 2.0.0 --- pkgs/development/python-modules/feedgenerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index c1e988ca769a..e07f36f105cb 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "feedgenerator"; - version = "1.9.2"; + version = "2.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sG1pQej9aiyecXkQeehsvno3iMciRKzAbwWTtJzaN5s="; + sha256 = "6836d456b8b0edbc5b6d3a42d1be852cebd43d2f28af4ff51789eb295f1860e2"; }; buildInputs = [ From c0054f2c8771eb8be5cab27c75847d01efc462ac Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:19 -0800 Subject: [PATCH 130/703] python3Packages.filelock: 3.3.0 -> 3.4.2 --- pkgs/development/python-modules/filelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index d5ccc117beff..8eaed65ca73c 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.3.0"; + version = "3.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8c7eab13dc442dc249e95158bcc12dec724465919bdc9831fdbf0660f03d1785"; + sha256 = "38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80"; }; nativeBuildInputs = [ From 3481203165925370bd5aeacaa2e4e3a2b851ed43 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:19 -0800 Subject: [PATCH 131/703] python3Packages.flask-appbuilder: 3.4.1 -> 3.4.3 --- pkgs/development/python-modules/flask-appbuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index afb81cc103bc..353f69b260c2 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "3.4.1"; + version = "3.4.3"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "c0830935077c4d06d57237ca4791fcabfc682fe3e315c1c9444a2bd6f94e7514"; + sha256 = "be1e2271cdd7c879d343f57060b50ac411346730df55b35ce242faadcab81c12"; }; # See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch From 62f9fc8c3fbabaf98787d8bde1b5ccf399b3f4bd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:19 -0800 Subject: [PATCH 132/703] python3Packages.flask-paginate: 2021.12.28 -> 2022.1.8 --- pkgs/development/python-modules/flask-paginate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index d23306be62bd..d73ad8d35c0d 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "2021.12.28"; + version = "2022.1.8"; src = fetchPypi { inherit pname version; - sha256 = "c722a25067d722483e24cde16ed987a822292ca758a213299e445694d2b5b587"; + sha256 = "a32996ec07ca004c45b768b0d50829728ab8f3986c0650ef538e42852c7aeba2"; }; propagatedBuildInputs = [ flask ]; From d860917872a8dc8981ad3175181c12821edcc4c9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:20 -0800 Subject: [PATCH 133/703] python3Packages.flexmock: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/flexmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index ae52c31b5775..923bc0cdc6c5 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.11.1"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1c51371767f968e1d2f505138de72b07704ecebc9b34e0b52ffdeeb510685c3f"; + sha256 = "44f702c0d0adde7085b4c7afe9adab50b01b724aceeb7e49b29f5632e6325ce8"; }; checkInputs = [ pytest ]; From c4f55d19c912dad0bbe4695869d155ddd70a2637 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:20 -0800 Subject: [PATCH 134/703] python3Packages.fonttools: 4.26.2 -> 4.28.5 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index ec3acfc775d0..c007f4158ced 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.26.2"; + version = "4.28.5"; # Bump to 3.7 when https://github.com/fonttools/fonttools/pull/2417 is merged disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "1zp9idjkn4bn1a4pn8x64vi8j1ijdsd4qvgf1f70dfwqvw6ak1i6"; + sha256 = "1zgcxhsjnb3r3h46i12k5mjbb3sly9mxxygz2xh28l3r347di19v"; }; # all dependencies are optional, but From 113346fed8c97db4b4dda7352eb6d1b960fbfeac Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:20 -0800 Subject: [PATCH 135/703] python3Packages.frozendict: 2.1.1 -> 2.1.3 --- .../python-modules/frozendict/default.nix | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 139a4c562bbe..95c946a7751f 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -8,21 +8,16 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "655b879217dd445a2023e16154cc231febef802b5c812d5c2e822280ad69e1dc"; + sha256 = "sha256-jj1HNfmhPRB3Vn5WhHFmPzJE+FrImyP4yzHPIx2+Rbk="; }; - postPatch = '' - # fixes build on non-x86_64 architectures - rm frozendict/src/3_9/cpython_src/Include/pyconfig.h - ''; - pythonImportsCheck = [ "frozendict" ]; @@ -32,24 +27,12 @@ buildPythonPackage rec { ]; preCheck = '' - rm -r frozendict - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + pushd test ''; - disabledTests = [ - # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict' - "test_union" - # non-standard assertions - "test_repr" - "test_format" - "test_str" - ]; - - disabledTestPaths = [ - # unpackaged test dependency: coold - "test/test_coold.py" - "test/test_coold_subclass.py" - ]; + postCheck = '' + popd + ''; meta = with lib; { homepage = "https://github.com/slezica/python-frozendict"; From 7b890d59335f78ff3a06b237b3d06d06c7fe0e78 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:20 -0800 Subject: [PATCH 136/703] python3Packages.furo: 2021.10.9 -> 2022.1.2 --- pkgs/development/python-modules/furo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 956c7da93580..9dc336e17f15 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "furo"; - version = "2021.10.9"; + version = "2022.1.2"; format = "flit"; disable = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K6pCoi7ePm6Vxhgqs2S6wuwVt5vH+cp/sJ/ZrsSzVAw="; + sha256 = "b217f218cbcd423ffbfe69baa79389d4ecebf2d86f0d593c44ef31da7b5aed30"; }; propagatedBuildInputs = [ From 7dc0d13c0f5a424de68fd4dabbd58fefb23d5437 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:20 -0800 Subject: [PATCH 137/703] python3Packages.gaphas: 3.1.9 -> 3.5.0 --- pkgs/development/python-modules/gaphas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index a6351aeeadd7..c3541bcc30a0 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.1.9"; + version = "3.5.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-S6cRsfqXYM4mSVSs2M8fET5ShFClKkGkod2w2y6F2gc="; + sha256 = "526f1943dd54efe91fbf45db38049103611fbac5939c42ad172ba9d2dce71fe1"; }; nativeBuildInputs = [ From 83cd9d6921dedcf6198d6fc8675ed4533fb24c4a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:21 -0800 Subject: [PATCH 138/703] python3Packages.garages-amsterdam: 2.1.1 -> 3.2.1 --- pkgs/development/python-modules/garages-amsterdam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index 08a687d70601..98ce3ff0ec24 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "garages-amsterdam"; - version = "2.1.1"; + version = "3.2.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; rev = version; - sha256 = "1m0bc3bzb83apprk412s7k5r2g6p5br2hrak2a976lh9ifk1d8hj"; + sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; }; propagatedBuildInputs = [ From 4f8dffe0421dde837c51015ad31bbfff07bb6572 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:21 -0800 Subject: [PATCH 139/703] python3Packages.gevent: 20.9.0 -> 21.12.0 --- pkgs/development/python-modules/gevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 3fe9e648ce32..968e4f76b413 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "gevent"; - version = "20.9.0"; + version = "21.12.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz"; + sha256 = "f48b64578c367b91fa793bf8eaaaf4995cb93c8bc45860e473bf868070ad094e"; }; buildInputs = [ libev ]; From c666eb96496ee894ec186c3d5717cfeb5bd2b391 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:21 -0800 Subject: [PATCH 140/703] python3Packages.globus-sdk: 2.0.1 -> 3.2.1 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index d251ec75ff59..91c959e87c5e 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "2.0.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "globus"; repo = "globus-sdk-python"; rev = version; - sha256 = "1kqnr50iwcq9nx40lblbqzf327cdcbkrir6vh70067hk33rq0gm9"; + sha256 = "12zza78qydkgzqg3j9428g92v7bb55nrwvl5m2il96z39darh7v8"; }; propagatedBuildInputs = [ From f8ff5558611cc5a92bc3319187ac67f24029c3e0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:22 -0800 Subject: [PATCH 141/703] python3Packages.google-api-python-client: 2.32.0 -> 2.35.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index e5bbbc8cbcde..772f45411d39 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.32.0"; + version = "2.35.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "619fe50155e73342c17aba4bbb2a08be8ce6ae00b795af383de7d6616b485c94"; + sha256 = "038b12979ea86ef0e33962bd33f955c337bc28f0471522bd27a801d52bfb4ae2"; }; propagatedBuildInputs = [ From d84bf493fed7994598341da44584955e445626cf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:22 -0800 Subject: [PATCH 142/703] python3Packages.googleapis-common-protos: 1.53.0 -> 1.54.0 --- .../python-modules/googleapis-common-protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 3a7c0510ad01..b6c518ec90dc 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.53.0"; + version = "1.54.0"; src = fetchPypi { inherit pname version; - sha256 = "a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4"; + sha256 = "a4031d6ec6c2b1b6dc3e0be7e10a1bd72fb0b18b07ef9be7b51f2c1004ce2437"; }; propagatedBuildInputs = [ grpc protobuf ]; From 074141e1e7d6e31c8095a9c10a830cd0c7f4964a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:23 -0800 Subject: [PATCH 143/703] python3Packages.growattserver: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/growattserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 18d6cd4dabb1..6347d9f55b8e 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = version; - sha256 = "sha256-Vooy+czqhrsWVw35zJb5paC5G0WwOlI5hF8PXxJG0cY="; + sha256 = "0v9clmz4qg6krmbsbfsrhsan824y2mqvwxsxb0fzfgaszxwkpm30"; }; propagatedBuildInputs = [ From e903fa5e8124e1a5dc73fd6bbb05afc22afef039 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:23 -0800 Subject: [PATCH 144/703] python3Packages.gym: 0.19.0 -> 0.21.0 --- pkgs/development/python-modules/gym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 5bcfb64a184d..5c3fed0db26b 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "gym"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = version; - sha256 = "sha256-0O/s9OVNGQmeX9j8B1x63RxdI6dhqfTEJcgDH2jtCv4="; + sha256 = "12b545xz0r2g4z5r7f8amxl7nm0lqymkzwcwhg1bni9h0sxwpv6c"; }; propagatedBuildInputs = [ From 1d31c461fdcbe2b253f8bf7b0b58687c5efe5af1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:23 -0800 Subject: [PATCH 145/703] python3Packages.habanero: 0.7.4 -> 1.0.0 --- pkgs/development/python-modules/habanero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index e24f2fc09691..8e7d90caa1a8 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "habanero"; - version = "0.7.4"; + version = "1.0.0"; # Install from Pypi is failing because of a missing file (Changelog.rst) src = fetchFromGitHub { owner = "sckott"; repo = pname; rev = "v${version}"; - sha256 = "1d8yj9xz5qabcj57rpjzvg0jcscvzrpb0739mll29nijbsaimfr1"; + sha256 = "0lhbd5c4sypcd65nh4cgxddsqrxwg89nn1qiii6m5l4fzsvblggv"; }; propagatedBuildInputs = [ requests tqdm ]; From 3056e35da625940d673e082f1a9e42a2aea2f940 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:24 -0800 Subject: [PATCH 146/703] python3Packages.httpcore: 0.14.3 -> 0.14.4 --- pkgs/development/python-modules/httpcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 99eb08a35a9d..79d979b10a97 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.14.3"; + version = "0.14.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo="; + sha256 = "19zsg8ijw0s1722ka67mjxx5z07lx9jq36z97l1fa6z1129wq240"; }; propagatedBuildInputs = [ From fa955685f30d26a5e8b14c7247552a649bc25225 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:24 -0800 Subject: [PATCH 147/703] python3Packages.httpx: 0.21.1 -> 0.21.3 --- pkgs/development/python-modules/httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 543308a3fdc1..97b6affd3abb 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.21.1"; + version = "0.21.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc="; + sha256 = "01069b0kj6vnb26xazlz06rj4yncy5nkq76pajvzx0pmpjkniiz9"; }; propagatedBuildInputs = [ From fb8aba36b0d9aef299f8cecd42116625d554ba0c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:25 -0800 Subject: [PATCH 148/703] python3Packages.huey: 2.2.0 -> 2.4.2 --- pkgs/development/python-modules/huey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 28a801de71a6..38c25fa1b0c8 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "huey"; - version = "2.2.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "1hgic7qrmb1kxvfgf2qqiw39nqyknf17pjvli8jfzvd9mv7cb7hh"; + sha256 = "00fi04991skq61gjrmig8ry6936pc8zs7p8py8spfipbxf1irkjg"; }; propagatedBuildInputs = [ redis ]; From 0e1c728157cdb76666a1b0c87c7059919de914b3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:25 -0800 Subject: [PATCH 149/703] python3Packages.hypothesis: 6.30.1 -> 6.35.0 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 9d9c6b6c91fa..6572ad57e110 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.30.1"; + version = "6.35.0"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "0nk57v03q7ss7dbsfd9gi3lzl6ngplk7axbiksm26dgkhh4swk8y"; + sha256 = "08wph7q3c08480ma2p7m7mamy0g7g7r5jqpwdyhdga4cfg734527"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From 29be58e00255b1ea5585a7a6eb90d876c1ce572b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:26 -0800 Subject: [PATCH 150/703] python3Packages.inquirer: 2.7.0 -> 2.9.1 --- pkgs/development/python-modules/inquirer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 84e381f0b8c8..f8c13dc13804 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "inquirer"; - version = "2.7.0"; + version = "2.9.1"; # PyPi archive currently broken: https://github.com/magmax/python-inquirer/issues/106 src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; rev = version; - sha256 = "152l5qjgkag8zkr69ax2i5s8xcac1qvyngisrplbnbzwbpf77d0d"; + sha256 = "0vdly2k4i7bfcqc8zh2miv9dbpmqvayxk72qn9d4hr7z15wph233"; }; propagatedBuildInputs = [ blessed python-editor readchar ]; From ba484bc4ea73b870bd67b6a17f35e6dc5429bcbc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:26 -0800 Subject: [PATCH 151/703] python3Packages.ipykernel: 6.6.0 -> 6.7.0 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 1a34dfaf65b2..0827e611679e 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.6.0"; + version = "6.7.0"; src = fetchPypi { inherit pname version; - sha256 = "3a227788216b43982d9ac28195949467627b0d16e6b8af9741d95dcaa8c41a89"; + sha256 = "d82b904fdc2fd8c7b1fbe0fa481c68a11b4cd4c8ef07e6517da1f10cc3114d24"; }; propagatedBuildInputs = [ From 1c0b0cecc44b6b0c5e19d9dfde33b62ee77113a2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:26 -0800 Subject: [PATCH 152/703] python3Packages.ipyparallel: 6.3.0 -> 8.1.0 --- pkgs/development/python-modules/ipyparallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 4c64fca34b76..51b76fc532bb 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.3.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0a97b276c62db633e9e97a816282bdd166f9df74e28204f0c8fa54b71944cfdc"; + sha256 = "63f7e136e88f890e9802522fa5475dd81e7614ba06a8cfe4f80cc3056fdb7d73"; }; buildInputs = [ nose ]; From 0ee7fff71c5db6f90586ca82193bdfa1b8306d24 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:26 -0800 Subject: [PATCH 153/703] python3Packages.ipython: 7.30.1 -> 8.0.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 73ead288ee49..3ead79dbaf14 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.30.1"; + version = "8.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "cb6aef731bf708a7727ab6cde8df87f0281b1427d41e65d62d4b68934fa54e97"; + sha256 = "004a0d05aeecd32adec4841b6e2586d5ca35785b1477db4d8333a39333e0ce98"; }; prePatch = lib.optionalString stdenv.isDarwin '' From d1577f11f6f5a006a91fe502150af947c77c21fe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:27 -0800 Subject: [PATCH 154/703] python3Packages.isort: 5.9.3 -> 5.10.1 --- pkgs/development/python-modules/isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index f708391cba21..d21f79b6ba9b 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "isort"; - version = "5.9.3"; + version = "5.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = version; - sha256 = "sha256-JbRZ/3Xz35tGoCNnQesR08Sjoz3yimxZyxhhOXGvmXw="; + sha256 = "09spgl2k9xrprr5gbpfc91a8p7mx7a0c64ydgc91b3jhrmnd9jg1"; }; nativeBuildInputs = [ From 905829c9dd3b27cb0dc874892143347b3b67fcaf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:27 -0800 Subject: [PATCH 155/703] python3Packages.janus: 0.7.0 -> 1.0.0 --- pkgs/development/python-modules/janus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index c8a9efdb54f8..f4c52db722cd 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "janus"; - version = "0.7.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f10dcf5776e8d49cc30ec86d5eb7268eeec39abaa24fe0332ee8fb8fa3611845"; + sha256 = "df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612"; }; disabled = pythonOlder "3.6"; From 55cda633672cb7a03d1f33e6537c2196e56e9700 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:27 -0800 Subject: [PATCH 156/703] python3Packages.jaraco.collections: 3.4.0 -> 3.5.1 --- .../development/python-modules/jaraco_collections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 46f2bfdff3fc..d45d354b38e7 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.4.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "344d14769d716e7496af879ac71b3c6ebdd46abc64bd9ec21d15248365aa3ac9"; + sha256 = "b04f00bd4b3c4fc4ba5fe1baf8042c0efd192b13e386830ea23fff77bb69dc88"; }; pythonNamespaces = [ "jaraco" ]; From 4f89f9001011e2011011c2de5f0abee34aa4d09a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:27 -0800 Subject: [PATCH 157/703] python3Packages.jaraco.functools: 3.4.0 -> 3.5.0 --- pkgs/development/python-modules/jaraco_functools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 1316c2b4e729..73aa7708cf25 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "659a64743047d00c6ae2a2aa60573c62cfc0b4b70eaa14fa50c80360ada32aa8"; + sha256 = "31e0e93d1027592b7b0bec6ad468db850338981ebee76ba5e212e235f4c7dda0"; }; nativeBuildInputs = [ setuptools-scm ]; From d8736f1252e8a319acb65422b8aab8bd729ab3ca Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:27 -0800 Subject: [PATCH 158/703] python3Packages.jellyfish: 0.8.9 -> 0.9.0 --- pkgs/development/python-modules/jellyfish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 546e56f702f6..a275b97310d9 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.8.9"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "90d25e8f5971ebbcf56f216ff5bb65d6466572b78908c88c47ab588d4ea436c2"; + sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a"; }; checkInputs = [ pytest unicodecsv ]; From 301b847e9d6577a314f56f5dfbf54f990ab2c87f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:28 -0800 Subject: [PATCH 159/703] python3Packages.jira: 3.0.1 -> 3.1.1 --- pkgs/development/python-modules/jira/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index c7d8207aa3d9..b22f5ccd73a4 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "jira"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "pycontribs"; repo = pname; rev = version; - sha256 = "sha256-hAUAzkHPXFDlKEom+dkzr8GQ+sqK2Ci1/k+QuSNvifE="; + sha256 = "04s2zgwxip54g894hps2cm081cp07mbi7qipmsv4dvailhsg43nn"; }; postPatch = '' From 73190f02d3f93b6c59025ebead77b5b7b3b22409 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:28 -0800 Subject: [PATCH 160/703] python3Packages.johnnycanencrypt: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/johnnycanencrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 2f7921374e75..635ea12d5f84 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "johnnycanencrypt"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kushaldas"; repo = "johnnycanencrypt"; rev = "v${version}"; - sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4"; + sha256 = "0b1yfddf38dicmjgnw9mk5g0iisa5yq6l9cj6kfskhyrznasvz3g"; }; cargoDeps = rustPlatform.fetchCargoTarball { From db6d0aed762401fa07b0119b0b03c544689c5bc1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:28 -0800 Subject: [PATCH 161/703] python3Packages.josepy: 1.11.0 -> 1.12.0 --- pkgs/development/python-modules/josepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index c091480f63c6..2cd81d4cba01 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "40ef59f2f537ec01bafe698dad66281f6ccf4642f747411647db403ab8fa9a2d"; + sha256 = "267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25"; }; postPatch = '' From 3739df07807edece83aaab43183dae9e1bc96188 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:28 -0800 Subject: [PATCH 162/703] python3Packages.jpylyzer: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/jpylyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index 442267b52ea0..92c78895eb62 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jpylyzer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "openpreserve"; repo = pname; rev = version; - sha256 = "01wfbb1bgby9b7m6q7483kvpyc1qhj80dg8d5a6smcxvmy8y6x5n"; + sha256 = "1cd9klq83g9p4nkg7x78axqid5vcsqzggp431hcfdiixa50yjxjg"; }; propagatedBuildInputs = [ six ]; From 186e9622c73c72ac73748a47764027fd5d67935f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:28 -0800 Subject: [PATCH 163/703] python3Packages.jsonlines: 1.2.0 -> 3.0.0 --- pkgs/development/python-modules/jsonlines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index d16fa89a97c4..4892d72aae91 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "jsonlines"; - version = "1.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "wbolster"; repo = pname; rev = version; - sha256 = "1f8zsqy8p9a41gqg2a5x7sppc5qhhq7gw58id2aigb270yxzs7jw"; + sha256 = "1242bvk208vjaw8zl1d7ydb0i05v8fwdgi92d3bi1vaji9s2hv65"; }; propagatedBuildInputs = [ six ]; From 49c6d3a55c61ae601e60c4fd2bb15cbf1ea39e3d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:29 -0800 Subject: [PATCH 164/703] python3Packages.jsonschema: 3.2.0 -> 4.4.0 --- pkgs/development/python-modules/jsonschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index b78165fc4f32..d7a1bd0e06ff 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "3.2.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; + sha256 = "636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83"; }; nativeBuildInputs = [ setuptools-scm ]; From b4f9da221aee22c3a6dd71f1769d2b622c7bf1b2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:29 -0800 Subject: [PATCH 165/703] python3Packages.jupyterlab: 3.2.6 -> 3.2.8 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 88c3d39ccf0e..3280e7ec2840 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.2.6"; + version = "3.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "04e763974010f0f424ee889238fa488ee11708d0546e6df6e2cad9e0fc724bdb"; + sha256 = "5e4e99868c4f385372686767781408acbb9004b690b198b45597ba869802334b"; }; nativeBuildInputs = [ From 8267003627c17e0db1136793d9b4e2d2344ce324 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:29 -0800 Subject: [PATCH 166/703] python3Packages.jupyterlab-git: 0.34.0 -> 0.34.1 --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 46c76ebfe20e..9d2907072e62 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.34.0"; + version = "0.34.1"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "3b9ee3a577834c0f021d41069be7b03068297ce0c2a73c76b17e8018eb3eb62f"; + sha256 = "c7a03f526eb19175df73fedd5dee3cdae2d39e0474eef8f55c1c55b219ab26d9"; }; nativeBuildInputs = [ From ef8fc5443cd434a34fa45cf3bf242a6077db1e92 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:29 -0800 Subject: [PATCH 167/703] python3Packages.jupytext: 1.13.5 -> 1.13.6 --- pkgs/development/python-modules/jupytext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 777f82a3e5ad..368cc19fdd94 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.13.5"; + version = "1.13.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "v${version}"; - sha256 = "0rapp2baqml1z3n8k7ijf5461b3p8wgr45y3njz54q75v0jk7v45"; + sha256 = "0xvc4i3wwycaqx16qylglywa14ky7mikdv1jm3p7yz19cq5hr0fx"; }; buildInputs = [ From 731729a71bc2df1cd71279351266430aa88a2ec4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:29 -0800 Subject: [PATCH 168/703] python3Packages.kaldi-active-grammar: 2.1.0 -> 3.1.0 --- .../python-modules/kaldi-active-grammar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index f7d4738ebcab..d5a906dd733b 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -17,13 +17,13 @@ let in buildPythonPackage rec { pname = "kaldi-active-grammar"; - version = "2.1.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "daanzu"; repo = pname; rev = "v${version}"; - sha256 = "ArbwduoH7mMmIjlFfYAFvcpR39rrkVUJhYEyQzZqsbY="; + sha256 = "0lilk6yjzcy31avy2z36bl9lr60gzwhmyqwqn8akq11qc3mbffsk"; }; KALDI_BRANCH = "foo"; From 4f5eddf5662f9a97a4256025690feffe3dd1a5e9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:30 -0800 Subject: [PATCH 169/703] python3Packages.labelbox: 3.10.0 -> 3.11.1 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index ba7579d10670..c89782d4027e 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.10.0"; + version = "3.11.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "v${version}"; - sha256 = "0afrzxy8hmsvqp84mf89k7sqlzzyh6xwp2pz5abj0981mqlzf2x9"; + sha256 = "114h9phvbdknyvqdnjba3pd7i4iznffhgx9d569lq0hfla3hl61a"; }; propagatedBuildInputs = [ From 8c7f4fafb992dabf7fea4fac1988d4fa2a7c4e8e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:30 -0800 Subject: [PATCH 170/703] python3Packages.lark-parser: 0.12.0 -> 1.0.0 --- pkgs/development/python-modules/lark-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index c1c67fd4c1ea..56a41207d0a6 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.12.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "sha256-zcMGCn3ixD3dJg3GlC/ijs+U1JN1BodHLTXZc/5UR7Y="; + sha256 = "0pfvjh4ydc49gs6m8b3ip85c8nd4da2bhz9714fwcyl3hdp33q7n"; }; # Optional import, but fixes some re known bugs & allows advanced regex features From ddcf435d8c56570e99fefaaaae512f5e1a4e315b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:30 -0800 Subject: [PATCH 171/703] python3Packages.lazy-object-proxy: 1.6.0 -> 1.7.1 --- pkgs/development/python-modules/lazy-object-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 09232cbc6242..0619a62fa32d 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.6.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726"; + sha256 = "d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4"; }; nativeBuildInputs = [ From b6b55c16bed61000a2529baa9de3669161461b99 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:30 -0800 Subject: [PATCH 172/703] python3Packages.lektor: 3.1.3 -> 3.3.1 --- pkgs/development/python-modules/lektor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index a094bf6b37e6..f88e14d0a3e7 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "lektor"; - version = "3.1.3"; + version = "3.3.1"; src = fetchFromGitHub { owner = "lektor"; repo = "lektor"; rev = version; - sha256 = "16qw68rz5q77w84lwyhjpfd3bm4mfrhcjrnxwwnz3vmi610h68hx"; + sha256 = "04gn3jybqf9wc6l9mi0djpki60adnk7gppmv987ik676k5x8f1kk"; }; propagatedBuildInputs = [ From 2f137e047398f39895a729e288131231c5d4ad3f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:30 -0800 Subject: [PATCH 173/703] python3Packages.libtmux: 0.10.2 -> 0.10.3 --- pkgs/development/python-modules/libtmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 5b251f842bff..7501744d37c1 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "a0e958b85ec14cdaabecfa738a0dd51846f05e5c5e9d6749a2bf5160b9f7e1d2"; + sha256 = "c7fbd837f0a9e4d33a157523e4ca6ef95e80256842e094ffd766c3dbd78d1957"; }; checkInputs = [ pytest ]; From 591cd7fbbc0f9bc310a5e607d4975e808852d629 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:31 -0800 Subject: [PATCH 174/703] python3Packages.limits: 1.6 -> 2.2.0 --- pkgs/development/python-modules/limits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 4c4f7a32133b..9a19dda15789 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "1.6"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6c0a57b42647f1141f5a7a0a8479b49e4367c24937a01bd9d4063a595c2dd48a"; + sha256 = "da6346f0dcf85f17f0f1cc709c3408a3058cf6fee68313c288127c287237b411"; }; propagatedBuildInputs = [ six ]; From beda925259d88070e8581cb8932cfc4a5497756c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:31 -0800 Subject: [PATCH 175/703] python3Packages.llvmlite: 0.37.0 -> 0.38.0 --- pkgs/development/python-modules/llvmlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index e3b9e3bb7c8a..637a4deb3abb 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.37.0"; + version = "0.38.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6392b870cd018ec0c645d6bbb918d6aa0eeca8c62674baaee30862d6b6865b15"; + sha256 = "a99d166ccf3b116f3b9ed23b9b70ba2415640a9c978f3aaa13fad49c58f4965c"; }; nativeBuildInputs = [ llvm ]; From 89fab221f693378cf50f064a411af4f1e00c86e3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:31 -0800 Subject: [PATCH 176/703] python3Packages.loo-py: 2017.2 -> 2020.2 --- pkgs/development/python-modules/loo-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loo-py/default.nix index 16060c1c030e..d16b06a284ab 100644 --- a/pkgs/development/python-modules/loo-py/default.nix +++ b/pkgs/development/python-modules/loo-py/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "loo-py"; - version = "2017.2"; + version = "2020.2"; src = fetchPypi { pname = "loo.py"; inherit version; - sha256 = "c656992de48b328cdaccd7d1f14eb522b9dd5a1d0d15f54623f4ab18fd219abc"; + sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f"; }; checkInputs = [ pytest ]; From 4bff13a41f287bb866b9dbe8d6bdb146fb411ba4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:31 -0800 Subject: [PATCH 177/703] python3Packages.marshmallow-sqlalchemy: 0.26.1 -> 0.27.0 --- .../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 1aeaa04e1721..9887f42bd8f3 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.26.1"; + version = "0.27.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d8525f74de51554b5c8491effe036f60629a426229befa33ff614c8569a16a73"; + sha256 = "1521b129564444648c523a38f6446c137f1aae5c9c7de1ec151d5ebf03fd407d"; }; propagatedBuildInputs = [ From 353519185da30d45f608e13917e476ea21f77bb3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:32 -0800 Subject: [PATCH 178/703] python3Packages.md2gemini: 1.8.1 -> 1.9.0 --- pkgs/development/python-modules/md2gemini/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index 7b4686dcac40..e71748de06b1 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "md2gemini"; - version = "1.8.1"; + version = "1.9.0"; propagatedBuildInputs = [ mistune_2_0 cjkwrap wcwidth ]; checkInputs = [ pytestCheckHook ]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0mfa0f0m762168fbsxjr1cx9yhj82dr8z1d28jl6hj9bkqnvvwiy"; + sha256 = "775cee2be36aa0f4b7ea2861f2ac7d80e113f78b40a58f92192b6c73f6c84e75"; }; meta = with lib; { From 351ba9ef7c4d116e0becc556e4032106b89c753c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:32 -0800 Subject: [PATCH 179/703] python3Packages.meshio: 4.4.6 -> 5.2.2 --- pkgs/development/python-modules/meshio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index e9b74d02b070..54f8431ba279 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "4.4.6"; + version = "5.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0kv832s2vyff30zz8yqypw5jifwdanvh5x56d2bzkvy94h4jlddy"; + sha256 = "209885ac31b00155e43c27859d1aff0ba7f97f319ee7bed453a8b9e1677a4e52"; }; propagatedBuildInputs = [ From f00f37f31c3bf9888feec90325b46d32d0358c29 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:32 -0800 Subject: [PATCH 180/703] python3Packages.Mezzanine: 4.3.1 -> 5.1.0 --- pkgs/development/python-modules/mezzanine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index c157cd2a6be8..2c78575d3704 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -20,12 +20,12 @@ }: buildPythonPackage rec { - version = "4.3.1"; + version = "5.1.0"; pname = "Mezzanine"; src = fetchPypi { inherit pname version; - sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3"; + sha256 = "ce1117c81416d2e0a77981419312e200aec1cf3cb3ea9630083bd29e74bbb265"; }; disabled = isPyPy || lib.versionOlder django.version "1.11" From bba19a2f4c676b7e79f45a7792813d2e18c82d2c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:32 -0800 Subject: [PATCH 181/703] python3Packages.mill-local: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/mill-local/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mill-local/default.nix b/pkgs/development/python-modules/mill-local/default.nix index 9d00bb71c8bc..76e859a978e1 100644 --- a/pkgs/development/python-modules/mill-local/default.nix +++ b/pkgs/development/python-modules/mill-local/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mill-local"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyMillLocal"; rev = version; - sha256 = "0q0frwj9yxdmqi5axl7gxirfflgn8xh1932c6lhp9my2v1d0gdrk"; + sha256 = "1qkv5a1fadxpfdw6cgyp9n5va4d9y5hi49micrd1jm2d3b9939iq"; }; propagatedBuildInputs = [ From 67521408b85196999ee88164f29c16e56efd1fd6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:33 -0800 Subject: [PATCH 182/703] python3Packages.mlxtend: 0.17.3 -> 0.19.0 --- pkgs/development/python-modules/mlxtend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 4692dc61c229..05fc6b4bb59a 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.17.3"; + version = "0.19.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = version; - sha256 = "1515wgmj5rhwpmky7apmmvys1630sfg534fai6559s13hp11pdcl"; + sha256 = "0qawzlzv4zf612n9n03fxnz6gxmzschq0ykh9dgv70l33ihmjbaw"; }; checkInputs = [ pytestCheckHook ]; From abd316fff09a1bb55c1d1874a2720be7dad6c7c4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:33 -0800 Subject: [PATCH 183/703] python3Packages.mocket: 3.10.3 -> 3.10.4 --- pkgs/development/python-modules/mocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index afef1cb5724d..6530a59c3f24 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.3"; + version = "3.10.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "82634f7d1a39f6a340ff9c7486e37bf3698e6510fdcfa7b378b5fbb256a42cda"; + sha256 = "831c23bf891c525828b7da49a358c6e0698481e4c8b3a61a69e87f36d06ef969"; }; propagatedBuildInputs = [ From 5ffbd4d07617e00a8c00375cd590188519b5bec3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:33 -0800 Subject: [PATCH 184/703] python3Packages.monty: 2021.12.1 -> 2022.1.12.1 --- pkgs/development/python-modules/monty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 36d798e5504d..16205286c003 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2021.12.1"; + version = "2022.1.12.1"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "0zcbdh7pqv4dq3fan0zh912w9bvmf2p0zj1fhp0ayhdsc50cwldh"; + sha256 = "11bp3zkmqffc6rqw93qfk8d905mzc10nqbjmvj2bay8h197q0dg2"; }; postPatch = '' From 9cddb8f3cf23c631040a772f156802124e3c6c33 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:33 -0800 Subject: [PATCH 185/703] python3Packages.multiset: 2.1.1 -> 3.0.1 --- pkgs/development/python-modules/multiset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index fa2fa87d0e89..e511ab100459 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multiset"; - version = "2.1.1"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7"; + sha256 = "e45671cae8385a8e6248a9b07a3a83280c2d0cc4312713058cfbacdc5ec9973e"; }; buildInputs = [ setuptools-scm pytest-runner ]; From d46da189fd79f34acc5788e4966c8358d397d833 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:33 -0800 Subject: [PATCH 186/703] python3Packages.mypy-boto3-builder: 5.5.0 -> 6.3.2 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 0a8252234569..b47c6701a008 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "5.5.0"; + version = "6.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "sha256-cFe8d6w28VFTNyj/ABWHkFQDfnM4aTrNZ+WUw5g8H5I="; + sha256 = "1krsh8pmxigpzz21gvsy7qnpnwfkyyjbz92bqp9iflf7kklfhb79"; }; nativeBuildInputs = [ From be208d6123fbf03f8907141d530f65dd2bd259a3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:34 -0800 Subject: [PATCH 187/703] python3Packages.mypy-boto3-s3: 1.20.28 -> 1.20.35.post1 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index e7aa7de0c9d8..54829a67908a 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.20.28"; + version = "1.20.35.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "85ac23d06f9d0d794f60041b4c4f271d2bb8f5a83375c963e4a9e73e51ba9ca5"; + sha256 = "e576fa0f3d1ea9ce53ad620ee565962687cdae5d8f1f8414db0669aed788836c"; }; propagatedBuildInputs = [ From be3125a649a6f27558d441e46399876932f5f06f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:34 -0800 Subject: [PATCH 188/703] python3Packages.mypy-protobuf: 2.10 -> 3.1.0 --- pkgs/development/python-modules/mypy-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index fdcfed839c78..9fe1fa8abe10 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "2.10"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1fed214e16351b09946770794a321a818abb744078b1d863a479da070028684c"; + sha256 = "558dcc390290e43c7def0d4238cc41a79abde06ff509b3014c3dff0553c7b0c1"; }; propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ]; From 8c6e27d650915657436af2384acec2923479f373 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:34 -0800 Subject: [PATCH 189/703] python3Packages.nbclassic: 0.3.1 -> 0.3.5 --- pkgs/development/python-modules/nbclassic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 0e6630281c0d..ae6554678635 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "0.3.1"; + version = "0.3.5"; disabled = pythonOlder "3.6"; # tests only on github @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jupyterlab"; repo = pname; rev = version; - sha256 = "sha256-gx086w/qYB02UFEDly+0mUsV5BvAVAuhqih4wev2p/w="; + sha256 = "1d0x7nwsaw5qjw4iaylc2sxlpiq3hlg9sy3i2nh7sn3wckwl76lc"; }; propagatedBuildInputs = [ jupyter_server notebook ]; From eff9c3e6162c9cee8e7a94c12abad8c52966ce41 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:34 -0800 Subject: [PATCH 190/703] python3Packages.nbclient: 0.5.9 -> 0.5.10 --- pkgs/development/python-modules/nbclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index c10b442bac92..62bb1848a3ce 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.9"; + version = "0.5.10"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-meRt2vrNC4YSk78kb+2FQKGErfo6p9ZB+JAx7AcHAeA="; + sha256 = "b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088"; }; inherit doCheck; From 6398c4663fd94c1ac6a0028be34c3c75ff889a04 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:34 -0800 Subject: [PATCH 191/703] python3Packages.nbconvert: 6.3.0 -> 6.4.0 --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 400d59272ee1..ab91f22acc44 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.3.0"; + version = "6.4.0"; src = fetchPypi { inherit pname version; - sha256 = "5e77d6203854944520105e38f2563a813a4a3708e8563aa598928a3b5ee1081a"; + sha256 = "5412ec774c6db4fccecb8c4ba07ec5d37d6dcf5762593cb3d6ecbbeb562ebbe5"; }; # Add $out/share/jupyter to the list of paths that are used to search for From 39d86416f1b40dac4fb1278d07b6962653f1393c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:34 -0800 Subject: [PATCH 192/703] python3Packages.nbsmoke: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/nbsmoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index a7c5425963aa..7d1d827cc20f 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2400d7878e97714e822ab200a71fc71ede487e671f42b4b411745dba95f9cb32"; + sha256 = "8b55333e2face27bc7ff80c266c468ca5633947cb0697727348020dd445b0874"; }; propagatedBuildInputs = [ From 5bf5fd714830a3e74e942cf69b43abbf4fc556a8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:35 -0800 Subject: [PATCH 193/703] python3Packages.notebook: 6.4.6 -> 6.4.7 --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 1cb5f1b75708..7a1902cb2114 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.4.6"; + version = "6.4.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7bcdf79bd1cda534735bd9830d2cbedab4ee34d8fe1df6e7b946b3aab0902ba3"; + sha256 = "b01da66f11a203b3839d6afa4013674bcfff41c36552f9ad0fbcb2d93c92764a"; }; LC_ALL = "en_US.utf8"; From cd83a6c9f94da3c4e0786e6373beabc066436b1f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:35 -0800 Subject: [PATCH 194/703] python3Packages.numexpr: 2.8.0 -> 2.8.1 --- pkgs/development/python-modules/numexpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 31b529c83dab..72c38a8946fb 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "9fec076b76c90a5f3929373f548834bb203c6d23a81a895e60d0fe9cca075e99"; + sha256 = "cd779aa44dd986c4ef10163519239602b027be06a527946656207acf1f58113b"; }; # Remove existing site.cfg, use the one we built for numpy. From 66615c59089f30722c7d5e7e06ae56cbac985c8a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:35 -0800 Subject: [PATCH 195/703] python3Packages.nunavut: 1.5.2 -> 1.6.2 --- pkgs/development/python-modules/nunavut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 8c4c8e1fbc5f..f4cc9d3140e4 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.5.2"; + version = "1.6.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "12703306872404be556648ab2282dc1566f4e77bfb9f14747fb13294c9235081"; + sha256 = "c6f99eaa65935b2c8a3f004025fb3c0309e11655c391d0fcd318d2a8665ca5c4"; }; propagatedBuildInputs = [ From 6af6c95fd4f800a7f1a15fdd6cbef07d6555bec6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:35 -0800 Subject: [PATCH 196/703] python3Packages.oci: 2.53.1 -> 2.54.0 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 2278133582c6..b262f4b84dd1 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.53.1"; + version = "2.54.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-TnLKT/F36jHEfT9K6DFM2GmPRccXz1GJWIF+EEQYRls="; + hash = "sha256-LTfJSlVT4I00ftshU0mbtxzy92G8lOmQiKMTMC+ZFHk="; }; propagatedBuildInputs = [ From 561509e3235f2e53b9261761f67e6a8f3d8c9841 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:36 -0800 Subject: [PATCH 197/703] python3Packages.openapi-schema-validator: 0.1.5 -> 0.2.0 --- .../python-modules/openapi-schema-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 18e357c1f2d2..392eb91ed8d3 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.1.5"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "a4b2712020284cee880b4c55faa513fbc2f8f07f365deda6098f8ab943c9f0df"; + sha256 = "71889d1cb69d9fb46eb04243b24e9c0cd7989d9153d29d8770e626874bf68f80"; }; propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; From 896e34a30d943a5e276aefba179d3e219b00c82a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:36 -0800 Subject: [PATCH 198/703] python3Packages.opensimplex: 0.3 -> 0.4 --- pkgs/development/python-modules/opensimplex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix index 6832266b87ad..71e1b15368a0 100644 --- a/pkgs/development/python-modules/opensimplex/default.nix +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "opensimplex"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "lmas"; repo = pname; rev = "v${version}"; - sha256 = "idF5JQGnAye6z3c3YU9rsHaebB3rlHJfA8vSpjDnFeM="; + sha256 = "0djc50v3hcay04a3i2g9qpviniyx98rkxsc6gmmrz2fyxsa5z5ya"; }; checkInputs = [ nose ]; From 3b9bbdf5942bf0a50d3299ed9116a30a2f238865 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:36 -0800 Subject: [PATCH 199/703] python3Packages.osqp: 0.6.2.post0 -> 0.6.2.post5 --- pkgs/development/python-modules/osqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 1db266e116d4..fa80a337deaf 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.2.post0"; + version = "0.6.2.post5"; src = fetchPypi { inherit pname version; - sha256 = "5f0695f26a3bef0fae91254bc283fab790dcca0064bfe0f425167f9c9e8b4cbc"; + sha256 = "b2fa17aae42a7ed498ec261b33f262bb4b3605e7e8464062159d9fae817f0d61"; }; nativeBuildInputs = [ cmake ]; From 624676631e9642159dea3a961961cba8cd1f20cf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:36 -0800 Subject: [PATCH 200/703] python3Packages.pandas: 1.3.4 -> 1.3.5 --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 880a5afdce63..536f883f29a2 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.3.4"; + version = "1.3.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "a2aa18d3f0b7d538e21932f637fbfe8518d085238b429e4790a35e1e44a96ffc"; + sha256 = "1e4285f5de1012de20ca46b188ccf33521bff61ba5c5ebd78b4fb28e5416a9f1"; }; nativeBuildInputs = [ cython ]; From bbff0ac0d1557bd9885cc3688e081d96491bd4ac Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:36 -0800 Subject: [PATCH 201/703] python3Packages.paramiko: 2.8.1 -> 2.9.2 --- pkgs/development/python-modules/paramiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index d271111d58f2..d7be0348d54a 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.9.1"; + version = "2.9.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-of3e07VfYdIzieT+UtmuQolgrJWNLt9QNz+qXYkm7dA="; + sha256 = "944a9e5dbdd413ab6c7951ea46b0ab40713235a9c4c5ca81cfe45c6f14fa677b"; }; propagatedBuildInputs = [ From cbb143b484be8e726982a4680b6ce666e27eb7be Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:37 -0800 Subject: [PATCH 202/703] python3Packages.pelican: 4.6.0 -> 4.7.1 --- pkgs/development/python-modules/pelican/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index e39993194a8c..e764ddb9ad2c 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.6.0"; + version = "4.7.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "getpelican"; repo = pname; rev = version; - sha256 = "0xrz0cmjyaylr81rmy5i3qbp4ms1iwh0gpb07q1dwljffb8xzbhr"; + sha256 = "13l3xd3a5lm7ma2rw6gi20rhkdbvcr6cvh38c7vpxlf0prsmbh2c"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From f7a996ba0c9d13b0e9f7f2d3b308694ae9f12264 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:37 -0800 Subject: [PATCH 203/703] python3Packages.pep257: 0.7.0 -> 6.1.1 --- pkgs/development/python-modules/pep257/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix index c168e087fc5c..d6205fc6e72e 100644 --- a/pkgs/development/python-modules/pep257/default.nix +++ b/pkgs/development/python-modules/pep257/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pep257"; - version = "0.7.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "GreenSteam"; repo = "pep257"; rev = version; - sha256 = "sha256-RkE9kkNkRTmZ8zJVwQzMsxU1hcjlxX6UA+ehnareynQ="; + sha256 = "0hcf3nyvzl8kd6gmc9qsiigz7vpwrjxcd1bd50dd63cad87qqicg"; }; checkInputs = [ pytestCheckHook mock ]; From c0935faef5e747daf0c1ee79cb81a96d64d5c3bb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:37 -0800 Subject: [PATCH 204/703] python3Packages.pep517: 0.9.1 -> 0.12.0 --- pkgs/development/python-modules/pep517/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index 90dc50461990..b14fb47dd11e 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.9.1"; + version = "0.12.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf"; + sha256 = "931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0"; }; nativeBuildInputs = [ From 797c78e1e6b96d7fd4a5503112a00b77f17a08c0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:37 -0800 Subject: [PATCH 205/703] python3Packages.perfplot: 0.9.8 -> 0.9.13 --- pkgs/development/python-modules/perfplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index af653ed0c8da..69fa1c8c0a16 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.9.8"; + version = "0.9.13"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; rev = version; - sha256 = "17dpgd27ik7ka7xpk3mj3anbjj62lwygy1vxlmrmk8xbhrqkim8d"; + sha256 = "0ry5x38sv8gh505z6ip90jymm7kfgyf80y3vjb2i6z567bnblam6"; }; format = "pyproject"; From a7462e132a72d7613cbe3543cb5b67781ab48018 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:37 -0800 Subject: [PATCH 206/703] python3Packages.pex: 2.1.56 -> 2.1.62 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 438360260822..bb275b0e0e14 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.56"; + version = "2.1.62"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "8dfb7ef551cc9d3d03a6e2dc1b1ba6183cd94f3cde7431836f017d60cc992d53"; + sha256 = "b69743e72c879b2d145560fc0a52ff57e7db6e7ca657c3db50e5845e46294783"; }; nativeBuildInputs = [ From 1a479d6b871012785138778b64e71049f6125bbe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:38 -0800 Subject: [PATCH 207/703] python3Packages.phonemizer: 2.2.2 -> 3.0.1 --- pkgs/development/python-modules/phonemizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 54a816643818..29f7266b6910 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -12,11 +12,11 @@ buildPythonApplication rec { pname = "phonemizer"; - version = "2.2.2"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "ae252f0bc7633e172b08622f318e7e112cde847e9281d4675ea7210157325146"; + sha256 = "1b4ea53b8da9a156361dff1d0c04ac1a8e65e6966d1cb9a8147c200960b32296"; }; postPatch = '' From 772d1ef3dc49daed798701f4b95da6b04fc43d7d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:38 -0800 Subject: [PATCH 208/703] python3Packages.phonenumbers: 8.12.40 -> 8.12.41 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 5a8cb430ae6f..44f4dda6b1bc 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.40"; + version = "8.12.41"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "00f2955a456b458f9b6ab0d24329049c3e7358c44dfc1979fe4908ced40f1eb8"; + sha256 = "f477da623a51cba084567d6a67b1882a8aaaf3e7beadad655f8613a8f887ac62"; }; checkInputs = [ From 23f4ca5b860284d1b2a32c16b96d4d599bee5845 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:38 -0800 Subject: [PATCH 209/703] python3Packages.pipx: 0.17.0 -> 1.0.0 --- pkgs/development/python-modules/pipx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 2f80806c431a..72f0284756af 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "0.17.0"; + version = "1.0.0"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "sha256-vR/tKV+ZB0nZaxEcB83dwoSI7kBC1rA+6fo30rizroM="; + sha256 = "1sgfrlhci2m83k436dfwfmqjpb8hij6yypm03pm3n8drmr2aaa4s"; }; propagatedBuildInputs = [ From 3f185ba9dbc86341ae6ef3bf45ef8f62bb5d267b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:38 -0800 Subject: [PATCH 210/703] python3Packages.pivy: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/pivy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 7645fdaec8aa..6637198b5643 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pivy"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "coin3d"; repo = "pivy"; rev = version; - sha256 = "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"; + sha256 = "1xlynrbq22pb252r37r80b3myzap8hzhvknz4zfznfrsg9ykh8k2"; }; dontUseCmakeConfigure = true; From aae7e1e06361195cbd9a83cafc675c0b26f01f31 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:39 -0800 Subject: [PATCH 211/703] python3Packages.plotly: 5.4.0 -> 5.5.0 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index c4811044ae2b..fbe869b07032 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.4.0"; + version = "5.5.0"; src = fetchPypi { inherit pname version; - sha256 = "735d50738c760ecbf3a38e2336b8c1b119bff2d857096e4f68af31089b798161"; + sha256 = "20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0"; }; propagatedBuildInputs = [ From f9350485eb3027a166efa0cda51a2ec498f0e4d4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:39 -0800 Subject: [PATCH 212/703] python3Packages.plugwise: 0.15.4 -> 0.16.0 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 91902a857448..92ab93256c57 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.15.4"; + version = "0.16.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "0lp87vn9kh0xqng5mv5j914pgrbnhp54bisq76njijn32mgaw4qq"; + sha256 = "1zgrq70ihkix39kf08h8xbjxa49800j9l6rn9nbgzwd25d7nlal0"; }; postPatch = '' From 94550a0569a009537555dee52f40d709eba3047c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:39 -0800 Subject: [PATCH 213/703] python3Packages.portend: 2.7.2 -> 3.1.0 --- pkgs/development/python-modules/portend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 52e46cec75a0..a3cb25624f7a 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "portend"; - version = "2.7.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3fbc0df9e4970b661e4d7386a91fc7bcf34ebeaf0333ce15d819d515a71ba8b2"; + sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4"; }; postPatch = '' From 5e55bec736ce255a942c28559b04266c9cffd3b8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:39 -0800 Subject: [PATCH 214/703] python3Packages.portpicker: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/portpicker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index 90ed4b34b707..fd7bf7bc09c3 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.4.0"; + version = "1.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "c2831ff4328a21e928ffc9e52124bcafacaf5816d38a1a72dc329680dc1bb7ba"; + sha256 = "e13b148008adeb2793cf8b55bcd20fdcec4f763f2d3bf3c45f5e5e5d1df7d228"; }; meta = { From eacb65e426d2bfe95c39d0f44aa2687a42b58a83 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:39 -0800 Subject: [PATCH 215/703] python3Packages.pot: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/pot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 86c7b61ae27f..41d0cc402eef 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pot"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { pname = "POT"; inherit version; - sha256 = "a70e092ddc5a29a4b526192750604a634dfc2faa1641664b4c2c1c00b3cd63cf"; + sha256 = "ff2974418fbf35b18072555c2a9e7e4f6876eddfb6791179ddb8f0f6d6032505"; }; postPatch = '' From 3e344a47db4979fbca29ce3abbca52a69fb0f083 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:40 -0800 Subject: [PATCH 216/703] python3Packages.prettytable: 2.4.0 -> 3.0.0 --- pkgs/development/python-modules/prettytable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 85aaa1e656d8..f914a0f3df44 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "18e56447f636b447096977d468849c1e2d3cfa0af8e7b5acfcf83a64790c0aca"; + sha256 = "69fe75d78ac8651e16dd61265b9e19626df5d630ae294fc31687aa6037b97a58"; }; nativeBuildInputs = [ setuptools-scm ]; From 39c14392938fd35a89eeda00ca7daabc5994557b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:40 -0800 Subject: [PATCH 217/703] python3Packages.progressbar2: 3.55.0 -> 4.0.0 --- pkgs/development/python-modules/progressbar2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 766b7090f90f..3f4f49d4299e 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.55.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "86835d1f1a9317ab41aeb1da5e4184975e2306586839d66daf63067c102f8f04"; + sha256 = "14d3165a1781d053ffaa117daf27cc706128d2ec1d2977fdb05b6bb079888013"; }; propagatedBuildInputs = [ python-utils ]; From ee5f49399d6bb6e0be5e22be320823f1da783eee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:40 -0800 Subject: [PATCH 218/703] python3Packages.prompt-toolkit: 3.0.23 -> 3.0.24 --- pkgs/development/python-modules/prompt-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 418e63ec9330..e38560be2eb6 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.23"; + version = "3.0.24"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "7053aba00895473cb357819358ef33f11aa97e4ac83d38efb123e5649ceeecaf"; + sha256 = "1bb05628c7d87b645974a1bad3f17612be0c29fa39af9f7688030163f680bad6"; }; propagatedBuildInputs = [ From 649812614c9cf9c5041cb547e62e594ed0e55cc0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:40 -0800 Subject: [PATCH 219/703] python3Packages.psutil: 5.8.0 -> 5.9.0 --- pkgs/development/python-modules/psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index ba17c5eca737..581e83ddf1a2 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.8.0"; + version = "5.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c"; + sha256 = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25"; }; # We have many test failures on various parts of the package: From 6811d97fd184308ee8b85a99e028726b92523e7a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:41 -0800 Subject: [PATCH 220/703] python3Packages.psycopg2: 2.9.2 -> 2.9.3 --- pkgs/development/python-modules/psycopg2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 34660a84cd60..bdf2b65cb507 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.9.2"; + version = "2.9.3"; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a84da9fa891848e0270e8e04dcca073bc9046441eeb47069f5c0e36783debbea"; + sha256 = "8e841d1bf3434da985cc5ef13e6f75c8981ced601fd70cc6bf33351b91562981"; }; nativeBuildInputs = [ From a40f6d4b615d01f384db32392da64d237f6cb3be Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:41 -0800 Subject: [PATCH 221/703] python3Packages.pyamg: 4.1.0 -> 4.2.1 --- pkgs/development/python-modules/pyamg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index 6ca3166fb19e..bf46734df514 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyamg"; - version = "4.1.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "b4cacfcfd13379762a4551ac059a2e52a093b476ca1ad44b9202e736490a8863"; + sha256 = "48d9be622049d8363cda84125c45d18b89e0ab7d99be5a93c0246f375ebad344"; }; propagatedBuildInputs = [ From 76d5f13773438b2b46a9eaff54a7a470c55a1537 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:41 -0800 Subject: [PATCH 222/703] python3Packages.pyatag: 0.3.5.3 -> 3.5.1 --- pkgs/development/python-modules/pyatag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatag/default.nix b/pkgs/development/python-modules/pyatag/default.nix index d2ed7d6ff34a..a06d2a05fb40 100644 --- a/pkgs/development/python-modules/pyatag/default.nix +++ b/pkgs/development/python-modules/pyatag/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyatag"; - version = "0.3.5.3"; + version = "3.5.1"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "MatsNl"; repo = "pyatag"; rev = version; - sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6"; + sha256 = "17x2m7icbby1y2zfc79jpbir2kvyqlrkix9pvvxanm658arsh8c7"; }; propagatedBuildInputs = [ From a1340a89dc6a0df9683d7b3660478bc52833f142 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:42 -0800 Subject: [PATCH 223/703] python3Packages.pychromecast: 10.2.2 -> 10.2.3 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index f9a4b24ffcd6..f5921d0dfd20 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "10.2.2"; + version = "10.2.3"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "bd1dbb9383ed549d42d12f337a6c664a9088b4910ebb3f11de6fe15f397e7efd"; + sha256 = "ddb86c5acdc13e8bdadd2b7f5738fda36b32c1750548f7b629ca8d178f05e0da"; }; propagatedBuildInputs = [ From 7070a551538eec6c13d28e8efe5c1305a3189b40 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:42 -0800 Subject: [PATCH 224/703] python3Packages.pycountry: 20.7.3 -> 22.1.10 --- pkgs/development/python-modules/pycountry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 868504e39949..560c5a708122 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "20.7.3"; + version = "22.1.10"; src = fetchPypi { inherit pname version; - sha256 = "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241"; + sha256 = "b9a6d9cdbf53f81ccdf73f6f5de01b0d8493cab2213a230af3e34458de85ea32"; }; checkInputs = [ From 193c07bbbfda7dec9af61a7335b5dec59ad4cb6c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:42 -0800 Subject: [PATCH 225/703] python3Packages.pydevccu: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/pydevccu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index f4ee3f6ad652..548f7db4c228 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-bLXACJPiHZlJzoDm7N9RWskN+qQddSkGFX9d4YcTaLo="; + sha256 = "1dfq7nqbmg7mqdcz27kvj772j61j1v47kz26f7map20x4kbz413b"; }; # Module has no tests From c7f9c31a2a50358fc8f151218c48543543c88dce Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:42 -0800 Subject: [PATCH 226/703] python3Packages.pyerfa: 2.0.0 -> 2.0.0.1 --- pkgs/development/python-modules/pyerfa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index b59aa56c48e9..7f51f435ada9 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyerfa"; format = "pyproject"; - version = "2.0.0"; + version = "2.0.0.1"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "sha256-+QQjHhpXD5REDgYUB5lZCJUQf5QoR7UqdTzoHJYJFi0="; + sha256 = "2fd4637ffe2c1e6ede7482c13f583ba7c73119d78bef90175448ce506a0ede30"; }; nativeBuildInputs = [ From 3fcfa5e4376b4fa45ae3a6e3307b20e00193c193 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:43 -0800 Subject: [PATCH 227/703] python3Packages.pyezviz: 0.2.0.5 -> 0.2.0.6 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index f7d564e7e54d..28d0bce2695b 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.5"; + version = "0.2.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-a+u8zS69qLHABPSvWEzhM/gdzlLh2RJLTDJjaX4DtpI="; + sha256 = "1zspymv8nz0gkx9m0fgls33hsw7rl0x4za87xx84ml4alcrp4r6w"; }; propagatedBuildInputs = [ From 1bc5fca230db8d0842019cd18160be564fb596b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:43 -0800 Subject: [PATCH 228/703] python3Packages.pyfakefs: 4.5.3 -> 4.5.4 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index eb5eb993ef48..29803793fd6f 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.3"; + version = "4.5.4"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f49db689c1d5db6172131479ca77bd474ba2cb886c869b9867fb89cdab2df397"; + sha256 = "5b5951e873f73bf12e3a19d8e4470c4b7962c51df753cf8c4caaf64e24a0a323"; }; postPatch = '' From bb23c9b4a1bbba6480b58e48c8de69999ae2448f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:43 -0800 Subject: [PATCH 229/703] python3Packages.pyfcm: 1.4.7 -> 1.4.8 --- pkgs/development/python-modules/pyfcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix index 8fdb051a4846..77ddabe2057e 100644 --- a/pkgs/development/python-modules/pyfcm/default.nix +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyfcm"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "olucurious"; repo = "pyfcm"; rev = version; - sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg"; + sha256 = "15q6p21wsjm75ccmzcsgad1w9fgk6189hbrp7pawpxl7l3qxn2p7"; }; propagatedBuildInputs = [ requests ]; From a81646eef3eee1eca6aeb1b82da78adab3f5ba47 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:43 -0800 Subject: [PATCH 230/703] python3Packages.pygame: 2.1.0 -> 2.1.2 --- pkgs/development/python-modules/pygame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 60a1fece63ac..09b70249960a 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = pname; @@ -14,7 +14,7 @@ buildPythonPackage rec { # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - sha256 = "sha256-Pe7BJ+8rXw+hhRv64fI+79gJcU1npQFFAXxECx2+Trw="; + sha256 = "0r4yibc5mxi3ymiy1lk079hs425n218yw232cg3i3fjx7534v4d0"; extraPostFetch = "rm -rf $out/docs/reST"; }; From c16124c8389f1ad3c5bd96fe07b982e48ad53ac5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:43 -0800 Subject: [PATCH 231/703] python3Packages.pygame-gui: 0.5.7 -> 060 --- pkgs/development/python-modules/pygame-gui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 58f65b6d0f41..831e1fa75375 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "0.5.7"; + version = "060"; src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; - rev = "v_${lib.replaceStrings ["."] [""] version}"; - sha256 = "4P2PT8/7oA5Q7H4+pm7BOET7w05pQYQltXVV3+YVrVE="; + rev = "v_${version}"; + sha256 = "1bw1nxfkjyn3h3xizz5s9lz6rgi9fav3y4cf5dq2hv9f5sads02g"; }; propagatedBuildInputs = [ pygame ]; From f685afd8e96eb05146cf6d5994f874a243fc7b75 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:43 -0800 Subject: [PATCH 232/703] python3Packages.Pygments: 2.10.0 -> 2.11.2 --- pkgs/development/python-modules/Pygments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index bb17af144cbe..af125e1f40ef 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.10.0"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"; + sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"; }; propagatedBuildInputs = [ docutils ]; From 31cdf8eb7f539790268159aba2a390b945f0b255 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:44 -0800 Subject: [PATCH 233/703] python3Packages.PyHamcrest: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/pyhamcrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index fd6ba2f2df98..a4c04ce79ee6 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "PyHamcrest"; - version = "2.0.2"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316"; + sha256 = "dfb19cf6d71743e086fbb761ed7faea5aacbc8ec10c17a08b93ecde39192a3db"; }; checkInputs = [ mock pytest ]; From c311091b4f45601ee6101cd62dbdb17e29c1c796 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:44 -0800 Subject: [PATCH 234/703] python3Packages.pyhocon: 0.3.58 -> 0.3.59 --- pkgs/development/python-modules/pyhocon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index f69a21115f27..aa967b76954a 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyhocon"; - version = "0.3.58"; + version = "0.3.59"; src = fetchFromGitHub { owner = "chimpler"; repo = "pyhocon"; rev = version; - sha256 = "sha256-ddspVDKy9++cISWH6R95r+gJrzNGqMTybI04OgVtIUU="; + sha256 = "1yr24plg3d4girg27ajjkf9mndig706fs8b2kmnmhi4l2xi866yh"; }; propagatedBuildInputs = [ From f663e8049e976f1dd48d6691f31e1b0250e8ffcb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:44 -0800 Subject: [PATCH 235/703] python3Packages.pyinsteon: 1.0.13 -> 1.0.14 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 04dbd8142ff6..f28b52d62b98 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.13"; + version = "1.0.14"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-KVwAF+yoU26ktNRKWQ+nrhS1i90xQxAhRAr4VJ+xtl0="; + sha256 = "0l6gx9bpxzpzs8jn37ja5znbfaaxjgp3db5rxgk156gjndvq476l"; }; propagatedBuildInputs = [ From 3826fe3f5b70d8822f6844cb1426711626e1f59c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:44 -0800 Subject: [PATCH 236/703] python3Packages.pylint-django: 2.4.4 -> 2.5.0 --- pkgs/development/python-modules/pylint-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index c93c8d4207fe..291ef8fba62e 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.4.4"; + version = "2.5.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bFcb5GhC7jc7jEpNlyjWa2CuCSMvQLJdnag+7mHwSb8="; + sha256 = "1r48dss9qnzlifwy5ylkffdw35aaajmil0486mav056jm1vmi2pr"; }; propagatedBuildInputs = [ From 4b238222b2b8f60c4c418ccaf65fe5394fb91b6b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:45 -0800 Subject: [PATCH 237/703] python3Packages.pylitterbot: 2021.11.0 -> 2021.12.0 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index be6d71aed5d3..1ed0a79ec400 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.11.0"; + version = "2021.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-HdIxi6RfdXBYEYFEcv/f9wAqKZg/MsEZd6mDYwE45to="; + sha256 = "1vm6fzsw10j9v9ki3ds5f7by5p8dqc3aflz2j34gwvb87i0qqgw7"; }; propagatedBuildInputs = [ From 12c89f45f9aee3d861bba1256be25c978577047b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:45 -0800 Subject: [PATCH 238/703] python3Packages.pylsp-mypy: 0.5.1 -> 0.5.7 --- pkgs/development/python-modules/pylsp-mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index e1d7ddff298d..a4725c4781c6 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.5.1"; + version = "0.5.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = version; - sha256 = "1d119csj1k5m9j0f7wdvpvnd02h548css6ybxqah92nk2v0rjscr"; + sha256 = "0am16z9kmj57r5pi32jhzlbdngzmvzzaiqjm7cba1izh7w5m6dvc"; }; disabledTests = [ From 91f47772e56991d8ea643ae58561e6aafcc45774 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:45 -0800 Subject: [PATCH 239/703] python3Packages.pymatgen: 2022.0.17 -> 2022.1.9 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 5354efacb4dc..d02d946f4d56 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.17"; + version = "2022.1.9"; src = fetchPypi { inherit pname version; - sha256 = "7103b89b889bb940709eea53226d3c9298584ad9ab42ab8c8f9de3872d7d969b"; + sha256 = "89774c0d87a38dc2f5d4d0148091f6aa240b3633121745826de66867e8d8ecc8"; }; nativeBuildInputs = [ glibcLocales ]; From 3ec9dbb0c54719c764df5003b9bf5db8d3290fcd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:45 -0800 Subject: [PATCH 240/703] python3Packages.pymupdf: 1.19.2 -> 1.19.4 --- pkgs/development/python-modules/pymupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index f7555d48ebb6..42c369dbf7e7 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.19.2"; + version = "1.19.4"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "964bbacddab9cba6cd2c8f388429fe4a97c0775b3096a13ac15724f5a1a2c58d"; + sha256 = "125783986da87fe1a5372d621e90fa49e454454af0b3d0f894858c146c712f81"; }; postPatch = '' From ac755e9fd0e18b31fcf8a44028f32a5c82b0945b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:45 -0800 Subject: [PATCH 241/703] python3Packages.pymysensors: 0.22.1 -> 0.23.0 --- pkgs/development/python-modules/pymysensors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index 9506e1504836..d071743d748d 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.22.1"; + version = "0.23.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "theolind"; repo = pname; rev = version; - sha256 = "sha256-n4khOQspJBeq0w+epdXYZh6I1lI1drB1JewZ6GfzVHs="; + sha256 = "0a09w1bzz2pn0w11f7kx8052914kdpgfb7w6hc9s50x8wl9q604h"; }; propagatedBuildInputs = [ From c3b3fb0bd7249f15f35f9b9f23dbf858e19c1c28 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:46 -0800 Subject: [PATCH 242/703] python3Packages.pynacl: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/pynacl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 91a197e7cf66..3a664b29eedd 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pynacl"; - version = "1.4.0"; + version = "1.5.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "PyNaCl"; - sha256 = "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal"; + sha256 = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba"; }; buildInputs = [ From 2a7a38e40c8dd31493fdb17a4c649015164ea49f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:46 -0800 Subject: [PATCH 243/703] python3Packages.pyopencl: 2021.2.10 -> 2021.2.11 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index d657efd707f8..a0f9e70dcc8b 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -21,7 +21,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2021.2.10"; + version = "2021.2.11"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -30,7 +30,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "75a1f202741bace9606a8680bbbfac69bf8a73d4e7511fb1a6ce3e48185996ae"; + sha256 = "334a6cdde7ef18e4370604b9a1d6551b055e8828a4da004893f26091669b561b"; }; # py.test is not needed during runtime, so remove it from `install_requires` From 3ee9518d3dc42a25afc0d21bbfed860a64f8ef5b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:46 -0800 Subject: [PATCH 244/703] python3Packages.pyopenssl: 20.0.1 -> 21.0.0 --- pkgs/development/python-modules/pyopenssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 688731033a98..3b225ad721ea 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -64,12 +64,12 @@ in buildPythonPackage rec { pname = "pyopenssl"; - version = "20.0.1"; + version = "21.0.0"; src = fetchPypi { pname = "pyOpenSSL"; inherit version; - sha256 = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51"; + sha256 = "5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3"; }; outputs = [ "out" "dev" ]; From c84b744d79a8c9fd8a844cbe9f4f9661549ed562 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:46 -0800 Subject: [PATCH 245/703] python3Packages.pyparsing: 2.4.7 -> 3.0.6 --- pkgs/development/python-modules/pyparsing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 5ecfdfb88839..1d3ec43bc78b 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyparsing"; - version = "2.4.7"; + version = "3.0.6"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; rev = "pyparsing_${version}"; - sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; + sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a"; }; # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6 From 3fa3bb5a29c1232665ccf9b109ab8e0a2506f419 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:46 -0800 Subject: [PATCH 246/703] python3Packages.pypck: 0.7.11 -> 0.7.12 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 797657a28c5c..933dc415966e 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.11"; + version = "0.7.12"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "1jj0y487qcxrprx4x2rs6r7rqsf5m9khk0xhigbvnbyvh8rsd2jr"; + sha256 = "109rwkkivvk1nmcznsjym4b7bibsd4vp9mmqwx0ihbhw2wwp69bc"; }; checkInputs = [ From 6632636ceae581db7116d66ff751f03bb3bad6cb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:46 -0800 Subject: [PATCH 247/703] python3Packages.pyphen: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/pyphen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 74581ba7e33c..bd9cf1304acd 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyphen"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8"; + sha256 = "b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b"; }; preCheck = '' From 137a52ac567f56c532cd0883dfd4fa4c949a5bc0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:47 -0800 Subject: [PATCH 248/703] python3Packages.pypugjs: 5.9.9 -> 5.9.10 --- pkgs/development/python-modules/pypugjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index 77ca912db6c9..9b19c4c8a261 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pypugjs"; - version = "5.9.9"; + version = "5.9.10"; src = fetchPypi { inherit pname version; - sha256 = "0s0a239940z6rsssa13yz6pfkjk4300j35hs7qysyz45f3ixq19j"; + sha256 = "082dae87d44e184030b66da9ea9bd1a0209f86c089d8f2bd61064b97a7511a28"; }; propagatedBuildInputs = [ six chardet ]; From ff500ef246b480b807d7ad571ac9f0f413b78180 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:47 -0800 Subject: [PATCH 249/703] python3Packages.PySDL2: 0.9.9 -> 0.9.10 --- pkgs/development/python-modules/pysdl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 10515ed7a6e9..f42b901a594a 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.9"; + version = "0.9.10"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "45879ae588038d7cf7cb0289ae47af60722b394d0efa527bf4327103dc4dc918"; + sha256 = "20f6aa5dbb4e2a17fce883fc4c7a044f675a044d91291c3ba2647ef438aad359"; }; # Deliberately not in propagated build inputs; users can decide From 57e8a3f68f26feeb8883a86bf8305816e5101938 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:47 -0800 Subject: [PATCH 250/703] python3Packages.pyskyqremote: 0.2.54 -> 0.2.56 --- pkgs/development/python-modules/pyskyqremote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index 85fc18463690..2f5b1568ead1 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.2.54"; + version = "0.2.56"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = version; - sha256 = "sha256-Z3fcihyK8QHtdREXWt2ESqjwAwxFZFEI9OXf3Y9onmw="; + sha256 = "0lbg3sh907k9q861k5739iva9fl4w067fsdsn1d5d4nay2xqdbrq"; }; propagatedBuildInputs = [ From bd1f65b61761768eea482231044082d1edf1e70c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:48 -0800 Subject: [PATCH 251/703] python3Packages.pyTelegramBotAPI: 4.2.1 -> 4.3.1 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index f55c869a7a2c..a865226759f5 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.3.0"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "a0405d1c6c60e6603594e9319c28d31b97abe49afe9af21d230f5072a1d38976"; + sha256 = "0cf9338b8bdcc57e49a6d11b2492d8661c708bda165ab21940404b2db8c52ad6"; }; propagatedBuildInputs = [ aiohttp requests ]; From d079be0ced2647e1acd55a87fe9e8592890f3ef3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:48 -0800 Subject: [PATCH 252/703] python3Packages.pytest-arraydiff: 0.3 -> 0.5.0 --- pkgs/development/python-modules/pytest-arraydiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index bfbec757b1d7..cc1b1ab56c12 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-arraydiff"; - version = "0.3"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "de2d62f53ecc107ed754d70d562adfa7573677a263216a7f19aa332f20dc6c15"; + sha256 = "714149beffd0dfa085477c65791c1139b619602b049536353ce1a91397fb3bd2"; }; buildInputs = [ pytest ]; From 814e31bbd502108a7949fce7da4d155473a50a79 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:48 -0800 Subject: [PATCH 253/703] python3Packages.pytest-asyncio: 0.16.0 -> 0.17.0 --- pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 4059a3c12fbe..8fd36a8e09e6 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.16.0"; + version = "0.17.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4zMbzdDtiLRKo5C12wZRoBNguXLn3f26NuDwQ+pHA0I="; + sha256 = "1c7xddg76pixwlwdl4zxwpy48q2q619i8kzjx2c67a0i8xbx1q5r"; }; buildInputs = [ From 18ec49dc049a14604b05970a3df5627880b26f5e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:48 -0800 Subject: [PATCH 254/703] python3Packages.pytest-cov: 2.12.1 -> 3.0.0 --- pkgs/development/python-modules/pytest-cov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 87f5972a747d..52c592c86912 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "2.12.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1mzl06m8qcgsac1r2krixrkqdwq0nqk8asrpkcj2ddr7qawfw716"; + sha256 = "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"; }; buildInputs = [ pytest ]; From b6abe04e5f0e92e6e73bbadcc2efc8e82ba0be23 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:48 -0800 Subject: [PATCH 255/703] python3Packages.pytest-django: 4.5.1 -> 4.5.2 --- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index d3b2bc66aae4..c4668def279e 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "4.5.1"; + version = "4.5.2"; src = fetchPypi { inherit pname version; - sha256 = "01fe1242e706375d7c942d206a30826bd9c0dffde99bfac627050cdc91f0d792"; + sha256 = "d9076f759bb7c36939dbdd5ae6633c18edfc2902d1a69fdbefd2426b970ce6c2"; }; nativeBuildInputs = [ pytest setuptools-scm ]; From 335ef2c7b58314b66c00279bc9180cfc6157eb46 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:48 -0800 Subject: [PATCH 256/703] python3Packages.pytest-httpbin: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/pytest-httpbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 836da1e157ff..17aa011d4006 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-httpbin"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0wlvw5qgkax7f0i5ks1562s37h2hdmn5yxnp1rajcc2289zm9knq"; + sha256 = "9f73320f97d33cc20bc8a08cb945372948de51402559e87e74e92c56b48da0d7"; }; checkInputs = [ pytest ]; From a6f961241aa2c6cc041cdec4ea931af284f6ba84 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:49 -0800 Subject: [PATCH 257/703] python3Packages.pytest-localserver: 0.5.1 -> 0.5.1.post0 --- .../development/python-modules/pytest-localserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index e5008af9ef2f..e3823c18d895 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.5.1"; + version = "0.5.1.post0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "ef6f04193dc0f7e8df5b27b3a8834318fa12eaf025436d2a99afff1b73cde761"; + sha256 = "5ec7f8e6534cf03887af2cb59e577f169ac0e8b2fd2c3e3409280035f386d407"; }; propagatedBuildInputs = [ From 1ac92dbbf65eb5819925fd88fe81940da6e61b5a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:49 -0800 Subject: [PATCH 258/703] python3Packages.pytest-remotedata: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/pytest-remotedata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index fb91f461329e..b42f539d2e07 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-remotedata"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "e20c58d4b7c359c4975dc3c3d3d67be0905180d2368be0be3ae09b15a136cfc0"; + sha256 = "66920bf1c62928b079d0e611379111a0d49f10a9509ced54c8269514ccce6ee3"; }; buildInputs = [ pytest ]; From 30d093cc9d7d7dd01c861604786536ed26889bfd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:49 -0800 Subject: [PATCH 259/703] python3Packages.pytest-timeout: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/pytest-timeout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index f504bd80868b..f99340e48b3b 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pexOzt246nJpEYSFk9ZoWUEH55diHpf5Oh0dvG+7kIA="; + sha256 = "e6f98b54dafde8d70e4088467ff621260b641eb64895c4195b6e5c8f45638112"; }; buildInputs = [ From 7daf38ac28b33ec3007610ddd3d1e3811ac32222 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:49 -0800 Subject: [PATCH 260/703] python3Packages.python-dbusmock: 0.19 -> 0.25.0 --- pkgs/development/python-modules/python-dbusmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index d643603a0679..a714260bda66 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.19"; + version = "0.25.0"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "09j338lmrjabbd3fpajr4piz4r20sl33030szfsqfzlwrrmvkyi0"; + sha256 = "0zg2aib0k6hc1vvlbdcmp003m85dvkv7pndzgkc4vv2y9qpi0jp9"; }; prePatch = '' From 5824c4b62348dc4f61b83d10161e7a70ea60be11 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:49 -0800 Subject: [PATCH 261/703] python3Packages.pythonocc-core: 0.18.1 -> 7.5.1 --- pkgs/development/python-modules/pythonocc-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 9039c52a8a42..b93ef3292e35 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pythonocc-core"; - version = "0.18.1"; + version = "7.5.1"; src = fetchFromGitHub { owner = "tpaviot"; repo = "pythonocc-core"; rev = version; - sha256 = "1jk4y7f75z9lyawffpfkr50qw5452xzi1imcdlw9pdvf4i0y86k3"; + sha256 = "1md6x60pnfq0qv4lsnmjv6i96mzdrcpxcgpb316i7wmv9b5ci01s"; }; postPatch = '' From 15905b4a7bcb4bf90ed054db9b1393a2b67eaddd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:50 -0800 Subject: [PATCH 262/703] python3Packages.python-snap7: 1.0 -> 1.1 --- pkgs/development/python-modules/python-snap7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index b494d2e442e6..0d34262ea3bb 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "gijzelaerr"; repo = "python-snap7"; rev = version; - sha256 = "103drdwf4v3yqvd7sscxx154mmmshb6x19v9yqmkj2lj76m0619s"; + sha256 = "18z13wb2q5q3msp9w3wddg1byp7picczw4ng8w1ccj4npidxsqv8"; }; propagatedBuildInputs = [ setuptools six ]; From e1558324f336fe26bfdc2097e70db98da85a71d2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:50 -0800 Subject: [PATCH 263/703] python3Packages.python-socks: 2.0.0 -> 2.0.2 --- pkgs/development/python-modules/python-socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index e6c2d016bb09..e11f5ff1eb53 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.0.0"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.6.1"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iTwlUyfTD2ZhOvBX3IDqjkeW4Z2tfKxvQjIV7GGBVJA="; + sha256 = "1ixhi23x28bg45146p23z26y38rlz445xr0inwgx7avh0rs7vwfx"; }; propagatedBuildInputs = [ From 801a9c475cb86171c7ca5d7dafd46ff97da2b0a1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:50 -0800 Subject: [PATCH 264/703] python3Packages.python-utils: 2.7.0 -> 3.0.0 --- pkgs/development/python-modules/python-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index d79f357e50e1..ee8861056860 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "python-utils"; - version = "2.7.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "WoLpH"; repo = pname; rev = "v${version}"; - sha256 = "0gns9v5144cj03p7qbb3822scb6pwrlgr6niixpkynwqkcwjfg4c"; + sha256 = "003radi605xjjxfa6fc9jih8j2l3yjkvanql20w9ppxs0v5vzm9w"; }; # disable coverage and linting From 90f30383913d5f401e8657b02121baf1e24a3a94 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:50 -0800 Subject: [PATCH 265/703] python3Packages.pytibber: 0.21.6 -> 0.22.0 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index fbfd0ba030cf..784f73f71811 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.21.6"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - hash = "sha256-zgiUXGso3bQ3pCD7r+VYHGBIihPwSfHibS2OZvPUb3Q="; + hash = "sha256-4eARNxVXtJtUC0oxym1kv5z+WkxgCHJZtN3MrIMA8+s="; }; propagatedBuildInputs = [ From 860dd3ea23e2bdc818bd717347bf7770239a1352 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:51 -0800 Subject: [PATCH 266/703] python3Packages.pytorch-lightning: 0.8.5 -> 1.5.8 --- pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 63991752a8ac..de75aa0ae8fb 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "0.8.5"; + version = "1.5.8"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = version; - sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a"; + sha256 = "161mz66l11z4350q93fmmq3x0jzbp5761lf4fx3yvz17qzp7ygkn"; }; propagatedBuildInputs = [ From a6ce85917e4149edc228f3f85006e1bf3082b036 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:51 -0800 Subject: [PATCH 267/703] python3Packages.pytorch-metric-learning: 0.9.99 -> 1.1.0 --- .../python-modules/pytorch-metric-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 0c1ca751eb13..e9728b3d676c 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "0.9.99"; + version = "1.1.0"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "1ahs2b7q3hxi6yv4g2fjy7mvl899h56dvlpc2r9301440qsgkdzr"; + sha256 = "0qvlxgdml22fzrs47yzqpfzak8lfdrzayvapawfz93cq8903h7qp"; }; propagatedBuildInputs = [ From 06335be2fe19bc08df9d24d415b6a4e4dbb76187 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:51 -0800 Subject: [PATCH 268/703] python3Packages.pytradfri: 8.0.0 -> 8.0.1 --- pkgs/development/python-modules/pytradfri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 3e50debd835c..1a2e6cc43ecb 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "8.0.0"; + version = "8.0.1"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - hash = "sha256-YnQUZcqSldtRqzMac5sPoSNDT+ifs3Jqek2CoDeobe8="; + hash = "sha256-Wxz2P55lc7yJ1OXNXYWb25a+xtMs1sANNc7hE7nawHI="; }; propagatedBuildInputs = [ From 4ee5c0fbae3f89229c6d3f0e8379762907e7e729 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:51 -0800 Subject: [PATCH 269/703] python3Packages.pyvlx: 0.2.19 -> 0.2.20 --- pkgs/development/python-modules/pyvlx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 1a78aefa6daf..b63fd1521736 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "Julius2342"; repo = pname; rev = version; - sha256 = "031gp3sjagvmgdhfpdqlawva425ja1n3bmxk6jyn4zx54szj9zwf"; + sha256 = "1irjix9kr6qih84gii7k1a9c67n8133gpnmwfd09550jsqdmg006"; }; propagatedBuildInputs = [ pyyaml ]; From a67342b77898f3c614b712f3f81f3bc4da5500cf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:52 -0800 Subject: [PATCH 270/703] python3Packages.pywlroots: 0.14.12 -> 0.15.0 --- pkgs/development/python-modules/pywlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 901161d634fe..45999081c840 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.14.12"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "80v1kuiYL3OdtDVJj0EvgrO9x1eN8xxUyRuI4Wb4giI="; + sha256 = "cc3edf7b6f5cef1b78875106ec39f5c317603737fadffb07ddf44218965a8351"; }; nativeBuildInputs = [ pkg-config ]; From 20edb5a8c0c38dfacfc22161ce7929e4ce3a5487 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:52 -0800 Subject: [PATCH 271/703] python3Packages.qdarkstyle: 2.8.1 -> 3.0.3 --- pkgs/development/python-modules/qdarkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index 6b9b94b603f4..6e3b6064fcb7 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "qdarkstyle"; - version = "2.8.1"; + version = "3.0.3"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"; + sha256 = "936d2d35b552f429803a985dbc17fc879a2f966faa9fbf8983896ccfa33e68f6"; }; # No tests available From 3514082c552e84c0ce1a16ae1e3c021e4b5b04c4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:52 -0800 Subject: [PATCH 272/703] python3Packages.qiling: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/qiling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 3576f5b73660..51c762c81075 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "qiling"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xUoNHMyGN0G2itVcKLsk+7QKxZdguzyh6OZCqCHNB4Y="; + sha256 = "e72dc5856cbda975f962ddf063063a32bd6c3b825f75e0795e94ba6840a7d45f"; }; propagatedBuildInputs = [ From 44052affb6ba3005530b59062bfed76fc6140bca Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:52 -0800 Subject: [PATCH 273/703] python3Packages.qiskit-aer: 0.9.1 -> 0.10.2 --- pkgs/development/python-modules/qiskit-aer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index b2e708d586f7..13ffac0c2f72 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.9.1"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "sha256-SAJjU2zYz6UabOPV1KI2JB7CbJfUJcjbPKbo6iiCk/g="; + sha256 = "0icdsiwpvjwiakg94i562wpgnj1qd7l8pkcjnvfwksq4w3pd9xjg"; }; postPatch = '' From 8b376e74ae626989134808570a31b14469b2dd6d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:52 -0800 Subject: [PATCH 274/703] python3Packages.qiskit: 0.32.1 -> 0.34.1 --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 9d050606006c..b6195d9bd84e 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -29,7 +29,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.32.1"; + version = "0.34.1"; disabled = pythonOlder "3.6"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "sha256-0L4TlolvL1akHhWSJ0GRQ/Cu/rZ+Es00jjNM5Ho2uEA="; + sha256 = "08hfd5ny206x2d9r700wgcmqvh0vcisp4kbv6n3grdizwbvh0ny0"; }; propagatedBuildInputs = [ From 8cb74596d7ee9e16464f9b10908e56c308dddda0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:53 -0800 Subject: [PATCH 275/703] python3Packages.qiskit-finance: 0.2.1 -> 0.3.0 --- pkgs/development/python-modules/qiskit-finance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index d4eaa58e7af9..05676a60f124 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-finance"; - version = "0.2.1"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-fEhc/01j6iYYwS6mLle+TpX9j0DVn12oPUFamEecoAY="; + sha256 = "1wpx519apnpp25yiq20warg4q8yv09x8fk0m8b9kyp199x86iffp"; }; propagatedBuildInputs = [ From 80feef88d9a97691fd5697c2e4ca2570bc7a3d41 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:53 -0800 Subject: [PATCH 276/703] python3Packages.qiskit-ibmq-provider: 0.18.1 -> 0.18.3 --- .../python-modules/qiskit-ibmq-provider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 5b304bf38984..0c8f74cf66dd 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.18.1"; + version = "0.18.3"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "sha256-rySSCyI+62G7kL1ZRtjX1WeWj3LPXECvrlXAcIDINF4="; + sha256 = "1n1w1lnq2xw94hhhn6kdvw8dqlxk5fxwpm8ng31gxbp1s3qgni17"; }; propagatedBuildInputs = [ From 5041725bb71df49c722e156511412e5966a011f9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:53 -0800 Subject: [PATCH 277/703] python3Packages.qiskit-ignis: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/qiskit-ignis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index f7ebbee39f80..a8f45b73e490 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.6"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - hash = "sha256-L5fwCMsN03ojiDvKIyqsGfUnwej1P7bpyHlL6mu7nh0="; + hash = "sha256-5dsRKsz/nruWKuox/WJBghp2CWSDuYvax+G5ZxjZG4s="; }; propagatedBuildInputs = [ From 74f3ef72387219db3ae660ee529741fe5a32b51f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:53 -0800 Subject: [PATCH 278/703] python3Packages.qiskit-machine-learning: 0.2.1 -> 0.3.0 --- .../python-modules/qiskit-machine-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index a2006079c195..511bc0b2a0be 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.2.1"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-2dfrkNZYSaXwiOCaRrPckq4BllANgc6BogyBcP0vosY="; + sha256 = "0jycs18apnwrksarpwpmp7scndyx91vnv6fchil4jyx4kym8mnf9"; }; propagatedBuildInputs = [ From 9afba017d1652002dc5304ddd6f676b44f6ef786 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:53 -0800 Subject: [PATCH 279/703] python3Packages.qiskit-nature: 0.2.2 -> 0.3.0 --- pkgs/development/python-modules/qiskit-nature/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 09941fcdd448..66f7bdbf626d 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.2.2"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-nQbvH911Gt4KddG23qwmiXfRJTWwVEsrzPvuTQfy4FY="; + sha256 = "1lr198l2z9j1hw389vv6mgz6djkq4bw91r0hif58jpg8w6kmzsx9"; }; postPatch = '' From dfb00419641c94b8c11f4f2ca04b71c15fb69435 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:53 -0800 Subject: [PATCH 280/703] python3Packages.qiskit-optimization: 0.2.3 -> 0.3.0 --- .../python-modules/qiskit-optimization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index 5d9ae3d4375f..b1ce0561dc4b 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qiskit-optimization"; - version = "0.2.3"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-y/j/cerzMAKVjehh1LUqYe1Juoa4lIxH2qS165S9img="; + sha256 = "18qs0m21j73fjawq3pxz5q5c0g2wgqgicy7p4a57lialpv6vrmc0"; }; postPatch = '' From c5e59fa143d80014391b8a776f65c86df3ba216c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:54 -0800 Subject: [PATCH 281/703] python3Packages.qiskit-terra: 0.18.3 -> 0.19.1 --- pkgs/development/python-modules/qiskit-terra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index da31f86500fb..75d4ba2c0bad 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -56,7 +56,7 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.18.3"; + version = "0.19.1"; disabled = pythonOlder "3.6"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "sha256-w/EnkdlC1hvmLqm4I8ajEYADxqMYGdHKrySLcb/yWGs="; + sha256 = "16d8dghjn81v6hxfg4bpj3cl2csy2rkc279qvijnwp2i9x4y8iyq"; }; nativeBuildInputs = [ cython ]; From 25813dcf41bb9b33594d463d1a78279530bd9d06 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:54 -0800 Subject: [PATCH 282/703] python3Packages.QtPy: 1.11.3 -> 2.0.0 --- pkgs/development/python-modules/qtpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 4bcb536ad826..5ecec3f7cd23 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.11.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d427addd37386a8d786db81864a5536700861d95bf085cb31d1bea855d699557"; + sha256 = "777e333df4d711b2ec9743117ab319dadfbd743a5a0eee35923855ca3d35cd9d"; }; # no concrete propagatedBuildInputs as multiple backends are supposed From 3883eac939756f053ac9251a7224bfa75671f4e9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:54 -0800 Subject: [PATCH 283/703] python3Packages.quantities: 0.12.5 -> 0.13.0 --- pkgs/development/python-modules/quantities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 28e08eade43d..48cc70d5f2af 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.5"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0"; + sha256 = "0fde20115410de21cefa786f3aeae69c1b51bb19ee492190324c1da705e61a81"; }; propagatedBuildInputs = [ From d0306185536c1753216c4830287e0d6c4bcd6d47 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:54 -0800 Subject: [PATCH 284/703] python3Packages.rdflib: 6.0.2 -> 6.1.1 --- pkgs/development/python-modules/rdflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 2ffe190a4720..f107435a78bd 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "rdflib"; - version = "6.0.2"; + version = "6.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YTauBWABR07ir/X8W5VuYqEcOpxmuw89nAqqX7tWhU4="; + sha256 = "8dbfa0af2990b98471dacbc936d6494c997ede92fd8ed693fb84ee700ef6f754"; }; propagatedBuildInputs = [ From f4a8da04ff63fc84c1e1dd91360b0b50352d7dce Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:54 -0800 Subject: [PATCH 285/703] python3Packages.readchar: 2.0.0 -> 3.0.5 --- pkgs/development/python-modules/readchar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index c83a2bba1cd6..817bebc71b2e 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "readchar"; - version = "2.0.0"; + version = "3.0.5"; # Don't use wheels on PyPI src = fetchFromGitHub { owner = "magmax"; repo = "python-${pname}"; rev = version; - sha256 = "0j1vj4f2j8x5f40rs6h8qplklcxcdbvkkvjpkpmr1xagw05i12bm"; + sha256 = "01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx"; }; nativeBuildInputs = [ flake8 ]; From 678baa978eb67dd79aa335323ca6fe24a6aea6ce Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:55 -0800 Subject: [PATCH 286/703] python3Packages.reolink: 0.56 -> 0053 --- pkgs/development/python-modules/reolink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 71f94d489aa1..69a1b11fea4c 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0.56"; + version = "0053"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ld1KDWweaG7y7EPN6Y19PzQRGCIFAPEb6AmlXXbjgCU="; + sha256 = "0qjp7n2qa9n9fdhfcgfgw89hy19z5144cxhkhmhv1xnfdiz175qd"; }; propagatedBuildInputs = [ From e1f7b3ac529b106ffd1967c5f2bcc45eee6591dc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:55 -0800 Subject: [PATCH 287/703] python3Packages.reportlab: 3.6.3 -> 3.6.5 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 9fac4f0c2410..82d84dc26a97 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.3"; + version = "3.6.5"; src = fetchPypi { inherit pname version; - sha256 = "be4f05230eb17b9c9c61a180ab0c89c30112da2823c77807a2a5ddba19365865"; + sha256 = "d8fe27ad312671c9347cf5997f7c1017833fac17233f33296281ba9fa0de189a"; }; checkInputs = [ glibcLocales ]; From 418d62ea2c04db0d9e65633bf4d4932c0a1938cd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:56 -0800 Subject: [PATCH 288/703] python3Packages.requirements-parser: 0.2.0 -> 0.3.1 --- .../python-modules/requirements-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix index 71cb33560e05..493b4815571c 100644 --- a/pkgs/development/python-modules/requirements-parser/default.nix +++ b/pkgs/development/python-modules/requirements-parser/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "requirements-parser"; - version = "0.2.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "5963ee895c2d05ae9f58d3fc641082fb38021618979d6a152b6b1398bd7d4ed4"; + sha256 = "3852277618e653dd1d8fa4129e59b4338358dffafeb3d5106e9f88504db9c460"; }; checkInputs = [ From 7e2049d82fd66e489e19b98379536179f032c4c1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:56 -0800 Subject: [PATCH 289/703] python3Packages.respx: 0.19.0 -> 0.19.1 --- pkgs/development/python-modules/respx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index d085d43008bb..51d88446c0b5 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8="; + sha256 = "134h9526md242p7ql0cpknqvkpd3fhxk2vridkvswg91f532w180"; }; propagatedBuildInputs = [ From ae01829c7f91311ad6d446fd199d5a18f0e7fb5c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:57 -0800 Subject: [PATCH 290/703] python3Packages.rlp: 2.0.1 -> 3.0.0 --- pkgs/development/python-modules/rlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index eca38c08f014..ec735c057abf 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rlp"; - version = "2.0.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "665e8312750b3fc5f7002e656d05b9dcb6e93b6063df40d95c49ad90c19d1f0e"; + sha256 = "63b0465d2948cd9f01de449d7adfb92d207c1aef3982f20310f8009be4a507e8"; }; checkInputs = [ pytest hypothesis ]; From 7980506d6556901d913e46dd7e27cf5e8b11aa05 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:57 -0800 Subject: [PATCH 291/703] python3Packages.robotframework-seleniumlibrary: 5.1.3 -> 6.0.0 --- .../python-modules/robotframework-seleniumlibrary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index ed2ba7155c7e..012d899ef2a5 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: buildPythonPackage rec { - version = "5.1.3"; + version = "6.0.0"; pname = "robotframework-seleniumlibrary"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "v${version}"; - sha256 = "1djlrbrgd7v15xk5w90xk7iy98cr1p2g57k614gvbd298dmnf2wd"; + sha256 = "1rjzz6mrx4zavcck2ry8269rf3dkvvs1qfa9ra7dkppbarrjin3f"; }; propagatedBuildInputs = [ robotframework selenium ]; From 8a994d3db66c9596702b5fb9b7c6a518d1389d3b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:57 -0800 Subject: [PATCH 292/703] python3Packages.robotstatuschecker: 1.3 -> 2.1.0 --- .../development/python-modules/robotstatuschecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 81226a23452e..63e87609ac25 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { - version = "1.3"; + version = "2.1.0"; pname = "robotstatuschecker"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "statuschecker"; rev = version; - sha256 = "0rppwwpp4djn5c43x7icwslnxbzcfnnn3c6awpg1k97j69d2nmln"; + sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz"; }; propagatedBuildInputs = [ robotframework ]; From 9fcc13bab986753a248c61484493412847a2c1e3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:57 -0800 Subject: [PATCH 293/703] python3Packages.rokuecp: 0.8.4 -> 0.10.0 --- pkgs/development/python-modules/rokuecp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index e1ee42b08157..73e5209a1993 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.8.4"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - sha256 = "sha256-vwXBYwiDQZBxEZDwLX9if6dt7tKQQOLyKL5m0q/3eUw="; + sha256 = "08cxqm8m39wwprcnhmyfq7aj1wxkzq7rq5lzsaw1p3lrzgif1mxr"; }; propagatedBuildInputs = [ From eb72011a748678506f8d4865c016f4450e996ca4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:57 -0800 Subject: [PATCH 294/703] python3Packages.roonapi: 0.0.38 -> 0.0.39 --- pkgs/development/python-modules/roonapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index ccc5749387b1..c9c4c9af5ba5 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.0.38"; + version = "0.0.39"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - sha256 = "sha256-vXx7MgoGjBPdx7uKUtAVqlXphPJYt5SyuTo2JlKia60="; + sha256 = "03m00qbdkm0vdflc48ds186kh9qjxqr6z602yn3l6fzj5f93zgh5"; }; nativeBuildInputs = [ From 513c091ec0420771fab70164d7f133e1846f89c8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:58 -0800 Subject: [PATCH 295/703] python3Packages.s3fs: 2021.11.1 -> 2022.1.0 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 22d7eb1a09f6..d90d1052282d 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2021.11.1"; + version = "2022.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1a9ea7596663cda3a5dc6802f11eb468b397de35a8793750e9a98c65abd1a114"; + sha256 = "6bafc1f6b4e935ea59512c0f38d5cb9c299dbbfe738e40c3d1de8f67b4ee1fd4"; }; buildInputs = [ From 4eccb75847d99f0ac85a38886a9583510ad71912 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:58 -0800 Subject: [PATCH 296/703] python3Packages.sanic: 21.9.3 -> 21.12.1 --- pkgs/development/python-modules/sanic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 2fab2a3df889..1ec5ab87d83c 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "sanic"; - version = "21.9.3"; + version = "21.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = pname; rev = "v${version}"; - sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i"; + sha256 = "0jyl23q7b7fyqzan97qflkqcvmfpzbxbzv0qgygxasrzh80zx67g"; }; postPatch = '' From 45e8b6f9362eaa2071904e6b4b4dd2db0a8cccaa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:58 -0800 Subject: [PATCH 297/703] python3Packages.sanic-routing: 0.7.2 -> 21.12.0 --- pkgs/development/python-modules/sanic-routing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index b0ecc5ed122c..90859c40fa02 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "sanic-routing"; - version = "0.7.2"; + version = "21.12.0"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-routing"; rev = "v${version}"; - hash = "sha256-MN6A8CtDVxj34eehr3UIwCT09VOfcruVX+/iImr1MgY="; + hash = "sha256-IN+keJ5OI++p33/FgW5Xo+Pk09VuR7EASDF7G6eWvM4="; }; checkInputs = [ pytestCheckHook pytest-asyncio ]; From f71a2a75e70c05bdda6fc8387e68016790fd0ead Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:58 -0800 Subject: [PATCH 298/703] python3Packages.sanic-testing: 0.7.0 -> 0.8.2 --- pkgs/development/python-modules/sanic-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index c99a78e0cc18..4bc446c2e142 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "0.7.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; rev = "v${version}"; - sha256 = "0ib6rf1ly1059lfprc3hpmy377c3wfgfhnar6n4jgbxiyin7vzm7"; + sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8"; }; postPatch = '' From 18ab60af969c4b9ca7ec1b17bd1260a1bd936ce8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:59 -0800 Subject: [PATCH 299/703] python3Packages.sapi-python-client: 0.1.3 -> 0.4.1 --- .../development/python-modules/sapi-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix index 58cdfe646c65..8375c62e979f 100644 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.1.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "keboola"; repo = pname; rev = version; - sha256 = "1xja4v5d30hy26lfys21vcz1lcs88v8mvjxwl2dc3wxx2pzdvcf6"; + sha256 = "189dzj06vzp7366h2qsfvbjmw9qgl7jbp8syhynn9yvrjqp4k8h3"; }; postPatch = '' From 7586689e654631f89d8b84cb998b824dff33e7c4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:59 -0800 Subject: [PATCH 300/703] python3Packages.scikit-tda: 0.0.4 -> 1.0.0 --- pkgs/development/python-modules/scikit-tda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index bf3e1d1ef469..4ccfb473915c 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "scikit-tda"; - version = "0.0.4"; + version = "1.0.0"; disabled = isPy27; src = fetchFromGitHub { owner = "scikit-tda"; repo = "scikit-tda"; rev = version; - sha256 = "0a90k6i9fkmc9gf250b4fidx2fzd2qrn025l74mjk51fvf23q13a"; + sha256 = "0yhmf5jmxywyj6l9q0rfv9r8wpdk063fvvfnb4azwwccblgz37rj"; }; propagatedBuildInputs = [ From 21036784279dc393eb5f827dce823deaa7bf334f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:58:59 -0800 Subject: [PATCH 301/703] python3Packages.setuptools-rust: 0.12.1 -> 1.1.2 --- pkgs/development/python-modules/setuptools-rust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 81276f4e338d..20e90de29433 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "0.12.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e"; + sha256 = "a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1"; }; nativeBuildInputs = [ setuptools-scm ]; From fa08ea6a19a2cee42aa8bdf85ea9e17a84bc1a32 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:00 -0800 Subject: [PATCH 302/703] python3Packages.smmap: 4.0.0 -> 5.0.0 --- pkgs/development/python-modules/smmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 800cf0842582..5e8344e3d637 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "smmap"; - version = "4.0.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182"; + sha256 = "c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"; }; checkInputs = [ nosexcover ]; From 4362f8c3abf89ca518d0588a6022058fb1c936b0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:00 -0800 Subject: [PATCH 303/703] python3Packages.sphinx-jinja: 1.1.1 -> 1.4.0 --- pkgs/development/python-modules/sphinx-jinja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix index 6f721ad1a8f6..7f5ea8c4241a 100644 --- a/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sphinx-jinja"; - version = "1.1.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0hz13vc65zi4zmay40nz8wzxickv1q9zzl6x03qc7rvvapz0c91p"; + sha256 = "e6614d986c0289cb85b016c25eb8cb9781ceb841e70bee639c5123f39ad90b38"; }; buildInputs = [ pbr ]; From 0745652bf3b9780d10dc5c24783c3ca00e533fff Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:01 -0800 Subject: [PATCH 304/703] python3Packages.spyder: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 38558f004984..419ac6bbb39c 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.2.0"; + version = "5.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cd04acc88426acee9c4ce6bb91f50c13fc161a437e68bca701243b3415ce9d08"; + sha256 = "b318a70a75acd200018a547d2ff2d2f55e7507054469d0c77ec6f967ac3c2d28"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; From 6811d4ac5029d8c73a9d2dce47cfab521f32f1a3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:01 -0800 Subject: [PATCH 305/703] python3Packages.spyder-kernels: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 4c43ce2f1617..4ddacc911903 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6b19ea224f183dbff8ff0031bee35ae6b5b3a6eef4aa84cfab04e3bc3e304b91"; + sha256 = "574ee1bd03f7236b9f9dacae34936a0625cd67ccfe3df11fec69f26889a0b866"; }; propagatedBuildInputs = [ From d9a149cd08769507d6f418f63d1ddb8048fa19c7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:01 -0800 Subject: [PATCH 306/703] python3Packages.sqlalchemy-utils: 0.37.9 -> 0.38.2 --- 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 685bb829dd3b..05ef00dae0ef 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.37.9"; + version = "0.38.2"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "4667edbdcb1ece011076b69772ef524bfbb17cc97e03f11ee6b85d98e7741d61"; + sha256 = "9e01d6d3fb52d3926fcd4ea4a13f3540701b751aced0316bff78264402c2ceb4"; }; propagatedBuildInputs = [ From 9530c1a9613e1cb0f53c6abf2ec957618f16347b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:01 -0800 Subject: [PATCH 307/703] python3Packages.sqlitedict: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/sqlitedict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index 1c28d6a0976d..b9af16855a40 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "sqlitedict"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; rev = version; - sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m"; + sha256 = "08fr81rz1fz35d35kravg7vl234aqagr9wqb09x6wi9lx9zkkh28"; }; checkInputs = [ pytest ]; From 429eeeebae87bf67488939f97dd8893b00aea5e9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:01 -0800 Subject: [PATCH 308/703] python3Packages.sslyze: 5.0.0 -> 5.0.2 --- pkgs/development/python-modules/sslyze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 587572646abc..f76ba96a5b8f 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sslyze"; - version = "5.0.0"; + version = "5.0.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-7kUriEMHcGCXKs42KVWxXvM+JEEWf/8tnuoGujHbqHY="; + hash = "sha256-8xtnE5oFxH3wo2Smt65/xGDHxivexN6ggUpyUg42Cjk="; }; patchPhase = '' From 5aa5999d2750721259214bbc8407517df7addbad Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:01 -0800 Subject: [PATCH 309/703] python3Packages.staticjinja: 4.1.1 -> 4.1.2 --- pkgs/development/python-modules/staticjinja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index d0c4d39f1165..5340bc9c0771 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "4.1.1"; + version = "4.1.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-Bpgff3VaTylnYpkWoaWEiRWu4sYSP6dLbHDOjAhj7BM="; + sha256 = "0qqyadhqsn66b7qrpfj08qc899pjwfa2byqqzh73xq1n22i4cy30"; }; nativeBuildInputs = [ From 660927c9d68af2446282967e3ee8205cc454e41c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:02 -0800 Subject: [PATCH 310/703] python3Packages.structlog: 21.4.0 -> 21.5.0 --- pkgs/development/python-modules/structlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 2e90d3350dbe..b6eb0c2672ad 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "structlog"; - version = "21.4.0"; + version = "21.5.0"; format = "flit"; # sdist is missing conftest.py @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; rev = version; - sha256 = "sha256-uXFSrC1TvQV46uu0sadC3eMq7yk5TnrpQE8m6NSv1Bg="; + sha256 = "0bc5lj0732j0hjq89llgrncyzs6k3aaffvg07kr3la44w0hlrb4l"; }; checkInputs = [ pytestCheckHook pytest-asyncio pretend freezegun simplejson twisted ]; From 99f362f0474cc33d7ac78a90c7d8fbccb6ca9d36 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:02 -0800 Subject: [PATCH 311/703] python3Packages.stups-pierone: 1.1.45 -> 1.1.49 --- pkgs/development/python-modules/stups-pierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index 92cd344edb6d..4757cd323186 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "stups-pierone"; - version = "1.1.45"; + version = "1.1.49"; disabled = !isPy3k; src = fetchFromGitHub { owner = "zalando-stups"; repo = "pierone-cli"; rev = version; - sha256 = "1ggfizw27wpcagbbk15xpfrhq6b250cx4278b5d7y8s438g128cs"; + sha256 = "1kb1lpnxbcq821mx75vzapndvxfvsdrplyhsqjq4vdhyqrx2dn3q"; }; propagatedBuildInputs = [ From fe7b37ba8236a86a0d421e0f2b83d180f9c88cb3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:02 -0800 Subject: [PATCH 312/703] python3Packages.subarulink: 0.3.16 -> 0.4.0 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 1b6d1033c456..6a0cbfb97b9b 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.16"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7waY5AOONi+u056JRH9KcoBWSB4AlMw4QcMW0uoCARc="; + sha256 = "0mn3am1np653a3mq8rjly482a9x2rp6ss9zx997b6adk5vm3zasc"; }; propagatedBuildInputs = [ From 8fc591b2aa328891bf9fdf3e9c9c81a92a1c2e95 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:02 -0800 Subject: [PATCH 313/703] python3Packages.tap.py: 3.0 -> 3.1 --- pkgs/development/python-modules/tappy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tappy/default.nix b/pkgs/development/python-modules/tappy/default.nix index 9e0b83bc925d..abbf70df62fb 100644 --- a/pkgs/development/python-modules/tappy/default.nix +++ b/pkgs/development/python-modules/tappy/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "tap.py"; - version = "3.0"; + version = "3.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9e7u6/1k5T0yZhdSu0wohYmjuru5bbPzkaTsKfE1nHA="; + sha256 = "3c0cd45212ad5a25b35445964e2517efa000a118a1bfc3437dae828892eaf1e1"; }; checkInputs = [ pytestCheckHook ]; From 3d67933dfb2c1c1cbecc228785e240bcbf1bc9c6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:02 -0800 Subject: [PATCH 314/703] python3Packages.tempora: 4.1.2 -> 5.0.0 --- pkgs/development/python-modules/tempora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index e9cd3e84fee5..6999655c5dc5 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "4.1.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fd6cafd66b01390d53a760349cf0b3123844ec6ae3d1043d7190473ea9459138"; + sha256 = "aa21dd1956e29559ecb2f2f2e14fcdb950085222fbbf86e6c946b5e1a8c36b26"; }; disabled = pythonOlder "3.2"; From 470cf783936ec9376025f327afb84471f1725ebf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:03 -0800 Subject: [PATCH 315/703] python3Packages.terminaltables: 3.1.7 -> 3.1.10 --- pkgs/development/python-modules/terminaltables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix index cb528b5b4e9a..7b548b763fdf 100644 --- a/pkgs/development/python-modules/terminaltables/default.nix +++ b/pkgs/development/python-modules/terminaltables/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "terminaltables"; - version = "3.1.7"; + version = "3.1.10"; src = fetchPypi { inherit pname version; - sha256 = "5dab2f33927c0a020b8011c81b92830ff9fd4ba701657da5d7bfdc41048360a6"; + sha256 = "ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543"; }; meta = with lib; { From cf4e1a26abef92b36d5b2af21bda8920e5188f7c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:03 -0800 Subject: [PATCH 316/703] python3Packages.test-tube: 0.7.5 -> 0.628 --- pkgs/development/python-modules/test-tube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index f0c26292c84b..1cc20cc2cca7 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "test-tube"; - version = "0.7.5"; + version = "0.628"; disabled = isPy27; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "williamFalcon"; repo = pname; rev = version; - sha256 = "0zpvlp1ybp2dhgap8jsalpfdyg8ycjhlfi3xrdf5dqffqvh2yhp2"; + sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m"; }; checkInputs = [ From 72935cbbf54f2b2ab20fb2d341fb66da5fbd8e31 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:03 -0800 Subject: [PATCH 317/703] python3Packages.tiledb: 0.6.6 -> 0.12.0 --- pkgs/development/python-modules/tiledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index bdd6ad241158..b310defa45d1 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.6.6"; + version = "0.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = version; - sha256 = "0b2kn1xyf7d994kz29dpqiaf8yzvx0axw4yqi854c54pl22ddgzl"; + sha256 = "0iz16sgr5dpwc1jvb6brcmgvvg0npjdd98q4wgkqmvg7qif92zls"; }; nativeBuildInputs = [ From 86cf470d7eaf5e4d433a450348b726442287300d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:03 -0800 Subject: [PATCH 318/703] python3Packages.tomlkit: 0.7.2 -> 0.8.0 --- pkgs/development/python-modules/tomlkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index fd6cec70f060..6c8455f060ec 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"; + sha256 = "29e84a855712dfe0e88a48f6d05c21118dbafb283bb2eed614d46f80deb8e9a1"; }; propagatedBuildInputs = From efd4df54ecf9c318d9444492cfa9be978fa0f849 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:04 -0800 Subject: [PATCH 319/703] python3Packages.tox: 3.24.4 -> 3.24.5 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 8940a57196ac..2307073c3225 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.24.4"; + version = "3.24.5"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca"; + sha256 = "67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"; }; meta = with lib; { From fb2071845f3556e9b087747f0dc5b9ae6fee1530 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:04 -0800 Subject: [PATCH 320/703] python3Packages.treeo: 0.0.9 -> 0.4.0 --- pkgs/development/python-modules/treeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index 3629b47e8a29..d0293d3e2c06 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "treeo"; - version = "0.0.9"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; rev = version; - sha256 = "0jfqj5150braj4ybnifc6b8mp0w2j93li6bm20lcd7a19qs0lkk2"; + sha256 = "176r1kgsdlylvdrxmhnzni81p8m9cfnsn4wwn6fnmsgam2qbp76j"; }; nativeBuildInputs = [ From 451ef4bfc8f3989e829a520ae804ff2ca03d283e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:04 -0800 Subject: [PATCH 321/703] python3Packages.treex: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/treex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index 4e8c1431cc18..1f4a55416d56 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "treex"; - version = "0.6.7"; + version = "0.6.8"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; rev = version; - sha256 = "1hl3wj71c7cp7jzkhyjy7xgs2vc8c89icq0bgfr49y4pwv69n43m"; + sha256 = "0pi4c78vqhy7mh9ranssdxdjbqnvyagsfkx95k93bnvzgmnr2kxb"; }; postPatch = '' From 35cd790cfc305436a0e919ec8899a5f43f4376a6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:04 -0800 Subject: [PATCH 322/703] python3Packages.trytond: 6.2.2 -> 6.2.3 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 59585ddc3fe0..c332a067a76b 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.2.2"; + version = "6.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9494016dd8b4da5a06dccdd1afbd918248d42da9f2c19b1eb8958052c747e193"; + sha256 = "9be5d27aff9ae9b0ab73a8805145b2cc89900b9b513e6d5bfce89e9b7167f8f4"; }; # Tells the tests which database to use From c35c0c19653c4e73bd1cf85d5d909d505f796c54 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:04 -0800 Subject: [PATCH 323/703] python3Packages.ttp: 0.7.2 -> 0.8.3 --- pkgs/development/python-modules/ttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 38faa10a9282..7620ee305c89 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "ttp"; - version = "0.7.2"; + version = "0.8.3"; format = "setuptools"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = version; - sha256 = "sha256-dYjE+EMfCVHLRAqT1KM7o8VEopJ/TwAEMphYXuj38Wk="; + sha256 = "0rnixz01dnxl1hmzh34v4w4c117ncldr33ws0m2hqhjf5n4kgrg3"; }; propagatedBuildInputs = [ From d5c86a996815709b9b4399b3f18ca9bcec42110f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:05 -0800 Subject: [PATCH 324/703] python3Packages.tumpa: 0.1.1 -> 0.1.2 --- pkgs/development/python-modules/tumpa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tumpa/default.nix b/pkgs/development/python-modules/tumpa/default.nix index 236cfbb7ba0c..6309e8937a36 100644 --- a/pkgs/development/python-modules/tumpa/default.nix +++ b/pkgs/development/python-modules/tumpa/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "tumpa"; - version = "0.1.1"; + version = "0.1.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kushaldas"; repo = "tumpa"; rev = "v${version}"; - sha256 = "1wvs64s0jxn4p8zr643d2hcczw3a175r6ib3481gdhjx38kgxjbq"; + sha256 = "17nhdildapgic5l05f3q1wf5jvz3qqdjv543c8gij1x9rdm8hgxi"; }; propagatedBuildInputs = [ From 1f24a9e3f35c2d2d24e60454bec689318d7b7f74 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:05 -0800 Subject: [PATCH 325/703] python3Packages.twilio: 7.4.0 -> 7.5.0 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 12859fae86cc..ddc94541422c 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.4.0"; + version = "7.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "sha256-gN9cVBhiO34uj2ZGqXrnlvOlSaGxry0tMxaTK4SYhjM="; + sha256 = "0h6r9nz7dcvagrjhzvnirpnjazcy9r64cwlr2bnmlrbjhwdni9rq"; }; propagatedBuildInputs = [ From 5b95577ba52081afe19e241cf13c14f0bb5790a3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:05 -0800 Subject: [PATCH 326/703] python3Packages.twine: 3.4.2 -> 3.7.1 --- pkgs/development/python-modules/twine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index f5809b0a9b90..82c157722d28 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "twine"; - version = "3.4.2"; + version = "3.7.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936"; + sha256 = "28460a3db6b4532bde6a5db6755cf2dce6c5020bada8a641bb2c5c7a9b1f35b8"; }; nativeBuildInputs = [ setuptools-scm ]; From 02bb54e1e5406397c1becaf54fca890600f76170 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:05 -0800 Subject: [PATCH 327/703] python3Packages.typeguard: 2.13.2 -> 2.13.3 --- pkgs/development/python-modules/typeguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 63e1502226d9..8b2ff2de5129 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.13.2"; + version = "2.13.3"; src = fetchPypi { inherit pname version; - sha256 = "7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"; + sha256 = "00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"; }; buildInputs = [ setuptools-scm ]; From f4df88d1c9e44a686fb5da81352ab1da769a3de8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:06 -0800 Subject: [PATCH 328/703] python3Packages.types-requests: 2.27.6 -> 2.27.7 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 21498135916d..aa7513ca7e91 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.6"; + version = "2.27.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Xg3Ggem/rbXB0X9j0p9tE9Ke8ol9MMuceShbNKFlX9c="; + sha256 = "f38bd488528cdcbce5b01dc953972f3cead0d060cfd9ee35b363066c25bab13c"; }; propagatedBuildInputs = [ From e8213b3ad205fa1777ecb794e3f358fc45d1a43d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:06 -0800 Subject: [PATCH 329/703] python3Packages.types-typed-ast: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/types-typed-ast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix index 4962f2d02e3a..e08450c6a3e7 100644 --- a/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/pkgs/development/python-modules/types-typed-ast/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UQ876qlUkrNUTWfoFYGvopA8dktwiJ/82yhubGJn0pc="; + hash = "sha256-bY/S6pCDbLQxEayKrnzYZOCYWTyT7M66kP5G1rewxz4="; }; # Module doesn't have tests From 687f0cd219881a5f96d5c451945214ead6c39348 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:07 -0800 Subject: [PATCH 330/703] python3Packages.ujson: 4.3.0 -> 5.1.0 --- pkgs/development/python-modules/ujson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 4d12af0689d8..0d7faf93f934 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "4.3.0"; + version = "5.1.0"; disabled = isPyPy || pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "baee56eca35cb5fbe02c28bd9c0936be41a96fa5c0812d9d4b7edeb5c3d568a0"; + sha256 = "a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004"; }; nativeBuildInputs = [ From 130bf40f0b05e03e22ce77975b79fb794b408e24 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:07 -0800 Subject: [PATCH 331/703] python3Packages.uproot: 4.1.5 -> 4.1.9 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index ef262e057e24..bf523046c616 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.1.5"; + version = "4.1.9"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; rev = version; - sha256 = "sha256-zsmAdqoWvFhRRRw4fdbRhhKkDV5oP/eYsfpA0AVqAnI="; + sha256 = "035gljxm18hvpfvc7nsd7lhawwq3np5sg1y86pzcxc680c6rj6lx"; }; propagatedBuildInputs = [ From 365bb79f918dfcab11b73818a5ab8a7dffa0b08b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:07 -0800 Subject: [PATCH 332/703] python3Packages.uvicorn: 0.14.0 -> 0.16.0 --- pkgs/development/python-modules/uvicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 57c6bf925357..4ce9228efee8 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.14.0"; + version = "0.16.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "164x92k3rs47ihkmwq5av396576dxp4rzv6557pwgc1ign2ikqy1"; + sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; }; outputs = [ From c0af5b199080d40e4b1a46ca545384ccfdde72dd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:07 -0800 Subject: [PATCH 333/703] python3Packages.virtualenv: 20.10.0 -> 20.13.0 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index d51b3d783796..c463c37747ea 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.10.0"; + version = "20.13.0"; src = fetchPypi { inherit pname version; - sha256 = "576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218"; + sha256 = "d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd"; }; nativeBuildInputs = [ From 3046347d81b9a12404c5f164a5d590197840c4e9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:08 -0800 Subject: [PATCH 334/703] python3Packages.vivisect: 1.0.5 -> 1.0.7 --- pkgs/development/python-modules/vivisect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index d664cf1d27fe..ddf6ce54b25e 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "vivisect"; - version = "1.0.5"; + version = "1.0.7"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f629dc0143656b06b64e2da1772deda67d37a3e048e74bd728de4a4f24bf877b"; + sha256 = "727a27ac1eb95d5a41f4430f6912e79940525551314fe68a2811fc9d51eaf2e9"; }; propagatedBuildInputs = [ From 4bf88be456be4a3fe8775705d8f7429c15f45ab5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:08 -0800 Subject: [PATCH 335/703] python3Packages.wasmer: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/wasmer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index dff14d15b901..726de4168d8a 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -21,7 +21,7 @@ let , extraBuildInputs ? [ ] }: buildPythonPackage rec { inherit pname; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; @@ -30,7 +30,7 @@ let owner = "wasmerio"; repo = "wasmer-python"; rev = version; - hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + hash = "sha256-nOeOhQ1XY+9qmLGURrI5xbgBUgWe5XRpV38f73kKX2s="; }; cargoDeps = rustPlatform.fetchCargoTarball { From 229db23d7bcbf0680a00949a6641e636e7a662f9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:08 -0800 Subject: [PATCH 336/703] python3Packages.wazeroutecalculator: 0.13 -> 0.14 --- .../python-modules/wazeroutecalculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wazeroutecalculator/default.nix b/pkgs/development/python-modules/wazeroutecalculator/default.nix index dd8409624648..063f26e47660 100644 --- a/pkgs/development/python-modules/wazeroutecalculator/default.nix +++ b/pkgs/development/python-modules/wazeroutecalculator/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "wazeroutecalculator"; - version = "0.13"; + version = "0.14"; src = fetchPypi { pname = "WazeRouteCalculator"; inherit version; - sha256 = "sha256-Ex9yglaJkk0+Uo3Y+xpimb5boXz+4QdbJS2O75U6dUg="; + sha256 = "01a6e8d7d896279fd342fd7fcb86c2b9bf97503d95e8b1a926867d504c4836ab"; }; propagatedBuildInputs = [ From e00e4f541a77a53ad58da5384d6b86fcbe880498 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:08 -0800 Subject: [PATCH 337/703] python3Packages.webargs: 8.0.1 -> 8.1.0 --- pkgs/development/python-modules/webargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index e92b47d20933..31cedc7b4032 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.0.1"; + version = "8.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bcce022250ee97cfbb0ad07b02388ac90a226ef4b479ec84317152345a565614"; + sha256 = "f1f0b7f054a22263cf750529fc0926709ca47da9a2c417d423ad88d9fa6a5d33"; }; pythonImportsCheck = [ From 9c22c21b074a0fc8218fac628e1ca93639311410 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:08 -0800 Subject: [PATCH 338/703] python3Packages.websocket-client: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/websocket-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 9622f10168f1..116f45f16dd3 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.2.2"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "21861f8645eb5725d1becfe86d7e7ae1a31d98b72556f9d44fcc5100976353cf"; + sha256 = "1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5"; }; propagatedBuildInputs = [ From b8c1bc474a5fce70b5691bcdd0481f4b92975278 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:09 -0800 Subject: [PATCH 339/703] python3Packages.webtest: 2.0.35 -> 3.0.0 --- pkgs/development/python-modules/webtest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 999d2560591d..f8b7ec99157a 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "2.0.35"; + version = "3.0.0"; pname = "webtest"; disabled = isPy27; # paste.deploy is not longer a valid import src = fetchPypi { pname = "WebTest"; inherit version; - sha256 = "sha256-qsFotbK08gCvTjWGfPMWcSIQ49XbgcHL3/OHImR7sIc="; + sha256 = "54bd969725838d9861a9fa27f8d971f79d275d94ae255f5c501f53bb6d9929eb"; }; postPatch = '' From 77c812f14f368bc44cd7a17c4413ff56e3c17482 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:09 -0800 Subject: [PATCH 340/703] python3Packages.weconnect: 0.28.0 -> 0.30.4 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 6de4dca39489..187fe2253eb9 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.29.0"; + version = "0.30.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-eAOEl7KBa7wZkoJxGPtK/6W2dq1n2X+APU2mHIlz9K0="; + sha256 = "0miih3gq6mkmzcrqhbvpm5zq0aafvvl8f3vql5s1r8ix3hag0ljg"; }; propagatedBuildInputs = [ From 351ac1c6e4fb3eccd48f17256b320c8742d4a5de Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:09 -0800 Subject: [PATCH 341/703] python3Packages.weconnect-mqtt: 0.21.0 -> 0.24.1 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 9b354025feab..6c1aa1eda2f5 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.22.0"; + version = "0.24.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-cNEV9PNBv7mL7QG3p8GIwjz0pUhzz55QV6HmCkv6MSg="; + sha256 = "125knv2mp479g90h7r2an0i5fyh3p4gdr3p01v4zcxin9hdbll3z"; }; propagatedBuildInputs = [ From 6bccdff931348dbdacc59e5106c1b11beb44f9da Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:09 -0800 Subject: [PATCH 342/703] python3Packages.whois: 0.9.13 -> 0.9.14 --- pkgs/development/python-modules/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index ef69283e6dbf..5dd638bbebff 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.13"; + version = "0.9.14"; src = fetchFromGitHub { owner = "DannyCork"; repo = "python-whois"; rev = version; - sha256 = "0y2sfs6nkr2j2crrn81wkfdzn9aphb3iaddya5zd2midlgdqq7bw"; + sha256 = "1df4r2pr356y1c2ys6pzdl93fmx9ci4y75xphc95xn27zvqbpvix"; }; # whois is needed From 3e4ac7d23d10553c0f97a9c4eab795d2ca3d848a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:10 -0800 Subject: [PATCH 343/703] python3Packages.xdis: 6.0.2 -> 6.0.3 --- pkgs/development/python-modules/xdis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index c916f8d7ec2a..ca339b7a4438 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "6.0.2"; + version = "6.0.3"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "sha256-P8mUkAO3usFCE+E9cna2x1iA2uyHVPX9FHDpX+kTFWQ="; + sha256 = "1qvg3bwqzqxlzlixz2di3si7siy0ismq93wd57r8cqmxl54gva6h"; }; checkInputs = [ pytest ]; From 3d409ac9a43f06cc8ce67f6178770e7be10b3daf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:10 -0800 Subject: [PATCH 344/703] python3Packages.xlib: 0.29 -> 0.31 --- pkgs/development/python-modules/xlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index cfb72680fa8b..b9658f0b4f0a 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "xlib"; - version = "0.29"; + version = "0.31"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; rev = version; - sha256 = "sha256-zOG1QzRa5uN36Ngv8i5s3mq+VIoRzxFj5ltUbKdonJ0="; + sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06"; }; checkPhase = '' From f49b7600b6943c86a793423dba2e5e01e193fb97 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:11 -0800 Subject: [PATCH 345/703] python3Packages.yfinance: 0.1.68 -> 0.1.69 --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index db27afcfe6c4..eb7b3bb45e04 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.68"; + version = "0.1.69"; src = fetchFromGitHub { owner = "ranaroussi"; repo = pname; rev = version; - sha256 = "sha256-ubOC56DUViClARzMSRtDFrtxhilmVkhKMx9SxLbYFiA="; + sha256 = "1077p01982wgbl8v74f8mqca0y6hmh6qr3gg7m3f1a30lgpljms3"; }; propagatedBuildInputs = [ From 6e37d7a1d42b6cef95c8cf4a797058042bf3e514 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:11 -0800 Subject: [PATCH 346/703] python3Packages.yowsup: 3.2.3 -> 3.3.0 --- pkgs/development/python-modules/yowsup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 0ff3212f48ca..91c58192b8a2 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "yowsup"; - version = "3.2.3"; + version = "3.3.0"; # The Python 2.x support of this package is incompatible with `six==1.11`: # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486 @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "tgalal"; repo = "yowsup"; rev = "v${version}"; - sha256 = "0wb8yl685nr1i3vx89hwan5m6a482x8g48f5ksvdlph538p720pm"; + sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q"; }; checkInputs = [ pytest ]; From b075a3a5ec8e310c6044001beb72bbd82b18ce07 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:11 -0800 Subject: [PATCH 347/703] python3Packages.zimports: 0.2.0 -> 0.4.1 --- pkgs/development/python-modules/zimports/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index 338dd93150b3..d968bf794ab3 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.2.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; rev = version; - sha256 = "0a5axflkk0wv0rdnrh8l2rgj8gh2pfkg5lrvr8x4yxxiifawrafc"; + sha256 = "11mg7j7xiypv9hki4qbnp9jsgwgfdrgdzfqyrzk5x0s4hycgi4q0"; }; disabled = !isPy3k; From b1129e74e13a7b11e00d3e43cce1207cdc3c1e48 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:11 -0800 Subject: [PATCH 348/703] python3Packages.zipp: 3.6.0 -> 3.7.0 --- pkgs/development/python-modules/zipp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index dc30128c9ead..8d03083446cf 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zipp"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"; + sha256 = "9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"; }; nativeBuildInputs = [ setuptools-scm ]; From 1a4f607854052836b6ad8df709a7f4c016f01b9f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 16:59:12 -0800 Subject: [PATCH 349/703] python3Packages.zope-deferredimport: 4.3.1 -> 4.4 --- .../python-modules/zope-deferredimport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 0b5d3103b64d..e1cba0ebc02b 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "zope-deferredimport"; - version = "4.3.1"; + version = "4.4"; src = fetchPypi { pname = "zope.deferredimport"; inherit version; - sha256 = "57b2345e7b5eef47efcd4f634ff16c93e4265de3dcf325afc7315ade48d909e1"; + sha256 = "2ae3257256802787e52ad840032f39c1496d3ce0b7e11117f663420e4a4c9add"; }; propagatedBuildInputs = [ zope_proxy ]; From 4b4e1ca5735040a14c589fc2880c370f8c186d42 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 14 Jan 2022 02:08:23 +0100 Subject: [PATCH 350/703] python3Packages.nbclient: fix interpreter compatibility --- pkgs/development/python-modules/nbclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 62bb1848a3ce..c5e3facc0622 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nbclient"; version = "0.5.10"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From e6989959140cd5f185bbd3a3cfc33d531beb68b6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 18:14:59 -0800 Subject: [PATCH 351/703] python3Packages.pyparsing: fix tests --- pkgs/development/python-modules/pyparsing/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 1d3ec43bc78b..5e9326483fbe 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,9 +1,6 @@ { buildPythonPackage , fetchFromGitHub , lib - -# pythonPackages -, coverage }: buildPythonPackage rec { @@ -17,11 +14,10 @@ buildPythonPackage rec { sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a"; }; - # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6 - checkInputs = [ coverage ]; + # only do unit tests, as diagram tests require railroad, which has + # been unmaintained since 2015 checkPhase = '' - coverage run --branch simple_unit_tests.py - coverage run --branch unitTests.py + python -m unittest -k 'not testEmptyExpressionsAreHandledProperly' tests/test_unit.py ''; meta = with lib; { From 96a92ca512e71b404e64058634eedab0dd734807 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 18:43:13 -0800 Subject: [PATCH 352/703] python3Packages.railroad-diagrams: init at 1.1.1 --- .../railroad-diagrams/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/railroad-diagrams/default.nix diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix new file mode 100644 index 000000000000..57c07e0dc48b --- /dev/null +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "railroad-diagrams"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "8a1ec227666be2000e76794aa740f77987f1586077aae4d090d2633b3064c976"; + }; + + # this is a dependency of pyparsing, which is a dependency of pytest + doCheck = false; + + pythonImportsCheck = [ "railroad" ]; + + meta = with lib; { + description = "Generate SVG railroad syntax diagrams, like on JSON.org"; + homepage = "https://github.com/tabatkins/railroad-diagrams"; + license = licenses.cc0; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 027178143fad..6faba07bc4de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8379,6 +8379,8 @@ in { radish-bdd = callPackage ../development/python-modules/radish-bdd { }; + railroad-diagrams = callPackage ../development/python-modules/railroad-diagrams { }; + rainbowstream = callPackage ../development/python-modules/rainbowstream { }; ramlfications = callPackage ../development/python-modules/ramlfications { }; From 8c2df175273606a796915b25072d14ce30185f48 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 18:41:58 -0800 Subject: [PATCH 353/703] python3Packages.pyparsing: enable optional testing --- .../python-modules/pyparsing/default.nix | 61 ++++++++++++------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 5e9326483fbe..27047cf6eabc 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,31 +1,48 @@ { buildPythonPackage , fetchFromGitHub , lib + +# since this is a dependency of pytest, we need to avoid +# circular dependencies +, jinja2 +, railroad-diagrams }: -buildPythonPackage rec { - pname = "pyparsing"; - version = "3.0.6"; +let + pyparsing = buildPythonPackage rec { + pname = "pyparsing"; + version = "3.0.6"; - src = fetchFromGitHub { - owner = "pyparsing"; - repo = pname; - rev = "pyparsing_${version}"; - sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a"; - }; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = pname; + rev = "pyparsing_${version}"; + sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a"; + }; - # only do unit tests, as diagram tests require railroad, which has - # been unmaintained since 2015 - checkPhase = '' - python -m unittest -k 'not testEmptyExpressionsAreHandledProperly' tests/test_unit.py - ''; - - meta = with lib; { - homepage = "https://github.com/pyparsing/pyparsing"; - description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; - license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda + # circular dependencies if enabled by default + doCheck = false; + checkInputs = [ + jinja2 + railroad-diagrams ]; + + checkPhase = '' + python -m unittest + ''; + + passthru.tests = { + check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + homepage = "https://github.com/pyparsing/pyparsing"; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; }; -} +in + pyparsing From af071722cd9cefcc6c39c269c98a291d14f71848 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 18:42:34 -0800 Subject: [PATCH 354/703] python3Packages.setuptools-rust: fix deps --- pkgs/development/python-modules/setuptools-rust/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 20e90de29433..2ab609c7d0c1 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -6,6 +6,7 @@ , semantic-version , setuptools , setuptools-scm +, typing-extensions , toml }: @@ -21,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ semantic-version setuptools toml ]; + propagatedBuildInputs = [ semantic-version setuptools toml typing-extensions ]; doCheck = false; pythonImportsCheck = [ "setuptools_rust" ]; From 0d2625632bf1595ae06fe5b453d6e22a5e6ea950 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 19:07:53 -0800 Subject: [PATCH 355/703] python3Packages.pytest-cov: fix deps --- pkgs/development/python-modules/pytest-cov/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 52c592c86912..971b12dc01c7 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -4,6 +4,7 @@ , pytest , coverage , toml +, tomli }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ coverage toml ]; + propagatedBuildInputs = [ coverage toml tomli ]; # xdist related tests fail with the following error # OSError: [Errno 13] Permission denied: 'py/_code' From 212ca435263aa552569ae82a78275c7bf45906bb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 19:37:20 -0800 Subject: [PATCH 356/703] python3Packages.pytest-asyncio: fix tests --- .../python-modules/pytest-asyncio/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 8fd36a8e09e6..ca9951dc8715 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage , fetchFromGitHub +, flaky , hypothesis , pytest , pytestCheckHook , pythonOlder +, setuptools-scm }: buildPythonPackage rec { @@ -21,11 +23,18 @@ buildPythonPackage rec { sha256 = "1c7xddg76pixwlwdl4zxwpy48q2q619i8kzjx2c67a0i8xbx1q5r"; }; - buildInputs = [ + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ pytest ]; checkInputs = [ + flaky hypothesis pytestCheckHook ]; From 2552044eb2a9f8d35be01bcadb8ebf7263ffbd5e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 20:31:18 -0800 Subject: [PATCH 357/703] python3Packages.aiosignal: disable tests, until next bump --- pkgs/development/python-modules/aiosignal/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index acf106ab3c6d..1fd619a846aa 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.2.0"; + version = "1.2.0"; # re-enable tests after 1.2.0 disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -23,6 +23,8 @@ buildPythonPackage rec { frozenlist ]; + # not compatible w ith latest asyncio + doCheck = false; checkInputs = [ pytest-asyncio pytestCheckHook From abfcd16d32b694d598ed11b3fb2c4b94aa305fb4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 20:47:40 -0800 Subject: [PATCH 358/703] python3Packages.async_generator: disable tests --- .../python-modules/async_generator/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix index dfbd0dbb9968..fb7dec6d6ed4 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -1,25 +1,25 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy35, pytest, pytest-asyncio }: buildPythonPackage rec { - pname = "async_generator"; + pname = "async-generator"; version = "1.10"; disabled = pythonOlder "3.5"; src = fetchPypi { - inherit pname version; + pname = "async_generator"; + inherit version; sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"; }; + # no longer compatible with pytest-asyncio + doCheck = false; checkInputs = [ pytest pytest-asyncio ]; checkPhase = '' pytest -W error -ra -v --pyargs async_generator ''; - # disable tests on python3.5 to avoid circular dependency with pytest-asyncio - doCheck = !isPy35; - meta = with lib; { description = "Async generators and context managers for Python 3.5+"; homepage = "https://github.com/python-trio/async_generator"; From 13a26ca9307fc37b0858d9098dc2b5220092ccec Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 21:13:12 -0800 Subject: [PATCH 359/703] python3Packages.pyopenssl: disable test with known regression --- pkgs/development/python-modules/pyopenssl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 3b225ad721ea..16bfddc8340a 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -47,6 +47,8 @@ let "test_fallback_default_verify_paths" # https://github.com/pyca/pyopenssl/issues/768 "test_wantWriteError" + # https://github.com/pyca/pyopenssl/issues/1043 + "test_alpn_call_failure" ] ++ ( lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests ) ++ ( From 6b93e236882ce51d94814e4ecff187a4e3835384 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 21:13:46 -0800 Subject: [PATCH 360/703] python3Packages.pytest-mock: disable pytest output senstive test --- pkgs/development/python-modules/pytest-mock/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index a8127e276f45..7f07ed2b6dd1 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # output of pytest has changed + "test_used_with_" + "test_plain_stopall" + ]; + pythonImportsCheck = [ "pytest_mock" ]; meta = with lib; { From f1689bd490619ed3d96a96bb2d688eedd6079e79 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 23:00:34 -0800 Subject: [PATCH 361/703] python3Packages.pybind11: disable incompatible tests --- .../python-modules/pybind11/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index d93bfe149cb8..475336a14cdf 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -8,7 +8,7 @@ , python , catch , numpy -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -49,16 +49,18 @@ buildPythonPackage rec { checkInputs = [ catch numpy - pytest + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - - make check - - runHook postCheck - ''; + disabledTestPaths = [ + # require dependencies not available in nixpkgs + "tests/test_embed/test_trampoline.py" + "tests/test_embed/test_interpreter.py" + # numpy changed __repr__ output of numpy dtypes + "tests/test_numpy_dtypes.py" + # no need to test internal packaging + "tests/extra_python_package/test_files.py" + ]; meta = with lib; { homepage = "https://github.com/pybind/pybind11"; From 7e4264ec435eb1453efa05912082bf128952b967 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 23:02:02 -0800 Subject: [PATCH 362/703] python3Packages.pep517: disable nix incompatible tests --- pkgs/development/python-modules/pep517/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index b14fb47dd11e..ad58cdb72d4d 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -2,11 +2,12 @@ , buildPythonPackage , fetchPypi , flit-core -, toml +, tomli , pythonOlder , importlib-metadata , zipp , pytestCheckHook +, setuptools , testpath , mock , pip @@ -27,18 +28,24 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - toml + tomli ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata zipp ]; checkInputs = [ pytestCheckHook + setuptools testpath mock pip ]; + disabledTests = [ + "test_setup_py" + "test_issue_104" + ]; + preCheck = '' rm pytest.ini # wants flake8 rm tests/test_meta.py # wants to run pip From 7adbab7fb28810f94010c9104d00da3ef468881c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 23:03:57 -0800 Subject: [PATCH 363/703] python3Packages.ipython: fix deps --- pkgs/development/python-modules/ipython/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 3ead79dbaf14..d1f6f4f3c301 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -9,6 +9,7 @@ , nose , pygments # Runtime dependencies +, black , jedi , decorator , matplotlib-inline @@ -18,6 +19,7 @@ , pexpect , appnope , backcall +, stack-data }: buildPythonPackage rec { @@ -39,10 +41,12 @@ buildPythonPackage rec { checkInputs = [ nose pygments ]; propagatedBuildInputs = [ + black jedi decorator matplotlib-inline pickleshare + stack-data traitlets prompt-toolkit pygments From 487cea691fadb2d6e9629682271900df44c2ee43 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 23:11:04 -0800 Subject: [PATCH 364/703] awscli: 1.22.21 -> 1.22.35 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 49762e3278c8..11cf6c53076c 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,11 +35,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.22.21"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.22.35"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-yzfy6MjXC6LeydLNVXQvcK4UmpVQP/jJ+W2jMgpNMgw="; + hash = "sha256-GsMclLh/VtPaNjD+XDKqTYeSX29R2aRS7If9G918OWY="; }; # https://github.com/aws/aws-cli/issues/4837 From 6290de6319471b8f178883998ca1440eaca175a1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 23:12:58 -0800 Subject: [PATCH 365/703] python3Packages.argon2_cffi: fix build --- pkgs/development/python-modules/argon2_cffi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index c27ae0ad6955..efdaf5204872 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "argon2_cffi"; version = "21.3.0"; + format = "flit"; src = fetchPypi { pname = "argon2-cffi"; From 7a46625c858d9ca7e73905dd79c99d621243c96f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 23:22:08 -0800 Subject: [PATCH 366/703] python3Packages.argon2-cffi-bindings: init at 21.2.0 --- .../argon2-cffi-bindings/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/argon2-cffi-bindings/default.nix diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix new file mode 100644 index 000000000000..3f1f3f86666c --- /dev/null +++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "argon2-cffi-bindings"; + version = "21.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + cffi + ]; + + # tarball doesn't include tests, but the upstream tests are minimal + doCheck = false; + pythonImportsCheck = [ "_argon2_cffi_bindings" ]; + + meta = with lib; { + description = "Low-level CFFI bindings for Argon2"; + homepage = "https://github.com/hynek/argon2-cffi-bindings"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6faba07bc4de..aa2d2c529e91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -600,6 +600,8 @@ in { argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { }; + args = callPackage ../development/python-modules/args { }; aria2p = callPackage ../development/python-modules/aria2p { }; From 93de9979d2cafaeda0a77dde7c3ef0f8a4aa8615 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 23:25:13 -0800 Subject: [PATCH 367/703] python3Packages.argon2_cffi: fix missing deps --- pkgs/development/python-modules/argon2_cffi/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index efdaf5204872..839429bc948b 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -9,6 +9,7 @@ , isPy3k , lib , stdenv +, argon2-cffi-bindings }: buildPythonPackage rec { @@ -24,7 +25,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; - propagatedNativeBuildInputs = [ cffi ]; + propagatedNativeBuildInputs = [ + argon2-cffi-bindings + cffi + ]; ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0"; From ca0720cb16a4409f467b645457653a46a65587d7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 23:39:54 -0800 Subject: [PATCH 368/703] python3Packages.jsonschema: use pyproject format --- pkgs/development/python-modules/jsonschema/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index d7a1bd0e06ff..a01bfb6806ef 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "jsonschema"; version = "4.4.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; From 8cd46d37ce41e2dc1234e7195770ba1c5a77b55b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 13 Jan 2022 23:51:05 -0800 Subject: [PATCH 369/703] python3Packages.sphinx: 4.3.1 -> 4.3.2 --- pkgs/development/python-modules/sphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 75693f3657e4..244514dd57af 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "sphinx"; - version = "4.3.1"; + version = "4.3.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Yj6cPZFG8ycbbZtMR+fsIAOX0brxroi6nYjP+WhnxA="; + sha256 = "sha256-ze6+iGGWSDljb8SPc1Z9UcPfUrleDTeaol5ZDGj1iYg="; extraPostFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ From 46cf897eb152f9d82d8718b8fe987a07d9d727e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jan 2022 17:09:29 +0100 Subject: [PATCH 370/703] python3Packages.jsonschema: cleanup --- .../python-modules/jsonschema/default.nix | 48 +++++++++++++------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index a01bfb6806ef..dd2a47f1bcb6 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -1,14 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib , attrs -, functools32 +, buildPythonPackage +, fetchPypi , importlib-metadata -, mock -, nose +, importlib-resources , pyperf , pyrsistent +, pytestCheckHook +, pythonOlder , setuptools-scm , twisted -, vcversioner +, typing-extensions }: buildPythonPackage rec { @@ -16,24 +18,42 @@ buildPythonPackage rec { version = "4.4.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; sha256 = "636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83"; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; - checkInputs = [ nose mock pyperf twisted vcversioner ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # zope namespace collides on py27 - doCheck = !isPy27; - checkPhase = '' - nosetests - ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + pyrsistent + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + checkInputs = [ + pyperf + pytestCheckHook + twisted + ]; + + pythonImportsCheck = [ + "jsonschema" + ]; meta = with lib; { - homepage = "https://github.com/Julian/jsonschema"; description = "An implementation of JSON Schema validation for Python"; + homepage = "https://github.com/Julian/jsonschema"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; }; From b4852980bd37ba95a737b660c5132d7c84de834a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Jan 2022 10:58:31 +0100 Subject: [PATCH 371/703] python3Packages.httpbin: enable tests --- .../python-modules/httpbin/default.nix | 48 +++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index ace9a7041e3f..8359fcf0a096 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,33 +1,65 @@ { lib +, brotlipy , buildPythonPackage +, decorator , fetchPypi , flask , flask-limiter -, markupsafe -, decorator , itsdangerous +, markupsafe , raven , six -, brotlipy +, pytestCheckHook }: buildPythonPackage rec { pname = "httpbin"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1yldvf3585zcwj4vxvfm4yr9wwlz3pa2mx2pazqz8x8mr687gcyb"; + hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; }; - propagatedBuildInputs = [ brotlipy flask flask-limiter markupsafe decorator itsdangerous raven six ]; + propagatedBuildInputs = [ + brotlipy + flask + flask-limiter + markupsafe + decorator + itsdangerous + raven + six + ]; - # No tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test_httpbin.py" + ]; + + disabledTests = [ + # Tests seems to be outdated + "test_anything" + "test_get" + "test_redirect_n_equals_to_1" + "test_redirect_n_higher_than_1" + "test_redirect_to_post" + "test_relative_redirect_n_equals_to_1" + "test_relative_redirect_n_higher_than_1" + ]; + + pythonImportsCheck = [ + "httpbin" + ]; meta = with lib; { + description = "HTTP Request and Response Service"; homepage = "https://github.com/kennethreitz/httpbin"; - description = "HTTP Request & Response Service"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 3bfaef643b70f1e8914226ab45038561523812bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Jan 2022 11:06:32 +0100 Subject: [PATCH 372/703] python3Packages.pytest-httpbin: switch to pytestCheckHook --- .../python-modules/pytest-httpbin/default.nix | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 17aa011d4006..4b356c672587 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -1,8 +1,10 @@ -{ buildPythonPackage -, lib -, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub , httpbin +, pytest +, pytestCheckHook +, requests , six }: @@ -15,21 +17,28 @@ buildPythonPackage rec { sha256 = "9f73320f97d33cc20bc8a08cb945372948de51402559e87e74e92c56b48da0d7"; }; - checkInputs = [ pytest ]; + buildInputs = [ + pytest + ]; - propagatedBuildInputs = [ httpbin six ]; + propagatedBuildInputs = [ + httpbin + six + ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + requests + ]; - # https://github.com/kevin1024/pytest-httpbin/pull/51 - doCheck = false; + pythonImportsCheck = [ + "pytest_httpbin" + ]; - meta = { - description = "Easily test your HTTP library against a local copy of httpbin.org"; + meta = with lib; { + description = "Test your HTTP library against a local copy of httpbin.org"; homepage = "https://github.com/kevin1024/pytest-httpbin"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } - From 93acc1fd8d1bea800e3df4918475ef0e0b85a030 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jan 2022 09:30:10 +0100 Subject: [PATCH 373/703] python3Packages.pytest-httpbin: fix src --- .../development/python-modules/pytest-httpbin/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 4b356c672587..0069eb6f179e 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -12,9 +12,11 @@ buildPythonPackage rec { pname = "pytest-httpbin"; version = "1.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "9f73320f97d33cc20bc8a08cb945372948de51402559e87e74e92c56b48da0d7"; + src = fetchFromGitHub { + owner = "kevin1024"; + repo = "pytest-httpbin"; + rev = "v${version}"; + hash = "sha256-Vngd8Vum96+rdG8Nz1+aHrO6WZjiAz+0CeIovaH8N+s="; }; buildInputs = [ From 46eef09d3ca6ca0cba4a4888c0a67c951b7aaa83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 09:01:13 +0100 Subject: [PATCH 374/703] python3Packages.josepy: cleanup --- .../python-modules/josepy/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 2cd81d4cba01..140b65c73772 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -1,28 +1,25 @@ { lib -, fetchPypi , buildPythonPackage , cryptography +, fetchPypi , pyopenssl -, setuptools -, mock , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "josepy"; version = "1.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25"; }; - postPatch = '' - # remove coverage flags - sed -i '/addopts/d' pytest.ini - sed -i '/flake8-ignore/d' pytest.ini - ''; - propagatedBuildInputs = [ pyopenssl cryptography @@ -30,15 +27,22 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook ]; + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --flake8 --cov-report xml --cov-report=term-missing --cov=josepy --cov-config .coveragerc" "" + ''; + + pythonImportsCheck = [ + "josepy" + ]; + meta = with lib; { description = "JOSE protocol implementation in Python"; homepage = "https://github.com/jezdez/josepy"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ]; }; } - From 5e895b728ba2faa555d6fd705be0faa9f2012d56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 09:12:19 +0100 Subject: [PATCH 375/703] python3Packages.anonip: switch to pytestCheckHook --- .../python-modules/anonip/default.nix | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index 45a61a12bb07..96115aaee439 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "anonip"; version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "DigitaleGesellschaft"; @@ -11,14 +19,27 @@ buildPythonPackage rec { sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc"; }; - propagatedBuildInputs = lib.optionals isPy27 [ ipaddress ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = "python tests.py"; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=anonip --cov-report=term-missing --no-cov-on-fail" "" + ''; + + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ + "anonip" + ]; meta = with lib; { + description = "Tool to anonymize IP addresses in log files"; homepage = "https://github.com/DigitaleGesellschaft/Anonip"; - description = "A tool to anonymize IP-addresses in log-files"; license = licenses.bsd3; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } From 87a312931161c537def8cb9d2eae3bc7956efa88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 09:58:45 +0100 Subject: [PATCH 376/703] python3Packages.croniter: 1.1.0 -> 1.2.0 --- .../python-modules/croniter/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index d73ee597adc5..ed8f127ff274 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -4,22 +4,21 @@ , python-dateutil , pytestCheckHook , pytz -, natsort , tzlocal }: buildPythonPackage rec { pname = "croniter"; - version = "1.1.0"; + version = "1.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "4023e4d18ced979332369964351e8f4f608c1f7c763e146b1d740002c4245247"; + hash = "sha256-CUQi9q657WRnFDk1A/o4iv5PhG4RDhmX/qV5TiCFwtc="; }; propagatedBuildInputs = [ python-dateutil - natsort ]; checkInputs = [ @@ -28,12 +27,14 @@ buildPythonPackage rec { tzlocal ]; - pythonImportsCheck = [ "croniter" ]; + pythonImportsCheck = [ + "croniter" + ]; meta = with lib; { - description = "croniter provides iteration for datetime object with cron like format"; + description = "Library to iterate over datetime object with cron like format"; homepage = "https://github.com/kiorky/croniter"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From b87f6e9ba62e089a3e41123ec27f53c2ef24e56d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 11:12:52 +0100 Subject: [PATCH 377/703] python3Packages.confuse: cleanup --- .../python-modules/confuse/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 2b350be00460..c4eb97e1cac6 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -1,12 +1,10 @@ -{ buildPythonPackage -, enum34 +{ lib +, buildPythonPackage , fetchFromGitHub , flit-core -, isPy27 -, lib -, pathlib , pyyaml , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -14,6 +12,8 @@ buildPythonPackage rec { version = "1.5.0"; format = "flit"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "beetbox"; repo = pname; @@ -27,16 +27,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml - ] ++ lib.optionals isPy27 [ - enum34 - pathlib - ] ; + ]; checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "confuse" ]; + pythonImportsCheck = [ + "confuse" + ]; meta = with lib; { description = "Python configuration library for Python that uses YAML"; From cbd5d46bf62ab42128f711696f2efcd8c1f6de96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 11:25:25 +0100 Subject: [PATCH 378/703] python3Packages.confuse: 1.5.0 -> 1.7.0 --- pkgs/development/python-modules/confuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index c4eb97e1cac6..e28621f26a99 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "confuse"; - version = "1.5.0"; + version = "1.7.0"; format = "flit"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "beetbox"; repo = pname; rev = "v${version}"; - sha256 = "1kvilxhjifvz6ra64jadf9jiwphrah5rcb9ryq0v7w1dywgn4qp7"; + sha256 = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8="; }; nativeBuildInputs = [ From dcf0978d8aa084c3091a64e35f622a935a971d69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 11:28:02 +0100 Subject: [PATCH 379/703] python3Packages.dbutils: 3.0.1 -> 3.0.2 --- .../python-modules/dbutils/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index bbfa60f03b69..8994e1d28cd2 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -2,21 +2,29 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "3.0.1"; pname = "dbutils"; + version = "3.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "DBUtils"; - sha256 = "6ec83f4d75d7a7b42a92e86b775f251e2671639b3b2123fe13a5d8d8fe7c5643"; + hash = "sha256-+t65eeFAbcEj4tuZVfMU4NU2DzBOC9bPBHqqX8P99bM="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "dbutils" ]; + pythonImportsCheck = [ + "dbutils" + ]; meta = with lib; { description = "Database connections for multi-threaded environments"; From 01eaeb199dd4438820ef5cead725162be4974867 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 13:36:29 +0100 Subject: [PATCH 380/703] python3Packages.databases: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/databases/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 2facff6c840b..e85bdd7868c9 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -14,7 +14,8 @@ buildPythonPackage rec { pname = "databases"; - version = "0.5.3"; + version = "0.5.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; + hash = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; }; propagatedBuildInputs = [ From ae72567ccce68a3d0c0f1418f6178d8fdcfbb522 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 13:52:32 +0100 Subject: [PATCH 381/703] python3Packages.gast: 0.5.1 -> 0.5.3 --- .../python-modules/gast/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index f374378d9865..110363b38322 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -1,24 +1,36 @@ { lib -, fetchFromGitHub -, buildPythonPackage , astunparse +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "gast"; - version = "0.5.1"; + version = "0.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "serge-sans-paille"; - repo = "gast"; + repo = pname; rev = version; - sha256 = "1gph45frnj47lfr6idiyxrb3gk7vzc9rni9cijmcyz10dyx5kgwa"; + sha256 = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg="; }; - checkInputs = [ astunparse ]; + checkInputs = [ + astunparse + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gast" + ]; meta = with lib; { - description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module."; + description = "Compatibility layer between the AST of various Python versions"; homepage = "https://github.com/serge-sans-paille/gast/"; license = licenses.bsd3; maintainers = with maintainers; [ jyp cpcloud ]; From 245cde952a184c59e340062104594b25bddd3eeb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 15:47:50 +0100 Subject: [PATCH 382/703] python3Packages.rfc3986: add pythonImportsCheck --- .../python-modules/rfc3986/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 76cdb9bb7755..f8fcc9aef7ab 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -1,19 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, idna, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, idna +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "rfc3986"; version = "2.0.0"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "sha256-l6rPnb1L/YKbqtbmMJ+mVzqvG+P2+nNcirBeRs7LJhw="; }; - propagatedBuildInputs = [ idna ]; + propagatedBuildInputs = [ + idna + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rfc3986" + ]; meta = with lib; { description = "Validating URI References per RFC 3986"; From c472377b3b7dedeb5ecc20304b160d70d59403d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 16:12:48 +0100 Subject: [PATCH 383/703] python3Packages.httpx: ignore DeprecationWarning --- .../python-modules/httpx/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 97b6affd3abb..d479cc1f13ce 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -1,11 +1,11 @@ { lib +, async_generator , buildPythonPackage , pythonOlder , fetchFromGitHub , brotlicffi , certifi , charset-normalizer -, h2 , httpcore , rfc3986 , sniffio @@ -21,6 +21,8 @@ buildPythonPackage rec { pname = "httpx"; version = "0.21.3"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -34,10 +36,11 @@ buildPythonPackage rec { brotlicffi certifi charset-normalizer - h2 httpcore rfc3986 sniffio + ] ++ lib.optionals (pythonOlder "3.7") [ + async_generator ]; checkInputs = [ @@ -49,13 +52,21 @@ buildPythonPackage rec { uvicorn ]; - pythonImportsCheck = [ "httpx" ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "rfc3986[idna2008]>=1.3,<2" "rfc3986>=1.3" + ''; # testsuite wants to find installed packages for testing entrypoint preCheck = '' export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + disabledTests = [ # httpcore.ConnectError: [Errno 101] Network is unreachable "test_connect_timeout" @@ -71,6 +82,10 @@ buildPythonPackage rec { "tests/test_main.py" ]; + pythonImportsCheck = [ + "httpx" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { From b47cfa8a163a30a6802a3fb08aa0659f77e6e2fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 16:47:24 +0100 Subject: [PATCH 384/703] python3Packages.datasette: 0.59.4 -> 0.60 --- pkgs/development/python-modules/datasette/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 7908b3c6b496..270e6119ee3b 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -18,7 +18,6 @@ , httpx # Check Inputs , pytestCheckHook -, pytest-runner , pytest-asyncio , pytest-timeout , aiohttp @@ -31,7 +30,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.59.4"; + version = "0.60"; disabled = pythonOlder "3.6"; @@ -39,11 +38,9 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-bH/VREo2f84wloA2jgXnQkGNSRRRYmSvUXmI0wMfmYM="; + sha256 = "sha256-GGxv6GWGUCJb4R4SMrDVc45q6xk4cB3vOCTabHlhNZE="; }; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ aiofiles asgi-csrf @@ -74,6 +71,8 @@ buildPythonPackage rec { ]; postConfigure = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" substituteInPlace setup.py \ --replace "click-default-group~=1.2.2" "click-default-group" \ --replace "hupper~=1.9" "hupper" \ From 5ccfdbec3541223176e82ef5f98ef5d2ce691383 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 18:21:15 +0100 Subject: [PATCH 385/703] python3Packages.h2: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/h2/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index fcd283621493..13d38a14b5b6 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , hpack , hyperframe , pytestCheckHook @@ -11,24 +10,16 @@ buildPythonPackage rec { pname = "h2"; - version = "4.0.0"; + version = "4.1.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"; + sha256 = "sha256-qDrKCPvnqst5/seIycC6yTY0NWDtnsGLgqE6EsKNKrs="; }; - patches = [ - # Workaround issues with hypothesis 6.6 - # https://github.com/python-hyper/h2/pull/1248 - (fetchpatch { - url = "https://github.com/python-hyper/h2/commit/0646279dab694a89562846c810202ce2c0b49be3.patch"; - sha256 = "1k0fsxwq9wbv15sc9ixls4qmxxghlzpflf3awm66ar9m2ikahiak"; - }) - ]; - propagatedBuildInputs = [ hpack hyperframe @@ -48,5 +39,6 @@ buildPythonPackage rec { description = "HTTP/2 State-Machine based protocol implementation"; homepage = "http://hyper.rtfd.org/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 264113f58149755a342cf936ede23f8e96ddbeb8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 18:22:17 +0100 Subject: [PATCH 386/703] python3Packages.hypothesis: cleanup --- .../python-modules/hypothesis/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 6572ad57e110..89aac153172d 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,6 +9,7 @@ , pytest-xdist , sortedcontainers , tzdata +, pythonOlder }: buildPythonPackage rec { # https://hypothesis.readthedocs.org/en/latest/packaging.html @@ -19,8 +20,10 @@ buildPythonPackage rec { pname = "hypothesis"; version = "6.35.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; @@ -35,8 +38,13 @@ buildPythonPackage rec { sortedcontainers ]; - checkInputs = [ pytestCheckHook pytest-xdist pexpect ] - ++ lib.optional (pythonAtLeast "3.9") tzdata; + checkInputs = [ + pexpect + pytest-xdist + pytestCheckHook + ] ++ lib.optional (pythonAtLeast "3.9") [ + tzdata + ]; inherit doCheck; @@ -45,10 +53,16 @@ buildPythonPackage rec { rm tox.ini ''; - pytestFlagsArray = [ "tests/cover" ]; + pytestFlagsArray = [ + "tests/cover" + ]; + + pythonImportsCheck = [ + "hypothesis" + ]; meta = with lib; { - description = "A Python library for property based testing"; + description = "Library for property based testing"; homepage = "https://github.com/HypothesisWorks/hypothesis"; license = licenses.mpl20; maintainers = with maintainers; [ SuperSandro2000 ]; From 25bafc8f1d6e8aa1fdfffbd6b49f95487a68c7d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 19:23:35 +0100 Subject: [PATCH 387/703] python3Packages.pytest-randomly: 3.10.3 -> 3.11.0 --- .../python-modules/pytest-randomly/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index a2fe0c6f25c4..5aae59bc605f 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.10.3"; + version = "3.11.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { repo = pname; owner = "pytest-dev"; rev = version; - sha256 = "sha256-NoYpMpFWz52Z0+KIUumUFp3xMPA1jGw8COojU+bsgHc="; + hash = "sha256-NoYpMpFWz52Z0+KIUumUFp3xMPA1jGw8COojU+bsgHc="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to randomly order tests and control random.seed"; homepage = "https://github.com/pytest-dev/pytest-randomly"; - license = licenses.bsd3; + license = licenses.mit; maintainers = with maintainers; [ sternenseemann ]; }; } From e8362dfa70f9380e4abb7c5f0a7d5188409879b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 21:15:48 +0100 Subject: [PATCH 388/703] python3Packages.pytest-regressions: 2.2.0 -> 2.3.0 --- .../pytest-regressions/default.nix | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 90b72c886eac..6866df7b7125 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , pythonOlder , matplotlib @@ -16,33 +15,44 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "15a71f77cb266dd4ca94331abe4c339ad056b2b2175e47442711c98cf6d65716"; + sha256 = "sha256-STWtZzbvhQ0NsSvl7jh0CjmYjmtRA/LTUQAAaze5Tg4="; }; - patches = [ - # Make pytest-regressions compatible with NumPy 1.20. - # Should be part of the next release. - (fetchpatch { - url = "https://github.com/ESSS/pytest-regressions/commit/ffad2c7fd1d110f420f4e3ca3d39d90cae18a972.patch"; - sha256 = "sha256-bUna7MnMV6u9oEaZMsFnr4gE28rz/c0O2+Hyk291+l0="; - }) - ]; - - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ numpy pandas pillow pytest-datadir pyyaml ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkInputs = [ pytestCheckHook matplotlib ]; - pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + numpy + pandas + pillow + pytest-datadir + pyyaml + ]; + + + checkInputs = [ + pytestCheckHook + matplotlib + ]; + + pythonImportsCheck = [ + "pytest_regressions" + "pytest_regressions.plugin" + ]; meta = with lib; { description = "Pytest fixtures to write regression tests"; From 9cce5dace72a6a90b4406d73955a862b2f507b0b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 21:17:32 +0100 Subject: [PATCH 389/703] python3Packages.pynacl: add pythonImportsCheck --- pkgs/development/python-modules/pynacl/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 3a664b29eedd..f34956d7280f 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -6,13 +7,13 @@ , libsodium , cffi , hypothesis -, stdenv -, six }: buildPythonPackage rec { pname = "pynacl"; version = "1.5.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -31,7 +32,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi - six ]; checkInputs = [ @@ -41,11 +41,14 @@ buildPythonPackage rec { SODIUM_INSTALL = "system"; - pythonImportsCheck = [ "nacl" ]; + pythonImportsCheck = [ + "nacl" + ]; meta = with lib; { description = "Python binding to the Networking and Cryptography (NaCl) library"; homepage = "https://github.com/pyca/pynacl/"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From e2293412d10bb090c93c5d692180f8862849f6d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 21:18:41 +0100 Subject: [PATCH 390/703] python3Packages.zipp: add pythonImportsCheck --- .../python-modules/zipp/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 8d03083446cf..0f64df2a56ac 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -1,26 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm , more-itertools +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "zipp"; version = "3.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ more-itertools ]; + propagatedBuildInputs = [ + more-itertools + ]; # Prevent infinite recursion with pytest doCheck = false; + pythonImportsCheck = [ + "zipp" + ]; + meta = with lib; { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; From af6be1dbaa225010037089bb83e22d83ec72ee9e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 21:21:26 +0100 Subject: [PATCH 391/703] python3Packages.pytest-subtests: 0.5.0 -> 0.6.0 --- .../pytest-subtests/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index 6b556abeaa4f..d5e379b524d5 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -8,22 +8,30 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.5.0"; - disabled = pythonOlder "3.5"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5bd1e4bf0eda4c89a6cd42b0ee28e1d2ca0848de3fd67ad8cdd6d559ed00f120"; + sha256 = "sha256-Pr0wao3PdRM/F0LyiMgvNkJuvPihMtTuiXgtIOhPwTo="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pytest_subtests" ]; + pythonImportsCheck = [ + "pytest_subtests" + ]; meta = with lib; { - description = "pytest plugin for unittest subTest() support and subtests fixture"; + description = "Pytest plugin for unittest subTest() support and subtests fixture"; homepage = "https://github.com/pytest-dev/pytest-subtests"; license = licenses.mit; maintainers = with maintainers; [ fab ]; From c07130d86325b7dbc4e9d5b664f63ab17146721d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 21:35:29 +0100 Subject: [PATCH 392/703] python3Packages.pytest-mypy-plugins: 1.9.2 -> 1.9.3 --- .../pytest-mypy-plugins/default.nix | 44 ++++++++++++++++--- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 38b2168e13fd..806c12c0e4ff 100644 --- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -1,27 +1,57 @@ { lib , buildPythonPackage -, fetchFromGitHub , chevron -, pyyaml +, decorator +, fetchFromGitHub , mypy , pytest -, decorator +, pytestCheckHook +, pythonOlder +, pyyaml , regex }: buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "1.9.2"; + version = "1.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "typeddjango"; repo = pname; rev = version; - sha256 = "sha256-Me5P4Q2M+gGEWlUVgQ0L048rVUOlUzVMgZZcqZPeE4Q="; + sha256 = "sha256-4hG3atahb+dH2dRGAxguJW3vvEf0TUGUJ3G5ymrf3Vg="; }; - propagatedBuildInputs = [ chevron pyyaml mypy pytest decorator regex ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + chevron + pyyaml + mypy + decorator + regex + ]; + + checkInputs = [ + mypy + pytestCheckHook + ]; + + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + + pythonImportsCheck = [ + "pytest_mypy_plugins" + ]; meta = with lib; { - description = "pytest plugin for testing mypy types, stubs, and plugins"; + description = "Pytest plugin for testing mypy types, stubs, and plugins"; homepage = "https://github.com/TypedDjango/pytest-mypy-plugins"; license = licenses.mit; maintainers = with maintainers; [ SomeoneSerge ]; From 8bcd96e711dfbbd544add9edf9b5c78637690450 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 21:36:50 +0100 Subject: [PATCH 393/703] python3Packages.pytest-bdd: 4.0.2 -> 5.0.0 --- .../python-modules/pytest-bdd/default.nix | 44 ++++++++++++------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index b087cd6f4598..6ca95bca4c0b 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib +, buildPythonPackage +, fetchFromGitHub , execnet , glob2 , Mako @@ -8,41 +10,51 @@ , py , pytest , pytestCheckHook -, six +, pythonOlder }: buildPythonPackage rec { pname = "pytest-bdd"; - version = "4.0.2"; + version = "5.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; - # tests are not included in pypi tarball src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = version; - sha256 = "0pxx4c8lm68rw0jshbr09fnadg8zz8j73q0qi49yw9s7yw86bg5l"; + sha256 = "sha256-3P9ongMAsLITOCRPmME492xnkdVc8IdOVrINK57gfOY="; }; - patches = [ - # Fixed compatibility with pytest > 6.1 - (fetchpatch { - url = "https://github.com/pytest-dev/pytest-bdd/commit/e1dc0cad9a1c1ba563ccfbc24f9993d83ac59293.patch"; - sha256 = "1p3gavh6nir2a8crd5wdf0prfrg0hmgar9slvn8a21ils3k5pm5y"; - }) + buildInputs = [ + pytest ]; + propagatedBuildInputs = [ + glob2 + Mako + parse + parse-type + py + ]; - buildInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + execnet + mock + ]; - propagatedBuildInputs = [ glob2 Mako parse parse-type py six ]; - - checkInputs = [ pytestCheckHook execnet mock ]; preCheck = '' export PATH=$PATH:$out/bin ''; + pythonImportsCheck = [ + "pytest_bdd" + ]; + meta = with lib; { - description = "BDD library for the py.test runner"; + description = "BDD library for the pytest"; homepage = "https://github.com/pytest-dev/pytest-bdd"; license = licenses.mit; maintainers = with maintainers; [ jm2dev ]; From 680898f089ec59b68d09f36fb672ccd03e6bc608 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 21:38:59 +0100 Subject: [PATCH 394/703] python3Packages.pytest-remotedata: add pythonImportsCheck --- .../pytest-remotedata/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index b42f539d2e07..fc9b5e6f9c1b 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -1,38 +1,54 @@ { lib , buildPythonPackage , fetchPypi -, six , pytest +, pytestCheckHook +, pythonOlder +, setuptools-scm +, six }: buildPythonPackage rec { pname = "pytest-remotedata"; version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "66920bf1c62928b079d0e611379111a0d49f10a9509ced54c8269514ccce6ee3"; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ six ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - # these tests require a network connection - pytest --ignore tests/test_strict_check.py - ''; + disabledTestPaths = [ + # These tests require a network connection + "tests/test_strict_check.py" + ]; + + pythonImportsCheck = [ + "pytest_remotedata" + ]; meta = with lib; { description = "Pytest plugin for controlling remote data access"; - homepage = "https://astropy.org"; + homepage = "https://github.com/astropy/pytest-remotedata"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From f65fa51637abf829150ba982144ad0f8a0315034 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 21:58:51 +0100 Subject: [PATCH 395/703] python3Packages.pytest-arraydiff: add pythonImportsCheck --- .../pytest-arraydiff/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index cc1b1ab56c12..95e22510d8a0 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -2,35 +2,48 @@ , buildPythonPackage , fetchPypi , numpy -, six , pytest +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-arraydiff"; version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "714149beffd0dfa085477c65791c1139b619602b049536353ce1a91397fb3bd2"; }; - buildInputs = [ pytest ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ numpy - six ]; - # The tests requires astropy, which itself requires - # pytest-arraydiff. This causes an infinite recursion if the tests - # are enabled. + # The tests requires astropy, which itself requires pytest-arraydiff doCheck = false; + pythonImportsCheck = [ + "pytest_arraydiff" + ]; + meta = with lib; { description = "Pytest plugin to help with comparing array output from tests"; homepage = "https://github.com/astrofrog/pytest-arraydiff"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From dece898effca6da4f5ad986605b8ae76dcad127c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Jan 2022 22:01:00 +0100 Subject: [PATCH 396/703] python3Packages.graphql-core: 3.1.7 -> 3.2.0 --- pkgs/development/python-modules/graphql-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 6a33cfd7b352..75583cdbfe39 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.7"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "1mwwh55qd5bcpvgy6pyliwn8jkmj4yk4d2pqb6mdkgqhdic2081l"; + sha256 = "sha256-71Z+5nVvg+aozJAKmBGJg5Gqq1OIVH7Xv33Q82IHhXg="; }; checkInputs = [ From 0a5f324b56581625ed8fb214d42b52b97e04becf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 16 Jan 2022 15:52:32 +0100 Subject: [PATCH 397/703] python3Packages.click-completion: add pythonImportsCheck, disable checkPhase --- .../click-completion/default.nix | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 19fdac37615a..dcfcab597b90 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -1,18 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, - click, jinja2, shellingham, six +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 + +# propagates +, click +, jinja2 +, shellingham +, six }: buildPythonPackage rec { pname = "click-completion"; version = "0.5.2"; - disabled = (!isPy3k); + disabled = isPy27; src = fetchPypi { inherit pname version; sha256 = "5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86"; }; - propagatedBuildInputs = [ click jinja2 shellingham six ]; + propagatedBuildInputs = [ + click + jinja2 + shellingham + six + ]; + + pythonImportsCheck = [ + "click_completion" + ]; + + # has no tests + doCheck = false; meta = with lib; { description = "Add or enhance bash, fish, zsh and powershell completion in Click"; From da2b4c01b31db1d1596b9c419c86aabd14d2666d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 16 Jan 2022 16:10:55 +0100 Subject: [PATCH 398/703] python3Packages.tqdm: test with explicit async_mode --- pkgs/development/python-modules/tqdm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 606308f88967..3973d68b6c38 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -37,6 +37,11 @@ buildPythonPackage rec { # pandas is not supported on i686 or risc-v lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas; + pytestFlagsArray = [ + # pytest-asyncio 0.17.0 compat; https://github.com/tqdm/tqdm/issues/1289 + "--asyncio-mode=strict" + ]; + # Remove performance testing. # Too sensitive for on Hydra. disabledTests = [ From b49036c6525a08fe6dc438d67c5a89f0f9c8622e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 16 Jan 2022 16:50:55 +0100 Subject: [PATCH 399/703] python3Packages.josepy: drop flake8-ignore from pytest.ini --- pkgs/development/python-modules/josepy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 140b65c73772..036b60e9eca2 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ --replace " --flake8 --cov-report xml --cov-report=term-missing --cov=josepy --cov-config .coveragerc" "" + sed -i '/flake8-ignore/d' pytest.ini ''; pythonImportsCheck = [ From 5aa214e4aa59285e2d9fba3836537fc48353f954 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 16 Jan 2022 19:37:13 +0100 Subject: [PATCH 400/703] python3Packages.starlette: don't test with pytest-asyncio The upstream does not test with pytest-asyncio and it does cause problems now. --- pkgs/development/python-modules/starlette/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 9612ac999cc8..1084a50be770 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -12,7 +12,6 @@ , requests , aiosqlite , databases -, pytest-asyncio , pytestCheckHook , pythonOlder , trio @@ -58,7 +57,6 @@ buildPythonPackage rec { checkInputs = [ aiosqlite databases - pytest-asyncio pytestCheckHook trio typing-extensions From d1a4527ed67cb245303a9e619da78b4e0e49329b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 02:16:21 +0100 Subject: [PATCH 401/703] python3Packages.readchar: fix build --- .../python-modules/readchar/default.nix | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 817bebc71b2e..81c489bd8c09 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -1,19 +1,41 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytest-cov, pexpect }: +{ lib +, buildPythonPackage +, fetchFromGitHub + +# native +, flake8 + +# tests +, pytestCheckHook +, pexpect +}: buildPythonPackage rec { pname = "readchar"; version = "3.0.5"; + format = "setuptools"; # Don't use wheels on PyPI src = fetchFromGitHub { owner = "magmax"; repo = "python-${pname}"; - rev = version; - sha256 = "01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx"; + rev = "v${version}"; + sha256 = "sha256:01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx"; }; - nativeBuildInputs = [ flake8 ]; - checkInputs = [ pytest pytest-cov pexpect ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov readchar" "" + ''; + + nativeBuildInputs = [ + flake8 + ]; + + checkInputs = [ + pytestCheckHook + pexpect + ]; meta = with lib; { homepage = "https://github.com/magmax/python-readchar"; From 0e2b063114b57001a2423ccaa86cb417f6085a13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 02:29:51 +0100 Subject: [PATCH 402/703] python3Packages.inquirer: fix build and src --- .../python-modules/inquirer/default.nix | 48 +++++++++++++------ 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index f8c13dc13804..dd2db106acea 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,30 +1,48 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytest-cov, pexpect, pytest-mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub + +# native +, poetry-core + +# propagated +, blessed +, python-editor +, readchar + +# tests +, pytest-mock +, pytestCheckHook +, pexpect +}: buildPythonPackage rec { pname = "inquirer"; version = "2.9.1"; + format = "pyproject"; - # PyPi archive currently broken: https://github.com/magmax/python-inquirer/issues/106 src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; - rev = version; - sha256 = "0vdly2k4i7bfcqc8zh2miv9dbpmqvayxk72qn9d4hr7z15wph233"; + rev = "v${version}"; + sha256 = "sha256:0vdly2k4i7bfcqc8zh2miv9dbpmqvayxk72qn9d4hr7z15wph233"; }; - propagatedBuildInputs = [ blessed python-editor readchar ]; + nativeBuildInputs = [ + poetry-core + ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "blessed==1.17.6" "blessed~=1.17" \ - --replace "readchar==2.0.1" "readchar>=2.0.0" - ''; + propagatedBuildInputs = [ + blessed + python-editor + readchar + ]; - checkInputs = [ pytest pytest-cov pexpect pytest-mock ]; - - checkPhase = '' - pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration - ''; + checkInputs = [ + pexpect + pytest-mock + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/magmax/python-inquirer"; From f2f715ef1fadc3fa8a23cfc90e5c57d6dd68d286 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 02:53:44 +0100 Subject: [PATCH 403/703] python3Packages.aioitertools: fix build --- .../python-modules/aioitertools/default.nix | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 4349bf4fccd3..cae0b10ea690 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -1,20 +1,26 @@ { lib - , buildPythonPackage , fetchpatch , fetchPypi , pythonAtLeast , pythonOlder + +# native +, flit-core + +# propagates , typing-extensions -, coverage + +# tests , python -, toml }: buildPythonPackage rec { pname = "aioitertools"; version = "0.8.0"; - disabled = pythonOlder "3.7"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -30,11 +36,20 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ typing-extensions ]; - checkInputs = [ coverage toml ]; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + pythonImportsCheck = [ + "aioitertools" + ]; checkPhase = '' - ${python.interpreter} -m coverage run -m aioitertools.tests + ${python.interpreter} -m unittest discover ''; meta = with lib; { From efc81847cbe8e969104786a9faf6e7e6debe3d6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 02:56:57 +0100 Subject: [PATCH 404/703] python3Packages.sqlitedict: fix tests, convert to pytestCheckHook --- .../python-modules/sqlitedict/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index b9af16855a40..178617e18dea 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -1,4 +1,8 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "sqlitedict"; @@ -11,12 +15,14 @@ buildPythonPackage rec { sha256 = "08fr81rz1fz35d35kravg7vl234aqagr9wqb09x6wi9lx9zkkh28"; }; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest tests + preCheck = '' + mkdir tests/db ''; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Persistent, thread-safe dict"; homepage = "https://github.com/RaRe-Technologies/sqlitedict"; From bec7914e03bb3105b2b774af8bed5da34d83fddc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 02:59:13 +0100 Subject: [PATCH 405/703] python3Packages.aiounifi: fix pytest-asyncio compatibility --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 8d31fccc5647..d84a396238a6 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=auto" + ]; + pythonImportsCheck = [ "aiounifi" ]; meta = with lib; { From 0e52fc0993c7e5cd42d8b6bdbc366f8aa31117cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 03:10:56 +0100 Subject: [PATCH 406/703] python3Packages.fakeredis: add redis 4.1.0 compatibility, use pyproject build --- .../python-modules/fakeredis/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index eff55de1d90e..91a0a797a5fd 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -3,6 +3,7 @@ , async_generator , buildPythonPackage , fetchPypi +, fetchpatch , hypothesis , lupa , pytest-asyncio @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "fakeredis"; version = "1.7.0"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.5"; @@ -26,6 +27,23 @@ buildPythonPackage rec { sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE="; }; + patches = [ + (fetchpatch { + # redis 4.1.0 compatibility + # https://github.com/jamesls/fakeredis/pull/324 + url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch"; + sha256 = "sha256:03xlqmwq8nkzisrjk7y51j2jd6qdin8nbj5n9hc4wjabbvlgx4qr"; + excludes = [ + "setup.cfg" + ]; + }) + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "redis<4.1.0" "redis" + ''; + propagatedBuildInputs = [ aioredis lupa @@ -42,11 +60,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # AttributeError: 'AsyncGenerator' object has no attribute XXXX - "test/test_aioredis2.py" - ]; - pythonImportsCheck = [ "fakeredis" ]; From 132d2ef47d8c2d5cb93039aeb31a2083e0a91fcc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 03:17:05 +0100 Subject: [PATCH 407/703] python3Packages.rokuecp: add missing cachetools dependency --- pkgs/development/python-modules/rokuecp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 73e5209a1993..04bee719c569 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -2,6 +2,7 @@ , aiohttp , aresponses , buildPythonPackage +, cachetools , fetchFromGitHub , pytest-asyncio , pytestCheckHook @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + cachetools xmltodict yarl ]; From ebcfdb4d62cfcc42fed091e1b3847530c9169c1d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 03:25:50 +0100 Subject: [PATCH 408/703] python3Packages.pyflunearyou: relax ujson constraint --- pkgs/development/python-modules/pyflunearyou/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index 99506de1026a..a481e9a97a89 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; From e02cea2d69d548710d6412845b68520e7d053803 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 03:29:41 +0100 Subject: [PATCH 409/703] python3Packages.hyperion-py: fix pytest-asyncio compatibility --- pkgs/development/python-modules/hyperion-py/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix index c282be29c655..719efb92d1da 100644 --- a/pkgs/development/python-modules/hyperion-py/default.nix +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -36,6 +36,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # pytest-asyncio 0.17.0 compat + "--asyncio-mode=auto" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --timeout=9 --cov=hyperion" "" From 7b0380172b8642b187571d269a6d94d20b3c0647 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 03:32:00 +0100 Subject: [PATCH 410/703] python3Packages.webtest: convert to pytestCheckHook --- pkgs/development/python-modules/webtest/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index f8b7ec99157a..8ec42598ee61 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -2,15 +2,14 @@ , buildPythonPackage , fetchPypi , isPy27 -, nose , webob , six , beautifulsoup4 , waitress -, mock , pyquery , wsgiproxy2 , pastedeploy +, pytestCheckHook }: buildPythonPackage rec { @@ -36,8 +35,7 @@ buildPythonPackage rec { ]; checkInputs = [ - nose - mock + pytestCheckHook pastedeploy wsgiproxy2 pyquery From 1071f94fde75dc28d0c2f5fc5272c6401c7255a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 03:35:08 +0100 Subject: [PATCH 411/703] python3Packages.responses: propagate six --- pkgs/development/python-modules/responses/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index a87655d7147d..86e37419c72d 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , requests +, six , urllib3 }: @@ -22,6 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests + six urllib3 ]; From 656880703249581501f7682d00d3c99c35c7c756 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 16 Jan 2022 22:51:36 -0800 Subject: [PATCH 412/703] azure-cli: fix deps --- pkgs/tools/admin/azure-cli/default.nix | 2 ++ pkgs/tools/admin/azure-cli/python-packages.nix | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 6f6e06db2a08..efd1ecfee3c1 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -29,6 +29,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { --replace "javaproperties~=0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ --replace "scp~=0.13.2" "scp" \ + --replace "PyNaCl~=1.4.0" "PyNaCl" \ --replace "jsondiff~=1.2.0" "jsondiff~=1.2" \ --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \ --replace "mock~=4.0" "mock" @@ -141,6 +142,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { pydocumentdb PyGithub pygments + pynacl pyopenssl pytz pyyaml diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 0339caa72ce8..53c72d007e22 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -466,7 +466,8 @@ let inherit version; sha256 = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE="; }; - # sdist lacks tests + + # sdist doesn't provide tests doCheck = false; }); @@ -502,6 +503,16 @@ let }; }); + argcomplete = super.argcomplete.overridePythonAttrs(oldAttrs: rec { + version = "1.8.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-SreailmO/AgRBGv3dnj4VkMnbokAzWT5xPEPEQ4QEb0="; + }; + }); + sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec { name = "sshtunnel-${version}"; version = "0.1.5"; From 6122c501aa3ded5006087cb940c440cb7a8cb07e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jan 2022 10:27:25 +0100 Subject: [PATCH 413/703] python3Packages.importlib-metadata: 4.10.0 -> 4.10.1 --- .../development/python-modules/importlib-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index a607de5eb114..13b26e337ac2 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.10.0"; + version = "4.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-kqi1jOc0sqRJSHjg7PfXnM16EotfxgFMQB4LYfAG8PY="; + hash = "sha256-lR8NiltyYOnbXkHUKShbX0UekoR58Z2AgYh4Un026V4="; }; nativeBuildInputs = [ From 64860508a405013b63557a9f8e17e52062c51e50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jan 2022 10:32:35 +0100 Subject: [PATCH 414/703] python3Packages.cachetools: 4.2.4 -> 5.0.0 --- pkgs/development/python-modules/cachetools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 1bff572b6032..f38eb328e3d9 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "cachetools"; - version = "4.2.4"; + version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tkem"; repo = pname; rev = "v${version}"; - sha256 = "sha256-doPLl7Ooc2cKlTiS/dqLTKSkTlSgPFztIumAzciM0bc="; + hash = "sha256-urTkls1S83m7Eo7chPaQc5gxz0omZBToNYa8upQEiOo="; }; checkInputs = [ From 8e4e96971499aae417f6e9d1e406f93fdf0231c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jan 2022 13:26:33 +0100 Subject: [PATCH 415/703] python3Packages.pypytools: init at 0.6.2 --- .../python-modules/pypytools/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/pypytools/default.nix diff --git a/pkgs/development/python-modules/pypytools/default.nix b/pkgs/development/python-modules/pypytools/default.nix new file mode 100644 index 000000000000..e88891172deb --- /dev/null +++ b/pkgs/development/python-modules/pypytools/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, freezegun +, numpy +, py +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pypytools"; + version = "0.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-oUDAU+TRwLroNfQGYusAQKdRkHcazysqiDLfp77v5Sk="; + }; + + propagatedBuildInputs = [ + py + ]; + + checkInputs = [ + freezegun + numpy + pytestCheckHook + ]; + + patches = [ + # Support for later Python releases, https://github.com/antocuni/pypytools/pull/2 + (fetchpatch { + name = "support-later-python.patch"; + url = "https://github.com/antocuni/pypytools/commit/c6aed496ec35a6ef7ce9e95084849eebc16bafef.patch"; + sha256 = "sha256-YoYRZmgueQmxRtGaeP4zEVxuA0U7TB0PmoYHHVI7ICQ="; + }) + ]; + + pythonImportsCheck = [ + "pypytools" + ]; + + meta = with lib; { + description = "Collection of tools to use PyPy-specific features"; + homepage = "https://github.com/antocuni/pypytools"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa2d2c529e91..8e23757769f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7254,6 +7254,8 @@ in { pypykatz = callPackage ../development/python-modules/pypykatz { }; + pypytools = callPackage ../development/python-modules/pypytools { }; + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; pyqt-builder = callPackage ../development/python-modules/pyqt-builder { }; From a2c41d3942769aff2f5c7e75d400e4be1a675dd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jan 2022 13:34:51 +0100 Subject: [PATCH 416/703] python3Packages.cheroot: add missing dependency and cleanup --- .../python-modules/cheroot/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 4d46ec81ada0..436669d92092 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,16 +1,16 @@ { lib , stdenv -, fetchPypi , buildPythonPackage -, isPy3k +, fetchPypi , jaraco_functools , jaraco_text , more-itertools , portend , pyopenssl -, pytestCheckHook -, pytest-cov +, pypytools , pytest-mock +, pytestCheckHook +, pythonOlder , requests , requests-toolbelt , requests-unixsocket @@ -24,19 +24,20 @@ buildPythonPackage rec { pname = "cheroot"; version = "8.6.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "366adf6e7cac9555486c2d1be6297993022eff6f8c4655c1443268cca3f08e25"; + hash = "sha256-NmrfbnyslVVIbC0b5il5kwIu/2+MRlXBRDJozKPwjiU="; }; - nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive + ]; propagatedBuildInputs = [ - # install_requires jaraco_functools - more-itertools six ]; @@ -45,9 +46,9 @@ buildPythonPackage rec { jaraco_text portend pyopenssl - pytestCheckHook - pytest-cov + pypytools pytest-mock + pytestCheckHook requests requests-toolbelt requests-unixsocket @@ -79,6 +80,10 @@ buildPythonPackage rec { "cheroot/test/test_wsgi.py" ]; + pythonImportsCheck = [ + "cheroot" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; @@ -86,5 +91,6 @@ buildPythonPackage rec { description = "High-performance, pure-Python HTTP"; homepage = "https://github.com/cherrypy/cheroot"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 0c89c2a4bf027040aa87fa2b0c6305be5f588525 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jan 2022 13:48:25 +0100 Subject: [PATCH 417/703] python3Packages.configshell: relax pyparsing constraint --- .../python-modules/configshell/default.nix | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index 9f67aacf2d4e..2cd66636b016 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pyparsing +, six +, urwid +}: buildPythonPackage rec { pname = "configshell"; @@ -11,11 +17,28 @@ buildPythonPackage rec { sha256 = "0mjj3c9335sph8rhwww7j4zvhyk896fbmx887vibm89w3jpvjjr9"; }; - propagatedBuildInputs = [ pyparsing six urwid ]; + propagatedBuildInputs = [ + pyparsing + six + urwid + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pyparsing >=2.0.2,<3.0" "pyparsing >=2.0.2" + ''; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "configshell" + ]; meta = with lib; { - description = "A Python library for building configuration shells"; + description = "Python library for building configuration shells"; homepage = "https://github.com/open-iscsi/configshell-fb"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From 910fec81999595a8ff9fe2c842ba35ce25c7c556 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 13:53:21 +0100 Subject: [PATCH 418/703] python3Packages.atv: fix pytest-asyncio compatibility --- pkgs/development/python-modules/pyatv/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 9f1bd0081084..f2e4e2a19960 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -52,6 +52,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=auto" + ]; + postPatch = '' substituteInPlace setup.py \ --replace "pytest-runner" "" From d41848107678d069811e455db5d74bec724a8504 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jan 2022 13:58:31 +0100 Subject: [PATCH 419/703] python3Packages.diff_cover: adjust inputs and disable failing test --- .../python-modules/diff-cover/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index e9735402fe33..5414f7522dbe 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -2,21 +2,25 @@ , buildPythonPackage , chardet , fetchPypi -, inflect , jinja2 , jinja2_pluralize +, pluggy , pycodestyle , pyflakes , pygments , pylint +, pytest-datadir , pytest-mock , pytestCheckHook , pythonOlder +, tomli }: buildPythonPackage rec { pname = "diff-cover"; version = "6.4.4"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -27,26 +31,32 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet - inflect jinja2 jinja2_pluralize + pluggy pygments + tomli ]; checkInputs = [ pycodestyle pyflakes pylint + pytest-datadir pytest-mock pytestCheckHook ]; disabledTests = [ - "added_file_pylint_console" + # Tests check for flake8 "file_does_not_exist" + # AssertionError: assert '.c { color:... + "test_style_defs" ]; - pythonImportsCheck = [ "diff_cover" ]; + pythonImportsCheck = [ + "diff_cover" + ]; meta = with lib; { description = "Automatically find diff lines that need test coverage"; From 7fc5951cde93e3adabc0f301e5bd6d02366e51fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jan 2022 15:32:02 +0100 Subject: [PATCH 420/703] python3Packages.pydot: switch to pytestCheckHook --- .../python-modules/pydot/default.nix | 44 ++++++++++++++----- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 00e36ec37312..8dccfbc2610d 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -4,19 +4,33 @@ , substituteAll , graphviz , python +, pytestCheckHook , chardet +, pythonOlder , pyparsing }: buildPythonPackage rec { pname = "pydot"; version = "1.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d"; }; + propagatedBuildInputs = [ + pyparsing + ]; + + checkInputs = [ + chardet + pytestCheckHook + ]; + patches = [ (substituteAll { src = ./hardcode-graphviz-path.patch; @@ -27,21 +41,31 @@ buildPythonPackage rec { postPatch = '' # test_graphviz_regression_tests also fails upstream: https://github.com/pydot/pydot/pull/198 substituteInPlace test/pydot_unittest.py \ - --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" + --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" \ + # Patch path for pytestCheckHook + substituteInPlace test/pydot_unittest.py \ + --replace "shapefile_dir = os.path.join(test_dir, 'from-past-to-future')" "shapefile_dir = 'test/from-past-to-future'" \ + --replace "path = os.path.join(test_dir, TESTS_DIR_1)" "path = os.path.join('test/', TESTS_DIR_1)" ''; - propagatedBuildInputs = [ pyparsing ]; + pytestFlagsArray = [ + "test/pydot_unittest.py" + ]; - checkInputs = [ chardet ]; + disabledTests = [ + "test_exception_msg" + # Hash mismatch + "test_my_regression_tests" + ]; - checkPhase = '' - cd test - ${python.interpreter} pydot_unittest.py - ''; + pythonImportsCheck = [ + "pydot" + ]; - meta = { + meta = with lib; { + description = "Allows to create both directed and non directed graphs from Python"; homepage = "https://github.com/erocarrera/pydot"; - description = "Allows to easily create both directed and non directed graphs from Python"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 8e4a147300e47548e3a29215d24140be956eb3dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jan 2022 15:45:35 +0100 Subject: [PATCH 421/703] python3Packages.aws-sam-translator: relax jsonschema constraint --- .../aws-sam-translator/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 4ca5df17109f..ca01e35a3c55 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -1,7 +1,6 @@ { lib , boto3 , buildPythonPackage -, enum34 , fetchFromGitHub , jsonschema , mock @@ -15,6 +14,9 @@ buildPythonPackage rec { pname = "aws-sam-translator"; version = "1.42.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aws"; @@ -27,11 +29,11 @@ buildPythonPackage rec { boto3 jsonschema six - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 ]; postPatch = '' + substituteInPlace requirements/base.txt \ + --replace "jsonschema~=3.2" "jsonschema>=3.2" substituteInPlace pytest.ini \ --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" ''; @@ -43,7 +45,14 @@ buildPythonPackage rec { pyyaml ]; - pythonImportsCheck = [ "samtranslator" ]; + disabledTests = [ + # AssertionError: Expected 7 errors, found 9: + "test_errors_13_error_definitionuri" + ]; + + pythonImportsCheck = [ + "samtranslator" + ]; meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; From e42dd294e4b1c837658068dfaad1545115e6ed9e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 17 Jan 2022 16:18:38 +0100 Subject: [PATCH 422/703] python2.pkgs.pyparsing: keep 2.4.7 --- .../python2-modules/pyparsing/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python2-modules/pyparsing/default.nix diff --git a/pkgs/development/python2-modules/pyparsing/default.nix b/pkgs/development/python2-modules/pyparsing/default.nix new file mode 100644 index 000000000000..d51032a154af --- /dev/null +++ b/pkgs/development/python2-modules/pyparsing/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +# since this is a dependency of pytest, we need to avoid +# circular dependencies +, jinja2 +, railroad-diagrams +}: + +let + pyparsing = buildPythonPackage rec { + pname = "pyparsing"; + version = "2.4.7"; + + src = fetchFromGitHub { + owner = "pyparsing"; + repo = pname; + rev = "pyparsing_${version}"; + sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; + }; + + # circular dependencies if enabled by default + doCheck = false; + checkInputs = [ + jinja2 + railroad-diagrams + ]; + + checkPhase = '' + python -m unittest + ''; + + passthru.tests = { + check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + homepage = "https://github.com/pyparsing/pyparsing"; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + license = licenses.mit; + }; + }; +in + pyparsing diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 4a15b64da09f..47657d858eca 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -114,6 +114,8 @@ with self; with super; { pyjwt = callPackage ../development/python2-modules/pyjwt { }; + pyparsing = callPackage ../development/python2-modules/pyparsing { }; + pyroma = callPackage ../development/python2-modules/pyroma { }; pysqlite = callPackage ../development/python2-modules/pysqlite { }; From 8883edda363c9f0db21b347c3d0ca31d80123a59 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 10:59:12 -0800 Subject: [PATCH 423/703] python3Packages.python-utils: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/python-utils/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index ee8861056860..3a47e107df6e 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -3,17 +3,19 @@ , fetchFromGitHub , pytestCheckHook , six +, pytest-mypy }: buildPythonPackage rec { pname = "python-utils"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "WoLpH"; repo = pname; rev = "v${version}"; - sha256 = "003radi605xjjxfa6fc9jih8j2l3yjkvanql20w9ppxs0v5vzm9w"; + sha256 = "sha256-+NgcVIDM9f2OKBpJNWlSyFxEONltPWJSWIu400/5RkQ= +"; }; # disable coverage and linting @@ -27,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-mypy pytestCheckHook ]; From 22879afd3c7bf31d86d21646a67d723a8ae95352 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 11:43:20 -0800 Subject: [PATCH 424/703] python3Packages.dask: 2021.10.0 -> 2022.01.0 --- .../development/python-modules/dask/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 39d01559d460..0358083c3a57 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2021.10.0"; + version = "2022.01.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,19 +32,10 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "07ysrs46x5w8rc2df0j06rsw58ahcysd6lwjk5riqpjlpwdfmg7p"; + sha256 = "sha256-HlVvnhEDzefzv9xchlXl9d4KCumoAqoYUWmIiCXLJyM= +"; }; - patches = [ - # remove with next bump - (fetchpatch { - name = "fix-tests-against-distributed-2021.10.0.patch"; - url = "https://github.com/dask/dask/commit/cd65507841448ad49001cf27564102e2fb964d0a.patch"; - includes = [ "dask/tests/test_distributed.py" ]; - sha256 = "1i4i4k1lzxcydq9l80jyifq21ny0j3i47rviq07ai488pvx1r2al"; - }) - ]; - propagatedBuildInputs = [ cloudpickle fsspec @@ -82,7 +73,7 @@ buildPythonPackage rec { pytestFlagsArray = [ # parallelize - "--numprocesses auto" + "--numprocesses $NIX_BUILD_CORES" # rerun failed tests up to three times "--reruns 3" # don't run tests that require network access From 7bcf54a9169ae3af5b2b8361e7489a7aeb5d0df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 Jan 2022 19:55:59 +0000 Subject: [PATCH 425/703] python3Packages.cfn-lint: update dependencies --- pkgs/development/python-modules/cfn-lint/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 3695ae9ebcb6..354f90f12b6b 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -3,16 +3,12 @@ , fetchFromGitHub , pythonOlder , aws-sam-translator -, importlib-metadata -, importlib-resources , jschema-to-python , jsonpatch , jsonschema , junit-xml , networkx -, pathlib2 , pyyaml -, requests , sarif-om , setuptools , six @@ -34,7 +30,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"' + --replace "jsonschema~=3.0" "jsonschema>=3.0" ''; propagatedBuildInputs = [ @@ -44,13 +40,10 @@ buildPythonPackage rec { jsonschema junit-xml networkx - pathlib2 pyyaml - requests sarif-om - setuptools six - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; + ]; checkInputs = [ mock From dc9d5b4176c7913e7f243fe095b61de4fd9dd9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 Jan 2022 19:56:34 +0000 Subject: [PATCH 426/703] python3Packages.aiobotocore: relax botocore constraint --- pkgs/development/python-modules/aiobotocore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 9988f1da26e6..f513ab557329 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { # relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. postPatch = '' - substituteInPlace setup.py --replace 'botocore>=1.20.106,<1.20.107' 'botocore' + sed -i "s/'botocore>=.*'/'botocore'/" setup.py ''; propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; From 5080051a31ec61fde6e42ac09080d7e413161d10 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 11:59:24 -0800 Subject: [PATCH 427/703] python3Packages.configargparse: fix tag --- pkgs/development/python-modules/configargparse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 3e345b3dcd41..7c1594e9e805 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; - rev = version; + rev = "v${version}"; sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; }; From 407981d0568bbfa111f9aafc064d1c7be0115ab9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 12:06:58 -0800 Subject: [PATCH 428/703] python3Packages.requests-cache: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/requests-cache/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index f095cf00a28c..adaf824d3d92 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.0"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,8 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "0gz6fyc6lgbab9k92cihrp3711r1wcp4xhs25qp176zbzgccbj43"; + sha256 = "sha256-MZ3N0zbo745erF52D6DqOEb4OPpXFwSsemi0z6Do02c= +"; }; nativeBuildInputs = [ From a793fe02c1a68d80b880cb2c8dc69204c8108364 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 12:11:39 -0800 Subject: [PATCH 429/703] python3Packages.mocket: fix http tests --- pkgs/development/python-modules/mocket/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 6530a59c3f24..1a0b7ee907bc 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -45,6 +45,8 @@ buildPythonPackage rec { pook ]; + # skip http tests + SKIP_TRUE_HTTP = true; pytestFlagsArray = [ # Requires a live Redis instance "--ignore=tests/main/test_redis.py" From ac7b0db092281ab8d3e595a884711eb35cbe3c83 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 12:18:23 -0800 Subject: [PATCH 430/703] python3Packages.resolvelib: disable tests, because commentjson --- pkgs/development/python-modules/resolvelib/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index f5c1f4357268..826900285868 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -21,11 +21,17 @@ buildPythonPackage rec { sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv"; }; + # lark-parser is no longer detectable for commentjson + doCheck = false; checkInputs = [ commentjson pytestCheckHook ]; + pythonImportsCheck = [ + "resolvelib" + ]; + meta = with lib; { description = "Resolve abstract dependencies into concrete ones"; homepage = "https://github.com/sarugaku/resolvelib"; From 02956c286da7d3120780851dbf8f22fd92cd029f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 12:29:51 -0800 Subject: [PATCH 431/703] python3Packages.ttp: fix tests --- pkgs/development/python-modules/ttp/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 7620ee305c89..d4200bc66f7d 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -57,6 +57,8 @@ buildPythonPackage rec { disabledTestPaths = [ # missing package n2g "test/pytest/test_N2G_formatter.py" + # missing test file + "test/pytest/test_extend_tag.py" ]; disabledTests = [ @@ -81,6 +83,10 @@ buildPythonPackage rec { "test_excel_formatter_update_using_result_kwargs" # missing package n2g "test_n2g_formatter" + # missing test files + "test_TTP_CACHE_FOLDER_env_variable_usage" + # requires additional network setup + "test_child_group_do_not_start_if_no_parent_started" ]; pytestFlagsArray = [ From 35a6aa11a0f7d9d2705aa579f6793a3336fa3636 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 12:30:33 -0800 Subject: [PATCH 432/703] python3Packages.transmission-rpc: relax typing_extensions version bounds --- pkgs/development/python-modules/transmission-rpc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 3420773372f4..17d893f37633 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { sha256 = "ef3a931fc1f1db74edf8660e475b9295e0904ee922030ef0e45b0c73f4be65ae"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'typing_extensions>=3.7.4.2,<4.0.0.0' 'typing_extensions' + ''; + propagatedBuildInputs = [ six typing-extensions From c4f7e3a4509585305c113800f14880dc8301bca0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 12:39:12 -0800 Subject: [PATCH 433/703] python3Packages.google-auth: fix deps version bounds --- pkgs/development/python-modules/google-auth/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index b51a5569a595..9249b949b6e6 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -25,6 +25,11 @@ buildPythonPackage rec { sha256 = "d83570a664c10b97a1dc6f8df87e5fdfff012f48f62be131e449c20dfc32630e"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "cachetools>=2.0.0,<5.0" "cachetools" + ''; + propagatedBuildInputs = [ cachetools pyasn1-modules From 7cb809d32007be9ebf9259eac390427d87307360 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 21:51:19 +0100 Subject: [PATCH 434/703] python3Packages.pytest-asyncio: 0.17.0 -> 0.17.2 --- pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index ca9951dc8715..6401e1ce2c9b 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.17.0"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - sha256 = "1c7xddg76pixwlwdl4zxwpy48q2q619i8kzjx2c67a0i8xbx1q5r"; + sha256 = "sha256-4wDXvO6pDK0dQLnyfJTTa+GXf9Qtsi6ywYDUIdhkgGo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From fb0da9f562befc343125e20070c5e95c08e146e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 22:05:56 +0100 Subject: [PATCH 435/703] python3Packages.simplisafe-python: migrate types-pytz from propagated to checks --- pkgs/development/python-modules/simplisafe-python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index bbfd95cd9212..9cdf40ca8430 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -40,7 +40,6 @@ buildPythonPackage rec { backoff docutils pytz - types-pytz voluptuous websockets ]; @@ -51,6 +50,7 @@ buildPythonPackage rec { pytest-aiohttp pytest-asyncio pytestCheckHook + types-pytz ]; postPatch = '' From cd050cf0fc6bf88e5db90f86a712f0fccca03c86 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 22:14:04 +0100 Subject: [PATCH 436/703] python3Packages.mpd2: 3.0.4 -> 3.0.5 --- pkgs/development/python-modules/mpd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 8d17d8b3b0cf..282d4a71c962 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.4"; + version = "3.0.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1r8saq1460yfa0sxfrvxqs2r453wz2xchlc9gzbpqznr49786rvs"; + sha256 = "sha256-bxv/2TuaMvwBipu/NIdQW1Lg11fsNAZpBcYKkS1JI4Q="; }; buildInputs = [ mock ]; From f2027daf5932ba151c8e240cca620fba718f2f07 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 22:39:27 +0100 Subject: [PATCH 437/703] python3Packages.wheel: 0.36.2 -> 0.37.1 --- pkgs/development/python-modules/wheel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 1b899b59897f..62298b0d6ac4 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.36.2"; + version = "0.37.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "13bj49psan1s1fxfrq613dm2l7jvrg2dpgb36lz81z3b1h7zig6j"; + sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs="; name = "${pname}-${version}-source"; extraPostFetch = '' cd $out @@ -37,7 +37,7 @@ buildPythonPackage rec { pipInstallFlags = [ "--ignore-installed" ]; meta = with lib; { - homepage = "https://bitbucket.org/pypa/wheel/"; + homepage = "https://github.com/pypa/wheel"; description = "A built-package format for Python"; longDescription = '' This library is the reference implementation of the Python wheel packaging standard, From ce9944c4d4cfe441b716ce1bb036d3dc33ee9646 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 23:26:15 +0100 Subject: [PATCH 438/703] python3Packages.nose: fix build With setuptools 58 internal translation using 2to3 has been removed, but since we still use nose to test over 300 packages we're apply 2to3 manually instead. --- pkgs/development/python-modules/nose/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 456bbfd9aedd..451c71897da9 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -14,6 +14,19 @@ buildPythonPackage rec { sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"; }; + # 2to3 was removed in setuptools 58 + postPatch = '' + substituteInPlace setup.py \ + --replace "'use_2to3': True," "" + + substituteInPlace setup3lib.py \ + --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" + ''; + + preBuild = '' + 2to3 -wn nose functional_tests unit_tests + ''; + propagatedBuildInputs = [ coverage ]; doCheck = false; # lot's of transient errors, too much hassle From 8a6c6f1b13d5d481eed07f1621c9f3b7996db802 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jan 2022 23:57:21 +0100 Subject: [PATCH 439/703] python3Packages.django-timezone-field: 4.2.1 -> 4.2.3 --- .../python-modules/django-timezone-field/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix index 0bbdac356cd0..5d43afc77949 100644 --- a/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/pkgs/development/python-modules/django-timezone-field/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-timezone-field"; - version = "4.2.1"; + version = "4.2.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mfogel"; repo = pname; rev = version; - sha256 = "0swld4168pfhppr9q3i9r062l832cmmx792kkvlcvxfbdhk6qz9h"; + sha256 = "sha256-purzXzPvnYNVsASsK6s9m4XieUL80FOjeSbUP4bpRj8="; }; nativeBuildInputs = [ From f04b3afe05bcf820c7961d135a97b30887dd8c74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 00:16:47 +0100 Subject: [PATCH 440/703] python3Packages.cchardet: fix test phase --- .../python-modules/cchardet/default.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix index b93ea9c3bd78..e1c27d9e4fb1 100644 --- a/pkgs/development/python-modules/cchardet/default.nix +++ b/pkgs/development/python-modules/cchardet/default.nix @@ -14,9 +14,27 @@ buildPythonPackage rec { sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf"; }; + pythonImportsCheck = [ + "cchardet" + ]; + checkInputs = [ nose ]; + + preCheck = '' + cp -R src/tests $TMPDIR + pushd $TMPDIR + ''; + checkPhase = '' - ${python.interpreter} setup.py nosetests + runHook preCheck + + nosetests + + runHook postCheck + ''; + + postCheck = '' + popd ''; meta = { From 0233959752aefc238d621c7a5332fbc42d2572f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 00:21:18 +0100 Subject: [PATCH 441/703] python3Packages.irctokens: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/irctokens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 037a5f0520fd..3cd86abb0b2e 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "irctokens"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "0kpxn5paailm4xpdlnzxrhjrfgvvg5pp327wd8kl41a0wbqkj4zb"; + sha256 = "sha256-FgcLngS11U9eBNV/8jllwdrm89tCmthA1sUaFDovk6U="; }; checkInputs = [ pyyaml ]; From 4a29f7b6fb53df1eb582bb835c21609e0199e790 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 00:29:51 +0100 Subject: [PATCH 442/703] python3Packages.locationsharinglib: fix test phase --- pkgs/development/python-modules/locationsharinglib/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix index 42cf477ca160..2004f962098b 100644 --- a/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/pkgs/development/python-modules/locationsharinglib/default.nix @@ -6,7 +6,6 @@ , emoji , fetchPypi , nose -, python , pythonOlder , pytz , requests @@ -46,7 +45,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck # Only coverage no real unit tests - ${python.interpreter} setup.py nosetests + nosetests runHook postCheck ''; From c7e34c25b999fa436625fd7786f1087262ec39c5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 21:33:10 -0800 Subject: [PATCH 443/703] python3Packages.coverage: update python compatibility --- pkgs/development/python-modules/coverage/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 875b47ce50f9..f1930b88fb8c 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -2,11 +2,14 @@ , buildPythonPackage , fetchPypi , mock +, pythonOlder }: buildPythonPackage rec { pname = "coverage"; version = "6.2"; + # uses f strings + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; From c1b2d3771a38b3865a731b2d7c100ac028780c70 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Jan 2022 21:44:22 -0800 Subject: [PATCH 444/703] python3Packages.sshtunnel: fix tests --- .../development/python-modules/sshtunnel/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 90e4962d3e8f..3c53864ec332 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , paramiko -, pytest +, pytestCheckHook , mock }: @@ -15,12 +15,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ paramiko ]; - checkInputs = [ pytest mock ]; + checkInputs = [ pytestCheckHook mock ]; # disable impure tests - checkPhase = '' - pytest -k 'not connect_via_proxy and not read_ssh_config' - ''; + disabledTests = [ + "test_get_keys" + "connect_via_proxy" + "read_ssh_config" + ]; meta = with lib; { description = "Pure python SSH tunnels"; From a17e0d7aa466990116e79e6563c1d1caa1dd66ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 09:08:31 +0100 Subject: [PATCH 445/703] python2.pkgs.coverage: keep 5.5 --- .../python2-modules/coverage/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python2-modules/coverage/default.nix diff --git a/pkgs/development/python2-modules/coverage/default.nix b/pkgs/development/python2-modules/coverage/default.nix new file mode 100644 index 000000000000..f93d32d392f7 --- /dev/null +++ b/pkgs/development/python2-modules/coverage/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +}: + +buildPythonPackage rec { + pname = "coverage"; + version = "5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"; + }; + + # No tests in archive + doCheck = false; + checkInputs = [ mock ]; + + meta = { + description = "Code coverage measurement for python"; + homepage = "https://coverage.readthedocs.io/"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 47657d858eca..db82b0e1da96 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -26,6 +26,8 @@ with self; with super; { contextlib2 = callPackage ../development/python2-modules/contextlib2 { }; + coverage = callPackage ../development/python2-modules/coverage { }; + cryptography = callPackage ../development/python2-modules/cryptography { }; cryptography_vectors = callPackage ../development/python2-modules/cryptography-vectors { }; From 405b51f2aeab141effface30108ef8fa77315f10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Jan 2022 09:05:49 +0100 Subject: [PATCH 446/703] python3Packages.gevent: add pythonImportsCheck --- .../python-modules/gevent/default.nix | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 968e4f76b413..e2b1e11278b7 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,5 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet +{ lib +, fetchPypi +, buildPythonPackage +, isPyPy +, python +, libev +, greenlet +, zope_event , zope_interface +, pythonOlder }: buildPythonPackage rec { @@ -7,29 +15,36 @@ buildPythonPackage rec { version = "21.12.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "f48b64578c367b91fa793bf8eaaaf4995cb93c8bc45860e473bf868070ad094e"; + hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4="; }; - buildInputs = [ libev ]; - propagatedBuildInputs = [ - zope_interface - ] ++ lib.optionals (!isPyPy) [ greenlet ]; + buildInputs = [ + libev + ]; - checkPhase = '' - cd greentest - ${python.interpreter} testrunner.py - ''; + propagatedBuildInputs = [ + zope_event + zope_interface + ] ++ lib.optionals (!isPyPy) [ + greenlet + ]; # Bunch of failures. doCheck = false; + pythonImportsCheck = [ + "gevent" + ]; + meta = with lib; { description = "Coroutine-based networking library"; homepage = "http://www.gevent.org/"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.unix; }; } From 4169343eeb95c2040216a994cdb5622489976064 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Jan 2022 09:13:06 +0100 Subject: [PATCH 447/703] python3Packages.gevent-websocket: add pythonImportsCheck --- .../gevent-websocket/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 5e93fb32b9e7..66709d8fafa5 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -3,29 +3,37 @@ , fetchPypi , gevent , gunicorn +, pythonOlder }: buildPythonPackage rec { pname = "gevent-websocket"; version = "0.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1c2zv2rahp1gil3cj66hfsqgy0n35hz9fny3ywhr2319d0lz7bky"; + hash = "sha256-fq7zKWgpDJEh98Nblz4swwL/sHbQGMkGjS9cqLLYX7A="; }; - propagatedBuildInputs = [ gevent gunicorn ]; + propagatedBuildInputs = [ + gevent + gunicorn + ]; - # zero tests run + # Module has no test doCheck = false; - pythonImportsCheck = [ "geventwebsocket" ]; + pythonImportsCheck = [ + "geventwebsocket" + ]; meta = with lib; { + description = "Websocket handler for the gevent pywsgi server"; homepage = "https://www.gitlab.com/noppo/gevent-websocket"; - description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; - } From 2240750ea69afe1eb400674fbdfcda44ec4d4e04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Jan 2022 09:17:45 +0100 Subject: [PATCH 448/703] python3Packages.gevent-socketio: add pythonImportsCheck --- .../gevent-socketio/default.nix | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix index 4a25e0d7e148..338398714494 100644 --- a/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/pkgs/development/python-modules/gevent-socketio/default.nix @@ -1,29 +1,48 @@ { lib , buildPythonPackage , fetchPypi -, versiontools +, gevent , gevent-websocket , mock -, pytest -, gevent +, versiontools +, pythonOlder }: buildPythonPackage rec { pname = "gevent-socketio"; version = "0.3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1zra86hg2l1jcpl9nsnqagy3nl3akws8bvrbpgdxk15x7ywllfak"; + hash = "sha256-UzlKuT+9hNnbuyvvhTSfalA7/FPYapvoZTJQ8aBBKv8="; }; - buildInputs = [ versiontools gevent-websocket mock pytest ]; - propagatedBuildInputs = [ gevent ]; + nativeBuildInputs = [ + versiontools + ]; + + buildInputs = [ + gevent-websocket + ]; + + propagatedBuildInputs = [ + gevent + ]; + + # Tests are not ported to Python 3 + doCheck = false; + + pythonImportsCheck = [ + "socketio" + ]; meta = with lib; { + description = "SocketIO server based on the Gevent pywsgi server"; homepage = "https://github.com/abourget/gevent-socketio"; - description = "SocketIO server based on the Gevent pywsgi server, a Python network library"; license = licenses.bsd0; + maintainers = with maintainers; [ ]; }; - } From 705414fcd596d16ba0c32c288c7c714b38ff75a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Jan 2022 09:19:22 +0100 Subject: [PATCH 449/703] python3Packages.geventhttpclient: add pythonImportsCheck --- .../geventhttpclient/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 7e30b8e83f49..4a349106ac3f 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,23 +1,25 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, backports_ssl_match_hostname , brotli +, buildPythonPackage , certifi -, gevent -, six , dpkt +, fetchPypi +, gevent , pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "geventhttpclient"; version = "1.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d80ec9ff42b7219f33558185499d0b4365597fc55ff886207b45f5632e099780"; + hash = "sha256-2A7J/0K3IZ8zVYGFSZ0LQ2VZf8Vf+IYge0X1Yy4Jl4A="; }; propagatedBuildInputs = [ @@ -25,8 +27,6 @@ buildPythonPackage rec { certifi gevent six - ] ++ lib.optionals (pythonOlder "3.7") [ - backports_ssl_match_hostname ]; checkInputs = [ @@ -45,11 +45,14 @@ buildPythonPackage rec { "test_multi_queries_greenlet_safe" ]; + pythonImportsCheck = [ + "geventhttpclient" + ]; + meta = with lib; { homepage = "https://github.com/gwik/geventhttpclient"; description = "HTTP client library for gevent"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; - } From 2f4b2e72d0f4c0d54e9567fb42165522298bc386 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 10:26:20 +0100 Subject: [PATCH 450/703] python3Packages.lark: rename from lark-parser With version 1.0 of lark-parser the name was changed to just lark. --- pkgs/applications/virtualization/charliecloud/default.nix | 4 ++-- pkgs/development/python-modules/commentjson/default.nix | 6 +++--- pkgs/development/python-modules/dragonfly/default.nix | 6 +++--- pkgs/development/python-modules/hypothesmith/default.nix | 4 ++-- .../python-modules/{lark-parser => lark}/default.nix | 2 +- pkgs/development/python-modules/pyquil/default.nix | 6 +++--- pkgs/development/python-modules/radish-bdd/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) rename pkgs/development/python-modules/{lark-parser => lark}/default.nix (97%) diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index cbd7d8e5512d..2889d09183d7 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper ]; buildInputs = [ docker - (python3.withPackages (ps: [ ps.lark-parser ps.requests ])) + (python3.withPackages (ps: [ ps.lark ps.requests ])) ]; configureFlags = let - pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]); + pythonEnv = python3.withPackages (ps: [ ps.lark ps.requests ]); in [ "--with-python=${pythonEnv}/bin/python3" ]; diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix index 2aefb51d481e..c1d3b8916d91 100644 --- a/pkgs/development/python-modules/commentjson/default.nix +++ b/pkgs/development/python-modules/commentjson/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, lark-parser, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, six, lark, pytestCheckHook }: buildPythonPackage rec { pname = "commentjson"; @@ -13,13 +13,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "lark-parser>=0.7.1,<0.8.0" "lark-parser" + --replace "lark-parser>=0.7.1,<0.8.0" "lark" # NixOS is missing test.test_json module rm -r commentjson/tests/test_json ''; - propagatedBuildInputs = [ lark-parser six ]; + propagatedBuildInputs = [ lark six ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index fb3feaae63ee..82e1a645c853 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -5,7 +5,7 @@ , packaging , pynput , regex -, lark-parser +, lark , enum34 , pyperclip , six @@ -34,7 +34,7 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark-parser' + substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark' substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \ --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' substituteInPlace dragonfly/windows/x11_window.py \ @@ -48,7 +48,7 @@ buildPythonPackage rec { packaging pynput regex - lark-parser + lark enum34 pyperclip six diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 776ff77fce2f..3ce0f068fec9 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, hypothesis, lark-parser, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }: +{ lib, buildPythonPackage, fetchPypi, hypothesis, lark, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }: buildPythonPackage rec { pname = "hypothesmith"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; }; - propagatedBuildInputs = [ hypothesis lark-parser libcst ]; + propagatedBuildInputs = [ hypothesis lark libcst ]; checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark/default.nix similarity index 97% rename from pkgs/development/python-modules/lark-parser/default.nix rename to pkgs/development/python-modules/lark/default.nix index 56a41207d0a6..ea1282386dc7 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - pname = "lark-parser"; + pname = "lark"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index f984bcc2dea6..7e2c427f6c23 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -4,7 +4,7 @@ , fetchpatch , importlib-metadata , ipython -, lark-parser +, lark , networkx , numpy , poetry-core @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - lark-parser + lark networkx numpy qcs-api-client @@ -71,7 +71,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'lark = "^0.11.1"' 'lark-parser = ">=0.11.1"' + --replace 'lark = "^0.11.1"' 'lark = "*"' ''; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index ac01b853c873..f75e5cc19ee5 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -6,7 +6,7 @@ , fetchFromGitHub , freezegun , humanize -, lark-parser +, lark , parse-type , pysingleton , pytestCheckHook @@ -29,7 +29,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - lark-parser + lark click colorful tag-expressions diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e23757769f3..ee8241737e76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4412,7 +4412,7 @@ in { language-data = callPackage ../development/python-modules/language-data { }; - lark-parser = callPackage ../development/python-modules/lark-parser { }; + lark = callPackage ../development/python-modules/lark { }; latexcodec = callPackage ../development/python-modules/latexcodec { }; From 787b9e48e3ca7b7ecccf2093253d4e31c0c47b5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 10:28:04 +0100 Subject: [PATCH 451/703] python3Packages.resolvelib: reenable tests --- pkgs/development/python-modules/resolvelib/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index 826900285868..30345ae654e4 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv"; }; - # lark-parser is no longer detectable for commentjson - doCheck = false; checkInputs = [ commentjson pytestCheckHook From 04cb595c55e523adb7878f6512f3a60f7561139e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 10:28:47 +0100 Subject: [PATCH 452/703] python3Packages.lark: add import checks --- pkgs/development/python-modules/lark/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index ea1282386dc7..6c29a662524c 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -19,6 +19,13 @@ buildPythonPackage rec { # Optional import, but fixes some re known bugs & allows advanced regex features propagatedBuildInputs = [ regex ]; + pythonImportsCheck = [ + "lark" + "lark.parsers" + "lark.tools" + "lark.grammars" + ]; + checkPhase = '' runHook preCheck From 3b2ba239a67743c532fe38ecd508dff2934f4fbf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 10:53:43 +0100 Subject: [PATCH 453/703] python3Packages.feedgenerator: fix tests --- pkgs/development/python-modules/feedgenerator/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index e07f36f105cb..53f2c15401ec 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { sha256 = "6836d456b8b0edbc5b6d3a42d1be852cebd43d2f28af4ff51789eb295f1860e2"; }; + postPatch = '' + sed -i '/cov/d' setup.cfg + ''; + buildInputs = [ glibcLocales ]; From c3d2a450fe6f345c73f66b9a904e152bcedfebb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 14:11:36 +0100 Subject: [PATCH 454/703] python3Packages.pelican: fix hash --- pkgs/development/python-modules/pelican/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index e764ddb9ad2c..436192e18b8d 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "getpelican"; repo = pname; rev = version; - sha256 = "13l3xd3a5lm7ma2rw6gi20rhkdbvcr6cvh38c7vpxlf0prsmbh2c"; + sha256 = "0w3r4ifbrl6mhfphabqs048qys7x6k164ds63jr10l3namljm8ad"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From 79db6d5b9b7b512cce61fc7220836e8f0e9224e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 14:27:48 +0100 Subject: [PATCH 455/703] python3Packages.deap: fix build and tests --- pkgs/development/python-modules/deap/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index f260727b87a6..5efad065011d 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -9,11 +9,19 @@ buildPythonPackage rec { sha256 = "0bvshly83c4h5jhxaa97z192viczymz5fxp6vl8awjmmrs9l9x8i"; }; + postPatch = '' + sed -i '/use_2to3=True/d' setup.py + ''; + propagatedBuildInputs = [ numpy matplotlib ]; + preBuild = '' + 2to3 -wn deap + ''; + checkInputs = [ nose ]; checkPhase = '' - ${python.interpreter} setup.py nosetests --verbosity=3 + nosetests --verbosity=3 ''; meta = with lib; { From 6a3822938fb4d1e9d17d91c19f31dbd8622d8e04 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 14:29:46 +0100 Subject: [PATCH 456/703] python3Packages.gssapi: fix tests --- pkgs/development/python-modules/gssapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 330172f56cee..d500c6453213 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { echo $'\ndel TestBaseUtilities.test_add_cred_impersonate_name' >> gssapi/tests/test_raw.py export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py nosetests -e 'ext_test_\d.*' + nosetests -e 'ext_test_\d.*' ''; pythonImportsCheck = [ "gssapi" ]; From 599845e6c6b1f12569b20b9ab0b9a79a5671940d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 14:32:03 +0100 Subject: [PATCH 457/703] python3Packages.uncertainties: fix tests --- pkgs/development/python-modules/uncertainties/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index c132f50dbea0..180baf0d4dde 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -14,7 +14,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; checkInputs = [ nose numpy ]; - checkPhase = "python setup.py nosetests -sv"; + checkPhase = '' + nosetests -sv + ''; meta = with lib; { homepage = "https://pythonhosted.org/uncertainties/"; From 26053aa922d8343f12e5653824791fcc6b6f1b92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 15:07:05 +0100 Subject: [PATCH 458/703] python3Packages.anyjson: drop Broke during the setuptools upgrade when use_2to3 was removed. --- .../python-modules/anyjson/default.nix | 22 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/anyjson/default.nix diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix deleted file mode 100644 index 1d0d02988f83..000000000000 --- a/pkgs/development/python-modules/anyjson/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }: - -buildPythonPackage rec { - pname = "anyjson"; - version = "0.3.3"; - - # The tests are written in a python2 syntax but anyjson is python3 valid - doCheck = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba"; - }; - - buildInputs = [ nose ]; - - meta = with lib; { - homepage = "https://bitbucket.org/runeh/anyjson/"; - description = "Wrapper that selects the best available JSON implementation"; - license = licenses.bsd2; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e8416f911097..9fd7a901bcc1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,6 +33,7 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee8241737e76..6c721a30bd1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -532,8 +532,6 @@ in { anyio = callPackage ../development/python-modules/anyio { }; - anyjson = callPackage ../development/python-modules/anyjson { }; - anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; From 65d3b6d74d8f19fefc7f13d3ceadc96af97a81ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 15:08:06 +0100 Subject: [PATCH 459/703] python3Packages.carrot: drop Depended on anyjson, which was removed. Also unmaintained upstream since 2012. --- .../python-modules/carrot/default.nix | 22 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/carrot/default.nix diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix deleted file mode 100644 index a772535ad82b..000000000000 --- a/pkgs/development/python-modules/carrot/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, nose, amqplib, anyjson }: - -buildPythonPackage rec { - pname = "carrot"; - version = "0.10.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "0s14rs2fgp1s2qa0avn8gj33lwc3k1hd4y9a2h6mhg487i7kfinb"; - }; - - buildInputs = [ nose ]; - propagatedBuildInputs = [ amqplib anyjson ]; - - doCheck = false; # depends on the network - - meta = with lib; { - homepage = "https://pypi.python.org/pypi/carrot"; - description = "AMQP Messaging Framework for Python"; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9fd7a901bcc1..f43f0b018b8a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -37,6 +37,7 @@ mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27 + carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 ConfigArgParse = configargparse; # added 2021-03-18 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c721a30bd1e..e61f85532ba4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1439,8 +1439,6 @@ in { carbon = callPackage ../development/python-modules/carbon { }; - carrot = callPackage ../development/python-modules/carrot { }; - cart = callPackage ../development/python-modules/cart { }; cartopy = callPackage ../development/python-modules/cartopy { }; From c1316381f1c243e6c6e48e5d5d218615a6870d04 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 15:33:16 +0100 Subject: [PATCH 460/703] python3Packages.hdlparse: drop The package was using `use_2to3` which was removed from setuptools in version 58. The project is also unmaintained since 2018. --- .../python-modules/hdlparse/default.nix | 22 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/hdlparse/default.nix diff --git a/pkgs/development/python-modules/hdlparse/default.nix b/pkgs/development/python-modules/hdlparse/default.nix deleted file mode 100644 index 4257f9b2e9a2..000000000000 --- a/pkgs/development/python-modules/hdlparse/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "hdlparse"; - version = "1.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "fb6230ed1e7a04a8f82f8d3fb59791d0751ae35e5b8e58dbbf2cbcf100d0d0f2"; - }; - - #This module does not contain any tests. - doCheck = false; - - meta = with lib; { - homepage = "https://kevinpt.github.io/hdlparse/"; - description = "Rudimentary parser for VHDL and Verilog"; - license = licenses.mit; - maintainers = with maintainers; [ elliottvillars ]; - }; -} - diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f43f0b018b8a..422c769fee4a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -62,6 +62,7 @@ mapAliases ({ grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 HAP-python = hap-python; # added 2021-06-01 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 + hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 IMAPClient = imapclient; # added 2021-10-28 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e61f85532ba4..c097cf430869 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3625,8 +3625,6 @@ in { hdfs = callPackage ../development/python-modules/hdfs { }; - hdlparse = callPackage ../development/python-modules/hdlparse { }; - hdmedians = callPackage ../development/python-modules/hdmedians { }; headerparser = callPackage ../development/python-modules/headerparser { }; From 861e3c703b419cec1484be6a65a344c68b277fec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 15:58:52 +0100 Subject: [PATCH 461/703] python3Packages.qtpy: fix build Needed to propagate packaging and took some time to look at the tests. The tests need pyqt5 with certain features, but pyqt5 takes roughly an hour to build so after two tries I wasn't going to spend more time and decided to keep the test disabled with updated hints. --- .../python-modules/qtpy/default.nix | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 5ecec3f7cd23..5c4984ca3f81 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -1,21 +1,49 @@ -{ lib, buildPythonPackage, fetchPypi, pyside, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# propagates +, packaging + +# tests +, pyqt5 +, pyside +, pytestCheckHook +}: buildPythonPackage rec { pname = "QtPy"; version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "777e333df4d711b2ec9743117ab319dadfbd743a5a0eee35923855ca3d35cd9d"; }; - # no concrete propagatedBuildInputs as multiple backends are supposed - checkInputs = [ pyside pytest ]; + propagatedBuildInputs = [ + packaging + ]; - doCheck = false; # require X - checkPhase = '' - py.test qtpy/tests - ''; + doCheck = false; # ModuleNotFoundError: No module named 'PyQt5.QtConnectivity' + checkInputs = [ + pyside + (pyqt5.override { + withConnectivity = true; + withMultimedia = true; + withWebKit = true; + withWebSockets = true; + }) + pytestCheckHook + ]; + + disabledTestPaths = [ + # Fatal error in python on x86_64 + "qtpy/tests/test_uic.py" + ]; meta = with lib; { description = "Abstraction layer for PyQt5/PyQt4/PySide2/PySide"; From 56daf9804c0361dba0b2b52e2cf046f2b4440025 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 16:14:34 +0100 Subject: [PATCH 462/703] python3Packages.pulsectl: 21.10.5 -> 22.1.0 --- pkgs/development/python-modules/pulsectl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 6e35cb573586..23668b121975 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.10.5"; + version = "22.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b347983fb78baab168f4dc4804ab2c59ca5b813bf62f8146dfb5fcb6ab6c8ba2"; + sha256 = "sha256-qm+/WsUiU+ViRDUoiv1A4gFf0rFwzTRdhwlk9R4rRAE="; }; patches = [ From 949c04687f1fa3d707a904e3da001fb52b7b5114 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 16:46:35 +0100 Subject: [PATCH 463/703] python3Packages.demjson: drop Using the `use_2to3` flag in setuptools, which was removed in version 58. Also unmaintained since 2015. --- .../python-modules/demjson/default.nix | 34 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/development/python-modules/demjson/default.nix diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix deleted file mode 100644 index a25ecd74b5d0..000000000000 --- a/pkgs/development/python-modules/demjson/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, python -, buildPythonPackage -, fetchPypi -, isPy3k -}: - -buildPythonPackage rec { - pname = "demjson"; - version = "2.2.4"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; - }; - - doCheck = !(isPy3k); - - checkPhase = '' - ${python.interpreter} test/test_demjson.py - ''; - - pythonImportsCheck = [ - "demjson" - ]; - - meta = with lib; { - description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; - homepage = "https://github.com/dmeranda/demjson"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 422c769fee4a..41cced594653 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -42,6 +42,7 @@ mapAliases ({ ConfigArgParse = configargparse; # added 2021-03-18 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 dateutil = python-dateutil; # added 2021-07-03 + demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 diff_cover = diff-cover; # added 2021-07-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c097cf430869..1370ceae2eb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2078,8 +2078,6 @@ in { deluge-client = callPackage ../development/python-modules/deluge-client { }; - demjson = callPackage ../development/python-modules/demjson { }; - demjson3 = callPackage ../development/python-modules/demjson3 { }; dendropy = callPackage ../development/python-modules/dendropy { }; From 155b8517d9a2689441ec0c5220870bb73cfcb939 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jan 2022 17:06:04 +0100 Subject: [PATCH 464/703] python3Packages.pycallgraph: drop The project is relying on the `use_2to3` flag that was removed from setuptools in version 58. It is also unmaintained since 2018. --- .../python-modules/pycallgraph/default.nix | 28 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/development/python-modules/pycallgraph/default.nix diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix deleted file mode 100644 index af9f18aad2c6..000000000000 --- a/pkgs/development/python-modules/pycallgraph/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -}: - -buildPythonPackage rec { - pname = "pycallgraph"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0w8yr43scnckqcv5nbyd2dq4kpv74ai856lsdsf8iniik07jn9mi"; - }; - - buildInputs = [ pytest ]; - - # Tests do not work due to this bug: https://github.com/gak/pycallgraph/issues/118 - doCheck = false; - - meta = with lib; { - homepage = "http://pycallgraph.slowchop.com"; - description = "Call graph visualizations for Python applications"; - maintainers = with maintainers; [ auntie ]; - license = licenses.gpl2; - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 41cced594653..c373ceceb2b5 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -76,6 +76,7 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 + pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pysmart-smartx = pysmart; # added 2021-10-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1370ceae2eb1..f39def364db9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6522,8 +6522,6 @@ in { inherit (pkgs.buildPackages) meson; }; - pycallgraph = callPackage ../development/python-modules/pycallgraph { }; - py = callPackage ../development/python-modules/py { }; pycangjie = callPackage ../development/python-modules/pycangjie { }; From 24e396bea628fafe68c5e34061ee57b56a751e5d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 18 Jan 2022 13:16:38 -0800 Subject: [PATCH 465/703] python3Packages.xlib: fix tests, lint --- .../python-modules/xlib/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index b9658f0b4f0a..edb4761af3a8 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -7,6 +7,7 @@ , python , mock , nose +, pytestCheckHook , util-linux }: @@ -21,16 +22,24 @@ buildPythonPackage rec { sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06"; }; - checkPhase = '' - ${python.interpreter} runtests.py - ''; - - checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ]; nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ xorg.libX11 ]; propagatedBuildInputs = [ six ]; doCheck = !stdenv.isDarwin; + checkInputs = [ + pytestCheckHook + mock + nose + util-linux + xorg.xauth + xorg.xorgserver + ]; + + disabledTestPaths = [ + # requires x session + "test/test_xlib_display.py" + ]; meta = with lib; { description = "Fully functional X client library for Python programs"; From 46bf3585b5b387e232dc1763446ec1305859376d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 18 Jan 2022 13:24:26 -0800 Subject: [PATCH 466/703] demjson: deprecate to aliases, as python package as deprecated --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a77e2d21ad2c..8c84dbbe42d8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -215,6 +215,7 @@ mapAliases ({ Note that it is NOT possible to switch back to Deluge 1.x after this change. ''; # added 2021-08-18 + demjson = with python3Packages; toPythonApplication demjson; # added 2022-01-18 desktop_file_utils = desktop-file-utils; # added 2018-02-25 devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c5d512022f5..6500a8c602f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32778,8 +32778,6 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; - demjson = with python3Packages; toPythonApplication demjson; - dosbox = callPackage ../misc/emulators/dosbox { }; dosbox-staging = callPackage ../misc/emulators/dosbox-staging { }; From 5c6ac69554c00cd50a43204df69859a87a067cf1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 18 Jan 2022 13:35:43 -0800 Subject: [PATCH 467/703] fail2ban: fix post setuptools>=58 https://github.com/fail2ban/fail2ban/issues/3098 --- pkgs/tools/security/fail2ban/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 92848def1d1c..d6f9dd35c358 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: - +{ lib, stdenv, fetchFromGitHub +, python3 +, fetchpatch +}: python3.pkgs.buildPythonApplication rec { pname = "fail2ban"; @@ -17,7 +19,20 @@ python3.pkgs.buildPythonApplication rec { systemd ]; + patches = [ + (fetchpatch { + url = "https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497.patch"; + sha256 = "sha256-aozQJHwPcJTe/D/PLQzBk1YH3OAP6Qm7wO7cai5CVYI= +"; + }) + ]; + preConfigure = '' + # workaround for setuptools 58+ + # https://github.com/fail2ban/fail2ban/issues/3098 + patchShebangs fail2ban-2to3 + ./fail2ban-2to3 + for i in config/action.d/sendmail*.conf; do substituteInPlace $i \ --replace /usr/sbin/sendmail sendmail \ From b3ccdb92c6b6496424d59439cadf97d54b389845 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 18 Jan 2022 13:40:07 -0800 Subject: [PATCH 468/703] fail2ban: add comment about patch usage --- pkgs/tools/security/fail2ban/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index d6f9dd35c358..6c3fb0727091 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -20,10 +20,11 @@ python3.pkgs.buildPythonApplication rec { ]; patches = [ + # remove references to use_2to3, for setuptools>=58 + # has been merged into master, remove next release (fetchpatch { url = "https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497.patch"; - sha256 = "sha256-aozQJHwPcJTe/D/PLQzBk1YH3OAP6Qm7wO7cai5CVYI= -"; + sha256 = "sha256-aozQJHwPcJTe/D/PLQzBk1YH3OAP6Qm7wO7cai5CVYI="; }) ]; From 73d4782ed869e5f0d0e425c278678d07f58d0e1f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 18 Jan 2022 13:47:41 -0800 Subject: [PATCH 469/703] python3Packages.clint: disable tests, fix build Tests are no longer compatible with setuptools>=58 --- pkgs/development/python-modules/clint/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 66e2d5f52f38..45733c4ae7f1 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -22,12 +22,18 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; + propagatedBuildInputs = [ pillow blessings args ]; + + # nose-progressive and clint are not actively maintained + # no longer compatible as behavior demand 2to3, which was removed + # in setuptools>=58 + doCheck = false; + checkInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; checkPhase = '' ${python.interpreter} test_clint.py ''; - buildInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; - propagatedBuildInputs = [ pillow blessings args ]; + pythonImportsCheck = [ "clint" ]; meta = with lib; { homepage = "https://github.com/kennethreitz/clint"; From 63341dce44e151108178cc1491c55629878e834f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Jan 2022 21:44:35 +0000 Subject: [PATCH 470/703] python3Packages.garages-amsterdam: fix url --- pkgs/development/python-modules/garages-amsterdam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index 98ce3ff0ec24..0b11b9642680 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; - rev = version; + rev = "v${version}"; sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; }; From 46766d31444a684118464d3e08d9e8bbd7860a55 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 18 Jan 2022 15:57:46 -0800 Subject: [PATCH 471/703] python3Packages.pygame.src: fix sha --- pkgs/development/python-modules/pygame/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 09b70249960a..66a1fb0ba287 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - sha256 = "0r4yibc5mxi3ymiy1lk079hs425n218yw232cg3i3fjx7534v4d0"; + sha256 = "sha256-v1z6caEMJNXqbcbTmFXoy3KQewHiz6qK4vhNU6Qbukk="; extraPostFetch = "rm -rf $out/docs/reST"; }; From b8ec74cf547d3b937238f4530a07955339b35724 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jan 2022 12:57:24 +0100 Subject: [PATCH 472/703] python3Packages.yangson: 1.4.10 -> 1.4.12 --- pkgs/development/python-modules/yangson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index fec15464bd9d..37fedb46d8f0 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.10"; + version = "1.4.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R7ZcG4FStESPDWnFD6WIDD8sugvil9ybVK0J2qQC+zU="; + sha256 = "sha256-Dx7jxhO3aGCT1Mq6QDsvZLDcC7EY3dX2ltM0tLxSW8Y="; }; nativeBuildInputs = [ From 476f8b55434ae8f54bb40634c02fc5d707f5e15d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jan 2022 13:06:51 +0100 Subject: [PATCH 473/703] python3Packages.asyncio-mqtt: 0.11.1 -> 0.12.1 --- pkgs/development/python-modules/asyncio_mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index 0744f757e03a..c0ae1cea95f7 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.11.1"; + version = "0.12.1"; format = "setuptools"; src = fetchPypi { pname = "asyncio_mqtt"; inherit version; - sha256 = "6fc2ec01288a6ee0df88fa5a2f18439c4f8a7fe926339e4ecdf874e8da4ce45a"; + sha256 = "sha256-bb+FpF+U0m50ZUEWgK2jlHtQVG6YII1dUuegp+16fDg="; }; propagatedBuildInputs = [ From 65c428587c4ced06729a925ecc1a3259971297fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jan 2022 13:33:07 +0100 Subject: [PATCH 474/703] python3Packages.sanic-routing: disable failing test --- pkgs/development/python-modules/sanic-routing/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index 90859c40fa02..7cd2a951d4f1 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -17,6 +17,12 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # sanic_routing/route.py:333: DeprecationWarning: Use of 'number' as a path parameter type is deprected, and will be removed in Sanic v21.12. Instead, use . + "test_casting" + ]; + pythonImportsCheck = [ "sanic_routing" ]; meta = with lib; { From 0e402b99365bb959ec96138490b33bf4d68233e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jan 2022 13:41:46 +0100 Subject: [PATCH 475/703] python3Packages.chalice: 1.26.2 -> 1.26.4 --- pkgs/development/python-modules/chalice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 43767cb1a319..a4e0538e348e 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.26.2"; + version = "1.26.4"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = version; - sha256 = "sha256-zF7wmrJTMX0Cr3wpJECUqhH58G2SLiVoC4Z2XbblQdQ="; + sha256 = "sha256-Xn8OqeEihLxZS9QZtrhzau2zLg9SzQrrigK70PoImhU="; }; propagatedBuildInputs = [ From 776cbab8d7e1c4a252f2756ed50847aff8ae7d11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 Jan 2022 09:39:09 +0100 Subject: [PATCH 476/703] python3Packages.oletools: relax pyparsing constraint --- pkgs/development/python-modules/oletools/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index 54c5c6c165b2..76019730eb70 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyparsing>=2.1.0,<3" "pyparsing>=2.1.0" + ''; + disabledTests = [ # Test fails with AssertionError: Tuples differ: ('MS Word 2007+... "test_all" From 7b06ef340478ee9ce377b7ddaae52c3b80bd9bf1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 Jan 2022 09:46:05 +0100 Subject: [PATCH 477/703] aws-sam-cli: relax tomlkit constraint --- pkgs/development/tools/aws-sam-cli/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 444bc39bddd0..0bbe2056be54 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -44,11 +44,12 @@ python3.pkgs.buildPythonApplication rec { --replace "dateparser~=1.0" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "Flask~=1.1.2" "Flask~=2.0" \ - --replace "PyYAML~=5.3" "PyYAML" \ + --replace "PyYAML~=5.3" "PyYAML #" \ --replace "regex==" "regex #" \ --replace "requests==" "requests #" \ --replace "typing_extensions==" "typing-extensions #" \ - --replace "tzlocal==3.0" "tzlocal" \ + --replace "tzlocal==3.0" "tzlocal #" \ + --replace "tomlkit==0.7.2" "tomlkit #" \ --replace "watchdog==" "watchdog #" ''; From 653c2be451562ca457bedb93e2c62e0c2196ee8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 Jan 2022 09:50:12 +0100 Subject: [PATCH 478/703] python3Packages.readme_renderer: disable failing tests --- pkgs/development/python-modules/readme_renderer/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index f64faaf82ca7..65ab0cb2682a 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -40,6 +40,11 @@ buildPythonPackage rec { --replace "cmarkgfm>=0.5.0,<0.7.0" "cmarkgfm>=0.5.0,<1" ''; + disabledTests = [ + # https://github.com/pypa/readme_renderer/issues/221 + "test_GFM_" + ]; + pythonImportsCheck = [ "readme_renderer" ]; From 7bddf042d01fb9aecacd5db049945abf1d5404b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 Jan 2022 09:55:15 +0100 Subject: [PATCH 479/703] python3Packages.aiohttp-remotes: update format --- pkgs/development/python-modules/aiohttp-remotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 3b44383082fb..be33becb26c2 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiohttp-remotes"; version = "1.2.0"; - format = "setuptools"; + format = "flit"; disabled = pythonOlder "3.6"; @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A set of useful tools for aiohttp.web server"; + description = "Set of useful tools for aiohttp.web server"; homepage = "https://github.com/wikibusiness/aiohttp-remotes"; license = licenses.mit; maintainers = with maintainers; [ qyliss ]; From 098dd33f70c7f5eb61dc89acba529572e3975f35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Jan 2022 21:59:03 +0100 Subject: [PATCH 480/703] python3Packages.aioesphomeapi: 10.6.0 -> 10.8.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 5023b0325233..6233fc46dc06 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "10.6.0"; + version = "10.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "1z9pybis8yi938i3cgzma4w452ik9vggyyhs3y542zpk4183d7xw"; + sha256 = "sha256-SIsFG2GVHUcWKorDmIebYVinPr1Ia0e7TnVko5VYiYw="; }; propagatedBuildInputs = [ From 304850b794c2f2b01f07b97de79b59af4c98d4b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Jan 2022 22:39:20 +0100 Subject: [PATCH 481/703] python3Packages.matrix-nio: relax jsonschema constraint --- pkgs/development/python-modules/matrix-nio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 69721aeb8280..12c7813ba4b1 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -40,7 +40,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' + --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \ + --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \ # Remove after https://github.com/poljar/matrix-nio/pull/288 substituteInPlace pyproject.toml \ --replace 'aiohttp-socks = "^0.6.0"' 'aiohttp-socks = "^0.7.0"' From 9f0de7b8de6faf3cfe77d755d3cb8f284d25a936 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Jan 2022 23:04:04 +0100 Subject: [PATCH 482/703] python3Packages.libtmux: fix build, enable tests --- .../python-modules/libtmux/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 7501744d37c1..7a7e116aa221 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,21 +1,32 @@ -{ lib, fetchPypi, buildPythonPackage, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, pytestCheckHook +, pkgs +}: buildPythonPackage rec { pname = "libtmux"; version = "0.10.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "c7fbd837f0a9e4d33a157523e4ca6ef95e80256842e094ffd766c3dbd78d1957"; + src = fetchFromGitHub { + owner = "tmux-python"; + repo = pname; + rev = "v${version}"; + hash = "sha256:0syj8m4x2mcq96b76b7h75dsmcai22m15pfgkk90rpg7rp6sn772"; }; - checkInputs = [ pytest ]; - postPatch = '' - sed -i 's/==.*$//' requirements/test.txt - ''; + nativeBuildInputs = [ + poetry-core + ]; - # No tests in archive - doCheck = false; + checkInputs = [ + pkgs.procps + pkgs.tmux + pytestCheckHook + ]; meta = with lib; { description = "Scripting library for tmux"; From 6544b53ed11436e97bef5e69767019bbb171bb6e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Jan 2022 23:17:55 +0100 Subject: [PATCH 483/703] python3Packages.gruut: fix build --- pkgs/development/python-modules/gruut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index 4718d8244d0c..c4c4438be535 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -45,9 +45,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "Babel~=2.8.0" "Babel" \ --replace "dateparser~=1.0.0" "dateparser" \ - --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" + --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" \ + --replace "jsonlines~=1.2.0" "jsonlines" ''; propagatedBuildInputs = [ From f7ba18f6f7cd341c29f8b8b1117e082df5610bce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Jan 2022 23:18:22 +0100 Subject: [PATCH 484/703] python3Packages.gruut: add lang packs for ar, es, fa, lb --- pkgs/development/python-modules/gruut/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index c4c4438be535..f1e490a65cb2 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -18,12 +18,15 @@ let langPkgs = [ + "ar" "cs" "de" - "es" "en" + "es" + "fa" "fr" "it" + "lb" "nl" "pt" "ru" From 42c54c1336858c228bc7ec69a90bccb3730ecf54 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 20 Jan 2022 14:47:16 -0800 Subject: [PATCH 485/703] python3Packages.nbclassic: fix src --- pkgs/development/python-modules/nbclassic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index ae6554678635..f98ce925357b 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyterlab"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1d0x7nwsaw5qjw4iaylc2sxlpiq3hlg9sy3i2nh7sn3wckwl76lc"; }; From fb7422fda994e5e2d063ddc9af2a54a4d5c41fb8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 20 Jan 2022 14:52:01 -0800 Subject: [PATCH 486/703] python3Packages.openapi-schema-validator: fix build and tests --- .../openapi-schema-validator/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 392eb91ed8d3..8251c2cd0175 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, poetry-core , pytestCheckHook , isodate , jsonschema @@ -14,12 +15,19 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; version = "0.2.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "71889d1cb69d9fb46eb04243b24e9c0cd7989d9153d29d8770e626874bf68f80"; + src = fetchFromGitHub { + owner = "p1c2u"; + repo = pname; + rev = version; + sha256 = "sha256-HoXtDlXOoYqzsM4FxVfLQdIlpJXaNUcQo8//B4JqJoA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ]; From 0b8cf4a766ae8d7d31e1f5ee68dfe4ee809ffc91 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 20 Jan 2022 15:03:51 -0800 Subject: [PATCH 487/703] python3Packages.nbclassic: fix tests --- pkgs/development/python-modules/nbclassic/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index f98ce925357b..2c062d3ff99e 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, python , notebook , pythonOlder , jupyter_server @@ -23,6 +24,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ jupyter_server notebook ]; + preCheck = '' + cd nbclassic + mv conftest.py tests + cd tests + + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; checkInputs = [ pytestCheckHook pytest-tornasync From 4cf64329d8ef1bb1583fa1d9af21f3b0abba34b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Jan 2022 00:38:29 +0100 Subject: [PATCH 488/703] python3Packages.garages-amsterdam: fix build --- .../python-modules/garages-amsterdam/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index 0b11b9642680..3276934e65b2 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -2,12 +2,14 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, poetry-core , aiohttp }: buildPythonPackage rec { pname = "garages-amsterdam"; version = "3.2.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -17,6 +19,10 @@ buildPythonPackage rec { sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp ]; From de1f6fd0a6377190a9afb2a41180e4285ab6d116 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Jan 2022 00:39:26 +0100 Subject: [PATCH 489/703] python3Packages.rdflib: fetch from git, disable network tests --- .../python-modules/rdflib/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index f107435a78bd..73f170b90b1b 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , html5lib , isodate , networkx @@ -21,9 +21,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "8dbfa0af2990b98471dacbc936d6494c997ede92fd8ed693fb84ee700ef6f754"; + src = fetchFromGitHub { + owner = "RDFLib"; + repo = pname; + rev = version; + hash = "sha256:1ih7vx4i16np1p8ig5faw74apmbm7kgyj9alya521yvzid6d7pzd"; }; propagatedBuildInputs = [ @@ -41,6 +43,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # requires network access + "--deselect rdflib/__init__.py::rdflib" + "--deselect test/jsonld/test_onedotone.py::test_suite" + ]; + disabledTests = [ # Requires network access "api_key" From 64b6d7337527ef2323fa9134d584918e682c2d4a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Jan 2022 00:52:59 +0100 Subject: [PATCH 490/703] python3Packages.pyphen: fix build --- pkgs/development/python-modules/pyphen/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index bd9cf1304acd..7bb46b115e00 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -1,18 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, flit , pytestCheckHook }: buildPythonPackage rec { pname = "pyphen"; version = "0.12.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b"; }; + nativeBuildInputs = [ + flit + ]; + preCheck = '' sed -i '/addopts/d' pyproject.toml ''; From 5f073e62c0a39d37293445c035107e55b6452b52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Jan 2022 00:55:57 +0100 Subject: [PATCH 491/703] python3Packages.dufte: fix src --- pkgs/development/python-modules/dufte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index 006280376814..92081e08067c 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = version; - sha256 = "0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; + rev = "v${version}"; + hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; }; format = "pyproject"; From 8fb7e9b9d4bab9532268b5c48767b9475d1c116f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Jan 2022 01:02:45 +0100 Subject: [PATCH 492/703] python3Packages.atpython: fix build --- pkgs/development/python-modules/atpublic/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 13f9276f8f30..16f0f0ddffd9 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pytestCheckHook , pythonOlder +, pdm-pep517 , sybil , typing-extensions }: @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "atpublic"; version = "3.0.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,6 +20,10 @@ buildPythonPackage rec { sha256 = "bb072b50e6484490404e5cb4034e782aaa339fdd6ac36434e53c10791aef18bf"; }; + nativeBuildInputs = [ + pdm-pep517 + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -29,8 +34,7 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=public" "" + sed -i '/cov=public/d' pyproject.toml ''; pythonImportsCheck = [ From 002467e0d628501f5762602bef3ba9fa36a00228 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Jan 2022 10:05:31 +0100 Subject: [PATCH 493/703] python3Packages.sqlalchemy: 1.4.29 -> 1.4.31 --- pkgs/development/python-modules/perfplot/default.nix | 10 ++++++++-- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 69fa1c8c0a16..ca8f867e6e30 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , dufte , matplotlib , numpy @@ -14,15 +15,19 @@ buildPythonPackage rec { pname = "perfplot"; version = "0.9.13"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "0ry5x38sv8gh505z6ip90jymm7kfgyf80y3vjb2i6z567bnblam6"; }; - format = "pyproject"; + + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ dufte @@ -44,5 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/nschloe/perfplot"; license = licenses.mit; maintainers = with maintainers; [ costrouc ]; + broken = true; # missing matplotx dependency }; } diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 085195f5a752..1d6406c5db13 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.29"; + version = "1.4.31"; src = fetchPypi { inherit pname version; - sha256 = "sha256:+iutFOFHS6ZJz8lpwdLskV3T55Z380a7/gjpPvkCCzk="; + sha256 = "sha256-WCtZ0eV4CkR6raIrRh5QtASp3AV2jaHYc2itgZBGhBg="; }; propagatedBuildInputs = [ From c237991991a573f573ab147c293f92a4bbe41810 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 Jan 2022 13:52:49 +0100 Subject: [PATCH 494/703] python3Packages.pyvlx: disable on older Python releases --- .../development/python-modules/pyvlx/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index b63fd1521736..10e07f4e22ab 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -2,12 +2,16 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , pyyaml }: buildPythonPackage rec { pname = "pyvlx"; version = "0.2.20"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Julius2342"; @@ -16,11 +20,17 @@ buildPythonPackage rec { sha256 = "1irjix9kr6qih84gii7k1a9c67n8133gpnmwfd09550jsqdmg006"; }; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ + pyyaml + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pyvlx" ]; + pythonImportsCheck = [ + "pyvlx" + ]; meta = with lib; { description = "Python client to work with Velux units"; From fc85bb1c2a6cb11d3dcbe6c1dac9b7540cd187a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Jan 2022 08:24:14 +0100 Subject: [PATCH 495/703] python3Packages.whois: disable on older Python releases --- pkgs/development/python-modules/whois/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 5dd638bbebff..b2875819646c 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -2,11 +2,15 @@ , buildPythonPackage , fetchFromGitHub , inetutils +, pythonOlder }: buildPythonPackage rec { pname = "whois"; version = "0.9.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "DannyCork"; @@ -15,12 +19,17 @@ buildPythonPackage rec { sha256 = "1df4r2pr356y1c2ys6pzdl93fmx9ci4y75xphc95xn27zvqbpvix"; }; - # whois is needed - propagatedBuildInputs = [ inetutils ]; + propagatedBuildInputs = [ + # whois is needed + inetutils + ]; # tests require network access doCheck = false; - pythonImportsCheck = [ "whois" ]; + + pythonImportsCheck = [ + "whois" + ]; meta = with lib; { description = "Python module/library for retrieving WHOIS information"; From ceab782f129f543351aedc6bf250538c8ed5ca44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Jan 2022 22:19:03 +0100 Subject: [PATCH 496/703] python3Packages.datasette: 0.60 -> 0.60.1 --- pkgs/development/python-modules/datasette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 270e6119ee3b..31c6ba175d5d 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.60"; + version = "0.60.1"; disabled = pythonOlder "3.6"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-GGxv6GWGUCJb4R4SMrDVc45q6xk4cB3vOCTabHlhNZE="; + sha256 = "sha256-x4bqd8hFPNLkDIsuTTy+WbAjuUl6lXsmIZoiRi7ZOm8="; }; propagatedBuildInputs = [ From d4528ddd5b2c7f8b926e748f477798bc741fe2f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 Jan 2022 00:59:25 +0100 Subject: [PATCH 497/703] python3Packages.requirements-parser: 0.3.1 -> 0.5.0 --- .../requirements-parser/default.nix | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix index 493b4815571c..3d51f4741af6 100644 --- a/pkgs/development/python-modules/requirements-parser/default.nix +++ b/pkgs/development/python-modules/requirements-parser/default.nix @@ -1,31 +1,44 @@ { lib , buildPythonPackage -, fetchPypi -, nose +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, types-setuptools }: + buildPythonPackage rec { pname = "requirements-parser"; - version = "0.3.1"; + version = "0.5.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "3852277618e653dd1d8fa4129e59b4338358dffafeb3d5106e9f88504db9c460"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "madpah"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-e2dfVBMh1uGRMDw7OdPefO4/eRxc3BGwvy/D7u5ipkk="; }; - checkInputs = [ - nose + nativeBuildInputs = [ + poetry-core ]; - checkPhase = '' - nosetests - ''; + propagatedBuildInputs = [ + types-setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "requirements" ]; meta = with lib; { - description = "A Pip requirements file parser"; + description = "Pip requirements file parser"; homepage = "https://github.com/davidfischer/requirements-parser"; license = licenses.bsd2; maintainers = teams.determinatesystems.members; From 30212977444dbeaf294902b1dde819d2eb17c524 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 Jan 2022 01:10:58 +0100 Subject: [PATCH 498/703] python3Packages.numexpr: add packaging --- .../python-modules/numexpr/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 72c38a8946fb..ffc422e9b421 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -1,32 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, python , numpy +, packaging +, python +, pythonOlder }: buildPythonPackage rec { pname = "numexpr"; version = "2.8.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cd779aa44dd986c4ef10163519239602b027be06a527946656207acf1f58113b"; + hash = "sha256-zXeapE3ZhsTvEBY1GSOWArAnvgalJ5RmViB6zx9YETs="; }; - # Remove existing site.cfg, use the one we built for numpy. - preBuild = '' - ln -s ${numpy.cfg} site.cfg - ''; - nativeBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy + packaging ]; + preBuild = '' + # Remove existing site.cfg, use the one we built for numpy + ln -s ${numpy.cfg} site.cfg + ''; + checkPhase = '' runtest="$(pwd)/numexpr/tests/test_numexpr.py" pushd "$out" @@ -34,9 +40,14 @@ buildPythonPackage rec { popd ''; - meta = { + pythonImportsCheck = [ + "numexpr" + ]; + + meta = with lib; { description = "Fast numerical array expression evaluator for NumPy"; homepage = "https://github.com/pydata/numexpr"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 632c4f444f61bb343d21c00b8b8541baadb12cec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 Jan 2022 01:33:56 +0100 Subject: [PATCH 499/703] python3Packages.teamcity-messages: init at 1.30 --- .../teamcity-messages/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/teamcity-messages/default.nix diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix new file mode 100644 index 000000000000..e378227b2f56 --- /dev/null +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "teamcity-messages"; + version = "1.30"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "JetBrains"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5C9ElCmTH+xSrFQ/x9IRJ89RfSd9cxzkETlOCzwyU8s="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/unit-tests/" + ]; + + pythonImportsCheck = [ + "teamcity" + ]; + + meta = with lib; { + description = "Python unit test reporting to TeamCity"; + homepage = "https://github.com/JetBrains/teamcity-messages"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f39def364db9..b1ec3e4eea6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9538,6 +9538,8 @@ in { tbm-utils = callPackage ../development/python-modules/tbm-utils { }; + teamcity-messages = callPackage ../development/python-modules/teamcity-messages { }; + telegram = callPackage ../development/python-modules/telegram { }; telethon = callPackage ../development/python-modules/telethon { From eaac7aa4a7559d34dbea33313bb8d0f1f56e3ee8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 Jan 2022 01:36:43 +0100 Subject: [PATCH 500/703] python3Packages.flexmock: update check part --- .../python-modules/flexmock/default.nix | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index 923bc0cdc6c5..11f3ad694fca 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -1,26 +1,42 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook +, pythonOlder +, teamcity-messages +, testtools }: buildPythonPackage rec { pname = "flexmock"; version = "0.11.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "44f702c0d0adde7085b4c7afe9adab50b01b724aceeb7e49b29f5632e6325ce8"; + hash = "sha256-RPcCwNCt3nCFtMev6a2rULAbckrO635Jsp9WMuYyXOg="; }; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + teamcity-messages + testtools + ]; + + disabledTests = [ + "test_failed_test_case" + ]; + + pythonImportsCheck = [ + "flexmock" + ]; meta = with lib; { - description = "flexmock is a testing library for Python that makes it easy to create mocks,stubs and fakes."; + description = "Testing library that makes it easy to create mocks,stubs and fakes"; homepage = "https://flexmock.readthedocs.org"; license = licenses.bsdOriginal; + maintainers = with maintainers; [ ]; }; } From 1ca6d727479c41615345cbb4850e68f5e36e21cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Jan 2022 17:02:27 +0100 Subject: [PATCH 501/703] heisenbridge: relax irc constraint --- pkgs/servers/heisenbridge/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index c38ff947263f..48aa24b2b842 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -12,6 +12,9 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' echo "${version}" > heisenbridge/version.txt + + substituteInPlace setup.cfg \ + --replace "irc >=19.0.0, <20.0" "irc" ''; propagatedBuildInputs = with python3.pkgs; [ From 4fcb739e2f9898c112a8beaeb9bff4b32d910672 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 22 Jan 2022 16:29:43 +0000 Subject: [PATCH 502/703] python3Packages.ipython: 8.0.0 -> 8.0.1 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index d1f6f4f3c301..e0d780fb9c79 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.0.0"; + version = "8.0.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "004a0d05aeecd32adec4841b6e2586d5ca35785b1477db4d8333a39333e0ce98"; + sha256 = "0x19sj4dlq7r4p1mqnpx9245r8dwvpjwd8n34snfm37a452lsmmb"; }; prePatch = lib.optionalString stdenv.isDarwin '' From dd1ff973f93863860d62723c64e1b5b954ad9b60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Jan 2022 17:31:34 +0100 Subject: [PATCH 503/703] python3Packages.numba: 0.54.1 -> 0.55.0 --- pkgs/development/python-modules/numba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index c45419c5c88c..8bead014e34a 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.54.1"; + version = "0.55.0"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "f9dfc803c864edcc2381219b800abf366793400aea55e26d4d5b7d953e14f43f"; + sha256 = "sha256-siHr2ZdmKh3Ld+TwkUDgIvv+dXetB4H8LgIUE126bL0="; }; postPatch = '' From 7e0f3eac6857b4d2e4c704afac305b3fc62d5409 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Jan 2022 18:29:36 +0100 Subject: [PATCH 504/703] python3Packages.astropy: propagate pyyaml and packaging and some refactoring. --- .../python-modules/astropy/default.nix | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index bbfc336213d2..78f02e2870ce 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,49 +1,55 @@ { lib , fetchPypi -, setuptools-scm , buildPythonPackage -, isPy3k +, pythonOlder + +# build time +, astropy-extension-helpers +, astropy-helpers , cython , jinja2 +, setuptools-scm + +# runtime , numpy -, pytest -, pytest-astropy -, astropy-helpers -, astropy-extension-helpers +, packaging , pyerfa +, pyyaml }: -buildPythonPackage rec { +let pname = "astropy"; version = "5.0"; +in +buildPythonPackage { + inherit pname version; format = "pyproject"; - disabled = !isPy3k; # according to setup.py + disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; sha256 = "70203e151e13292586a817b4069ce1aad4643567aff38b1d191c173bc54f3927"; }; - nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ]; - propagatedBuildInputs = [ numpy pyerfa ]; - checkInputs = [ pytest pytest-astropy ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; + nativeBuildInputs = [ + astropy-extension-helpers + astropy-helpers + cython + jinja2 + setuptools-scm + ]; - # Tests must be run from the build directory. astropy/samp tests - # require a network connection, so we ignore them. For some reason - # pytest --ignore does not work, so we delete the tests instead. - checkPhase = '' - cd build/lib.* - rm -f astropy/samp/tests/* - pytest - ''; + propagatedBuildInputs = [ + numpy + packaging + pyerfa + pyyaml + ]; - # 368 failed, 10889 passed, 978 skipped, 69 xfailed in 196.24s - # doCheck = false; + # infinite recursion with pytest-astropy (pytest-astropy-header depends on astropy itself) doCheck = false; meta = with lib; { From c7cb10e4ac75882f65b309b348394a15c5038315 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 22 Jan 2022 13:48:31 -0800 Subject: [PATCH 505/703] python3Packages.toggl-cli: 2.4.2 -> 2.4.3 --- pkgs/development/python-modules/toggl-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 1bbac9ce9da1..30c3f08f52e7 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "toggl-cli"; - version = "2.4.2"; + version = "2.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "togglCli"; inherit version; - sha256 = "1wgh231r16jyvaj1ch1pajvl9szflb4srs505pfdwdlqvz7rzww8"; + sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; }; nativeBuildInputs = [ From 161803b751a3d3f809c8efe952dc7bed8d95292b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 22 Jan 2022 13:56:39 -0800 Subject: [PATCH 506/703] python3Packages.eth-utils: 1.10.0 -> 2.0.0 --- pkgs/development/python-modules/eth-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 172647f0da70..9b26fb7024c0 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "1.10.0"; + version = "2.0.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sq3H4HmUFUipqVYleZxWLG1gBsQEoNwcZAXiKckacek="; + sha256 = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; }; checkInputs = [ pytestCheckHook hypothesis ]; From d64bce42f72e253a10d17f748a51ebecd9b03fab Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 22 Jan 2022 13:57:11 -0800 Subject: [PATCH 507/703] python3Packages.eth-typing: 2.2.2 -> 2.3.0 --- pkgs/development/python-modules/eth-typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 66ff1ddc10ed..5e17f6f59ad7 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "2.2.2"; + version = "2.3.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-typing/issues/8 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0rkvkacxla4y2blkkfdsq1ywnyqsvg8pwhvadznbag1bfzja4xhv"; + sha256 = "sha256-cuA6vSfCfqgffEhSEuVeKJfxsGLw1mGID9liodE9wcU="; }; # setuptools-markdown uses pypandoc which is broken at the moment From 76d322cada61b6e08c6151da81ded4db75802778 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 22 Jan 2022 13:59:53 -0800 Subject: [PATCH 508/703] python3Packages.eth-typing: 2.3.0 -> 3.0.0 --- pkgs/development/python-modules/eth-typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 5e17f6f59ad7..c98a0fc51529 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "2.3.0"; + version = "3.0.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-typing/issues/8 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cuA6vSfCfqgffEhSEuVeKJfxsGLw1mGID9liodE9wcU="; + sha256 = "sha256-9rrnDFPWAmrUkr2mVTVi/8DTJdg4hzGaU0UbpwG5mtY="; }; # setuptools-markdown uses pypandoc which is broken at the moment From ac292e34644f2a030c026ee42d8c674b814ffe46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Jan 2022 23:44:37 +0100 Subject: [PATCH 509/703] python3Packages.pulsectl: 22.1.0 -> 22.1.2 --- pkgs/development/python-modules/pulsectl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 23668b121975..69d776f90039 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "22.1.0"; + version = "22.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qm+/WsUiU+ViRDUoiv1A4gFf0rFwzTRdhwlk9R4rRAE="; + sha256 = "sha256-icAIrRgLX/WNqSit/6/423/pVLzA55wlFRcUHlgvEVk="; }; patches = [ From faa7fef95f852d56b0bad7cc6f48916b06fc0827 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 22 Jan 2022 23:56:43 +0000 Subject: [PATCH 510/703] python3Packages.jupyterlab-widgets: 1.0.2 -> 2.0.0b1 --- .../development/python-modules/jupyterlab-widgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 92b341a591c7..26794fbc77b5 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "1.0.2"; + version = "2.0.0b1"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - sha256 = "7885092b2b96bf189c3a705cc3c412a4472ec5e8382d0b47219a66cccae73cfa"; + sha256 = "1xinfk3bhqmfp9ygfpi8b87h4ky8dv3sdr96035psx1jjgyyw8bi"; }; nativeBuildInputs = [ From 613e47dd1a0d926707d3baa50720bb7918321436 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 Jan 2022 01:02:42 +0100 Subject: [PATCH 511/703] python3Packages.numpy: 1.21.4 -> 1.21.5 --- pkgs/development/python-modules/numpy/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 945828fbc19f..2fbe1a7a694c 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,19 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.21.4"; + + # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so + # build both to verify they don't break. + # https://github.com/scipy/scipy/issues/15414 + version = "1.21.5"; + format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0"; + sha256 = "sha256-alkovGJBJk3OXtUJ5m8zZ2/Jf0ZOepGe3GcvtVMiIe4="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From 37fdba0b4f14b81ba483c33977a149ac1fdcc87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 23 Jan 2022 03:50:09 +0100 Subject: [PATCH 512/703] stdenv: restore bash options -e/-u to the values they where before Source https://github.com/akinomyoga/ble.sh/issues/169#issuecomment-1019049032 Author: akinomyoga --- pkgs/stdenv/generic/setup.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 2951813c0f71..563c07407ffa 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,3 +1,4 @@ +__nixpkgs_setup_set_original=$- set -eu set -o pipefail shopt -s inherit_errexit @@ -1361,5 +1362,7 @@ runHook userHook dumpVars -# Disable nounset for nix-shell. -set +u +# Restore the original options for nix-shell +[[ $__nixpkgs_setup_set_original == *e* ]] || set +e +[[ $__nixpkgs_setup_set_original == *u* ]] || set +u +unset -v __nixpkgs_setup_set_original From 24880b690b31d91a4c1dda3339a125d844ec5125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 23 Jan 2022 03:50:23 +0100 Subject: [PATCH 513/703] stdenv: fix shellcheck complaining about things not being posix compliant --- pkgs/stdenv/generic/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 563c07407ffa..0777fa830c10 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash __nixpkgs_setup_set_original=$- set -eu set -o pipefail From ea5a1dd5e7c0afb3c14e1a27e3d2ebfaef9ff52b Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 19 Jan 2022 10:28:22 +0100 Subject: [PATCH 514/703] vim: 8.2.3877 -> 8.2.4186 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 42cae7992853..51a9b9af5bfd 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.3877"; + version = "8.2.4186"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-NqTO2TdhOs63eP7CdWY9U9nbR7No3hqPV5rGhYF9arA="; + sha256 = "0g276mbmq69z7c4kgj59r0azxmx9ih2sd8v83dx2gfph6wgw65ph"; }; enableParallelBuilding = true; From 6df5d16d20175fc872ee5dc9ff46043e376012aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 Jan 2022 12:57:56 +0100 Subject: [PATCH 515/703] spice: properly test for existance of python modules --- pkgs/development/libraries/spice/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index ee0f6be16984..4f639cf29f74 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation rec { postPatch = '' install ${doxygen_sh} doxygen.sh patchShebangs build-aux + + # https://gitlab.freedesktop.org/spice/spice-common/-/issues/5 + substituteInPlace subprojects/spice-common/meson.build \ + --replace \ + "cmd = run_command(python, '-m', module)" \ + "cmd = run_command(python, '-c', 'import @0@'.format(module))" ''; nativeBuildInputs = [ From 9a778368f2a61787c2b9d100e364fc0474130175 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 23 Jan 2022 12:00:00 +0000 Subject: [PATCH 516/703] ocamlPackages.findlib: move destdir creation to installPhase allows to use configurePhase in nix-shell --- pkgs/development/tools/ocaml/findlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index d42441db6225..e7abf32eae5f 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { # run for every buildInput addEnvHooks "$targetOffset" addOCamlPath - # run before configurePhase, even without buildInputs, and not in nix-shell - preConfigureHooks+=(createOcamlDestDir) + # run before installPhase, even without buildInputs, and not in nix-shell + preInstallHooks+=(createOcamlDestDir) # run even in nix-shell, and even without buildInputs addEnvHooks "$hostOffset" exportOcamlDestDir ''; From 598b973406df1d05ad3b5eaee063ea1d24abda5c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 23 Jan 2022 13:53:27 +0100 Subject: [PATCH 517/703] nodejs: rename name to pname&version --- pkgs/development/web/nodejs/nodejs.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 72615b356222..1e05850884c7 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -19,7 +19,7 @@ let majorVersion = versions.major version; minorVersion = versions.minor version; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + pname = if enableNpm then "nodejs" else "nodejs-slim"; useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4"; @@ -43,9 +43,7 @@ let extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; self = stdenv.mkDerivation { - inherit version; - - name = "${baseName}-${version}"; + inherit pname version; src = fetchurl { url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; From f4d82e40e82a58b88b5b40ed9afaa5afb969ea59 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 23 Jan 2022 18:05:27 +0100 Subject: [PATCH 518/703] lib.licenses: add MIT-advertising --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index d07a6449b8fa..84e2a10bf320 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -592,6 +592,11 @@ in mkLicense lset) ({ fullName = "MIT License"; }; + mitAdvertising = { + spdxId = "MIT-advertising"; + fullName = "Enlightenment License (e16)"; + }; + mpl10 = { spdxId = "MPL-1.0"; fullName = "Mozilla Public License 1.0"; From 597f76f0bbfcfbb38c4ff8243c9dc6877d17c3d7 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 22 Jan 2022 18:51:55 +0100 Subject: [PATCH 519/703] imlib2: 1.7.3 -> 1.7.5 --- pkgs/development/libraries/imlib2/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index b61f4e442bf2..1447a327e0df 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.3"; + version = "1.7.5"; src = fetchurl { - url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc="; + url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz"; + hash = "sha256-RY2DAKp6bUzjU1GDi7pdn9+wiES9WxU8WTjs/kP/Ngo="; }; buildInputs = [ @@ -28,11 +28,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = '' - substituteInPlace imlib2-config.in \ - --replace "@my_libs@" "" - ''; - # Do not build amd64 assembly code on Darwin, because it fails to compile # with unknow directive errors configureFlags = optional stdenv.isDarwin "--enable-amd64=no" @@ -40,10 +35,6 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - postInstall = '' - moveToOutput bin/imlib2-config "$dev" - ''; - meta = with lib; { description = "Image manipulation library"; @@ -56,7 +47,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://docs.enlightenment.org/api/imlib2/html"; - license = licenses.mit; + changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}"; + license = licenses.imlib2; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt ]; }; From ff517c4db75510b978d3d4cbcad2a700ce680af6 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 22 Jan 2022 18:54:31 +0100 Subject: [PATCH 520/703] imlibsetroot: adapt to Imlib2 v1.7.5 imlib2-config is gone imlibsetroot.c license header is actually MIT-advertising --- .../graphics/imlibsetroot/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index d3640a656f13..110a7e513e32 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -9,20 +9,27 @@ stdenv.mkDerivation { }; buildInputs = [ libX11 imlib2 libXinerama ]; + buildPhase = '' - gcc -g imlibsetroot.c -o imlibsetroot \ - `imlib2-config --cflags` `imlib2-config --libs` \ - -I/include/X11/extensions -lXinerama -lX11 + runHook preBuild + + gcc -g imlibsetroot.c -o imlibsetroot \ + -I${imlib2.dev}/include -L${imlib2}/lib -lImlib2 \ + -I${libX11.dev}/include -lXinerama -lX11 + + runHook postBuild ''; + installPhase = '' - mkdir -p $out/bin - install -m 755 imlibsetroot $out/bin + runHook preInstall + install -D -m 0755 imlibsetroot -t $out/bin + runHook postInstall ''; meta = with lib; { description = "A Xinerama Aware Background Changer"; homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/"; - license = licenses.gpl2; + license = licenses.mitAdvertising; platforms = platforms.linux; maintainers = with maintainers; [ dwarfmaster ]; }; From 27314e17beb0bae912ae25918402f213e2b7f4b1 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 23 Jan 2022 18:45:14 +0100 Subject: [PATCH 521/703] scrot: 1.5 -> 1.7 Upstream says it's licensed under MIT-advertising --- pkgs/tools/graphics/scrot/default.nix | 34 +++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index aa525abacb07..bb721ded43a3 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,25 +1,45 @@ -{ lib, stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook -, autoconf-archive, libXfixes, libXcursor, libXcomposite }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, autoconf-archive +, pkg-config +, imlib2 +, libbsd +, libXcomposite +, libXfixes +, xlibsWrapper +}: stdenv.mkDerivation rec { pname = "scrot"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "sha256-4vguodLnCj0sOBLM4oJXTfX1p8hIo3WTwIuViPtZxHQ="; + hash = "sha256-oVmEPkEK1xDcIRUQjCp6CKf+aKnnVe3L7aRTdSsCmmY="; }; - nativeBuildInputs = [ autoreconfHook autoconf-archive ]; - buildInputs = [ giblib xlibsWrapper libXfixes libXcursor libXcomposite ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + buildInputs = [ + imlib2 + libbsd + libXcomposite + libXfixes + xlibsWrapper + ]; meta = with lib; { homepage = "https://github.com/resurrecting-open-source-projects/scrot"; description = "A command-line screen capture utility"; platforms = platforms.linux; maintainers = with maintainers; [ globin ]; - license = licenses.mit; + license = licenses.mitAdvertising; }; } From c182a39498e3b4c9c9a6442a627446f102836be6 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 23 Jan 2022 18:58:53 +0100 Subject: [PATCH 522/703] giblib: remove There is no upstream anymore and scrot now uses imlib2 directly --- pkgs/development/libraries/giblib/default.nix | 37 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/development/libraries/giblib/default.nix diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix deleted file mode 100644 index ca4a3c98e0a6..000000000000 --- a/pkgs/development/libraries/giblib/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }: - -stdenv.mkDerivation rec { - pname = "giblib"; - version = "1.2.4"; - - src = fetchurl { - url = "http://linuxbrit.co.uk/downloads/giblib-${version}.tar.gz"; - sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; - }; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; - - preConfigure = '' - configureFlagsArray+=( - --includedir=$dev/include - ) - ''; - - buildInputs = [ xlibsWrapper ]; - propagatedBuildInputs = [ imlib2 ]; - - postFixup = '' - moveToOutput bin/giblib-config "$dev" - - # Doesn't contain useful stuff - rm -rf $out/share/doc - ''; - - meta = { - homepage = "http://linuxbrit.co.uk/giblib/"; - description = "wrapper library for imlib2, and other stuff"; - platforms = lib.platforms.unix; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7ae975c5cbe7..c51aa2c48074 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -312,6 +312,7 @@ mapAliases ({ gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 gettextWithExpat = gettext; # 2016-02-19 getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # added 2022-01-12 + giblib = throw " giblib has been removed from nixpkgs because upstream is gone."; # added 2022-01-23 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 gitAndTools = self // { # added 2021-01-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b926da829ab..b00958d34a45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16579,8 +16579,6 @@ with pkgs; ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; - giblib = callPackage ../development/libraries/giblib { }; - gifticlib = callPackage ../development/libraries/science/biology/gifticlib { }; gio-sharp = callPackage ../development/libraries/gio-sharp { }; From 922672435ae422310d7f4167fe051df3fb540d25 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Wed, 12 Jan 2022 06:16:53 -0500 Subject: [PATCH 523/703] pdm: init at 1.12.6 --- .../package-management/pdm/check-update.patch | 12 ++ pkgs/tools/package-management/pdm/default.nix | 192 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 206 insertions(+) create mode 100644 pkgs/tools/package-management/pdm/check-update.patch create mode 100644 pkgs/tools/package-management/pdm/default.nix diff --git a/pkgs/tools/package-management/pdm/check-update.patch b/pkgs/tools/package-management/pdm/check-update.patch new file mode 100644 index 000000000000..9bc216177e5b --- /dev/null +++ b/pkgs/tools/package-management/pdm/check-update.patch @@ -0,0 +1,12 @@ +diff --git a/tests/conftest.py b/tests/conftest.py +index d310d36..e15d398 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -252,6 +252,7 @@ def project_no_init(tmp_path, mocker): + old_config_map = Config._config_map.copy() + tmp_path.joinpath("caches").mkdir(parents=True) + p.global_config["cache_dir"] = tmp_path.joinpath("caches").as_posix() ++ p.global_config["check_update"] = False + do_use(p, getattr(sys, "_base_executable", sys.executable)) + with temp_environ(): + os.environ.pop("VIRTUAL_ENV", None) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix new file mode 100644 index 000000000000..cf8b7d3f74af --- /dev/null +++ b/pkgs/tools/package-management/pdm/default.nix @@ -0,0 +1,192 @@ +{ lib, python3, fetchFromGitHub }: +let + python = python3.override { + # override resolvelib due to + # 1. pdm requiring a later version of resolvelib + # 2. Ansible being packaged as a library + # 3. Ansible being unable to upgrade to a later version of resolvelib + # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738 + packageOverrides = self: super: { + resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec { + version = "0.8.1"; + src = fetchFromGitHub { + owner = "sarugaku"; + repo = "resolvelib"; + rev = version; + sha256 = "sha256-QDHEdVET7HN2ZCKxNUMofabR+rxJy0erWhNQn94D7eI="; + }; + }); + }; + self = python; + }; +in + +with python.pkgs; +buildPythonApplication rec { + pname = "pdm"; + version = "1.12.6"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-MXKER2ijU+2yPnsBFH0cu/hjHI4uNt++AqggH5rhnaU="; + }; + + # this patch allows us to run additional tests that invoke pdm, which checks + # itself for an update on every invocation by default, drammatically slowing + # down test runs inside the sandbox + # + # the patch is necessary because the fixture is creating a project and + # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream + patches = [ ./check-update.patch ]; + + propagatedBuildInputs = [ + blinker + click + installer + packaging + pdm-pep517 + pep517 + pip + platformdirs + python-dotenv + pythonfinder + resolvelib + shellingham + tomli + tomlkit + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + ]; + + preCheck = "HOME=$TMPDIR"; + + disabledTests = [ + # these may eventually succeed but are incredibly slow due to contacting + # the internet + "test_convert_requirements_file_without_name" + "test_add_dependency_from_multiple_parents" + "test_add_editable_package" + "test_add_package" + "test_add_package_with_mismatch_marker" + "test_add_with_dry_run" + "test_add_with_prerelease" + "test_build_src_package_by_include" + "test_editable_package_override_non_editable" + "test_find_candidates_from_find_links" + "test_freeze_dependencies_list" + "test_info_global_project" + "test_install_with_dry_run" + "test_install_with_lockfile" + "test_list_dependency_graph" + "test_list_dependency_graph_with_circular_forward" + "test_list_dependency_graph_with_circular_reverse" + "test_list_reverse_dependency_graph" + "test_load_multiple_plugings" + "test_old_entry_point_compatibility" + "test_parse_flit_project_metadata" + "test_parse_local_directory_metadata" + "test_parse_project_file_on_build_error" + "test_parse_project_file_on_build_error_no_dep" + "test_parse_project_file_on_build_error_with_extras" + "test_parse_vcs_metadata" + "test_post_lock_and_install_signals" + "test_remove_both_normal_and_editable_packages" + "test_remove_package" + "test_remove_package_exist_in_multi_groups" + "test_remove_package_no_sync" + "test_remove_package_not_exist" + "test_remove_package_with_dry_run" + "test_resolve_file_req_with_prerelease" + "test_resolve_local_and_named_requirement" + "test_resolve_two_extras_from_the_same_package" + "test_resolve_vcs_and_local_requirements" + "test_sync_clean_packages" + "test_sync_dry_run" + "test_sync_packages_with_group_all" + "test_sync_packages_with_groups" + "test_sync_production_packages" + "test_update_all_packages" + "test_update_dry_run" + "test_update_existing_package_with_prerelease" + "test_update_ignore_constraints" + "test_update_packages_with_top" + "test_update_top_packages_dry_run" + "test_update_with_package_and_groups_argument" + # requires the internet + "test_actual_list_freeze" + "test_add_cached_vcs_requirement" + "test_add_remote_package_url" + "test_basic_integration" + "test_build_distributions" + "test_build_ignoring_pip_environment" + "test_build_legacy_package" + "test_build_package" + "test_build_package_include" + "test_build_single_module" + "test_build_single_module_with_readme" + "test_build_src_package" + "test_build_with_config_settings" + "test_build_with_no_isolation" + "test_cache_egg_info_sdist" + "test_cache_vcs_immutable_revision" + "test_cli_build_with_config_settings" + "test_expand_project_root_in_url" + "test_extras_warning" + "test_hash_cache" + "test_install_wheel_with_cache" + "test_install_wheel_with_data_scripts" + "test_install_wheel_with_inconsistent_dist_info" + "test_install_with_file_existing" + "test_parse_abnormal_specifiers" + "test_parse_artifact_metadata" + "test_parse_metadata_with_extras" + "test_parse_remote_link_metadata" + "test_pep582_launcher_for_python_interpreter" + "test_rollback_after_commit" + "test_run_with_another_project_root" + "test_search_package" + "test_show_update_hint" + "test_sync_only_different" + "test_sync_with_index_change" + "test_uninstall_commit_rollback" + "test_uninstall_with_console_scripts" + "test_update_with_prerelease_without_package_argument" + "test_url_requirement_is_not_cached" + # sys.executable and expected executable are different + "test_set_non_exist_python_path" + # editable inside nixpkgs doesn't seem to be a thing + "test_vcs_candidate_in_subdirectory" + # pdm compares with what looks to be an older version of poetry + "test_parse_poetry_project_metadata" + # pythonfinder isn't aware of nix's python infrastructure + "test_auto_isolate_site_packages" + "test_use_invalid_wrapper_python" + "test_use_wrapper_python" + # broken but wouldn't succeed anyway because of the network + "test_sync_in_sequential_mode" + # tries to read/write files without proper permissions + "test_completion_command" + "test_plugin_add" + "test_plugin_list" + "test_plugin_remove" + # unknown breakage, but probably hitting the internet + "test_show_package_on_pypi" + # tries to treat a gzip file as a zipfile and fails + "test_resolve_local_artifacts" + ]; + + meta = with lib; { + homepage = "https://pdm.fming.dev"; + description = "A modern Python package manager with PEP 582 support"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6500a8c602f5..75ab25d6c53a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8690,6 +8690,8 @@ with pkgs; pcapc = callPackage ../tools/networking/pcapc { }; + pdm = callPackage ../tools/package-management/pdm { }; + pdnsd = callPackage ../tools/networking/pdnsd { }; peco = callPackage ../tools/text/peco { }; From 5dd5f15a5fb71fb6beb708df9a7239f4954bcadb Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 21 Jan 2022 16:19:13 -0500 Subject: [PATCH 524/703] pdm: add upstream patch --- pkgs/tools/package-management/pdm/default.nix | 116 +++--------------- 1 file changed, 15 insertions(+), 101 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index cf8b7d3f74af..e9db7f63fba6 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub, fetchurl }: let python = python3.override { # override resolvelib due to @@ -39,7 +39,14 @@ buildPythonApplication rec { # # the patch is necessary because the fixture is creating a project and # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream - patches = [ ./check-update.patch ]; + patches = [ + ./check-update.patch + (fetchurl { + # Mark test that require network access + url = "https://github.com/pdm-project/pdm/files/7911962/mark-network-tests.patch.txt"; + hash = "sha256:1dizf9j3z7zk4lxvnszwx63xzd9r68f2iva5sszzf8s8na831dvd"; + }) + ]; propagatedBuildInputs = [ blinker @@ -64,121 +71,28 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook pytest-mock + pytest-xdist + ]; + + pytestFlagsArray = [ + "--numprocesses $NIX_BUILD_CORES" + "-m 'not network'" ]; preCheck = "HOME=$TMPDIR"; disabledTests = [ - # these may eventually succeed but are incredibly slow due to contacting - # the internet - "test_convert_requirements_file_without_name" - "test_add_dependency_from_multiple_parents" - "test_add_editable_package" - "test_add_package" - "test_add_package_with_mismatch_marker" - "test_add_with_dry_run" - "test_add_with_prerelease" - "test_build_src_package_by_include" - "test_editable_package_override_non_editable" - "test_find_candidates_from_find_links" - "test_freeze_dependencies_list" - "test_info_global_project" - "test_install_with_dry_run" - "test_install_with_lockfile" - "test_list_dependency_graph" - "test_list_dependency_graph_with_circular_forward" - "test_list_dependency_graph_with_circular_reverse" - "test_list_reverse_dependency_graph" - "test_load_multiple_plugings" - "test_old_entry_point_compatibility" - "test_parse_flit_project_metadata" - "test_parse_local_directory_metadata" - "test_parse_project_file_on_build_error" - "test_parse_project_file_on_build_error_no_dep" - "test_parse_project_file_on_build_error_with_extras" - "test_parse_vcs_metadata" - "test_post_lock_and_install_signals" - "test_remove_both_normal_and_editable_packages" - "test_remove_package" - "test_remove_package_exist_in_multi_groups" - "test_remove_package_no_sync" - "test_remove_package_not_exist" - "test_remove_package_with_dry_run" - "test_resolve_file_req_with_prerelease" - "test_resolve_local_and_named_requirement" - "test_resolve_two_extras_from_the_same_package" - "test_resolve_vcs_and_local_requirements" - "test_sync_clean_packages" - "test_sync_dry_run" - "test_sync_packages_with_group_all" - "test_sync_packages_with_groups" - "test_sync_production_packages" - "test_update_all_packages" - "test_update_dry_run" - "test_update_existing_package_with_prerelease" - "test_update_ignore_constraints" - "test_update_packages_with_top" - "test_update_top_packages_dry_run" - "test_update_with_package_and_groups_argument" - # requires the internet - "test_actual_list_freeze" - "test_add_cached_vcs_requirement" - "test_add_remote_package_url" - "test_basic_integration" - "test_build_distributions" - "test_build_ignoring_pip_environment" - "test_build_legacy_package" - "test_build_package" - "test_build_package_include" - "test_build_single_module" - "test_build_single_module_with_readme" - "test_build_src_package" - "test_build_with_config_settings" - "test_build_with_no_isolation" - "test_cache_egg_info_sdist" - "test_cache_vcs_immutable_revision" - "test_cli_build_with_config_settings" - "test_expand_project_root_in_url" - "test_extras_warning" - "test_hash_cache" - "test_install_wheel_with_cache" - "test_install_wheel_with_data_scripts" - "test_install_wheel_with_inconsistent_dist_info" - "test_install_with_file_existing" - "test_parse_abnormal_specifiers" - "test_parse_artifact_metadata" - "test_parse_metadata_with_extras" - "test_parse_remote_link_metadata" - "test_pep582_launcher_for_python_interpreter" - "test_rollback_after_commit" - "test_run_with_another_project_root" - "test_search_package" - "test_show_update_hint" - "test_sync_only_different" - "test_sync_with_index_change" - "test_uninstall_commit_rollback" - "test_uninstall_with_console_scripts" - "test_update_with_prerelease_without_package_argument" - "test_url_requirement_is_not_cached" # sys.executable and expected executable are different "test_set_non_exist_python_path" - # editable inside nixpkgs doesn't seem to be a thing - "test_vcs_candidate_in_subdirectory" - # pdm compares with what looks to be an older version of poetry - "test_parse_poetry_project_metadata" # pythonfinder isn't aware of nix's python infrastructure "test_auto_isolate_site_packages" "test_use_invalid_wrapper_python" "test_use_wrapper_python" - # broken but wouldn't succeed anyway because of the network - "test_sync_in_sequential_mode" # tries to read/write files without proper permissions "test_completion_command" "test_plugin_add" "test_plugin_list" "test_plugin_remove" - # unknown breakage, but probably hitting the internet - "test_show_package_on_pypi" # tries to treat a gzip file as a zipfile and fails "test_resolve_local_artifacts" ]; From 7ad577f72a70e55d205d1431fde0486ba718d255 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sat, 22 Jan 2022 10:38:04 -0800 Subject: [PATCH 525/703] ruby: remove config indiscriminately stripping config data was introduced in #138368, but was unintentionally added to the wrong `optionalString` condition. This isn't a problem in practice (as the relevant condition flag is enabled by default), but was unintended and therefore fixed here. --- pkgs/development/interpreters/ruby/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 8a20fa92857e..c676a7b05e55 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -166,6 +166,8 @@ let # Bundler tries to create this directory postInstall = '' rbConfig=$(find $out/lib/ruby -name rbconfig.rb) + # Remove references to the build environment from the closure + sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig # Remove unnecessary groff reference from runtime closure, since it's big sed -i '/NROFF/d' $rbConfig ${ @@ -203,7 +205,6 @@ let # Add rbconfig shim so ri can find docs mkdir -p $devdoc/lib/ruby/site_ruby cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb - sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig '' + opString useBaseRuby '' # Prevent the baseruby from being included in the closure. ${removeReferencesTo}/bin/remove-references-to \ From f1a1c39c4be19838e94ea9b8ced90a45a220b155 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Jan 2022 12:20:57 +0100 Subject: [PATCH 526/703] python3Packages.weconnect: 0.30.4 -> 0.31.0 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 187fe2253eb9..f1e0e6f4ed51 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.30.4"; + version = "0.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "0miih3gq6mkmzcrqhbvpm5zq0aafvvl8f3vql5s1r8ix3hag0ljg"; + sha256 = "sha256-1P+bd8BJ2m0PrF3EP5GsLte17vigA1KQh+PrZvfIkq4="; }; propagatedBuildInputs = [ From f9c2a5fbdf3da131ac37d27f66533d7435059ebe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Jan 2022 12:23:16 +0100 Subject: [PATCH 527/703] python3Packages.weconnect: 0.31.0 -> 0.32.0 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index f1e0e6f4ed51..afa3edacf5e8 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.31.0"; + version = "0.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-1P+bd8BJ2m0PrF3EP5GsLte17vigA1KQh+PrZvfIkq4="; + sha256 = "sha256-derdhy5McIuKJp8o21NV7kZYlYPprADfeqZaKiTm5Tc="; }; propagatedBuildInputs = [ From 863c51798e7fdf7b725d7fc93962fb73dfe4ee8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Jan 2022 12:24:59 +0100 Subject: [PATCH 528/703] python3Packages.weconnect: 0.32.0 -> 0.33.0 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index afa3edacf5e8..38e3d854a745 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.32.0"; + version = "0.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-derdhy5McIuKJp8o21NV7kZYlYPprADfeqZaKiTm5Tc="; + sha256 = "sha256-nIta89xRjXpjmSK8miIZUB4MlnlT7R9nF/vqVu+sUiY="; }; propagatedBuildInputs = [ From f5e9585f9e915aead223bb3497100d5f4d035c9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Jan 2022 12:29:28 +0100 Subject: [PATCH 529/703] python3Packages.weconnect-mqtt: 0.26.1 -> 0.26.2 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 6c1aa1eda2f5..740fd789bdc2 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.24.1"; + version = "0.26.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "125knv2mp479g90h7r2an0i5fyh3p4gdr3p01v4zcxin9hdbll3z"; + sha256 = "sha256-9vSQUU5lj9yY8/lJ+vVsD+3iczhS49gJE36RiJvMJYA="; }; propagatedBuildInputs = [ @@ -32,6 +32,8 @@ buildPythonPackage rec { substituteInPlace pytest.ini \ --replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" + substituteInPlace requirements.txt \ + --replace "weconnect[Images]~=0.33.0" "weconnect" ''; checkInputs = [ From 90be9924f8fc2b21bda96332a28f12545ed43d70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Jan 2022 21:50:25 +0100 Subject: [PATCH 530/703] python3Packages.pynuki: 1.4.1 -> 1.5.2 --- .../python-modules/pynuki/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix index 9c3dc394cc04..292d07d4e774 100644 --- a/pkgs/development/python-modules/pynuki/default.nix +++ b/pkgs/development/python-modules/pynuki/default.nix @@ -3,27 +3,37 @@ , fetchFromGitHub , poetry-core , requests +, pythonOlder }: buildPythonPackage rec { pname = "pynuki"; - version = "1.4.1"; + version = "1.5.2"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "pschmitt"; repo = pname; rev = version; - sha256 = "1nymlrf0j430851plp355697p55asfxjmavdh2zr96b16d41dnn4"; + hash = "sha256-Uqw1Xa0pBQmQsFEBv/l1gtsPy+owYcTZITOYUmMvT5Y="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pynuki" ]; + + pythonImportsCheck = [ + "pynuki" + ]; meta = with lib; { description = "Python bindings for nuki.io bridges"; From 9e3dff243f5d5b4aec22dd37e97387ec6c717f2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jan 2022 16:25:53 +0100 Subject: [PATCH 531/703] python3Packages.pypck: 0.7.12 -> 0.7.13 --- pkgs/development/python-modules/pypck/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 933dc415966e..ae297389bb15 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -1,23 +1,25 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder -, stdenv }: buildPythonPackage rec { pname = "pypck"; - version = "0.7.12"; + version = "0.7.13"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "109rwkkivvk1nmcznsjym4b7bibsd4vp9mmqwx0ihbhw2wwp69bc"; + sha256 = "sha256-Gbz+3Hq4yStlTI7UxB4NBZigUzZjSJFFcwdzWtbGnio="; }; checkInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "pypck" ]; + pythonImportsCheck = [ + "pypck" + ]; meta = with lib; { description = "LCN-PCK library written in Python"; From 218c163b48bef52fc8c60b7d3c009c2ae450d230 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Jan 2022 12:57:15 +0000 Subject: [PATCH 532/703] cryptsetup: enable debug info --- pkgs/os-specific/linux/cryptsetup/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 434bdc624710..715dcb986253 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { version = "2.4.3"; outputs = [ "out" "dev" "man" ]; + separateDebugInfo = true; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz"; From 87f2bae5ee8b5167eecc71267a1aeb72a83599b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Jan 2022 16:40:02 +0100 Subject: [PATCH 533/703] util-linux: 2.37.2 -> 2.37.3 --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index afdf335e1b40..8485565e0a88 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.37.2"; + version = "2.37.3"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-agdkwarn+2B++KbdLA9sR9Xl/SeqCIIKuq2ewU4o6dk="; + sha256 = "sha256-WQxZLljNa/OFGctGevBc5qGrGAQOPjQY8kvPsvVfl3Y="; }; patches = [ From 4292c49b93cd018c300cd8321151afa0cd051387 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 24 Jan 2022 19:08:38 +0000 Subject: [PATCH 534/703] expat: add patches for CVE-2022-23852 --- .../libraries/expat/CVE-2022-23852-fix.patch | 26 +++++++++ .../libraries/expat/CVE-2022-23852-test.patch | 55 +++++++++++++++++++ pkgs/development/libraries/expat/default.nix | 6 ++ 3 files changed, 87 insertions(+) create mode 100644 pkgs/development/libraries/expat/CVE-2022-23852-fix.patch create mode 100644 pkgs/development/libraries/expat/CVE-2022-23852-test.patch diff --git a/pkgs/development/libraries/expat/CVE-2022-23852-fix.patch b/pkgs/development/libraries/expat/CVE-2022-23852-fix.patch new file mode 100644 index 000000000000..fbbd080db4ed --- /dev/null +++ b/pkgs/development/libraries/expat/CVE-2022-23852-fix.patch @@ -0,0 +1,26 @@ +From 847a645152f5ebc10ac63b74b604d0c1a79fae40 Mon Sep 17 00:00:00 2001 +From: Samanta Navarro +Date: Sat, 22 Jan 2022 17:48:00 +0100 +Subject: [PATCH] lib: Detect and prevent integer overflow in XML_GetBuffer + (CVE-2022-23852) + +--- + expat/lib/xmlparse.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index d54af683..5ce31402 100644 +--- a/expat/lib/xmlparse.c ++++ b/expat/lib/xmlparse.c +@@ -2067,6 +2067,11 @@ XML_GetBuffer(XML_Parser parser, int len) { + keep = (int)EXPAT_SAFE_PTR_DIFF(parser->m_bufferPtr, parser->m_buffer); + if (keep > XML_CONTEXT_BYTES) + keep = XML_CONTEXT_BYTES; ++ /* Detect and prevent integer overflow */ ++ if (keep > INT_MAX - neededSize) { ++ parser->m_errorCode = XML_ERROR_NO_MEMORY; ++ return NULL; ++ } + neededSize += keep; + #endif /* defined XML_CONTEXT_BYTES */ + if (neededSize diff --git a/pkgs/development/libraries/expat/CVE-2022-23852-test.patch b/pkgs/development/libraries/expat/CVE-2022-23852-test.patch new file mode 100644 index 000000000000..3dca8f914a8f --- /dev/null +++ b/pkgs/development/libraries/expat/CVE-2022-23852-test.patch @@ -0,0 +1,55 @@ +From acf956f14bf79a5e6383a969aaffec98bfbc2e44 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Sun, 23 Jan 2022 18:17:04 +0100 +Subject: [PATCH] tests: Cover integer overflow in XML_GetBuffer + (CVE-2022-23852) + +--- + expat/tests/runtests.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c +index e89e8220..579dad1a 100644 +--- a/expat/tests/runtests.c ++++ b/expat/tests/runtests.c +@@ -3847,6 +3847,30 @@ START_TEST(test_get_buffer_2) { + } + END_TEST + ++/* Test for signed integer overflow CVE-2022-23852 */ ++#if defined(XML_CONTEXT_BYTES) ++START_TEST(test_get_buffer_3_overflow) { ++ XML_Parser parser = XML_ParserCreate(NULL); ++ assert(parser != NULL); ++ ++ const char *const text = "\n"; ++ const int expectedKeepValue = (int)strlen(text); ++ ++ // After this call, variable "keep" in XML_GetBuffer will ++ // have value expectedKeepValue ++ if (XML_Parse(parser, text, (int)strlen(text), XML_FALSE /* isFinal */) ++ == XML_STATUS_ERROR) ++ xml_failure(parser); ++ ++ assert(expectedKeepValue > 0); ++ if (XML_GetBuffer(parser, INT_MAX - expectedKeepValue + 1) != NULL) ++ fail("enlarging buffer not failed"); ++ ++ XML_ParserFree(parser); ++} ++END_TEST ++#endif // defined(XML_CONTEXT_BYTES) ++ + /* Test position information macros */ + START_TEST(test_byte_info_at_end) { + const char *text = ""; +@@ -11731,6 +11755,9 @@ make_suite(void) { + tcase_add_test(tc_basic, test_empty_parse); + tcase_add_test(tc_basic, test_get_buffer_1); + tcase_add_test(tc_basic, test_get_buffer_2); ++#if defined(XML_CONTEXT_BYTES) ++ tcase_add_test(tc_basic, test_get_buffer_3_overflow); ++#endif + tcase_add_test(tc_basic, test_byte_info_at_end); + tcase_add_test(tc_basic, test_byte_info_at_error); + tcase_add_test(tc_basic, test_byte_info_at_cdata); diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 6abbd9567478..5bd03824441a 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-sfnxsaXrsKyqiMn/eb+k4UWCO3iqUYXlxdhfBggkd4o="; }; + patches = [ + ./CVE-2022-23852-fix.patch + ./CVE-2022-23852-test.patch + ]; + patchFlags = "-p2"; + outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; From cea3ade4b278e920caf88f5e442cf04180e848ce Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 24 Jan 2022 22:13:41 +0100 Subject: [PATCH 535/703] git: 2.34.1 -> 2.35.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 073b50c4bd51..f768a3348c89 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.34.1"; + version = "2.35.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0b40vf315s1kz65x1wq47g8srl4wqac39pwnvlj1mdzs3kfma1rs"; + sha256 = "1j4g8qmc6ninpl0ixblpvs7871cbxmnznsg5xk75fs12fns7grj7"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; From 2cd72d57a3e2329a61b91e12e2e101b0d88935c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 Jan 2022 23:28:50 -0800 Subject: [PATCH 536/703] libgphoto2: 2.5.27 -> 2.5.28 (#154606) --- pkgs/development/libraries/libgphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 63015fdf6cb3..6da4c9a53a5b 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.27"; + version = "2.5.28"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg="; + sha256 = "sha256-e3zMinUUBKzZlQQzkS0oPWAzIVlmQoLj73Spj0XiTIE="; }; depsBuildBuild = [ pkg-config ]; From 13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 25 Jan 2022 11:25:18 +0100 Subject: [PATCH 537/703] glibc: 2.33-71 -> 2.33-78 (security) https://www.openwall.com/lists/oss-security/2022/01/24/4 --- .../libraries/glibc/2.33-master.patch.gz | Bin 78002 -> 85746 bytes pkgs/development/libraries/glibc/common.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index fd78d3a5e8a86a00658b8049fb2ec5bf76a09e0f..13ef601408c569d3a4c8d4148e0bfe5eada587cb 100644 GIT binary patch delta 8071 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 Date: Tue, 25 Jan 2022 03:21:39 -0800 Subject: [PATCH 538/703] catch2: 2.13.7 -> 2.13.8 (#154407) --- pkgs/development/libraries/catch2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 5adcc2d1dd9e..71a99ad6b696 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.7"; + version = "2.13.8"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="sha256-NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI="; + sha256="sha256-jOA2TxDgaJUJ2Jn7dVGZUbjmphTDuVZahzSaxfJpRqE="; }; nativeBuildInputs = [ cmake ]; From 19ec45fc27f42385b8429f7ba862b11c29ce942b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 25 Jan 2022 14:19:18 +0100 Subject: [PATCH 539/703] gixy: pin pyparsing at 2.4.7 --- pkgs/tools/admin/gixy/default.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 65ca85b463e9..03571ac7cf75 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -1,11 +1,26 @@ { lib, fetchFromGitHub, python3 }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + pyparsing = super.pyparsing.overridePythonAttrs (oldAttrs: rec { + version = "2.4.7"; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = "pyparsing"; + rev = "pyparsing_${version}"; + sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "gixy"; version = "0.1.20"; # package is only compatible with python 2.7 and 3.5+ - disabled = with python3.pkgs; !(pythonAtLeast "3.5" || isPy27); + disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27); # fetching from GitHub because the PyPi source is missing the tests src = fetchFromGitHub { @@ -19,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { sed -ie '/argparse/d' setup.py ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ cached-property configargparse pyparsing From 9236978d80a5f6ce96b7271476fad824ead7b93d Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Tue, 25 Jan 2022 23:10:09 +1000 Subject: [PATCH 540/703] ffmpeg: switch to ffmpeg_5 * Keep opencv{2,3,4} on ffmpeg_4 as upstream hasn't updated yet. See [1]. * Remove libavresample from ffmpeg-full, as it was removed in 5.0. [1]: https://github.com/opencv/opencv/issues/21455 --- pkgs/development/libraries/ffmpeg-full/default.nix | 5 +---- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index e4a5d908d263..fdb0bed1e6db 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -32,7 +32,6 @@ , avdeviceLibrary ? true # Build avdevice library , avfilterLibrary ? true # Build avfilter library , avformatLibrary ? true # Build avformat library -, avresampleLibrary ? true # Build avresample library , avutilLibrary ? true # Build avutil library , postprocLibrary ? true # Build postproc library , swresampleLibrary ? true # Build swresample library @@ -225,7 +224,6 @@ assert avdeviceLibrary -> avformatLibrary && avcodecLibrary && avutilLibrary; # configure flag since 0.6 assert avformatLibrary -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 -assert avresampleLibrary -> avutilLibrary; assert postprocLibrary -> avutilLibrary; assert swresampleLibrary -> soxr != null; assert swscaleLibrary -> avutilLibrary; @@ -304,7 +302,6 @@ stdenv.mkDerivation rec { (enableFeature avdeviceLibrary "avdevice") (enableFeature avfilterLibrary "avfilter") (enableFeature avformatLibrary "avformat") - (enableFeature avresampleLibrary "avresample") (enableFeature avutilLibrary "avutil") (enableFeature (postprocLibrary && gplLicensing) "postproc") (enableFeature swresampleLibrary "swresample") @@ -453,7 +450,7 @@ stdenv.mkDerivation rec { checkPhase = let ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' - ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ + ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ make check -j$NIX_BUILD_CORES ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6905c893e6a..6921f62fd14e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16421,7 +16421,7 @@ with pkgs; ffmpeg_3 = ffmpeg_3_4; # Please make sure this is updated to the latest version on the next major # update to ffmpeg - ffmpeg = ffmpeg_4; + ffmpeg = ffmpeg_5; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { svt-av1 = if stdenv.isAarch64 then null else svt-av1; @@ -19216,10 +19216,12 @@ with pkgs; opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; + ffmpeg = ffmpeg_4; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; + ffmpeg = ffmpeg_4; }; opencv3WithoutCuda = opencv3.override { @@ -19229,6 +19231,7 @@ with pkgs; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; pythonPackages = python3Packages; + ffmpeg = ffmpeg_4; }; opencv = opencv4; From 64efca591e58b56cbdf630c7d1510abd41a7ce36 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Tue, 25 Jan 2022 23:00:20 +1000 Subject: [PATCH 541/703] ffmpeg-full: add libxml2 dependency For the DASH and IMF demuxers. --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index fdb0bed1e6db..1753c6e3f24d 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -99,6 +99,7 @@ , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support , libXext ? null # Xlib support +, libxml2 ? null # libxml2 support, for IMF and DASH demuxers , xz ? null # xz-utils , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support @@ -372,6 +373,7 @@ stdenv.mkDerivation rec { (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") (enableFeature libxcbshapeExtlib "libxcb-shape") + (enableFeature (libxml2 != null) "libxml2") (enableFeature (xz != null) "lzma") (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") @@ -428,7 +430,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr + libxcb libXv libXext libxml2 xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore zeromq4 zimg zlib ] ++ optionals openglExtlib [ libGL libGLU ] From 7790930e4dc0860191aceaf52dc4c546d881ad2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jan 2022 18:51:20 +0000 Subject: [PATCH 542/703] tdb: 1.4.5 -> 1.4.6 --- pkgs/development/libraries/tdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index febf1b97eb68..f040022cc91b 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-vPztiE9wMQgJmLXEscXc5XVnBV95QX+G26QNzemaDkE="; + sha256 = "sha256-1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws="; }; nativeBuildInputs = [ From 354fdf80d158bcc9e8ad9a459c427b66667a5816 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 23 Jan 2022 00:05:56 +0100 Subject: [PATCH 543/703] electrum-ltc: unbreak --- pkgs/applications/misc/electrum/ltc.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index a070bc321b74..416adbe60c88 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -76,6 +76,11 @@ python3.pkgs.buildPythonApplication { prePatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" + + # according to upstream, this is fine + # https://github.com/spesmilo/electrum/issues/7361 + substituteInPlace contrib/requirements/requirements.txt \ + --replace "qdarkstyle<2.9" "qdarkstyle>=2.7" ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; From aa405079410295b78d889faa4a7f89de8851ced3 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 23 Jan 2022 00:09:53 +0100 Subject: [PATCH 544/703] electrum: unbreak --- pkgs/applications/misc/electrum/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 841b943e8634..a5afa1bf7a51 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -77,6 +77,11 @@ python3.pkgs.buildPythonApplication { prePatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" + + # according to upstream, this is fine + # https://github.com/spesmilo/electrum/issues/7361 + substituteInPlace contrib/requirements/requirements.txt \ + --replace "qdarkstyle<2.9" "qdarkstyle>=2.7" ''; patches = [ From 982158e23403cd0d6b224234c5d5ff94dac8e138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 26 Jan 2022 12:08:06 +0100 Subject: [PATCH 545/703] python39Packages.setuptools-scm: 6.3.2 -> 6.4.2 --- pkgs/development/python-modules/setuptools-scm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index 62568869b7bf..c175cfb4c609 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "6.3.2"; + version = "6.4.2"; src = fetchPypi { pname = "setuptools_scm"; inherit version; - sha256 = "1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4"; + sha256 = "sha256-aDOsZcbtlxGk1dImb4Akz6B8UzoOVfTBL27/KApanjA="; }; propagatedBuildInputs = [ From e0c98448bb88ec16ddf3168cb333ba623cbb3ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 19:23:06 +0100 Subject: [PATCH 546/703] mime-types: drop, gentoo replaced it with mailcap, marked for removal --- pkgs/data/misc/mime-types/default.nix | 21 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/data/misc/mime-types/default.nix diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix deleted file mode 100644 index 77b67e48f923..000000000000 --- a/pkgs/data/misc/mime-types/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, fetchzip }: - -let - version = "9"; -in fetchzip rec { - name = "mime-types-${version}"; - url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; - postFetch = '' - mkdir -p $out/etc - tar xjvf $downloadedFile --directory=$out/etc --strip-components=1 - ''; - sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0"; - - meta = with lib; { - description = "A database of common mappings of file extensions to MIME types"; - homepage = "https://packages.gentoo.org/packages/app-misc/mime-types"; - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4a55239d2656..63fb822fdbcb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -606,6 +606,7 @@ mapAliases ({ mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # added 2022-01-12 + mime-types = mailcap; # added 2022-01-21 mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # added 2022-01-01 mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6905c893e6a..9d46ec5ae409 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23978,8 +23978,6 @@ with pkgs; sweet = callPackage ../data/themes/sweet { }; - mime-types = callPackage ../data/misc/mime-types { }; - shared-mime-info = callPackage ../data/misc/shared-mime-info { }; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; From 4545189568dedab675ebb873bf316ddb99710d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 22 Jan 2022 19:15:19 +0100 Subject: [PATCH 547/703] nyxt: mime-types -> mailcap --- pkgs/applications/networking/browsers/nyxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index ccbc7a8dc8fb..7c1cb7f04a71 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, lispPackages , makeWrapper, wrapGAppsHook, gst_all_1 , glib, gdk-pixbuf, cairo -, mime-types, pango, gtk3 +, mailcap, pango, gtk3 , glib-networking, gsettings-desktop-schemas , xclip, notify-osd, enchant }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gdk-pixbuf cairo - mime-types pango gtk3 + mailcap pango gtk3 glib-networking gsettings-desktop-schemas xclip notify-osd enchant ] ++ gstBuildInputs; From be1fef9258f3fbd2bcafb54b2bf40b2c25675a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 22 Jan 2022 19:15:33 +0100 Subject: [PATCH 548/703] cpython: mime-types -> mailcap --- pkgs/development/interpreters/python/cpython/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 7a2a79b8cfed..66aaf08c6385 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -4,7 +4,7 @@ , libffi , gdbm , xz -, mime-types ? null, mimetypesSupport ? true +, mailcap, mimetypesSupport ? true , ncurses , openssl , readline @@ -62,8 +62,6 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -assert mimetypesSupport -> mime-types != null; - assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang)) "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found."; @@ -277,7 +275,7 @@ in with passthru; stdenv.mkDerivation { --replace "'/bin/sh'" "'${bash}/bin/sh'" '' + optionalString mimetypesSupport '' substituteInPlace Lib/mimetypes.py \ - --replace "@mime-types@" "${mime-types}" + --replace "@mime-types@" "${mailcap}" '' + optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; From 6d8df0003cd5ab330eb0063f9fd6a3063a1ef470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 22 Jan 2022 19:15:40 +0100 Subject: [PATCH 549/703] python39Packages.mat2: mime-types -> mailcap --- pkgs/development/python-modules/mat2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 0d54656c1586..3a5eac16141a 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -7,7 +7,7 @@ , bubblewrap , exiftool , ffmpeg -, mime-types +, mailcap , wrapGAppsHook , gdk-pixbuf , gobject-introspection @@ -41,7 +41,7 @@ buildPythonPackage rec { exiftool = "${exiftool}/bin/exiftool"; ffmpeg = "${ffmpeg}/bin/ffmpeg"; # remove once faf0f8a8a4134edbeec0a73de7f938453444186d is in master - mimetypes = "${mime-types}/etc/mime.types"; + mimetypes = "${mailcap}/etc/mime.types"; } // lib.optionalAttrs dolphinIntegration { kdialog = "${plasma5Packages.kdialog}/bin/kdialog"; })) From ac2f7326268aa26a1a29da2fad8f897762f75316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 25 Jan 2022 11:08:16 +0100 Subject: [PATCH 550/703] gmnisrv: mime-types -> mailcap --- pkgs/servers/gemini/gmnisrv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index 8d8ad16e7849..81e1c17467cc 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mime-types, scdoc }: +{ stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mailcap, scdoc }: stdenv.mkDerivation rec { pname = "gmnisrv"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" ''; - MIMEDB = "${mime-types}/etc/mime.types"; + MIMEDB = "${mailcap}/etc/mime.types"; nativeBuildInputs = [ pkg-config scdoc ]; - buildInputs = [ openssl mime-types ]; + buildInputs = [ openssl mailcap ]; meta = with lib; { description = "A simple Gemini protocol server"; From b20ad47fa3fe642a15a6a56250af62d19228d051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 26 Jan 2022 17:09:31 +0100 Subject: [PATCH 551/703] nixos/ceph: mime-types -> mailcap --- nixos/modules/services/network-filesystems/ceph.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index e313589134f1..7a1444decafa 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -181,8 +181,8 @@ in rgwMimeTypesFile = mkOption { type = with types; nullOr path; - default = "${pkgs.mime-types}/etc/mime.types"; - defaultText = literalExpression ''"''${pkgs.mime-types}/etc/mime.types"''; + default = "${pkgs.mailcap}/etc/mime.types"; + defaultText = literalExpression ''"''${pkgs.mailcap}/etc/mime.types"''; description = '' Path to mime types used by radosgw. ''; From e532d594e02291e100fc74b1d31939e62ef454f2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 27 Jan 2022 09:00:23 +0000 Subject: [PATCH 552/703] re2c: 2.2 -> 3.0 https://re2c.org/releases/changelog/changelog.html While at it added trivial updater script. --- pkgs/development/tools/parsing/re2c/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index c3b09b71d173..41ec653a409b 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,18 +2,19 @@ , stdenv , fetchFromGitHub , autoreconfHook +, nix-update-script , python3 }: stdenv.mkDerivation rec { pname = "re2c"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "0snfxk1cf2f4dy4hcxd1fx1grav3di0qjgqqn97k85zsf9f6ys78"; + sha256 = "sha256-ovwmltu97fzNQT0oZHefrAo4yV9HV1NwcY4PTSM5Bro="; }; nativeBuildInputs = [ @@ -28,6 +29,12 @@ stdenv.mkDerivation rec { patchShebangs run_tests.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Tool for writing very fast and very flexible scanners"; homepage = "https://re2c.org"; From b7c57ee12180d671a6eb5d476c5119ead51c0ea1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jan 2022 19:53:38 +0000 Subject: [PATCH 553/703] zstd: 1.5.1 -> 1.5.2 --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index a3184f6d1ede..0bff5110c935 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "facebook"; repo = "zstd"; rev = "v${version}"; - sha256 = "sha256-D9+kuIjPYnmg5ht/ezIeYCpyiLkrtdiH3fwpmemIPGM="; + sha256 = "sha256-yJvhcysxcbUGuDOqe/TQ3Y5xyM2AUw6r1THSHOqmUy0="; }; nativeBuildInputs = [ cmake ] From 22894ee2e008a3b618d856149b803316a1a60a24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 06:56:46 +0000 Subject: [PATCH 554/703] rdma-core: 38.1 -> 39.0 --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 02321d843510..f7543291deda 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "rdma-core"; - version = "38.1"; + version = "39.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "05r5f9agpn7dcx5jmggrsm9953w2k6ly6gfbg9b8wjdc853apqp7"; + sha256 = "sha256-7Z06bdCtv/gdZKzKfcU+JrWl4+b6b/cdKp8pMLCZZo0="; }; strictDeps = true; From 00caaf1e9a815132f266ef555b7d4a90402e739c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 28 Jan 2022 09:18:36 +0000 Subject: [PATCH 555/703] glibc: 2.33-78 -> 2.33-108 --- .../libraries/glibc/2.33-master.patch.gz | Bin 85746 -> 147266 bytes pkgs/development/libraries/glibc/common.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index 13ef601408c569d3a4c8d4148e0bfe5eada587cb..49ffd4a7441cb59744eedbdda9cee072d931d868 100644 GIT binary patch delta 64776 zcmew~m-Wy;j)pCa_Ad2rVsndcn+g4!^M~uoOtm28lQs2)w|qjQ%WS4D?Rk3b`pF+6 zlNe-ub3N6MZoIww-}l=`r5(FAJ$2i;lYeHXawo%dg$=tS7vHm;Ik7TPU{do?bkIcY6J*rMs7P z?>_TuT0-BppGluMOCG6C=JIL1s{h>c*gyNbinZqg>ponSEt+ecA`l;9S-s;>Ti30; zgZ&QS8%h?hob~yrt@d@5T&Bg2v+bAic%?OR$#2TN;OKeikl*o-GS4nfsrK~t_PI6VEttWDSBG%k>k~|C?8C{NJ`yXP%h$TqQoo6v>LzDT!y! zYA@{hkm9&PI>0*U@`Dr(x5rL;+r1OG*dimMLgrpQbuRhNne}c{PtCb!wM9g5*~!`O z*6;mz^5cUaOK!jaZ)PVy?_Z6Lg_Qi)bKlPMr`RojJg4ORv3B+XSKsTuj?7#>fA=mI zjr0816Y4h=9E+NinEc^xxnHoe{HYv=5AUV??@SA~F`dyicWU9IOY@HC@`~K+pRsMt zwB%LGihZZ;C=FE+uUvR|lF1gGTQ867ku2?sCs z5n1kkGwz?my9=?+ujQX+Ssl}!|LN(e)&qx)x9ln@e);5aQN8$;x5rnT<+ClDU42V0 zb?RwR?Wy&whmuQ=$;#ZWShl_9SJ3?v{a;U&uaA3lc9Qtfgl*HW2XuI?&@i0e5I&!i z{dRTHzKyH*?37f$V!Lxmu-Wd!%YTDjv5N6VNU(hUy|ll2#m3pMD$3?wUOYu$ug01j zs~fGU>kY-X9GYHTUSoA(TYdYK%(Xi!l?-P~eJ>*FZ?N=4eMHFK zdFRz+-mE-f=>Oqu@vn0`BaWV5vU#J^RE?i=^ThmOEc~VNrvK@fXd-sqhGkzybg+tk z#nxBVJGnk=Ymuy)6D;~%O53*9=iWfd~*U*w{nH^ zw7r+k?T}2;-uGgkz||!m?WU@4DyU}vcg$j^Zd!Q2=bbef?Em7fh6v7xUUkqd^(~{$ zuJ--+9)5iJ;?3EEnwd83tCJEo?D;G8U!FT^PuhO-6(xtWp8E4hTS$F7zWCw4^LsaE z@lJ_cv!ULo-p3Bf(}ytNpVD)z?JV=50IidCs;kvkxS!Hg9kH3M@4zPu^b?rOqu`qW$8}?963-wM#c0zZ|bAaOv=7MRk+ci!zVsX}mmm zQTVCW7RL_{q8OjfTzr)ysh*E}_e$4o>+Cie^UU~r$mO$;_Kaia-ua!L(I0)O`FV=T zzn2vS4*#0(`&IvbRJHk>p}RnkfInN$9LukY3i|iYyTY zr}2D!4=1J{4lb-Tu#x%p`|#&!GkSKOS@klk#K})|!NM1LAFEf-oxVro!Q(E&`nCK= zG$Pr|i@P@JUq2a>JMm;+qjvGUpkqBLnx}T`UA8#uN9f8G8v?lYwir)d@?}os?T=k) z+`GQ~5wYI8bj@t*Gs$OuuMIWvwp+F?J^a3q`Le>rZ;K3f&(uFYXBIutj4lgT2odSU3JQzvfg~Ec6-gO?crA{5>{6{HGQnqw)B^dsl~E2(?X`qvkkAj z${{cHjV=ACT{IvT7K=%*89IcP0Wu~_T=!>eEvjMC2uin5sR_?ht~^ko2S3%61u8A zDak5sDgV>;TmM`Y@s6qY3idl%v@js%#6rI7VXhpjoZ6q|bABthn0zDJ?Ze6vx6IBR zx;sOArB5-I(2m0Hbq<(TeW z4W>}}shI^KZ@w^n+4jXk_*I$Gy1lbwrd;O~eG?0 z=i%pa6EKEGHspaXq<3;zmb!W9Y z%H7C&(PH@dP)+v7J$-whvsKTlEu0=saum&dq73{);6~)XKEx<_lJe-`e?f9j9iUh?ieu&*hf} z?Nxox>z_vMkewpK&tG$tJw`(yzr*A4Cc`5`XGdfDlyIOV!-YMF#JJ9sO|Ak9sA~#P7 z=5zaf=fkeQ2Y#dkPLp_OxqNa@#%XW8Jx71}uDg@q_iL|#V@22$&QQ6<{4{SJS za>U^E+W3W{JDx45boqSok-_wLcf=-jMDCgtYSa`mMfuixbMMHY8#;HQ>MQlQzKR9R zompI0(-B{=+u=&yEd8p!)Ww_M-PBi(jbqz2-OWGN)vx_`RBm>vuU&Gg@4MJYZPR>K z$)6Xc996nZn4>p_pA6t8nuNMKVoMKpY-;q*5s)U zDVy#(q-+XQD5~aeJn{A{)5P$3CU>jOY>vqmlKkv*?WoP<^Zk`-(#LHkml~dbyY`69 z_Iho@^S2eEvUU}4)-0=Ko;qt$U%vX4^4MpFY;HjZY9<(62;4S#x8ozXeY0-|X02iS z?{n#9=r)z+C!hFdOnG|#oJifj89M7ucXcfnV|PtmJg?}Et^aGy+&(o91L2Bl7lsvG zhAz7&?%#7@KVP!>K7+?m5--bs=017*k7HS1{av4c`h_|U*&9Xn*M9kWocXWQG|cm! zSSCz97ALb~rSD+|HYNT=CX38I8?$TNY&;rM9V{LC?a8_ewTr9I9Q5*?de=Jb!i1K} zz~z&TBW9=Qcr@3aU2{q6=a#s;o3qztwb={zB2o2B9G)q}mpIy538;hF5in~fb zu5V+m{r~E%i^pzJBGtvOMd{^7`u&Pw9DId*Qa`OH#rw+tW9TpZxQZ7845E z^lp*EnSYNz=5CvlmM~R){yP~tPDbwsuPdeNnHD!puvO;s+40YH>e61NeM^-%7kaB% zH9oq@nRoHTg%j891)k5ZV`%yuQc-`|x%BG|zT*;&X1y1kXR)7q)W+|AU0q^Y%R-$g zdIox#2bHrfmX~QIIjPppyt%+b#CX2$bYUJ5LA&Wpd*shAIq`exU%9_3_x0y~Z?pKc zwY}o^w10-Wb)9V6JDBS8R*N6o8*xSC^~VQha);Uvtk1|hx^eQ;x*13GZWQyJId&q^ zuU@G73RkT8M`7+Wi=R2S1l?a$CspOxmZ@EHL9gS6`{pZ)HazJmir|cP=vsGKKWRYzYx5L1vf&x;=Z-YHh`wwmRyl=;Fg^Z|X9^E&J_`NOpD=A_ z(NBE_28RFt&&Xy6OS^yC{8{^3j3?_&k9%`#Z=x!3)^fBEv|@-2bu&2Jxabeul^=p^H-+lJN`kB9vE zwRlEcnaXEInRz?vRR11+a`)T93}xnxJ{@0g+e_@^k@?#w@b}x3_RPBNnSTw=zU#P= zqrGvjOVXixyTa?u{pRJ=U#`Bi$K&_X=ow)}cV7nDPkHUOZ$EW3f_5D^6U2G_kSJMUp{_P-aqTfp^o28BGc!bJ5awW#^ z`|?^Vo*lMY$-L0Yw*Hf?@ZA3Ld+O}U&8$HzR$NBM%Zshkde|+?BOgpNJI~$!bK&e~ z^WHuWoG9L^cA$fam+nngWR{&)IQux~=-;9f>kT#3xF0sv zKll+f;o?^3t?^$pbvXj{t2H@#i^8_46keIx#ZZ{HbW!L%nI@^=Vx1S0S1}x97cbo^ z!z|A_QGR)n;vyR^C+R0YW}ZJ1_vDOzuE0N*M^aPUd_}o?J}&x~w1O>DGrW^yj*{r} z@_7gI(l?&oY{EUaQq()TdTCN-b(>x3iHh#?0rjk@Q`K+p{yUd(f}g1N^Nc@IK1)-x zmH)gdFtCx4@#NipF{ygJz1yywDYNszdHbMwQ0=gu8$kh9h?IeK}YkiYiK z1~G2s2Oc3d_Q5ySuQlGAJAc)Y#%(wERp;#DEB26hyL-WgB9Yp&2Yuf!@i@U;pf)iq zb4g|CTn@fX^@myxNk@p*UWm*1sr2RkL6KMMPsq!#*RTn?n!nJ_+9!FcamrN3t(mNL zH)19Ju2y+7Evl_O>!3)z=_&hwt`Kjl&3)$rqf5AUDLJj>@{jmXE1a{lg7=Zwj#H19 zad7h6_TRpv%YDK8_oErT%~M$Iv}@GA9X|1FO~H)gcHI+h9Q3X?ubVPKAi3>TVr16c zI46e}!Y3HY>NS}s#C+JjxqCMEN%pfG%`r{w@o~Q^9Q_|$>NwLCG3jrRjOLU@J~9EU zF83YN&A5t`+U57iH-A`dzCmG1KPOryb=^c%-1$rI94}b5` znK8TSOz~cuZ{A^3>RH#$s=v5APM`nnq++oTU)C=O_48RJ_wo2w`CD;Tf3M71zL&lJG$M)1%eOEyvowtvQtywZ_iyR-;3K76)bNL{+j zk*_;y^P1#cX$g}RB1}u!3fHa=vKI+F|YUah(@d&7Ypnx%P+j&Cn3lAhSh$$t*_%HxrFx97>S zpV7~;e|oR0opHtSvTl*Q#BKb?-1ph>ESgoo{IvV&(+2;uZ+@{OfJ5EZm-GnvWQ#rl=G}4%O79b+-;z@dB=myiPouK8Vuo>U(3I(}M=>)12vOpe3Pv>(i!pSa2J$6*_< zH#KE*JGweoahxhEYBA=XKXbo>S=zsM|0ajUE%>nhhZbkY{Yl$+KQe~q{y(}ysylmc z5L@htC*|SNJ`MNFZ?K0f-OBG`8kecGFYLR^9(hTJxq^RPqw5ZqU3Wihw7Wh|UNRwm zqpg)+8T;SGk3T9{+P%r|tUl?nVAsdC*%!7g7TU9(*Il&#OJT&T(1^)8D;K6+$uvE6 zCF8!+0x@Crt5um&Ta^qJ+&5j2IAI@qV&WC$Z4Muga0vGB1jULf@G|?o)10$j!SdX% z!*iD}Fss~EUSDMSbLEUX9kbsBYlfSysaG`b`oh>|Vw#X{KTdzOfIOlEdclbr(tIU#1ezv__ zCp30eyl${xF~`QLuGiu2J9(L$uiNY0_OE&J#q4qT)CZSRUOy?X)06m_{^)$D`%Ebg zzgmX+XUy!sqi>)5_wM8Cw<#uaZ}^TqKIpgU>$8mWw*+Kjc|$Ke@c46^wN12Xze=>t z?~>EYch*gruQ*-tg5|3{moh$H2w2ZvWV7K|2G7l+3qr^8qP{MCvG(7Q{VNl$**gkq zFzBe)?UXnZR1s{wa+lQGt2RPT^~>20t@vVW9T0xGVLD%Z|ED|ezsg(}{hpw%H}~j^ zO~)L3r$j9l7OCCnd%a4}?&FbrOws0?(+^fuXatAkQQ<+4w>I3y;m|EQi$(uCHv75Q;A`T4m}Yf8_-e^$Bv zRe3dG*PB%q(?2ds7nD$JyTHnJHphpdujI+{f;w{n1>xO4&lkL4iT(J}s-o|3X3*BV zd>h;=D-{mxwY@Rr{bn-tGH5^{T`L+vCjh4&auhutd#k%rr?xOkC)sM8}6M4Hl5IJHsYBc z=DodTZFGeDOo^(*7rO=Z_r{$+-*uv2>6*vu-x=}!FBWD`e0@ja$e~AhaQp>wue zy|TDIJ@>ubmwKx=|IRJH`ZBUo_eFC<%y%c9Ez9K($*fxKX&(LMi`Lw_S=C+BO?*P- zST6Z&t!H&DC_S=fVduxiS}}jK+cX#Wh<|323Ai6PIn!qTEYW4TrUkYMJC0nmH||wf zEP`KUT7RekJZoIQ@dXXGH%er+YeuzJ4#56uP>;+h;xVHKX%0orRcvX82A! z%gGkOD7fW;is6s8o`$b!C0p$8{AX?Q;xs5fa#FeZsp|6d$~d36wU=0Zmagr7e!85| zAZPB;@@ai%n>JoKx#*X5_l_rr4>Gce7#>+V&9vLrP+z4oOnl~_=0$hUafV-*?V^_Y ze|Dk0jnA*gZ}&d?x}pB9*WJK>nU8|Dei03JZH?I1c-8F0qRK8c&N!bw(U<;wM^vNJ zC#s)(FB1~KbxB8jQQZmli(4yyhB{2kT3A z8MX}7o@q6YE*ENS`0_JymTH7~<1WrCp&L_9{FaT`YIgP5+|_(}BEfa*Z5dTq8P@t= zx_?vfz=7inRxd72eD*JStHPwMjnOC8Oi{Tau(reMSKhxL7UxUFrMcNIRXbXDZb{m{ z$~*eO#$7ExpMChnEAVxCyyl15*K-9E>#c9qJP6n|Q?JFY(0Ff;ivNmVqUwSx>LNdc zCfLVH|F|r=(EjiK#{HbvUh=FvA0ENZdn;3Ro6+~H598wJoMhQ*5Vmh-yiC?FvyE(b zN^UPzOz-)|n|t?Wwa)J9^!JVd^S*9)CAX|PJeS{{kt-;-J*c7HGiSlgHH}P8^ zD7Ms3Ekp8V*JguXpRUYiv3c!SCc10wv7c=n+iIFc57;YT-=xc6KQl%xGqlc6yu-eO zlQH+xjh|673>qtbWh*sj>{haSka1te>p=CIHqj4q^=cst+f6gd0<%9`3y_3n-M4@T?DA8+}zd)M!8O_5#jTF*0G{GHOF zYW^>(GnVh|iJ#}okgpZFyvFsk-R3q;8FmBPD}ukCPY-%p6R-t}qb zuBzXqwg-RKC$#OEZ2xC}^VgKR_wt9Lwg@!T|ExBP)$m%dfZJ4O+3BV8+g=<})>z8j z-*Am9Pdir2B1&kzXxlX|i3MCg{Cf8ZA9^o!+51nzSTeDWV{%W4! zTqC`y^~t+g`yG_(_s@9$Y581-F571h^bbyCow2&1KkG{%hkdmXT+Z}l(yKkK1x_A&~~-GWC`P3vBQ>^68xl2U1TfT_unnqT{`HIZcnLC z{Z{`5r^OEntN)8$j?ZAMUvPujVI^lnd2GWbmMI#m-+f!ZcoMhwYxdi@(&pB+I{D_W z+3&y9StXtGY;T@H?B`RrG|&A!m;H6$p7JR->q3rxV+VDu-^6e@BC zp(9!2>`KL@s#(k$jw@_k`*Jf*99}8A;^Fo3v~O>3aBd0If7*26Ou%|68P*sS9- z(V4W*c&XlGx!IT0Chs#}D(88ZIk@V?65imdBTLpT{QfmF-Qs|}iJ52K+vS40mv8bv zKQ~$CwW$5-EA~2*euzoFFUy*nAY={FJ`=ciA<)kboJdoCA4Qi~h5e6>2hw+Q_zO+T|1Js^aI8CUp8v|M9nF zUQ+rK(U$#E=JS@x=@ctXILhHTZ6ixVgr~ET&eTPkNnU+xKZLuy$#xW4p2^7A(R(F@ z|4WHf?CPs4LJoe@+E=HtxO(kW(rO)sn)^OaY!a+DOXd+u(%0hj(%)5Q>UY3l zr$yivjn4+1_hhcTeU&HFCwtcBM>*4sEou+WTxj}Vm~H=9!{Pg{nF4FwMTgFAs@xfxLVg22?VtezYj(7br&@5qeAkh;xTj9%U3+E@4m^DmYDuzv&6J-;(E!mzLjOQc4X%o>@#_N zaNp<2)BYCzX_)@=Wu3sJ+H=z@_&)v6-Ft$+E+H>jW#0qY1Fk|#1g4Eu;=7!+oyR?W}lq(t7lr!q;moH z1kTij%{r;%!SnTsuTW9fM0OR=MX8Kw^}PGHUR!l~f7c~twSOi%jx%qLW!(E_7Oynp zI#v&@HLEV)n73A0{+XpHo8OaX}P=dWBrkG@>W+HUu(KEB5wr%E+T)ZEnn^{j;3towq+UO!h!QQQ1c zQ1xKFV2^66*I$d&^RqgO_!BRL-AXIg$#XjPE9trJ`^zWZFK$0lx^2(w-Fe%eZ7a{V zlCt4m@Xg<0mbD#2TTzEdtY@fRq0E7@ms90_Rk$0aSw!2Jz9^f)D(r9l^UUKAlNiOR z5fy1pdA;H)XN?Q{%@frNl@=Ht+-GcAqd9N3e(RI`dT=Rk#K_KZB`J9WM~6W(N7JM< zt`o8bh8~An)Pxcmgl6j$Zk>9t*Wd|3%3Xyy`6t3s7J}l{lE{m*S{27O}4CC7TVdp z^^B{5|H16rCpIqp*y2Z6BBkALWs|l|-0&d+pe(8j| zgh1P2bA^CecTdF11syt`A<@q7X6aO>A=y76fC=IYHQOl%+9Dt7EiKrt9GLZ*k@M!9 zD@UCCcw5v<7wD>G7&y-gm0)b_U^uk&Ji{;UrEyA6?CX_I2?_1VHJNa+^X5OL7nMoe zTuzP+SI%u;wBjk(^(>d7WRZ1OXFPdl8MB&GZf(ZhHwOhT9!qiAVyG$j_SN$y8&9^0 zs#R;<1TS`*GH5B)Zf#o_88pjvRb${J#gnT|y9#u!8<@FAtqU~S<(FJC_t*<7UIwsR zr8bmGZ8%vQU;p30-S3=HfMD#5jI<`D&V2@rR^3bn=S&pyf@CT^*`BSjSkm2l>4Afe zh(pinMSQEAPGwBl$~rGW_r=w2NLV0`wluOUy5qxxZPur zbJ#j4)hFt*U}C@Gvh@W#bA+$%J2G|ehjU9CJ~L_DbUyWJ%ax*poqRe=KR4Vh3pjg# zbESe~`6IDLDUO{hAI!Ww=Lpk_%;TM&3p9V8F^QPODEouk*FfOz4)uJFC)o+Rj!)Wt z(f!d!Kh6i!T;}l{S|`fDz)=7HztWsy&6(#8Mn4M-ViE|B5T3oM@SMoRX@b3;dKw;c zwGYiQIPjgj;r(P?HaDldBu}H7bA4;xu;{j&IQ7bHMOE(!4K)Mqb4!xG6e=gR&nxha zOFXAELm^F2f%{p(*&x-#xl5(i$}{YVKFHf(z!7t_ojYRRyQCid$@_YKyRQwY-*|;9 z_c4Q*rND&U)4sINKJnm&bI0Ga8?Iz)xYS9V+?F!)P{X#eKY%zt&yO`Lt!6uIBwl71|i_3GlrqPxp}L~Pn4 z$N$)%NBr%Fjb8O)PHmbtdVUg#n?6-#1TU01dGj+TTY&k$+H3y%7rtF%V)wNzS#)+( z?$#)`@a_PXznHJM{i(am!3PU&v+dY4hz@ig~Qm zgp=yMKF=C_-ZAP{W}JBYXTp=hQ}){2_slcTc`>Y0xo2Ln*xuDV{nrt{+D&JptDCG+ z_Fnu`!pD-_*}On+4om5M&j5KV&R5FnjxMVopO@+5?@y*sR zg+=D7hD&zla~EIsvA^%?xqYTd$k&INY3FX4bU7Qvpk;rV=JG1X4%7bC-3pvE26%w&o^&%DmwU5 zW8m$b$@@aK`?-zN8eU?LY{d`|% z^WMySE4HW|>z!9k6nxq`@zmeW3DXVc3?C4ZQ=r@xT3YD}3pGi6z(_};pMHxhon=kv`xWHhm(MZqS~-uCzYNruj1 zI`{8}bG{7ylrOb*>!r2@YojL4UN=?xZ2c~c_xY3FGn{1n&wOdqkLM4a<^FMf3rZ`v zCYN;V;QXZ`#-&y#p6_X~7SsRNcXpO5mweIQCTag?(^pJ5>XzS7yNa#2%Om20r|yp} zwGtl=`pxJ1A+X$^x8}v1wMNZuJUyZ&LJ4aYPGnM^F8n%K{D6b_fdw09U5IwO+Ou`d z8Ie%q`l8551y{UwdtBrH{PC58F_UNS``^j+F!r+4?x zl=nKzfBe(xw2M~_J|ABBb7Dl@Rwe&giXK@UQrrhs^NqMnKZwjv;QA7H#AXiP^LL+5 z{1vS}xO{z*wadh-atB>*=^vezaM&?^2~X@FKF_#zV|)2}d&Q3tHt8m2TX&s%b(?=H z>;2@NAv zHp%FDfYm88zYQAECvVm#%y}bl_^Yw*Y1@Om`2np`M_<2KDb4wDA0sHTm(2CeK5W3# z_Wq~nt+OvL9WIkjY~NHF@S@%GcC2e=Y?wskNtqiOzu!+zS*{WrCREk4G4<%CsSWX8 zN`y-T>>Z=*RLT#n^L^*a#{BK{O(k}h@3k95RHwdtUbt-jGz)3pQl8@a%`*O$J2ezj zFVxot@IJU*w|i^lt?MqXkM^FM6rdgDbEnK)anf=#eWf2I+1u}5=&XOv?WOt9vV%z` zX`y;b?!3lF-z=Jx7dzYBQhs1#)-F_D_SWl^Nb@man@Q;BWXAx@{ul@pd<{ITX@4dcz= z%n7p(Ol8cSyKtY2yiNu9l{B;vFK6%`e?cXE+e%7rWu}fyZc>DJE z1)oLXTc@0x&lgm+p<#R5rm3m77u|gDF=T$8FH?LKBDX#Vwlv-b6Q?qQwH$5k2+ z&SqpksBJfQy~92$nFB2EMIt3^3S{2wmavrHkzTs&x2vxB^!k{%J>B>Ii6(9gbg^D= zPP2UHr`!*ZY+lrB?O7M{JM;vn^ClkEXAk)Iv(yQtd&w+V|LCLbh6gE=(7W1i`)}c&3_ID@ zgnR4lQ>uDdabVKwCyfQnTUUwx3bK1&{^I4z-yt6_Uym0Kntbfbd5ik!rZ0OnjFk_Z zU-Pm|SA8qT?#eyqimHE}zPg+HLXXA!&oW|4B1y%YGQ*008;dm=^3KVs+kY!saJ60E zTmcos6*GRi91oLyY{cs2TyszLnL}@rkF1k%!~qF8m+9#>7utBgh_1c6OzX!oZyss3 z*S=m}y%VP&xW51I*(&L4!B+}1>NO8UapZpf^~S@|kyB??RjUq%Y4SPtANMBymOr?l z@lcBQ5+!54x$TPUzbAywTq$G-kC|K8BHgCrrP~e)=dES8`Z2%Vvh+!+@ATcy z)7+af_*Tq{U!Sk%q?CM2JG!4kV)?xjJ8t-|$aYY_ZJDd6Y0w>Pef5nAzv=P~pO4lb zT;w`QL|rtkoagG}8|?`)5AFn~%*fl*DSt4{Tlin`giQ+<3crw&^zK~Ndm>3cMgPKO z&8DvZSG(OWt_|Gqb=NYs^*47d{C831v82L7)>hW3jkV2_LbulMu9Cd3dt;mO!^35# zc#nu0-cXt=`8#o*arkl0nQc0j4)4m=glBKt_o!Z#mH+0s$?Ys@sk2_2)=m?=e9$6x zlkQfv!j)pDCse7p`v*($-n^+b!6iZB$NRSZA@7-+R{9SAqZha;n;;&w3k4ZG2Y9eC^KG z)u$HCPm_K5#K7=n-t`^zla(Sf?y8-rh_^dy`~H~T`sS}~lHtzv^GyPJ&mSy3#C?C$ z;k{2%jZNPcM}1kle(g%OtEUdzX1x5p`ERpX%H22})vecO|7eqy4LEw|N5-zGTUwf-|?%b)Ir;>T8>r*uCM^G&$>t!y9*8y10UEp6R;pOJ2>)xKw3c z^XS@fU+$Nj#xu4&J|-;l+W3+Vx6$mR6jV)0ebOnvyfsMM47}^Bm>&D?REf)%tm^mb1w8 zc#(Mu3!ZpyYn)jh=-TJKk!p8fPUL)IO$g%Y2BroVM>`gdxE?vI6gBtt&T<(&1r zK3bUdzNzc-JKG)}(?8wnopbuBZQPFeb0@pp3N&Asd3s*u0iX5li;hgLzICPRO<}OL zZq+@vS#0;G*qkg`uQ>CHhVMM5`>Mgb2eYlFi6`B#hl-+w(PHrMdR&1c4* zcRtLXwBzAtuR9+!3jc#^wKK8zvzrYB{)N}PW~(>4<`SP${US`Bt=VzuhHz_UuGO+` zX5a3w-}%QxE$a5VFOkAe-%Ywx`~B|IC8F*8F@-;JwE5)sJo<1me2(ZG6)ls}t1|a? z&kI^z^ydGe>mP4?xwP=Pr^&TAj+a~t*|O7K_y&GdzRv90f8r-!S(xOS*x$R>8GSgr z_+DrK0lf(!b@fle>@M~Eb9}nk@TvRdsr@aV7QYU(+jPa=_eKPlbs4vG^pU#xIv;0j zc>MCvF{c|Jzj8>=K2*0i(NiXFa>%4T3cNX!ZQpGRRUuansr3G?6=u+tjN;@lTCg^L_o_VS`u4+&Z+H&utS?RP zk*qi4ZchER$4fkNmZuSiKWomxy}vX)WpgB!%Pdp3S$S}ILd?TM8ta4p2}!Fs>~2{2 zGT-#PxauY5stS?)C--VzjAxm%%G#3eW1(p7_UhG~y)8{1Djd_-y#0|P^=NVv+orcQ zc2z&E*ZORIy>N?E(}IVZp9AW3qnduWdkA}~?JIS*x>{~luJ*#@|NWYG607VjVsE~A zd-kNHf&GLu{gZ|9FN06Jdi&MRH%NU}@p|Qz#~!opPn)0f`Bjuy`A6&R>N+Rgor}EO z8W!1ud-!i+?`Iz}5U9IXztNqYOV2l0;>V8djSKd9zda>zS7yZ-`}&u$lb+RQU0U)l zNxFKD=a&1r@t>c*n^f%cBH(S~1DC>{m6xyEiZ==?+eXg(B=LkH`PB9Uzw$oZSp9EJ zy4VksL<7#~JzvBsH_m!*R-7B(b7nV46(8=5BeE}mc&e)m%QlVe<$PyI1Bond#U z-nsFmvPZzv3lIj6;mR5zBen4UeldKNnfN zAa&vemd0t73scKDg@2e|dG7bonPI|2g9kqQqzxZFw7tJ>l?%T`bI8#rii!F2*Dvjh zoZ`B#K78fWS+9S%EWWr`Mk)2s@ig^t(VZQ-*979^{Xb}J)Ny@rr{gkKbE$a+B zAMj0bP)Rw+o-r-aE-6FJfohg{*Ue>)Ix-T=y@ec#>)4%&NI}PD@+uoNl=0%a!lJDMxu< zhMw%2o%^c2&ekM)mtTE?={3v7(A#fMRLR_q`L%eBda`=a-DKwb?_*ldtdX8O^X9ZU zr!t;ttY}|j*B9qj7(F8>tL?Vu;K#mTXEfR zMb|2?DVMmm2B`*w-kad*!>OXO)w%HhK5Ogh*?Vs!a4Zp8zj5x~bLZa7oM~*B{&7Vm zpY-m&TXVnu&rfcjyY1hJ+9fOB+x)1A%n6ISU9%!!cfn#!-mr}&I^V*q$^t*lh<+lx z!?kYO4{i^qn>wqNEN|FPbolx9XiNOpdPD9Yp;=Qn|Myph?n-&=w@W5broDi7+M(9! z*BSqhINn<7vSgWxR{i_3xL8lNS)7fBjT;2YKIi&=elB9%Vq<$|Gxw5@H~TracBw`4 zUzq7U+d|q%`pW#Kh=+k!r1mozY}_~FMnbk?`k~JT)!!D^r8^vq`lQ3}yzR+cu@`#P zHs|X5{dS>lYm1X_x`5C!4&(DM{DqA_ z3tLncxqANRombw?T4_^xQsAln#yp+;&mUr5Y~^3a#&VUNe_PDw*{}Eml}*yj{7>^P zE6TjDD(?DrmEy%Shw3@@h2Pwkyi)GsJi{>Vt1X8D0wzDqst;D4dEQ|1@q6w)pLXt< zsmt=ylQHstaqJ{Ei==4+x=ZS=6gTbNm0uxr>_X(i;QYxaT-VKeaccDyjZEfg-=?Yj z>W$y$f^5ylcBUcZ4?yc{=el)W% z%8SJgAAOM}HxQuEld}l~a0r)>%~tZZ1By`}zKe+SLu4|4wYrooe@4VA~S6v#}4~ z?7Nnfvwdr4hE0(~u70EO%Oi75_9&;;ze(}gb9=_jw;lE@Qx{wj|00|j;q#RFtiQ-T zfh57H|GPfiJEbYZx@lUWt7tQOOUqyjjPtUV38nii1b!)^zEAi*B!A*u!C=dOyBqYr}8n7PtEUS*sMiW+`(N z1S25$kLT8?D3NeV;T-emir9`{|RfA1B_5zbSn^ z=jMT`%Ts&gT?1~#rOj5f+@o?bk4JaUU+=qV`zsB9^)=RSKF7Hz+o?+MrpW5&YcGh@ zoX~rArLVQ(JwX zi`+JAuAIs9c=n6Wk@cFpa)bPmtfHCyM6W&Fvg?i3>vNZODk?1wUd9rX9Ct=6u=~IZ zd2og5$~_cR{jO zdDrfIpA;qO_v`b+THjYkQ=PZXm-V#_m*$%#dV5W^%28)I z3%kjz{$GxTE?uHubC^xyNW?;eXO3az4-SjSi^RN;tiE7;kJ&c4bKXW-+hmucH~Qpy z-Ojejt#u6k(!*MH%&KZzy}RrAYhCl+I=*ZzMMAS?weApt?rEQCWE4Lj^+HP_DxVopB#{;%F;TKb!kJJ z%sF4y3-7|eGG*-Pov=ny<*<(LA_KX&`na;qH+TO_kVtW4W;C(5?l;TKi9wggfuXnd z%P-w;M_+zDZx+P;`oUydpTnDbZbiDijXb^LB(u~W{d>*AhAy_&qGrFVzi@1tdf1iO zcU#S_8@`cia(1lV6fui+Z=AivvhBT7kDfT%u_;1?uVaHmHuEOMKaOwj^LY~uzwvT)8}?MS94!kzY~=TT%5I@Um-|=${+W~7pkeXMa$JSZ0U-9p_*9>rYzF=l%qQ(J$uFH zLvhn=<5})4T35{Y%jk^LySm!to#Nu__totd>(cnpKBaz5+48=JC%tpU3MF!m7%x7i ze)$6wF9Z_M^NGWW@47WZpsvyL*TXXN&rxim?jC+EcCg6>^sZ!Et(Dd^v>Nf-0f zpNcLH$UPl?b-&^K%Qx<}9&C7Xt!c@gxHaylKYtCf?QyxttJ5Q)k~BAi)GB_#ZL8_p|0ECtbZRD^`M{CTy;nMgT*>bQ=fZYQn{$5_%Af8VB_}F z?U~PXh39VW+fJ%M=Bxr`Mtt?sR;c zu6x4ZZ1bNLSAQKnA>tbv*4civ{|k4^f<;VLi96>#IdeC2_LLbN$LFrdxLRMh|MCcN^KZSH=Ew9aN<^K*^qNsbKed*KDT z7n;J#_B>r{og0y6c>0m-t-7^-mp9I7-y6p9LxauYT50i&Ct(c2X;cOXsDEFYCsQ{e><}{|&{b ze!0|Mzu}&_q*dSJoVR_x)_Z%u|NC&d&xAhS{U6yV2_pN$Q zav0A$;q-CQ*{onC9tq3kvnF-T-u6PKnD3G2)(5QwrpqSl)EigliI5C3<1{voxb?U&E@o4d_r1-6{$7s+28tbf1$CF|Br$Cm79 zx_kM-%-X`+mnP_WZT42b)#Z@kXL0q}G{@P(3%%~SoQ+N{-J51Vb&s=Ye$ywld)yvV z_b8jb7kDarYWMl6r3?FR$5sgJ7Ix6OpYx3+=;4|kY0lQ5U5f%TH}o9N*|a03a&f>8 zlOs;8Q(CH&A98I_;0iy$&k}oZe^~v^r;KmDbJsndVz_=!OR)W3Db9N`%6l?x`i`f} zNjv@db78^8j!g+BeRl=#-I@CEtTpq;cjxYkMY=3WFRw1!o?dQ!;$77IDzo1Ls$Hx* zLUOwSsD06t!l*2C zvHpST=?@Zny6mORj|O;!9}SzHV$y%PLa0)^&D*(aVqwpLbPtvl#(&-hK9?(f7x;X- z+g$Fz_gZU=|8)O+e8ERLKQYcPt<(UnIL&YPAV|2QPJkB4jz`7R@?UN@Qn$5mWw!795UoGUZ{0#({z8M5M@^NBYzs_KiIlH za#e$*^}f9e57(@!cfN7$*QKkA7xe`^exm5Fb^c_<v+wnG?XdknPc!kFviz%6J#IcXj%n_FSGIG@R_`6&i%;n-7EAgiwKXJr^|mcS z6_alLSg_?`^HkLfK3AsoORwAc)OuU`%>P^Ts_z8c&YG=rXx);(Z5_YN>zhxd#>5!g zhJR=4%NDRa7(MaoKa=?U39=DOUrj9vU1h#1Zk5~0f4eI9yC&Uf{`G_5g2rm?UfCrl zCTbnuyyh{>+uFxhVO!tRhbYPKC*DQo+d?wbGl)%nj=AC~X) z-F}~Kg91x;&=#pLE#kf6TYsHgz1((3Svps{ee);d`S}Y(uB1LQKNw-Y_vTZBrO$rO zG8O(&qxQ{oft&O?xjRQEPQQ96?cA-yA8&7Xv?4Kh*~dqf=FWzte@(UATw(;M*+?$%3lmB+)eL8WL-99%rpr+C1L#nQR z8k1A6)!RiHoO8F&75jWr>%=03ueV(SxmUBQ<-KF`JalQc`CNsN=!qVORZso#w_Q@S z$a_l5x*%7T-5i@OPCWY;Bzbevi38ILR_0`Ic4wvEnD@Cp-8(`@-hAUf@W|YoIlf%Y z1_G`5Dl<>o?{(D=_>??NZ_ocl*V?=ews@{!Jvfz{owHy3^Pw7_YU|7H)8{<2JC(L^ z)~=cFe=UmG|0?yF;(n8@RtHocpE=Q(`QU7k=mFJ86LH=ct4rm=H!Ea&OGKiI-yiLG z8}u&PUu>`_{d76HPitkDp{SC#*~x3C4+}Fe{QqAPb(^cnL7=|&{`!cj@|mUK zn^lz-Dk<3~<;OW0`^f+Lz3j`;L*Hjw7Rrh(yE~*cdHJv3dEl<^q-iAkAqX!um zm*u2P+V=DNT*=Rp3C*j`rn6W+PPhJ?R>9W1QmwYeddZJ)UG$LZ~r*c>O4DCv>-}**4yWH^>>W~_pey&W+SR}&->7- zOA4_XD=$S?-rnk|r=$JJ-2IlD^QGJSU++70|7PLMp5l2no=eZYnV@<;!SnXHY5Ssg zzqTl3EuZZBV9lku+aEP&;*T40`lIso& z+-j6uDBoh^DXTwEV}8~eZN{M6i5V4lie$DOSkG|%+Uux^RhF`fTwL2KR+rxqb+>L@ z?96v&fpVx^?fi|_dye1j>L{D}N>uCP>g?SMk`A~XIK8Q6K|o@@)r_^Ae_bV0dg=-- z*S>HtJA0+9erj6Y?WfMU&z(Dd3Z&dSw1)fjzVkP#Z`EG>rzxUq%J7kwZ$tfqlQ~MS zOE@0ia;)Z0{I;v+z2tP8Cm;Eo7=FCho!%(Ed$mbVaJmxz?*-u;H`hCCy7yIQ%GVE1 z*G!ld*z)?P(x$!(R!-R*nL?|#=$>=d`@&bI5~F|SCbQlWo9G|)$M0u4HfR6tNSau8 zhPm#NeMaG*#NRKIzr6b>Si*HRWoBsMC8-HvIev?Zb}$B6J-xkY*#qT?UXOoz1aGxl z!_zJrpUS=I!#>{IUwTXCoxCx3qy5IuY}v*~xMc*&jxeo@JaG8`8Kz(%iJ}7&n9Nfe z6dA4V{mNd>zi7d<>we#zi>m4${4ZX<{rAyl7iR8~QYp(0dVaEK*XxUS4t(7uZ(eBo zHD}lB!z=V%8mL3cNH$J zvX|Rm{^!;WPY>6v%eS06B6t2=-|>Go#&yrk+S!!NXUZ;;-aF%kTYZ7k-4l0s-JfMz z8u?$IIQK$X%DiLBpSQ}*T>taLjK2$3T~J@uU{iFjBDOG>e^ZTPD!S?R5J9C$DufIF##l_6kDl0lS zUs?FU{dua$Z};Qg^P)HF1%@gs_VaMA^md!sH05aI?R7UY9bVMEUcS3ym#5W>-)(+} z53ccOZ`kENeQ{?EXQIi(?OR@zGF{wVJ*BdeVP|mA%>644`RQ{UDw9&Xx9HTFODL{7r^SD!bh2UhoW3}Q>4!tMzmD0r%%?shafiE53W z^djWUzZmZ_&L$TRrvpi)=I&8_*ILB7`AmINUl=yoq*n>Y&NP1a>dl;(FZ|49pW{>J z`EFYyaC`F;ch800oc#Xv`%F7JQ$Lye6>EIvcy~^^^6uxK3$`cCT^cmAL_@+zAo^?++i!ebQI>#H@e9Rc}|HM4N=& z*P7hdvHqI8?oxLYcUE*j_QCo^tWVO-`VGRpgoUnkz7KG_B)86OZtc|tvd^dZy zA1}W^@6(7w(-l20x4Bn^1ip4ym!fMU7X9&Hj$?gBMakZ4Y~eqpFO{%Xlu9kZ!KP+k{WoZCU8UQ;C})AF z%i0w?Cnc=D=(00{`}JH|?n9p(dL_2koSYD3@2qli(tXP;0fROA+mCH2RS5Lw_`24~ zR`JUADN@_Ed1i~8SSx!=>eSlUTT&<2+TM~1xAo9|l-^qZXU&ZHeDA-0V|?H?d0L#7 zzfN7r!@X6%zdn1+p*uIc_KRj%@F)2U(={t?u20ytV0zW+JEDOJs;`6ir{3V*-kk6- zPa}Z&rxL@biAEjCDHA4J7G;FpEDyT==ef=8gyf>X>3>t_^@Nvy4zrxm(*4oo$hMY) zQdwa;6kCrPJ=cibwY7ey^BE6?*Uq9EQ{^2$|BL(oXjMzRYP>B^%YBc{MHAU{tp6-` z$gC{W`t-Z#l>UvIoyGb-GgtiCSbgwGO|Q@Yr(0&Y&oBNXc=*ugYjYQU`n}3n%JeMX>F)gwZ>H3A=0!2Y%0Z2l9G<8FU4% z%ya8`C5_hj{dN-+H<_^gr}MJA`I-lwmU;v|n0>-~Vz@-*SJfvAzX%zIr_NY?b4GU0 z&VRvYN+q9FofJ%aIpe?1wly=RC(rA?skwX2$3L4t%IIBc`z~qmxxw^|SU$t;V|JDG z%!haKKC3ZH-`;v~!PnJR!QUTuShRjV`S@?ytDvCoH`7B7eevA0Y~}MP{+hoxGZdL+^Of@|p2(dXy$J#w98EE>E3ibxLQi=DF{A2kojq zIz@dlon(FBWTceL(-beEZEFr}iQL9ES#RCtTTAQxn|#hDJkedm^5&GG-q|UEj-r|q zUhGfxyv@_Xy}nb7bxvI5=}BcOsZBel-8`N%&1U^Kzq3NuWpCYM@JZHwt9zkY&OqVo z8||RLuje%Nf+kK{qBPm^z|CK~mi=CEyV+-l>ziv!)>q7561%Bjo4d`v3!5K-Tc1s0 zdLCDmUj2MmuQ5~BePv6S(xEWp$OTugi5a{O>}BkKu+W<6rQX(r6VocTpP3_bK_I#! z&6BMrL*iE4LBsX2b2_8>PBJZ7@{lX?Q_GcWiUvNZ-e(L%D;~}2XpGao5@^=Lrn9Z+ ze#ag)9dLTs5_^`fS%If+>RYu)n-Z(^J?||$PL|C$x#vy&-^nNY0~Y>qSr(q%a_Q3g z_|<>rUY#1Uow-Oi{k6bD@oYs+H!&~G$OOg{r@pDi9M3rSUR3eRc2Tdai&0`CLI*Z% zXIp67qmVW=|LUizGyZ|!e)qhO6n&jKHRQ{_+U!?BcBV~O>X*rxw0KiXQy(QWcK#N*>XJCils_iyxV&8&I(DWdr4+z4+~ zCRs%$+57_?Us_zwKTKnZa$4}Ty!bxb&67Nb_!w;0{)yL4SQaXbN%e3oF7Xj zRvmkLmZj7@sX(M_i{bOb2PR9M5j>$G%$?Y>oWX6uV(XU11w0>87^chY)pMvm(YA?w z#ck^(jfLMJBlCx@wH)KAOFne4|CY!?r^l0b$oQ?TVEz`p;h7&~u>MJ`Z+^1@kL~;T zf|*;wx+3frdm3z_vivkN86QPclOPHpFR36(|&G(LhDmj z?`h(Jj4glKZ|eD{Y*12a_U+)ArfQ@nscObJWrE759jskREjMznvF$rKeU9~Jn>-t3 zUryyi#!6li59bNaOJ?a4;yp8k_l!y2UVHB4oU%?fhhItGVfG${|d&z`Gy)m#Ry{g;HArZ`?Y6ehMLs&(~SnD{J)eRHaQxUsJ++m~|bx}EF4V=2~~vabdx zop#d`G%IR;s@~ogaffODnRDE+cQg$Q<{BR;o_2h3QAWM(j|hwg1&06*wobXik{)_IE-26bY7T z2a+~&CzXFJe!IwI)=R@PPEWVGUFM68KHagyuU>o7_Rx)MKAzco%y*Y-eZwQM;F|^J zALeg!2mupsx6ADI$J|i`=dBcg)RKES6gG%lv?hSlTJO=D&8%YyDSCwTIUeYe+JNCAdDYvD_++p$QJ&IQAjWdEKy`-@ZVd279OF4K-( zo^(#(qTuscP0OcphR7v`P1=5&spnPwPsT?NEQ9agepGh4cG<&n!7pr3GKNePo~NIr(_Fd`+wMef{+r7XAqthPlL*Ofmf3{$T@zjE(nV(QP&&377}C8pkC;P&-5GoH~dv`VMq?=kk& zZ#%T=_Mer$Br#e4PR80$ox=7|)7T^8^L4*oIKASj(|V^ZS$unrDNJNryKicnmdbMd zwa)}5>=ThrzIOZjlde5;<7OA9{yTpy_Lo?vkXz)bWiRR{|GubY^Y&)vswGF31&H=e zdG>A3;igzwVgD$nMN>HE{1r0&evE55vv!r*@eG$se-F-h^zMj=|8uo6*}scQ+!_!S?r#adX)XD|L;S4!ro@TU9jZhjq7~VX64j>xu+2hsq3zX;b$CPZTC~UpD!}rJR-Ad<_y%L+Ww9=>NdtER1cr|Fs zCK>jJp)V_rKZ%k4pL0)^;q3QXYr~0851!lZbM7if25&|6P2PF#sXEJyBnm`z)-Cuy zUGL7Ny^}VxKbn`Dl+7Y+%vV*gn%gSTc+0&Y_Ney;QFrbNhB=l$Njxw0P^F&J_k3%Z z(I*{amyOJO1(d~)ZcE>__{WE*e}9#2lxZ$MX3tYl$N#VF_w6$g`eK`}-ml-wz09~- z;Lpzwz8j7uGaR`6R3wJQ`vJpc+1u}KeEGR|f%9eav(9a1o)HEmZw)IXk3ZnMKQXk; zQRt3udORcR!qo5G*VfCY`rbUh|B}Um@AcJ2M{e~r6mnnV-f+lRX6;SUK11(L1%@;(;*6kT%p1^3FCI^yLDvkk6uCEYHH zG5^R^|K!L8v&Sc#rx|}@mbqodlXU%~LF?_SF@oX;#m}%<--%NfuDJcRMqBAUU*`eq zbyHpXW?Rf^IKsMCS9{S4_v=l(lDEukzG|=-<{L-qy}R!6E&Rcg8tt>>jf(zar4wAyw{(}b z?J1DVIrXJtBTKl~sa*`dm#d@NMQZPKY)iKFp1S$w*Ea$)H_9KoU|`U*Ch*OVjkh`T zqSRKkTIiZD`22Qu$-a~NF27mB?{~ekotYwR*_pThgvUeP1y4my3RfDo28%z~DXhg| z_2AW1zBxIs8IJ4eHP|hV%Hjh1a(*MXH})z{FF$lI}BLO%Z5S3LXs!sXMdmV7V295}1^!h%Jg z*%EWPQjFJi*VX71Rj<{*U5Z_{X?oeM&(XVIsQr4i?vN7qsk%6)qi0>kgw22NG>P2R zt>yiF!RbqLr+V&MY*xKRuH%-MDnG$?b2~OMd2wwR(bIy#3z& z3*@FGcRp2!NPl5C`F5tvmijM~?Cgy7Uy528%H%BmUYM|p z^P7+1>w1mb2}YTgg=>RZR$llpwXC+x??ufHrsH3xOfGpafpt$~a^}=n|G2olb>=@k zOiHWlJqtGMi+^-g)Aq-lJ-lJBJ9n@>t`R)KY{tW|PnPfJtaTGki{;L}ck}8|(@dKs zbQ~1Zjh+qjdyGymc&nUMzw?dJsTw!a2P+q|ai}$VrpR%)C9%L4Pdafb@v+F$!#ak~P58er_wube_e$JQ=V_5gaQSADNjk;h6PZ)$y(|w+El>S% zOKHxjkhH&7?lbc}$xJNNZ%vT7`h3L$nG((CIycT(z9>59DLg@ahW3n~0f}kzG^X=^ zSa|46J6oDvLE5vI8oX!rXc}(*wQjbMasHGudmf(A*}wddz2S#9i<)fA4u3n8G9{u; zqRL{Mlf*7Z5f(E(CvH`Z4@&CW7T>7f^!s>PMe>Ut-|Xm|V_fUYxy~xQ?ftX6bn^eb zra{dUvyRWd+IJ;kOV&jxrJ&|}QHTFmd_8?_1Fzc}_ZMtD?(5`tJ=ECJr0~f{#6_cV zTI*Shw!A4v5;L6HAG`D3)i`9z!|XOu(m~ky%Zi24Z(?Ttc_*_gkbB|_!JKHg|ls*ZSGX9OVLKNUhn&r8el)`?Cv|4Pkv~Bk!#-G@{ecr+#i=z%w^jg z=UaYyc%rIG^O@}%{r$G7=JjtcpLEo>KeqYX#_sdZ`SpCWRkyrdaqZ+Gp9e2rbhZ{> zjEn9ME(Zmz^<@Nl^>$JD#$?0tIKdz&sU+jYODXvs{J{dMK2QqC9OL(7tc zl_X{fI`N%7^6|roZ%W5`-};#)UOualb1JN{_V?uY{+$wh)wf&szWRDF?rZ(ed0*Fc z-BG;xg!OeM%d*dsUvoAjpO!D)?QQ4bKcSxMuUP1>-cuU)thAp?2?445d;c3B}Ims6C_3FNp&)C0KGF!KKS8%h|Hd#?NsipHj_$>=Mpn322 zULJL?*2g(ZtG5STuMc{E*($w8SA#eE=Gs}jEpIn7%;uW7WSIt&7R#F}o5Rn^NAJ_O zn_<80+iI`wmObK+ZaltWJxgrk`Mu2D4l(LFL4Bi<|Jr|b(O27Oj(R~(@k0%3SQXn( z_8`}D>9McQD6Lifh5bD z?OIoPOJaKi|2u#97?$(n;#c#J{1tz>dVVgpoWK6?O|6~5J2LIf-u~YG_Bq@B9pS0d zOK!zqW_s(gO!$k{a{ft0IW_-wRB)yAnT2{!eR3mf=fj8V9dvSc_$-y3uxCYIdVreQ zZ2?t#-}6Ok_2Rp(^zQncZZrAvs$ZIs7aXNR)*rmu`XO(A@Ym8pd0nq9)0K?1bmc?t z>t8WBv}iEoUA05!Nr&5%qjsH=svPx>{696ilHM3U`x4`F z^2)>K8LQzt zeGMrJcS&9T?92nm;Ea+^&J}Z>h=lkR32CXT@lLcT=FRL?6{c3BH(geU z36@;^Sqw6Ov?um<)?ovlzoNEzOTBNcGjNjQ)@?Ondu?~XbIQ?xIg0AiiT3sr_TuAPXU|rZ`6}N}9_Cq|KAB5>LUqic8oR<2CmSwK z9~nER`p{SGp;b@rDD00=`x{kwZ_|#ivTdr0hl*p(m1c9P3MEI(zT=&%oxAsA zO>J<@;bMi!bq8O4WEIP1AP1A<<>5-Uo*v5{3h(C$j(j|(D& zzIl@O(qqevPDm+Q?l~r!Tm7Ku8q4{$7Zg^?+HAe)_uQ{$aj}V*G*MODHcma>x6xTft#SXq zUD5ofx1~%Hn6Y|S@~SkponK$&d9Ixnwco2QF34oA1x{`EB(yeSueM3HQx$;eQw@!oUd4-bU*$P zta5OjBX{^fo6X+&ztsP(mVR?W|L^L}k579)7mu*1I#>Dr(W?J1e=RA0I43@S&i}f~ znDRN^$5f76=KIEk%g8$|Eax;ZODV1wS~`i}T;a3GEXme$H~yb;_{KQ9##NthVcdGn zYZ?N$z0zY1;U`(IxC_wUi9K>4HmUsKF(^;ZPG{OA6z=8oyy zt25hVI{1H{eiza6=<{XeRZ9ZdLuVDvSKB%3#OB)%HSSjXv8-mzdYoXisMadO-gLgT z<%P$l9^(H(&Ye6}c|AD)Em?_!+43t!lHV!q$Sk76q2!B-wT@%i1afAS?h(x82t z=cO}0e|>!4cRc#UQ#G}zGk@Kh%6qDVMZSVH?(R!|OVbZaU)Rjv+1My@_d&HmLptXQ zV=gT(p@|zq+i!N5AHQ7O`0qF0nM|F@>mmvgxn?z5GH+Gi?0!?{#QV=oxA&~hTex}U zwdjn6*%^xG??3#x_tl?yruEaGzYlv}Z(gWz*}l}~hjP5;tH=F2kDvGN_qU%r?{e_V zn?F^ST;cis_R!~-*OVU!O?&;kNVk5D^P!LXEsinl=HER1+FBFl;=j+_`2{K`E-#y3 z`{hAfhWzO*ZS6b)zZU(Oz?kGPMc&9kfaU9i#)nhxJzW0f{3fmw{?*g>Te6>i81SE= zHblOs{?BFOPx8@aA3Y1jpRG9mPp9qX1O1|y3;lC89gxY; z`J`(4!@jxOx0c9Uy|?pK&Lm_1!|wa`zMVhE{O;{&zE?jq>yzxZi@&%a(tl%vli{fk zJB+ms6norYbc(+4!7im%X1>$hmx26GUy4moEj$4Ag!q6p4J`YkzEf z;KmQ81u9OSdncb-ysuz~z%0YfX3qcL^*%`SZp{|@S;h9^iKgDuglR{j#8)yuJ!Ik# z$+XHr`@y!|B1a{SDyrVrZz{@)_xFs<$(|JQk>Zym* zC7w)V@45KoQC8~|hL9qIg{x%QW{5hfUdZlYH7jPVn#MGHCzEaCpQc^RVr^Gsn>c=5 zx)iiBZBbtKN?k93m9zeBojR@2WAQA{p8->MDC8#=6eb?puxEX3#rpLNtljDjintf{ zojli=x^LovvuEz?l6tcA@~TzOR8K8j^^xnUN8xre0rN#A4|QJai%yl)YHQoGTclj| zUQLuPV|uQ^+N{aTUN~NKaldVEI^)ZtvoZI*CA^<120BHqlH*x_r?}h2SmqXlSW0G%hxiSJ=!I1?*9XVl{g`JR^hJG| z?|M6n`X6jJtSnw^zLs*6cb>+rGZ$|i6TBhb@#O5sB}JT$(|n!F_*h@7|Lp(u;8DQt zlW*+WLsf;AFzkHtPIQ5xyx|EawE*AC2Nx)G?Rgf#COr8-`m^(sp1#Z7-1IbbPi>S7 z+q14KOy$aT=6yd~@4vLJ)PJ&K!hVf)*X=|u&d5|ronJDoUbx9B&Y?!)OuF5D_XA5N z)_jzo%g9}Gr!(bQ?esO(B`g*dwE^FF(~Vk%BM&CFCapWRx^hX@9E0h9!nJq3n%t(o z_tv5rcjdP5S0n_~`^8;R>6>79j?pKnny+ICqgH>pa;!(8;>owqo?pEq>b7tNi@AH4 z#r~F=y+wuBjoj~Q1l3PJC3EG|tCb$R+=S+sa77!wZF;`$XVdZ&CXMzVOt%`=ZE@4S zpIB0UC;gJBzR${#uUb?0C3TrE(};{W5P!xR{O-ee;!+zcOys@2?0HO2ExqBx_L}pyyxV@C4ApGusSthst z{GPX;{GT0C7I`Lfp{F9qk*r(of+_lO6YOL5?*0`IG zAEwpY`CXltZ&p}T_$0!>P_172`eAOdhu_bJ{_Q`@`=|f^=Sdr9@ZX9lNU=S+Vr@v{ z&f4?O_r{u)b)EQ-omyVrCGjfs=JtoXwfwJ!`G-}$GoSG3!JbLs%b#rBbT#^(K#KkGeov^bor_`~x#{KvAttM-&EwDoI_ zpLvPtR`=J`f*0%^i{EZ*VtmbK*fxiEckj06ZOsB=>kfwcw}@*69#3kNT9E{pKdj4Vxu*TXMPZ1(h51w;G>LD>|-U z@=S158l&6e-YGE#heXy#tP^^DGqJg`{zk?&X=ZzwvZ%9eFE;wUUQl|W%(`y7bk(}+ zZ+9HN-t+a$BkM#Ld9x;$P8)7U%1x@1{7fQtsUqpU=1S{bvWy)y+N2 zd&q#NH9V0)&-3yHzr$>nDgT*!?@s&IlzTM7LssF*()-S4E?;*W#>v+67iuVKTo+*H zyZ2Ewd?SC@uX@Wojr4$G=4G8<4r&N3|1$ST;`eHApYGO)&!rjf=PI?=FB0+j!0&Wg zd1=(N)1_U37R|e5qxcmq__{6!i1|7dbeZi;PR*OUJ@mN#rxjCe`ix&bv8()aq5p=? z&KomJyd&@ErKatl@>P17&WjnFqE4Im=@%9H+~o={o1^wecV`Ef(xeaSzwTf|M6PVJb`Q*q0^|Gkrd=(~R(zV1K57`1p(O8!B!&WCDhcbD{= zbN)~(J)o=d%2e+P`yLzHm=pDOg?x%HUu<~br`{)hq4V+c)k5`*kYGKXx5j{{E&i#_ z?o~UUF!dX+y|q--b!x@m!$&UoMW;=-oS?s{Iw7cfY;*9;@-`&>!{oN$~-1AM>PrEPO6W`BbQfntO@k@PD`>I9j z*%+Jl-I1|<^r!iL-5VdXoX8VrxfQqVI{2;Ekt6!5!S3fx`)0@9>d=YZzgDBgdOhpU zX`3^ZkGc}v{XYVtf9Up_9 zuKW6s`Ss^=nF`(A%=cDD6}(Tbj4fMeX*|w*9M;K#WnujrjO7y3-*Vh8oOXHp z+s-2^?T)A!98)tmq4rl}HcO&e=JA_-iw*DhE-zYNR%%c^>EIjBYv<>sIDS)Eo$ena z@zdY@;h(*;Zy#o@HrHQsZ1+6({&&5OTMO#r{~WB|F6|X}hJP;SO&zz{j@u&T^TaNM z*436J*L(I8_|AV7$pQ^wYk!?csVMt&_D|qr#R%@G^p8jjMxn{pLv*&X^jXVF+ zQUBFM^VDpuB-`)TLR>Pum~?g>Tao#1mh2?H>AKn9&rGYG7gwy7cH3`B;=Kz#J7V|E zdofpV-qpUd&!_GVN#;?j{bc`X(uK)d^E6kVx%iG*f3AkH0pFVm>yy7dh`dw7_p?~r zS-hvD-uSKHxsryWWx*zzZ?F3WJ12hi+5Obm_R{$i!8;Fs%{}K}KRLwVvL37NE3K*D zGFEg}F6deoYc%WK%Zw*~YjSdCWq90ibxx4xefj<3gas4b^j}-wZm;Q0|G7W!sQcP$ z%G2L}_;Gr5w*K26MmF~R`uX{9pZ>M2dSPwzADqgY>SudgQM4(zIw3ZALhkGbi`TxW zUMHFoXty-2;r*25e;RaODDa5(-E`_{4XC>zmKXlew&*m|rf;*n-18KRSk@(PUvO^8 zuZPhc3zqy8jN#CqP$wY%#R?-!6@-o;e;CzQn=apLk%~ug7|c8>WkKs58wy9O+%RGLScKm%!@NrYFoJ zgsxVx_X`-Ld!INo{rM&TXEip<8EpB6(VQ|BR{E z&R4$Z67G{&?IC}#>x;nJ6aDqF>yB)mB=`5^A<>so>reE{Z8*~WC6_5IFo_YdqvWt|9x;$Lk_*S(~`u4P^=b77=M2fM@mHDzxddZH${6DPetnta}O&yja-GeX`6Bzhlmxu6=G&i&vb6WbE;;005HeoT(@dF`Gt{YcPa z-Cm&=7EiqR8joaEefv{WR%teOqkqmcHHWng^?agS_haUr)w>$DJve*|^PK1xNg8T~ zcP{;%k+oHF^Y72$lOLXPS$*(8Qc-lw8?DWgukaLDmCk!}P55kyUh)p{jR$-;zK#|< zH%UVMN+$27FKoBZ@0wGXwfTfW()t;n80;KYEK71$_1CI6I^jX&V>YF$T;Tz}m)ovv zIVIWe6|B`+e^w*Wcb-((JT4}+?8Ao?uUJ<~)K*n|I-a$+Mm#>hD4|9Bl*rr{yU%rPvv{zu)znX3S?gb3u3wU=d~WyYn{yiZx!YDx{Qjv~>bRVDk#djW`O-7j zCVe&H55KtEq-VOk*yoJDH*3~ttWfwPx+d@9^0%UnjAz!(k&3R@-CS=G96gzr`Qlwh z`Nlh|i=G<(>~i4DxweM0aK(JyW`!f-Goq9;c&ESqpmw%cf;D@M8>i=CmJpVWn@%mc zZX&Sw*%Dr(RXrPnTxJ&u=7tMz)M@5~58Oy)#>GCKw(Us26>`XxAZzJ8FR&m9m->q#mxyI`2Mp`ioCheABOIPns?> zVf(qzJF~BZOutpG*xA<+pY!#dMomQCt>!y>wjZzht5)VSE!gtO&8cD9XPMqTNM5z= z$i}HQ7r5pN%vPOaXsH;Xv24Y%>fR3}bMI{4e)I6}>fdf{^$s2T)WRW1-2)fR672$q)!t)dpuHPhsq&Yhw802*G*Ggd+1sG zs~exZ=f3B8uywVAKwq14&pex(MyD4CxA^WfuRr+k(g{u#>p7p)*}B&$`OW>M=zsC` z$v1y~K6xW~Va~cmUrWzDuy^?SMQv|vPSI=ehL^T_3JqqGZxyDwxz&{>|KSpOdpSM- zQ1|{LRgDD!9i8gexUU}T>DOl1bS!^{E2z?O!rmA&?s8pW7j)bf0 zK4&b}>Mwh#_g3{zrfS!drU(8@!p$=xx@*giUc2aUz|^~0h&RJEKsemewEEJ=I*sFx zmD+4y3hpu0DG6!({^9a>Z7od~)eTpkva{{_YI;uZ?xebs)q?d$%iAKWcXaZr-P&7v zn@N9;+KkjkSIVuK*Z=*yn&XVNfP~fj*5|?|E$$P2S(`;Kr)*fVB33qTcH6<4N`oC? z`Fm=EK2@1E9%+|HfRs!AAfU9;9AMl*E3?nXU{yH_9dd_K))Qv;u)Wp{QUIw=u^v@%I1AFj`jQ| z;>~ZHo^pNDV>_y+-JjC@Ma^HDIVw?P&+KP$a<-TL?&xXks$G=mX;jv_rb6Kifk+0^lBY%&nh3T{mO5)HPi$}FMai-sG;;w+w|i{{gw*0B_#X|-QxHB zVbV?x^OtY4cJ}2RI(yaX?D}cu#cEH!p1RUluP-`NT!S;^S?}euv9t7?yqu=5GIQ(9 zi-pwBcVYwcZ<`6!ecOM*fF*l^g@EVHN!Lpqrk7A{u3)(f=Pck^zrILowOw`slZyHmH;^-kKRR~Oq=di#c*&QxQ`DZ9K1oLZ)wjuxC% zC9*hU{fBp7(>8}z2>Ks*e>f*nJ~Ls?ZHe|nzI7WP%UbWAedM4)ctn)BsoA4W+es4+ zHaktKT`2$lM~-m4-qyOOI@XE1N)ql}dGp++@?MH{d;Zs(R(JC9FYA9|v%2&6p?tHh z*4(Reu0MFr8?C|1vy7u{22&Ud^GkvU$E&eFMa6 z&F(3Ptp0s)w(qaQe5<|w1W2!TK6^4yIL~Yy&mZ-0xd$iKhQ!To&aRisJD)l0L8WD* z75AFMl8%2{XB@L?IagH}vnf$!x&`OUNo{tq-~3)}veTJf+5F5%ze4Zk|A{Xq@h0s` zxfU{g&B0R7X{S?WR!r_#?w0t*_*Uvn+S^auX>eO97zqjjVKXXr=S*c+#mlRqv> zAAVN$>)lrwzQ~TZSM}OWdoDUQO*|f7UamLIPWh{k%03a*qVOdfeZ-cmeDo;8edEFs zuP&y{De24~p0Mk!Gk;;WsL1xP;m?0^S$&rx(kHHwZ+1yyU`l&3!|`W=n9OCdGQZgR z>023h)+MOKFBI%DGsu}#UFLdgcT~6pbN@2Nw^ts#>^Ud$x;1f=gZI9MG~KzME`6D> z+#tMn(cxgJB`+#eU5~5mzP|9L@{McL79?ww^CmtGnE3Sat!sw0=>e2uWpjAb>Swa+U5a}YQ@>%x+HhLSUz_?NzyQ2z65W^MuhRPHnF z7c)Mks4sfS_`~n{=4&j1RXRcnI@$a{h+}?`nOsAj~ zd`mSxYJ2~T+H@glf80vvZ0W<#)-AcvE*Q=7X`%6D1p0N9} zW#ya2(`??p-gEC-Xm)b=wY8x^wolKc$rN5#XTji>Q|gtmZe73E3 z{bg__YWDWxmtj1DOlk|XPwe3I?rjU%-nl{I^8JbP802TVh>5?qJEvd&RBxr{{+9Bs zhUso5r@yS27C7A?Jov5`|AqjmUH!i`*ekS;oYG7@q^hB#o~>cvYWLxYs4}s)6}huH~(}=k7gGE`22Ec*2YCmH*No zP0@Sga+0fSUyYrthzQ$SrpE_0 zvB&hg+NT*BnKB>lDqXUBvFp*_QZ5s3eUn@lS^e+)k5t2x-BxN*P0#QA<5s-PIdih) zqk1is1lHOG%;{U@1I49&yG&uyIrDV4!R?0z*F1lerW`2ZXYKc0vY6%51?4XDX<}Dx zWf%8sy%f&%{`>-lp8dK0?nf7>dZd~D`QB4sR%V{~N`SXw<*t9_4}NX9`QpAo)c>?s zCl4`Mev8p)_UWIgrSoF%Kf&G;UTcnLlnAW%zA*n!ea3#xYv(jpd=S%ae|=2+?3AtR z#oeBI+&(EesV-1CYQ{;)Z&9l+->4K|a$~>k^hq=845#t!McaSv-6^7G$M%Hr()8nw zp`LG-&(oUrw}N|r(V6N6tM0E`x%`{oJ zHS3i{yj!2>+iu;|Q!jqyX3BJdl!vwJ%m4d++V*sUL7)2SOs8<$(~8IJwhDEGuWS%` z|69EOrN;`9Rr^EUPPq2{m23UB)aDxY=^W8gn-z1iJ*CbjUFTQd9BS`vW_{(%39Ym# zV!L+yDf#tsbJ*RTb3UK1nEXEM|KydsJ|5ZXakyvtw@qts#jaH{pY2! z-<4+HwD--c&)Ay%i=*u?cwpoWfoD>~#6@-Tl9f^5_08Rd{n}t;JJU8U16`J@FRv ze<=KZc{tp-Jlgg`c$sv$dA#ej=K71q>b%=NJA5ykqp_q%WQB(kXKj!0yyX(R)0%Jd z?&_~<|K9NA3d5Z)Y5$s+c6RT%9yVONqy2BonvdJ2POm;>miu~df&2VzzS{q|+&;LN zHYa!9eR-3+d-dmpZTCv~*4bH}bSsU>su%ctr}oI){RiC-om(!c=+4NinRt5o_UyRH z^>5_0*K*3ecv_q5>Fai0C;FbBrth=`a{f}So-)Ex9Z%<`3;GIbURFJQ+j8Mav1Zl1gJ_>7$B#+_5yjg0sdqbF^Suw5UorB*(b z?`H9q1@9KUnWyJba>8EjqtUr9hJI^zx-cGyVlt|aF8(>+#Krc%2E#wWS%*%pS@&?o z2{BjAD}oavpB!`j8q8O?|B2Y#=7aB^Oke*#q3&kxTnW)79FsSEsGXK1m2Sv+a?#r0 zEl;;(b6IlV=0DLmb^Y6fjNq%Y7d_0Mr7FF$yMECRADx^1@pcQ%&rfXi)bly+Dz;kp z{hVHZZ@p=m6I<(-ORQ}!KgZ_H7Pjig_MbC^PuSJ{)=Bo8yzN2J{e8)6ElQWFzLD9T zta_C3Y|y?v@^8iE%>U_H3D{h?n{`L3)b!Z?cQYrm-L71~U+F&QLQqYn>WS}$Q{S9x znyh;4|3b&_f!CGSZQ_1^^nK|``$I4O&3nH(_v@E)N#FixNiTfRyk~m7+zng(HO=48 zEUuQ=P~9W{V-EkXHlx)ulX(;}Jnn8>w8Cknqv)imp}YTlFZ;gdbJjWOYo{Kqvps!U zzNbw6<4*PE+_yKc3fUSTvy1&bBkQi*Jic;HgH`-0de7hc9Bd2u;gp!76OyUCeqZvu z4-FBI@3PIS5V?1924778b3B)U`ONx{3t|^4JIG`)yVh9=yPkW_Q2LhRaQHlyQo8^t zr-?4}lkBF=4*6N|;YYvP?mBs?EVFO5%T&TI^7fY;maGtc=wQBQUf$FhUq0;HcJF)S zT~8*CC3YWU!UFPcRb8I{BR)v|NVECI*K8|KG%d21`WhzU?>I z@GdbzuwzQa#kg)Ui3@y;m)1ta@!Xsg&Db|d>)fPw*ZXbuyl}Hzq!aBtfq^l}P0c>= ziQvzVbKY-|D_LGOsWzYY<*Jab@^7mqtoiS?SGHb?(QwM)j>Tt=m0iCu>*bAU7yf;E z=M|oRZ{F`+Y~Ly_n#ATu8}}Yd+Nm67JLR}p*7A#=obF6}aW+N$pU$TBT05Nn=qAVC zQ}AbfvF!bZ-??vi?#v7*iBj9g`$aja8rdn{j77g9J|(GmtoJd z%q2g<{GRuWAN85nMQvkQndCNz>Fm=xD&*aFb*W<6LlbY2X*a*O$GkZ>{d@UMHUF~H zdn10mecJWWe5%&>?|(l%dsw&MC;#ZH@PDr^Z%ET!dWucvVzr{lDE}8EPA=`+Pus@_2*A71?ei)O75AxyZ*VPO=a)B{|ib^ zbM!Wc%nN;N>V0kIkB_(h^CW+GU{$-w^Px*|-=5vVYHKRbYKjJ~jrncE|H5&@NuOKV zw*TTI4_-R{eYwo@Uz-n3VmxUU{p@`5*Q$RO6*?c@MwZR3J~b`>{OJc9OV0oJ81c=U z`S;!+ofMJdk(*qfJZf5_$(iBxqyF0AzHm{#`d7~cq(#;^m(|H}pP0MseD}Y1m(QO4 z>f{+XW0Cx(6IuZdWs~AP7ep?5cPgSfbnXPzU4Nt_l#U+?IWxs?2mAI z-}OH~hB2GDpLbcBpm-#2$CI@R)%q2OswKDNO+TBwJG@m-o#*<&L~gw~%yR;B6|(NT zTdZy7*4>f8S8%FQwycJ+!|Q^=n#0ED-d;6WyG=a3Wo7M8#^s-M7Feu!yye_KV`kHf zf(<55bn_O~u{y+lbBdi;7xT(Oq`|A<$wHN^9$)GDl||>`{;oWJL2E(R^kr8z?cbG| z-73>2b&p?*=Y{WwuSMPv4chc*T4&%D_Xkz?UTun;cud=cH-u;IDXr*hsEpM5G} zQo?N+-tPIA?{++hai6*)?CE8b(5%&0R*HBfZ01|4mgH;ucyZK~Ypz>o?3~?_B)rGm zarQAE3Gv@yi+7!HG4#8zVD2lm&x|V;#ay42JN353d1dMKZ(IMF_|(t;k@H5lKk@C6 zopV15t^InsMYwI!@*>7bI%gJ4p1-M8@~Yg8BVwUv3?)}RoMmq1;q32RP!_h#&P{CY z-gf@&{7d((?~nZC|4nb=m&XRLpLATCcgRQfNSc)lD`S)J{29sBkAjV3*4vk9{$o` zS#x2!>;@&b)wdhH`(8WlTsE<&nCar-=AFxKFMqbG^>_Z$@~IQ@?oAMtQJSul5q^1F zZvCO(@1JC>@69`uIeG6+{fA$E9{8F*BW&lRf~nf)<|bB&tys%*IcDX7Pag`}UPdn1 zHp%<=s_^78i=AI|0%jL&RXpVNUt}j!^RtGk$u^QX5}G+>1*`tg73}%8J20}lvi{nm z1f|uMW=?u4TINAh@9dLRG-tNR*=u-JLV1n8#k-gX^}9~0@3h)dBsKNJk_$b~y>%qCe_mbu`s!k7RKK3SbA-E%#Xble zPkys-y-e8tyvy}><{sp0GT>=Dzpu4_Lt^_UlhX}?z9sC7?e_PySxOu!Z8E&)?N+_u zwfw*J*F$&swy8{+X|lA(@$hGz@TPTBW>&7`IVO9QGdXQZPpj*;h4nRIHA>+Vj~(}9 zdD3CV%eU*%7p+MgmWoQxpW6NN_VANZRhOGATvT+#Pn%(5@}anh(v@Ad&jsoiFK8@c z3Od)%(LX!1)t!IpWBn^loK<}5=A63dd$Mg_z|Vl^yTA3?1kd)en)1HGdC%K}DzEb| z?OG9CT9Pq`d6vHIn(mdUzn41HKU()!JY&MGB2L%Y6-$cpTU2K8lwV9el>6x0;U_0O z%pbEwmU!3ho6}PNC0%TJ-4efpXCh`-mOSQcO8)J~>uT+5zDA`;{4n!*?>aKX51KP^(wg;4Sc*y-I zd$DWh$17oy8}`rp7drjN{j@Fyz0?M`XDp}Jat3%9v!@*~^AX;DV#b3-x(B!Vavo`T z%XId9y=0KDj{2>P$xa-(`ptYU+yZl@!aG+#G2OKCNT|tN_i~@4v}2*kcXn;)pTA;l z=H~WWjGV>NkLPR@bnz@-;i(#g}5g ztz!Ch=&i#6i~WZi>jiAeL}YqRS4n^4@v~+*}P;(EO_^S3e~-xA>8nz`t|rFSMVFnW22_#vYcUw^w}oWn}eE zHe5EDZ?#GH_&dqjo1Z@Z@x3<8Xd`Fiom$VdYpbVzoA}L@tt`53Thze=^?Eu>X4jlK zeDOun1Aew`=3MM$@dpZy?F}@L`Ls`z$7c7_DMqJ0asE#Ele(euq@Bxu)wVO6mi+je zdGzs-h6DGb>WehhESmE)Z-i8w*)-E~&W&#@%hG3t@yk6uWD>2l>F_$WGn`DzviSqk zPwL#?w87_VwXc=WDn`b+$+2r)dxPuiWg?Bc-fw(k@cey!#I|W4xlYMVj(pM8c-E{c zWVS)q-;8u+*IYA)F54Ap&Z_gS8&&wJex1Z}IfU&G3#7g_r(D&1S#80&O#Roh3X4z84{yjsJ}l6&x&J6+ndO(- zSD^+u+xx8Ezf1q;y29YuUaxyQb5FmEbiOU~Md0G0f)~9u)irl=uOH^GDf{d3_fY4q zqkE6XdoR6nKD7H$Kuv1;{yCyc#gA0(Ui{D{XqD<;?)v}DvPbmx{ugy%T4=#*yeVt1 z8#M#HSNm%Bk zG?)2se&~s{eP|`tNDg6Ax?7 z(oZcZ>e%u4kV?qfz^_+J&;Ea-SbxG=N~>{UeB?n%ccJpD+xVm}$23VR$=V@JDau5`uEOx9^HIy$D_LXj}D=wOC!6o zrg?8W>$SpJ^-$A}73;qDl&SOXid=VuA@S1@g(TOGEvu9yzBXt3`NgVyd=s@q={e_a z?Y%1Bu70R|(=Ad_xMs!**CoLwQk6bWz11c#aoO4{IXWs{Fsj-usXbFx>swVD1EX${ zsKn+iy-V{W4=p`4@}TkDYzxmB>MQ=_MX1TDa@={7_^fW% z-tw8npHIlmIeKVkp}c+5M+gXW!GCaroVwR_oon=38@@mG9rNJ2oi&`ceVwBc|KdFZ|cD!)js3O>+UE zoAurs4?h&Fj!T&7xgfYT=7-Y1HrJvfhrWJO-)?$xmg>WAANDS}u9n$$WT}8t?=Jz* zoqB3_-=%FfoOkKciGS?i%4M#%_hAQtpIfY$;3z@gE@)-vxTW&d0 zvsvOCgZDd^=tZA{wt22-i=MrDv#!yXteha=UW>Ps&|# z_O9XguC#Y*#w*@Olzoz0%5Tcfaih9rQ`AKB)-{nq;*n1_n%%h<_tVG8Vy{K_a=$mB ztzweRL8otf=oSRr2m-@Z?Ye7TEn4v8%_P6msj|9a&jn0+MJH}JTh5=jt$B;Il444b zcxz^-$;^LIv;Tk>VAOk=nEIReZt+mv^H```_6V<^SZ|+SUs&tnP(=n%^h(LjUGn}# zieP1PNYX`lgDkr#IjTaPU(-#b$>{+q2bM2o=mwJ4AgnfgAf;-m!5eQSzzh!hZ z@_VDcrOeu2ZmaiQT$R7&m2$|}#Px|QBI_qS6JX}*u2~Q&GWCascfIeV4_?A|?`|~k zGTr23W?-(g>WKTsrjC1jE`KvR?V}#`Py4Z0)eh{GH?f)7j|~L=YQJham^Vr7tl5$Y zY8y^ZTe_jdd$NM%1P;Fw2g|Ded_On&So<3py-Wqx+RdiBmR9DgR6g-_;J*CZ zSlp(^=2p>z)3uEoqm{pHtS<;Oy*2abr1OeI{vpjrbI!3fmU{y0zGp9zzh!t;?)El)zuEupPrW>8WNZKcDRxqqFVM0LL=DCwBgr2RPa;imfMnU{=DCTA+V)M6CotS@@F z#JhX-;aOJe)-wIMsM&b*R;=YNR#)JeBltPi@zH*2r842|gQ zG%#$O<2S3m&-iRP+eH39NB{f$>$J>d{n#MipMT}C9|%P0%^tH)aGk`FdFI`%)9 zV&yh}@ww)Iwy$TNx-x%4m@t<>%B2c{-mc_LQ6VdY`By2wn(5Fp&5pyU)PKu`hf&rm zP0FI?dLB=Dy+kr%+6LWt1`W<^o%=u8rcUtt-VxHvy*7)ruzq{qjnjUnp)b_D)!Q|- zOa5-$e$~L!mV0mSBmO(DO7wlT+F>2Pn7hm^+kgRVqtx1i3{r1v z16O}<%}wR|xH_us#5-n))S^}M8J^6I^=~#1X?y=&yXtvby@RIi(l>c&hK7=zorO~Q zQg&W$bBY zR_NTA9^L7);n&N^z9S1oi;^m<4@u^C@%(%>Z|8|mZBzIR?;lAsk-S=Pk^TPhGa=bc z3st3k-^=ENPn^l(|FXWO*Luex&U<#p4c5#)wC<@nSNi7S*qYU+9E@X5?CkmUDLyW| zfVb#MgIfmcwCACghV`1$CLCsB+axW%L#bh#;R@~Oqf8gFy(eGxQ_ouikXHF+>uRfrp*j+Yy zzPtKe$f$AUrTBfbt?mnj|CO3uH6!8-XX3omEW4+@R&jLyRdf4=`G$wz7*%`al9^Y_ z1@6>M-z}IluWh2nQ>G_OPiD`X{W8NL{>clGPmkI!I-B;F8~ez9U0o&5bM30r3jxuK zZvq)yV?`oOTP?o?n#`9K^UdG?X}x-Vl8M~vJm<=!DN?-BZs*tJ=I`%1{pn-e(%1Ro ze(KGp5BX!bm-FA@PmWvicTHn^ zzL2p%rLMt!NAvC@b267i&D-ny=0;(s2J7UYgZFLg*H39eIzgF0Ghw zqAd8=o4m-_1Cb&}bj}G`%}vsYc;&9s&2xD7^7eTd?=xcyp1(`xSzoVZ5O(B5k)og2 z>B+|BJj)MwinkkHsCu>Z@$JsXeFwScAtAcS``+96-FZKuxt{B&Uigty8Eh&J9~M3Sd9XHwW%uTwcXqW?eriwF z)D7JfH976CbF98P!@+OYGI(km19=zk-?#JXAJeenyRUlJXXM-zjotRedv3*ERR&9D zm2F|!g~tC&>a6zNuh;6>zWVU*j4xLVJ$JWcYfPJb!`y30GiU%t=NKE=g0NAsp#L+pYTOkGOthacw0 zsr===a7*vhY{5O{eW@KMOWd4JJ^36hxVgP+#-D%OzBia3H^fgoWOgvzF)elZ<(FTM ztb1wbIq5?EyvjTOFHE(6?rNYm|9(Tm&(&`qC;FIu`ni0gLvFRe?^jc{HE)=5XBmf? zk;Y8r`S&{-Y?%%`_^fXn$=|Ymy<5EW2PdVOGbd~QvHZf$D;lL}X?$EI{mUP=Cpll+ z6>h%jW<2uhV#GJz3%B^rhP{25^J2n`iy&9IKe+j-o8j0i!TOGGqMA9)nJ#ItyfUl=;|0gtWSwzh@*aYp8{*JVC#%--T#a7t}=<9Z%LV_=d!12KYkofTlVio31><5CTmuvt5;WYer-1V>%TBQO2@zcQc7no zTchl)ed*D2c7H1n;bZEKUU;a1t<-K%Tt8ogt&jL%C;RZlZR1sncZPxaUy zH|9q!layr+vyJfe&n^1P;l5m$Fzfwr*wZA+n8>|^Of6YkcG)&nr!;k-2 zx9Og?`tr@y$!d97LQ~E5|32+|rBdwEZ|AoEkBt^Z{yqOCrOamT-%m+ZRYh&x%Qwv_ zee%{af5M&6Eve-%l+GRq?#iDoJ*S*K{ioKFm|LH|9pk>PVSTSmSgqt=N2!pU>)hpG zZp?qRY`$sL%gg<)Y%J+cTOe?o<44N&;F;Zqvc#CoL72(Ms3gLe{1$^)|jL^-}PRkZ$oVB_<~*ZgM_47MEJX#FAToq(@y(jCrJuln7Y7V z?H{q`&6DGo375${@bs;J|BdU)9b2Ac=2x8kRsVk2f7|=iih28j{14g(ifdM^^+`To z-2AhKW7?kQ55IA+o6K0J?NWM)<&nRL>~Tw(O>%$qzb$@Tc&k#z^`q=6zXk2@6q(c2 z`s`Nva!T85+{3qcg8D-i_K&kut({-X&c3wKCV%6R<{gXjHpG6C)|k9KFR%U)zv7Fp z&C8dsueV9@KkwhKUtd@Kk?mhi^~YaNUmL$n`<*>6rk!)^+goj)`_`IWUvVsb!Hwof z0jKJZ(^v~;4*z2R}cd`uocLem5>3oHMkDGN@2pZ(yu^|YU5 z6?_qSFE>Q267CjnRlC3vRX}0uvs;=*t(js@A@zy81%= znTf(B?K3x|Us8+7Q0jSB-`%uWr7dzF-{PqfvhR-V=)NwWa&)0_O?&q5Dxq{rTaX+Y1d( zsr=EYe|G&%stoG^+XrVqYkz%y@$SVcvB4{<}DFLio?1Sv{9x{`J}X4n0yk$0aeUDtq6T ziLOpYwFb*-|4;aKYRc;aQZWrZ`A_djGwK^8o;)M?t$&9>{eua2Kkz%PdHA#|zSV%! zkRwSX{-8^8uA+;boRH&glZW#+n5BRI;CKJLa^F<_qiZX*bz?fH8y zcFcaf@a@M&&TZS??p|zJA90WE`x-`_qH-Cjv)kD-l{TtBm>_J?||3Y;oRR$)Ixm!M_6cb(=PbwYMv85N*$DUjE^mNh+7!qwa9=hbwy)(?w=d`iH&5EU^+@2;CYD1|(u=)hF9@zbB;J}Ky7{wX^XJFY)kEG$JXWl` zVCm&_tA05Xm-~XtW_J&(|M_?Fp?%ovAE%=07pPfT?%wlbs;ofxNsW>_&e=8zdl!~w zSSMe3*Xot_HmRbKSw znOisyTGcPi_VqY=Tg=%_b9Df(>x}JTCYKy>rLv4_s<~EX!ZXPODSj`PDAVcnjYV9?tcwx!2Yev;_QG zz3bhif_?K=^UW95V77QzA68Pr(!D$lCIqniIvJE_aM>D_+$Nb8Kd{;#PGrj;`^-ZoFl z+At~D{3!SIu#ZWdebeXYIW9H$mMEAbR4=w(Jp6%}`y1i@yrZGwKD(g(>Do1YsSbagCoi%o4G8J~_$&G7lqa*#J}ix2 zU$Nk7eRkL5y}zbr&(fGB6eg|^*0aJ-{E1k--m!GC)3(`51+H`tL!OgZw+iLQfN~+dI zRb_6FTwL9fewO{h?W^nW?zk^MegM?}QZ zmWn@m@<&Tx^Y+sj+BO@fSnN9}?JRDt`1b$e$E8k7n=bWi+_kB{SZmuv^ZLvA57&k4 zV%53c{A%Z|8#fnPtbSOs>3)NPZKPSCoUXbwCiirD{WNdSKM|3Cd}9BY{CV}R_@3#6+@nj=jzoSv za`S9wu*V-sjxD<_PpoUW@5<{~X6v}uYUe7G#a%3xckj;I`0fIe+9Dpq+^0|PMt-X} z8`S5@ASQAlDk10MXV1N^%gs{MY~9wjCDqh#KemQX;7vrNv0&NzcSnL#k-hb( z?QUH?OD2uSrS6VG-@N)A|4r3heK~nXz3GJ1m*J|1GwV0pFPM}ql(JfTLMr>GZ{7h` z0o{wto-bV#UAZ%u>qq8(wg;jcEpL17*dC>CQw6;jn0hU|lyyYw+fCh<_w?R<)7o+S&KI|Te|v8J zKKs>b-`-uvwAUry@~l^|+{Ksw!^uTV^RKem$yFAj{)d!Z>d$UEGdXk1_Q0;Xps#1b zk8UV@b#>Z|2BkEvhS>$T-h|zh%aTusZr*fs&1x2}V_7Hf?|(jZ`qD2~`98A#T3_Po zUot)Sf=;rEjgqeO^k{aYrm#C*(cT|FA4&?oA~x&&(^>xFmDb%BbL(ub)+=mJn9O(d ze%^$aJUl_7nL1WZ{Tse(2bYW9*=C$KU05*Gu%k$+RmWn_9Fxb9w>Jdz-IvH;;bSkl zsQuTL_l@UjHG7pdiPv5?>F~FoVW|I5NLBpV&J@w5>SErRO=)4V(&8FdZET{yh}5l( zv~^p3^>TjKvA|tiD$3&FW`sF8MFL8nSIO2lHnsd*&ZU z>ogvV$%cZ>{z-5BH1Q<-fWvG&TBV^;CwhmFnwQzPx>Uf916Qb1vWY zyHs9udfl^WU!U&$TF(F)^g0uJGVigQfUS1CqlMj#37H#a`vxgZaBeuG+P?FQV!LBP z!Pco8T^+Y2CGWF~y=r|kM(6j0#XGii?G3s9DXz4>CNBRd_tv97XDQ9NBD#0o(f6nK zTCrCLh+RG2a=86R(ZpRe~RbK^<7FBZQa zD-`PND`b%A_N>^st^S{#@%J8ux4+l61pZE#QT$!=UOC&L<93-rZbrJv_14i^RzAm) znJvFAfAo{RO|ic8R*s&`Uww%ypW3s<_0#8h zr?3a}DaF1~wEB0a-8uGQ$7*4{-Ultpb%!>wz1YBLcJY9K%fof8H6J%f7AIaaj(8)G z@%q#0>-IVV|JFa+rIfW%CGXXWj;L9etX4^MuHwy&jGZt`?WS30WLRq9#d-c$eyv{F zZ14X&L3)D8a!n*~RU;VV3%GzXq<*j&k9^et5P z-}L(1!Fl|0GP3u#hEM9R((UGGaAH35Fe2-20}zuiNG5>ia*>U9z!bvIt=bowcBObD*pD_5arA!cI+UQkkuLX-meH6rEEM zn^$slM@(}myt!dl&#jEU&8i9u?IumzqZ}ETdU=~kw^?a%we-xSso5RE;Ppdh3o)%si*0t_ZcJZ>4 zMQc1KWt}~!&UOED)Q!vgYJWR@y}4`C3-g?Y_T`V>hCC|roq0eg`Pz*4b+4vOREao# zk~eXdddkI?Dibj!y_=dTACi9A%=xOrpKkl$;hL-Fy*(#Ql0B>Jns$irakv%4bF`=lc_lyJyzPmT$NH z)I}AV#YgwPs?4+6yR4+$xK*{=2powh^l=n%C9G zcd;nuMUVOwIXJtd_A5?bXgcqr{zBOgOr^aYe-3Ru`F#Gv&#uxYlNj34PUx`I*!Byx zPvUgvR(UtmWOe<5|2|W<)|RUucysN0r)^*%-?4oKk5(px+HKF1ODkE#5vnv#q@vQc zSfu9O!KI#|TIKC#4?NR2ck4n7$S!&&1 zzvF7^q+8}Iw)`?PSYgt4b-}kMQe1ie0-r^tPH<>3{7@dBCF{1=(9~ZEp1KW{tkHD0BDQ`~FK( zBDbkV_H9;iXf)ZVG?`~DyJp>dtpf?SIC7Qu?9xc!o^x>10y91Ckb}R^$C|6U&D5$? zcv1fIQmfiVg;mlg^2~H+q{_dRl5sH4msY#udHU?O=*-R0_tlv@#gEl}yl{TW%_r-Z zIcC?tda_IE{D$Xd`<)bI%*E>(tb(kr1in~!)zITykoUGHS@kFC7}u`S5Bk%VXmlm~ z)sm|c^DlqCVzH#Gw^_vWS+m3a?p!JNn>Vv`*evHBb7xrkvLPdE^`pAjXN5w)zgR3V zDP*Z$>ir<_ysB0&+t!vD0p2`}-FkJu7CLwCjA$x+R3Em8>tkKVB7UzgU#*M%UF}|W zaq~=2eaz9E-l%$0{n&z*fQo9H%tGR9c4%b9O(R4xcR~-9S%-NRpP_*)F+m*_Q74B~7EtP(T|b3oqm!o(5AS@l z^|MRQHn;9AT-bhQ)siFin%=APGG;JFI;sV#U5JQmICd&%?#3yHqLNk~Q}y<0KDp=8 zgW9(|->=->WpI0zeu8e->@`Q7<#y~{62d0JGp#hnd#6Zo)wf3yg@szzk~Mo(y1kT7 zZZHvg>vEAbQ^IH0gAHYqe5PvD`(5?>m)^eW*XLgw{5BVF+*vxy=#8-R4fi)C@;RbudOEN1ovO^B7(m!Q&tEw>aqxeRd4@VfB zWe$IqT$VV$E1_h@jk+^a&)7c8a*Vf_6ub6(-|51r-mSMMyQO-a*75(lV_9L`qt)^C z%R^_fUbNEcJ`}GW=XT zYe`nxZ@XVVdiv)0y6biKHgI#CIP>i-OGBy!-6XxY!IP2=@%;4?UY~ho=Yu&rYXZ&B=_!-T=mMwL}5m<>QJwCYImdLjNvM`* zKjizLzioNwvq{r=P1~9(tNyGzF{=u{uY49WXVuJ?p=W>Y2;JNsZ+dCtBm?K;UWi9rYhtNXW!%__Vsh!P4o1w?)V*2 ztmk+2%$HTqYVNGMd3gPfADdr%U3PiR-`>^-|5kJ@I`?|Xny}SHzOR?8TfAb1`}*h8 z(%zas`%+cGW;-?g!dH_hu}A&)w$6TiK0a~tuFN>Gi?uVXOefXs_>kzrC=?Lm_VBmH zx&CvVh2Nh}yZI?8CHdRWbc0Ri6Lspt{Py&%JE?rH{JPTVuK!z(Ge)mrkvKe0@&9Js ze+RxV^m<~J%$pkLacs5u_eW>!${C+7*i$uqjqlS}C$I0?vqgY?^Px4_c~`#H!_ z`FNytOB3I`Rge4^Aaq(@F|t^z<%qA6w$QdO|06fG#imGY3FeCFUVF*X%=vakrm4W{rnv5N{?$~JiIXlGdcWcRF+S?gN_FUkk)(I~d>`Nq4) z@{w!W|K_thx3H~WvrKk{lKzf+Ycl6vIxg3I$hZ23%%f`MO!aihjxQP9v%S)i|9gYgZX8Yf(zy9Zz3*quUrO^At-d58;raNwlTe<)$4_&^eYiKWTv@Pd zsZH48wiOSL3GS47>(RSUwD#ltcV7+e?>#olrf$KW{kp=hTK8m#ElS=Sd7pE0op1BI zX~r7zI+<7UA{U=q)C*mIb!YBvzC#K;4)ec@SDU7N-1L+AU(>&a=`-IPoKeyJZ|{_* z06pQEIi2gBXHH(HoBLAoP{c9ohLzX;wr9tE`>nJ+AWn?$)am0~SGHDhlYKW6^EHT-|hnA=-zk&d6n zPT-h&hMW23I7PFypWp~ve$-<|rKkHr0|XIgT|R=?E#wQQqz`QOcAM@z1z zI!!2=GRs$a*0P*8>F3{8%v~*;r_sDjqQ|lL_~s8sex1AW^-QYq^IJRO{in_I4?G%D z`1R=KR=omlNt27ZDHmF{XSBu3&tEn3@}gLsZIh=JY~a*0QooSpG5vX!@_o&Xh5XKm z3*)wQ-L3E5m!MNoFWz%B{n~vU?MF*L1Q$-fywPp@^!%yY&i}b#kp8XVp0O9puk$Z_ z9Jz8?1oNlVG~zx`Eaa!07x>UTSDGxXH>9Qkq}y?$wHQ~vITCRU>z`=gzUf5y$3 z-?wk&rDv5pMX%i1Eq=B#eD|A9U6-G1Gd^7GbLMzDWopy08`X;3Yo)sEa?+2iy)`T1 z)y?}}E}JJbmO6)@X8LB{JNN#R33a|QZkOly@mU{zDZ!|+=Lmy4bDQL%l?i7qEtv0l zi6cMZ_rhT1h{CYe`ad)F|1aMq&Ads!h4XsM#Qw77O7gy2_ncZ&+Q^_eb(4wV$eb49UNFVg=0#8qS8Uud+0QeQMHxaubTv4P?5;n4xvOtS zxb(_Ht*X1)^ZYCX{hbf|VmSQqnut^8X>RbCz+B&~!v+Ga>y=)tYH@fRdQ!29eS2A# z;tYo%kNo(vFYZfuCP({iJ{=TRzogRN_)^U){zd=4CR`7{Ec8e2cITh)cLkX(cE9UH zlKPTse< zMbA5JY-8JhdMKwQ+*RLh+21G<@IZoNiR@m1t(Bp#H$+`h*V69T`t`$tpT|n>O#D^9 zJUjF4+>CI)X^SHdMpo#HPG>6RQ&BoLbFx;)j2FMcxLQIUJS|Yuf2pd)eJ{sj;%B|t z=Q5k>0uo-^Ts~9O>mph5ME9L8lXGK?fqB*oZascpp~*jVuYBlx7xrQIUm2xCPaZ5` z40Wws_N;GPX3Om_AL|*cr;4_3*YKD*S4r0PgGEAi$Ghi6a{Hn} zmx=9*OIDQbTIwKV5MKG$sA5_D%~uOH*L!L*gfp#S(h&^NtS*0ZHGK7@$a?$v4yRY$+<&^KTWhJd z`_Vk<5?QH|2Z7Dc-FzFP_={CG1ac?ZK8v~Bv10zkeZRSP{d#!v=XB#|o5Kzo9-nm~ zc;V@s+V00UQdvv(R`=Qd8#L zYhNbKT$QvnHiX$W;e_ta`tzaxpB6@~o3`(}-`rVe*(JK2cN5>1_1Buj%TfxK?mB(@$BFjPYc59XxKl(` zA2(^7dL}uuHE-7O&l)p?`_FjB37K~=>v#T9;7pHnl4CEjI=AiXuIs$tUfbu_n;j@j zipeZ;e|Of>&q+=4IOnyl?W(OBxhJk_X(uc>eE3PtxT5eRZtaw*qbx1NdsK3$sL|0ax!NQ9f{;zJf8?t_#lpA8j=N3=E&mHDjH~Qx*lS2OgobXRmpeaJIfzM0(OgmZ~p5vxA)~&OiDt@ZV*2$H9eB zw=~7NQUlyVn&WH5?5RL^?{1$w`1^44<;_)9C!|x#JKOZ^4%}b#@$Vt=EbnwmKBG-KTe(zrXz5WbH{7@8(($fw*UO%QQ6K@zrx@|>Vo*3-|-b0>Kqm+n%rl{9!OvoNE!t@aF4+4#vIq zYJTg}lzXmA7A)~%R-VAO_7X!;%^}YROServGWh~;2(Q5!-UEBDnnjD6ddBIvCr7%=UHt^bMwQL6&VxIZGX5Cq=7gdKI-_m7FKPyMbxq+?X9L zYYa3v76#T$5Eip2KdP=GpuxCN_u9_xKN5$m-*f5v>`2_WStt9ah*0;}?t@+ddQIEz zOEOA$y<%H-&|8{K>O=&yT1NZb8^)3g5_?oSYV3DuUw!yxiB(S(&)sA7>pEV%VikS4 z=TYSSr>`0JnZ+HdGVFF_nZMO6DPt^V3sS5}q#+&J*5aNF0m*PPBa(}W)uT;uGm{ZN0Ip|I+rk(BZB z&VTK`_cPV@U%LGNML%PcS-VB@Td(@07t8c+T)lDX>lBY``}akhxhdf7c-Q2|#FV3~ z-T$`QS0)s!h?d#*DY5@-eo&M4lm^FXhjh+|Dg5}fHF|a%UsLz~cdHtHym$3G?e4qn z*u(2O`9~8Mhz1Jx*;H(4uYBGQv9{8Y~O*mmzb7o%4-Ccu|`cl-5s#>jtlpk$cXp5H%LZ4SmL=wXZ0oBcUm&M z9jguFmi$mXQCC&=YMa=sZ3_w?+w`R@es++L1d$SHGF>|IiNlrap{-!?qaYcy! zn;rVLBDaDT@3}lL?eo#Kb&Klm9CS`SXQkR+Yu4Ds#3V2N@z#Eu@>Ms=cXVq$F)q-m zC`mc6Y{PHnhq)gPt$gyh{{7#lO5b}oW&QPhaZajw>f1#p1oUp%{66pC%Ip;{rag_dRg_) zg$wJH?N-O@-dQH-LdzjCy z3|^}BDqs)q`aN#C=4%#Zn;zS)eLmpT-)H+emL6hIefLyLz#A%-fy%*)AQg z+V;7u;*g-qMjg3|TFsyzuTRc7dN?sPTXJ8|uVoJ-ttOT`Y1F3%oOu!d-u&ehU19e* z;_G@JPnhECb*Z4o`g!7C@lgFe4uO)ovoG$=vbz5u_E495=}YtNf8DGm{9?}8c4GV1 z8$x0&oYU{+RDArnWUfa*r-^)qdXd`aV>{lgirNw%+iQF(1TD`xUl((>?_HC<>&Mf$R`m4;L+$r(1yW0Qr=4yqo4)s8k=pLSWZS7-pW0ET z@Kkj{&$<{V{f+KA`z~l5WlrxXzq~DBC;!6r>~CNHW;f%wdTPDypSW6O{a;VB;$jn4 z`ArGAU9g4omw3VH;xj)w>b~yhTC`AqcBh`#YVWFX>?3R=q1``BTQX2GPqug_OU3nRT=N+*$W2d5pS8FJ0^T;%as2d&8k0{UI}o zt)%Z}RjhQ-+H|0qOX=M?bL)WrFPcggR9;{HaVl^8o9R{m|7+N%&-pUtAK$BgOLx{8 z&aq#sF!8wjlFO_{y0IKKO&gB?R!-+B+n+l%{kY{Hvz2xht{cwWk+QMyxBJen`-Xj2 z@CK8Gk}vB0;ugt$-EMQsZr`oWyDzo1Pe0&1WmGY16OWaqcQ@OTJ-xS=FnV6PPGQ!q@%(E}Z_eZj##L6r))_a~2AxHZNGhXc=|p@sz*Whxc)RjQ_i&e!JnudYSdl zj{GxBddG6p-X?rweUHgEevUty*7NQw=6+QBZyA5@*{gT&KB?8m3bwLag>ajmxHxV3 zw8A}+YbV^XF)wic@^S5qoy)owRabsUeE#p(uj}*g-mm-nbi1t8_l5(eYMbJps{QG6 z>-<=>Ma)sk?~a1crVE^lJ!i1K)ad;AzECV>@3bg9XkOCR`FQso79X|17pie{dgrDXaNI30(RBY`CL5moKWXx&`n;lNl{IJl zYx7@OT|4++_+GTuHEp}YkE^UPTtG z==^g9B0ifO-?ZNOu;bi`^5k@rml+kWMC}qPUbUY5VDZ~yd2{{s2oD#}u*o$q-9Iw* z1U1a9`|t4bEMNJ-)LrZNt^0)+Us$*zdgt}Zs?(b+*R3}6nKWhAgf+qcuD>rXKfk}! zq|;sHQhl?^-=YcmV%>d4!tb3XTK?v{UHpBoV$`ea)jJA|`wq=|W$qsL|Epa1Mfqvw z-&g;9dUclmg+Cx`s<)<$X*)`Gey7LF!)|%6byW{gT>UBis+nt%XLHm%wj^bU6 zwGHJ<4TY{usy|-s^F-I{sAu}VNBi`?On-b(XWn`S9`X#m3(rKEB!h{dvWbw>G|0kF@6a2I;H%g`fTCRbM-) z==esBDKd7S^W$PJdPa6_+UWJTfV9NpZ7$~v%mJ4O=*2n%Ut~*PY_kKkGTF<$Prt3u4bBkap|1)^$xE#u6Yu;e$|C7x3X4EuG9+Ci`?yY zux&TrPnnYkI(P54Rp@$^5jsP~L+Vl#QiJ*LZhkYR}e`n_p{D{r}zH z`shp5ze?^jaGFJ0+8yata5dBxdKxSL>w}HA%A#4}D_6a!e{o=m!Nwhxx3h2muJWGI z5wZU2y$vtar(6DtOzL;zVLz+rtB|A=CVIr|Xq4ZLfso6Nc|}oe#fC|wy)mRn8mj}|LtD+lY76>uUj2oXS3bX-=6QXUt7=qjfu1N z@z@3S^DfS=Ui4n7)LdA4@eloVdo!N@cu>r|Wc5SV%yT-)T&uQSv)v~Y_}DghV;RT# zOs5#Hwx#8TRh#SGj_r4m_z-dXRp_V83rv|x)1KVmeIJ=>5|cjl;)mH{*E2qLi!HzL zsYAE?#+PdTqoGT(>!YftgqMEL#M{c2ZvVGdRUegn_f_p zSbH;b(fr5@Z$sD3@+ogRbvsv0wqDoTOmy!0U+-4!n;iIZ{R>zQkZ#B*Cq(hsTpZMm5AbZtZb z&n!n=bhe1pUN_fniN0TXr~HV=tagetuGsLp>c4#~@1I*=-L7jdw*NEJZO-M~6Rb^3mS@(5$kw-HX_fzc_T_j{=Y8IZ zQ(stll+41x?2mRvaIaj;>c6Sp#Jt%1g7ep$ny4Pe2AofA*}W-09vxh0{w#USV}pHp~G z$fU(v41)}kmn0nUIM_2WEBTT^E#u);d_1eI4C>dsTF^Q%s$%9V3C%qMZd|!NB5@qb zt!8dnp-0Y1Xx=acS(b3f<6z6gCP8IZX180LzVjz7DeeAO(j#&P>{^3Fu)z%zn>azf z;8Fuwo>}?v!iT5P400LVjH=K3Bs6Cj1{owRNjT=QuoYxdYkJa>Qo~TC`mDqyA7Xm0 zs3dW_ahdgq2&Z$)C)*&P%uky$vMz-!$Epuqm&z$>49Zy7fXQ+o!35b)^kuM zVE=0>t790H;plLosbK*thX^SRx)#Ck+@Bs6ar zT$+9*^oYl54I3%9U(2Nm{kAK*OJv^u6C&~QdbsaXz0#g3>o+Z`D62R17ka0&=xoi# zdC!fvtV`|uiYj-(pWO-p5xwCwtmRv>iV4-Pm6Cc;>XF6DQl)ZhE6`XY-=w zXM^RtD|3C=_i1j?nX7N_B~*EC3y+j{1IwYApLBLuo_g~iygu@cY;685gAbK|MeoTi zTVk?iqqD-SZw}E~ijM8KF6Gu=Qqkr-Y1JFZlA3M$cK`cx@+*Z8P3o|Hv#?e}W#^pU z_iuiGn9J|I?tsFnh&StBrU_0qXQ{V{3VNwEB|R-K>{9bo{XL7NTpnjlU7}?bvP~mN zUigS!O~tNRYhG>$N{ybn*>IZP-v67WR?jcnrL*MjiT>(|?la$4&Yf2+Q#J3s{O@|b z)G133@T@8O^26fKG!FZ;5Z=W$hvOa`i?x4o_EFjG_YFtBPtsU1d(EVWs|uE-7rgkv zb0e^S%aQsWQ{I2LdY5e(%M7KpMH=Vx0a-n|VhhMuL7AT5tyQcR*{YdJCRU2jZ zYWx$sTb*9|-?m)7ZOxl~#}>Z3o@`_|TXs&zxj(Oe$t{bx!VtlJrQM`suUvOi*=)9) zXFE4^bQoX~s$AW$DxkHVfea$Yin)&Ioqx_L04gTwYsV`>S_{&`0TF>@p!u1AQ zN&c0&vm=gf6PhJE<45Z09l}4P=lSdV{VcGN{P^#tt_`#i~5g9SJj^l`19qVYx9W#N=LuT$o&U|z=ivm;V5 zYsQg#;q`XcZzpAEUU%bkiXZZipNgh z-}$I^M*Y&WABt_(C9eAWS!Ol=O|G;0y=xt}JHFl_={a>_+J58EqthB4BDl6XxR_S? z?kcLZ)pMU=7|!_ewA5o$!DmYQcRV)Fxb3e#`QX!cVH;SF{M#-0cIu=h85>$7eS@z4 z-gJD?!~0(kFOzcdeabW~OUv}`k>z%!hwDx9mR%8!OmEp5c4dDJ*4E=)j!jm4D=A zL6t#DtLk3)Uzs(Z>QturE&bMMTW{+YwA?u@@BTg^$>5*rQBRL3$X$+d{L5u-;czO- zX7{7|sKVzrw?CSc&HR4Se9s@fhnrZerhH}5vVT~)xZ;3Ul&()wrDOlnJQq#Z)fdw< zr^u8yr3p4{U9t7V#BSEzFSf2wxUtA#;~u7mG8VtJ1$Z5Ob3iBoB7mt?9-FW?wH}+-Y?j^6^YFBe_+1tCz z{OjL}of%hRqw{Z@iPYWOuW(DeIxwdD%Gv5DE*|HGM9oR>7Rt6cYV-ep>!r`)}Bt@q6@bDPHMeA+qh$wiY;EB~oMCu;;-Pufhp%<|5q z(4=nV3D-G)RMc}PavwXgN#vx&42S4l&z!#QQGet1_w(QMk73IuoBTR`l=D=@F`?qL zZ*0+Qs!2RdYbw*1=WqL!xAWf3(e-rvq*Xx<|>&7_HS;mSQnST?M!cZ;5@vc_O^hgBODpU#$*`gY6GG(qi1z^6T7a(85=>9#OVW;$#- zcPrz~?_c!Vf{r{`(~!3@YN2?mrQVi^#qBMsy#0C?CN0mLvwY{J%K_;hP5M3^t&qx; z)fW?NYEjM9`dnaGtLMZ2cF#N}gTwXwvtrMb=#?%i6?wY&Vn~{i|6`Sq^UW^}ndY-u zCd(bW>m$Ny5a;)!>9%D4`=F#)&6juo7JPfHUt=xhFZAAKGyl(*2RrwE4)`ijwlU%P z(j85iPyamn&Zz3h-)#Q#pYMmyX}k9w{A25K>vzRZPo8ylaZPItauyU%P1ljhFnlVw zwLbZ7T>Sk1-yBcA&SqY?+iBXJyJ^g|BK2pjzusbse6ZlZwE?eJO7O!1pZ1tdtJlAH z+;p*v_3*`#nFqDa#4k?NINWq_MrDq4q}ueTQ#olu71<3vwk!7q6bYQwnpJ(a;MJ_g z2OC#tPWck`_=-?l&@Z7P_4&K1tYThst=4c<3ky=Ke_s76eI<|62G*ZU=C4lWrvKNo zo;bZMJ>iZ;^<2T{au(D6A9(3guDAEW!IX0sC6|5L_u>8bvelnk7r)aw9rQGG-Lqf6 zDmHkS<>p<#SnyCgQK3G2$-{NAzV{waKYN`$@#Jztws)JC^&esN+x-2s)9tg2FZ!iy zx(%jH-8l79M&7$+^`cDQ!d{%OdOhWUbpOU3+YT(}W|r5Pn-d+r{otmb!XgrW%m!Q3 zA_d%dVly_~ab?z-?=H0|=FzU6zEtCTU8cKFtxS8PYyP(7LbJ<47ycpX_N$f={U~yS$}H%=Z>;N0SlA- z4iyNs2!{pm7VIt0`O8=vcK+MFI@Zh=8kZO+3+0q}RwoavAS2f>w zwmPHtkxR?rM(e3r@|?GYZy7_v!q)?NK27EL#1+ ze(9WrMz31dI&@n-owzbsc9q{(p;z^5jE_f7Jig}sjTh#bvg=-*_@d2!b^RZ?Utf>P zZSD(R{MhrgL|>oJ@rQ|4|MY%^{^$Pdmvqb3TXI^pQn}cpTknM4wyoGV`T zE?Y0#U)j#zdEnf-2Q{o^yVhJYe{xY&cZy|MbLo$K=~ZQ)AAPQm-g3b<R{M6NePNLy<&jsir>knk zvZhb@?mv05eP7{>ixKZ;Pw_bLdl&n$O_!qArOe>fHT2Wmo%NRgmA&ao3C;`Z(4KQ)BMuBsW~f{{yN<}Y~;J6K4{&~O}$0C>;D;rZCsD$t5vO+F|OM)$ulmS{|x>oW$4ndIGDE*1}^( z6K>icddO|ETq-DL{sNQb0W$4@^@k6t=&c$9mkaiu)Ad7>ql(9iUAo!ylKhV^dy zmh}m>I~M7H8|!Cc&k8ju2-tlWyR+8Q(c7lvm8;E-rI~-S)oOo7I5@Iqu91;vX!oC< z|2_F`>_G-^v$kWc?=u2^tXr4hy_b{Q=m)3Gr-P3VZrm?6;pw{k=}$x^%$WDx@d%$% z^UYX+npdV zBAP4gi&ISPbFVHfI&(U;cEiloeA_%%h})hxvMJ}&)bQ`K%JWw4%sHEHVBssXKhtMd zP}U*0?f14{Sn?o`_kz{4IezSCT(&Ir2)SjL>~B!swDY}+;M>~eAG=RByq##4ePVy6 z(s9FG^-_(q0<CVo2Y;)=%2l{_oTUGCZzM^A~shWn8r|->>J0bl!{# zPnCp=2e`C198ijGD{V?^jeBuiIN~qM3zwz)%`yw}!9lo*p?_)CY>Al%j)w&1cOJ`F z%KJt`@YL2z7s3|FzhK}#A(*!!Hrs}o;lZNf2W&Iy1Ky>ziCv$Tw&2mNBNEYtz9ELb zZv{2AM6ar`J?K5ErY5$-rY+wo$>5okuyeuFm+k)qjB=tC(av<-n?1AeATX9cemYEY-BvByK%1H?YryN zt*U!}_5Ht7>h%x)CO!XLbLZ!a{%FI=D$93ATC^$6n-O#IeXV<@m*;+y4xdZ>aaCc# zMSoXCuaLODZTI>kUPh;<2(`VKG-;YpYH7#`ho8&zl1opn|8eb?E|iM z-d(z?{p6i{i`MJTy>I{DC9N-LbI9_^lM1#jnbECSzSic?@r7nbZq~286!vGzJ}$e( zPpkhvod3Q4bDm;WL}%_=vukEW)hz;#1W%?NT5&OH3h&v-Pjz=VrM}InSz>ZVQrY6K z!&RZAxl2#@R{qO+totXkI{V$8?{7QzY>(3arEPqA;nv=lifeP%-7&M5G1`%t^XJjY z^w0l8tnHbUidlN6FFf%@+RHq6Mg43~C*wm5}@P#g+=bjJ&tSPa5svu(Ll= z-@Br$ba(AZt*I{W7uTdj9&Tj&H|tjBtvq?wKvt&6O-pPq=BS4G=Wpxi&D2`6eV?_> zB!*>^UM={dYI;fTdbZA=dsi0~iOykO{nGZl(r*Ffi!WE#%J@F+aPKzW@m*ytYwuXlV#@OsXP?VyS2nKz(<))!4 zCv4<7WE1~1GwynKsF2FbT|S3%M2|#4m`KzuEst-ogccK?FUMZ z>13<+Rc~oe=*h3odoRCoqQQs94_y8ACmt2?yxW`dAmk-$lE}&@wX6GAZ+f`qeVak< zrGFDn!?)$l`bZTC0fVq$5zvZE2)&~{5yk;)VoG2>bx+HOq zd#1<0YvLisKTucRbmrKR5mSohc~(Q0WA>!PokyR@$GI=qx(z zV{2Y9Z|(E$tMd+pN<3m)`swO&p`aZ+S#g3@o8@*a-cS|xS9nYR&kLgc5@CfEuVuwT z;>$~%GLD~4Q(n0IjjF83g}d!VoA{UR=5OA==~sa77sV~QdB>OjD&M(e5|74_*_zim zKJslSQ#%?uW9i>ZFXgA7KJ&T2+pvDtlgzVvk25=qE255^pY?b`y}tYD?^UZ0&RAaB zblB8&*Q>y_^IC+SCUtk_Us`gcLoL;Phu*(wt^XvFs{RO8W<67guzfR?!PZ~i!tU3X zGuu1!wx2z_w(HJ`Hpl2<*8h7}zqVzqu6P%4|2n^rkL7g3fM}y9rP?7=j!rt<;$(if zrrvsXLYt7>C-EcsHbv65n#peA3exh+Bz?N{)_nUa?;@6Pl}+!b*6Fm(Yp)~*izW() zYdT!paQ@eGwqlz#s}f8L^c>&z#$252_WXS;Lw^bXYXzPD4X;)i%$(!0XV>=r_qOdn z?zXIvKbvunwcx1iAy=CpIokx?BSZfmS#8dAk#$b}%<%P3xAvY?;<}P$wSQ$}AoIN0 z=L5{V&i=~Djs5>;`b`a!J-g;v78SnsoA4rSxo3$ENAAx&30F?4GIJ720@7b9R+2+m%{Y&@zKdMzYk&*Y;yMD0g~xe&V|24Pi15 zN*MANJG@h9xYo%LnA>x<`bIPVo(=lEdjv(d7{~<)*E7X3TWYXg+N;qf7tN40rTO>u zlbsKYZ(Me8H*+!*WB6^pjq75Y6<6D`X&XPV@vc?@vE^mp_>}>5;@nb!H>i(@%Eu?|Up9+ICUec(%ifjTe27?W?ca zaW$gy&e8u_{t>4O9IhEYv{MW{=kj1iu}{-_XQ!B}^_@)2)!nr_KH1H7yDW8XW9}wP z_Srr1QM%sKUPhc(*=BHhN8g%-mCW{YSeI36n{H~II&TJ-r@s%QLC^OPzOv0X@7q4K z&MV#hcJn;1J2xzs+@8uCTE>_VwMNXOT{G`*%dG2vEb!^6tormSA=4xO>953Ehm{@n5^LAs;XSI*C^^7o`E{(e_l zuKrpzXBv0X-8Es?W`#Jenaz=Aeal|_^r7gk)W)anmyc{ptNK$vd3pUxi%S=s{-4gf zsJyZLV`s72@A`)y7dx=BM(VCyc{F0C{+z7=Db-u~7i_CpS-dIE?B`Fl&!4|d<(#h< z`n`~GRi6IUtGC{oCDo<2`CMZ+3@n(S_m96{cD2p**5{Xt_CJnn{K69R#PF8R?N@UZ zas_1)(=OaTv!HpyzbP68zO{n43)rtnMSq>;`zP}H{=YANOz+)&vTlv~Q5k`Gjkl9y`^=O-y$EDA>CsxC zSpO)3FUa9=w#I^or6L#XME$=Uu$uoc_(7oR*=tr#Q*YcC&3|%{^^Cf3N}&1~=`DL4 zWz!VBIre@-Bg* zQ)ZtpoVptK@6PL?1&S?_oS1d_$KM~fkP38ZjZ{fd=E)G0< zY^mjS{>5UB7tT*w*>&^O46zd|{F4K}7Tq-BxTSYsFR ztvTdq%JX8C?g^W8$sJrQS7S3XkFHdGuzIJ%xq}%k%M{f0JxbZ?~X<+~Ob11Tt; z#CrQ3HV}v{?)K2p^;Su2EaDQ2VNena5NQ->dMsQo)o(lh#!Bz#jk;?)-%6hUe5P7> z{uig`@eO(#Ppo;@TR*MhnO=a=oym?_+yy-IQ__s)J?aTgjIs%gtth{@%kppCqLd2z zL#gU)YzFUtY>Yd|+32xzs+3dp>)k)zd#e=@~W%X3g)|&$Y=fCF-x82eRB^-$f~JZFIUd+m*Ssp^;~Xps6+b`_1QsQA$MM1 zaFUf_GGb1Tdd)^!a*da;V-rvg&{P0?;%+BdsHnYGF>9;PoxX!xW(s9P|0IIxv%_x%6&nD9T)CCPe^NH{j!Dii%s+=k>6)q z?dvbBUcJlliz?ehK?gmBnlF0C;fU%4>(p7fKq ztXHluhR@rUxTM*D^_1(QpPw=_tB%DjK6!i1_dgNqUe>RuR2Kh`H_yobZph9_ZCY>M z7J8k&&vDJjU(sWwnE3|l!_E&CY=XBqD3+_4oGHw_-syEGF+TdE?u^8(_RF+;<`r6r zEj^|b(Xe#ZLD3MM6QW7VE6(t(ICT5klE71}KgD|PPP=BcWzMCy2X4eh`ZD#;{lHRX z@afY&wNH0D z9JXkB)!g>Li;ayRzt_H6-|89ggmqs*`mK$R@}tiQE_ir;=>;#oz5OZ@1;5&7U0Pld zXg_h@XNmGj)`AuK%`X=9AIpC1@A%QLcs+Y+UE&oRgTys2)?VoSak9Q}X3*rsn{_hR z-HuFcI?*=K+~`z8g29fbyF-h29o*^ltc%^G?8$|h2a=Qc&F3=K?|*n-!H22urVIC! zgIO__W{+jApZ)w-Ds#(Z)!c-+Yy6yqbc9bkS{>Y$BX=_Vf@=L-E8VXwAP-)V%?`e8 z@u9lDb)B(~@TV2J`nA^QxfkoHohctz$(nN2#sB4#v_%2_6OD@-jAvX}Rey8ixtu9IZ4Nzs)7Huw&OPws zMZv~X?=Nb5o}Jfa8{D#-Eu10LTwua^kuy!Adyjna4l&+W?%3|STuWd0V` z4Lbcq#gCW#*k$)FYT1+%vAy2+=1JdGvRT6z(Kfs1+||yTJL>n{>YxA4;8ldhAz!CN z6{8kWaf!MIZkKp=^4O{uCCC5R_o1Rjc`DD^8PBJ%yMNp#o%m{+UPTm+|{)=e|D;-lcC;nfy+Qa)SF?7)FXVdYPbRxrppeD1vW_Q17=;?)PYZ7(Yqbv=-&tR`o^{?b2l zfhW_&*L0n}k^1kN)Caj~am-gFYUb6=OX$+B-NlgSc6s%jwW&F|JoA_5&WfEoJ^fM0 zwy)J`9T)2Lv~Dc;66-xNZ%wbG!|@OQ=VwkXjZ2EXkg`TkecAs|t@G8l)`hQkbiBlz zedg8smrs2D?+JSTBI(l0uz6KdZSK6iY1TKLk1900)7&?Ck1jjAyY}Qy=NY*cq{T7* zO27OhATm_Z?Q;B{aoM^Up9} zx>}|cux0oC1$S0dZ2U8|{NFJbcKPVD*VVEeUN4Ask=N;DGL`q7A!pGR{zFB@nN#ed zcaMLRM~HS)iZcKP;FtZ|vW;?O#my z7)18I`fugnH)VB-T^QGc%G2-quWDLt4oRJ=wyw`%wV#4|qg2-VjD zCrt1DuwMSc$=B>(KK&}ZyJz3(`Ieui{^FXh?Q=R}Dz`@kliB+hC1F|zR2Hh_+;MR{ zE<2Y+Dv@o+$BhlMGi551ww(TFIX8Urwy*3_*)c5Z159iKIW|vSb?w~5Krh9YEP4eO zH{~uoxajR6X)*7>b-rSHlMj4xD)8GCTYq|T)9xUNb4inz9@(F{dCK=Ijn~ayvhCTy zUD_O}!T9Us>R$)f{Cn`$Nx3e4;kvWxD{5^Yn;OoaX>xRhiE-eK=UkrNRT|H>Caqie z{6%|D0N2IT1ygRZT<=b6*l)6&npbPzwRX~@P`i-LT&0<%QGv_4Ltm~fPV5Vc zyK&drdaY@AadPRCsMV_56KcXeBeqwVE?FOb=F)4?&tK|)?Kb>cr5EmfW%VES+RBE~ z#F-^$`k(IH9w{Dfe<C#6 zdhfBLYaj4ooj-Lo{+JGkWzU#}33J zN*5m6aolHhx|FT*fexV`o7(2PPr3K5#xCHais*aKOWc3Isjl0oloC>3y{a!_0rQ7N zS3M<8otU`oeP^EeN83!-fZ(?>yiDP@n)f}L(V*|AzHNozPXpmejo((-{1Kkn+g5R< zscxffXyy!8HBF7;6Sn6I`XiPlwMyJQp|Sj`#j!tGGp;3=*e?I>_0h1TFX^`Xn*=Ml zezoU3)#~ay=BCYPd;Ixvr^v_8iS>8Rx@}qC)vLB~&Was3Ex+mU=f2z_z4ujo z_u}43Hcpq%C3|X}YG3+b+v>ER>mJH(w4InJqRPBgqpfS=#v{twY5`V?B2Y2(Gn{{sXcUkXV2QID;+DE^r_}$O3nY(0h=CONqcg_|C zg`JeRZYOhUvE1#tyWta$>P%j)xQuhc1?$F}yEo-a?rWWSu~ISJsxW+`ozBVDmoDpG zd)=PUH$^UvN54bH{G0A=-W~Z7ccO}FL;7YL?2)Uf-!aoYX78y&VcF~NHrD>UZoSZ2H4*@YI@@aq66>u2&hP-re8DEq8c*s>I}fFYe9ueB-_>oAZ7bbGXYT zAEER9Ez(^lgoC8^&E3)YT=3jqi-rl7;&J{#Gqi-C8619Fxcm8sIh-0QUB^OZHa=21 zx`6kn;qK#CISkI#^S|36duP?Q&zaA?JsIzxJe(Uh)gddz_~cCOh({YwtdRK0z$Shx z)cLnu$PqjD**ew|JLZHmYi5}EZ2p|LBx#QEUjgSBq5Ge>Hf>^i-fx~B>AyetL9K$r_2t5>ZAmve7A`I1 z+HlI#*!=QkVGAkDbKYrhT*+9Z-lmyxir1yln(O1o1Dnh(<Iz@(*o)0x!OQ}l!;>N$Lrjt`l%n$yyX zkHhA!)89DFIGv)d=ie;Ku%?N>nA;WDc{_Qb)jSFSv~q!wo?nB~YRlAt#$$nC=VYX87FhIHjz->{DA!$kT}u;guQ_r?v}4GelZPGM296VgLZ=MHcq} delta 2772 zcmX@~kK@x^)`l&N_Ad2rW&h^i^7!`spJ<++??TlC>12~Ll2=~KF%vmG)gyz*CTo)o8er(K4i_EnKF^X;f;zxdLJ!|dC2oaH~|IDB}|mVf6`wimD3;d4dyh3otuO=J^#ue(gwILRlj)GVd* z_O+JeiPuXW7hK!&c14tJ&K1U`bCx`vwJ}3`g^pcruABJ@-93rQ%k9*pDi>K)p8obx z{u=YFY=QrR%a$=ttMR_%)cF3P>@3Z@cXA46Uu(E~FHXMxf`P%^JF}a8!gjhW2>Let zyiQnn%7coA@~W4!`#(AEx^~(wR%cP-N2hHw*kAI7CpnVL2<&0$UHP=4YPz7qs~5h{a{eYJ z{(L;=`*F+npLKLPyPuzO5J=FwQ{tX{=IASZ>5NAo4KDsq{x)Uz%=mll+?jPVTQ?sP z+1sZ6Zkm3kT{dEj`P-^T6tjQzJh$Jzn%S)$l+xmynf* z(!(c;aZW$ZU*5S-O1t|)<>a{9Ub7#JzdpSGHvjk?+5D|%R&LnycaA+neNf|6woP+C zpUgD)x%KYLl|SZP$lh6_DH2^J*FP^Lz25SG{DV3D{=57w0u6?aeDD=tf14-TH4KG(8a$&opR#ksaNwhP`EKA+kGN4cQ=#lKB ztG0^mS?W^EA<MUq&=>|A?vAdAO0|qV$=AA=(Dk`JL<^ z)|%aSIeoLTD@D9!hSs4h#-6Mt!jGfpO7;44zEX+OnUv9IRmnEV!`Sj<)8qYlv5ga@Q|9`Iu|_1Izg=_TSrMU-SPldsiA!c{63kVTMit z|0oH|*e{6=aaLz^I2+GTy57@NSZ*TohfTIu!$qU^<+p{WUuK-?YF|A0VuHc06$Xhu zCfY}IXSb*bG4kFl*?eE$s`6pAsGZ;1l{W>I7faq*tNf*QC+GD?9XTJ!E&=7EPB8#e?bxahuiO{s~m5PZDasq$H<;f~5<<{qV;>gw?Wz1y--7<7@Z0QLe(rIL_crY|Xqc#}3#(egBZ9&iB{yxtkrYA35#u&qi7m+(YIVCUU5?GbX=pvEf z>d^RC?|^>cS*P^hLOn8~^~}cC&-8Oybw7Gq|IKId?Wb$k$NgNpe%{Y(Y+i>ROo>r@ zuUNotIw5$%pN92^zd205V5z26uHq#l{?Pfax@Ub`mfZB9<-yxx1A4d(uc+oNjR|lq z$*A(a(0;Y&VSP^Kx#f2xmLB@E?MI-goW|x0PtFuijOE=Fd}2d^r(XV^mOFd;BUbV3 z5mhl38)ul~7x9|XpPmuv7qa>7|4Yr;+J2YuL$+%9yocvsTej<3 z``lS^v*&r@oGW`RGAn$oXPN&!QvS+!d!5s_3qL7q1S*B&m=fCbrxmPn&!%{Bp$0mM_0Kt5nX~$BZ3mDg5 z<5NuI`yybxGvQ_a&1F+tFK+GHn7&3m>Ac6UY}fX__eZw9{=LoIJMG+=%%A&i_egCH zD}Hxe_q##P)~K+TYp%bGVxQl_>&NSBpJkp{CEYBwca>z<=}8&>>%wQVUbyeNX9pw8 z|LP+D_&TO5Y()uaC2IG7Uz_+?R`H@yRB21PQN5*#P8gjHl=*di7ByMXCI%{y_ftbQ?$lOfA((GUx%07?h%Whlp^&ao&QeZ zy^ceXB@#^KJ?RUl-&l8dR%>GRJd?j}wt5o(_I}f~QZ_2}j9Y6aReImI=JxjT&0B9U z{m_qJe_hk3zF@9ks@m##drCL$Q*L}9eCZ62<6ZB_{(Ih$cidJU&6&cdt#?!7>0%a} zt^YS~d-J~~G^l;c*5B(5J!j|~H7K^8In!lTcFp#4X0DkpBn^0{}p3ZsPy| diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d633a202025d..9a84a5f8167a 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.33"; - patchSuffix = "-78"; + patchSuffix = "-108"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-71-gac148bdd88 + glibc-2.33-108-g3e2a15c666 $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. From 58fb597c43a9bfd4f128ed640cb9c46f232105e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Dec 2021 09:10:29 +0000 Subject: [PATCH 556/703] =?UTF-8?q?libinput:=201.19.1=20=E2=86=92=201.19.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.x.org/archives/wayland-devel/2021-October/042003.html https://lists.x.org/archives/wayland-devel/2021-December/042068.html --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 54843486e137..924237d58fbe 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -23,11 +23,11 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.19.1"; + version = "1.19.3"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; - sha256 = "sha256-C9z1sXg7c3hUt68coi32e8Nqb+fJz6cfAekUn5IgRG0="; + sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; }; outputs = [ "bin" "out" "dev" ]; From 2144f37d365c36ed5b35d3f96c56969bc5becc11 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 Jan 2022 19:20:16 +0100 Subject: [PATCH 557/703] libinput: Clean up - format with nixpkgs-fmt - use more conventional attribute ordering - remove non-existent file from patchShebang args - remove unnecessary if from sphinx-build binding (Nix is lazy so we do not need to null it when not used) --- .../libraries/libinput/default.nix | 95 +++++++++++++------ 1 file changed, 65 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 924237d58fbe..d34d50b19e3d 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,47 +1,70 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja -, libevdev, mtdev, udev, libwacom -, documentationSupport ? false, doxygen, graphviz # Documentation -, eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support -, testsSupport ? false, check, valgrind, python3 +{ lib +, stdenv +, fetchurl +, pkg-config +, meson +, ninja +, libevdev +, mtdev +, udev +, libwacom +, documentationSupport ? false +, doxygen +, graphviz +, eventGUISupport ? false +, cairo +, glib +, gtk3 +, testsSupport ? false +, check +, valgrind +, python3 , nixosTests }: let mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; - sphinx-build = if documentationSupport then - python3.pkgs.sphinx.overrideAttrs (super: { - propagatedBuildInputs = super.propagatedBuildInputs ++ (with python3.pkgs; [ recommonmark sphinx_rtd_theme ]); + sphinx-build = + python3.pkgs.sphinx.overrideAttrs (attrs: { + propagatedBuildInputs = + attrs.propagatedBuildInputs + ++ (with python3.pkgs; [ + recommonmark + sphinx_rtd_theme + ]); - postFixup = super.postFixup or "" + '' + postFixup = attrs.postFixup or "" + '' # Do not propagate Python rm $out/nix-support/propagated-build-inputs ''; - }) - else null; + }); in stdenv.mkDerivation rec { pname = "libinput"; version = "1.19.3"; + outputs = [ "bin" "out" "dev" ]; + src = fetchurl { url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; }; - outputs = [ "bin" "out" "dev" ]; - - mesonFlags = [ - (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "debug-gui") - (mkFlag testsSupport "tests") - "--sysconfdir=/etc" - "--libexecdir=${placeholder "bin"}/libexec" + patches = [ + ./udev-absolute-path.patch ]; - nativeBuildInputs = [ pkg-config meson ninja ] - ++ lib.optionals documentationSupport [ doxygen graphviz sphinx-build ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + ] ++ lib.optionals documentationSupport [ + doxygen + graphviz + sphinx-build + ]; buildInputs = [ libevdev @@ -53,20 +76,34 @@ stdenv.mkDerivation rec { pyyaml setuptools ])) - ] ++ lib.optionals eventGUISupport [ cairo glib gtk3 ]; + ] ++ lib.optionals eventGUISupport [ + # GUI event viewer + cairo + glib + gtk3 + ]; + + propagatedBuildInputs = [ + udev + ]; checkInputs = [ check valgrind ]; - propagatedBuildInputs = [ udev ]; + mesonFlags = [ + (mkFlag documentationSupport "documentation") + (mkFlag eventGUISupport "debug-gui") + (mkFlag testsSupport "tests") + "--sysconfdir=/etc" + "--libexecdir=${placeholder "bin"}/libexec" + ]; - patches = [ ./udev-absolute-path.patch ]; + doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; postPatch = '' patchShebangs \ - tools/helper-copy-and-exec-from-tmp.sh \ test/symbols-leak-test \ test/check-leftover-udev-rules.sh \ test/helper-copy-and-exec-from-tmp.sh @@ -75,17 +112,15 @@ stdenv.mkDerivation rec { sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build ''; - doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; - passthru.tests = { libinput-module = nixosTests.libinput; }; meta = with lib; { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; - license = licenses.mit; - platforms = platforms.unix; + homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; + license = licenses.mit; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; }; } From 1e144d4d087eb9d751e6a776aafa6b08c34cf331 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 Jan 2022 19:22:53 +0100 Subject: [PATCH 558/703] libinput: add freedesktop team to maintainers --- pkgs/development/libraries/libinput/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index d34d50b19e3d..30919baf5c04 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -121,6 +121,6 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ codyopel ] ++ teams.freedesktop.members; }; } From 818de15e48953cf0a3ffc65ae42d07ffe83acca7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 Jan 2022 20:06:49 +0100 Subject: [PATCH 559/703] libinput: fix docs build --- .../libraries/libinput/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 30919baf5c04..89bdc15ff62c 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -11,6 +11,7 @@ , documentationSupport ? false , doxygen , graphviz +, runCommand , eventGUISupport ? false , cairo , glib @@ -26,19 +27,19 @@ let mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; sphinx-build = - python3.pkgs.sphinx.overrideAttrs (attrs: { - propagatedBuildInputs = - attrs.propagatedBuildInputs - ++ (with python3.pkgs; [ - recommonmark - sphinx_rtd_theme - ]); - - postFixup = attrs.postFixup or "" + '' - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs - ''; - }); + let + env = python3.withPackages (pp: with pp; [ + sphinx + recommonmark + sphinx_rtd_theme + ]); + in + # Expose only the sphinx-build binary to avoid contaminating + # everything with Sphinx’s Python environment. + runCommand "sphinx-build" { } '' + mkdir -p "$out/bin" + ln -s "${env}/bin/sphinx-build" "$out/bin" + ''; in stdenv.mkDerivation rec { From 4c047d740b3fcc98331aef2c446ad4eecd2acc7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 09:10:37 +0000 Subject: [PATCH 560/703] libical: 3.0.10 -> 3.0.11 --- pkgs/development/libraries/libical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 909ee73e69a6..f4a1959a512c 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.10"; + version = "3.0.11"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-fLmEJlkZLYLcKZqZwitf8rH261QDPTJZf/+/+FMsGIg="; + sha256 = "sha256-9kMYqWITZ2LlBDebJUZFWyVclAjfIZtc3Dm7lii9ZMc="; }; nativeBuildInputs = [ From 27a9c1bae22921e99bdc89f12e3dbfb9a30b6e53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 16:05:01 +0000 Subject: [PATCH 561/703] linux-pam: 1.5.1 -> 1.5.2 --- pkgs/os-specific/linux/pam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 33ab4f784fcb..54184a990fe5 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "linux-pam"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz"; - sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; + sha256 = "sha256-5OxxMakdpEUSV0Jo9JPG2MoQXIcJFpG46bVspoXU+U0="; }; outputs = [ "out" "doc" "man" /* "modules" */ ]; From eb89e048138ad9ceeb6bfea48ca542556166aa2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:47:07 +0100 Subject: [PATCH 562/703] maintainers.sphinx: add --- maintainers/team-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 361be88045f1..5b70a7b1e633 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -278,6 +278,13 @@ with lib.maintainers; { scope = "Maintain SageMath and the dependencies that are likely to break it."; }; + sphinx = { + members = [ + SuperSandro2000 + ]; + scope = "Maintain Sphinx related packages."; + }; + serokell = { # Verify additions by approval of an already existing member of the team. members = [ From 3296a42cdc2cad0fb4977dcec868296d8b8000a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:47:20 +0100 Subject: [PATCH 563/703] python39Packages.sphinxcontrib-applehelp: move to maintainer team, update homepage --- .../python-modules/sphinxcontrib-applehelp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 9c3c16657f29..ef7a50382c6e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-applehelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } From 78d23a7ed37ab86b8a7f214c40f5dc3a07312ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:47:35 +0100 Subject: [PATCH 564/703] python39Packages.sphinxcontrib-devhelp: move to maintainer team, update homepage --- .../python-modules/sphinxcontrib-devhelp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 1f33c06b984e..293f4c856ef5 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -12,14 +12,13 @@ buildPythonPackage rec { sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-devhelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } From 8bdf4d6f08890307ffdc49583ff67b72e577bfe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:47:43 +0100 Subject: [PATCH 565/703] python39Packages.sphinxcontrib-htmlhelp: move to maintainer team, update homepage --- .../python-modules/sphinxcontrib-htmlhelp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 51084adf6ed6..901132176ed9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "Sphinx extension which renders HTML help files"; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } From 1c78972f4b869bd2f973c02aa43e6a5cd1a2270b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:47:49 +0100 Subject: [PATCH 566/703] python39Packages.sphinxcontrib-jsmath: move to maintainer team, update homepage --- .../python-modules/sphinxcontrib-jsmath/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index cd67732605bb..da630c6ee96d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-jsmath"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } From 72bdb762a66365f9fc19ba2688a67b5419e7642b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:47:54 +0100 Subject: [PATCH 567/703] python39Packages.sphinxcontrib-qthelp: move to maintainer team, update homepage --- .../python-modules/sphinxcontrib-qthelp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 9d16ede62a20..4364fcb99dc6 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } From cfee10fb8fde8762e2eeafabf4c0b19ab0be92d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:47:58 +0100 Subject: [PATCH 568/703] python39Packages.sphinxcontrib-serializinghtml: move to maintainer team, update homepage --- .../python-modules/sphinxcontrib-serializinghtml/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index a238c0191a7b..85ed3cdc596d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } From 8bd2cbe7dac715020de56d8356cdfb1529a3a9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:48:16 +0100 Subject: [PATCH 569/703] python39Packages.sphinx: 4.3.2 -> 4.4.0, move to maintainer team --- pkgs/development/python-modules/sphinx/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 244514dd57af..065f8750bb5f 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -8,11 +8,11 @@ , alabaster , docutils , imagesize +, importlib-metadata , jinja2 , packaging , pygments , requests -, setuptools , snowballstemmer , sphinxcontrib-applehelp , sphinxcontrib-devhelp @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "sphinx"; - version = "4.3.2"; + version = "4.4.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ze6+iGGWSDljb8SPc1Z9UcPfUrleDTeaol5ZDGj1iYg="; + sha256 = "sha256-Q4CqPO08AfR+CDB02al65A+FHRFUDUfFTba0u8YQx+8="; extraPostFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ @@ -54,7 +54,6 @@ buildPythonPackage rec { packaging pygments requests - setuptools snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp @@ -64,6 +63,8 @@ buildPythonPackage rec { sphinxcontrib-serializinghtml # extra[docs] sphinxcontrib-websupport + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; checkInputs = [ @@ -114,6 +115,6 @@ buildPythonPackage rec { ''; homepage = "https://www.sphinx-doc.org"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = teams.sphinx.members; }; } From 4bff2f943e94fd023e44bd3170f6c08fb042301f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 26 Jan 2022 23:59:22 +0000 Subject: [PATCH 570/703] expat: add patch for CVE-2022-23990 --- .../libraries/expat/CVE-2022-23990.patch | 41 +++++++++++++++++++ pkgs/development/libraries/expat/default.nix | 1 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/expat/CVE-2022-23990.patch diff --git a/pkgs/development/libraries/expat/CVE-2022-23990.patch b/pkgs/development/libraries/expat/CVE-2022-23990.patch new file mode 100644 index 000000000000..32d7c420b943 --- /dev/null +++ b/pkgs/development/libraries/expat/CVE-2022-23990.patch @@ -0,0 +1,41 @@ +From ede41d1e186ed2aba88a06e84cac839b770af3a1 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Wed, 26 Jan 2022 02:36:43 +0100 +Subject: [PATCH] lib: Prevent integer overflow in doProlog (CVE-2022-23990) + +The change from "int nameLen" to "size_t nameLen" +addresses the overflow on "nameLen++" in code +"for (; name[nameLen++];)" right above the second +change in the patch. +--- + expat/lib/xmlparse.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index 5ce31402..d1d17005 100644 +--- a/expat/lib/xmlparse.c ++++ b/expat/lib/xmlparse.c +@@ -5372,7 +5372,7 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, + if (dtd->in_eldecl) { + ELEMENT_TYPE *el; + const XML_Char *name; +- int nameLen; ++ size_t nameLen; + const char *nxt + = (quant == XML_CQUANT_NONE ? next : next - enc->minBytesPerChar); + int myindex = nextScaffoldPart(parser); +@@ -5388,7 +5388,13 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, + nameLen = 0; + for (; name[nameLen++];) + ; +- dtd->contentStringLen += nameLen; ++ ++ /* Detect and prevent integer overflow */ ++ if (nameLen > UINT_MAX - dtd->contentStringLen) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ ++ dtd->contentStringLen += (unsigned)nameLen; + if (parser->m_elementDeclHandler) + handleDefault = XML_FALSE; + } diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 5bd03824441a..371126f4b0dc 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2022-23852-fix.patch ./CVE-2022-23852-test.patch + ./CVE-2022-23990.patch ]; patchFlags = "-p2"; From 0de04fef7dd553ad7126d749b1a5d0339812f75b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 29 Jan 2022 00:44:43 +0100 Subject: [PATCH 571/703] wayland-protocols: 1.24 -> 1.25 Announcement and release notes: https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html --- pkgs/development/libraries/wayland/protocols.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 73fef21eccb7..61696d232f79 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.24"; + version = "1.25"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1hlb6gvyqlmsdkv5179ccj07p04cn6xacjkgklakbszczv7xiw5z"; + sha256 = "0q0laxdvf8p8b7ks2cbpqf6q0rwrjycqrp8pf8rxm86hk5qhzzzi"; }; postPatch = lib.optionalString doCheck '' From f9d71ecfc1c897cba354a286db99bee81c26e0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 20 Jan 2022 13:14:06 +0100 Subject: [PATCH 572/703] python39Packages.openstackdocstheme: init at 2.3.1 --- .../openstackdocstheme/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/openstackdocstheme/default.nix diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix new file mode 100644 index 000000000000..797a524e0172 --- /dev/null +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, dulwich +, pbr +, sphinx +}: + +buildPythonPackage rec { + pname = "openstackdocstheme"; + version = "2.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-zzWgAozJrYMFyGWzoDLYbeoY+IPlgzmVhnX7lgM6BXs="; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ dulwich pbr sphinx ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "openstackdocstheme" ]; + + meta = with lib; { + description = "Sphinx theme for RST-sourced documentation published to docs.openstack.org"; + homepage = "https://github.com/openstack/openstackdocstheme"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d6cf8b62623b..376718d806d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5636,6 +5636,8 @@ in { opensimplex = callPackage ../development/python-modules/opensimplex { }; + openstackdocstheme = callPackage ../development/python-modules/openstackdocstheme { }; + openstacksdk = callPackage ../development/python-modules/openstacksdk { }; opentimestamps = callPackage ../development/python-modules/opentimestamps { }; From c274e5e62d6dc61ab15590c71ecacbe645220464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:16:26 +0100 Subject: [PATCH 573/703] python39Packages.sphinxcontrib-apidoc: init at 0.3.0 --- .../sphinxcontrib-apidoc/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix new file mode 100644 index 000000000000..c7bdb26b0008 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-apidoc"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-cpv1ks97fdV8TAV5T3MtwCYScnXXhcKlSUUh/d53P7k="; + }; + + postPatch = '' + # break infite recursion, remove pytest 4 requirement + rm test-requirements.txt requirements.txt + ''; + + propagatedBuildInputs = [ + pbr + ]; + + # Check is disabled due to circular dependency of sphinx + doCheck = false; + + meta = with lib; { + description = "Sphinx extension for running sphinx-apidoc on each build"; + homepage = "https://github.com/sphinx-contrib/apidoc"; + license = licenses.bsd2; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 376718d806d6..9ddfe6b1695c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9234,6 +9234,8 @@ in { sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; + sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { }; + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; From 165de9a1646250947d1df61a043bfa6deb95ab3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:36:45 +0100 Subject: [PATCH 574/703] python39Packages.sphinx: propagate sphinxcontrib-apidoc to make it usable in sphinx-build this is more a hack but I couldn't get it to work otherwise today --- pkgs/development/python-modules/sphinx/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 065f8750bb5f..19961cc2ec18 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -14,6 +14,7 @@ , pygments , requests , snowballstemmer +, sphinxcontrib-apidoc , sphinxcontrib-applehelp , sphinxcontrib-devhelp , sphinxcontrib-htmlhelp @@ -63,6 +64,9 @@ buildPythonPackage rec { sphinxcontrib-serializinghtml # extra[docs] sphinxcontrib-websupport + + # extra plugins which are otherwise not found by sphinx-build + sphinxcontrib-apidoc ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; From bbc13405d318cd5682a186fa26c366324f20d3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 00:43:47 +0100 Subject: [PATCH 575/703] python39Packages.python-openstackclient: generate and install man page --- .../python-openstackclient/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 8e446d6b9909..05efc97b6448 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -2,12 +2,15 @@ , buildPythonPackage , fetchPypi , ddt +, installShellFiles +, openstackdocstheme , osc-lib , pbr , python-cinderclient , python-keystoneclient , python-novaclient , requests-mock +, sphinx , stestr }: @@ -20,6 +23,12 @@ buildPythonPackage rec { sha256 = "c65e3d51018f193cce2daf3d0fd69daa36003bdb2b85df6b07b973e4c39e2f92"; }; + nativeBuildInputs = [ + installShellFiles + openstackdocstheme + sphinx + ]; + propagatedBuildInputs = [ osc-lib pbr @@ -28,6 +37,11 @@ buildPythonPackage rec { python-novaclient ]; + postInstall = '' + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man + installManPage doc/build/man/openstack.1 + ''; + checkInputs = [ ddt stestr From ea57cb59b650951f6275e0bd67a4b66ebfc66dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Jan 2022 02:00:47 +0100 Subject: [PATCH 576/703] python39Packages.cliff: generate and install man page --- pkgs/development/python-modules/cliff/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index ce229665c659..0eebbb449e1d 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -3,11 +3,14 @@ , fetchPypi , autopage , cmd2 +, installShellFiles +, openstackdocstheme , pbr , prettytable , pyparsing , pyyaml , stevedore +, sphinx , callPackage }: @@ -26,6 +29,12 @@ buildPythonPackage rec { rm test-requirements.txt ''; + nativeBuildInputs = [ + installShellFiles + openstackdocstheme + sphinx + ]; + propagatedBuildInputs = [ autopage cmd2 @@ -36,6 +45,11 @@ buildPythonPackage rec { stevedore ]; + postInstall = '' + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man + installManPage doc/build/man/cliff.1 + ''; + # check in passthru.tests.pytest to escape infinite recursion with stestr doCheck = false; From ed89447f2c7b267b00d7aa91f8da989d640a3dfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jan 2022 20:33:57 +0000 Subject: [PATCH 577/703] vim: 8.2.4186 -> 8.2.4227 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 51a9b9af5bfd..0cb09814c0f0 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4186"; + version = "8.2.4227"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0g276mbmq69z7c4kgj59r0azxmx9ih2sd8v83dx2gfph6wgw65ph"; + sha256 = "sha256-Xj4ymkrWY5GWpQhEDYtPtaRovBa6j19dW9GWg9WSdig="; }; enableParallelBuilding = true; From d52f8bf9d0f3988857da4457e56ba9c5f846ebe2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jan 2022 16:15:24 +0100 Subject: [PATCH 578/703] python3Packages.weconnect: 0.33.0 -> 0.35.0 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 38e3d854a745..8af5acb70057 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.33.0"; + version = "0.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-nIta89xRjXpjmSK8miIZUB4MlnlT7R9nF/vqVu+sUiY="; + sha256 = "sha256-Rx9OTx3GNIIRo7jIDIp8i6vGUFwn1keg5ifXqzewr4I="; }; propagatedBuildInputs = [ From 162452ef63d35e9bb5a385b0c910db5e9ecbbb36 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jan 2022 09:19:53 +0100 Subject: [PATCH 579/703] python3Packages.weconnect-mqtt: 0.26.2 -> 0.28.0 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 740fd789bdc2..a843aa5c05cc 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.26.2"; + version = "0.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-9vSQUU5lj9yY8/lJ+vVsD+3iczhS49gJE36RiJvMJYA="; + sha256 = "sha256-WrKJy4CxRJ/X599+95mfCQIhVcsLPnSPNtv3oAISSfU="; }; propagatedBuildInputs = [ From 6c771046dbddf522d27ca7709acf68f65cadef69 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 29 Jan 2022 13:59:59 +0100 Subject: [PATCH 580/703] git: 2.35.0 -> 2.35.1 From the release notes [0]: > Git 2.35 shipped with a regression that broke use of "rebase" and > "stash" in a secondary worktree. This maintenance release ought to > fix it. [0]: https://github.com/git/git/blob/v2.35.1/Documentation/RelNotes/2.35.1.txt --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index f768a3348c89..13da857b790e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.35.0"; + version = "2.35.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1j4g8qmc6ninpl0ixblpvs7871cbxmnznsg5xk75fs12fns7grj7"; + sha256 = "100h37cpw49pmlpf6lcpm1xi578gllf6y9in60h5mxj3cj754s6p"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; From 6715796ae447aaf68e01559517e0d3fa6e03f3b3 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sun, 30 Jan 2022 07:30:30 +0100 Subject: [PATCH 581/703] keyutils: fix build with llvm/clang (#104930) Co-authored-by: Sandro --- ...0001-Remove-unused-function-after_eq.patch | 28 +++++++++++++++++++ pkgs/os-specific/linux/keyutils/default.nix | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch diff --git a/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch b/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch new file mode 100644 index 000000000000..61ad2a474f9a --- /dev/null +++ b/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch @@ -0,0 +1,28 @@ +From 59d91e57d103fb4686d2f45ee3c688878244367a Mon Sep 17 00:00:00 2001 +From: Christian Kampka +Date: Tue, 24 Nov 2020 22:12:40 +0100 +Subject: [PATCH] Remove unused function 'after_eq' + +--- + keyctl_watch.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/keyctl_watch.c b/keyctl_watch.c +index a70a19a..c4ca7f7 100644 +--- a/keyctl_watch.c ++++ b/keyctl_watch.c +@@ -47,11 +47,6 @@ static struct watch_notification_filter filter = { + }, + }; + +-static inline bool after_eq(unsigned int a, unsigned int b) +-{ +- return (signed int)(a - b) >= 0; +-} +- + static void consumer_term(int sig) + { + consumer_stop = 1; +-- +2.28.0 + diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 71f708e210d4..f307bd56d1cf 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm"; }) ./conf-symlink.patch + # This patch solves a duplicate symbol error when building with a clang stdenv + # Before removing this patch, please ensure the package still builds by running eg. + # nix-build -E 'with import ./. {}; pkgs.keyutils.override { stdenv = pkgs.llvmPackages_latest.stdenv; }' + ./0001-Remove-unused-function-after_eq.patch ]; makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; From a74a1f32517b61107bd28f3b54cd49a6fc8db82c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Jan 2022 05:47:22 +0000 Subject: [PATCH 582/703] webkitgtk: pull upstream fix for gcc-12 Without the change the build will fail on gcc-12 as: Source/WTF/wtf/CompletionHandler.h: In member function 'Out WTF::CompletionHandler::operator()(In ...)': Source/WTF/wtf/CompletionHandler.h:67:21: error: 'exchange' is not a member of 'std' 67 | return std::exchange(m_function, nullptr)(std::forward(in)...); | ^~~~~~~~ --- .../libraries/webkitgtk/default.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e9026d46bc69..ad8711cb9dd3 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , runCommand , fetchurl +, fetchpatch , perl , python3 , ruby @@ -82,6 +83,30 @@ stdenv.mkDerivation rec { inherit (addOpenGLRunpath) driverLink; }) ./libglvnd-headers.patch + + # Pull upstream patches for missing includes on gcc-12: + # https://trac.webkit.org/changeset/288379/webkit + (fetchpatch { + name = "exchange-gcc-12.patch"; + url = "https://github.com/WebKit/WebKit/commit/198b392130b8dd625f4d5d36e652954eececb16b.patch"; + excludes = [ + "Source/JavaScriptCore/ChangeLog" + "Source/WTF/ChangeLog" + "Source/WebCore/ChangeLog" + "Tools/ChangeLog" + + "Tools/ImageDiff/ImageDiff.cpp" + ]; + sha256 = "sha256-D+wxfM8AEMBfvpghrwa5v9cYLyK5+Sab3J0RE/xVar8="; + }) + (fetchpatch { + name = "string-gcc-12.patch"; + url = "https://github.com/WebKit/WebKit/commit/4e3fade6bd89347e041a1938d4ea85fee14e5534.patch"; + excludes = [ + "Source/WTF/ChangeLog" + ]; + sha256 = "sha256-NPqZLfMUR6InQuqfVwNoZwuM3Jtbz5KAbm9SUBaprmc="; + }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' From 0184e467eb5290ac597caaa9609a159b8d64f746 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 30 Jan 2022 10:46:28 -0300 Subject: [PATCH 583/703] wxmac: rewrite --- .../libraries/wxwidgets/3.0/mac.nix | 98 ++++++++++++------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 64 insertions(+), 39 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 17c2ee9efaef..e1f732929cec 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,71 +1,99 @@ -{ lib, stdenv, fetchFromGitHub, expat, libiconv, libjpeg, libpng, libtiff, zlib -# darwin only attributes -, derez, rez, setfile -, AGL, Cocoa, Kernel, WebKit +{ lib +, stdenv +, fetchFromGitHub +, expat +, libiconv +, libjpeg +, libpng +, libtiff +, zlib +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; + inherit (darwin.stubs) derez rez setfile; +in stdenv.mkDerivation rec { - version = "3.0.5.1"; pname = "wxmac"; + version = "3.0.5.1"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0="; + hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0="; }; buildInputs = [ - expat libiconv libjpeg libpng libtiff zlib - derez rez setfile - AGL Cocoa Kernel WebKit + expat + libiconv + libjpeg + libpng + libtiff + zlib + AGL + Cocoa + Kernel + WebKit + derez + rez + setfile ]; postPatch = '' - substituteInPlace configure --replace "-framework System" -lSystem + substituteInPlace configure --replace "-framework System" "-lSystem" ''; configureFlags = [ - "wx_cv_std_libfullpath=/var/empty" - "--with-macosx-version-min=10.7" - "--enable-unicode" - "--with-osx_cocoa" - "--enable-std_string" - "--enable-display" - "--with-opengl" - "--with-libjpeg" - "--with-libtiff" - "--without-liblzma" - "--with-libpng" - "--with-zlib" - "--enable-dnd" + "--disable-mediactrl" + "--disable-precomp-headers" "--enable-clipboard" - "--enable-webkit" - "--enable-svg" - "--enable-graphics_ctx" "--enable-controls" "--enable-dataviewctrl" + "--enable-display" + "--enable-dnd" + "--enable-graphics_ctx" + "--enable-std_string" + "--enable-svg" + "--enable-unicode" + "--enable-webkit" "--with-expat" - "--disable-precomp-headers" - "--disable-mediactrl" + "--with-libjpeg" + "--with-libpng" + "--with-libtiff" + "--with-macosx-version-min=10.7" + "--with-opengl" + "--with-osx_cocoa" + "--with-zlib" + "--without-liblzma" + "wx_cv_std_libfullpath=/var/empty" ]; + doCheck = true; checkPhase = '' ./wx-config --libs ''; NIX_CFLAGS_COMPILE = "-Wno-undef"; - doCheck = true; - enableParallelBuilding = true; meta = with lib; { - platforms = platforms.darwin; - license = licenses.wxWindows; - maintainers = [ maintainers.lnl7 ]; homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; + description = "A Cross-Platform C++ GUI Library - MacOS-only build"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ lnl7 ]; + platforms = platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 588ba93137e0..7efc5103e088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20467,10 +20467,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; - wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; - inherit (darwin.stubs) setfile rez derez; - }; + wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { }; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30-gtk3; From 3e6a05f477387ce90a1116db091c5cab4a76b872 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 30 Jan 2022 15:24:09 -0300 Subject: [PATCH 584/703] wxGTK28: rewrite --- .../libraries/wxwidgets/2.8/default.nix | 119 ++++++++++++------ 1 file changed, 80 insertions(+), 39 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 8029477708df..bc8fc6f5b047 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,76 +1,117 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, libX11, cairo -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +{ lib +, stdenv +, fetchurl +, cairo +, gtk2 +, libGL +, libGLU +, libSM +, libX11 +, libXinerama +, libXxf86vm +, pkg-config +, xorgproto +, compat24 ? false +, compat26 ? true +, unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, libGLU ? null, libGL ? null -, compat24 ? false, compat26 ? true, unicode ? true, }: assert withMesa -> libGLU != null && libGL != null; -with lib; - stdenv.mkDerivation rec { - version = "2.8.12.1"; pname = "wxGTK"; + version = "2.8.12.1"; src = fetchurl { url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; + hash = "sha256-Hz8VPZ8VBMbOLSxLI+lAuPWLgfTLo1zaGluzEUIkPNA="; }; - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] - ++ optional withMesa libGLU; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - - hardeningDisable = [ "format" ]; + buildInputs = [ + cairo + gtk2 + libSM + libX11 + libXinerama + libXxf86vm + xorgproto + ] + ++ lib.optional withMesa libGLU; configureFlags = [ "--enable-gtk2" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") "--disable-precomp-headers" - (if unicode then "--enable-unicode" else "") "--enable-mediactrl" "--enable-graphics_ctx" - ] ++ optional withMesa "--with-opengl"; + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl"; + + hardeningDisable = [ "format" ]; # These variables are used by configure to find some dependencies. SEARCH_INCLUDE = "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; + + lib.optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing"; - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - "; + preConfigure = '' + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + ''; - postBuild = "(cd contrib/src && make)"; + postBuild = '' + pushd contrib/src + make + popd + ''; - postInstall = " - (cd contrib/src && make install) - (cd $out/include && ln -s wx-*/* .) - "; + postInstall = '' + pushd contrib/src + make install + popd + pushd $out/include + ln -s wx-*/* . + popd + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; passthru = { inherit compat24 compat26 unicode; gtk = gtk2; }; - - enableParallelBuilding = true; - - meta = { - platforms = platforms.linux; - license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - }; } From d6f7a38ad3d1b71bbe319348856f560d6cbad334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Mon, 31 Jan 2022 06:14:44 +0100 Subject: [PATCH 585/703] texinfo: rename name to pname&version (#157454) --- pkgs/development/tools/misc/texinfo/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 8d8f1e1627aa..b379df09a4b0 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -18,7 +18,7 @@ in with lib; stdenv.mkDerivation { - name = "texinfo-${optionalString interactive "interactive-"}${version}"; + pname = "texinfo${optionalString interactive "-interactive"}"; inherit version; src = fetchurl { From 69382d41d5dbda63b7ed045c47ff368ec2d0063c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Dec 2021 00:48:09 -0800 Subject: [PATCH 586/703] python311: 3.11a2 -> 3.11a4 --- pkgs/development/interpreters/python/cpython/default.nix | 3 ++- pkgs/development/interpreters/python/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 66aaf08c6385..1bcbd2bb4b5e 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -17,6 +17,7 @@ , configd , autoreconfHook , autoconf-archive +, pkg-config , python-setup-hook , nukeReferences # For the Python package set @@ -103,7 +104,7 @@ let nativeBuildInputs = optionals (!stdenv.isDarwin) [ autoreconfHook - ] ++ optionals (!stdenv.isDarwin && passthru.pythonAtLeast "3.10") [ + pkg-config autoconf-archive # needed for AX_CHECK_COMPILE_FLAG ] ++ [ nukeReferences diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 3965ff4f0882..6bee51f64232 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -201,9 +201,9 @@ in { major = "3"; minor = "11"; patch = "0"; - suffix = "a2"; + suffix = "a4"; }; - sha256 = "sha256-aKjE1s4lSKe2F9aZ+9s0iTe9rODPltsaoIOEnfXa0T8="; + sha256 = "sha256-Q3/nN2w2Pa+vNM6A8ERrQfyaQsDiqMflGdPwoLfPs+0="; inherit (darwin) configd; inherit passthruFun; }; From b96dafafd19e77e5b71ac8aacf7c6cf4090e4fe3 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 28 Jan 2022 22:18:30 -0500 Subject: [PATCH 587/703] pythonPackages.brotli: don't use deepClone It's not reproducible --- pkgs/development/python-modules/brotli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 0556c5b4e2a2..d4cff163a0b1 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1rdp9rx197q467ixp53g4cgc3jbsdaxr62pz0a8ayv2lvm944azh"; + sha256 = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o="; # for some reason, the test data isn't captured in releases, force a git checkout - deepClone = true; + forceFetchGit = true; }; dontConfigure = true; From 93d05cd472ba04254c75450685f8cf7e40a44000 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 31 Jan 2022 21:52:06 +0100 Subject: [PATCH 588/703] expat: 2.4.3 -> 2.4.4 --- .../libraries/expat/CVE-2022-23852-fix.patch | 26 --------- .../libraries/expat/CVE-2022-23852-test.patch | 55 ------------------- .../libraries/expat/CVE-2022-23990.patch | 41 -------------- pkgs/development/libraries/expat/default.nix | 11 +--- 4 files changed, 2 insertions(+), 131 deletions(-) delete mode 100644 pkgs/development/libraries/expat/CVE-2022-23852-fix.patch delete mode 100644 pkgs/development/libraries/expat/CVE-2022-23852-test.patch delete mode 100644 pkgs/development/libraries/expat/CVE-2022-23990.patch diff --git a/pkgs/development/libraries/expat/CVE-2022-23852-fix.patch b/pkgs/development/libraries/expat/CVE-2022-23852-fix.patch deleted file mode 100644 index fbbd080db4ed..000000000000 --- a/pkgs/development/libraries/expat/CVE-2022-23852-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 847a645152f5ebc10ac63b74b604d0c1a79fae40 Mon Sep 17 00:00:00 2001 -From: Samanta Navarro -Date: Sat, 22 Jan 2022 17:48:00 +0100 -Subject: [PATCH] lib: Detect and prevent integer overflow in XML_GetBuffer - (CVE-2022-23852) - ---- - expat/lib/xmlparse.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c -index d54af683..5ce31402 100644 ---- a/expat/lib/xmlparse.c -+++ b/expat/lib/xmlparse.c -@@ -2067,6 +2067,11 @@ XML_GetBuffer(XML_Parser parser, int len) { - keep = (int)EXPAT_SAFE_PTR_DIFF(parser->m_bufferPtr, parser->m_buffer); - if (keep > XML_CONTEXT_BYTES) - keep = XML_CONTEXT_BYTES; -+ /* Detect and prevent integer overflow */ -+ if (keep > INT_MAX - neededSize) { -+ parser->m_errorCode = XML_ERROR_NO_MEMORY; -+ return NULL; -+ } - neededSize += keep; - #endif /* defined XML_CONTEXT_BYTES */ - if (neededSize diff --git a/pkgs/development/libraries/expat/CVE-2022-23852-test.patch b/pkgs/development/libraries/expat/CVE-2022-23852-test.patch deleted file mode 100644 index 3dca8f914a8f..000000000000 --- a/pkgs/development/libraries/expat/CVE-2022-23852-test.patch +++ /dev/null @@ -1,55 +0,0 @@ -From acf956f14bf79a5e6383a969aaffec98bfbc2e44 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sun, 23 Jan 2022 18:17:04 +0100 -Subject: [PATCH] tests: Cover integer overflow in XML_GetBuffer - (CVE-2022-23852) - ---- - expat/tests/runtests.c | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c -index e89e8220..579dad1a 100644 ---- a/expat/tests/runtests.c -+++ b/expat/tests/runtests.c -@@ -3847,6 +3847,30 @@ START_TEST(test_get_buffer_2) { - } - END_TEST - -+/* Test for signed integer overflow CVE-2022-23852 */ -+#if defined(XML_CONTEXT_BYTES) -+START_TEST(test_get_buffer_3_overflow) { -+ XML_Parser parser = XML_ParserCreate(NULL); -+ assert(parser != NULL); -+ -+ const char *const text = "\n"; -+ const int expectedKeepValue = (int)strlen(text); -+ -+ // After this call, variable "keep" in XML_GetBuffer will -+ // have value expectedKeepValue -+ if (XML_Parse(parser, text, (int)strlen(text), XML_FALSE /* isFinal */) -+ == XML_STATUS_ERROR) -+ xml_failure(parser); -+ -+ assert(expectedKeepValue > 0); -+ if (XML_GetBuffer(parser, INT_MAX - expectedKeepValue + 1) != NULL) -+ fail("enlarging buffer not failed"); -+ -+ XML_ParserFree(parser); -+} -+END_TEST -+#endif // defined(XML_CONTEXT_BYTES) -+ - /* Test position information macros */ - START_TEST(test_byte_info_at_end) { - const char *text = ""; -@@ -11731,6 +11755,9 @@ make_suite(void) { - tcase_add_test(tc_basic, test_empty_parse); - tcase_add_test(tc_basic, test_get_buffer_1); - tcase_add_test(tc_basic, test_get_buffer_2); -+#if defined(XML_CONTEXT_BYTES) -+ tcase_add_test(tc_basic, test_get_buffer_3_overflow); -+#endif - tcase_add_test(tc_basic, test_byte_info_at_end); - tcase_add_test(tc_basic, test_byte_info_at_error); - tcase_add_test(tc_basic, test_byte_info_at_cdata); diff --git a/pkgs/development/libraries/expat/CVE-2022-23990.patch b/pkgs/development/libraries/expat/CVE-2022-23990.patch deleted file mode 100644 index 32d7c420b943..000000000000 --- a/pkgs/development/libraries/expat/CVE-2022-23990.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ede41d1e186ed2aba88a06e84cac839b770af3a1 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Wed, 26 Jan 2022 02:36:43 +0100 -Subject: [PATCH] lib: Prevent integer overflow in doProlog (CVE-2022-23990) - -The change from "int nameLen" to "size_t nameLen" -addresses the overflow on "nameLen++" in code -"for (; name[nameLen++];)" right above the second -change in the patch. ---- - expat/lib/xmlparse.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c -index 5ce31402..d1d17005 100644 ---- a/expat/lib/xmlparse.c -+++ b/expat/lib/xmlparse.c -@@ -5372,7 +5372,7 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, - if (dtd->in_eldecl) { - ELEMENT_TYPE *el; - const XML_Char *name; -- int nameLen; -+ size_t nameLen; - const char *nxt - = (quant == XML_CQUANT_NONE ? next : next - enc->minBytesPerChar); - int myindex = nextScaffoldPart(parser); -@@ -5388,7 +5388,13 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, - nameLen = 0; - for (; name[nameLen++];) - ; -- dtd->contentStringLen += nameLen; -+ -+ /* Detect and prevent integer overflow */ -+ if (nameLen > UINT_MAX - dtd->contentStringLen) { -+ return XML_ERROR_NO_MEMORY; -+ } -+ -+ dtd->contentStringLen += (unsigned)nameLen; - if (parser->m_elementDeclHandler) - handleDefault = XML_FALSE; - } diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 371126f4b0dc..322c6ecebbf6 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -7,20 +7,13 @@ stdenv.mkDerivation rec { pname = "expat"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sfnxsaXrsKyqiMn/eb+k4UWCO3iqUYXlxdhfBggkd4o="; + sha256 = "sha256-tdJdbjczUcLtGbVitHMtAdJYmsjI6eeWLY3xIHzDEbg="; }; - patches = [ - ./CVE-2022-23852-fix.patch - ./CVE-2022-23852-test.patch - ./CVE-2022-23990.patch - ]; - patchFlags = "-p2"; - outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; From fc302d4786c234310ad97c574bbbac5be6cb2ab7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 31 Jan 2022 11:54:41 -0300 Subject: [PATCH 589/703] wxGTK29: 2.9.4 -> 2.9.5 Also vendoring the patch --- ...-fix-assertion-using-hide-in-destroy.patch | 43 +++++ .../libraries/wxwidgets/2.9/default.nix | 153 +++++++++++------- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 142 insertions(+), 59 deletions(-) create mode 100644 pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch diff --git a/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch b/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch new file mode 100644 index 000000000000..ca9eb8bf612a --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch @@ -0,0 +1,43 @@ +commit 56a60ee50122613d3a356ce74b4bd77b5e7be235 +Author: Tim Kosse +Date: Sat Aug 26 15:37:30 2017 +0200 + + If a wxTopLevelWindow has been instanced, but Create has not been called, calling Destroy on the window results in an assertion in Show(false), at least under wxGTK. Fix this by only hiding a top level window during destruction if it is actually shown. + +diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp +index ef693690c5..8d07812031 100644 +--- a/src/common/toplvcmn.cpp ++++ b/src/common/toplvcmn.cpp +@@ -122,19 +122,21 @@ bool wxTopLevelWindowBase::Destroy() + // any more as no events will be sent to the hidden window and without idle + // events we won't prune wxPendingDelete list and the application won't + // terminate +- for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), +- end = wxTopLevelWindows.end(); +- i != end; +- ++i ) +- { +- wxTopLevelWindow * const win = static_cast(*i); +- if ( win != this && win->IsShown() ) ++ if ( IsShown() ) { ++ for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), ++ end = wxTopLevelWindows.end(); ++ i != end; ++ ++i ) + { +- // there remains at least one other visible TLW, we can hide this +- // one +- Hide(); ++ wxTopLevelWindow * const win = static_cast(*i); ++ if ( win != this && win->IsShown() ) ++ { ++ // there remains at least one other visible TLW, we can hide this ++ // one ++ Hide(); + +- break; ++ break; ++ } + } + } + diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 5674f076beca..46ef04dcb7a1 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,84 +1,127 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, gtk2 +, libGL +, libGLU +, libSM +, libXinerama +, libXxf86vm +, pkg-config +, xorgproto +, compat24 ? false +, compat26 ? true +, unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, libGLU ? null, libGL ? null -, compat24 ? false, compat26 ? true, unicode ? true -, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null +, darwin }: assert withMesa -> libGLU != null && libGL != null; - -with lib; - +let + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; +in stdenv.mkDerivation rec { - pname = "wxwidgets"; - version = "2.9.4"; + pname = "wxGTK"; + version = "2.9.5"; - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc"; + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + hash = "sha256-izefAPU4lORZxQja7/InHyElJ1++2lDloR+xPudsRNE="; }; patches = [ - (fetchurl { # https://trac.wxwidgets.org/ticket/17942 - url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" - + "fix_assertion_using_hide_in_destroy.diff"; - sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; - }) + # https://github.com/wxWidgets/wxWidgets/issues/17942 + ../0001-fix-assertion-using-hide-in-destroy.patch ]; - buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xorgproto ] - ++ optional withMesa libGLU - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; + nativeBuildInputs = [ + autoconf + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + gtk2 + libSM + libXinerama + libXxf86vm + xorgproto + ] + ++ lib.optional withMesa libGLU + ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + Kernel + QuickTime + setfile + ]; - propagatedBuildInputs = optional stdenv.isDarwin AGL; + propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; - configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") ] - ++ optional unicode "--enable-unicode" - ++ optional withMesa "--with-opengl" - ++ optionals stdenv.isDarwin - # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; + configureFlags = [ + "--disable-precomp-headers" + "--enable-gtk2" + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl" + ++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit + "--enable-universal-binaries" + "--with-cocoa" + "--with-macosx-version-min=10.7" + ]; SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - " + optionalString stdenv.isDarwin '' + preConfigure = '' + ./autogen.sh + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' substituteInPlace configure --replace \ - "-framework System" \ - -lSystem + "-framework System" "-lSystem" ''; - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; + postInstall = '' + pushd $out/include + ln -s wx-*/* . + popd + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.darwin ++ platforms.linux; + badPlatforms = [ "x86_64-darwin" ]; + }; passthru = { inherit compat24 compat26 unicode; gtk = gtk2; }; - - enableParallelBuilding = true; - - meta = { - platforms = with platforms; darwin ++ linux; - license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - badPlatforms = [ "x86_64-darwin" ]; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 274ddf695a12..38d3a41e2d3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20508,10 +20508,7 @@ with pkgs; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; - }; + wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { }; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; From 3b139b96c54e56f9ac7b3b49fc650867391bb665 Mon Sep 17 00:00:00 2001 From: ivanbrennan Date: Sat, 29 Jan 2022 12:51:54 -0500 Subject: [PATCH 590/703] alsa-lib: re-add alsa-plugin-conf-multilib.patch This patch was originally added in 2014 to support running apps with 32bit sound on 64bit architecture. The patch itself add a "libs" field to syntax recognized in /etc/asound.conf: ab8ef63ff49dd6276f765cce10d88b3e5b86b837 The pulseaudio module then used the "libs" to declare locations for both native and 32bit plugins: 0c8ad65560fa1df07ea7b7937e02b44b1ce2b498 In a recent alsa-lib upgrade (1.2.5.1 -> 1.2.6.1), the patch was removed without understanding its purpose, leaving alsa-lib unable to parse the etc/asound.conf that the pulseaudio module generated: aeea1bb53b28fc7bbe4583bd21f5bda8b05d5041 As a result, ALSA utils are failing on x86_64 architecture if pulseaudio is enabled. E.g. $ alsactl monitor default alsa-lib control.c:1464:(snd_ctl_open_conf) Unknown field libs Cannot open ctl default $ alsamixer ALSA lib control.c:1464:(snd_ctl_open_conf) Unknown field libs cannot open mixer: Invalid argument $ speaker-test -t wav -c 2 speaker-test 1.2.6 Playback device is default Stream parameters are 48000Hz, S16_LE, 2 channels WAV file(s) ALSA lib pcm.c:2576:(snd_pcm_open_conf) Unknown field libs Playback open error: -22,Invalid argument Put the patch back in place to fix what was broken. --- .../alsa-lib/alsa-plugin-conf-multilib.patch | 232 ++++++++++++++++++ .../linux/alsa-project/alsa-lib/default.nix | 4 + 2 files changed, 236 insertions(+) create mode 100644 pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch new file mode 100644 index 000000000000..b17df9a492e5 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch @@ -0,0 +1,232 @@ +diff --git a/src/control/control.c b/src/control/control.c +index d66ed75..42cecad 100644 +--- a/src/control/control.c ++++ b/src/control/control.c +@@ -838,6 +838,10 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + #ifndef PIC + extern void *snd_control_open_symbols(void); + #endif ++ ++ snd_config_t *libs = NULL; ++ const char *libs_lib = NULL; ++ + if (snd_config_get_type(ctl_conf) != SND_CONFIG_TYPE_COMPOUND) { + if (name) + SNDERR("Invalid type for CTL %s definition", name); +@@ -879,6 +883,19 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + SNDERR("Invalid type for %s", id); + goto _err; + } ++ ++ continue; ++ } ++ // Handle an array of extra libs. ++ if (strcmp(id, "libs") == 0) { ++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { ++ SNDERR("Invalid type for libs definition in CTL %s definition", ++ str); ++ goto _err; ++ } ++ ++ libs = n; ++ + continue; + } + if (strcmp(id, "open") == 0) { +@@ -903,7 +920,62 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + open_name = buf; + sprintf(buf, "_snd_ctl_%s_open", str); + } +- if (!lib) { ++ ++#ifndef PIC ++ snd_control_open_symbols(); ++#endif ++ ++ // Normal alsa behaviour when there is no libs array. ++ if (!libs) { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1); ++ } ++ } ++ // Handle libs array. ++ // Suppresses error messages if any function is loaded successfully. ++ else { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0); ++ } ++ ++ if (!open_func) { ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ err = snd_config_get_string(n, &libs_lib); ++ if (err < 0) { ++ SNDERR("Invalid entry in CTL %s libs definition", str); ++ goto _err; ++ } ++ ++ if (!open_func) { ++ open_func = snd_dlobj_cache_get(libs_lib, open_name, ++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0); ++ } ++ } ++ } ++ ++ // Print error messages. ++ if (!open_func) { ++ if (lib) { ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ lib, open_name); ++ } ++ ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ snd_config_get_string(n, &libs_lib); ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ libs_lib, open_name); ++ } ++ } ++ } ++ ++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look. ++ if (!lib && (!libs || !libs_lib)) { + const char *const *build_in = build_in_ctls; + while (*build_in) { + if (!strcmp(*build_in, str)) +@@ -919,12 +991,11 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + lib = buf1; + sprintf(buf1, "%s/libasound_module_ctl_%s.so", ALSA_PLUGIN_DIR, str); + } +- } +-#ifndef PIC +- snd_control_open_symbols(); +-#endif +- open_func = snd_dlobj_cache_get(lib, open_name, ++ ++ open_func = snd_dlobj_cache_get(lib, open_name, + SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1); ++ } ++ + if (open_func) { + err = open_func(ctlp, name, ctl_root, ctl_conf, mode); + if (err >= 0) { +diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c +index 2e24338..7f489f4 100644 +--- a/src/pcm/pcm.c ++++ b/src/pcm/pcm.c +@@ -2116,6 +2116,10 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + #ifndef PIC + extern void *snd_pcm_open_symbols(void); + #endif ++ ++ snd_config_t *libs = NULL; ++ const char *libs_lib = NULL; ++ + if (snd_config_get_type(pcm_conf) != SND_CONFIG_TYPE_COMPOUND) { + char *val; + id = NULL; +@@ -2160,6 +2164,19 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + SNDERR("Invalid type for %s", id); + goto _err; + } ++ ++ continue; ++ } ++ // Handle an array of extra libs. ++ if (strcmp(id, "libs") == 0) { ++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { ++ SNDERR("Invalid type for libs definition in PCM %s definition", ++ str); ++ goto _err; ++ } ++ ++ libs = n; ++ + continue; + } + if (strcmp(id, "open") == 0) { +@@ -2184,7 +2201,62 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + open_name = buf; + sprintf(buf, "_snd_pcm_%s_open", str); + } +- if (!lib) { ++ ++#ifndef PIC ++ snd_pcm_open_symbols(); /* this call is for static linking only */ ++#endif ++ ++ // Normal alsa behaviour when there is no libs array. ++ if (!libs) { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1); ++ } ++ } ++ // Handle libs array. ++ // Suppresses error messages if any function is loaded successfully. ++ else { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0); ++ } ++ ++ if (!open_func) { ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ err = snd_config_get_string(n, &libs_lib); ++ if (err < 0) { ++ SNDERR("Invalid entry in PCM %s libs definition", str); ++ goto _err; ++ } ++ ++ if (!open_func) { ++ open_func = snd_dlobj_cache_get(libs_lib, open_name, ++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0); ++ } ++ } ++ } ++ ++ // Print error messages. ++ if (!open_func) { ++ if (lib) { ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ lib, open_name); ++ } ++ ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ snd_config_get_string(n, &libs_lib); ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ libs_lib, open_name); ++ } ++ } ++ } ++ ++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look. ++ if (!lib && (!libs || !libs_lib)) { + const char *const *build_in = build_in_pcms; + while (*build_in) { + if (!strcmp(*build_in, str)) +@@ -2200,12 +2272,11 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + lib = buf1; + sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str); + } +- } +-#ifndef PIC +- snd_pcm_open_symbols(); /* this call is for static linking only */ +-#endif +- open_func = snd_dlobj_cache_get(lib, open_name, ++ ++ open_func = snd_dlobj_cache_get(lib, open_name, + SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1); ++ } ++ + if (open_func) { + err = open_func(pcmp, name, pcm_root, pcm_conf, stream, mode); + if (err >= 0) { diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index 445d171d31fd..f2cc2b48a7eb 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { hash = "sha256-rVgpk9Us21+xWaC+q2CmrFfqsMwb34XcTbbWGX8CMz8="; }; + patches = [ + ./alsa-plugin-conf-multilib.patch + ]; + enableParallelBuilding = true; postInstall = '' From 02acead6eb2ddb77f4deea6444e429632011a086 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 31 Jan 2022 22:11:43 +0100 Subject: [PATCH 591/703] python3Packages.ipython: enable tests, reformat The infinite recursion with ipykernel was been resolved in 9e3b98531. --- .../python-modules/ipython/default.nix | 72 +++++++++++-------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e0d780fb9c79..cee9868cfacb 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -3,69 +3,79 @@ , buildPythonPackage , fetchPypi , pythonOlder + # Build dependencies , glibcLocales -# Test dependencies -, nose -, pygments + # Runtime dependencies -, black -, jedi -, decorator -, matplotlib-inline -, pickleshare -, traitlets -, prompt-toolkit -, pexpect , appnope , backcall +, black +, decorator +, jedi +, matplotlib-inline +, pexpect +, pickleshare +, prompt-toolkit +, pygments , stack-data +, traitlets + +# Test dependencies +, pytestCheckHook +, testpath }: buildPythonPackage rec { pname = "ipython"; version = "8.0.1"; - disabled = pythonOlder "3.7"; + format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; sha256 = "0x19sj4dlq7r4p1mqnpx9245r8dwvpjwd8n34snfm37a452lsmmb"; }; - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace "'gnureadline'" " " - ''; - - buildInputs = [ glibcLocales ]; - - checkInputs = [ nose pygments ]; + buildInputs = [ + glibcLocales + ]; propagatedBuildInputs = [ + backcall black - jedi decorator + jedi matplotlib-inline + pexpect pickleshare - stack-data - traitlets prompt-toolkit pygments - pexpect - backcall - ] ++ lib.optionals stdenv.isDarwin [appnope]; + stack-data + traitlets + ] ++ lib.optionals stdenv.isDarwin [ + appnope + ]; LC_ALL="en_US.UTF-8"; - doCheck = false; # Circular dependency with ipykernel - - checkPhase = '' - nosetests - ''; - pythonImportsCheck = [ "IPython" ]; + preCheck = '' + export HOME=$TMPDIR + + # doctests try to fetch an image from the internet + substituteInPlace pytest.ini \ + --replace "--ipdoctest-modules" "--ipdoctest-modules --ignore=IPython/core/display.py" + ''; + + checkInputs = [ + pytestCheckHook + testpath + ]; + meta = with lib; { description = "IPython: Productive Interactive Computing"; homepage = "http://ipython.org/"; From dd35016349992f73947b2c7f4c0e7597d6337425 Mon Sep 17 00:00:00 2001 From: ivanbrennan Date: Tue, 1 Feb 2022 08:44:15 -0500 Subject: [PATCH 592/703] alsa-lib: document alsa-plugin-conf-multilib.patch --- pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index f2cc2b48a7eb..58e5990ae0a6 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { }; patches = [ + # Add a "libs" field to the syntax recognized in the /etc/asound.conf file. + # The nixos modules for pulseaudio, jack, and pipewire are leveraging this + # "libs" field to declare locations for both native and 32bit plugins, in + # order to support apps with 32bit sound running on x86_64 architecture. ./alsa-plugin-conf-multilib.patch ]; From 4c8019a8e5cc54464d4e253b88fd10cb9492ff8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 1 Feb 2022 15:38:13 +0100 Subject: [PATCH 593/703] python3Packages.django_2: 2.2.26 -> 2.2.27 https://www.djangoproject.com/weblog/2022/feb/01/security-releases/ Fixes: CVE-2022-23833, CVE-2022-22818 --- pkgs/development/python-modules/django/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index f20eb49c0233..c4df27beaaa2 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.26"; + version = "2.2.27"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-36U3Jn1SxiQ6YrMoVadEyoPDfHBgCqz/v9mLxdbYUY8="; + sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM="; }; patches = lib.optional withGdal From 1194b292d931848114f805351f2ce0da0002751d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 1 Feb 2022 15:45:21 +0100 Subject: [PATCH 594/703] python3Packages.django_3: 3.2.11 -> 3.2.12 https://www.djangoproject.com/weblog/2022/feb/01/security-releases/ Fixes: CVE-2022-23833, CVE-2022-22818 --- pkgs/development/python-modules/django/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index a7bafcfb2707..3ed7024c3499 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.11"; + version = "3.2.12"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aclKvl1rGwiL9HXgm3t0QD+UPjTaEH55hGXSBF2ifnU="; + sha256 = "sha256-l3Lmk1cD5Z6ZOWCDLWamFM8CM6HFEjvGIk7MataeQeI="; }; patches = lib.optional withGdal From da86fe2cd69c3b12b86040f349fe87a63e4f541c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 1 Feb 2022 16:19:51 +0100 Subject: [PATCH 595/703] samba: 4.15.3 -> 4.15.5 https://www.openwall.com/lists/oss-security/2022/02/01/1 Fixes: CVE-2021-44141, CVE-2021-44142, CEV-2022-0336 --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index f70c33156c3a..d32a545069de 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.3"; + version = "4.15.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-UZOZQEORVQNFhGdo6k3Q/n/LBOIMK4kbXusC5VVBN9s="; + sha256 = "sha256-aRFeM4MZN7pRUb4CR5QxR3Za7OZYunQ/RHQWcq1o0X8="; }; outputs = [ "out" "dev" "man" ]; From 2e04cdd240ff3439779928721bdc0fa6ff813346 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 1 Feb 2022 12:18:35 -0600 Subject: [PATCH 596/703] boehmgc: drop musl flags, per upstream's note (!) (#157625) https://github.com/NixOS/nixpkgs/commit/0938316e058850460ea206c8eb2ebb819cdee493#commitcomment-63005097 Resulting binaries are identifical according to diffoscope (other than embedded /nix/store/.../ paths). FWIW, going back through versions we've packaged, the most recent instance where these flags produced differing outputs was in 7.6.8 (comparing $out's only, FWIW). --- pkgs/development/libraries/boehm-gc/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index b20bdac90876..d5057a614843 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -19,10 +19,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" - ''; - # boehm-gc whitelists GCC threading models patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch; From 29c409f82423042a367f73c14d6595c032a8302a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Feb 2022 12:08:04 +0100 Subject: [PATCH 597/703] cmake: 3.22.1 -> 3.22.2 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 5c57776a918a..47abc7ec767b 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI"; - version = "3.22.1"; + version = "3.22.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-DpmCKVSdez82hwPSDiSOfuH4U5ENQnBKqHkYwhPqgsA="; + sha256 = "sha256-PBxHi5ZQsQfUUsW9VFxy4vrU43wJuJoZhLmi9G32rO0="; }; patches = [ From b374193c51700cb9b026ae1ef35ad0c7c4bbb38a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 1 Feb 2022 00:25:51 -0300 Subject: [PATCH 598/703] wxGTK30: rewrite --- .../libraries/wxwidgets/3.0/default.nix | 167 +++++++++++------- pkgs/top-level/all-packages.nix | 4 - 2 files changed, 105 insertions(+), 66 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 30e807cde057..0469ccbd0dfb 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,20 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config -, libXinerama, libSM, libXxf86vm -, gtk2, gtk3 -, xorgproto, gst_all_1, setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, withMesa ? libGLSupported -, libGLU, libGL -, compat24 ? false, compat26 ? true, unicode ? true +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, gtk2 +, gtk3 +, libGL +, libGLU +, libSM +, libXinerama +, libXxf86vm +, pkg-config +, xorgproto +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, compat24 ? false +, compat26 ? true +, unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk -, AGL, Carbon, Cocoa, Kernel, QTKit +, darwin }: -with lib; - -assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2."; +assert withGtk2 -> (!withWebKit); +let + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + inherit (gst_all_1) gstreamer gst-plugins-base; + gtk = if withGtk2 then gtk2 else gtk3; +in stdenv.mkDerivation rec { pname = "wxwidgets"; version = "3.0.5"; @@ -23,73 +36,103 @@ stdenv.mkDerivation rec { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; + hash = "sha256-p69nNCg552j+nldGY0oL65uFRVu4xXCkoE10F5MwY9A="; }; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optional withGtk2 gtk2 - ++ optional (!withGtk2) gtk3 - ++ optional withMesa libGLU - ++ optional withWebKit webkitgtk - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - - propagatedBuildInputs = optional stdenv.isDarwin AGL; - - patches = [ - (fetchurl { # https://trac.wxwidgets.org/ticket/17942 - url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" - + "fix_assertion_using_hide_in_destroy.diff"; - sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; - }) + nativeBuildInputs = [ + pkg-config ]; - configureFlags = - [ "--disable-precomp-headers" "--enable-mediactrl" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") ] - ++ optional unicode "--enable-unicode" - ++ optional withMesa "--with-opengl" - ++ optionals stdenv.isDarwin - # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ] - ++ optionals withWebKit - ["--enable-webview" "--enable-webview-webkit"]; + buildInputs = [ + gstreamer + gst-plugins-base + gtk + libSM + libXinerama + libXxf86vm + xorgproto + ] + ++ lib.optional withMesa libGLU + ++ lib.optional withWebKit webkitgtk + ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + Kernel + QTKit + setfile + ]; + + propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + + patches = [ + # https://github.com/wxWidgets/wxWidgets/issues/17942 + ../0001-fix-assertion-using-hide-in-destroy.patch + ]; + + configureFlags = [ + "--disable-precomp-headers" + "--enable-mediactrl" + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl" + ++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit + "--enable-universal-binaries" + "--with-cocoa" + "--with-macosx-version-min=10.7" + ] + ++ lib.optionals withWebKit [ + "--enable-webview" + "--enable-webview-webkit" + ]; SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - " + optionalString stdenv.isDarwin '' + preConfigure = '' + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' substituteInPlace configure --replace \ - "-framework System" \ - -lSystem + "-framework System" "-lSystem" ''; - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = { - inherit compat24 compat26 unicode; - gtk = if withGtk2 then gtk2 else gtk3; - }; + postInstall = '' + pushd $out/include + ln -s wx-*/* . + popd + ''; enableParallelBuilding = true; - meta = { - platforms = with platforms; darwin ++ linux; - license = licenses.wxWindows; + meta = with lib; { homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux ++ platforms.darwin; badPlatforms = [ "x86_64-darwin" ]; }; + + passthru = { + inherit gtk; + inherit compat24 compat26 unicode; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4959c02e879..df166a163f41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20544,14 +20544,10 @@ with pkgs; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = false; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { From 36c4ded2ab6f9076f901b4089cc12c453806a73c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 1 Feb 2022 23:57:23 -0300 Subject: [PATCH 599/703] pixinsight: mime-types is now mailcap --- pkgs/applications/graphics/pixinsight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 7133c914b66a..8396ba55638f 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot -, mime-types, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig +, mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig , dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim # Qt 5 subpackages , qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fakeroot wrapQtAppsHook autoPatchelfHook - mime-types + mailcap libudev0-shim ]; From d7bb7e244e23bd4baf5e1c233bcd09974071a03a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 1 Feb 2022 21:59:29 -0500 Subject: [PATCH 600/703] pixinsight: fix eval A conflict between #156082 and #155159 --- pkgs/applications/graphics/pixinsight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 7133c914b66a..8396ba55638f 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot -, mime-types, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig +, mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig , dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim # Qt 5 subpackages , qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fakeroot wrapQtAppsHook autoPatchelfHook - mime-types + mailcap libudev0-shim ]; From c67f885fe4cf70856b9f0052c1ce48f1abfcfe95 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 28 Jun 2021 14:16:04 +0200 Subject: [PATCH 601/703] makeWrapper: Don't readd existing values in prefix/suffix When prefixing or suffixing list variables, check that the value or values aren't already part of the list. If this is the case when suffixing, the list won't be touched at all. When prefixing, however, the last matching instance of the value will be moved to the beginning of the list. Any remaining duplicates of the value will be left as-is. Co-authored-by: Vincenzo Mantova --- .../build-support/setup-hooks/make-wrapper.sh | 78 +++++++++++++------ 1 file changed, 56 insertions(+), 22 deletions(-) diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 903e17c3b2e5..604096135c20 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -36,6 +36,58 @@ makeWrapper() { assertExecutable "$original" + # Write wrapper code which adds `value` to the beginning or end of + # the list variable named by `varName`, depending on the `mode` + # specified. + # + # A value which is already part of the list will not be added + # again. If this is the case and the `suffix` mode is used, the + # list won't be touched at all. The `prefix` mode will however + # move the last matching instance of the value to the beginning + # of the list. Any remaining duplicates of the value will be left + # as-is. + addValue() { + local mode="$1" # `prefix` or `suffix` to add to the beginning or end respectively + local varName="$2" # name of list variable to add to + local separator="$3" # character used to separate elements of list + local value="$4" # one value, or multiple values separated by `separator`, to add to list + if test -n "$value"; then + local old_ifs=$IFS + IFS=$separator + + if [[ "$mode" == '--prefix'* ]]; then + # Keep the order of the components as written when + # prefixing; normally, they would be added in the + # reverse order. + local tmp= + for v in $value; do + tmp=$v${tmp:+$separator}$tmp + done + value="$tmp" + fi + for v in $value; do + { + echo "$varName=\${$varName:+${separator@Q}\$$varName${separator@Q}}" # add separators on both ends unless empty + if [[ "$mode" == '--prefix'* ]]; then # -- in prefix mode -- + echo "$varName=\${$varName/${separator@Q}${v@Q}${separator@Q}/${separator@Q}}" # remove the first instance of the value (if any) + echo "$varName=${v@Q}\$$varName" # prepend the value + elif [[ "$mode" == '--suffix'* ]]; then # -- in suffix mode -- + echo "if [[ \$$varName != *${separator@Q}${v@Q}${separator@Q}* ]]; then" # if the value isn't already in the list + echo " $varName=\$$varName${v@Q}" # append the value + echo "fi" + else + echo "unknown mode $mode!" 1>&2 + exit 1 + fi + echo "$varName=\${$varName#${separator@Q}}" # remove leading separator + echo "$varName=\${$varName%${separator@Q}}" # remove trailing separator + echo "export $varName" + } >> "$wrapper" + done + IFS=$old_ifs + fi + } + mkdir -p "$(dirname "$wrapper")" echo "#! @shell@ -e" > "$wrapper" @@ -67,28 +119,14 @@ makeWrapper() { separator="${params[$((n + 2))]}" value="${params[$((n + 3))]}" n=$((n + 3)) - if test -n "$value"; then - if test "$p" = "--suffix"; then - echo "export $varName=\$$varName\${$varName:+${separator@Q}}${value@Q}" >> "$wrapper" - else - echo "export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName" >> "$wrapper" - fi - fi - elif [[ "$p" == "--prefix-each" ]]; then + addValue "$p" "$varName" "$separator" "$value" + elif [[ ("$p" == "--suffix-each") || ("$p" == "--prefix-each") ]]; then varName="${params[$((n + 1))]}" separator="${params[$((n + 2))]}" values="${params[$((n + 3))]}" n=$((n + 3)) for value in $values; do - echo "export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName" >> "$wrapper" - done - elif [[ "$p" == "--suffix-each" ]]; then - varName="${params[$((n + 1))]}" - separator="${params[$((n + 2))]}" - values="${params[$((n + 3))]}" - n=$((n + 3)) - for value in $values; do - echo "export $varName=\$$varName\${$varName:+$separator}${value@Q}" >> "$wrapper" + addValue "$p" "$varName" "$separator" "$value" done elif [[ ("$p" == "--suffix-contents") || ("$p" == "--prefix-contents") ]]; then varName="${params[$((n + 1))]}" @@ -97,11 +135,7 @@ makeWrapper() { n=$((n + 3)) for fileName in $fileNames; do contents="$(cat "$fileName")" - if test "$p" = "--suffix-contents"; then - echo "export $varName=\$$varName\${$varName:+$separator}${contents@Q}" >> "$wrapper" - else - echo "export $varName=${contents@Q}\${$varName:+$separator}\$$varName" >> "$wrapper" - fi + addValue "$p" "$varName" "$separator" "$contents" done elif [[ "$p" == "--add-flags" ]]; then flags="${params[$((n + 1))]}" From be2aa01de789b490c7f6880b57e8d837fc2c8203 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 22 Jun 2021 23:05:38 +0200 Subject: [PATCH 602/703] tests: Add test for makeWrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Janne Heß --- pkgs/test/default.nix | 2 + pkgs/test/make-wrapper/default.nix | 136 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 ++- 3 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 pkgs/test/make-wrapper/default.nix diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b7980c478c66..4110327946d9 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -67,4 +67,6 @@ with pkgs; writers = callPackage ../build-support/writers/test.nix {}; dhall = callPackage ./dhall { }; + + makeWrapper = callPackage ./make-wrapper {}; } diff --git a/pkgs/test/make-wrapper/default.nix b/pkgs/test/make-wrapper/default.nix new file mode 100644 index 000000000000..6e70945ee194 --- /dev/null +++ b/pkgs/test/make-wrapper/default.nix @@ -0,0 +1,136 @@ +{ lib +, writeText +, writeCBin +, writeShellScript +, makeWrapper +, runCommand +, which +, ... +}: + +let + # Testfiles + foofile = writeText "foofile" "foo"; + barfile = writeText "barfile" "bar"; + + # Wrapped binaries + wrappedArgv0 = writeCBin "wrapped-argv0" '' + #include + #include + + void main(int argc, char** argv) { + printf("argv0=%s", argv[0]); + exit(0); + } + ''; + wrappedBinaryVar = writeShellScript "wrapped-var" '' + echo "VAR=$VAR" + ''; + wrappedBinaryArgs = writeShellScript "wrapped-args" '' + echo "$@" + ''; + + mkWrapperBinary = { name, args, wrapped ? wrappedBinaryVar }: runCommand name + { + nativeBuildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + makeWrapper "${wrapped}" "$out/bin/${name}" ${lib.escapeShellArgs args} + ''; + + mkTest = cmd: toExpect: '' + output="$(${cmd})" + if [[ "$output" != '${toExpect}' ]]; then + echo "test failed: the output of ${cmd} was '$output', expected '${toExpect}'" + echo "the wrapper contents:" + for i in ${cmd}; do + if [[ $i =~ ^test- ]]; then + cat $(which $i) + fi + done + exit 1 + fi + ''; +in +runCommand "make-wrapper-test" +{ + nativeBuildInputs = [ + which + (mkWrapperBinary { name = "test-argv0"; args = [ "--argv0" "foo" ]; wrapped = "${wrappedArgv0}/bin/wrapped-argv0"; }) + (mkWrapperBinary { name = "test-set"; args = [ "--set" "VAR" "abc" ]; }) + (mkWrapperBinary { name = "test-set-default"; args = [ "--set-default" "VAR" "abc" ]; }) + (mkWrapperBinary { name = "test-unset"; args = [ "--unset" "VAR" ]; }) + (mkWrapperBinary { name = "test-run"; args = [ "--run" "echo bar" ]; }) + (mkWrapperBinary { name = "test-run-and-set"; args = [ "--run" "export VAR=foo" "--set" "VAR" "bar" ]; }) + (mkWrapperBinary { name = "test-args"; args = [ "--add-flags" "abc" ]; wrapped = wrappedBinaryArgs; }) + (mkWrapperBinary { name = "test-prefix"; args = [ "--prefix" "VAR" ":" "abc" ]; }) + (mkWrapperBinary { name = "test-suffix"; args = [ "--suffix" "VAR" ":" "abc" ]; }) + (mkWrapperBinary { name = "test-prefix-and-suffix"; args = [ "--prefix" "VAR" ":" "foo" "--suffix" "VAR" ":" "bar" ]; }) + (mkWrapperBinary { name = "test-prefix-multi"; args = [ "--prefix" "VAR" ":" "abc:foo:foo" ]; }) + (mkWrapperBinary { name = "test-suffix-each"; args = [ "--suffix-each" "VAR" ":" "foo bar:def" ]; }) + (mkWrapperBinary { name = "test-prefix-each"; args = [ "--prefix-each" "VAR" ":" "foo bar:def" ]; }) + (mkWrapperBinary { name = "test-suffix-contents"; args = [ "--suffix-contents" "VAR" ":" "${foofile} ${barfile}" ]; }) + (mkWrapperBinary { name = "test-prefix-contents"; args = [ "--prefix-contents" "VAR" ":" "${foofile} ${barfile}" ]; }) + ]; +} + ( + # --argv0 works + mkTest "test-argv0" "argv0=foo" + + # --set works + + mkTest "test-set" "VAR=abc" + # --set overwrites the variable + + mkTest "VAR=foo test-set" "VAR=abc" + # --set-default works + + mkTest "test-set-default" "VAR=abc" + # --set-default doesn"t overwrite the variable + + mkTest "VAR=foo test-set-default" "VAR=foo" + # --unset works + + mkTest "VAR=foo test-unset" "VAR=" + + # --add-flags works + + mkTest "test-args" "abc" + # given flags are appended + + mkTest "test-args foo" "abc foo" + + # --run works + + mkTest "test-run" "bar\nVAR=" + # --run & --set works + + mkTest "test-run-and-set" "VAR=bar" + + # --prefix works + + mkTest "VAR=foo test-prefix" "VAR=abc:foo" + # sets variable if not set yet + + mkTest "test-prefix" "VAR=abc" + # prepends value only once + + mkTest "VAR=abc test-prefix" "VAR=abc" + # Moves value to the front if it already existed + + mkTest "VAR=foo:abc test-prefix" "VAR=abc:foo" + + mkTest "VAR=abc:foo:bar test-prefix-multi" "VAR=abc:foo:bar" + # Doesn't overwrite parts of the string + + mkTest "VAR=test:abcde:test test-prefix" "VAR=abc:test:abcde:test" + # Only append the value once when given multiple times in a parameter + # to makeWrapper + + mkTest "test-prefix" "VAR=abc" + + + # --suffix works + + mkTest "VAR=foo test-suffix" "VAR=foo:abc" + # sets variable if not set yet + + mkTest "test-suffix" "VAR=abc" + # adds the same value only once + + mkTest "VAR=abc test-suffix" "VAR=abc" + + mkTest "VAR=abc:foo test-suffix" "VAR=abc:foo" + # --prefix in combination with --suffix + + mkTest "VAR=abc test-prefix-and-suffix" "VAR=foo:abc:bar" + + # --suffix-each works + + mkTest "VAR=abc test-suffix-each" "VAR=abc:foo:bar:def" + # --prefix-each works + + mkTest "VAR=abc test-prefix-each" "VAR=bar:def:foo:abc" + # --suffix-contents works + + mkTest "VAR=abc test-suffix-contents" "VAR=abc:foo:bar" + # --prefix-contents works + + mkTest "VAR=abc test-prefix-contents" "VAR=bar:foo:abc" + + "touch $out" + ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbb6be6c25b6..067e782cc365 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -715,8 +715,14 @@ with pkgs; makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out - makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; }; } - ../build-support/setup-hooks/make-wrapper.sh; + makeWrapper = makeSetupHook + { deps = [ dieHook ]; + substitutions = { + shell = targetPackages.runtimeShell; + passthru.tests = tests.makeWrapper; + }; + } + ../build-support/setup-hooks/make-wrapper.sh; makeBinaryWrapper = let f = { cc, sanitizers }: let From 2622b175101e2411bf94f4818b5b5bc77ba7e563 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 1 Feb 2022 12:42:04 -0800 Subject: [PATCH 603/703] johnnycanencrypt: fix vendor sha256 --- pkgs/development/python-modules/johnnycanencrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 635ea12d5f84..9f247c2d7569 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit patches src; name = "${pname}-${version}"; - hash = "sha256-2XhXCKyXVlFgbcOoMy/A5ajiIVxBii56YeI29mO720U="; + hash = "sha256-1dRFC59GY7M99LvQWy2eXPesmLX5k46rN8l4suLYkQY="; }; format = "pyproject"; From d445fb7d60c8899406789c7e758910e7bcd37159 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 2 Feb 2022 00:07:54 -0300 Subject: [PATCH 604/703] aliases.nix: organize in ASCIIbetical ordering - Part I For now, just some comments documenting the novelty. --- pkgs/top-level/aliases.nix | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d66d375b2c6a..a3d7007955b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -3,11 +3,11 @@ lib: self: super: with self; let - # Removing recurseForDerivation prevents derivations of aliased attribute - # set to appear while listing all the packages available. + # Removing recurseForDerivation prevents derivations of aliased attribute set + # to appear while listing all the packages available. removeRecurseForDerivations = alias: with lib; - if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] + if alias.recurseForDerivations or false + then removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package @@ -17,20 +17,23 @@ let dontDistribute alias else alias; - # Make sure that we are not shadowing something from - # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n super - then throw "Alias ${n} is still in all-packages.nix" - else alias; + # Make sure that we are not shadowing something from all-packages.nix. + checkInPkgs = n: alias: + if builtins.hasAttr n super + then throw "Alias ${n} is still in all-packages.nix" + else alias; mapAliases = aliases: - lib.mapAttrs (n: alias: removeDistribute - (removeRecurseForDerivations - (checkInPkgs n alias))) - aliases; + lib.mapAttrs (n: alias: + removeDistribute + (removeRecurseForDerivations + (checkInPkgs n alias))) + aliases; in - ### Deprecated aliases - for backward compatibility +### Deprecated aliases - for backward compatibility +### Please maintain this list in ASCIIbetical ordering. +### Hint: the "sections" are delimited by ### ### mapAliases ({ _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; From 82e3f13c03ef017463e38d9b881b8dbe15d1967c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 2 Feb 2022 00:13:32 -0300 Subject: [PATCH 605/703] aliases.nix: organize in ASCIIbetical ordering - Part II Create the "sections" described before. --- pkgs/top-level/aliases.nix | 2172 ++++++++++++++++++------------------ 1 file changed, 1111 insertions(+), 1061 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a3d7007955b5..499243a92d73 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -36,101 +36,114 @@ in ### Hint: the "sections" are delimited by ### ### mapAliases ({ + # forceSystem should not be used directly in Nixpkgs. + # Added 2018-07-16 + forceSystem = system: _: + (import self.path { localSystem = { inherit system; }; }); + _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; - PPSSPP = ppsspp; # added 2017-10-01 - QmidiNet = qmidinet; # added 2016-05-22 - accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 - adobeReader = adobe-reader; # added 2013-11-04 - adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01 - aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 - ag = silver-searcher; # added 2018-04-25 - aircrackng = aircrack-ng; # added 2016-01-14 - airtame = throw "airtame has been removed due to being unmaintained."; # added 2022-01-19 - aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 - alienfx = throw "alienfx has been removed."; # added 2019-12-08 - alsaLib = alsa-lib; # added 2021-06-09 - alsaOss = alsa-oss; # added 2021-06-10 - alsaPlugins = alsa-plugins; # added 2021-06-10 - alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10 - alsaTools = alsa-tools; # added 2021-06-10 - alsaUtils = alsa-utils; # added 2021-06-10 - amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 - aminal = throw "aminal was renamed to darktile."; # added 2021-09-28 - ammonite-repl = ammonite; # added 2017-05-02 - amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 - angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06 - antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # added 2020-08-06 - antimicroX = antimicrox; # added 2021-10-31 - arduino_core = arduino-core; # added 2015-02-04 - ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 - arora = throw "arora has been removed."; # added 2020-09-09 - asciidocFull = asciidoc-full; # added 2014-06-22 - asn1c = throw "asn1c has been removed: deleted by upstream"; # added 2022-01-07 - asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07 - at_spi2_atk = at-spi2-atk; # added 2018-02-25 - at_spi2_core = at-spi2-core; # added 2018-02-25 - aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26 - avldrums-lv2 = x42-avldrums; # added 2020-03-29 - avxsynth = throw "avxsynth was removed because it was broken"; # added 2021-05-18 - azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # added 2021-08-02 + + ### A ### + + accounts-qt = libsForQt5.accounts-qt; # Added 2015-12-19 + adobeReader = adobe-reader; # Added 2013-11-04 + adobe_flex_sdk = apache-flex-sdk; # Added 2018-06-01 + aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 + ag = silver-searcher; # Added 2018-04-25 + aircrackng = aircrack-ng; # Added 2016-01-14 + airtame = throw "airtame has been removed due to being unmaintained."; # Added 2022-01-19 + aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # Added 2020-11-30 + alienfx = throw "alienfx has been removed."; # Added 2019-12-08 + alsaLib = alsa-lib; # Added 2021-06-09 + alsaOss = alsa-oss; # Added 2021-06-10 + alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 + alsaPlugins = alsa-plugins; # Added 2021-06-10 + alsaTools = alsa-tools; # Added 2021-06-10 + alsaUtils = alsa-utils; # Added 2021-06-10 + amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # Added 2020-10-30 + aminal = throw "aminal was renamed to darktile."; # Added 2021-09-28 + ammonite-repl = ammonite; # Added 2017-05-02 + amsn = throw "amsn has been removed due to being unmaintained."; # Added 2020-12-09 + angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06 + antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # Added 2020-08-06 + antimicroX = antimicrox; # Added 2021-10-31 + ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 + arduino_core = arduino-core; # Added 2015-02-04 + arora = throw "arora has been removed."; # Added 2020-09-09 + asciidocFull = asciidoc-full; # Added 2014-06-22 + asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 + asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # Added 2020-10-07 + at_spi2_atk = at-spi2-atk; # Added 2018-02-25 + at_spi2_core = at-spi2-core; # Added 2018-02-25 + aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # Added 2020-12-26 + avldrums-lv2 = x42-avldrums; # Added 2020-03-29 + avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 + azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 + + ### B ### + badtouch = authoscope; # Project was renamed, added 20210626 - bar-xft = lemonbar-xft; # added 2015-01-16 - bashburn = throw "bashburn has been removed: deleted by upstream"; # added 2022-01-07 + bar-xft = lemonbar-xft; # Added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 - bash_5 = bash; # added 2021-08-20 - bashInteractive_5 = bashInteractive; # added 2021-08-20 - batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 - bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 - bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 - bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22 - beegfs = throw "beegfs has been removed."; # added 2019-11-24 - beret = throw "beret has been removed"; # added 2021-11-16 - blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # added 2022-01-01 + bashInteractive_5 = bashInteractive; # Added 2021-08-20 + bash_5 = bash; # Added 2021-08-20 + bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 + batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 + bazaar = throw "bazaar has been deprecated by breezy."; # Added 2020-04-19 + bazaarTools = throw "bazaar has been deprecated by breezy."; # Added 2020-04-19 + bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 + beegfs = throw "beegfs has been removed."; # Added 2019-11-24 + beret = throw "beret has been removed"; # Added 2021-11-16 + bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 + bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 + blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # Added 2022-01-01 bluezFull = bluez; # Added 2019-12-03 - bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # added 2022-01-07 + bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10 + bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # Added 2019-12-10 bpftool = bpftools; # Added 2021-05-03 - brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24 - bridge_utils = bridge-utils; # added 2015-02-20 - bro = zeek; # added 2019-09-29 - bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10 - bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10 - btrfsProgs = btrfs-progs; # added 2016-01-03 - bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # added 2021-08-22 + brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 + bridge_utils = bridge-utils; # Added 2015-02-20 + bro = zeek; # Added 2019-09-29 + btrfsProgs = btrfs-progs; # Added 2016-01-03 # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) bitwarden_rs = vaultwarden; - bitwarden_rs-sqlite = vaultwarden-sqlite; bitwarden_rs-mysql = vaultwarden-mysql; bitwarden_rs-postgresql = vaultwarden-postgresql; + bitwarden_rs-sqlite = vaultwarden-sqlite; bitwarden_rs-vault = vaultwarden-vault; - blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # added 2022-01-12 - bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 - bsod = throw "bsod has been removed: deleted by upstream"; # added 2022-01-07 - btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 - buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 - buildkite-agent3 = buildkite-agent; # added 2018-09-26 - bundler_HEAD = bundler; # added 2015-11-15 - bunny = throw "bunny has been removed: deleted by upstream"; # added 2022-01-07 - bypass403 = throw "bypass403 has been removed: deleted by upstream"; # added 2022-01-07 - calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 - calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 - caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02 - cantarell_fonts = cantarell-fonts; # added 2018-03-03 - cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20 + blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # Added 2022-01-12 + bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # Added 2021-01-02 + bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 + btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # Added 2020-11-03 + buildPerlPackage = perlPackages.buildPerlPackage; # Added 2018-10-12 + buildkite-agent3 = buildkite-agent; # Added 2018-09-26 + bundler_HEAD = bundler; # Added 2015-11-15 + bunny = throw "bunny has been removed: deleted by upstream"; # Added 2022-01-07 + bypass403 = throw "bypass403 has been removed: deleted by upstream"; # Added 2022-01-07 + + ### C ### + + caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 + calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # Added 2021-01-13 + calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # Added 2021-01-13 + cantarell_fonts = cantarell-fonts; # Added 2018-03-03 + cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # Added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; - catfish = xfce.catfish; # added 2019-12-22 - ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # added 2021-03-25 - cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # added 2022-01-12 - cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 - checkbashism = checkbashisms; # added 2016-08-16 - chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15 - chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # added 2022-01-07 + catfish = xfce.catfish; # Added 2019-12-22 + ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 + cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # Added 2022-01-12 + cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # Added 2020-06-05 + checkbashism = checkbashisms; # Added 2016-08-16 + chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 + chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream"; - cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 - cifs_utils = cifs-utils; # added 2016-08 - ckb = ckb-next; # added 2018-10-21 - creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01 + cifs_utils = cifs-utils; # Added 2016-08 + cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 + ckb = ckb-next; # Added 2018-10-21 + callPackage_i686 = pkgsi686Linux.callPackage; + creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 # these are for convenience, not for backward compat and shouldn't expire clang5Stdenv = lowPrio llvmPackages_5.stdenv; @@ -142,73 +155,81 @@ mapAliases ({ clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; - clangAnalyzer = clang-analyzer; # added 2015-02-20 - claws-mail-gtk3 = claws-mail; # added 2021-07-10 - clawsMail = claws-mail; # added 2016-04-29 - claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # added 2021-12-05 - clutter_gtk = clutter-gtk; # added 2018-02-25 - cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05 - codimd = hedgedoc; # added 2020-11-29 - compton = picom; # added 2019-12-02 - compton-git = compton; # added 2019-05-20 - concurrencykit = libck; # added 2021-03 - conntrack_tools = conntrack-tools; # added 2018-05 - cool-old-term = cool-retro-term; # added 2015-01-31 - coprthr = throw "coprthr has been removed."; # added 2019-12-08 - couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 - couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 - coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 - corsmisc = throw "corsmisc has been removed (upstream is gone)"; # added 2022-01-24 - cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 - cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # added 2022-01-07 - crafty = throw "crafty has been removed: deleted by upstream"; # 2022-01-07 - cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 - cpp-gsl = microsoft_gsl; # added 2019-05-24 - cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 - cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 - cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 - cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 - cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 - cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 - cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 - cupsBjnp = cups-bjnp; # added 2016-01-02 - cups_filters = cups-filters; # added 2016-08 - cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + clangAnalyzer = clang-analyzer; # Added 2015-02-20 + claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05 + claws-mail-gtk3 = claws-mail; # Added 2021-07-10 + clawsMail = claws-mail; # Added 2016-04-29 + clutter_gtk = clutter-gtk; # Added 2018-02-25 + cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05 + codimd = hedgedoc; # Added 2020-11-29 + compton = picom; # Added 2019-12-02 + compton-git = compton; # Added 2019-05-20 + concurrencykit = libck; # Added 2021-03 + conntrack_tools = conntrack-tools; # Added 2018-05 + cool-old-term = cool-retro-term; # Added 2015-01-31 + coprthr = throw "coprthr has been removed."; # Added 2019-12-08 + coredumper = throw "coredumper has been removed: abandoned by upstream."; # Added 2019-11-16 + corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 + couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 + couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 + cpp-gsl = microsoft_gsl; # Added 2019-05-24 + cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # Added 2020-11-30 + cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 + crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 + cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21 + + # CUDA Toolkit + + cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 + cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; - curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages."; # added 2022-01-12 - curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # added 2021-10-23 - cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 - cv = progress; # added 2015-09-06 - cvs_fast_export = cvs-fast-export; # added 2021-06-10 - d1x_rebirth = dxx-rebirth; # added 2018-04-25 - d2x_rebirth = dxx-rebirth; # added 2018-04-25 - dart_dev = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 - dart_old = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15 - dart_stable = dart; # added 2020-01-15 + cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # Added 2020-06-15 + cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + cupsBjnp = cups-bjnp; # Added 2016-01-02 + cups_filters = cups-filters; # Added 2016-08 + curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages."; # Added 2022-01-12 + curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23 + cv = progress; # Added 2015-09-06 + cvs_fast_export = cvs-fast-export; # Added 2021-06-10 + + ### D ### + + d1x_rebirth = dxx-rebirth; # Added 2018-04-25 + d2x_rebirth = dxx-rebirth; # Added 2018-04-25 + dart_dev = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 + dart_old = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15 + dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; - dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # added 2020-09-20 - dbus_daemon = dbus.daemon; # added 2018-04-25 - dbus_glib = dbus-glib; # added 2018-02-25 - dbus_libs = dbus; # added 2018-04-25 - diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 - dbus_tools = dbus.out; # added 2018-04-25 - deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 + dbus_daemon = dbus.daemon; # Added 2018-04-25 + dbus_glib = dbus-glib; # Added 2018-02-25 + dbus_libs = dbus; # Added 2018-04-25 + dbus_tools = dbus.out; # Added 2018-04-25 + dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20 + deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # Added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; - debian_devscripts = debian-devscripts; # added 2016-03-23 - debugedit-unstable = debugedit; # added 2021-11-22 - deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 - deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 - deltachat-electron = deltachat-desktop; # added 2021-07-18 + debian_devscripts = debian-devscripts; # Added 2016-03-23 + debugedit-unstable = debugedit; # Added 2021-11-22 + deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # Added 2020-08-31 + deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # Added 2021-05-05 + deltachat-electron = deltachat-desktop; # Added 2021-07-18 + diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 + deluge-1_x = throw '' Deluge 1.x (deluge-1_x) is no longer supported. Please use Deluge 2.x (deluge-2_x) instead, for example: @@ -216,112 +237,131 @@ mapAliases ({ services.deluge.package = pkgs.deluge-2_x; Note that it is NOT possible to switch back to Deluge 1.x after this change. - ''; # added 2021-08-18 - demjson = with python3Packages; toPythonApplication demjson; # added 2022-01-18 - desktop_file_utils = desktop-file-utils; # added 2018-02-25 - devicemapper = lvm2; # added 2018-04-25 - digikam5 = digikam; # added 2017-02-18 - displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # added 2022-01-12 - dmtx = dmtx-utils; # added 2018-04-25 - dnnl = oneDNN; # added 2020-04-22 - docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 - docbookrx = throw "docbookrx has been removed since it was unmaintained"; # added 2021-01-12 - docbook_xml_xslt = docbook_xsl; # added 2018-04-25 - dolphinEmu = dolphin-emu; # added 2021-11-10 - dolphinEmuMaster = dolphin-emu-beta; # added 2021-11-10 - dotnet-netcore = dotnet-runtime; # added 2021-10-07 - double_conversion = double-conversion; # 2017-11-22 - docker_compose = docker-compose; # 2018-11-10 - draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 - dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 - dwarf_fortress = dwarf-fortress; # added 2016-01-23 - dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07 - dylibbundler = macdylibbundler; # added 2021-04-24 - ec2_ami_tools = ec2-ami-tools; # added 2021-10-08 - ec2_api_tools = ec2-api-tools; # added 2021-10-08 - elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 - elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 - electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2021-01-06 - electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2021-01-06 - electron_5 = throw "electron_5 has been removed in favor of newer versions"; # added 2021-01-06 - electron_6 = throw "electron_6 has been removed in favor of newer versions"; # added 2021-01-06 - electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # added 2022-01-01 - emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 - emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 - emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 - emacsPackagesNg = emacs.pkgs; # added 2019-08-07 - emacs27Packages = emacs27.pkgs; # added 2020-12-18 - emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18 - emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18 - emacsPackages = emacs.pkgs; # added 2020-12-18 - enblendenfuse = enblend-enfuse; # 2015-09-30 - envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 - epoxy = libepoxy; # 2021-11-11 - esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12 - euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # added 2022-01-01 - evolution_data_server = evolution-data-server; # added 2018-02-25 - etcdctl = etcd; # added 2018-04-25 - evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # added 2022-01-14 - exfat-utils = exfat; # 2015-09-11 - facette = throw "facette has been removed."; # added 2020-01-06 - fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - fastnlo = fastnlo_toolkit; # added 2021-04-24 - fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13 + ''; # Added 2021-08-18 + + demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 + desktop_file_utils = desktop-file-utils; # Added 2018-02-25 + devicemapper = lvm2; # Added 2018-04-25 + digikam5 = digikam; # Added 2017-02-18 + displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # Added 2022-01-12 + dmtx = dmtx-utils; # Added 2018-04-25 + dnnl = oneDNN; # Added 2020-04-22 + docbook5_xsl = docbook_xsl_ns; # Added 2018-04-25 + docbook_xml_xslt = docbook_xsl; # Added 2018-04-25 + docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 + docker_compose = docker-compose; # Added 2018-11-10 + dolphinEmu = dolphin-emu; # Added 2021-11-10 + dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 + dotnet-netcore = dotnet-runtime; # Added 2021-10-07 + double_conversion = double-conversion; # Added 2017-11-22 + draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 + dvb_apps = throw "dvb_apps has been removed."; # Added 2020-11-03 + dwarf_fortress = dwarf-fortress; # Added 2016-01-23 + dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # Added 2021-02-07 + dylibbundler = macdylibbundler; # Added 2021-04-24 + + ### E ### + + ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 + ec2_api_tools = ec2-api-tools; # Added 2021-10-08 + elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 + elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + + # Electron + electron_3 = throw "electron_3 has been removed in favor of newer versions"; # Added 2021-01-06 + electron_4 = throw "electron_4 has been removed in favor of newer versions"; # Added 2021-01-06 + electron_5 = throw "electron_5 has been removed in favor of newer versions"; # Added 2021-01-06 + electron_6 = throw "electron_6 has been removed in favor of newer versions"; # Added 2021-01-06 + + electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # Added 2022-01-01 + + # Emacs + emacs27Packages = emacs27.pkgs; # Added 2020-12-18 + emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18 + emacsPackages = emacs.pkgs; # Added 2020-12-18 + emacsPackagesGen = emacsPackagesFor; # Added 2018-08-18 + emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 + emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 + emacsPackagesNgGen = emacsPackagesFor; # Added 2018-08-18 + emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 + + enblendenfuse = enblend-enfuse; # Added 2015-09-30 + envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 + epoxy = libepoxy; # Added 2021-11-11 + esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 + etcdctl = etcd; # Added 2018-04-25 + euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # Added 2022-01-01 + evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # Added 2022-01-14 + evolution_data_server = evolution-data-server; # Added 2018-02-25 + exfat-utils = exfat; # Added 2015-09-11 + + ### F ### + + facette = throw "facette has been removed."; # Added 2020-01-06 + fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + fastnlo = fastnlo_toolkit; # Added 2021-04-24 + fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # Added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; - ffadoFull = ffado; # added 2018-05-01 - firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs"; - firefox-esr-wrapper = firefox-esr; # 2016-01 - firefox-wrapper = firefox; # 2016-01 - firefoxWrapper = firefox; # 2015-09 + ffadoFull = ffado; # Added 2018-05-01 + firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25."; + firefox-esr-wrapper = firefox-esr; # Added 2016-01 + firefox-wrapper = firefox; # Added 2016-01 + firefoxWrapper = firefox; # Added 2015-09 + + firestr = throw "firestr has been removed."; # Added 2019-12-08 + firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 + fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 + flameGraph = flamegraph; # Added 2018-04-25 + flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # Added 2021-06-31 + flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # Added 2021-01-25 + flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # Added 2020-01-15 + flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # Added 2020-01-15 + flvtool2 = throw "flvtool2 has been removed."; # Added 2020-11-03 + fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # Added 2022-01-26 + foldingathome = fahclient; # Added 2020-09-03 + font-awesome-ttf = font-awesome; # Added 2018-02-25 - firestr = throw "firestr has been removed."; # added 2019-12-08 - firmwareLinuxNonfree = linux-firmware; # added 2022-01-09 - fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 - flameGraph = flamegraph; # added 2018-04-25 - flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # added 2021-06-31 - flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 - flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 - flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 - flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 - fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # added 2022-01-26 - foldingathome = fahclient; # added 2020-09-03 - font-awesome-ttf = font-awesome; # 2018-02-25 - # 2019-10-31 fontconfig-ultimate = throw '' fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years. https://github.com/bohoomil/fontconfig-ultimate/issues/171. - ''; + ''; # Added 2019-10-31 + fontconfig-penultimate = throw '' fontconfig-penultimate has been removed. It was a fork of the abandoned fontconfig-ultimate. - ''; - # 2020-07-21 + ''; # Added 2020-07-21 + fontconfig_210 = throw '' fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384 and has only been used for old fontconfig caches. ''; - foomatic_filters = foomatic-filters; # 2016-08 - fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # 2021-11-07 + + foomatic_filters = foomatic-filters; # Added 2016-08 + fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # Added 2021-11-07 fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; - fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # 2022-01-15 - fuse_exfat = exfat; # 2015-09-11 - fuseki = apache-jena-fuseki; # added 2018-04-25 - fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 - g4py = python3Packages.geant4; # added 2020-06-06 - gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # added 2020-06-06 - gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # added 2021-04-03 - gdb-multitarget = gdb; # added 2017-11-13 - gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 - gettextWithExpat = gettext; # 2016-02-19 - getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # added 2022-01-12 - gfm = throw "gfm has been removed"; # 2021-01-15 - giblib = throw " giblib has been removed from nixpkgs because upstream is gone."; # added 2022-01-23 - giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12 - git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 - gitAndTools = self // { # added 2021-01-14 + fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15 + fuse_exfat = exfat; # Added 2015-09-11 + fuseki = apache-jena-fuseki; # Added 2018-04-25 + fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19 + + ### G ### + + g4py = python3Packages.geant4; # Added 2020-06-06 + gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 + gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # Added 2021-04-03 + gdb-multitarget = gdb; # Added 2017-11-13 + gdk_pixbuf = gdk-pixbuf; # Added 2019-05-22 + getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # Added 2022-01-12 + gettextWithExpat = gettext; # Added 2016-02-19 + gfm = throw "gfm has been removed"; # Added 2021-01-15 + giblib = throw " giblib has been removed from nixpkgs because upstream is gone."; # Added 2022-01-23 + giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 + git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # Added 2022-01-01 + + gitAndTools = self // { darcsToGit = darcs-to-git; gitAnnex = git-annex; gitBrunch = git-brunch; @@ -329,246 +369,278 @@ mapAliases ({ gitRemoteGcrypt = git-remote-gcrypt; svn_all_fast_export = svn-all-fast-export; topGit = top-git; - }; - gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # added 2021-12-07 - gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # added 2022-01-12 - gksu = throw "gksu has been removed"; # added 2022-01-16 - glib_networking = glib-networking; # added 2018-02-25 - gmailieer = lieer; # added 2020-04-19 - gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08 - gnome-mpv = celluloid; # added 2019-08-22 - gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10 - gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 - gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # added 2022-01-15 - gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 - gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 - gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 - gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27 - # Added 2020-10-16 + }; # Added 2021-01-14 + + gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07 + gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # Added 2022-01-12 + gksu = throw "gksu has been removed"; # Added 2022-01-16 + glib_networking = glib-networking; # Added 2018-02-25 + gmailieer = lieer; # Added 2020-04-19 + gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 + gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 + gnome-mpv = celluloid; # Added 2019-08-22 + gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 + gnome-themes-standard = gnome-themes-extra; # Added 2018-03-14 + gnome_user_docs = gnome-user-docs; # Added 2019-11-20 + gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2019-12-10 + gnome_doc_utils = gnome-doc-utils; # Added 2018-02-25 + gnome_themes_standard = gnome-themes-standard; # Added 2018-02-25 + gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # Added 2019-05-27 + gnuradio-with-packages = gnuradio3_7.override { extraPackages = lib.attrVals [ "osmosdr" "ais" "gsm" "nacl" "rds" "limesdr" ] gnuradio3_7Packages; - }; - gnuradio-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16 - gnuradio-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16 - gnuradio-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16 - gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16 - gnuradio-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16 - gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16 - gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # added 2022-01-16 - gr-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16 - gr-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16 - gr-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16 - gr-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16 - gr-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16 - gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16 - gnustep-make = gnustep.make; # added 2016-7-6 - gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 - gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 + }; # Added 2020-10-16 + gmock = gtest; # moved from top-level 2021-03-14 - go-pup = pup; # added 2017-12-19 - gobby5 = gobby; # added 2021-02-01 - gobjectIntrospection = gobject-introspection; # added 2018-12-02 - goimports = gotools; # added 2018-09-16 - gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 - google-gflags = gflags; # added 2019-07-25 - google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07 - google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07 - googleAuthenticator = google-authenticator; # added 2016-10-16 - googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # added 2022-01-22 - grantlee5 = libsForQt5.grantlee; # added 2015-12-19 - graalvm8 = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19 - graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19 + gnome3 = gnome; # Added 2021-05-07 + gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# Added 2020-07-12 + gnuradio-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 + gnuradio-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 + gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 + gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 + gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 + gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 + gnustep-make = gnustep.make; # Added 2016-7-6 + gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 + go-pup = pup; # Added 2017-12-19 + gobby5 = gobby; # Added 2021-02-01 + gobjectIntrospection = gobject-introspection; # Added 2018-12-02 + goimports = gotools; # Added 2018-09-16 + gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 + google-gflags = gflags; # Added 2019-07-25 + google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + googleAuthenticator = google-authenticator; # Added 2016-10-16 + googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22 + gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 + gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 + gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 + gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 + gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 + gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 graalvm11 = graalvm11-ce; - grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # added 2022-01-05 - gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 - gtk_doc = gtk-doc; # added 2018-02-25 - gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # added 2022-01-01 - guileCairo = guile-cairo; # added 2017-09-24 - guileGnome = throw "guile-gnome has been removed"; # 2022-01-16 - guile-gnome = throw "guile-gnome has been removed"; # 2022-01-16 - gnome3 = gnome; # added 2021-05-07 - guileLint = guile-lint; # added 2017-09-27 - guile_lib = guile-lib; # added 2017-09-24 - guile_ncurses = guile-ncurses; # added 2017-09-24 - gupnp_av = gupnp-av; # added 2018-02-25 - gupnp_dlna = gupnp-dlna; # added 2018-02-25 - gupnp_igd = gupnp-igd; # added 2018-02-25 - gupnptools = gupnp-tools; # added 2015-12-19 - gutenberg = zola; # added 2018-11-17 - hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # added 2022-01-15 - hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 - heimdalFull = heimdal; # added 2018-05-01 - hepmc = hepmc2; # added 2019-08-05 - hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11 - hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 - holochain-go = throw "holochain-go was abandoned by upstream"; # added 2022-01-01 - ht-rust = xh; # added 2021-02-13 - htmlTidy = html-tidy; # added 2014-12-06 - hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06 - iana_etc = iana-etc; # added 2017-03-08 - iasl = throw "iasl has been removed, use acpica-tools instead"; # added 2021-08-08 - icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 - icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 - idea = jetbrains; # added 2017-04-03 - imagemagick7_light = imagemagick_light; # added 2021-02-22 - imagemagick7 = imagemagick; # added 2021-02-22 - imagemagick7Big = imagemagickBig; # added 2021-02-22 - impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # added 2022-01-27 + graalvm8 = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 + graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19 + grantlee5 = libsForQt5.grantlee; # Added 2015-12-19 + grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 + gsettings_desktop_schemas = gsettings-desktop-schemas; # Added 2018-02-25 + gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 + gtk_doc = gtk-doc; # Added 2018-02-25 + gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 + guileCairo = guile-cairo; # Added 2017-09-24 +guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16 + guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16 + guileLint = guile-lint; # Added 2017-09-27 + guile_lib = guile-lib; # Added 2017-09-24 + guile_ncurses = guile-ncurses; # Added 2017-09-24 + gupnp_av = gupnp-av; # Added 2018-02-25 + gupnp_dlna = gupnp-dlna; # Added 2018-02-25 + gupnp_igd = gupnp-igd; # Added 2018-02-25 + gupnptools = gupnp-tools; # Added 2015-12-19 + gutenberg = zola; # Added 2018-11-17 + + ### H ### + + hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07 + hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 + heimdalFull = heimdal; # Added 2018-05-01 + hepmc = hepmc2; # Added 2019-08-05 + hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # Added 2019-12-11 + hicolor_icon_theme = hicolor-icon-theme; # Added 2018-02-25 + holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 + ht-rust = xh; # Added 2021-02-13 + htmlTidy = html-tidy; # Added 2014-12-06 + hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # Added 2020-04-06 + + ### I ### + + i-score = throw "i-score has been removed: abandoned upstream."; # Added 2020-11-21 + iana_etc = iana-etc; # Added 2017-03-08 + iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 + icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + idea = jetbrains; # Added 2017-04-03 + imagemagick7 = imagemagick; # Added 2021-02-22 + imagemagick7Big = imagemagickBig; # Added 2021-02-22 + imagemagick7_light = imagemagick_light; # Added 2021-02-22 + impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; - infiniband-diags = rdma-core; # added 2019-08-09 + infiniband-diags = rdma-core; # Added 2019-08-09 + ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project."; # Added 2022-01-12 inotifyTools = inotify-tools; - inter-ui = inter; # added 2021-03-27 + inter-ui = inter; # Added 2021-03-27 iproute = iproute2; # moved from top-level 2021-03-14 - ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # added 2021-12-15 - i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 + ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 + + ### J ### + + jack2Full = jack2; # moved from top-level 2021-03-14 - jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 - jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 - jbuilder = dune_1; # added 2018-09-09 + jamomacore = throw "jamomacore has been removed: abandoned upstream."; # Added 2020-11-21 + jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 + jbuilder = dune_1; # Added 2018-09-09 + jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # Added 2021-04-26 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; - joseki = apache-jena-fuseki; # added 2016-02-28 + joseki = apache-jena-fuseki; # Added 2016-02-28 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead."; - jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 - json_glib = json-glib; # added 2018-02-25 - kafkacat = kcat; # added 2021-10-07 - kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 - keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-01 - k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 - kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 + + # Julia + julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15 + julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # Added 2021-03-13 + julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15 + julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13 + julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 + + json_glib = json-glib; # Added 2018-02-25 + jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 + + ### K ### + + k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # Added 2022-01-04 + k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-11-06 + kafkacat = kcat; # Added 2021-10-07 + kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # Added 2021-04-11 + kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 + kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 + kdiff3-qt5 = kdiff3; # Added 2017-02-18 + keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 + keepassx-community = keepassxc; # Added 2017-11 + keepassx-reboot = keepassx-community; # Added 2017-02-01 + keepassx2-http = keepassx-reboot; # Added 2016-10-17 + keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-01 + kerberos = libkrb5; # moved from top-level 2021-03-14 + kexectools = kexec-tools; # Added 2021-09-03 + keybase-go = keybase; # Added 2016-08-24 + keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # Added 2019-12-10 + keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 + kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + kicad-with-packages3d = kicad; # Added 2019-11-25 + kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # Added 2021-03-09 + kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # Added 2020-04-28 + kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25 + knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned."; # Added 2022-01-01 kodiGBM = kodi-gbm; kodiPlain = kodi; kodiPlainWayland = kodi-wayland; - ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project."; # added 2022-01-12 - jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26 - julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # added 2020-09-15 - julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13 - julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15 - julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13 - julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # added 2021-12-02 - k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # added 2022-01-04 - kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11 - kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 - kdiff3-qt5 = kdiff3; # added 2017-02-18 - keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 - keepassx-community = keepassxc; # added 2017-11 - keepassx-reboot = keepassx-community; # added 2017-02-01 - keepassx2-http = keepassx-reboot; # added 2016-10-17 - kexectools = kexec-tools; # added 2021-09-03 - keybase-go = keybase; # added 2016-08-24 - keysmith = libsForQt5.plasmaMobileGear.keysmith; # added 2021-07-14 - kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 - kicad-with-packages3d = kicad; # added 2019-11-25 - kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09 - kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25 - knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned."; # 2022-01-01 - krename-qt5 = krename; # added 2017-02-18 - kerberos = libkrb5; # moved from top-level 2021-03-14 - keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # added 2019-12-10 - kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23 + kodiPlugins = kodiPackages; # Added 2021-03-09; + kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 + krename-qt5 = krename; # Added 2017-02-18 krita-beta = krita; # moved from top-level 2021-12-23 - kvm = qemu_kvm; # added 2018-04-25 - lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # added 2022-01-01 + kvm = qemu_kvm; # Added 2018-04-25 + + ### L ### + + lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 latinmodern-math = lmmath; - letsencrypt = certbot; # added 2016-05-16 - libaudit = audit; # added 2018-04-25 - libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 - libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 - libcap_manpages = libcap.doc; # added 2016-04-29 - libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 - libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # added 2020-03-04 - libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - libcap_progs = libcap.out; # added 2016-04-29 - libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # added 2021-05-16 - libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 - libdbusmenu-glib = libdbusmenu; # added 2018-05-01 - liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 - liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12 - liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 - libgksu = throw "libgksu has been removed"; # added 2022-01-16 - libgnome_keyring = libgnome-keyring; # added 2018-02-25 - libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 - libgpgerror = libgpg-error; # added 2021-09-04 - libgumbo = gumbo; # added 2018-01-21 - libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # added 2022-01-21 - libGL_driver = mesa.drivers; # added 2019-05-28 - libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 - libjpeg_drop = libjpeg_original; # added 2020-06-05 - libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 - libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # added 2021-11-09 - liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 - liblastfm = libsForQt5.liblastfm; # added 2020-06-14 - liblrdf = lrdf; # added 2018-04-25 + letsencrypt = certbot; # Added 2016-05-16 + libGL_driver = mesa.drivers; # Added 2019-05-28 + libaudit = audit; # Added 2018-04-25 + libcanberra_gtk2 = libcanberra-gtk2; # Added 2018-02-25 + libcanberra_gtk3 = libcanberra-gtk3; # Added 2018-02-25 + libcap_manpages = libcap.doc; # Added 2016-04-29 + libcap_pam = if stdenv.isLinux then libcap.pam else null; # Added 2016-04-29 + libcap_progs = libcap.out; # Added 2016-04-29 + libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # Added 2021-05-16 + libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # Added 2020-03-04 + libdbusmenu-glib = libdbusmenu; # Added 2018-05-01 + libdbusmenu_qt5 = libsForQt5.libdbusmenu; # Added 2015-12-19 + liberation_ttf_v1_from_source = liberation_ttf_v1; # Added 2018-12-12 + liberation_ttf_v2_from_source = liberation_ttf_v2; # Added 2018-12-12 + liberationsansnarrow = liberation-sans-narrow; # Added 2018-12-12 + libgksu = throw "libgksu has been removed"; # Added 2022-01-16 + libgnome_keyring = libgnome-keyring; # Added 2018-02-25 + libgnome_keyring3 = libgnome-keyring3; # Added 2018-02-25 + libgpgerror = libgpg-error; # Added 2021-09-04 + libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 + libgumbo = gumbo; # Added 2018-01-21 + libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 + libjpeg_drop = libjpeg_original; # Added 2020-06-05 + libjson_rpc_cpp = libjson-rpc-cpp; # Added 2017-02-28 + libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2021-11-09 + liblapackWithoutAtlas = lapack-reference; # Added 2018-11-05 + liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 + liblrdf = lrdf; # Added 2018-04-25 + libmsgpack = msgpack; # Added 2018-08-17 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; - libqrencode = qrencode; # added 2019-01-01 - librdf = lrdf; # added 2020-03-22 - librecad2 = librecad; # backwards compatibility alias, added 2015-10 - librsync_0_9 = throw "librsync_0_9 has been removed"; # added 2021-07-24 - libseat = seatd; # added 2021-06-24 - libsysfs = sysfsutils; # added 2018-04-25 - libtidy = html-tidy; # added 2014-12-21 + libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 + libqrencode = qrencode; # Added 2019-01-01 + librdf = lrdf; # Added 2020-03-22 + librecad2 = librecad; # backwards compatibility alias, added 2015-10 + librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 + libseat = seatd; # Added 2021-06-24 + libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2019-12-10 + libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # Added 2020-06-22 + libsysfs = sysfsutils; # Added 2018-04-25 + libtidy = html-tidy; # Added 2014-12-21 + libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 + libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # Added 2020-12-20 + libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 + libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; - libudev = udev; # added 2018-04-25 - libungif = giflib; # added 2020-02-12 - libusb = libusb1; # added 2020-04-28 - libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 - libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 - libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 + libudev = udev; # Added 2018-04-25 + libungif = giflib; # Added 2020-02-12 + libusb = libusb1; # Added 2020-04-28 + libva-full = libva; # Added 2018-03-26 + libva1-full = libva1; # Added 2018-03-26 libwnck3 = libwnck; - lilypond-unstable = lilypond; # added 2021-03-11 - lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14 - lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14 - links = links2; # added 2016-01-31 - linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # added 2021-12-09 - linux_rpi0 = linuxKernel.kernels.linux_rpi1; + lilypond-unstable = lilypond; # Added 2021-03-11 + lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 + lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14 + links = links2; # Added 2016-01-31 + linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # Added 2021-12-09 + + # Linux kernels + linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; + linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; + linuxPackages_4_14 = linuxKernel.packages.linux_4_14; + linuxPackages_4_19 = linuxKernel.packages.linux_4_19; + linuxPackages_4_4 = linuxKernel.packages.linux_4_4; + linuxPackages_4_9 = linuxKernel.packages.linux_4_9; + linuxPackages_5_10 = linuxKernel.packages.linux_5_10; + linuxPackages_5_15 = linuxKernel.packages.linux_5_15; + linuxPackages_5_16 = linuxKernel.packages.linux_5_16; + linuxPackages_5_4 = linuxKernel.packages.linux_5_4; + linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; - linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; - linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4; - linuxPackages_4_4 = linuxKernel.packages.linux_4_4; - linuxPackages_4_9 = linuxKernel.packages.linux_4_9; - linuxPackages_4_14 = linuxKernel.packages.linux_4_14; - linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; - linuxPackages_4_19 = linuxKernel.packages.linux_4_19; - linuxPackages_5_4 = linuxKernel.packages.linux_5_4; - linuxPackages_5_10 = linuxKernel.packages.linux_5_10; - linuxPackages_5_15 = linuxKernel.packages.linux_5_15; - linuxPackages_5_16 = linuxKernel.packages.linux_5_16; - + linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; + linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; + linux_4_14 = linuxKernel.kernels.linux_4_14; + linux_4_19 = linuxKernel.kernels.linux_4_19; + linux_4_4 = linuxKernel.kernels.linux_4_4; + linux_4_9 = linuxKernel.kernels.linux_4_9; + linux_5_10 = linuxKernel.kernels.linux_5_10; + linux_5_15 = linuxKernel.kernels.linux_5_15; + linux_5_16 = linuxKernel.kernels.linux_5_16; + linux_5_4 = linuxKernel.kernels.linux_5_4; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; + linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi1 = linuxKernel.kernels.linux_rpi1; linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; - linux_4_4 = linuxKernel.kernels.linux_4_4; - linux_4_9 = linuxKernel.kernels.linux_4_9; - linux_4_14 = linuxKernel.kernels.linux_4_14; - linux_4_19 = linuxKernel.kernels.linux_4_19; - linux_5_4 = linuxKernel.kernels.linux_5_4; - linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; - linux_5_10 = linuxKernel.kernels.linux_5_10; - linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; - linux_5_15 = linuxKernel.kernels.linux_5_15; - linux_5_16 = linuxKernel.kernels.linux_5_16; - # added 2020-04-04 + # Added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; - # added 2021-04-04 + # Added 2021-04-04 linuxPackages_xen_dom0 = linuxPackages; linuxPackages_latest_xen_dom0 = linuxPackages_latest; linuxPackages_xen_dom0_hardened = linuxPackages_hardened; linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; - # added 2021-08-16 + # Added 2021-08-16 linuxPackages_latest_hardened = throw '' The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches frequently lag behind the upstream kernel. In some cases this meant that this attribute @@ -582,177 +654,201 @@ mapAliases ({ ''; linux_latest_hardened = linuxPackages_latest_hardened; - linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 - loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - lobster-two = google-fonts; # added 2021-07-22 - lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15 - lttngTools = lttng-tools; # added 2014-07-31 - lttngUst = lttng-ust; # added 2014-07-31 - lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 - lua5_expat = luaPackages.luaexpat; # added 2017-05-02 - lua5_sec = luaPackages.luasec; # added 2017-05-02 - lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12 - love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15 - love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15 - love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # added 2022-01-15 - lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03 + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # Added 2020-05-22 + + loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + lobster-two = google-fonts; # Added 2021-07-22 + love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 + love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 + love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 + lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # Added 2021-02-15 + lttngTools = lttng-tools; # Added 2014-07-31 + lttngUst = lttng-ust; # Added 2014-07-31 + lua5_1_sockets = lua51Packages.luasocket; # Added 2017-05-02 + lua5_expat = luaPackages.luaexpat; # Added 2017-05-02 + lua5_sec = luaPackages.luasec; # Added 2017-05-02 + lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 + lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 - m3d-linux = m33-linux; # added 2016-08-13 - mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # added 2021-08-21 - mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12 - man_db = man-db; # added 2016-05 - manpages = man-pages; # added 2015-12-06 - marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 - mysql = mariadb; # moved from top-level 2021-03-14 + + ### M ### + + m3d-linux = m33-linux; # Added 2016-08-13 + mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21 + mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12 + man_db = man-db; # Added 2016-05 + manpages = man-pages; # Added 2015-12-06 + marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 - matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 - mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 - matrique = spectral; # added 2020-01-27 - mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 - meme = meme-image-generator; # added 2021-04-21 - mess = mame; # added 2019-10-30 - metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # added 2022-01-12 - mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 - mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 - mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # added 2022-01-12 - mime-types = mailcap; # added 2022-01-21 - mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # added 2022-01-01 - mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 - minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 - minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 - minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14 - monero = monero-cli; # added 2021-11-28 - monodevelop = throw "monodevelop has been removed from nixpgks"; # added 2022-01-15 - mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 - mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 - mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 + matcha = throw "matcha was renamed to matcha-gtk-theme"; # Added 2020-05-09 + mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 + matrique = spectral; # Added 2020-01-27 + mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # Added 2019-12-08 + mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23 + mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # Added 2019-12-10, modified 2020-11-25 + meme = meme-image-generator; # Added 2021-04-21 + memtest86 = memtest86plus; # Added 2019-05-08 + mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 + mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 + mess = mame; # Added 2019-10-30 + metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # Added 2022-01-12 + mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # Added 2022-01-12 + midoriWrapper = midori; # Added 2015-01 + mime-types = mailcap; # Added 2022-01-21 + mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # Added 2022-01-01 + minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 + minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 + minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 + mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 + mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 + mlt-qt5 = libsForQt5.mlt; # Added 2015-12-19 + mobile_broadband_provider_info = mobile-broadband-provider-info; # Added 2018-02-25 + moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; + module_init_tools = kmod; # Added 2016-04-22 + monero = monero-cli; # Added 2021-11-28 + monodevelop = throw "monodevelop has been removed from nixpgks"; # Added 2022-01-15 + mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18 + morituri = whipper; # Added 2018-09-13 + mozart = mozart2-binary; # Added 2019-09-23 + mozart-binary = mozart2-binary; # Added 2019-09-23 + mpc_cli = mpc-cli; # moved from top-level 2022-01-24 + mpd_clientlib = libmpdclient; # Added 2021-02-11 + mpich2 = mpich; # Added 2018-08-06 + msf = metasploit; # Added 2018-04-25 + multimc = throw "multimc was removed from nixpkgs; use polymc instead"; # Added 2022-01-08 + mumble_git = pkgs.mumble; # Added 2019-08-01 + murmur_git = pkgs.murmur; # Added 2019-08-01 + mysql = mariadb; # moved from top-level 2021-03-14 mysql-client = hiPrio mariadb.client; - memtest86 = memtest86plus; # added 2019-05-08 - mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # added 2021-10-18 - mesa_noglu = mesa; # added 2019-05-28 + + # NOTE: 2018-07-12: legacy alias: # grsecurity business is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ + # floating point textures patents are expired, # so package reduced to alias mesa_drivers = mesa.drivers; - mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 - midoriWrapper = midori; # added 2015-01 - mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # added 2020-08-15 - mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 - mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 - moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead."; - module_init_tools = kmod; # added 2016-04-22 - mozart = mozart2-binary; # added 2019-09-23 - mozart-binary = mozart2-binary; # added 2019-09-23 - mpc_cli = mpc-cli; # moved from top-level 2022-01-24 - mpd_clientlib = libmpdclient; # added 2021-02-11 - mpich2 = mpich; # added 2018-08-06 - msf = metasploit; # added 2018-04-25 - libmsgpack = msgpack; # added 2018-08-17 - mssys = ms-sys; # added 2015-12-13 - mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22 - multipath_tools = multipath-tools; # added 2016-01-21 - mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # added 2021-11-18 - mupen64plus1_5 = mupen64plus; # added 2016-02-12 - mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 - mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 - mysqlWorkbench = mysql-workbench; # added 2017-01-19 + mesa_noglu = mesa; # Added 2019-05-28 + + mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # Added 2020-05-22 + mssys = ms-sys; # Added 2015-12-13 + multipath_tools = multipath-tools; # Added 2016-01-21 + mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # Added 2021-11-18 + mupen64plus1_5 = mupen64plus; # Added 2016-02-12 + mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 + mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # Added 2021-04-15 + mysqlWorkbench = mysql-workbench; # Added 2017-01-19 + + ### N ### + + net_snmp = net-snmp; # Added 2019-12-21 nagiosPluginsOfficial = monitoring-plugins; - navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # added 2021-06-07 - ncat = nmap; # added 2016-01-26 - neap = throw "neap was removed from nixpkgs, as it relies on python2"; # added 2022-01-12 - netcat-openbsd = libressl.nc; # added 2018-04-25 - netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 - networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 - networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 - networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 - networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 - networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 - networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 - neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - nfsUtils = nfs-utils; # added 2014-12-06 - nginxUnstable = nginxMainline; # added 2018-04-25 - nilfs_utils = nilfs-utils; # added 2018-04-25 + navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 + ncat = nmap; # Added 2016-01-26 + neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 + netcat-openbsd = libressl.nc; # Added 2018-04-25 + netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 + networkmanager_fortisslvpn = networkmanager-fortisslvpn; # Added 2018-02-25 + networkmanager_iodine = networkmanager-iodine; # Added 2018-02-25 + networkmanager_l2tp = networkmanager-l2tp; # Added 2018-02-25 + networkmanager_openconnect = networkmanager-openconnect; # Added 2018-02-25 + networkmanager_openvpn = networkmanager-openvpn; # Added 2018-02-25 + networkmanager_vpnc = networkmanager-vpnc; # Added 2018-02-25 + neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + nfsUtils = nfs-utils; # Added 2014-12-06 + nginxUnstable = nginxMainline; # Added 2018-04-25 + nilfs_utils = nilfs-utils; # Added 2018-04-25 nix-direnv-flakes = nix-direnv; - nix-review = nixpkgs-review; # added 2019-12-22 - nixFlakes = nixVersions.stable; # added 2021-05-21 - nixStable = nixVersions.stable; # added 2022-01-24 - nixUnstable = nixVersions.unstable; # added 2022-01-26 + nix-review = nixpkgs-review; # Added 2019-12-22 + nixFlakes = nixVersions.stable; # Added 2021-05-21 + nixStable = nixVersions.stable; # Added 2022-01-24 + nixUnstable = nixVersions.unstable; # Added 2022-01-26 nix_2_3 = nixVersions.nix_2_3; nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; - nmap_graphical = nmap-graphical; # added 2017-01-19 - nmap-unfree = nmap; # added 2021-04-06 - nologin = shadow; # added 2018-04-25 - nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27 - nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # added 2022-01-15 - noto-fonts-cjk = noto-fonts-cjk-sans; # added 2021-12-16 - now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05 - nxproxy = nx-libs; # added 2019-02-15 + nmap-unfree = nmap; # Added 2021-04-06 + nmap_graphical = nmap-graphical; # Added 2017-01-19 + nologin = shadow; # Added 2018-04-25 + nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 + noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 + nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 + now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 + nxproxy = nx-libs; # Added 2019-02-15 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; - oauth2_proxy = oauth2-proxy; # added 2021-04-18 - opencascade_oce = opencascade; # added 2018-04-25 - obconf = throw "obconf has been removed"; # added 2022-01-16 - oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 - octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24 + + ### O ### + + oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # Added 2020-10-09 + OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16 + OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16 + oauth2_proxy = oauth2-proxy; # Added 2021-04-18 + obconf = throw "obconf has been removed"; # Added 2022-01-16 + oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # Added 2019-12-10 + octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # Added 2021-01-24 + ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12 ofp = throw "ofp is not compatible with odp-dpdk"; - olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 - openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06 - openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06 - opencl-icd = ocl-icd; # added 2017-01-20 - openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 - openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10 - openexr_ctl = ctl; # added 2018-04-25 - openisns = open-isns; # added 2020-01-28 - openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 - openjpeg_2 = openjpeg; # added 2021-01-25 - openmpt123 = libopenmpt; # added 2021-09-05 - opensans-ttf = open-sans; # added 2018-12-04 - openssh_with_kerberos = openssh; # added 2018-01-28 - orchis = orchis-theme; # added 2021-06-09 - onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 - osquery = throw "osquery has been removed."; # added 2019-11-24 - osxfuse = macfuse-stubs; # added 2021-03-20 - otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 - OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16 - OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16 - owncloudclient = owncloud-client; # added 2016-08 - ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 - p11_kit = p11-kit; # added 2018-02-25 - packet-cli = metal-cli; # added 2021-10-25 - paperless = paperless-ng; # added 2021-06-06 - parity = openethereum; # added 2020-08-01 - parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # added 2022-01-10 - parquet-cpp = arrow-cpp; # added 2018-09-08 - pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 - pdfmod = throw "pdfmod has been removed"; # added 2022-01-15 - pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22 - pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # added 2022-01-01 - pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03 - perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 - perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 - pgp-tools = signing-party; # added 2017-03-26 - pg_tmp = ephemeralpg; # added 2018-01-16 + olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05 + onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # Added 2020-12-04 + openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 + openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 + opencascade_oce = opencascade; # Added 2018-04-25 + opencl-icd = ocl-icd; # Added 2017-01-20 + openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 + openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 + openexr_ctl = ctl; # Added 2018-04-25 + openisns = open-isns; # Added 2020-01-28 + openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 + openjpeg_2 = openjpeg; # Added 2021-01-25 + openmpt123 = libopenmpt; # Added 2021-09-05 + opensans-ttf = open-sans; # Added 2018-12-04 + openssh_with_kerberos = openssh; # Added 2018-01-28 + orchis = orchis-theme; # Added 2021-06-09 + osquery = throw "osquery has been removed."; # Added 2019-11-24 + osxfuse = macfuse-stubs; # Added 2021-03-20 + otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 + owncloudclient = owncloud-client; # Added 2016-08 + + ### P ### + + PPSSPP = ppsspp; # Added 2017-10-01 + + p11_kit = p11-kit; # Added 2018-02-25 + packet-cli = metal-cli; # Added 2021-10-25 + paperless = paperless-ng; # Added 2021-06-06 + parity = openethereum; # Added 2020-08-01 + parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 + parquet-cpp = arrow-cpp; # Added 2018-09-08 + pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # Added 2018-05-04 + pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 + pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 + pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # Added 2022-01-01 + pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 + perlXMLParser = perlPackages.XMLParser; # Added 2018-10-12 + perlArchiveCpio = perlPackages.ArchiveCpio; # Added 2018-10-12 + pgp-tools = signing-party; # Added 2017-03-26 + pg_tmp = ephemeralpg; # Added 2018-01-16 # Obsolete PHP version aliases - php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # added 2021-06-03 - php73Packages = php73; # added 2021-06-03 - php73Extensions = php73; # added 2021-06-03 + php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # Added 2021-06-03 + php73Packages = php73; # Added 2021-06-03 + php73Extensions = php73; # Added 2021-06-03 php-embed = throw '' php*-embed has been dropped, you can build something similar with the following snippet: php74.override { embedSupport = true; apxs2Support = false; } - ''; # added 2020-04-01 - php73-embed = php-embed; # added 2020-04-01 - php74-embed = php-embed; # added 2020-04-01 + ''; # Added 2020-04-01 + php73-embed = php-embed; # Added 2020-04-01 + php74-embed = php-embed; # Added 2020-04-01 phpPackages-embed = throw '' php*Packages-embed has been dropped, you can build something similar with the following snippet: (php74.override { embedSupport = true; apxs2Support = false; }).packages - ''; # added 2020-04-01 + ''; # Added 2020-04-01 php73Packages-embed = phpPackages-embed; php74Packages-embed = phpPackages-embed; @@ -767,9 +863,9 @@ mapAliases ({ cgiSupport = false; fpmSupport = false; } - ''; # added 2020-04-01 - php73-unit = php-unit; # added 2020-04-01 - php74-unit = php-unit; # added 2020-04-01 + ''; # Added 2020-04-01 + php73-unit = php-unit; # Added 2020-04-01 + php74-unit = php-unit; # Added 2020-04-01 phpPackages-unit = throw '' php*Packages-unit has been dropped, you can build something @@ -782,193 +878,194 @@ mapAliases ({ cgiSupport = false; fpmSupport = false; }).packages - ''; # added 2020-04-01 + ''; # Added 2020-04-01 php73Packages-unit = phpPackages-unit; php74Packages-unit = phpPackages-unit; - pidgin-with-plugins = pidgin; # added 2016-06 - pidginlatex = pidgin-latex; # added 2018-01-08 - pidginlatexSF = pidgin-latex; # added 2014-11-02 - pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08 - pidginosd = pidgin-osd; # added 2018-01-08 - pidginotr = pidgin-otr; # added 2018-01-08 - pidginsipe = pidgin-sipe; # added 2018-01-08 - pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 - pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # added 2022-01-19 - piwik = matomo; # added 2018-01-16 - pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18 - pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 - planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # added 2021-02-02 - pleroma-otp = pleroma; # added 2021-07-10 - pltScheme = racket; # just to be sure + pidgin-with-plugins = pidgin; # Added 2016-06 + pidginlatex = pidgin-latex; # Added 2018-01-08 + pidginlatexSF = pidgin-latex; # Added 2014-11-02 + pidginmsnpecan = pidgin-msn-pecan; # Added 2018-01-08 + pidginosd = pidgin-osd; # Added 2018-01-08 + pidginotr = pidgin-otr; # Added 2018-01-08 + pidginsipe = pidgin-sipe; # Added 2018-01-08 + pidginwindowmerge = pidgin-window-merge; # Added 2018-01-08 + pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # Added 2022-01-19 + piwik = matomo; # Added 2018-01-16 + pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 + pkgconfigUpstream = pkg-configUpstream; # Added 2018-02-02 + planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # Added 2021-02-02 + pleroma-otp = pleroma; # Added 2021-07-10 plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 - pmtools = acpica-tools; # added 2018-11-01 - polarssl = mbedtls; # added 2018-04-25 - polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01 - poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 + pltScheme = racket; # just to be sure + pmtools = acpica-tools; # Added 2018-11-01 + polarssl = mbedtls; # Added 2018-04-25 + polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01 + poppler_qt5 = libsForQt5.poppler; # Added 2015-12-19 + + # postgresql postgresql96 = postgresql_9_6; - postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # added 2021-12-03 + postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # Added 2021-12-03 + # postgresql plugins - pgjwt = postgresqlPackages.pgjwt; + cstore_fdw = postgresqlPackages.cstore_fdw; + pg_cron = postgresqlPackages.pg_cron; + pg_hll = postgresqlPackages.pg_hll; pg_repack = postgresqlPackages.pg_repack; - pgroonga = postgresqlPackages.pgroonga; pg_similarity = postgresqlPackages.pg_similarity; + pg_topn = postgresqlPackages.pg_topn; + pgjwt = postgresqlPackages.pgjwt; + pgroonga = postgresqlPackages.pgroonga; pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; - tilp2 = throw "tilp2 has been removed"; # added 2022-01-15 - timekeeper = throw "timekeeper has been removed"; # added 2022-01-16 + postgis = postgresqlPackages.postgis; + tilp2 = throw "tilp2 has been removed"; # Added 2022-01-15 + timekeeper = throw "timekeeper has been removed"; # Added 2022-01-16 timescaledb = postgresqlPackages.timescaledb; tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; - cstore_fdw = postgresqlPackages.cstore_fdw; - pg_hll = postgresqlPackages.pg_hll; - pg_cron = postgresqlPackages.pg_cron; - pg_topn = postgresqlPackages.pg_topn; - pinentry_curses = pinentry-curses; # added 2019-10-14 - pinentry_emacs = pinentry-emacs; # added 2019-10-14 - pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14 - pinentry_qt = pinentry-qt; # added 2019-10-14 - pinentry_gnome = pinentry-gnome; # added 2019-10-14 - pinentry_qt5 = pinentry-qt; # added 2020-02-11 - postgis = postgresqlPackages.postgis; - # end - privateer = throw "privateer was removed because it was broken"; # added 2021-05-18 - processing3 = processing; # added 2019-08-16 - procps-ng = procps; # added 2018-06-08 - proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # added 2021-06-30 - proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # added 2021-04-12 - prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # added 2021-03-16 - pygmentex = texlive.bin.pygmentex; # added 2019-12-15 - pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # added 2021-03-21 + + phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # Added 2019-11-22 + phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # Added 2019-11-22 + phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # Added 2019-11-22 + pinentry_curses = pinentry-curses; # Added 2019-10-14 + pinentry_emacs = pinentry-emacs; # Added 2019-10-14 + pinentry_gnome = pinentry-gnome; # Added 2019-10-14 + pinentry_gtk2 = pinentry-gtk2; # Added 2019-10-14 + pinentry_qt = pinentry-qt; # Added 2019-10-14 + pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # Added 2019-12-10 + privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 + processing3 = processing; # Added 2019-08-16 + procps-ng = procps; # Added 2018-06-08 + proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 + proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # Added 2021-04-12 + prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # Added 2021-03-16 + pulseaudioLight = pulseaudio; # Added 2018-04-25 + pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # Added 2021-02-13 + pulseeffects-pw = easyeffects; # Added 2021-07-07 + pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; + pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; + pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14 + pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # Added 2022-01-01 + pygmentex = texlive.bin.pygmentex; # Added 2019-12-15 + pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # Added 2021-03-21 + pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # Added 2020-10-24 pyo3-pack = maturin; - pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10 - pulseaudioLight = pulseaudio; # added 2018-04-25 - pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # added 2021-02-13 - pulseeffects-pw = easyeffects; # added 2021-07-07 - phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 - phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 - phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 - pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14 - pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 - pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 - pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 - pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 - pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 - pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01 - python = python2; # added 2022-01-11 - python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 - python-swiftclient = swiftclient; # added 2021-09-09 - pythonFull = python2Full; # added 2022-01-11 - pythonPackages = python.pkgs; # added 2022-01-11 - quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 - qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 - qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 - qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02 - qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 - qt5ct = libsForQt5.qt5ct; # added 2021-12-27 - quake3game = ioquake3; # added 2016-01-14 - quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-03 - qvim = throw "qvim has been removed."; # added 2020-08-31 - qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08 - qwt6 = libsForQt5.qwt; # added 2015-12-19 - qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # added 2021-08-04 - qtcurve = libsForQt5.qtcurve; # added 2020-11-07 - quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 - raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24 - rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # added 2022-01-01 - rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 - rdiff_backup = rdiff-backup; # added 2014-11-23 - rdmd = dtools; # added 2017-08-19 - readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # added 2021-04-22 - rng_tools = rng-tools; # added 2018-10-24 + pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12 + pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12 + pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12 + pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-01 + python = python2; # Added 2022-01-11 + python-swiftclient = swiftclient; # Added 2021-09-09 + python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # Added 2021-03-08 + pythonFull = python2Full; # Added 2022-01-11 + pythonPackages = python.pkgs; # Added 2022-01-11 + + ### Q ### + + QmidiNet = qmidinet; # Added 2016-05-22 + qca-qt5 = libsForQt5.qca-qt5; # Added 2015-12-19 + qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 + qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 + qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 + qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 + qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 + qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 + qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 + qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 + quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 + quake3game = ioquake3; # Added 2016-01-14 + quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 + quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-03 + qvim = throw "qvim has been removed."; # Added 2020-08-31 + qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08 + qwt6 = libsForQt5.qwt; # Added 2015-12-19 + + ### R ### + + radare2-cutter = cutter; # Added 2021-03-30 + raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 + rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # Added 2022-01-01 + rdf4store = throw "rdf4store has been removed from nixpkgs."; # Added 2019-12-21 + rdiff_backup = rdiff-backup; # Added 2014-11-23 + rdmd = dtools; # Added 2017-08-19 + readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22 + recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 + redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 + redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 + renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2."; # Added 2022-01-12 + residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27 + retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 + retroshare06 = retroshare; + rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23 + riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14 + rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 + ring-daemon = jami-daemon; # Added 2021-10-26 + rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 + rng_tools = rng-tools; # Added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 + rpiboot-unstable = rpiboot; # Added 2021-07-30 rssglx = rss-glx; #added 2015-03-25 - rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25 - # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, - # due to it being inside the linuxPackagesFor function. - rtlwifi_new-firmware = rtw88-firmware; # added 2021-03-14 - recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 - residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # added 2021-11-27 - retroshare06 = retroshare; - gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 - qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 - qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 - rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 - rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # added 2022-01-15 - riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 - ring-daemon = jami-daemon; # added 2021-10-26 - radare2-cutter = cutter; # added 2021-03-30 - redkite = throw "redkite was archived by upstream"; # added 2021-04-12 - redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # added 2021-12-25 - renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2."; # added 2022-01-12 - retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # added 2021-11-19 - rkt = throw "rkt was archived by upstream"; # added 2020-05-16 - rpiboot-unstable = rpiboot; # added 2021-07-30 - rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # added 2021-08-08 - rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; + rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25 + rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08 rubyMinimal = throw "rubyMinimal was removed due to being unused"; + rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; - runwayml = throw "runwayml is now a webapp"; # added 2021-04-17 - rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # added 2021-10-19 - rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 - rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 - subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31 - thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs"; - thunderbird-bin-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs"; - togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; - urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 - urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02 - urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02 - urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # added 2020-02-02 - urxvt_font_size = rxvt-unicode-plugins.font-size; # added 2020-02-02 - urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02 - urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02 - urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02 - s2n = s2n-tls; # added 2021-03-03 - s6Dns = s6-dns; # added 2018-07-23 - s6Networking = s6-networking; # added 2018-07-23 - s6LinuxUtils = s6-linux-utils; # added 2018-07-23 - s6PortableUtils = s6-portable-utils; # added 2018-07-23 - sagemath = sage; # added 2018-10-27 - sam = deadpixi-sam; # added 2018-04-25 - samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 - saneBackends = sane-backends; # added 2016-01-02 - saneBackendsGit = sane-backends; # added 2016-01-02 - sane-backends-git = sane-backends; # added 2021-02-19 - saneFrontends = sane-frontends; # added 2016-01-02 - scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01 - scim = sc-im; # added 2016-01-22 - scollector = bosun; # added 2018-04-25 - scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # added 2021-10-07 - sdlmame = mame; # added 2019-10-30 - seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21 + runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17 + rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # Added 2021-10-19 + rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 + rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 + + # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, + # due to it being inside the linuxPackagesFor function. + rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14 + + ### S ### + + s2n = s2n-tls; # Added 2021-03-03 + s6Dns = s6-dns; # Added 2018-07-23 + s6LinuxUtils = s6-linux-utils; # Added 2018-07-23 + s6Networking = s6-networking; # Added 2018-07-23 + s6PortableUtils = s6-portable-utils; # Added 2018-07-23 + sagemath = sage; # Added 2018-10-27 + sam = deadpixi-sam; # Added 2018-04-25 + samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # Added 2016-01-25 + sane-backends-git = sane-backends; # Added 2021-02-19 + saneBackends = sane-backends; # Added 2016-01-02 + saneBackendsGit = sane-backends; # Added 2016-01-02 + saneFrontends = sane-frontends; # Added 2016-01-02 + scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 + scim = sc-im; # Added 2016-01-22 + scollector = bosun; # Added 2018-04-25 + scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 + sdlmame = mame; # Added 2019-10-30 + seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; - sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11 - shared_mime_info = shared-mime-info; # added 2018-02-25 - sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01 - sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01 - sigurlx = throw "sigurlx has been removed (upstream is gone)"; # added 2022-01-24 - skrooge2 = skrooge; # added 2017-02-18 + sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 + shared_mime_info = shared-mime-info; # Added 2018-02-25 + sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 + sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01 + sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24 + skrooge2 = skrooge; # Added 2017-02-18 sky = throw "sky has been removed from nixpkgs (2020-09-16)"; - skype = skypeforlinux; # added 2017-07-27 - skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31 - skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # added 2021-07-14 - slack-dark = slack; # added 2020-03-27 - slic3r-prusa3d = prusa-slicer; # added 2019-05-21 + skype = skypeforlinux; # Added 2017-07-27 + skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2021-07-14 + skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2020-10-31 + slack-dark = slack; # Added 2020-03-27 + slic3r-prusa3d = prusa-slicer; # Added 2019-05-21 + slim = throw "slim has been removed. Please use a different display-manager"; # Added 2019-11-11 + slimThemes = throw "slimThemes has been removed because slim has been also"; # Added 2019-11-11 + slurm-full = slurm; # Added 2018-05-1 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 - slurm-full = slurm; # added 2018-05-1 - smbclient = samba; # added 2018-04-25 - smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 - slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 - slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 - solr_8 = solr; # added 2021-01-30 - spectral = neochat; # added 2020-12-27 - sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; + smbclient = samba; # Added 2018-04-25 + smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2020-11-04 + solr_8 = solr; # Added 2021-01-30 - # added 2020-02-10 + # Added 2020-02-10 sourceHanSansPackages = { japanese = source-han-sans; korean = source-han-sans; @@ -989,367 +1086,285 @@ mapAliases ({ source-han-serif-korean = source-han-serif; source-han-serif-simplified-chinese = source-han-serif; source-han-serif-traditional-chinese = source-han-serif; - source-sans-pro = source-sans; # added 2021-10-20 - source-serif-pro = source-serif; # added 2021-10-20 + source-sans-pro = source-sans; # Added 2021-10-20 + source-serif-pro = source-serif; # Added 2021-10-20 - net_snmp = net-snmp; # added 2019-12-21 - oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # added 2020-10-09 - spaceOrbit = space-orbit; # added 2016-05-23 - speech_tools = speech-tools; # added 2018-04-25 - speedtest_cli = speedtest-cli; # added 2015-02-17 - spice_gtk = spice-gtk; # added 2018-02-25 - spice_protocol = spice-protocol; # added 2018-02-25 - spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03 - spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 - spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16 - spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 - spring-boot = spring-boot-cli; # added 2020-04-24 - sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 - sqliteInteractive = sqlite-interactive; # added 2014-12-06 - squid4 = squid; # added 2019-08-22 - sshfsFuse = sshfs-fuse; # added 2016-09 - stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 - stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09 - surf-webkit2 = surf; # added 2017-04-02 - svgcleaner = throw "svgcleaner has been removed."; # added 2021-11-17 - swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14 - swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 - swtpm-tpm2 = swtpm; # added 2021-02-26 - syncthing-cli = syncthing; # added 2021-04-06 - synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # added 2021-11-26 - system_config_printer = system-config-printer; # added 2016-01-03 - systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 - systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 - systool = sysfsutils; # added 2018-04-25 - tahoelafs = tahoe-lafs; # added 2018-03-26 - tangogps = foxtrotgps; # added 2020-01-26 + spaceOrbit = space-orbit; # Added 2016-05-23 + spectral = neochat; # Added 2020-12-27 + speech_tools = speech-tools; # Added 2018-04-25 + speedtest_cli = speedtest-cli; # Added 2015-02-17 + spice_gtk = spice-gtk; # Added 2018-02-25 + spice_protocol = spice-protocol; # Added 2018-02-25 + # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell + spidermonkey = spidermonkey_78; # Added 2020-10-09 + spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # Added 2021-05-03 + spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # Added 2021-03-21 + spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # Added 2019-10-16 + spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # Added 2021-03-21 + spring-boot = spring-boot-cli; # Added 2020-04-24 + sqlite3_analyzer = sqlite-analyzer; # Added 2018-05-22 + sqliteInteractive = sqlite-interactive; # Added 2014-12-06 + squid4 = squid; # Added 2019-08-22 + sshfsFuse = sshfs-fuse; # Added 2016-09 + stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # Added 2020-10-14 + stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 + subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 + sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; + surf-webkit2 = surf; # Added 2017-04-02 + svgcleaner = throw "svgcleaner has been removed."; # Added 2021-11-17 + swec = throw "swec has been removed; broken and abandoned upstream."; # Added 2021-10-14 + swfdec = throw "swfdec has been removed as broken and unmaintained."; # Added 2020-08-23 + swtpm-tpm2 = swtpm; # Added 2021-02-26 + syncthing-cli = syncthing; # Added 2021-04-06 + synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # Added 2021-11-26 + system_config_printer = system-config-printer; # Added 2016-01-03 + systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # Added 2020-07-12 + systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # Added 2020-07-12 + systool = sysfsutils; # Added 2018-04-25 + + ### T ### + + tahoelafs = tahoe-lafs; # Added 2018-03-26 + tangogps = foxtrotgps; # Added 2020-01-26 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead."; - telepathy_farstream = telepathy-farstream; # added 2018-02-25 - telepathy_gabble = telepathy-gabble; # added 2018-02-25 - telepathy_glib = telepathy-glib; # added 2018-02-25 - telepathy_haze = telepathy-haze; # added 2018-02-25 - telepathy_idle = telepathy-idle; # added 2018-02-25 - telepathy_logger = telepathy-logger; # added 2018-02-25 - telepathy_mission_control = telepathy-mission-control; # added 2018-02-25 - telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # added 2020-07-02 - telepathy_qt = telepathy-qt; # added 2018-02-25 - telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 - telepathy_salut = telepathy-salut; # added 2018-02-25 - telnet = inetutils; # added 2018-05-15 - terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # added 2021-08-21 + telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # Added 2020-07-02 + telepathy_farstream = telepathy-farstream; # Added 2018-02-25 + telepathy_gabble = telepathy-gabble; # Added 2018-02-25 + telepathy_glib = telepathy-glib; # Added 2018-02-25 + telepathy_haze = telepathy-haze; # Added 2018-02-25 + telepathy_idle = telepathy-idle; # Added 2018-02-25 + telepathy_logger = telepathy-logger; # Added 2018-02-25 + telepathy_mission_control = telepathy-mission-control; # Added 2018-02-25 + telepathy_qt = telepathy-qt; # Added 2018-02-25 + telepathy_qt5 = libsForQt5.telepathy; # Added 2015-12-19 + telepathy_salut = telepathy-salut; # Added 2018-02-25 + telnet = inetutils; # Added 2018-05-15 + terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 + terraform-provider-ibm = terraform-providers.ibm; # Added 2018-09-28 + terraform-provider-libvirt = terraform-providers.libvirt; # Added 2018-09-28 + terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16 terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01"; - terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # added 2021-06-15 - terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # added 2021-12-08 - terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28 - terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28 - terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16 - tesseract_4 = tesseract4; # added 2018-12-19 - tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03 - tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03 - tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 - tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 - tftp_hpa = tftp-hpa; # added 2015-04-03 - timescale-prometheus = promscale; # added 2020-09-29 - timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05 - tomboy = throw "tomboy is not actively developed anymore and was removed."; # added 2022-01-27 - tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 - tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 - tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11 - tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # added 2022-01-01 - torbrowser = tor-browser-bundle-bin; # added 2017-04-05 - torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28 - trang = jing-trang; # added 2018-04-25 - transmission_gtk = transmission-gtk; # added 2018-01-06 - transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 - transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # added 2020-10-14 + terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08 + terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15 + tesseract_4 = tesseract4; # Added 2018-12-19 + tex-gyre-bonum-math = tex-gyre-math.bonum; # Added 2018-04-03 + tex-gyre-pagella-math = tex-gyre-math.pagella; # Added 2018-04-03 + tex-gyre-schola-math = tex-gyre-math.schola; # Added 2018-04-03 + tex-gyre-termes-math = tex-gyre-math.termes; # Added 2018-04-03 + tftp_hpa = tftp-hpa; # Added 2015-04-03 + thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25."; + thunderbird-bin-68 = thunderbird-68; + timescale-prometheus = promscale; # Added 2020-09-29 + timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 + togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 + tomboy = throw "tomboy is not actively developed anymore and was removed."; # Added 2022-01-27 + tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 + tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16 + tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # Added 2020-03-11 + tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # Added 2022-01-01 + torbrowser = tor-browser-bundle-bin; # Added 2017-04-05 + torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + trang = jing-trang; # Added 2018-04-25 + transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 + transmission_gtk = transmission-gtk; # Added 2018-01-06 + transmission_remote_gtk = transmission-remote-gtk; # Added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned."; - trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 - truecrypt = veracrypt; # added 2018-10-24 - tshark = wireshark-cli; # added 2018-04-25 - tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 - turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 2021-08-08 - typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # added 2021-09-11 - uberwriter = apostrophe; # added 2020-04-23 - ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 - ucsFonts = ucs-fonts; # added 2016-07-15 - ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # 2020-01-11 - ultrastardx-beta = ultrastardx; # added 2017-08-12 - unicorn-emu = unicorn; # added 2020-10-29 - unifiStable = unifi6; # added 2020-12-28 - untrunc = untrunc-anthwlock; # added 2021-02-01 - usb_modeswitch = usb-modeswitch; # added 2016-05-10 - usbguard-nox = usbguard; # added 2019-09-04 - utillinux = util-linux; # added 2020-11-24 - uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; - v4l_utils = v4l-utils; # added 2019-08-07 - v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; - vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; - vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 - varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 - varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26 - varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-09-15 - venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 - vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 - vimbWrapper = vimb; # added 2015-01 - vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 - vimprobable2-unwrapped = vimprobable2; # added 2019-12-05 - virtviewer = virt-viewer; # added 2015-12-24 - virtmanager = virt-manager; # added 2019-10-29 - virtmanager-qt = virt-manager-qt; # added 2019-10-29 - virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 - vorbisTools = vorbis-tools; # added 2016-01-26 - vtun = throw "vtune has been removed as it's unmaintained upstream."; # added 2021-10-29 - way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13 - webkit = webkitgtk; # added 2019-03-05 - webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 - webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 - weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 - wicd = throw "wicd has been removed as it is abandoned."; # added 2021-09-11 - wineStaging = wine-staging; # added 2018-01-08 - wineWayland = wine-wayland; - winusb = woeusb; # added 2017-12-22 - winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 - wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18 - wireguard = wireguard-tools; # added 2018-05-19 - wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # 2022-01-31 - morituri = whipper; # added 2018-09-13 - xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # added 2021-11-19 - xp-pen-g430 = pentablet-driver; # added 2020-05-03 - xdg_utils = xdg-utils; # added 2021-02-01 - xfceUnstable = xfce4-14; # added 2019-09-17 - xfce4-14 = xfce; - xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 - x11 = xlibsWrapper; # added 2015-09 - xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24 - xbmc = kodi; # added 2018-04-25 - xbmcPlain = kodiPlain; # added 2018-04-25 - xbmcPlugins = kodiPackages; # added 2018-04-25 - kodiPlugins = kodiPackages; # added 2021-03-09; - xineLib = xine-lib; # added 2021-04-27 - xineUI = xine-ui; # added 2021-04-27 - xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 - xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; - pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; - pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; - xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 - xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained" - + "and is broken. Working alternatives are libinput and synaptics."); - xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20 - xlibs = xorg; # added 2015-09 - xpraGtk3 = xpra; # added 2018-09-13 - xv = xxv; # added 2020-02-22 - xvfb_run = xvfb-run; # added 2021-05-07 - yacc = bison; # moved from top-level 2021-03-14 - yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # added 2022-01-15 - youtubeDL = youtube-dl; # added 2014-10-26 - ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; - yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 - yuzu = yuzu-mainline; # added 2021-01-25 - zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # added 2021-04-07 - zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28 - zdfmediathk = mediathekview; # added 2019-01-19 + trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # Added 2020-04-29 + truecrypt = veracrypt; # Added 2018-10-24 + tshark = wireshark-cli; # Added 2018-04-25 + tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 + typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # Added 2021-09-11 - gnome_user_docs = gnome-user-docs; # added 2019-11-20 - # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell - spidermonkey = spidermonkey_78; # added 2020-10-09 - libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20 - libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20 - libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20 - libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20 + ### U ### + + uberwriter = apostrophe; # Added 2020-04-23 + ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 + ucsFonts = ucs-fonts; # Added 2016-07-15 + ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # Added 2020-01-11 + ultrastardx-beta = ultrastardx; # Added 2017-08-12 + unicorn-emu = unicorn; # Added 2020-10-29 + unifiStable = unifi6; # Added 2020-12-28 + untrunc = untrunc-anthwlock; # Added 2021-02-01 + urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 + urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02 + urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02 + urxvt_perl = rxvt-unicode-plugins.perl; # Added 2020-02-02 + urxvt_perls = rxvt-unicode-plugins.perls; # Added 2020-02-02 + urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 + urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 + urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 + usb_modeswitch = usb-modeswitch; # Added 2016-05-10 + usbguard-nox = usbguard; # Added 2019-09-04 + utillinux = util-linux; # Added 2020-11-24 + uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; + + ### V ### + + v4l_utils = v4l-utils; # Added 2019-08-07 + v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; + vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 + vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; + varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-07-26 + varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-07-26 + varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-09-15 + vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 + venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 + vimbWrapper = vimb; # Added 2015-01 + vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # Added 2019-12-05 + vimprobable2-unwrapped = vimprobable2; # Added 2019-12-05 + virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 + virtmanager = virt-manager; # Added 2019-10-29 + virtmanager-qt = virt-manager-qt; # Added 2019-10-29 + virtviewer = virt-viewer; # Added 2015-12-24 + vorbisTools = vorbis-tools; # Added 2016-01-26 + vtun = throw "vtune has been removed as it's unmaintained upstream."; # Added 2021-10-29 + + ### W ### + + way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 + webkit = webkitgtk; # Added 2019-03-05 + webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 + webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 + weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # Added 2018-09-06 + wicd = throw "wicd has been removed as it is abandoned."; # Added 2021-09-11 + wineFull = winePackages.full; # Added 2017-05-27 + wineMinimal = winePackages.minimal; # Added 2017-05-27 + wineStable = winePackages.stable; # Added 2017-05-27 + wineStaging = wine-staging; # Added 2018-01-08 + wineUnstable = winePackages.unstable; # Added 2017-05-27 + wineWayland = wine-wayland; + winswitch = throw "winswitch has been removed from nixpkgs."; # Added 2019-12-10 + winusb = woeusb; # Added 2017-12-22 + wireguard = wireguard-tools; # Added 2018-05-19 + wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # Added 2019-11-18 + wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # Added 2022-01-31 + + ### X ### + + x11 = xlibsWrapper; # Added 2015-09 + xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24 + xbmc = kodi; # Added 2018-04-25 + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 + xbmcPlain = kodiPlain; # Added 2018-04-25 + xbmcPlugins = kodiPackages; # Added 2018-04-25 + xdg_utils = xdg-utils; # Added 2021-02-01 + xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # Added 2020-03-14 + xfce4-14 = xfce; + xfceUnstable = xfce4-14; # Added 2019-09-17 + xineLib = xine-lib; # Added 2021-04-27 + xineUI = xine-ui; # Added 2021-04-27 + xmonad_log_applet_gnome3 = xmonad_log_applet; # Added 2018-05-01 + xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; + xp-pen-g430 = pentablet-driver; # Added 2020-05-03 + xf86_video_nouveau = xorg.xf86videonouveau; # Added 2015-09 + xf86_input_mtrack = throw '' + xf86_input_mtrack has been removed from nixpkgs as it is broken and + unmaintained. Working alternatives are libinput and synaptics. + ''; + xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # Added 2020-01-20 + xlibs = xorg; # Added 2015-09 + xpraGtk3 = xpra; # Added 2018-09-13 + xv = xxv; # Added 2020-02-22 + xvfb_run = xvfb-run; # Added 2021-05-07 + + ### Y ### + + yacc = bison; # moved from top-level 2021-03-14 + yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 + youtubeDL = youtube-dl; # Added 2014-10-26 + ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; + yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # Added 2021-03-08 + yuzu = yuzu-mainline; # Added 2021-01-25 + + ### Z ### + + zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07 + zdfmediathk = mediathekview; # Added 2019-01-19 + zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # Added 2021-03-28 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off - # added 2017-05-27 - wineMinimal = winePackages.minimal; - wineFull = winePackages.full; - wineStable = winePackages.stable; - wineUnstable = winePackages.unstable; - - # added 2018-03-26 - libva-full = libva; - libva1-full = libva1; - - # forceSystem should not be used directly in Nixpkgs. - # added 2018-07-16 - forceSystem = system: _: - (import self.path { localSystem = { inherit system; }; }); - callPackage_i686 = pkgsi686Linux.callPackage; - - inherit (ocaml-ng) # added 2016-09-14 + inherit (ocaml-ng) # Added 2016-09-14 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 - ocamlPackages_4_03 - ocamlPackages_latest; + ocamlPackages_4_03 ocamlPackages_latest; - mumble_git = pkgs.mumble; # added 2019-08-01 - murmur_git = pkgs.murmur; # added 2019-08-01 - zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; # added 2020-08-17 + zabbix44 = throw '' + Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at + https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 + ''; # Added 2020-08-17 - # added 2019-09-06 + # Added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; - # added 2020-06-22 + # Added 2020-06-22 zeromq3 = throw "zeromq3 has been deprecated by zeromq4."; jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; -} // (with ocaml-ng; { # added 2016-09-14 + +} // (with ocaml-ng; { # Added 2016-09-14 ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; }) // { - gnatsd = nats-server; # added 2019-10-28 - tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 - tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 - dina-font-pcf = dina-font; # added 2020-02-09 - - /* Cleanup before 20.09 */ - oraclejdk8psu = throw '' - oraclejdk8psu: The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed! - ''; - oraclejre8psu = oraclejdk8psu; - oraclejdk8psu_distro = oraclejdk8psu; - - dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02 - sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 - gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; - todolist = throw "todolist is now ultralist."; # added 2020-12-27 - - /* Cleanup before 21.05 */ - riot-desktop = throw "riot-desktop is now element-desktop!"; - riot-web = throw "riot-web is now element-web"; - - ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; - - /* Added 2021-01-02 */ - ttyrec = ovh-ttyrec; - - tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # added 2012-06-12 - - zplugin = zinit; # Added 2021-01-30 - - posix_man_pages = man-pages-posix; # Added 2021-04-15 - - /* Cleanup before 21.11, Added 2021-05-07 */ avian = throw '' - The package doesn't compile anymore on NixOS and both development - & maintenance is abandoned by upstream. - ''; + The package doesn't compile anymore on NixOS and both development & + maintenance is abandoned by upstream. + ''; # Cleanup before 21.11, Added 2021-05-07 + ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; + dina-font-pcf = dina-font; # Added 2020-02-09 + dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # Added 2020-02-02 + gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; + gnatsd = nats-server; # Added 2019-10-28 - # Added 2021-06-01 obs-gstreamer = throw '' obs-gstreamer has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-gstreamer. - ''; + ''; # Added 2021-06-01 - # Added 2021-06-01 obs-move-transition = throw '' obs-move-transition has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-move-transition. - ''; + ''; # Added 2021-06-01 - # Added 2021-06-01 obs-multi-rtmp = throw '' obs-multi-rtmp has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-multi-rtmp. - ''; + ''; # Added 2021-06-01 - # Added 2021-06-01 obs-ndi = throw '' obs-ndi has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.obs-ndi. - ''; + ''; # Added 2021-06-01 - obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01 + obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01 - # Added 2021-06-01 obs-wlrobs = throw '' wlrobs has been converted into a plugin for use with wrapOBS. Its new location is obs-studio-plugins.wlrobs. - ''; + ''; # Added 2021-06-01 - multimc = throw "multimc was removed from nixpkgs; use polymc instead"; # Added 2022-01-08 + oraclejdk8psu = throw "The *psu versions of oraclejdk are no longer provided by upstream."; # Cleanup before 20.09 + oraclejre8psu = oraclejdk8psu; # Cleanup before 20.09 + oraclejdk8psu_distro = oraclejdk8psu; # Cleanup before 20.09 + posix_man_pages = man-pages-posix; # Added 2021-04-15 + riot-desktop = throw "riot-desktop is now element-desktop!"; # Cleanup before 21.05 + riot-web = throw "riot-web is now element-web"; # Cleanup before 21.05 + sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04 + todolist = throw "todolist is now ultralist."; # Added 2020-12-27 + tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 + tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10 + tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # Added 2012-06-12 + ttyrec = ovh-ttyrec; # Added 2021-01-02 + zplugin = zinit; # Added 2021-01-30 - /* If these are in the scope of all-packages.nix, they cause collisions - between mixed versions of qt. See: - https://github.com/NixOS/nixpkgs/pull/101369 */ - - inherit (plasma5Packages) breeze-icons oxygen-icons5; - inherit (plasma5Packages) - akonadi akregator ark - bomber bovo - dolphin dragon - elisa - ffmpegthumbs filelight - granatier gwenview - k3b - kaddressbook kalzium kapptemplate kapman kate katomic - kblackbox kblocks kbounce - kcachegrind kcalc kcharselect kcolorchooser - kdenlive kdf kdialog kdiamond - keditbookmarks - kfind kfloppy - kget kgpg - khelpcenter - kig kigo killbots kitinerary - kleopatra klettres klines - kmag kmail kmines kmix kmplot - knavalbattle knetwalk knights - kollision kolourpaint kompare konsole kontact korganizer - kpkpass - krdc kreversi krfb - kshisen ksquares ksystemlog - kteatime ktimer ktouch kturtle - kwalletmanager kwave - marble minuet - okular - picmi - spectacle - yakuake - ; - inherit (plasma5Packages) - bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth - discover - kactivitymanagerd - kde-cli-tools kde-gtk-config kdeplasma-addons - kgamma5 - kinfocenter - kmenuedit - kscreen kscreenlocker ksshaskpass - kwallet-pam kwayland-integration kwin kwrited - milou - oxygen - plasma-browser-integration - plasma-desktop - plasma-integration - plasma-nm - plasma-pa - plasma-systemmonitor - plasma-thunderbolt - plasma-vault - plasma-workspace plasma-workspace-wallpapers - polkit-kde-agent powerdevil - qqc2-breeze-style - sddm-kcm systemsettings - xdg-desktop-portal-kde - plasma-phone-components - plasma-nano - ; - inherit (plasma5Packages.thirdParty) - plasma-applet-caffeine-plus - plasma-applet-virtual-desktop-bar - kwin-dynamic-workspaces - kwin-tiling - krohnkite - krunner-symbols - ; - inherit (libsForQt5) - sddm - ; + inherit (stdenv.hostPlatform) system; # Added 2021-10-22 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { @@ -1358,6 +1373,41 @@ mapAliases ({ targetLlvmLibraries = targetPackages.llvmPackages_git.libraries; }); - inherit (stdenv.hostPlatform) system; # added 2021-10-22 + /* If these are in the scope of all-packages.nix, they cause collisions + between mixed versions of qt. See: + https://github.com/NixOS/nixpkgs/pull/101369 */ + + inherit (plasma5Packages) + akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk + breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa + ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook + kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce + kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config + kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy + kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary + kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot + knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact + korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares + ksshaskpass ksystemlog kteatime ktimer ktouch kturtle kwallet-pam + kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet + okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop + plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components + plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace + plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style + sddm-kcm spectacle systemsettings xdg-desktop-portal-kde yakuake + ; + + inherit (plasma5Packages.thirdParty) + krohnkite + krunner-symbols + kwin-dynamic-workspaces + kwin-tiling + plasma-applet-caffeine-plus + plasma-applet-virtual-desktop-bar + ; + + inherit (libsForQt5) + sddm + ; }) From be1609fe569f507c12ea8eede34ea1612ae69009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Feb 2022 04:10:58 +0000 Subject: [PATCH 606/703] python3Packages.pybind11: 2.9.0 -> 2.9.1 https://github.com/pybind/pybind11/releases/tag/v2.9.1 --- pkgs/development/python-modules/pybind11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 475336a14cdf..46c1307826ef 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-zYDgXXpn8Z1Zti8Eje8qxDvbQV70/LmezG3AtxzDG+o="; + hash = "sha256-wBvEWQlZhHoSCMbGgYtB3alWBLA8mA8Mz6JPLhXa3Pc="; }; nativeBuildInputs = [ cmake ]; From b964d23a917d127e82781b17d70efbaf2ecb56ea Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Feb 2022 21:39:48 -0800 Subject: [PATCH 607/703] chromaprint: fix build, pin ffmpeg to 4.x --- pkgs/development/libraries/chromaprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index c8b8875154a8..5b8cc369ee31 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, boost, ffmpeg, darwin, zlib }: +{ lib, stdenv, fetchurl, cmake, boost, ffmpeg_4, darwin, zlib }: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg ] ++ lib.optionals stdenv.isDarwin + buildInputs = [ boost ffmpeg_4 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo zlib]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; From 2eb5c569a8b09295b043fbface64dc335a991052 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 3 Feb 2022 21:44:44 +0000 Subject: [PATCH 608/703] graphicsmagick: fix use of delegates in conversions fixes #157920. nuking the references in `magick_config.h` also nuked the references to the package's own `delegates.mgk`, needed for determining which external tools to use for handling of e.g. pdf files. --- pkgs/applications/graphics/graphicsmagick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index fe387ddc273b..4c83802d7ad8 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # Remove CFLAGS from the binaries to avoid closure bloat. # In the past we have had -dev packages in the closure of the binaries soley due to the string references. postConfigure = '' - nuke-refs ./magick/magick_config.h + nuke-refs -e $out ./magick/magick_config.h ''; postInstall = '' From e379b45caaff2a70be6aff85b0e3e4e6fdbd2490 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 3 Feb 2022 21:46:28 +0000 Subject: [PATCH 609/703] graphicsmagick: add passthru regression test for issue #157920 use a pdf from the documentation of `graphviz` as it's already a dependency --- .../graphics/graphicsmagick/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 4c83802d7ad8..f92f3686611f 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,9 @@ { lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 -, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences }: +, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences +, runCommand +, graphicsmagick # for passthru.tests +}: stdenv.mkDerivation rec { pname = "graphicsmagick"; @@ -40,6 +43,16 @@ stdenv.mkDerivation rec { sed -i 's/-ltiff.*'\'/\'/ $out/bin/* ''; + passthru = { + tests = { + issue-157920 = runCommand "issue-157920-regression-test" { + buildInputs = [ graphicsmagick ]; + } '' + gm convert ${graphviz}/share/graphviz/doc/pdf/neatoguide.pdf jpg:$out + ''; + }; + }; + meta = { homepage = "http://www.graphicsmagick.org"; description = "Swiss army knife of image processing"; From 3b8270ac54b9e1892e5ed465ac01a61cd575863f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Fri, 4 Feb 2022 02:05:47 +0100 Subject: [PATCH 610/703] zlib: rename name to pname&version (#157751) --- pkgs/development/libraries/zlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 8d7cb3a48c88..48603000c903 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -22,13 +22,13 @@ assert shared || static; assert splitStaticOutput -> static; stdenv.mkDerivation (rec { - name = "zlib-${version}"; + pname = "zlib"; version = "1.2.11"; src = fetchurl { urls = - [ "https://www.zlib.net/fossils/${name}.tar.gz" # stable archive path - "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz" + [ "https://www.zlib.net/fossils/zlib-${version}.tar.gz" # stable archive path + "mirror://sourceforge/libpng/zlib/${version}/zlib-${version}.tar.gz" ]; sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; }; From 3d7809b56cdc2f19ea9caa2b523e10d7c4aa7da3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 14:45:41 -0800 Subject: [PATCH 611/703] python3Packages.empty-files: init at 0.0.3 --- .../python-modules/empty-files/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/empty-files/default.nix diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix new file mode 100644 index 000000000000..b6c31519efcd --- /dev/null +++ b/pkgs/development/python-modules/empty-files/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "empty-files"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "approvals"; + repo = "EmptyFiles.Python"; + rev = "v${version}"; + sha256 = "sha256-K4rlVO1X1AWxYI3EqLsyQ5/Ist/jlwFrmOM4aMojtKU="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # cyclic dependency with approvaltests + doCheck = false; + + pythonImportsCheck = [ "empty_files" ]; + + meta = with lib; { + description = "Null Object pattern for files"; + homepage = "https://github.com/approvals/EmptyFiles.Python"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e55629918184..0f68fd116d6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2564,6 +2564,8 @@ in { emoji = callPackage ../development/python-modules/emoji { }; + empty-files = callPackage ../development/python-modules/empty-files { }; + empy = callPackage ../development/python-modules/empy { }; emulated-roku = callPackage ../development/python-modules/emulated-roku { }; From 6e39d6a2e793b192951119e7748bddae721e8b46 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 14:50:29 -0800 Subject: [PATCH 612/703] python3Packages.approvaltests: fix src, build, update deps --- .../python-modules/approvaltests/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 5bb9a5bf9e8a..7d2377938cf8 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,21 +1,34 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pyperclip }: +{ lib, buildPythonPackage, fetchFromGitHub +, beautifulsoup4 +, empty-files +, numpy +, pyperclip +, pytest +}: buildPythonPackage rec { - version = "3.3.2"; + version = "3.5.0"; pname = "approvaltests"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; - rev = version; + rev = "v${version}"; sha256 = "15blwjzd6nwh0kzxa9xxscxdn0vqwb1bax8d46wk01dcywdyd6ni"; }; - propagatedBuildInputs = [ pyperclip ]; + propagatedBuildInputs = [ + beautifulsoup4 + empty-files + numpy + pyperclip + pytest + ]; postPatch = '' substituteInPlace setup.py \ + --replace bs4 beautifulsoup4 \ --replace "pyperclip==1.5.27" "pyperclip>=1.5.27" ''; From 4a56d85b829e973e699fa737b8c2e151b004c753 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 15:10:46 -0800 Subject: [PATCH 613/703] python3Packages.imageio-ffmpeg: pin ffmpeg to 4.x --- pkgs/development/python-modules/imageio-ffmpeg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index a249b2dbfe19..6998ff330afc 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -3,7 +3,7 @@ , isPy3k , fetchPypi , substituteAll -, ffmpeg +, ffmpeg_4 , python }: @@ -21,7 +21,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./ffmpeg-path.patch; - ffmpeg = "${ffmpeg}/bin/ffmpeg"; + ffmpeg = "${ffmpeg_4}/bin/ffmpeg"; }) ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { ${python.interpreter} << EOF from imageio_ffmpeg import get_ffmpeg_version - assert get_ffmpeg_version() == '${ffmpeg.version}' + assert get_ffmpeg_version() == '${ffmpeg_4.version}' EOF runHook postCheck From a987251bd5eb2b6d7e2eb2415d2720dc5b789265 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 15:11:10 -0800 Subject: [PATCH 614/703] python3Packages.imageio: 2.13.5 -> 2.14.1 --- pkgs/development/python-modules/imageio/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 5727b52755a6..98495932fdaf 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -13,23 +13,14 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.13.5"; + version = "2.14.1"; disabled = isPy27; src = fetchPypi { - sha256 = "0gc41aiz2i0napk1y00v9bgb4m7dd21sz3lghfm6w6s0ivjjpv67"; + sha256 = "sha256-cJwY+ACYHkKGq+S9hrbJtbtuKFtrkztboJYu+OeZQFg="; inherit pname version; }; - patches = [ - # already present in master, remove on next bump - (fetchpatch { - name = "pillow-9-gif-rgba.patch"; - url = "https://github.com/imageio/imageio/commit/836b7a9b077a96de8adab5b67ea53b1292048275.patch"; - sha256 = "0rlyppa4w16n6qn5hr4wrg8xiy7ifs8c5dhmq8a9yncypx87glpv"; - }) - ]; - propagatedBuildInputs = [ imageio-ffmpeg numpy From f5fbcf260f0fbcf07ec079fccbcd389dd27c9841 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 15:34:42 -0800 Subject: [PATCH 615/703] gst_all_1.gst-plugins-base: 1.18.5 -> 1.20. --- pkgs/development/libraries/gstreamer/base/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 8b6073cb9588..db76164fde2a 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -41,19 +41,15 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lgt69FhXANsP3VuENVThHiVk/tngYfWR+uiKe+ZEb6M="; + sha256 = "sha256-TLZvzPcwsQN+ZTOGLCEomQkSpttOW70U4O+RRFDrTHw="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja @@ -121,7 +117,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs \ common/scangobj-merge.py \ - scripts/extract-release-date-from-doap-file.py + scripts/ ''; # This package has some `_("string literal")` string formats From c2e0d0286d883c6defc64516737afaee5339e0f0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 15:35:45 -0800 Subject: [PATCH 616/703] gst_all_1.gstreamer: 1.18.5 -> 1.20.0 --- pkgs/development/libraries/gstreamer/core/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 268da0171630..fa1188347731 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "bin" @@ -34,13 +34,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VYYiMqY0Wbv1ar694whcqa7CEbR46JHazqTW34yv6Ao="; + sha256 = "sha256-7fS///hVkdT/97Ibue1/D+q8EjrEpO/ynnPLzkVPnbc="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja From 4f35eed05fe814ba01013bfe8ed29f1d39f613f4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 15:36:03 -0800 Subject: [PATCH 617/703] gst_all_1.gst-libav: 1.18.5 -> 1.20.0 --- pkgs/development/libraries/gstreamer/libav/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 7f2828253c88..0d9f22d7d65f 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , python3 +, gstreamer , gst-plugins-base , gettext , libav @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gi4AipEOndE67b3Y3GP+3vQEDA7i6Se6sxEuneaTpUg="; + sha256 = "sha256-Xu5e2NUIKjG1AESOQVNcci7jDNX4Ik8ymCu6ui7t7xc="; }; outputs = [ "out" "dev" ]; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gstreamer gst-plugins-base libav ]; From 4fb8a2e0124b123ef1f1695f2ebd12b320a9947f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 15:49:08 -0800 Subject: [PATCH 618/703] ffms: pin ffmpeg to 4.x --- pkgs/development/libraries/ffms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 283942df63f9..6e7a58f5597e 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, ffmpeg +, ffmpeg_4 , zlib }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - ffmpeg + ffmpeg_4 zlib ]; From 3662deaf295eb2b2f27fb9188391785de8ef755b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 16:20:22 -0800 Subject: [PATCH 619/703] vlc: pin ffmpeg to 4.x --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 7aa780f8a7f2..a5e65480b2bf 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,7 +10,7 @@ , avahi , dbus , faad2 -, ffmpeg +, ffmpeg_4 , flac , fluidsynth , freefont_ttf @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { avahi dbus faad2 - ffmpeg + ffmpeg_4 flac fluidsynth fribidi From 1ab5a3c9284c7c469c83273dd79a02743a382750 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 16:21:11 -0800 Subject: [PATCH 620/703] ffmpegthumbnailer: pin ffmpeg to 4.x --- pkgs/development/libraries/ffmpegthumbnailer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index dfdbf8eb2f80..812da34061be 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, ffmpeg, cmake, libpng, pkg-config, libjpeg +{ fetchFromGitHub, lib, stdenv, ffmpeg_4, cmake, libpng, pkg-config, libjpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg libpng libjpeg ]; + buildInputs = [ ffmpeg_4 libpng libjpeg ]; cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; meta = with lib; { From fad7fedb29241e659c3be6b2c88efe71219636f9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 22:09:51 -0800 Subject: [PATCH 621/703] audacity: pin ffmpeg to 4.x --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 0e4afa4af7cf..9d4c522edc1a 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -24,7 +24,7 @@ , expat , libid3tag , libopus -, ffmpeg +, ffmpeg_4 , soundtouch , pcre /*, portaudio - given up fighting their portaudio.patch */ @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ffmpeg + ffmpeg_4 file flac libid3tag From d50803b78d18935daccf42aca1ea5be7c1b87bb3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Feb 2022 22:10:14 -0800 Subject: [PATCH 622/703] mgba: pin ffmpeg to 4.x --- pkgs/misc/emulators/mgba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index f6b9c11ffe39..d8defe6f2e96 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -4,7 +4,7 @@ , SDL2 , cmake , libepoxy -, ffmpeg +, ffmpeg_4 , imagemagick , libedit , libelf @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 libepoxy - ffmpeg + ffmpeg_4 imagemagick libedit libelf From bca5a4fa6ead231620280d1dd4a0d684a603e6c1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 12:54:49 -0800 Subject: [PATCH 623/703] openjfx15: pin ffmpeg to 4.x --- pkgs/development/compilers/openjdk/openjfx/15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index 26c16895c5d4..3feda519b084 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg, python3, ruby }: +, ffmpeg_4, python3, ruby }: let major = "15"; @@ -21,7 +21,7 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; From e3281ae93800df82b1bd351d6434ad0878e93d4b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 13:02:03 -0800 Subject: [PATCH 624/703] wlroots_0_15: pin ffmpeg to 4.x --- pkgs/development/libraries/wlroots/0.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix index e5785fab9f21..ed3effaa5405 100644 --- a/pkgs/development/libraries/wlroots/0.15.nix +++ b/pkgs/development/libraries/wlroots/0.15.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang +, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang , nixosTests , enableXWayland ? true, xwayland ? null @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg xcbutilrenderutil seatd vulkan-loader + libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader ] ++ lib.optional enableXWayland xwayland ; From 06d4ae68000de517fc526b436d3628acc0973ee8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 13:02:42 -0800 Subject: [PATCH 625/703] wlroots_0_14: pin ffmpeg to 4.x --- pkgs/development/libraries/wlroots/0.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/0.14.nix b/pkgs/development/libraries/wlroots/0.14.nix index cf188756ffde..398a09ff2aa7 100644 --- a/pkgs/development/libraries/wlroots/0.14.nix +++ b/pkgs/development/libraries/wlroots/0.14.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, xcbutilrenderutil, seatd +, libpng, ffmpeg_4, xcbutilrenderutil, seatd , enableXWayland ? true, xwayland ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg xcbutilrenderutil seatd + libpng ffmpeg_4 xcbutilrenderutil seatd ] ++ lib.optional enableXWayland xwayland ; From 80793761a6037e41a08de9a72156f5b16d05fd01 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 13:09:47 -0800 Subject: [PATCH 626/703] gst_all_1.gst-devtools: 1.18.5 -> 1.20.0 --- .../libraries/gstreamer/devtools/default.nix | 10 ++++------ .../devtools/fix_pkgconfig_includedir.patch | 15 --------------- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 0b7be2bd03ec..aa92410e0e48 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, cairo , meson , ninja , pkg-config @@ -12,17 +13,13 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/s/8hkR9r1wqBoQ8dXqZHXRcqiBpRGoNdG6ZsT98sHk="; + sha256 = "sha256-afyHVuydk+XFJYyZCIQ08gPpH9vFryjR8sWD/YGbeh0="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - outputs = [ "out" "dev" @@ -40,6 +37,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + cairo python3 json-glib ]; diff --git a/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch deleted file mode 100644 index ff19c7cbf6f8..000000000000 --- a/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build -index a612b21b..c017eaff 100644 ---- a/validate/pkgconfig/meson.build -+++ b/validate/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', apiversion) - pkgconf.set('VERSION', gst_version) - From ee01a36d2233fe4cc031a1488f65ccdfad4b7ca8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 13:12:37 -0800 Subject: [PATCH 627/703] gst_all_1.gst-editing-services: 1.18.5 -> 1.20.0 --- .../libraries/gstreamer/ges/default.nix | 8 ++------ .../gstreamer/ges/fix_pkgconfig_includedir.patch | 15 --------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 0bfe6f3e0e2f..4630ce6d0ce4 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" @@ -26,13 +26,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ivSoOU0FHz4YKAaG20mm76zMlcDFmhfw9WTjIABZDfU="; + sha256 = "sha256-+Detz0Bz0ZpZCJhOh5zQOfQZLKNo5x056MzYpWuf7t8="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch deleted file mode 100644 index 1e12f3bbfbea..000000000000 --- a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index a612b21b..c017eaff 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', apiversion) - pkgconf.set('VERSION', gst_version) - From 821dcc49f3686bf46eb6ab7c8541f6dfd3a4bafd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 13:28:01 -0800 Subject: [PATCH 628/703] retroarchBare: pin ffmpeg to 4.x --- pkgs/misc/emulators/retroarch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index f0dba9058d10..2c49874e5446 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -6,7 +6,7 @@ , alsa-lib , AppKit , fetchFromGitHub -, ffmpeg +, ffmpeg_4 , Foundation , freetype , gamemode @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { lib.optional stdenv.isLinux wayland ++ lib.optional (runtimeLibs != [ ]) makeWrapper; - buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ + buildInputs = [ ffmpeg_4 freetype libxml2 libGLU libGL python3 SDL2 which ] ++ lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ lib.optional withVulkan vulkan-loader ++ lib.optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ From a237978b5fb0a3d607ca026b8edad5c3bee97fd0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 13:31:49 -0800 Subject: [PATCH 629/703] jami-daemon: pin ffmpeg to 4.x --- .../networking/instant-messengers/jami/daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix index a324d061aa73..f39b731132ea 100644 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -7,7 +7,7 @@ , autoreconfHook , pkg-config , perl # for pod2man -, ffmpeg +, ffmpeg_4 , pjsip , alsa-lib , asio @@ -39,7 +39,7 @@ let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); - ffmpeg-jami = ffmpeg.overrideAttrs (old: + ffmpeg-jami = ffmpeg_4.overrideAttrs (old: let patch-src = src + "/daemon/contrib/src/ffmpeg/"; in From 9ec5c4ceb5fdfbb4f66a683c9a150056c30a1993 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 16:59:50 -0800 Subject: [PATCH 630/703] obs-studio: pin ffmpeg to 4.x --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 31f478c47c0b..f8bed2365638 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -6,7 +6,7 @@ , addOpenGLRunpath , cmake , fdk_aac -, ffmpeg +, ffmpeg_4 , jansson , libjack2 , libxkbcommon @@ -73,7 +73,7 @@ mkDerivation rec { buildInputs = [ curl fdk_aac - ffmpeg + ffmpeg_4 jansson libcef libjack2 From e9a1b7cb54fd284ff39d72270abd634b98d4c1d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 17:04:22 -0800 Subject: [PATCH 631/703] Revert "python3Packages.sanic-routing: disable failing test" The main `sanic` package doesn't support this release yet This reverts commit 65c428587c4ced06729a925ecc1a3259971297fd. --- pkgs/development/python-modules/sanic-routing/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index 7cd2a951d4f1..90859c40fa02 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -17,12 +17,6 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook pytest-asyncio ]; - - disabledTests = [ - # sanic_routing/route.py:333: DeprecationWarning: Use of 'number' as a path parameter type is deprected, and will be removed in Sanic v21.12. Instead, use . - "test_casting" - ]; - pythonImportsCheck = [ "sanic_routing" ]; meta = with lib; { From ea6b4e655787e0cf2c12831e86805ddcbaad7d2b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 17:05:05 -0800 Subject: [PATCH 632/703] Revert "python3Packages.sanic-routing: 0.7.2 -> 21.12.0" The `sanic` package doesn't yet support this This reverts commit 45e8b6f9362eaa2071904e6b4b4dd2db0a8cccaa. --- pkgs/development/python-modules/sanic-routing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index 90859c40fa02..b0ecc5ed122c 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "sanic-routing"; - version = "21.12.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-routing"; rev = "v${version}"; - hash = "sha256-IN+keJ5OI++p33/FgW5Xo+Pk09VuR7EASDF7G6eWvM4="; + hash = "sha256-MN6A8CtDVxj34eehr3UIwCT09VOfcruVX+/iImr1MgY="; }; checkInputs = [ pytestCheckHook pytest-asyncio ]; From 570965d2cbdb5f1b858bf7a58cd4041e2e588b62 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 17:59:25 -0800 Subject: [PATCH 633/703] python3Packges.sanic: fix tests --- .../python-modules/sanic/default.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 1ec5ab87d83c..660ca5de80bf 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -73,9 +73,24 @@ buildPythonPackage rec { preCheck = '' # Some tests depends on sanic on PATH PATH="$out/bin:$PATH" + PYTHONPATH=$PWD:$PYTHONPATH + + # needed for relative paths for some packages + cd tests ''; + # uvloop usage is buggy + #SANIC_NO_UVLOOP = true; + + pytestFlagsArray = [ + "--asyncio-mode=auto" + ]; + disabledTests = [ + # Lack of uvloop setup through fixtures + "test_create_asyncio_server" + "test_listeners_triggered_async" + "test_tls_options" # Tests are flaky "test_keep_alive_client_timeout" "test_check_timeouts_request_timeout" @@ -103,6 +118,14 @@ buildPythonPackage rec { "test_version" ]; + disabledTestPaths = [ + # unable to create async loop + "test_app.py" + "test_asgi.py" + # occasionally hangs + "test_multiprocessing.py" + ]; + # avoid usage of nixpkgs-review in darwin since tests will compete usage # for the same local port __darwinAllowLocalNetworking = true; From ec961465948c85bffce6d16a70f9c2596c615e36 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 17:04:50 +0100 Subject: [PATCH 634/703] gst_all_1.gst-plugins-base: clean up Follow up on f5fbcf260f0fbcf07ec079fccbcd389dd27c9841. --- .../libraries/gstreamer/base/default.nix | 4 ++-- .../gstreamer/base/fix_pkgconfig_includedir.patch | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index db76164fde2a..82d90845677c 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -116,8 +116,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs \ - common/scangobj-merge.py \ - scripts/ + scripts/meson-pkg-config-file-fixup.py \ + scripts/extract-release-date-from-doap-file.py ''; # This package has some `_("string literal")` string formats diff --git a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch deleted file mode 100644 index 04486a4647f9..000000000000 --- a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index 04abfbee5..88c86b431 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - pkgconf.set('LIBM', libm.found() ? '-lm' : '') From 918410b35e1b7857e427679e643567dbb521a9ea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 17:05:56 +0100 Subject: [PATCH 635/703] gst_all_1.gstreamer: clean up Follow up on c2e0d0286d883c6defc64516737afaee5339e0f0 --- .../core/fix_pkgconfig_includedir.patch | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch deleted file mode 100644 index db1684269350..000000000000 --- a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index edb0586c2..7ed46dfce 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', join_paths(get_option('prefix'))) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('libexecdir', '${prefix}/@0@'.format(get_option('libexecdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', apiversion) - pkgconf.set('VERSION', gst_version) - pkgconf.set('LIBM', mathlib.found() ? '-lm' : '') From 4a74ad996e68d534436bf1cd52491bb79f72c34c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 17:20:12 +0100 Subject: [PATCH 636/703] =?UTF-8?q?gst=5Fall=5F1.gst-plugins-good:=201.18.?= =?UTF-8?q?5=20=E2=86=92=201.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gstreamer/good/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index a6ed248b663d..3b686e4c7f59 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -48,13 +48,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Oq7up3Zfv4gBrM5KUDqbBfc/BOijU1Lp0AIyz9VVeWs="; + sha256 = "sha256-LRGcFauMnnn4zTxr9YL/egULKMyuUqtIZeGhRkmRZZw="; }; nativeBuildInputs = [ From 827bc2e586ad60e40d5a620898a6e3d161e42396 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 17:21:19 +0100 Subject: [PATCH 637/703] =?UTF-8?q?gst=5Fall=5F1.gst-plugins-bad:=201.18.5?= =?UTF-8?q?=20=E2=86=92=201.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/gstreamer/bad/default.nix | 9 ++------- .../gstreamer/bad/fix_pkgconfig_includedir.patch | 15 --------------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 016a7a992ed9..f3eed6c947cd 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -92,20 +92,15 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oWSSO5Tw0IV4pvyuqsbgwF2niKRpA6EIaHDpykWtZ44="; + sha256 = "sha256-AVuNTZo5Xr9ETUCHaGeiA03TMEs61IvDoN0MHucdwR0="; }; - patches = [ - # Use pkgconfig to inject the includedirs - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch deleted file mode 100644 index c687fffc9c08..000000000000 --- a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index 271f327f3..7e2afa754 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', join_paths(get_option('prefix'))) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - From 2af6e2ba52881259c38108a8fa923802d0ea6353 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 18:10:27 +0100 Subject: [PATCH 638/703] =?UTF-8?q?gst=5Fall=5F1.gst-plugins-ugly:=201.18.?= =?UTF-8?q?5=20=E2=86=92=201.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/gstreamer/ugly/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 7c4b21f7c833..05133271f846 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -19,17 +19,18 @@ , IOKit , CoreFoundation , DiskArbitration +, enableGplPlugins ? true }: stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3zKAPpj4qZeTc/osp+BeYvl3sQl1dtOoBhnZ9cafZtk="; + sha256 = "sha256-To3LXSZVLwpJN/a8Ynm9kHD1XKauDqoy1y0mTEQAHC4="; }; nativeBuildInputs = [ @@ -43,14 +44,15 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc + libintl + opencore-amr + ] ++ lib.optionals enableGplPlugins [ a52dec libcdio libdvdread libmad libmpeg2 x264 - libintl - opencore-amr ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation @@ -60,7 +62,16 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing - ]; + ] ++ (if enableGplPlugins then [ + "-Dgpl=enabled" + ] else [ + "-Da52dec=disabled" + "-Dcdio=disabled" + "-Ddvdread=disabled" + "-Dmpeg2dec=disabled" + "-Dsidplay=disabled" + "-Dx264=disabled" + ]); postPatch = '' patchShebangs \ @@ -76,7 +87,7 @@ stdenv.mkDerivation rec { the plug-ins or the supporting libraries might not be how we'd like. The code might be widely known to present patent problems. ''; - license = licenses.lgpl2Plus; + license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; From 4f8e97d1f902c9e9ea7a8ae676858b49679cfa2c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 18:10:44 +0100 Subject: [PATCH 639/703] faad2: correct license --- pkgs/development/libraries/faad2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 0afef1c9fd82..396acbc1bdf2 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; From cf5c58ea390909510614680620191bbf1854c153 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 18:10:57 +0100 Subject: [PATCH 640/703] x264: correct license --- pkgs/development/libraries/x264/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 2c9f476313ec..dc2b1c40c6cb 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for encoding H264/AVC video streams"; homepage = "http://www.videolan.org/developers/x264.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt tadeokondrak ]; }; From 3f8b8a8ebf53dfca927c4df8a932914277026c61 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 18:11:10 +0100 Subject: [PATCH 641/703] mjpegtools: correct license --- pkgs/tools/video/mjpegtools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 77c187a48a61..4d9fdfd7820e 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A suite of programs for processing MPEG or MJPEG video"; homepage = "http://mjpeg.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; From 500a98c8cc0d2b9e182f1d27ed9818c8550514ac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 18:34:55 +0100 Subject: [PATCH 642/703] =?UTF-8?q?gst=5Fall=5F1.gst-plugins-bad:=201.18.5?= =?UTF-8?q?=20=E2=86=92=201.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/gstreamer/bad/default.nix | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index f3eed6c947cd..85cfa3077a57 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -8,11 +8,13 @@ , python3 , gst-plugins-base , orc +, gstreamer , gobject-introspection , enableZbar ? false , faacSupport ? false , faac , faad2 +, ldacbt , libass , libkate , libmms @@ -27,7 +29,7 @@ , sratom , libbs2b , libmodplug -, mpeg2dec +, libmpeg2 , libmicrodns , openjpeg , libopus @@ -39,6 +41,7 @@ , fdk_aac , flite , gsm +, json-glib , libaom , libdc1394 , libde265 @@ -47,6 +50,7 @@ , libdvdread , libgudev , libofa +, libqrencode , libsndfile , libusb1 , neon @@ -88,6 +92,7 @@ , CoreVideo , Foundation , MediaToolbox +, enableGplPlugins ? true }: stdenv.mkDerivation rec { @@ -108,6 +113,7 @@ stdenv.mkDerivation rec { orc # for orcc python3 gettext + gstreamer # for gst-tester-1.0 gobject-introspection ] ++ lib.optionals stdenv.isLinux [ wayland # for wayland-scanner @@ -119,14 +125,14 @@ stdenv.mkDerivation rec { # gobject-introspection has to be in both nativeBuildInputs and # buildInputs. The build tries to link against libgirepository-1.0.so gobject-introspection - faad2 + json-glib + ldacbt libass libkate libmms webrtc-audio-processing # webrtc libbs2b libmodplug - mpeg2dec libmicrodns openjpeg libopenmpt @@ -140,9 +146,9 @@ stdenv.mkDerivation rec { libde265 libdvdnav libdvdread + libqrencode libsndfile libusb1 - mjpegtools neon openal opencv4 @@ -161,7 +167,6 @@ stdenv.mkDerivation rec { libGLU libgme openssl - x265 libxml2 libintl srt @@ -170,6 +175,11 @@ stdenv.mkDerivation rec { zbar ] ++ lib.optionals faacSupport [ faac + ] ++ lib.optionals enableGplPlugins [ + libmpeg2 + mjpegtools + faad2 + x265 ] ++ lib.optionals stdenv.isLinux [ bluez libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs @@ -224,7 +234,7 @@ stdenv.mkDerivation rec { "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" "-Dzbar=${if enableZbar then "enabled" else "disabled"}" "-Dfaac=${if faacSupport then "enabled" else "disabled"}" - "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing + "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing, also this is AGPL so update license when adding support "-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support # As of writing, with `libmpcdec` in `buildInputs` we get @@ -250,6 +260,10 @@ stdenv.mkDerivation rec { "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing + "-Dgs=disabled" # depends on `google-cloud-cpp` + "-Disac=disabled" # depends on `webrtc-audio-coding-1` not packaged in nixpkgs as of writing + "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing + "-Dopenaptx=disabled" # depends on older version of `libopenaptx` due to licensing conflict https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2235 ] ++ lib.optionals (!stdenv.isLinux) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` @@ -281,7 +295,17 @@ stdenv.mkDerivation rec { "-Dapplemedia=disabled" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dintrospection=disabled" - ]; + ] ++ (if enableGplPlugins then [ + "-Dgpl=enabled" + ] else [ + "-Ddts=disabled" + "-Dfaad=disabled" + "-Diqa=disabled" + "-Dmpeg2enc=disabled" + "-Dmplex=disabled" + "-Dresindvd=disabled" + "-Dx265=disabled" + ]); # Argument list too long strictDeps = true; @@ -306,7 +330,7 @@ stdenv.mkDerivation rec { something - be it a good code review, some documentation, a set of tests, a real live maintainer, or some actual wide use. ''; - license = licenses.lgpl2Plus; + license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; }; From 0baf106ccd688668041b8c76b02d909604aa2226 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 18:36:01 +0100 Subject: [PATCH 643/703] =?UTF-8?q?gst=5Fall=5F1.gst-rtsp-server:=201.18.5?= =?UTF-8?q?=20=E2=86=92=201.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/gstreamer/rtsp-server/default.nix | 16 ++++------------ .../rtsp-server/fix_pkgconfig_includedir.patch | 15 --------------- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index a75af25224a0..80190200c26c 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BNY79IgWxvQcc/beD5EqfO8KqznEQWKnvOzhkj38nR8="; + sha256 = "sha256-wgn17ZBtpxP91EqIROkJqmyK89+2MCWbCSz7d6d1WEM="; }; outputs = [ @@ -25,15 +26,6 @@ stdenv.mkDerivation rec { # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs ]; - patches = [ - # To use split outputs, we need this so double prefix won't be used in the - # pkg-config files. Hopefully, this won't be needed on the next release, - # _if_ - # https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/merge_requests/1 - # will be merged. For the current release, this merge request won't apply. - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch deleted file mode 100644 index d31fe19fb0fe..000000000000 --- a/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git i/pkgconfig/meson.build w/pkgconfig/meson.build -index 8ed8299..594cbfe 100644 ---- i/pkgconfig/meson.build -+++ w/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - From 5afff1e13a9f28088e233b97d21ccc8e15def1af Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 18:36:28 +0100 Subject: [PATCH 644/703] =?UTF-8?q?python3.pkgs.gst-python:=201.18.4=20?= =?UTF-8?q?=E2=86=92=201.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/gst-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index a391d993cf0c..c02e3b593b82 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.18.4"; + version = "1.20.0"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - sha256 = "13h9qzfz8s1gyj2ar9q2gf5346sgdv6jv8hj7aw0hpl2gs5f0s6b"; + sha256 = "j2e9xWBrozYGxryJbonefc2M9PykWfcTibG2/gdbXlQ="; }; # Python 2.x is not supported. From 5281feeb3c13d0adaea88af00c140fe9346cbb0c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 18:41:18 +0100 Subject: [PATCH 645/703] =?UTF-8?q?gst=5Fall=5F1.gst-vaapi:=201.18.5=20?= =?UTF-8?q?=E2=86=92=201.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 5de9a247a527..c8b6230cd595 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SkYPuVVZ9BRE6ySGStLZ43kitu6pQVEDEDGfw+C6cns="; + sha256 = "sha256-95pHNG39XlheBj53B45fxJiwbe6JW/y/R9iGP8rJ6jI="; }; outputs = [ From ba6f1d74706593b239a75a9f3a971a9f8325db5e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 18:57:56 +0100 Subject: [PATCH 646/703] gst_all_1.gst-plugins-bad: remove unused dependencies 1.20.0 removed mms and ofa plug-ins: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1153 https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1211 --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 85cfa3077a57..186eac32c870 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -17,7 +17,6 @@ , ldacbt , libass , libkate -, libmms , lrdf , ladspaH , libnice @@ -49,7 +48,6 @@ , libdvdnav , libdvdread , libgudev -, libofa , libqrencode , libsndfile , libusb1 @@ -129,7 +127,6 @@ stdenv.mkDerivation rec { ldacbt libass libkate - libmms webrtc-audio-processing # webrtc libbs2b libmodplug @@ -198,7 +195,6 @@ stdenv.mkDerivation rec { libdrm libgudev libnice - libofa sbc spandsp From a1c9e8402cd10480b9b34100c951610beaf52f6a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 6 Feb 2022 19:01:52 +0100 Subject: [PATCH 647/703] gst_all_1.gst-plugins-bad: fix eval --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 186eac32c870..deece45753bc 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -48,7 +48,7 @@ , libdvdnav , libdvdread , libgudev -, libqrencode +, qrencode , libsndfile , libusb1 , neon @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { libde265 libdvdnav libdvdread - libqrencode + qrencode libsndfile libusb1 neon From 46b79f9b46273490ef41636939d8781de5099432 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 10:32:35 -0800 Subject: [PATCH 648/703] python3Packages.treeo: fix build --- pkgs/development/python-modules/treeo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index c8329f99a60e..f3271b9a3bb2 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { sha256 = "176r1kgsdlylvdrxmhnzni81p8m9cfnsn4wwn6fnmsgam2qbp76j"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'typing-extensions = "^3.10.0"' 'typing-extensions = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; From 8dd54f6f102b3f3f9899c63f57fb7b5049770128 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 10:38:20 -0800 Subject: [PATCH 649/703] python3Packages.ha-av: pin ffmpeg to 4.x --- pkgs/development/python-modules/ha-av/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ha-av/default.nix b/pkgs/development/python-modules/ha-av/default.nix index af5f5f31ab61..78735b67d44d 100644 --- a/pkgs/development/python-modules/ha-av/default.nix +++ b/pkgs/development/python-modules/ha-av/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , pkg-config -, ffmpeg +, ffmpeg_4 }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; buildInputs = [ - ffmpeg + ffmpeg_4 ]; pythonImportsCheck = [ From a47d80b669229ed805da31c299ec9741eb213b3c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 10:41:06 -0800 Subject: [PATCH 650/703] openjfk: pin ffmpeg to 4x. --- pkgs/development/compilers/openjdk/openjfx/11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index e977d2b00203..ff243372b4a5 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4, python2, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ]; dontUseCmakeConfigure = true; From e12328c7b76dfcf07525f0962c0bd18b83caaaab Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 10:45:29 -0800 Subject: [PATCH 651/703] python3Packages.altair: fix tests --- pkgs/development/python-modules/altair/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 0d5dd95c8333..e4bec8fafa4b 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -6,7 +6,7 @@ , jsonschema , numpy , pandas -, pytest +, pytestCheckHook , pythonOlder , recommonmark , six @@ -39,7 +39,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales ipython - pytest + pytestCheckHook recommonmark sphinx vega_datasets @@ -47,11 +47,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "altair" ]; - checkPhase = '' - export LANG=en_US.UTF-8 - # histogram_responsive.py attempt network access, and cannot be disabled through pytest flags - rm altair/examples/histogram_responsive.py - pytest --doctest-modules altair + # avoid examples directory, which fetches web resources + preCheck = '' + cd altair/tests ''; meta = with lib; { From 8f6ad6abdc6b6a887dbf7eae55ed840acd0cdeba Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 10:52:32 -0800 Subject: [PATCH 652/703] python3Packages.hypercorn: 0.11.2 -> 0.13.2 --- pkgs/development/python-modules/hypercorn/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index 5f3842835364..dc165f2b2cc4 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -8,6 +8,7 @@ , h2 , priority , mock +, poetry-core , pytest-asyncio , pytest-cov , pytest-sugar @@ -17,16 +18,21 @@ buildPythonPackage rec { pname = "Hypercorn"; - version = "0.11.2"; + version = "0.13.2"; disabled = pythonOlder "3.7"; + format = "pyproject"; src = fetchFromGitLab { owner = "pgjones"; repo = pname; rev = version; - sha256 = "0v80v6l2xqac5mgrmh2im7y23wpvz4yc2v4h9ryhvl88c2jk9mvh"; + sha256 = "sha256-fIjw5A6SvFUv8cU7xunVlPYphv+glypY4pzvHNifYLQ="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ wsproto toml h2 priority ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; From ecba38a3833330e1e8bd782fe4dd885420e5035b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 17:24:28 -0800 Subject: [PATCH 653/703] mlt: pin ffmpeg to 4.x --- pkgs/development/libraries/mlt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index a4f0289cd58e..b73289ca82ff 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper -, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif +, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 , jack2, ladspa-sdk, swig, which, ncurses @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev + SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2 ladspa-sdk ] ++ lib.optional enablePython ncurses; From 4bcdfdfc717ed355390300ffea5244a682b1c810 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 17:38:57 -0800 Subject: [PATCH 654/703] qt5.qtwebengine: pin ffmpeg to 4.x --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 65b740573fcb..01d0c5932828 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -19,7 +19,7 @@ , ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication , cups, openbsm, runCommand, xcbuild, writeScriptBin -, ffmpeg ? null +, ffmpeg_4 ? null , lib, stdenv, fetchpatch , version ? null , qtCompatVersion @@ -154,7 +154,7 @@ qtModule { harfbuzz icu libevent - ffmpeg + ffmpeg_4 ] ++ lib.optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp From 0cdc7232cb743e30e32862cd827650e2387bcf87 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 18:11:24 -0800 Subject: [PATCH 655/703] kotatogram-desktop.tg_owt: pin mpeg to 4.x --- .../instant-messengers/telegram/kotatogram-desktop/tg_owt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 614183b72d08..070ae2f8c5f8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf +, libjpeg, openssl, libopus, ffmpeg_$, alsa-lib, libpulseaudio, protobuf , xorg, libXtst }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf + libjpeg openssl libopus ffmpeg_4 alsa-lib libpulseaudio protobuf xorg.libX11 libXtst ]; From e78ff05ee81a214c78122d7acff1a7118da4507e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 18:45:19 -0800 Subject: [PATCH 656/703] kotatogram-desktop.tg_owt: fix typo --- .../instant-messengers/telegram/kotatogram-desktop/tg_owt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 070ae2f8c5f8..aff74a174b9c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg_$, alsa-lib, libpulseaudio, protobuf +, libjpeg, openssl, libopus, ffmpeg_4, alsa-lib, libpulseaudio, protobuf , xorg, libXtst }: From 2946c3062888e1ec069bb2de4c38baa17aa1492c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 18:46:08 -0800 Subject: [PATCH 657/703] diffoscope: disable llvm test The python script returns is unable to determine llvm correctly, which cases another error --- pkgs/tools/misc/diffoscope/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 26b39c66e88f..0c090106640c 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -77,6 +77,9 @@ python3Packages.buildPythonApplication rec { # Failing because of file-v5.40 has a slightly different output. # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 "test_text_proper_indentation" + + # fails because it fails to determine llvm version + "test_item3_deflate_llvm_bitcode" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" From 28038a0b6dd35cd943f85fb563564e48e6d99d5d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 18:54:12 -0800 Subject: [PATCH 658/703] python3Packges.zimports: fix src --- pkgs/development/python-modules/zimports/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index d968bf794ab3..d350e2040891 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; - rev = version; + rev = "v${version}"; sha256 = "11mg7j7xiypv9hki4qbnp9jsgwgfdrgdzfqyrzk5x0s4hycgi4q0"; }; From c33df84daf6f163ca36df3cde2f35a2cc0e562de Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 18:59:30 -0800 Subject: [PATCH 659/703] python3Packages.pot: fix version --- pkgs/development/python-modules/pot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 41d0cc402eef..8bc7ecb7f355 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pot"; - version = "0.8.1"; + version = "0.8.1.0"; src = fetchPypi { pname = "POT"; From 73a757d0ddf9aeefbfeaf32506ea906eb192547a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 19:00:46 -0800 Subject: [PATCH 660/703] python3Packages.scikit-tda: fix src --- pkgs/development/python-modules/scikit-tda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index 4ccfb473915c..cf2e524337de 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-tda"; repo = "scikit-tda"; - rev = version; + rev = "v${version}"; sha256 = "0yhmf5jmxywyj6l9q0rfv9r8wpdk063fvvfnb4azwwccblgz37rj"; }; From 38baf60c1f9a0f119a3f8cf9bf2c319ea6860b93 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 19:20:14 -0800 Subject: [PATCH 661/703] python3Packages.moto: 1.3.16 -> 3.0.2 --- .../python-modules/moto/default.nix | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 4d9156349e4a..a998e7b74b41 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -6,6 +6,7 @@ , cfn-lint , docker , flask +, flask-cors , freezegun , jinja2 , jsondiff @@ -24,15 +25,16 @@ , idna , nose , pytestCheckHook +, pytest-xdist }: buildPythonPackage rec { pname = "moto"; - version = "1.3.16"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0zy0prsyip264i6h03lxsn1qg1n3dc8c4iyfawckjqvm24gnns3c"; + sha256 = "sha256-vZ1oofOYUkFETDFKwSmifvvn+bCi/6NQAxu950NYk5k="; }; postPatch = '' @@ -42,22 +44,6 @@ buildPythonPackage rec { --replace "MarkupSafe<2.0" "MarkupSafe" \ ''; - patches = [ - # Remove dependence on boto. The boto library (long ago superseded by boto3) - # has not had an official release in over two years or even a commit in the - # last 18 months. These patches should be included in the next moto release - # after 1.3.16 - (fetchpatch { - url = "https://github.com/spulec/moto/pull/3503/commits/ae85c539fd57034c4d5cfd0f95af41ff19862dd1.patch"; - sha256 = "16hr2py6q701d8ih6zcvs3lbanshpbk15ixckgdqngjf160k5m9p"; - excludes = ["tests/test_ec2/test_ec2_cloudformation.py"]; - }) - (fetchpatch { - url = "https://github.com/spulec/moto/pull/3468/commits/6ee39bd7fda4d3623569e10dcd9561bf2cd1d0bd.patch"; - sha256 = "10m3xdqxgys7spav9mkbhcn4z0124rlprwxnw6ysb10610xlna0i"; - }) - ]; - propagatedBuildInputs = [ aws-xray-sdk boto3 @@ -80,8 +66,15 @@ buildPythonPackage rec { idna ] ++ lib.optionals isPy27 [ backports_tempfile ]; - # Next release after 1.3.16 will not require `nose` - checkInputs = [ boto3 nose freezegun pytestCheckHook sure parameterized ]; + checkInputs = [ + boto3 + flask-cors + freezegun + parameterized + pytestCheckHook + pytest-xdist + sure + ]; # Multiple test files still import boto, rather than boto3 like # boto is long-deprecated and broken on python3.9 @@ -89,6 +82,7 @@ buildPythonPackage rec { # NOTE: This should change to use disabledTestFiles / disabledTestPaths once that # feature stabalizes: see #113153 (mostly the discussion therein), #113167, #110700 pytestFlagsArray = [ + "-n $NIX_BUILD_CORES" "--ignore=tests/test_awslambda/test_policy.py" "--ignore=tests/test_autoscaling/test_autoscaling.py" "--ignore=tests/test_autoscaling/test_cloudformation.py" @@ -226,6 +220,12 @@ buildPythonPackage rec { "--ignore=tests/test_swf/responses/test_timeouts.py" "--ignore=tests/test_swf/responses/test_workflow_executions.py" "--ignore=tests/test_swf/responses/test_workflow_types.py" + # attempts web connections + "--ignore=tests/test_appsync/test_appsync_schema.py" + "--ignore=tests/test_awslambda/test_lambda_eventsourcemapping.py" + "--ignore=tests/test_awslambda/test_lambda_invoke.py" + "--ignore=tests/test_batch/test_batch_jobs.py" + "--ignore=tests/**/*_integration.py" ]; disabledTests = [ @@ -256,6 +256,14 @@ buildPythonPackage rec { "test_get_records_seq" "test_stream_with_range_key" "test_create_notebook_instance_bad_volume_size" + "http_destination" + "test_invoke_function_from_sqs_exception" + "test_state_machine_list_executions_with_pagination" + "test_put_subscription_filter_with_lambda" + "test_create_custom_lambda_resource__verify_cfnresponse_failed" + "test_state_machine_creation_fails_with_invalid_names" + # needs graphql + "test_get_schema_creation_status" ]; meta = with lib; { From 91c26b8e3976e419c9b9f926bad6a96d89ff78de Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 19:53:34 -0800 Subject: [PATCH 662/703] python310Packages.retworkx: 0.9.0 -> 0.11.0 --- pkgs/development/python-modules/retworkx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index f4490c72876d..62b419def880 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "retworkx"; - version = "0.9.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "retworkx"; rev = version; - hash = "sha256-1W7DexS+ECAPsxyZAF36xcEguFkjUMX9lDBylNVPqyk="; + hash = "sha256-o3XPMTaiFH5cBtyqtW650wiDBElLvCmERr2XwwdPO1c="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-y5l7jqrlk3ONHefZPS31IvcaO9ttXWLM7fIUmNVwbco="; + hash = "sha256-Zhk4m+HNtimhPWfiBLi9dqJ0fp2D8d0u9k6ROG0/jBo="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; From a85692956dbf101617aa96c19f132e293c33aae9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 20:06:23 -0800 Subject: [PATCH 663/703] python3Packages.oslo-log: fix tests --- pkgs/development/python-modules/oslo-log/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index dd2d69a0c23d..a2e6eac8e389 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -10,7 +10,7 @@ , pbr , pyinotify , python-dateutil -, stestr +, pytestCheckHook }: buildPythonPackage rec { @@ -36,12 +36,13 @@ buildPythonPackage rec { checkInputs = [ oslotest - stestr + pytestCheckHook ]; - checkPhase = '' - stestr run - ''; + disabledTests = [ + # not compatible with sandbox + "test_logging_handle_error" + ]; pythonImportsCheck = [ "oslo_log" ]; From ce6c9dcc25b674ed0f4c1fbd7a0c9d65277b9cfd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 20:39:43 -0800 Subject: [PATCH 664/703] python310Packages.tornado_4: mark broken for python 3.10+ --- pkgs/development/python-modules/tornado/4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix index b4343b5d5ff6..3be82e40a298 100644 --- a/pkgs/development/python-modules/tornado/4.nix +++ b/pkgs/development/python-modules/tornado/4.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tornado"; version = "4.5.3"; - disabled = isPy27; + disabled = isPy27 || python.pythonAtLeast "3.10"; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 From 6eda56c36798c431e97ce391a4485fcdb9f3765e Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sat, 5 Feb 2022 20:25:57 +1000 Subject: [PATCH 665/703] ffmpegthumbnailer: 2.2.2 -> unstable-2021-09-02 Needed for FFmpeg 5 compatibility. Upstream hasn't tagged a release since 2019. --- .../libraries/ffmpegthumbnailer/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 812da34061be..9bfee290871f 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,19 +1,19 @@ -{ fetchFromGitHub, lib, stdenv, ffmpeg_4, cmake, libpng, pkg-config, libjpeg +{ fetchFromGitHub, lib, stdenv, ffmpeg, cmake, libpng, pkg-config, libjpeg }: stdenv.mkDerivation rec { pname = "ffmpegthumbnailer"; - version = "2.2.2"; + version = "unstable-2021-09-02"; src = fetchFromGitHub { owner = "dirkvdb"; repo = "ffmpegthumbnailer"; - rev = version; - sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich"; + rev = "d92e191dd793b12cee0a0f685f5a8d8252988399"; + sha256 = "1ysfq3g74b8ivivrdpfi4vm23d3cyc3rfla5i6y8q9aycis9xv6q"; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg_4 libpng libjpeg ]; + buildInputs = [ ffmpeg libpng libjpeg ]; cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; meta = with lib; { From 5ab0b425f68668a71d2ed91afce696f9891d491d Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sat, 5 Feb 2022 20:57:09 +1000 Subject: [PATCH 666/703] mplayer: 1.4 -> unstable-2022-02-03 Needed for FFmpeg 5.0 compatibility. Last release was in 2019. --- pkgs/applications/video/mplayer/default.nix | 14 +++++------- .../mplayer/svn-r38199-ffmpeg44fix.patch | 22 ------------------- 2 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 1715ce4a6a17..0c435bfbe158 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg +{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -93,11 +93,12 @@ in stdenv.mkDerivation rec { pname = "mplayer"; - version = "1.4"; + version = "unstable-2022-02-03"; - src = fetchurl { - url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz"; - sha256 = "0j5mflr0wnklxsvnpmxvk704hscyn2785hvvihj2i3a7b3anwnc2"; + src = fetchsvn { + url = "svn://svn.mplayerhq.hu/mplayer/trunk"; + rev = "38331"; + sha256 = "1vpic8i6zvg0zsy50vhm45ysqag561bpn9jycfbvvwl9ji7l55zi"; }; prePatch = '' @@ -106,8 +107,6 @@ stdenv.mkDerivation rec { rm -rf ffmpeg ''; - patches = [ ./svn-r38199-ffmpeg44fix.patch ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; @@ -163,7 +162,6 @@ stdenv.mkDerivation rec { (if pulseSupport then "--enable-pulse" else "--disable-pulse") (if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2") "--disable-xanim" - "--disable-ivtv" "--disable-xvid --disable-xvid-lavc" "--disable-ossaudio" "--disable-ffmpeg_a" diff --git a/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch b/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch deleted file mode 100644 index 4137989fcb54..000000000000 --- a/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: libmpcodecs/ad_spdif.c -=================================================================== -diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c ---- a/libmpcodecs/ad_spdif.c (revision 38198) -+++ b/libmpcodecs/ad_spdif.c (revision 38199) -@@ -298,14 +298,8 @@ - if (spdif_ctx->header_written) - av_write_trailer(lavf_ctx); - av_freep(&lavf_ctx->pb); -- if (lavf_ctx->streams) { -- av_freep(&lavf_ctx->streams[0]->codec); -- av_freep(&lavf_ctx->streams[0]->info); -- av_freep(&lavf_ctx->streams[0]); -- } -- av_freep(&lavf_ctx->streams); -- av_freep(&lavf_ctx->priv_data); -+ avformat_free_context(lavf_ctx); -+ lavf_ctx = NULL; - } -- av_freep(&lavf_ctx); - av_freep(&spdif_ctx); - } From 79cb125a6d27f3846cd2e60ae71926de95bae78b Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sun, 6 Feb 2022 12:45:56 +1000 Subject: [PATCH 667/703] gnash: remove Is broken and long-abandoned by upstream. --- .../gnash/0001-fix-build-with-ffmepg-4.patch | 57 -------- pkgs/misc/gnash/default.nix | 132 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 4 files changed, 1 insertion(+), 193 deletions(-) delete mode 100644 pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch delete mode 100644 pkgs/misc/gnash/default.nix diff --git a/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch b/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch deleted file mode 100644 index f6316ae972fd..000000000000 --- a/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch +++ /dev/null @@ -1,57 +0,0 @@ -From cb13c20332526a4db99e7fd0818b9a75829affad Mon Sep 17 00:00:00 2001 -From: Zane van Iperen -Date: Sun, 7 Nov 2021 15:36:02 +1000 -Subject: [PATCH] fix build with ffmepg 4 - ---- - libmedia/ffmpeg/MediaHandlerFfmpeg.cpp | 2 +- - libmedia/ffmpeg/MediaParserFfmpeg.cpp | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp -index 127aaaa..216d96b 100644 ---- a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp -+++ b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp -@@ -149,7 +149,7 @@ MediaHandlerFfmpeg::cameraNames(std::vector& /*names*/) const - size_t - MediaHandlerFfmpeg::getInputPaddingSize() const - { -- return FF_INPUT_BUFFER_PADDING_SIZE; -+ return AV_INPUT_BUFFER_PADDING_SIZE; - } - - } // gnash.media.ffmpeg namespace -diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp -index 9ceb8b0..a27ca56 100644 ---- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp -+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp -@@ -64,7 +64,7 @@ AVInputFormat* - MediaParserFfmpeg::probeStream() - { - const size_t probeSize = 4096; -- const size_t bufSize = probeSize + FF_INPUT_BUFFER_PADDING_SIZE; -+ const size_t bufSize = probeSize + AV_INPUT_BUFFER_PADDING_SIZE; - - std::unique_ptr buffer(new std::uint8_t[bufSize]); - -@@ -173,7 +173,7 @@ MediaParserFfmpeg::parseVideoFrame(AVPacket& packet) - - // TODO: We might avoid the copy as a whole by making EncodedVideoFrame - // virtual. -- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE; -+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE; - std::uint8_t* data = new std::uint8_t[allocSize]; - std::copy(packet.data, packet.data+packet.size, data); - std::unique_ptr frame(new EncodedVideoFrame(data, packet.size, 0, timestamp)); -@@ -221,7 +221,7 @@ MediaParserFfmpeg::parseAudioFrame(AVPacket& packet) - - // TODO: We might avoid the copy as a whole by making EncodedAudioFrame - // virtual. -- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE; -+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE; - std::uint8_t* data = new std::uint8_t[allocSize]; - std::copy(packet.data, packet.data+packet.size, data); - --- -2.31.1 - diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix deleted file mode 100644 index fc7148b40489..000000000000 --- a/pkgs/misc/gnash/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook -, pkg-config, libtool, boost, SDL -, glib, pango, gettext, curl, xorg -, libpng, libjpeg, giflib, speex, atk - -# renderers -, enableAGG ? true, agg ? null -, enableCairo ? false, cairo ? null -, enableOpenGL ? false -, libGLU ? null -, libGL ? null - -# GUI toolkits -, enableGTK ? true, gtk2 ? null, gnome2 ? null -, enableSDL ? false -, enableQt ? false, qt4 ? null - -# media -, enableFFmpeg ? true, ffmpeg ? null - -# misc -, enableJemalloc ? true, jemalloc ? null -, enableHwAccel ? true -, enablePlugins ? false, xulrunner ? null, npapi_sdk ? null -}: - -with lib; - -let - available = x: x != null; - - sound = - if enableFFmpeg then "ffmpeg" else "none"; - - renderers = [] - ++ optional enableAGG "agg" - ++ optional enableCairo "cairo" - ++ optional enableOpenGL "opengl"; - - toolkits = [] - ++ optional enableGTK "gtk" - ++ optional enableSDL "sdl" - ++ optional enableQt "qt4"; - -in - -# renderers -assert enableAGG -> available agg; -assert enableCairo -> available cairo; -assert enableOpenGL -> all available [ libGLU libGL ]; - -# GUI toolkits -assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ]; -assert enableSDL -> available SDL; -assert enableQt -> available qt4; - -# media libraries -assert enableFFmpeg -> available ffmpeg ; - -# misc -assert enableJemalloc -> available jemalloc; -assert enableHwAccel -> all available [ libGLU libGL ]; -assert enablePlugins -> all available [ xulrunner npapi_sdk ]; - -assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"; -assert length renderers == 0 -> throw "at least one renderer must be enabled"; - - -stdenv.mkDerivation { - pname = "gnash"; - version = "0.8.11-2019-30-01"; - - src = fetchgit { - url = "git://git.sv.gnu.org/gnash.git"; - rev = "583ccbc1275c7701dc4843ec12142ff86bb305b4"; - sha256 = "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry"; - }; - - postPatch = '' - sed -i 's|jemalloc.h|jemalloc/jemalloc.h|' libbase/jemalloc_gnash.c - ''; - - nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; - buildInputs = [ - glib gettext boost curl SDL speex - xorg.libXmu xorg.libSM xorg.libXt - libpng libjpeg giflib pango atk - ] ++ optional enableAGG agg - ++ optional enableCairo cairo - ++ optional enableQt qt4 - ++ optional enableFFmpeg ffmpeg - ++ optional enableJemalloc jemalloc - ++ optional enableHwAccel [ libGL libGLU ] - ++ optionals enableOpenGL [ libGL libGLU ] - ++ optionals enablePlugins [ xulrunner npapi_sdk ] - ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]; - - patches = [ - (fetchpatch { # fix compilation due to bad detection of libgif version: https://savannah.gnu.org/patch/index.php?9873 - url = "https://savannah.gnu.org/patch/download.php?file_id=47859"; - sha256 = "0aimayzgi5065gkcfcr8d5lkd9c0471q7dqmln42hjzq847n6d5y"; - }) - - # Fix build with modern Pango - # https://savannah.gnu.org/bugs/index.php?57759 - (fetchpatch { - url = "https://savannah.gnu.org/file/0001-Do-not-depend-on-pangox.patch?file_id=48366"; - sha256 = "02x7sl5zwd1ld2n4b6bp16c5gk91qsap0spfbb5iwpglq3galv2l"; - }) - - ./0001-fix-build-with-ffmepg-4.patch - ]; - - configureFlags = with lib; [ - "--with-boost-incl=${boost.dev}/include" - "--with-boost-lib=${boost.out}/lib" - "--enable-renderer=${concatStringsSep "," renderers}" - "--enable-gui=${concatStringsSep "," toolkits}" - "--enable-media=${sound}" - "--with-npapi-install=prefix" - (enableFeature enablePlugins "plugins") - (enableFeature enableJemalloc "jemalloc") - (optionalString enableHwAccel "--enable-device=egl") - ]; - - meta = { - homepage = "https://savannah.gnu.org/projects/gnash"; - description = "A flash (SWF) player and browser plugin"; - license = licenses.gpl3; - maintainers = with maintainers; [ rnhmjoj ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index be0d96b3bbed..a4d6c26ff147 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -383,6 +383,7 @@ mapAliases ({ gmailieer = lieer; # Added 2020-04-19 gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 + gnash = throw "gnash has been removed; broken and abandoned upstream."; # added 2022-02-06 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = celluloid; # Added 2019-08-22 gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b03979e95baf..32bb9c06d57f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5995,10 +5995,6 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; - gnash = callPackage ../misc/gnash { - autoreconfHook = buildPackages.autoreconfHook269; - }; - gnirehtet = callPackage ../tools/networking/gnirehtet { }; gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; From 48fe791e401c07bd5bbd3540158f99be4b3229e9 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Mon, 7 Feb 2022 19:31:26 +1000 Subject: [PATCH 668/703] x265: disable tests on aarch64-darwin Temporary to not break its dependencies. See https://github.com/NixOS/nixpkgs/pull/154347#issuecomment-1030949445 --- pkgs/development/libraries/x265/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 8ddcedf198b5..20c56f4d9037 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -17,7 +17,7 @@ , custatsSupport ? false # Internal profiling of encoder work , debugSupport ? false # Run-time sanity checks (debugging) , ppaSupport ? false # PPA profiling instrumentation -, unittestsSupport ? (!stdenv.is32bit) # Unit tests - only testing x64 assembly +, unittestsSupport ? (stdenv.is64bit && !(stdenv.isDarwin && stdenv.isAarch64)) # Unit tests - only testing x64 assembly , vtuneSupport ? false # Vtune profiling instrumentation , werrorSupport ? false # Warnings as errors }: From d06ab8aa759d64d693938f05f7b61ee8fefeb5dd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 10:28:55 -0800 Subject: [PATCH 669/703] alephone: pin ffmpeg to 4.x --- pkgs/games/alephone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 347ccd8df63b..6477e3fb37d5 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg +{ lib, stdenv, fetchurl, boost, curl, ffmpeg_4, icoutils, libGLU, libmad, libogg , libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net , SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip , alephone }: @@ -20,7 +20,7 @@ let buildInputs = [ boost curl - ffmpeg + ffmpeg_4 libGLU libmad libsndfile From fa6d7fa2b484bd21ebfd5a2cec09d72c6b2d3ffe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 10:45:23 -0800 Subject: [PATCH 670/703] python3Packages.python-dbusmock: disable incompatible tests --- pkgs/development/python-modules/python-dbusmock/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index a714260bda66..60e6f2e74552 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -38,6 +38,10 @@ buildPythonPackage rec { "test_cli" "test_timedated" "test_upower" + # needs glib + "test_accounts_service" + # needs dbus-daemon active + "test_systemd" # Very slow, consider disabling? # "test_networkmanager" ]; From 66f1e25b45404ed832ca6f6292404ca870b85a75 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 10:46:04 -0800 Subject: [PATCH 671/703] python3Packages.pythonocc-core: update opencascade reference --- pkgs/development/python-modules/pythonocc-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index b93ef3292e35..6a8d6e0adee9 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python, fetchFromGitHub, cmake, swig, opencascade, smesh, freetype, libGL, libGLU, libX11 +{ lib, stdenv, python, fetchFromGitHub, cmake, swig, opencascade-occt, smesh, freetype, libGL, libGLU, libX11 , Cocoa }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake swig ]; buildInputs = [ - python opencascade smesh + python opencascade-occt smesh freetype libGL libGLU libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; From abe2304448903d3bef76bd2ae27819e03af304b2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 10:51:43 -0800 Subject: [PATCH 672/703] python3Packages.wasmer*: fix builds --- pkgs/development/python-modules/wasmer/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 726de4168d8a..4a99f048d1a6 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , buildPythonPackage , libiconv -, llvm_11 , libffi , libxml2 , ncurses @@ -74,26 +73,26 @@ rec { wasmer = common { pname = "wasmer"; buildAndTestSubdir = "packages/api"; - cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; + cargoHash = "sha256-twoog8LjQtoli+TlDipSuB7yLFkXQJha9BqobqgZW3Y="; }; wasmer-compiler-cranelift = common { pname = "wasmer-compiler-cranelift"; buildAndTestSubdir = "packages/compiler-cranelift"; - cargoHash = "sha256-cHgAUwqnbQV3E5nUYGYQ48ntbIFfq4JXfU5IrSFZ3zI="; + cargoHash = "sha256-IqeMOY6emhIC7ekH8kIOZCr3JVkjxUg/lQli+ZZpdq4="; }; wasmer-compiler-llvm = common { pname = "wasmer-compiler-llvm"; buildAndTestSubdir = "packages/compiler-llvm"; - cargoHash = "sha256-Jm22CC5S3pN/vdVvsGZdvtoAgPzWVLto8wavSJdxY3A="; - extraNativeBuildInputs = [ llvm_11 ]; + cargoHash = "sha256-xawbf5gXXV+7I2F2fDSaMvjtFvGDBtqX7wL3c28TSbA="; + extraNativeBuildInputs = [ rustPlatform.rust.rustc.llvm ]; extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; }; wasmer-compiler-singlepass = common { pname = "wasmer-compiler-singlepass"; buildAndTestSubdir = "packages/compiler-singlepass"; - cargoHash = "sha256-lmqEo3+jYoN+4EEYphcoE4b84jdFcvYVycjrJ956Bh8="; + cargoHash = "sha256-4nZHMCNumNhdGPOmHXlJ5POYP7K+VPjwhEUMgzGb/Rk="; }; } From 945dd662a6d69eac41c5ffd528071f6b6a892b72 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 10:57:57 -0800 Subject: [PATCH 673/703] python3Packages.pyquil: disable lark sensitive tests --- pkgs/development/python-modules/pyquil/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 7e2c427f6c23..38dd2a8c5a30 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -92,6 +92,9 @@ buildPythonPackage rec { disabledTests = [ "test_compile_with_quilt_calibrations" "test_sets_timeout_on_requests" + # sensitive to lark parser output + "test_memory_commands" + "test_classical" ]; pythonImportsCheck = [ "pyquil" ]; From 894e8ca1fc1a6866867c7227ba4e4a32e1dbc087 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 10:58:24 -0800 Subject: [PATCH 674/703] python3Packages.pyopencl: fix deps, lint --- .../python-modules/pyopencl/default.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index a0f9e70dcc8b..8ba6acb19f60 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -2,18 +2,19 @@ , stdenv , fetchPypi , buildPythonPackage -, Mako -, pytest -, numpy -, cffi -, pytools -, decorator , appdirs -, six -, opencl-headers -, ocl-icd -, pybind11 +, cffi +, decorator +, Mako , mesa_drivers +, numpy +, ocl-icd +, opencl-headers +, platformdirs +, pybind11 +, pytest +, pytools +, six }: let @@ -26,7 +27,16 @@ in buildPythonPackage rec { checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; - propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; + propagatedBuildInputs = [ + appdirs + cffi + decorator + Mako + numpy + platformdirs + pytools + six + ]; src = fetchPypi { inherit pname version; From 2897b20a43a4e683fe7aea3e2860da5ef77650fe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 11:01:12 -0800 Subject: [PATCH 675/703] python3Packages.jupyterhub: disable ssl test --- pkgs/development/python-modules/jupyterhub/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index a90fa0eb9a13..66344e408a8f 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -149,6 +149,8 @@ buildPythonPackage rec { "test_upgrade" # Testcase fails to find requests import "test_external_service" + # attempts to do ssl connection + "test_connection_notebook_wrong_certs" ]; meta = with lib; { From a52db119e1d657bcdeeaa65bcd6cc1238c49b949 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 11:24:46 -0800 Subject: [PATCH 676/703] qcad: fix src --- pkgs/applications/misc/qcad/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 2e75977d68a2..86ed90cbd4a1 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -21,10 +21,11 @@ mkDerivation rec { version = "3.27.1.6"; src = fetchFromGitHub { + name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-ouvWE1fa4DfPLqFYuMsUPWDx/NUaoCc7TfR6Ed0uuF4="; + sha256 = "sha256-NnaCwbk8w0ZPnBz7xxs5LMFMUSnEERCSRBXpJL0u+s0="; }; patches = [ From 03f8de477540bb59e07500308b6e406d13d08534 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 11:26:55 -0800 Subject: [PATCH 677/703] unpaper: pin ffmpeg to 4.x --- pkgs/tools/graphics/unpaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index 20dfe15dc6c6..fdd8cb80e567 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, ffmpeg, libxslt }: +{ lib, stdenv, fetchurl, pkg-config, ffmpeg_4, libxslt }: stdenv.mkDerivation rec { pname = "unpaper"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg libxslt ]; + buildInputs = [ ffmpeg_4 libxslt ]; meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper"; From 72e5686be2ab31ce954bbcd3305f0ec95c2714c0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 11:39:27 -0800 Subject: [PATCH 678/703] python3Packages.osqp: fix version --- pkgs/development/python-modules/osqp/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index fa80a337deaf..865bd45c61b3 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -5,6 +5,7 @@ , future , numpy , qdldl +, setuptools-scm , scipy # check inputs , pytestCheckHook @@ -20,7 +21,9 @@ buildPythonPackage rec { sha256 = "b2fa17aae42a7ed498ec261b33f262bb4b3605e7e8464062159d9fae817f0d61"; }; - nativeBuildInputs = [ cmake ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ cmake setuptools-scm ]; dontUseCmakeConfigure = true; propagatedBuildInputs = [ From fc385b9d88c015fc70c4c3d770f3c8dbba421f34 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 12:04:33 -0800 Subject: [PATCH 679/703] farstream: mark broken no longer compat with gstreamer==1.20 --- pkgs/development/libraries/farstream/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index e26ebef0c518..e9be2efe2acb 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -62,5 +62,7 @@ stdenv.mkDerivation rec { description = "Audio/Video Communications Framework formely known as farsight"; platforms = platforms.linux; license = licenses.lgpl21; + # no longer compatible with gstreamer 1.20 + broken = true; }; } From ac110717908816c0ef15baa266194edd1717191a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 12:17:01 -0800 Subject: [PATCH 680/703] python3Packages.flufl_lock: 6.0 -> 7.0 --- pkgs/development/python-modules/flufl/lock.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index c0f3ec60cf35..c2cc5723e4df 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,16 +1,19 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook , atpublic, psutil, pytest-cov, sybil +, pdm-pep517 }: buildPythonPackage rec { pname = "flufl.lock"; - version = "6.0"; + version = "7.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/HSO5gnshktIOO9knb0RcPp53rDCE8L9URUb7mp/wkI="; + sha256 = "sha256-FBX30Z2N2WpYJC4O+5DOPLGHf7VFB0rYwcrky3GR/gE="; }; + nativeBuildInputs = [ pdm-pep517 ]; propagatedBuildInputs = [ atpublic psutil ]; checkInputs = [ pytestCheckHook pytest-cov sybil ]; From 90f672cfda2f268890de7aec49028003e36a6346 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 12:17:22 -0800 Subject: [PATCH 681/703] python3Packages.sybil: 2.0.1 -> 3.0.0 --- pkgs/development/python-modules/sybil/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 7114f0aeba48..55cea70924e6 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,14 +7,14 @@ buildPythonApplication rec { pname = "sybil"; - version = "2.0.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "597d71e246690b9223c132f0ed7dcac470dcbe9ad022004a801e108a00dc3524"; + sha256 = "sha256-dpLtZueT5eea5qcM8s+GGRftSOr/DYrfgl5k2Fgg8lE="; }; checkInputs = [ @@ -22,9 +22,9 @@ buildPythonApplication rec { ]; disabledTests = [ - # Will be fixed with 3.0.0, https://github.com/simplistix/sybil/pull/27 - "test_future_imports" - "test_pytest" + # sensitive to output of other commands + "test_namespace" + "test_unittest" ]; pythonImportsCheck = [ From 0c8b4192b0910ce66803e4fb4e59414055a9a3ea Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 12:21:06 -0800 Subject: [PATCH 682/703] python3Packages.flufl_i18n: 3.0 -> 4.0 --- pkgs/development/python-modules/flufl/i18n.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index 70b97a083d8f..a670b4a9ba16 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -1,9 +1,14 @@ -{ buildPythonPackage, fetchPypi, atpublic }: +{ buildPythonPackage, fetchPypi +, atpublic +, pdm-pep517 +}: buildPythonPackage rec { pname = "flufl.i18n"; - version = "3.2"; + version = "4.0"; + format = "pyproject"; + nativeBuildInputs = [ pdm-pep517 ]; propagatedBuildInputs = [ atpublic ]; doCheck = false; @@ -12,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-w1yPjqtmrbf9ZKFCCGAQUGbSs2y2VbM/+xSv6OIj7WI="; + sha256 = "sha256-MTq0djhFp/cEx0Ezt5EaMz3MzrAWjxZ0HQSkfFuasWY="; }; } From 6d02a514db95d3179f001a5a204595f17b89cb32 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 12:32:46 -0800 Subject: [PATCH 683/703] python3Packages.habanero: disable network tests --- pkgs/development/python-modules/habanero/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 8e7d90caa1a8..9dc3193957f6 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage, lib, fetchFromGitHub , requests, tqdm , nose, vcrpy +, pytestCheckHook }: buildPythonPackage rec { @@ -17,8 +18,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests tqdm ]; - checkInputs = [ nose vcrpy ]; - checkPhase = "make test"; + # almost the entirety of the test suite makes network calls + pytestFlagsArray = [ + "test/test-filters.py" + ]; + + checkInputs = [ + pytestCheckHook + vcrpy + ]; meta = { description = "Python interface to Library Genesis"; From ef06f44700a70ba17b05b3a2a130a4fa86d6b0f7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 12:33:50 -0800 Subject: [PATCH 684/703] python3Packages.pythonocc-core: fix linking --- .../python-modules/pythonocc-core/default.nix | 18 +++++++++++++++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 6a8d6e0adee9..9415a4ee36f7 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, python, fetchFromGitHub, cmake, swig, opencascade-occt, smesh, freetype, libGL, libGLU, libX11 -, Cocoa }: +{ lib, stdenv, python, fetchFromGitHub +, cmake +, Cocoa +, freetype +, libGL +, libGLU +, libX11 +, libXext +, libXi +, libXmu +, opencascade-occt +, smesh +, swig +}: stdenv.mkDerivation rec { pname = "pythonocc-core"; @@ -21,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake swig ]; buildInputs = [ python opencascade-occt smesh - freetype libGL libGLU libX11 + freetype libGL libGLU libX11 libXext libXmu libXi ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e87b36d945af..a6a44ee61cae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8051,7 +8051,7 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libX11 libXi libXmu libXext; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }); From 23fa12ea7a20f572863213fb962499100d628885 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 12:40:06 -0800 Subject: [PATCH 685/703] python3Packages.pythonocc-core: add fontconfig --- pkgs/development/python-modules/pythonocc-core/default.nix | 2 ++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 9415a4ee36f7..d632103d36ae 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, python, fetchFromGitHub , cmake , Cocoa +, fontconfig , freetype , libGL , libGLU @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ python opencascade-occt smesh freetype libGL libGLU libX11 libXext libXmu libXi + fontconfig ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6a44ee61cae..71feac4889e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8051,6 +8051,7 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { + inherit (pkgs) fontconfig; inherit (pkgs.xorg) libX11 libXi libXmu libXext; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }); From f20aa40e803fc0ce9d6bac605521749bab7c43b6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 12:51:40 -0800 Subject: [PATCH 686/703] python3Packages.gym: fix src --- pkgs/development/python-modules/gym/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 5c3fed0db26b..1616343f8b43 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openai"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "12b545xz0r2g4z5r7f8amxl7nm0lqymkzwcwhg1bni9h0sxwpv6c"; }; From 4861bef3c1c4b31dd0549b5c9d59ee6e8a4e05df Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 13:28:31 -0800 Subject: [PATCH 687/703] ffmpeg: restore 4.x as default Partial revert of 9236978d80a5f6ce96b7271476fad824ead7b93d Was causing too many failures for packages which don't yet support ffmpeg 5.x yet. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32bb9c06d57f..3804bbe1b2b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16595,7 +16595,9 @@ with pkgs; ffmpeg_3 = ffmpeg_3_4; # Please make sure this is updated to the latest version on the next major # update to ffmpeg - ffmpeg = ffmpeg_5; + # Packages which use ffmpeg as a library, should pin to the relevant major + # version number which the upstream support. + ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { svt-av1 = if stdenv.isAarch64 then null else svt-av1; From 775e3c8e2b39a44c2c7f71687426e854f384bca7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 7 Feb 2022 18:53:21 +0000 Subject: [PATCH 688/703] python3Packages.websockets: disable time-sentitive test Without the change python3Packages.websockets fails tests on machines under load: python3.9-websockets> ERROR: test_keepalive_ping_with_no_ping_timeout (tests.legacy.test_protocol.ServerTests) python3.9-websockets> Traceback (most recent call last): python3.9-websockets> File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout python3.9-websockets> ping_1_again, ping_2 = tuple(self.protocol.pings) python3.9-websockets> ValueError: too many values to unpack (expected 2) The change disables the test. --- .../python-modules/websockets/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 2e13d95c3825..7d6f78902d0a 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -23,11 +23,25 @@ buildPythonPackage rec { # Tests fail on Darwin with `OSError: AF_UNIX path too long` doCheck = !stdenv.isDarwin; - # Disable all tests that need to terminate within a predetermined amount of - # time. This is nondeterministic. patchPhase = '' + # Disable all tests that need to terminate within a predetermined amount of + # time. This is nondeterministic. sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ tests/legacy/test_protocol.py + + # Disables tests relying on tight timeouts to avoid failures like: + # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout + # ping_1_again, ping_2 = tuple(self.protocol.pings) + # ValueError: too many values to unpack (expected 2) + for t in \ + test_keepalive_ping_stops_when_connection_closing \ + test_keepalive_ping_does_not_crash_when_connection_lost \ + test_keepalive_ping \ + test_keepalive_ping_not_acknowledged_closes_connection \ + test_keepalive_ping_with_no_ping_timeout \ + ; do + sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py + done ''; checkPhase = '' From 40bf8d25aa25969174ca5d1eb121191d984461c0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 14:03:06 -0800 Subject: [PATCH 689/703] python3Packages.pythonocc: add rapidjson dep --- pkgs/development/python-modules/pythonocc-core/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index d632103d36ae..8a9433ec898f 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -10,6 +10,7 @@ , libXi , libXmu , opencascade-occt +, rapidjson , smesh , swig }: @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ python opencascade-occt smesh freetype libGL libGLU libX11 libXext libXmu libXi - fontconfig + fontconfig rapidjson ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71feac4889e5..626fb1278456 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8051,7 +8051,7 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs) fontconfig; + inherit (pkgs) fontconfig rapidjson; inherit (pkgs.xorg) libX11 libXi libXmu libXext; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }); From 52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 10 Feb 2022 01:01:21 +0000 Subject: [PATCH 690/703] webkitgtk: revert "pull upstream fix for gcc-12" (#158814) `nixpkgs/master` contains `2.34.5` version with patches applied. Merge of `master` into `staging-next` causes `webkitgtk` to fail to apply patches twice. This reverts commit a74a1f32517b61107bd28f3b54cd49a6fc8db82c to ease `master` merging. --- .../libraries/webkitgtk/default.nix | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ad8711cb9dd3..e9026d46bc69 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , runCommand , fetchurl -, fetchpatch , perl , python3 , ruby @@ -83,30 +82,6 @@ stdenv.mkDerivation rec { inherit (addOpenGLRunpath) driverLink; }) ./libglvnd-headers.patch - - # Pull upstream patches for missing includes on gcc-12: - # https://trac.webkit.org/changeset/288379/webkit - (fetchpatch { - name = "exchange-gcc-12.patch"; - url = "https://github.com/WebKit/WebKit/commit/198b392130b8dd625f4d5d36e652954eececb16b.patch"; - excludes = [ - "Source/JavaScriptCore/ChangeLog" - "Source/WTF/ChangeLog" - "Source/WebCore/ChangeLog" - "Tools/ChangeLog" - - "Tools/ImageDiff/ImageDiff.cpp" - ]; - sha256 = "sha256-D+wxfM8AEMBfvpghrwa5v9cYLyK5+Sab3J0RE/xVar8="; - }) - (fetchpatch { - name = "string-gcc-12.patch"; - url = "https://github.com/WebKit/WebKit/commit/4e3fade6bd89347e041a1938d4ea85fee14e5534.patch"; - excludes = [ - "Source/WTF/ChangeLog" - ]; - sha256 = "sha256-NPqZLfMUR6InQuqfVwNoZwuM3Jtbz5KAbm9SUBaprmc="; - }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' From a0da54e4d11c289b0c8b5fae54bd77be0cb5af10 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 13:41:23 -0800 Subject: [PATCH 691/703] abseil-cpp: init 20211102.0 --- .../abseil-cpp/{default.nix => 202103.nix} | 2 +- .../libraries/abseil-cpp/202111.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 40 insertions(+), 2 deletions(-) rename pkgs/development/libraries/abseil-cpp/{default.nix => 202103.nix} (94%) create mode 100644 pkgs/development/libraries/abseil-cpp/202111.nix diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/202103.nix similarity index 94% rename from pkgs/development/libraries/abseil-cpp/default.nix rename to pkgs/development/libraries/abseil-cpp/202103.nix index 2ade512de310..d2a1f389324c 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "abseil"; repo = "abseil-cpp"; rev = version; - sha256 = "0g9rbhk3mwjdfxk7cscd04vm8fphd5flz9yykpgvyy1nwa34zk3x"; + sha256 = "sha256-fcxPhuI2eL/fnd6nT11p8DpUNwGNaXZmd03yOiZcOT0="; }; patches = [ diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix new file mode 100644 index 000000000000..d40ca0bd4ab2 --- /dev/null +++ b/pkgs/development/libraries/abseil-cpp/202111.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, static ? stdenv.hostPlatform.isStatic +, cxxStandard ? null +}: + +stdenv.mkDerivation rec { + pname = "abseil-cpp"; + version = "20211102.0"; + + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + rev = version; + sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ] ++ lib.optionals (cxxStandard != null) [ + "-DCMAKE_CXX_STANDARD=${cxxStandard}" + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An open-source collection of C++ code designed to augment the C++ standard library"; + homepage = "https://abseil.io/"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.andersk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdd3089daebd..4692524da345 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15808,7 +15808,9 @@ with pkgs; aalib = callPackage ../development/libraries/aalib { }; - abseil-cpp = callPackage ../development/libraries/abseil-cpp { }; + abseil-cpp_202111 = callPackage ../development/libraries/abseil-cpp/202111.nix { }; + abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; + abseil-cpp = abseil-cpp_202103; accountsservice = callPackage ../development/libraries/accountsservice { }; From 3c26e7ce33133afd2ada1abbd8331f3870003afb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 13:55:46 -0800 Subject: [PATCH 692/703] webrtc-audio-processing: init 1.0 --- .../libraries/webrtc-audio-processing/0.3.nix | 26 +++++++++++++++++ .../webrtc-audio-processing/default.nix | 29 ++++++++++++++----- pkgs/top-level/all-packages.nix | 5 +++- 3 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/webrtc-audio-processing/0.3.nix diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix new file mode 100644 index 000000000000..1ce3c2d9fa8b --- /dev/null +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, darwin }: + +stdenv.mkDerivation rec { + pname = "webrtc-audio-processing"; + version = "0.3.1"; + + src = fetchurl { + url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz"; + sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; + }; + + patches = [ ./enable-riscv.patch ]; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + + patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 + ''; + + meta = with lib; { + homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; + description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 1ce3c2d9fa8b..7ec54eac80b0 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,19 +1,34 @@ -{ lib, stdenv, fetchurl, darwin }: +{ lib, stdenv, fetchurl +, darwin +, abseil-cpp_202111 +, meson +, ninja +}: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; - version = "0.3.1"; + version = "1.0"; src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz"; - sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; + url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v1.0/webrtc-audio-processing-v${version}.tar.gz"; + sha256 = "sha256-dqRy1OfOG9TX2cgCD8cowU44zVanns/nPYZrilPfuiU="; }; - patches = [ ./enable-riscv.patch ]; + nativeBuildInputs = [ + meson + ninja + ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = [ + abseil-cpp_202111 + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); - patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' + patchPhase = '' + # this is just incorrect upstream + # see https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4 + substituteInPlace meson.build \ + --replace "absl_flags_registry" "absl_flags_reflection" + '' + lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4692524da345..5744b803a307 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20400,7 +20400,10 @@ with pkgs; websocketpp = callPackage ../development/libraries/websocket++ { }; - webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { }; + webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; + # bump when majoring of packages have updated + webrtc-audio-processing = webrtc-audio-processing_0_3; wildmidi = callPackage ../development/libraries/wildmidi { }; From c42a247d85392b8157099ca10247e2b0e6643139 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 16:58:35 -0800 Subject: [PATCH 693/703] gst_all_1: use webrtc-audio-processing 1.x --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index deece45753bc..be75ea2892db 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -20,7 +20,7 @@ , lrdf , ladspaH , libnice -, webrtc-audio-processing +, webrtc-audio-processing_1 , lilv , lv2 , serd @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { ldacbt libass libkate - webrtc-audio-processing # webrtc + webrtc-audio-processing_1 # webrtc libbs2b libmodplug libmicrodns From f02555db3f4f12ec678bb8d21f4391055a0040eb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 6 Feb 2022 11:29:06 -0800 Subject: [PATCH 694/703] gst_all_1.gst-plugins-bad: add webrtc-audio-processing_0_3 --- pkgs/development/libraries/gstreamer/bad/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index be75ea2892db..8cea6205cf57 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -20,6 +20,7 @@ , lrdf , ladspaH , libnice +, webrtc-audio-processing , webrtc-audio-processing_1 , lilv , lv2 @@ -127,7 +128,8 @@ stdenv.mkDerivation rec { ldacbt libass libkate - webrtc-audio-processing_1 # webrtc + webrtc-audio-processing # required by webrtcdsp + webrtc-audio-processing_1 # required by isac libbs2b libmodplug libmicrodns @@ -257,7 +259,6 @@ stdenv.mkDerivation rec { "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing "-Dgs=disabled" # depends on `google-cloud-cpp` - "-Disac=disabled" # depends on `webrtc-audio-coding-1` not packaged in nixpkgs as of writing "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing "-Dopenaptx=disabled" # depends on older version of `libopenaptx` due to licensing conflict https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2235 ] From eb3b962f84c1b1f47ae9e4124bbc4e11411f9df0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Feb 2022 20:10:47 -0800 Subject: [PATCH 695/703] webrtc-audio-processing_1: remove i686 platforms --- .../development/libraries/webrtc-audio-processing/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 7ec54eac80b0..5a53564603d8 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - platforms = platforms.unix; + # attempts to inline 256bit AVX instructions on x86 + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 + platforms = lib.lists.subtractLists platforms.i686 platforms.unix; }; } From d01d0835c0576083a6f827221c6db0ce85ad3b53 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Feb 2022 21:00:54 -0800 Subject: [PATCH 696/703] gst_all_1.gst-plugins-bad: disable isac, avoid webrtc_1 --- pkgs/development/libraries/gstreamer/bad/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 8cea6205cf57..e575173d7257 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { libass libkate webrtc-audio-processing # required by webrtcdsp - webrtc-audio-processing_1 # required by isac + #webrtc-audio-processing_1 # required by isac libbs2b libmodplug libmicrodns @@ -258,6 +258,7 @@ stdenv.mkDerivation rec { "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing + "-Disac=disabled" # depends on `webrtc-audio-coding-1` not compatible with 0.3 "-Dgs=disabled" # depends on `google-cloud-cpp` "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing "-Dopenaptx=disabled" # depends on older version of `libopenaptx` due to licensing conflict https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2235 From a6e27baee2e21079d28dccc8b04f6c0011bda2c6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Feb 2022 21:55:31 -0800 Subject: [PATCH 697/703] libcangjie: fix src --- pkgs/development/libraries/libcangjie/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index b0c02eaa6bcf..73277d30de3c 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, autoconf, automake, libtool, m4, fetchFromGitLab, bash, pkg-config, sqlite }: +{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: stdenv.mkDerivation rec { pname = "libcangjie"; version = "1.4_rev_${rev}"; rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; - src = fetchFromGitLab { - owner = "Cangjians"; - repo = "libcangjie"; - inherit rev; - sha256 = "sha256-R7WqhxciaTxhTiwPp2EUNTOh477gi/Pj3VpMtat5qXw="; + # fetchFromGitLab isn't working for some reason + src = fetchurl { + url = "https://gitlab.freedesktop.org/cangjie/libcangjie/-/archive/a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d/libcangjie-a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d.tar.gz"; + sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ="; }; nativeBuildInputs = [ pkg-config ]; From 7e60f8ee7c8d841500383e082ba26ea28faec8cc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Feb 2022 21:58:59 -0800 Subject: [PATCH 698/703] python3Package.mpi4py: 3.0.3 -> 3.1.3 --- pkgs/development/python-modules/mpi4py/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 6e8fd896d913..aa5a74c2cfe8 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -2,19 +2,13 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.0.3"; + version = "3.1.3"; src = fetchPypi { inherit pname version; - sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f"; + sha256 = "sha256-8en64QefQ+r92fgXzbP9MNcJ7cCTtdXa2lekYbLbMAg="; }; - patches = [ (fetchpatch { - name = "disable-broken-test"; # upstream patch - url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch"; - sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx"; - })]; - passthru = { inherit mpi; }; From ef5c414f419dc1d2de91f77858ae364231962d7b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Feb 2022 22:15:27 -0800 Subject: [PATCH 699/703] python3Packages.testfixtures: disable tests, incompatible with new sybil --- pkgs/development/python-modules/testfixtures/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index b582bf4bc7f7..be4cdd6ec005 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -22,6 +22,9 @@ buildPythonPackage rec { sha256 = "sha256-JgAQCulv/QgjNLN441VVD++LSlKab6TDT0cTCQXHQm0="; }; + # no longer compatible with sybil + # https://github.com/simplistix/testfixtures/issues/169 + doCheck = false; checkInputs = [ mock pytestCheckHook From d723d2d7bfa6989c627a388a7b9f9f4aff18cd1a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Feb 2022 22:18:33 -0800 Subject: [PATCH 700/703] python310Packages.zetup: disable for python3.10 --- pkgs/development/python-modules/zetup/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 3862a8e757d1..c2e707347b33 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -5,12 +5,16 @@ , pathpy , pytestCheckHook , setuptools-scm +, pythonAtLeast }: buildPythonPackage rec { pname = "zetup"; version = "0.2.64"; + # https://github.com/zimmermanncode/zetup/issues/4 + disabled = pythonAtLeast "3.10"; + src = fetchPypi { inherit pname version; sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d"; From 889dfed13c86ae34a2698173565af1511d226326 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Feb 2022 22:32:07 -0800 Subject: [PATCH 701/703] python3Packages.pymatgen: 2022.1.9 -> 2022.2.7, fix build --- .../python-modules/pymatgen/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index d02d946f4d56..be13f77490ad 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchFromGitHub +, cython , enum34 , glibcLocales , matplotlib @@ -8,6 +9,7 @@ , palettable , pandas , plotly +, pybtex , pydispatcher , requests , ruamel-yaml @@ -21,14 +23,20 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.1.9"; + version = "2022.2.7"; - src = fetchPypi { - inherit pname version; - sha256 = "89774c0d87a38dc2f5d4d0148091f6aa240b3633121745826de66867e8d8ecc8"; + # sdist doesn't include c files + src = fetchFromGitHub { + owner = "materialsproject"; + repo = "pymatgen"; + rev= "v${version}"; + sha256 = "sha256-92Dxmo1Z9LR2caSOftIf1I6jeZmqDe3SqhhoCofWraw="; }; - nativeBuildInputs = [ glibcLocales ]; + nativeBuildInputs = [ + cython + glibcLocales + ]; propagatedBuildInputs = [ enum34 @@ -39,6 +47,7 @@ buildPythonPackage rec { palettable pandas plotly + pybtex pydispatcher requests ruamel-yaml From 948d09f199a1f09a89e23cb2e2619cf5593733d5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Feb 2022 22:57:47 -0800 Subject: [PATCH 702/703] python3Packages.h5py: relax mpi4py bounds --- pkgs/development/python-modules/h5py/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 701b8f78f83b..36b1322a88b3 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -20,7 +20,8 @@ in buildPythonPackage rec { # avoid strict pinning of numpy postPatch = '' substituteInPlace setup.py \ - --replace "numpy ==" "numpy >=" + --replace "numpy ==" "numpy >=" \ + --replace "mpi4py ==" "mpi4py >=" ''; HDF5_DIR = "${hdf5}"; From 1a17758b78d2d3afd9af7e22c29111d4f0d247d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 10 Feb 2022 14:12:10 +0100 Subject: [PATCH 703/703] fish: upstream patch to fix tests after pcre2 update --- pkgs/shells/fish/default.nix | 3 +++ pkgs/shells/fish/tests-pcre2-update.patch | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 pkgs/shells/fish/tests-pcre2-update.patch diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index cf264f11de8c..e0ab463b4180 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , coreutils , which , gnused @@ -146,6 +147,8 @@ let sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok="; }; + patches = [ ./tests-pcre2-update.patch ]; # should be included in >= 3.4 + # Fix FHS paths in tests postPatch = '' # src/fish_tests.cpp diff --git a/pkgs/shells/fish/tests-pcre2-update.patch b/pkgs/shells/fish/tests-pcre2-update.patch new file mode 100644 index 000000000000..5e0c327c540a --- /dev/null +++ b/pkgs/shells/fish/tests-pcre2-update.patch @@ -0,0 +1,7 @@ +Adapted formating to 3.3.1 from +https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a +--- a/src/fish_tests.cpp ++++ b/src/fish_tests.cpp +@@ -5726,2 +5725,0 @@ +- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"}, +- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},