From 2e34bfb45ab7d074009653a32daf8aa69cc9f4e2 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Thu, 22 Apr 2021 14:38:30 -0500 Subject: [PATCH 001/561] boost: generalize version numbers --- pkgs/development/libraries/boost/1.55.nix | 4 ++-- pkgs/development/libraries/boost/1.59.nix | 4 ++-- pkgs/development/libraries/boost/1.60.nix | 4 ++-- pkgs/development/libraries/boost/1.65.nix | 4 ++-- pkgs/development/libraries/boost/1.66.nix | 4 ++-- pkgs/development/libraries/boost/1.68.nix | 4 ++-- pkgs/development/libraries/boost/1.69.nix | 4 ++-- pkgs/development/libraries/boost/1.70.nix | 4 ++-- pkgs/development/libraries/boost/1.72.nix | 5 ++--- pkgs/development/libraries/boost/1.73.nix | 5 ++--- pkgs/development/libraries/boost/1.74.nix | 4 ++-- pkgs/development/libraries/boost/1.75.nix | 4 ++-- 12 files changed, 24 insertions(+), 26 deletions(-) diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index bcb452ea4f866..b01f62e9dea65 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -1,12 +1,12 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // { +callPackage ./generic.nix (args // rec { version = "1.55.0"; patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ]; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2"; + url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z"; }; }) diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 0f6e9a35b6e07..88e584f5e4159 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // { +callPackage ./generic.nix (args // rec { version = "1.59.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2"; + url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; }; }) diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix index 4bc7a1cc7327d..0cf81a0602935 100644 --- a/pkgs/development/libraries/boost/1.60.nix +++ b/pkgs/development/libraries/boost/1.60.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // { +callPackage ./generic.nix (args // rec { version = "1.60.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_60_0.tar.bz2"; + url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; sha256 = "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8"; }; diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix index 764f38d5b7472..6238a88424ff5 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // { +callPackage ./generic.nix (args // rec { version = "1.65.1"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_65_1.tar.bz2"; + url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; # SHA256 from http://www.boost.org/users/history/version_1_65_1.html sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; }; diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index af61aa51944c7..5bc3dcbff5acd 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // { +callPackage ./generic.nix (args // rec { version = "1.66.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_66_0.tar.bz2"; + url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; # SHA256 from http://www.boost.org/users/history/version_1_66_0.html sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; }; diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix index 920dd9a300b14..7fb85d7239f25 100644 --- a/pkgs/development/libraries/boost/1.68.nix +++ b/pkgs/development/libraries/boost/1.68.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // { +callPackage ./generic.nix (args // rec { version = "1.68.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_68_0.tar.bz2"; + url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; # SHA256 from http://www.boost.org/users/history/version_1_68_0.html sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7"; }; diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix index 7292356ecd1c4..d934e3267fcb2 100644 --- a/pkgs/development/libraries/boost/1.69.nix +++ b/pkgs/development/libraries/boost/1.69.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // { +callPackage ./generic.nix (args // rec { version = "1.69.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_69_0.tar.bz2"; + url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; # SHA256 from http://www.boost.org/users/history/version_1_69_0.html sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; }; diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix index 3b898cfc0ae5b..bc70797acda8d 100644 --- a/pkgs/development/libraries/boost/1.70.nix +++ b/pkgs/development/libraries/boost/1.70.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // { +callPackage ./generic.nix (args // rec { version = "1.70.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_70_0.tar.bz2"; + url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; # SHA256 from http://www.boost.org/users/history/version_1_70_0.html sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778"; }; diff --git a/pkgs/development/libraries/boost/1.72.nix b/pkgs/development/libraries/boost/1.72.nix index 97dad9b6c8a80..bb2fccdfaf786 100644 --- a/pkgs/development/libraries/boost/1.72.nix +++ b/pkgs/development/libraries/boost/1.72.nix @@ -4,10 +4,9 @@ callPackage ./generic.nix (args // rec { version = "1.72.0"; src = fetchurl { - #url = "mirror://sourceforge/boost/boost_1_72_0.tar.bz2"; urls = [ - "mirror://sourceforge/boost/boost_1_72_0.tar.bz2" - "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2" + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; # SHA256 from http://www.boost.org/users/history/version_1_72_0.html sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"; diff --git a/pkgs/development/libraries/boost/1.73.nix b/pkgs/development/libraries/boost/1.73.nix index 289bea197c354..1d53ebcccd75e 100644 --- a/pkgs/development/libraries/boost/1.73.nix +++ b/pkgs/development/libraries/boost/1.73.nix @@ -4,10 +4,9 @@ callPackage ./generic.nix (args // rec { version = "1.73.0"; src = fetchurl { - #url = "mirror://sourceforge/boost/boost_1_73_0.tar.bz2"; urls = [ - "mirror://sourceforge/boost/boost_1_73_0.tar.bz2" - "https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2" + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; # SHA256 from http://www.boost.org/users/history/version_1_73_0.html sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402"; diff --git a/pkgs/development/libraries/boost/1.74.nix b/pkgs/development/libraries/boost/1.74.nix index a181ed94c266b..f3a29dafbcd9c 100644 --- a/pkgs/development/libraries/boost/1.74.nix +++ b/pkgs/development/libraries/boost/1.74.nix @@ -5,8 +5,8 @@ callPackage ./generic.nix (args // rec { src = fetchurl { urls = [ - "mirror://sourceforge/boost/boost_1_74_0.tar.bz2" - "https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2" + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; # SHA256 from http://www.boost.org/users/history/version_1_74_0.html sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1"; diff --git a/pkgs/development/libraries/boost/1.75.nix b/pkgs/development/libraries/boost/1.75.nix index ff1073bd02681..1432899f99673 100644 --- a/pkgs/development/libraries/boost/1.75.nix +++ b/pkgs/development/libraries/boost/1.75.nix @@ -5,8 +5,8 @@ callPackage ./generic.nix (args // rec { src = fetchurl { urls = [ - "mirror://sourceforge/boost/boost_1_75_0.tar.bz2" - "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2" + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; # SHA256 from http://www.boost.org/users/history/version_1_75_0.html sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"; From eca50883fc25ecc4b27a9ec3e694f261bba2f21e Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Fri, 17 Sep 2021 12:17:40 -0500 Subject: [PATCH 002/561] boost: default to boost 1.77 --- pkgs/development/libraries/boost/1.77.nix | 15 ++++++++ pkgs/development/libraries/boost/default.nix | 1 + pkgs/top-level/all-packages.nix | 38 ++++++-------------- 3 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/libraries/boost/1.77.nix diff --git a/pkgs/development/libraries/boost/1.77.nix b/pkgs/development/libraries/boost/1.77.nix new file mode 100644 index 0000000000000..634523b244ce7 --- /dev/null +++ b/pkgs/development/libraries/boost/1.77.nix @@ -0,0 +1,15 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.77.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_77_0.html + sha256 = "sha256-/J+F/AMOIzFCkIJBr3qEbmBjCqc4jeml+vsfOiaECFQ="; + }; +}) + diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index 3b79378605f28..aeb0878a0d11f 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -44,4 +44,5 @@ in { boost173 = makeBoost ./1.73.nix; boost174 = makeBoost ./1.74.nix; boost175 = makeBoost ./1.75.nix; + boost177 = makeBoost ./1.77.nix; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b9fa4192e720..01968bf421d81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4595,9 +4595,7 @@ with pkgs; vorta = libsForQt5.callPackage ../applications/backup/vorta { }; - vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { - boost = boost17x; - }; + vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; utahfs = callPackage ../applications/networking/utahfs { }; @@ -14814,9 +14812,7 @@ with pkgs; uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { }; - uhd = callPackage ../applications/radio/uhd { - boost = boost17x; - }; + uhd = callPackage ../applications/radio/uhd { }; uisp = callPackage ../development/embedded/uisp { }; @@ -15129,12 +15125,13 @@ with pkgs; boost173 boost174 boost175 + boost177 ; boost15x = boost159; boost16x = boost169; - boost17x = boost175; - boost = boost16x; + boost17x = boost177; + boost = boost17x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -20718,14 +20715,10 @@ with pkgs; libtool = darwin.cctools; }; - # Fails to compile with boost >= 1.72 - rippled = callPackage ../servers/rippled { - boost = boost17x; - }; + # Fails to compile with boost <= 1.72 + rippled = callPackage ../servers/rippled { }; - rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { - boost = boost17x; - }; + rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { }; roon-bridge = callPackage ../servers/roon-bridge { }; @@ -24147,7 +24140,6 @@ with pkgs; unwrapped = callPackage ../applications/radio/gnuradio { inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python3; - boost = boost17x; }; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; @@ -24177,7 +24169,6 @@ with pkgs; unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python3; - boost = boost17x; }; }; gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; @@ -26814,9 +26805,7 @@ with pkgs; qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { - boost = boost17x; - }; + qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { }; @@ -28801,16 +28790,11 @@ with pkgs; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - boost = boost17x; }; - oxen = callPackage ../applications/blockchains/oxen { - boost = boost17x; - }; + oxen = callPackage ../applications/blockchains/oxen { }; - monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { - boost = boost17x; - }; + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { }; masari = callPackage ../applications/blockchains/masari { boost = boost165; }; From b772490d9b9e7d30ddb8ca9319cbdc59cfcaed57 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Mon, 11 Oct 2021 12:59:20 -0500 Subject: [PATCH 003/561] boost-build: make darwin patch work across all versions --- .../tools/boost-build/darwin-default-toolset.patch | 12 ------------ pkgs/development/tools/boost-build/default.nix | 9 +++++---- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/tools/boost-build/darwin-default-toolset.patch diff --git a/pkgs/development/tools/boost-build/darwin-default-toolset.patch b/pkgs/development/tools/boost-build/darwin-default-toolset.patch deleted file mode 100644 index ebe3f8d2e1ea2..0000000000000 --- a/pkgs/development/tools/boost-build/darwin-default-toolset.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/build-system.jam b/src/build-system.jam -index 60425c54..c6842217 100644 ---- a/src/build-system.jam -+++ b/src/build-system.jam -@@ -644,7 +644,7 @@ local rule should-clean-project ( project ) - } - else if [ os.name ] = MACOSX - { -- default-toolset = darwin ; -+ default-toolset = clang-darwin ; - } - } diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index c6c66d4d212d3..044589a9664b4 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -33,10 +33,11 @@ stdenv.mkDerivation { sourceRoot="$sourceRoot/tools/build" ''; - patches = [ - # Upstream defaults to gcc on darwin, but we use clang. - ./darwin-default-toolset.patch - ]; + # Upstream defaults to gcc on darwin, but we use clang. + postPatch = '' + substituteInPlace src/build-system.jam \ + --replace "default-toolset = darwin" "default-toolset = clang-darwin" + ''; nativeBuildInputs = [ bison From 81394b0ad82e62f3a3a3d92305a11b590045614b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 25 Oct 2021 00:24:08 +0200 Subject: [PATCH 004/561] gcc9: 9.3.0 -> 9.4.0 --- .../gcc/9/avoid-cycling-subreg-reloads.patch | 261 ------------------ pkgs/development/compilers/gcc/9/default.nix | 16 +- 2 files changed, 4 insertions(+), 273 deletions(-) delete mode 100644 pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch diff --git a/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch b/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch deleted file mode 100644 index 17a4e0a2447b3..0000000000000 --- a/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 6001db79c477b03eacc7e7049560921fb54b7845 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford -Date: Mon, 7 Sep 2020 20:15:36 +0100 -Subject: [PATCH] lra: Avoid cycling on certain subreg reloads [PR96796] - -This PR is about LRA cycling for a reload of the form: - ----------------------------------------------------------------------------- -Changing pseudo 196 in operand 1 of insn 103 on equiv [r105:DI*0x8+r140:DI] - Creating newreg=287, assigning class ALL_REGS to slow/invalid mem r287 - Creating newreg=288, assigning class ALL_REGS to slow/invalid mem r288 - 103: r203:SI=r288:SI<<0x1+r196:DI#0 - REG_DEAD r196:DI - Inserting slow/invalid mem reload before: - 316: r287:DI=[r105:DI*0x8+r140:DI] - 317: r288:SI=r287:DI#0 ----------------------------------------------------------------------------- - -The problem is with r287. We rightly give it a broad starting class of -POINTER_AND_FP_REGS (reduced from ALL_REGS by preferred_reload_class). -However, we never make forward progress towards narrowing it down to -a specific choice of class (POINTER_REGS or FP_REGS). - -I think in practice we rely on two things to narrow a reload pseudo's -class down to a specific choice: - -(1) a restricted class is specified when the pseudo is created - - This happens for input address reloads, where the class is taken - from the target's chosen base register class. It also happens - for simple REG reloads, where the class is taken from the chosen - alternative's constraints. - -(2) uses of the reload pseudo as a direct input operand - - In this case get_reload_reg tries to reuse the existing register - and narrow its class, instead of creating a new reload pseudo. - -However, neither occurs here. As described above, r287 rightly -starts out with a wide choice of class, ultimately derived from -ALL_REGS, so we don't get (1). And as the comments in the PR -explain, r287 is never used as an input reload, only the subreg is, -so we don't get (2): - ----------------------------------------------------------------------------- - Choosing alt 13 in insn 317: (0) r (1) w {*movsi_aarch64} - Creating newreg=291, assigning class FP_REGS to r291 - 317: r288:SI=r291:SI - Inserting insn reload before: - 320: r291:SI=r287:DI#0 ----------------------------------------------------------------------------- - -IMO, in this case we should rely on the reload of r316 to narrow -down the class of r278. Currently we do: - ----------------------------------------------------------------------------- - Choosing alt 7 in insn 316: (0) r (1) m {*movdi_aarch64} - Creating newreg=289 from oldreg=287, assigning class GENERAL_REGS to r289 - 316: r289:DI=[r105:DI*0x8+r140:DI] - Inserting insn reload after: - 318: r287:DI=r289:DI ---------------------------------------------------- - -i.e. we create a new pseudo register r289 and give *that* pseudo -GENERAL_REGS instead. This is because get_reload_reg only narrows -down the existing class for OP_IN and OP_INOUT, not OP_OUT. - -But if we have a reload pseudo in a reload instruction and have chosen -a specific class for the reload pseudo, I think we should simply install -it for OP_OUT reloads too, if the class is a subset of the existing class. -We will need to pick such a register whatever happens (for r289 in the -example above). And as explained in the PR, doing this actually avoids -an unnecessary move via the FP registers too. - -The patch is quite aggressive in that it does this for all reload -pseudos in all reload instructions. I wondered about reusing the -condition for a reload move in in_class_p: - - INSN_UID (curr_insn) >= new_insn_uid_start - && curr_insn_set != NULL - && ((OBJECT_P (SET_SRC (curr_insn_set)) - && ! CONSTANT_P (SET_SRC (curr_insn_set))) - || (GET_CODE (SET_SRC (curr_insn_set)) == SUBREG - && OBJECT_P (SUBREG_REG (SET_SRC (curr_insn_set))) - && ! CONSTANT_P (SUBREG_REG (SET_SRC (curr_insn_set))))))) - -but I can't really justify that on first principles. I think we -should apply the rule consistently until we have a specific reason -for doing otherwise. - -gcc/ - PR rtl-optimization/96796 - * lra-constraints.c (in_class_p): Add a default-false - allow_all_reload_class_changes_p parameter. Do not treat - reload moves specially when the parameter is true. - (get_reload_reg): Try to narrow the class of an existing OP_OUT - reload if we're reloading a reload pseudo in a reload instruction. - -gcc/testsuite/ - PR rtl-optimization/96796 - * gcc.c-torture/compile/pr96796.c: New test. ---- - gcc/lra-constraints.c | 54 ++++++++++++++---- - gcc/testsuite/gcc.c-torture/compile/pr96796.c | 55 +++++++++++++++++++ - 2 files changed, 99 insertions(+), 10 deletions(-) - create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr96796.c - -diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c -index 580da9c3ed6..161b721efb1 100644 ---- a/gcc/lra-constraints.c -+++ b/gcc/lra-constraints.c -@@ -236,12 +236,17 @@ get_reg_class (int regno) - CL. Use elimination first if REG is a hard register. If REG is a - reload pseudo created by this constraints pass, assume that it will - be allocated a hard register from its allocno class, but allow that -- class to be narrowed to CL if it is currently a superset of CL. -+ class to be narrowed to CL if it is currently a superset of CL and -+ if either: -+ -+ - ALLOW_ALL_RELOAD_CLASS_CHANGES_P is true or -+ - the instruction we're processing is not a reload move. - - If NEW_CLASS is nonnull, set *NEW_CLASS to the new allocno class of - REGNO (reg), or NO_REGS if no change in its class was needed. */ - static bool --in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) -+in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class, -+ bool allow_all_reload_class_changes_p = false) - { - enum reg_class rclass, common_class; - machine_mode reg_mode; -@@ -266,7 +271,8 @@ in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) - typically moves that have many alternatives, and restricting - reload pseudos for one alternative may lead to situations - where other reload pseudos are no longer allocatable. */ -- || (INSN_UID (curr_insn) >= new_insn_uid_start -+ || (!allow_all_reload_class_changes_p -+ && INSN_UID (curr_insn) >= new_insn_uid_start - && curr_insn_set != NULL - && ((OBJECT_P (SET_SRC (curr_insn_set)) - && ! CONSTANT_P (SET_SRC (curr_insn_set))) -@@ -598,13 +604,12 @@ canonicalize_reload_addr (rtx addr) - return addr; - } - --/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse already -- created input reload pseudo (only if TYPE is not OP_OUT). Don't -- reuse pseudo if IN_SUBREG_P is true and the reused pseudo should be -- wrapped up in SUBREG. The result pseudo is returned through -- RESULT_REG. Return TRUE if we created a new pseudo, FALSE if we -- reused the already created input reload pseudo. Use TITLE to -- describe new registers for debug purposes. */ -+/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse an existing -+ reload pseudo. Don't reuse an existing reload pseudo if IN_SUBREG_P -+ is true and the reused pseudo should be wrapped up in a SUBREG. -+ The result pseudo is returned through RESULT_REG. Return TRUE if we -+ created a new pseudo, FALSE if we reused an existing reload pseudo. -+ Use TITLE to describe new registers for debug purposes. */ - static bool - get_reload_reg (enum op_type type, machine_mode mode, rtx original, - enum reg_class rclass, bool in_subreg_p, -@@ -616,6 +621,35 @@ get_reload_reg (enum op_type type, machine_mode mode, rtx original, - - if (type == OP_OUT) - { -+ /* Output reload registers tend to start out with a conservative -+ choice of register class. Usually this is ALL_REGS, although -+ a target might narrow it (for performance reasons) through -+ targetm.preferred_reload_class. It's therefore quite common -+ for a reload instruction to require a more restrictive class -+ than the class that was originally assigned to the reload register. -+ -+ In these situations, it's more efficient to refine the choice -+ of register class rather than create a second reload register. -+ This also helps to avoid cycling for registers that are only -+ used by reload instructions. */ -+ if (REG_P (original) -+ && (int) REGNO (original) >= new_regno_start -+ && INSN_UID (curr_insn) >= new_insn_uid_start -+ && in_class_p (original, rclass, &new_class, true)) -+ { -+ unsigned int regno = REGNO (original); -+ if (lra_dump_file != NULL) -+ { -+ fprintf (lra_dump_file, " Reuse r%d for output ", regno); -+ dump_value_slim (lra_dump_file, original, 1); -+ } -+ if (new_class != lra_get_allocno_class (regno)) -+ lra_change_class (regno, new_class, ", change to", false); -+ if (lra_dump_file != NULL) -+ fprintf (lra_dump_file, "\n"); -+ *result_reg = original; -+ return false; -+ } - *result_reg - = lra_create_new_reg_with_unique_value (mode, original, rclass, title); - return true; -diff --git a/gcc/testsuite/gcc.c-torture/compile/pr96796.c b/gcc/testsuite/gcc.c-torture/compile/pr96796.c -new file mode 100644 -index 00000000000..8808e62fe77 ---- /dev/null -+++ b/gcc/testsuite/gcc.c-torture/compile/pr96796.c -@@ -0,0 +1,55 @@ -+/* { dg-additional-options "-fcommon" } */ -+ -+struct S0 { -+ signed f0 : 8; -+ unsigned f1; -+ unsigned f4; -+}; -+struct S1 { -+ long f3; -+ char f4; -+} g_3_4; -+ -+int g_5, func_1_l_32, func_50___trans_tmp_31; -+static struct S0 g_144, g_834, g_1255, g_1261; -+ -+int g_273[120] = {}; -+int *g_555; -+char **g_979; -+static int g_1092_0; -+static int g_1193; -+int safe_mul_func_int16_t_s_s(int si1, int si2) { return si1 * si2; } -+static struct S0 *func_50(); -+int func_1() { func_50(g_3_4, g_5, func_1_l_32, 8, 3); } -+void safe_div_func_int64_t_s_s(int *); -+void safe_mod_func_uint32_t_u_u(struct S0); -+struct S0 *func_50(int p_51, struct S0 p_52, struct S1 p_53, int p_54, -+ int p_55) { -+ int __trans_tmp_30; -+ char __trans_tmp_22; -+ short __trans_tmp_19; -+ long l_985_1; -+ long l_1191[8]; -+ safe_div_func_int64_t_s_s(g_273); -+ __builtin_printf((char*)g_1261.f4); -+ safe_mod_func_uint32_t_u_u(g_834); -+ g_144.f0 += 1; -+ for (;;) { -+ struct S1 l_1350 = {&l_1350}; -+ for (; p_53.f3; p_53.f3 -= 1) -+ for (; g_1193 <= 2; g_1193 += 1) { -+ __trans_tmp_19 = safe_mul_func_int16_t_s_s(l_1191[l_985_1 + p_53.f3], -+ p_55 % (**g_979 = 10)); -+ __trans_tmp_22 = g_1255.f1 * p_53.f4; -+ __trans_tmp_30 = __trans_tmp_19 + __trans_tmp_22; -+ if (__trans_tmp_30) -+ g_1261.f0 = p_51; -+ else { -+ g_1255.f0 = p_53.f3; -+ int *l_1422 = g_834.f0 = g_144.f4 != (*l_1422)++ > 0 < 0 ^ 51; -+ g_555 = ~0; -+ g_1092_0 |= func_50___trans_tmp_31; -+ } -+ } -+ } -+} --- -2.18.4 - diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 604d90fa7828e..6426f7434d5fe 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -63,17 +63,11 @@ with lib; with builtins; let majorVersion = "9"; - version = "${majorVersion}.3.0"; + version = "${majorVersion}.4.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - # Fix ICE: Max. number of generated reload insns per insn is achieved (90) - # - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96796 - # - # This patch can most likely be removed by a post 9.3.0-release. - [ ./avoid-cycling-subreg-reloads.patch ] + patches = [] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch @@ -87,9 +81,7 @@ let majorVersion = "9"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch - - ++ [ ../libsanitizer-no-cyclades-9.patch ]; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -106,7 +98,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi"; + sha256 = "13l3p6g2krilaawbapmn9zmmrh3zdwc36mfr3msxfy038hps6pf9"; }; inherit patches; From e9b858aa39565332394a1e33f46a385c66c784ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 09:06:23 +0000 Subject: [PATCH 005/561] libfabric: 1.13.1 -> 1.13.2 --- pkgs/development/libraries/libfabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix index 4142c3763b52c..c1c6ef7032ae7 100644 --- a/pkgs/development/libraries/libfabric/default.nix +++ b/pkgs/development/libraries/libfabric/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.13.1"; + version = "1.13.2"; enableParallelBuilding = true; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "0USQMBXZrbz4GtXLNsSti9ohUOqqo0OCtVz+0Uk9ndI="; + sha256 = "sha256-ydMZP83keUGDYDw9i/SCa4U1KEgfuqkFklwRKbfLoK8="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 39f9fd70e44ee4e99035852fdc7fc825a67bed0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 17:56:25 +0000 Subject: [PATCH 006/561] openblas: 0.3.17 -> 0.3.18 --- pkgs/development/libraries/science/math/openblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index bf7eb3d0d38c1..0fc00efcff0a7 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.17"; + version = "0.3.18"; outputs = [ "out" "dev" ]; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "11j103s851mml6kns781kha0asxjz6b6s1vbv80aq3b6g7p05pms"; + sha256 = "sha256-b5i52rjsH65qAIlYGXQrzVxChi8/fwbD4eJTrxVq7Z8="; }; inherit blas64; From 0fdec325b6a8fa4d78a1981ba5fd60af95deb4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Nov 2021 20:28:32 +0100 Subject: [PATCH 007/561] gamin: switch to pname+version, cleanup --- pkgs/development/libraries/gamin/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 56de42d9dc5b5..a2d6078024d58 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: -let - cross = stdenv.hostPlatform != stdenv.buildPlatform; -in stdenv.mkDerivation (rec { - name = "gamin-0.1.10"; +stdenv.mkDerivation rec { + pname = "gamin"; + version = "0.1.10"; src = fetchurl { - url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz"; + url = "https://www.gnome.org/~veillard/gamin/sources/gamin-${version}.tar.gz"; sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; @@ -22,6 +21,10 @@ in stdenv.mkDerivation (rec { "CPPFLAGS=-D_GNU_SOURCE" ]; + preBuild = lib.optionalString stdenv.isDarwin '' + sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile + ''; + patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) ++ lib.optional stdenv.cc.isClang ./returnval.patch @@ -29,7 +32,7 @@ in stdenv.mkDerivation (rec { name = "fix-pthread-mutex.patch"; url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; - }) ++ lib.optional (cross) ./abstract-socket-namespace.patch ; + }) ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./abstract-socket-namespace.patch; meta = with lib; { @@ -41,8 +44,3 @@ in stdenv.mkDerivation (rec { }; } -// lib.optionalAttrs stdenv.isDarwin { - preBuild = '' - sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile - ''; -}) From 8f658696eac495365d1da456249548a2406ae0a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Nov 2021 20:51:15 -0800 Subject: [PATCH 008/561] python3Packages.pybind11: 2.8.0 -> 2.8.1 https://github.com/pybind/pybind11/releases/tag/v2.8.1 --- pkgs/development/python-modules/pybind11/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index fccc064f23ef4..d33d9ffc575dc 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , cmake +, boost , eigen , python , catch @@ -12,13 +13,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kmyfRNZM9AtF0QA1MnWEPwWb6BebkkpanTvQwsraSJo="; + sha256 = "sha256-Gk4ZN/g6SRWFm0ALCvyald/9zq3wBd48mGdqdGCeGYI="; }; nativeBuildInputs = [ cmake ]; @@ -26,7 +27,8 @@ buildPythonPackage rec { dontUseCmakeBuildDir = true; cmakeFlags = [ - "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" + "-DBoost_INCLUDE_DIR=${lib.getDev boost}/include" + "-DEIGEN3_INCLUDE_DIR=${lib.getDev eigen}/include/eigen3" "-DBUILD_TESTING=on" ] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ "-DPYBIND11_CXX_STANDARD=-std=c++17" From 9310852ec2c28a63d640aa061aa933fd5a01d5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 16 Nov 2021 09:32:43 -0800 Subject: [PATCH 009/561] python3Packages.markdown: 3.3.4 -> 3.3.5 --- pkgs/development/python-modules/markdown/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index c1eff88b926dd..83a4f224f2fb1 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -8,17 +8,18 @@ }: buildPythonPackage rec { - pname = "Markdown"; - version = "3.3.4"; + pname = "markdown"; + version = "3.3.5"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49"; + pname = "Markdown"; + inherit version; + sha256 = "sha256-JulUa/vN5fzQcr2PYSycG24md8uKrb32UgZnT0bd4Gk="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; From 1fa0af91677f65ccffbe71d4644a95d95f2ae3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 10 Nov 2021 20:28:44 +0100 Subject: [PATCH 010/561] dbus-java: switch to pname+version, format --- .../libraries/java/dbus-java/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 9fbcf8b020ced..c8e67edfe2b57 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -1,18 +1,19 @@ -{lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java}: +{ lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java }: + +stdenv.mkDerivation rec { + pname = "dbus-java"; + version = "2.7"; -let jdk = jdk8; in -stdenv.mkDerivation { - name = "dbus-java-2.7"; src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz"; + url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-${version}.tar.gz"; sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y"; }; - JAVA_HOME=jdk; - JAVA="${jdk}/bin/java"; + JAVA_HOME=jdk8; + JAVA="${jdk8}/bin/java"; PREFIX="\${out}"; JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni"; JAVAUNIXJARDIR="${libmatthew_java}/share/java"; - buildInputs = [ gettext jdk ]; + buildInputs = [ gettext jdk8 ]; # I'm too lazy to build the documentation preBuild = '' sed -i -e "s|all: bin doc man|all: bin|" \ From 40726812071e1fe0dbb9cb326b8bb4ab0cb4d7b6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 28 Sep 2021 18:00:22 +0100 Subject: [PATCH 011/561] automake: 1.16.3 -> 1.16.5 --- pkgs/development/tools/misc/automake/automake-1.16.x.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 4547f745a98f4..89a5b4879004a 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { - # When updating, beware of https://github.com/NixOS/nixpkgs/pull/131928#issuecomment-896614165 pname = "automake"; - version = "1.16.3"; + version = "1.16.5"; src = fetchurl { url = "mirror://gnu/automake/automake-${version}.tar.xz"; - sha256 = "0fmz2fhmzcpacnprl5msphvaflwiy0hvpgmqlgfny72ddijzfazz"; + sha256 = "0sdl32qxdy7m06iggmkkvf7j520rmmgbsjzbm7fgnxwxdp6mh7gh"; }; nativeBuildInputs = [ autoconf perl ]; From 78d93d369857a74e64313fed40fd179634ed9e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Nov 2021 02:54:49 +0100 Subject: [PATCH 012/561] systemd: enable zstd compression support --- pkgs/os-specific/linux/systemd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 036ea991ef6ae..f8d7a5582d4af 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -40,6 +40,7 @@ , gnupg , zlib , xz +, zstd , tpm2-tss , libuuid , libapparmor @@ -67,7 +68,7 @@ , withAnalyze ? true , withApparmor ? true -, withCompression ? true # adds bzip2, lz4 and xz +, withCompression ? true # adds bzip2, lz4, xz and zstd , withCoredump ? true , withCryptsetup ? true , withDocumentation ? true @@ -364,7 +365,7 @@ stdenv.mkDerivation { ++ lib.optional withApparmor libapparmor ++ lib.optional wantCurl (lib.getDev curl) - ++ lib.optionals withCompression [ bzip2 lz4 xz ] + ++ lib.optionals withCompression [ bzip2 lz4 xz zstd ] ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ++ lib.optional withEfi gnu-efi ++ lib.optional withKexectools kexec-tools From 9c9dffbf7a549b15fd7d006b0764af1bd5c5e7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Nov 2021 02:55:14 +0100 Subject: [PATCH 013/561] systemd: enable elfutils support for stack traces in coredump --- pkgs/os-specific/linux/systemd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index f8d7a5582d4af..4a9a335b86a06 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -48,6 +48,7 @@ , bzip2 , pcre2 , e2fsprogs +, elfutils , linuxHeaders ? stdenv.cc.libc.linuxHeaders , gnu-efi , iptables @@ -366,6 +367,7 @@ stdenv.mkDerivation { ++ lib.optional withApparmor libapparmor ++ lib.optional wantCurl (lib.getDev curl) ++ lib.optionals withCompression [ bzip2 lz4 xz zstd ] + ++ lib.optional withCoredump elfutils ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ++ lib.optional withEfi gnu-efi ++ lib.optional withKexectools kexec-tools From 34b035d4faad0f25333d2dc8dbe61caa48d27ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 12 Nov 2021 23:47:24 +0100 Subject: [PATCH 014/561] pcre: convert to pname+version, minor formatting changes --- pkgs/development/libraries/pcre/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index d2fe9a84ac371..f7094e04a9d6d 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -7,14 +7,11 @@ with lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; -let +stdenv.mkDerivation rec { + pname = "pcre" + + lib.optionalString (variant == "cpp") "-cpp" + + lib.optionalString (variant != "cpp" && variant != null) variant; version = "8.44"; - pname = if (variant == null) then "pcre" - else if (variant == "cpp") then "pcre-cpp" - else variant; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/pcre/pcre/${version}/pcre-${version}.tar.bz2"; @@ -43,8 +40,7 @@ in stdenv.mkDerivation { postFixup = '' moveToOutput bin/pcre-config "$dev" - '' - + optionalString (variant != null) '' + '' + optionalString (variant != null) '' ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib} ''; @@ -62,5 +58,6 @@ in stdenv.mkDerivation { ''; platforms = platforms.all; + maintainers = with maintainers; [ ]; }; } From f2f4b71a48ed9b97ebd6589e686e02f46dee1bea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Nov 2021 00:10:29 +0100 Subject: [PATCH 015/561] python3Packages.responses: 0.15.0 -> 0.16.0 --- pkgs/development/python-modules/responses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 98a04c2ac58a1..cff31f782c5a7 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.15.0"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hmdXmH0ZYqqQjZyLMYVzn679cqNZ6VRZ3gwuTlNpybI="; + sha256 = "sha256-ouOsoqgnfmElfNOxwVSx3Q14Kxrj04t/o3y+P+tTF5E="; }; propagatedBuildInputs = [ From f7a01054e93a0dcadc0c4495c700f3487161ff4e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 20 Nov 2021 14:32:09 +0000 Subject: [PATCH 016/561] =?UTF-8?q?vala:=200.54.2=20=E2=86=92=200.54.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/vala/0.54/vala-0.54.3.news --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index ba9abc0def1d9..6dbdd1713347d 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -134,8 +134,8 @@ in rec { }; vala_0_54 = generic { - version = "0.54.2"; - sha256 = "iE3nRTF9TVbk6M7emT3I8E1Qz8o2z2DS8vJ4wwwrExE="; + version = "0.54.3"; + sha256 = "7R1f5MvAzShF0N5PH/77Fa+waJLSMMfMppV4FnLo+2A="; }; vala = vala_0_54; From bea767e5fee7cdf9ab6a3005dfeb84f1ef4b729f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 21 Nov 2021 14:58:14 +0000 Subject: [PATCH 017/561] separateDebugInfo: skip files objcopy can't read --- .../setup-hooks/separate-debug-info.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 2481d8f50470c..1a23e6b198ee0 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -28,10 +28,16 @@ _separateDebugInfo() { # Extract the debug info. header "separating debug info from $i (build ID $id)" mkdir -p "$dst/${id:0:2}" - $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" - $STRIP --strip-debug "$i" - # Also a create a symlink .debug. - ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" + # This may fail, e.g. if the binary is for a different + # architecture than we're building for. (This happens with + # firmware blobs in QEMU.) + ( + $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" + $STRIP --strip-debug "$i" + + # Also a create a symlink .debug. + ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" + ) || rmdir -p "$dst/${id:0:2}" done < <(find "$prefix" -type f -print0) } From a0262a08026c7e8fe7ed8acde33b729e73e43208 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 21 Nov 2021 20:26:51 +0000 Subject: [PATCH 018/561] qemu: enable debug info I dropped autoPatchelfHook because it got confused with the debug objects, and I can't reproduce the pixman linker errors that caused it to be introduced in #106988 ("qemu: 5.1.0 -> 5.2.0"). --- pkgs/applications/virtualization/qemu/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 9d2b227dcbb5d..4a502b2594a71 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool -, makeWrapper, autoPatchelfHook +, makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper python python.pkgs.sphinx python.pkgs.sphinx_rtd_theme pkg-config flex bison meson ninja ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; buildInputs = [ zlib glib perl pixman @@ -84,6 +83,7 @@ stdenv.mkDerivation rec { dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build outputs = [ "out" "ga" ]; + separateDebugInfo = true; patches = [ ./fix-qemu-ga.patch @@ -167,6 +167,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--audio-drv-list=${audio}" + "--disable-strip" # We'll strip ourselves after separating debug info. "--enable-docs" "--enable-tools" "--enable-guest-agent" From fa022edf06fb246e6d986a25a5eedcba56d6c30f Mon Sep 17 00:00:00 2001 From: ElXreno Date: Mon, 22 Nov 2021 14:36:58 +0300 Subject: [PATCH 019/561] ell: 0.45 -> 0.46 --- pkgs/os-specific/linux/ell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index be46f00a2cfed..aa8e3f15aab27 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.45"; + version = "0.46"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - sha256 = "sha256-W+IXubPuA/BQzD/LknCeJQgTXUH6I/rUrKBMeEzcBlw="; + sha256 = "sha256-Am1PNFFfSzII4Iaeq0wgfuVHSeMDjiDzYkNQWlnEHJY="; }; nativeBuildInputs = [ From dfb34c9a7bb7a60ff398b7006d8c4ae94db0bfa0 Mon Sep 17 00:00:00 2001 From: ElXreno Date: Mon, 22 Nov 2021 14:42:41 +0300 Subject: [PATCH 020/561] iwd: 1.19 -> 1.20 --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index a7bc2ab7f6188..3f725e3e5b261 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.19"; + version = "1.20"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-sMET4ouZ33SZRnkqJBadVvIDYMCOi7pib6d1zt1EJ8k="; + sha256 = "sha256-GcqmMqrZSgvSrsY8FJbPynNWTzSi5A6kmyq+xJ+2i3Y="; }; outputs = [ "out" "man" ] From 8a7c2218b9bacf0c1b87c314156d9b66e766498c Mon Sep 17 00:00:00 2001 From: cwyc <16950437+cwyc@users.noreply.github.com> Date: Sun, 21 Nov 2021 03:55:01 -0500 Subject: [PATCH 021/561] desktop-file-utils: 0.24 -> 0.26 make-desktopitem adds the prefersNonDefaultGPU option in commit c4b3aa62608d592d8a983be685f7e82000f4de30, but desktop-file-validate 0.24 doesn't recognize that key, so validation incorrectly fails. 0.26 solves this issue. --- pkgs/tools/misc/desktop-file-utils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index da87d048b7095..af3e907c04ae3 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libintl }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, glib, libintl }: with lib; stdenv.mkDerivation rec { pname = "desktop-file-utils"; - version = "0.24"; + version = "0.26"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1"; + sha256 = "02bkfi6fyk4c0gh2avd897882ww5zl7qg7bzzf28qb57kvkvsvdj"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ glib libintl ]; postPatch = '' From 49cf63ccc9e6a9c27737f060c9ecf97075e610dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 22 Nov 2021 13:07:34 -0800 Subject: [PATCH 022/561] python3Packages.html5lib: use pytestCheckHook --- .../python-modules/html5lib/default.nix | 22 +++++++++---------- pkgs/top-level/python-packages.nix | 5 +++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index f0abbcfbeccea..1172b01951323 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -1,12 +1,11 @@ { lib , buildPythonPackage , fetchPypi -, flake8 -, pytest_4 -, pytest-expect -, mock , six , webencodings +, mock +, pytest-expect +, pytestCheckHook_5 }: buildPythonPackage rec { @@ -18,17 +17,16 @@ buildPythonPackage rec { sha256 = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"; }; - checkInputs = [ flake8 pytest_4 pytest-expect mock ]; propagatedBuildInputs = [ - six webencodings + six + webencodings ]; - checkPhase = '' - # remove test causing error - # https://github.com/html5lib/html5lib-python/issues/411 - rm html5lib/tests/test_stream.py - py.test - ''; + checkInputs = [ + mock + pytest-expect + pytestCheckHook_5 + ]; meta = { homepage = "https://github.com/html5lib/html5lib-python"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb9e8bf2ec5c0..fb435dedc2487 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -137,6 +137,11 @@ in { # it should not override the version of pytest that is used for say # Python 2. This is an ugly hack that is needed now because the hook # propagates the package. + pytestCheckHook_5 = if isPy3k then + self.pytestCheckHook.override { pytest = self.pytest_5; } + else + self.pytestCheckHook; + pytestCheckHook_6_1 = if isPy3k then self.pytestCheckHook.override { pytest = self.pytest_6_1; } else From 192bbb938c50917e8a411ab0a73cba893dac0dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 22 Nov 2021 13:23:45 -0800 Subject: [PATCH 023/561] python2Packages.construct: skip tests that require broken packages --- .../python-modules/construct/2.10.54.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/construct/2.10.54.nix b/pkgs/development/python-modules/construct/2.10.54.nix index 30d303b60cd08..6cfca7260512b 100644 --- a/pkgs/development/python-modules/construct/2.10.54.nix +++ b/pkgs/development/python-modules/construct/2.10.54.nix @@ -14,9 +14,20 @@ buildPythonPackage rec { sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48"; }; - checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy arrow ruamel-yaml ]; + checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy ]; - disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; + # these have dependencies that are broken on Python 2 + disabledTestPaths = [ + "tests/gallery/test_gallery.py" + "tests/test_benchmarks.py" + "tests/test_compiler.py" + ]; + + disabledTests = [ + "test_timestamp" + ] ++ lib.optionals stdenv.isDarwin [ + "test_multiprocessing" + ]; pytestFlagsArray = [ "--benchmark-disable" ]; From d11ad3e6251c55a63879e9e40dd1f5ad81473916 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 5 Oct 2021 16:17:28 +0200 Subject: [PATCH 024/561] python3Packages.fonttools: 4.21.1 -> 4.26.2 We can't yet upgrade to fonttools 4.27.* because afdko doesn't support it yet. * Refactor to use pytestCheckHook * No longer necessary to set locale prior to running the tests * Python 3.6 support will be dropped soon Change Log entrys: * https://github.com/fonttools/fonttools/releases/tag/4.22.0 * https://github.com/fonttools/fonttools/releases/tag/4.22.1 * https://github.com/fonttools/fonttools/releases/tag/4.23.0 * https://github.com/fonttools/fonttools/releases/tag/4.23.1 * https://github.com/fonttools/fonttools/releases/tag/4.24.0 * https://github.com/fonttools/fonttools/releases/tag/4.24.1 * https://github.com/fonttools/fonttools/releases/tag/4.24.2 * https://github.com/fonttools/fonttools/releases/tag/4.24.3 * https://github.com/fonttools/fonttools/releases/tag/4.24.4 * https://github.com/fonttools/fonttools/releases/tag/4.25.0 * https://github.com/fonttools/fonttools/releases/tag/4.25.1 * https://github.com/fonttools/fonttools/releases/tag/4.25.2 * https://github.com/fonttools/fonttools/releases/tag/4.26.0 * https://github.com/fonttools/fonttools/releases/tag/4.26.1 * https://github.com/fonttools/fonttools/releases/tag/4.26.2 --- .../python-modules/fonttools/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 407b72c953f1d..96ea9d4be1e83 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -13,29 +13,30 @@ , matplotlib , reportlab , sphinx -, pytest +, pytestCheckHook , pytest-randomly , glibcLocales }: buildPythonPackage rec { pname = "fonttools"; - version = "4.21.1"; + version = "4.26.2"; + + # Bump to 3.7 when https://github.com/fonttools/fonttools/pull/2417 is merged disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1x9qrg6ppqhm5214ymwvn0r34qdz8pqvyxd0sj7rkp06wa757z2i"; + sha256 = "1zp9idjkn4bn1a4pn8x64vi8j1ijdsd4qvgf1f70dfwqvw6ak1i6"; }; # all dependencies are optional, but # we run the checks with them checkInputs = [ - pytest + pytestCheckHook pytest-randomly - glibcLocales # etree extra lxml # ufo extra @@ -43,8 +44,6 @@ buildPythonPackage rec { # woff extra brotlipy zopfli - # unicode extra - unicodedata2 # interpolatable extra scipy munkres @@ -55,17 +54,23 @@ buildPythonPackage rec { # pens reportlab sphinx + ] ++ lib.optionals (pythonOlder "3.9") [ + # unicode extra + unicodedata2 ]; preCheck = '' - export LC_ALL="en_US.UTF-8" + # tests want to execute the "fonttools" executable from $PATH + export PATH="$out/bin:$PATH" ''; - # avoid timing issues with timestamps in subset_test.py and ttx_test.py - checkPhase = '' - pytest Tests fontTools \ - -k 'not ttcompile_timestamp_calcs and not recalc_timestamp' - ''; + # Timestamp tests have timing issues probably related + # to our file timestamp normalization + disabledTests = [ + "test_recalc_timestamp_ttf" + "test_recalc_timestamp_otf" + "test_ttcompile_timestamp_calcs" + ]; meta = with lib; { homepage = "https://github.com/fonttools/fonttools"; From e5cc512faea3be4e25744ec67a670bf663483276 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 5 Oct 2021 16:33:37 +0200 Subject: [PATCH 025/561] python3Packages.psautohint: 2.3.0 -> 2.3.1 https://github.com/adobe-type-tools/psautohint/blob/master/NEWS.md#v231---july-28-2021 --- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index ff312cbff891a..3004d5f7a9b92 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "psautohint"; - version = "2.3.0"; + version = "2.3.1"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "adobe-type-tools"; repo = pname; rev = "v${version}"; - sha256 = "1y7mqc2myn1gfzg4h018f8xza0q535shnqg6snnaqynz20i8jcfh"; + sha256 = "1knh428af0lvzijvd72i30jcvx9n6ga0hai69kxg8386jdpmmvkg"; fetchSubmodules = true; # data dir for tests }; From ac1f59665b669878a73d1977c6da3c5804703420 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 5 Oct 2021 19:17:33 +0200 Subject: [PATCH 026/561] antlr4_9: init at 4.9.2 * Mostly copied from 4.8.nix * C++ runtime now requires utfcpp which is solved using an ExternalProject in 4.9.2. Since this requires network access, we patch it out using a patch picked from antlr4's master. * Change logs: * https://github.com/antlr/antlr4/releases/tag/4.9 * https://github.com/antlr/antlr4/releases/tag/4.9.1 * https://github.com/antlr/antlr4/releases/tag/4.9.2 --- pkgs/development/tools/parsing/antlr/4.9.nix | 95 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 97 insertions(+) create mode 100644 pkgs/development/tools/parsing/antlr/4.9.nix diff --git a/pkgs/development/tools/parsing/antlr/4.9.nix b/pkgs/development/tools/parsing/antlr/4.9.nix new file mode 100644 index 0000000000000..efc478ecd9877 --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/4.9.nix @@ -0,0 +1,95 @@ +{ lib, stdenv, fetchurl, jre +, fetchpatch, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, utf8cpp, darwin }: + +let + version = "4.9.2"; + source = fetchFromGitHub { + owner = "antlr"; + repo = "antlr4"; + rev = version; + sha256 = "0rpqgl2y22iiyg42y8jyiy2g7x421yf0q16cf17j76iai6y0bm5p"; + }; + + runtime = { + cpp = stdenv.mkDerivation { + pname = "antlr-runtime-cpp"; + inherit version; + src = source; + + outputs = [ "out" "dev" "doc" ]; + + patches = [ + (fetchpatch { + name = "use-utfcpp-from-system.patch"; + url = "https://github.com/antlr/antlr4/commit/5a808b470e1314b63b0a921178040ccabb357945.patch"; + sha256 = "0nq7iajy9inllcspyqpxskfg3k5s1fwm7ph75i8lfc25rl35k1w7"; + }) + ]; + + patchFlags = [ "-p3" ]; + + nativeBuildInputs = [ cmake ninja pkg-config ]; + buildInputs = [ utf8cpp ] + ++ lib.optional stdenv.isLinux libuuid + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation; + + postUnpack = '' + export sourceRoot=$sourceRoot/runtime/Cpp + ''; + + meta = with lib; { + description = "C++ target for ANTLR 4"; + homepage = "https://www.antlr.org/"; + license = licenses.bsd3; + platforms = platforms.unix; + }; + }; + }; + + antlr = stdenv.mkDerivation { + pname = "antlr"; + inherit version; + + src = fetchurl { + url = "https://www.antlr.org/download/antlr-${version}-complete.jar"; + sha256 = "1k9pw5gv2zhh06n1vys76kchlz4mz0vgv3iiba8w47b9fqa7n4dv"; + }; + + dontUnpack = true; + + installPhase = '' + mkdir -p "$out"/{share/java,bin} + cp "$src" "$out/share/java/antlr-${version}-complete.jar" + + echo "#! ${stdenv.shell}" >> "$out/bin/antlr" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" + + echo "#! ${stdenv.shell}" >> "$out/bin/grun" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun" + + chmod a+x "$out/bin/antlr" "$out/bin/grun" + ln -s "$out/bin/antlr"{,4} + ''; + + inherit jre; + + passthru = { + inherit runtime; + jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar"; + }; + + meta = with lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = "https://www.antlr.org/"; + license = licenses.bsd3; + platforms = platforms.unix; + }; + }; +in antlr diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f06b94446d3b2..115bca4402ead 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13910,6 +13910,8 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + antlr4_9 = callPackage ../development/tools/parsing/antlr/4.9.nix { }; + antlr4 = antlr4_8; antlr = antlr4; From f51df005e2c2024df73a9c38c7300b35b80439d3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 5 Oct 2021 19:18:01 +0200 Subject: [PATCH 027/561] python3Packages.afdko: 3.5.1 -> 3.7.1 --- .../python-modules/afdko/default.nix | 45 ++++++++++--------- .../afdko/no-pypi-build-tools.patch | 24 ++++++++++ .../use-dynamic-system-antlr4-runtime.patch | 43 ++++++++++++++++++ 3 files changed, 91 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/afdko/no-pypi-build-tools.patch create mode 100644 pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index c06929176d98a..7dd2fa9287fd5 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -1,38 +1,45 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens , brotli, fontmath, mutatormath, booleanoperations , ufoprocessor, ufonormalizer, psautohint, tqdm -, setuptools-scm +, setuptools-scm, scikit-build +, cmake +, antlr4_9 , pytestCheckHook }: buildPythonPackage rec { pname = "afdko"; - version = "3.5.1"; + version = "3.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw"; + sha256 = "05hj2mw3ppfjaig5zdk5db9vfrbbq5gmv5rzggmvvrj0yyfpr0pd"; }; + format = "pyproject"; + + nativeBuildInputs = [ + setuptools-scm + scikit-build + cmake + ]; + + buildInputs = [ + antlr4_9.runtime.cpp + ]; + patches = [ - # Skip date-dependent test. See - # https://github.com/adobe-type-tools/afdko/pull/1232 - # https://github.com/NixOS/nixpkgs/pull/98158#issuecomment-704321117 - (fetchpatch { - url = "https://github.com/adobe-type-tools/afdko/commit/2c36ad10f9d964759f643e8ed7b0972a27aa26bd.patch"; - sha256 = "0p6a485mmzrbfldfbhgfghsypfiad3cabcw7qlw2rh993ivpnibf"; - }) - # fix tests for fonttools 4.21.1 - (fetchpatch { - url = "https://github.com/adobe-type-tools/afdko/commit/0919e7454a0a05a1b141c23bf8134c67e6b688fc.patch"; - sha256 = "0glly85swyl1kcc0mi8i0w4bm148bb001jz1winz5drfrw3a63jp"; - }) + # Don't try to install cmake and ninja using pip + ./no-pypi-build-tools.patch + # Use antlr4 runtime from nixpkgs and link it dynamically + ./use-dynamic-system-antlr4-runtime.patch ]; - nativeBuildInputs = [ setuptools-scm ]; + # setup.py will always (re-)execute cmake in buildPhase + dontConfigure = true; propagatedBuildInputs = [ booleanoperations @@ -53,10 +60,6 @@ buildPythonPackage rec { tqdm ]; - # tests are broken on non x86_64 - # https://github.com/adobe-type-tools/afdko/issues/1163 - # https://github.com/adobe-type-tools/afdko/issues/1216 - doCheck = stdenv.isx86_64; checkInputs = [ pytestCheckHook ]; preCheck = '' export PATH=$PATH:$out/bin diff --git a/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch b/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch new file mode 100644 index 0000000000000..4acc351e7bd7c --- /dev/null +++ b/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch @@ -0,0 +1,24 @@ +commit 72b0ab672d1080049431eeee07ae6d2556ae9e4a +Author: sternenseemann +Date: Tue Oct 5 18:17:20 2021 +0200 + + Don't use pypi distributions of build tools + + We want to use regular cmake and ninja and not the pypi projects which + somehow wrap and vendor a version of the proper tool. + +diff --git a/setup.py b/setup.py +index 50deb781..81417971 100644 +--- a/setup.py ++++ b/setup.py +@@ -196,9 +196,7 @@ def main(): + setup_requires=[ + 'wheel', + 'setuptools_scm', +- 'scikit-build', +- 'cmake', +- 'ninja' ++ 'scikit-build' + ], + tests_require=[ + 'pytest', diff --git a/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch new file mode 100644 index 0000000000000..25e399e78d9bf --- /dev/null +++ b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch @@ -0,0 +1,43 @@ +commit 105daa26f09034af58eb13ac7c5c4ff5420c1724 +Author: sternenseemann +Date: Tue Oct 5 18:16:10 2021 +0200 + + Link against system antlr4 runtime, dynamically + + Instead of cloning a antlr4 version from git, use the system one. Also + don't link it statically, but dynamically by default (the library is + called antlr4-runtime, not antlr4_static). + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d7f86fb6..c43c4456 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,13 +36,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.2-source.zip + # set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip") + +-add_definitions(-DANTLR4CPP_STATIC) + set(ANTLR4_WITH_STATIC_CRT OFF) + # Use slightly more recent commit than 4.9.2 to deal with utfcpp test + # compilation problems + # set(ANTLR4_TAG tags/4.9.2) + set(ANTLR4_TAG 916f03366edf15bf8b50010b11d479c189bf9f96) +-include(ExternalAntlr4Cpp) ++find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime) ++set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER}) + + # sanitizer support + # work around https://github.com/pypa/setuptools/issues/1928 with environment +diff --git a/c/makeotf/lib/hotconv/CMakeLists.txt b/c/makeotf/lib/hotconv/CMakeLists.txt +index 82257bf2..02eb2e30 100644 +--- a/c/makeotf/lib/hotconv/CMakeLists.txt ++++ b/c/makeotf/lib/hotconv/CMakeLists.txt +@@ -69,7 +69,7 @@ add_library(hotconv STATIC + + set_property(TARGET hotconv PROPERTY C_STANDARD 99) + target_include_directories(hotconv PRIVATE AFTER $<$:${ANTLR4_INCLUDE_DIRS}>) +-target_link_libraries(hotconv PUBLIC antlr4_static) ++target_link_libraries(hotconv PUBLIC antlr4-runtime) + + if ( CMAKE_COMPILER_IS_GNUCC ) + target_compile_options(hotconv PRIVATE -Wall -Wno-attributes) From 5104de2ad76bd95675843e8e2cb3582a5135d23e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 5 Oct 2021 19:36:01 +0200 Subject: [PATCH 028/561] python3Packages.nototools: 0.2.13 -> 0.2.16 --- pkgs/data/fonts/noto-fonts/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 88c17e8f4a31b..d6b4488daf05e 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -124,11 +124,6 @@ in sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; }; - makeFlags = [ - # TODO(@sternenseemann): remove if afdko is new enough to know about Unicode 14.0 - "BYPASS_SEQUENCE_CHECK=True" - ]; - nativeBuildInputs = [ cairo imagemagick From 462cc7f39cd772ab2a647a9ef9fa66a6b7e89735 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 5 Oct 2021 19:51:06 +0200 Subject: [PATCH 029/561] python3Packages.afdko: run full test suite in passthru.tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Testsuite delta seems to be 25% still (3min vs 4min on my machine…). --- pkgs/development/python-modules/afdko/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 7dd2fa9287fd5..d9610e9b92740 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -6,6 +6,9 @@ , cmake , antlr4_9 , pytestCheckHook +# Enables some expensive tests, useful for verifying an update +, runAllTests ? false +, afdko }: buildPythonPackage rec { @@ -68,7 +71,7 @@ buildPythonPackage rec { # https://github.com/adobe-type-tools/afdko/issues/1418 find tests -name layerinfo.plist -delete ''; - disabledTests = [ + disabledTests = lib.optionals (!runAllTests) [ # Disable slow tests, reduces test time ~25 % "test_report" "test_post_overflow" @@ -79,6 +82,10 @@ buildPythonPackage rec { "test_options" ]; + passthru.tests = { + fullTestsuite = afdko.override { runAllTests = true; }; + }; + meta = with lib; { description = "Adobe Font Development Kit for OpenType"; homepage = "https://adobe-type-tools.github.io/afdko/"; From fcda45486c94f33ddc9b87f002c60a11b351d38a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 29 Oct 2021 14:17:29 +0200 Subject: [PATCH 030/561] python3Packages.afdko: skip broken test on aarch64 Reported upstream, hopefully harmless: https://github.com/adobe-type-tools/afdko/issues/1425 --- pkgs/development/python-modules/afdko/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index d9610e9b92740..d0de050c86f97 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -80,6 +80,10 @@ buildPythonPackage rec { "test_filename_without_dir" "test_overwrite" "test_options" + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + # aarch64-only (?) failure, unknown reason so far + # https://github.com/adobe-type-tools/afdko/issues/1425 + "test_spec" ]; passthru.tests = { From 9a4978f9cfbf9f93ec9eacc1ceb29caa5996fd0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Nov 2021 16:35:55 +0000 Subject: [PATCH 031/561] vim: 8.2.3451 -> 8.2.3651 --- 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 e068f7df50b4c..43d8888c225a5 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.3451"; + version = "8.2.3651"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-8OaEaFyOaL59j0EZkUY+kuR6si79H2dN09f8SnltxbQ="; + sha256 = "sha256-bSbNO00lqjsjVhkv9W6TCvCQV6UDf2X79z0cgLy9UE0="; }; enableParallelBuilding = true; From d29803109556aae06e15e4c0db3e0c5745bdf49a Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 30 Aug 2021 21:47:20 +0300 Subject: [PATCH 032/561] gradle: Add ncurses dependencies on Linux If ncurses is available Gradle can use it to prettify its output and show progress during task execution. The fixup step patches the bundled native libraries with libstdc++ but not with ncurses, which means that Gradle will always use the (non-pretty) fallback native platform libraries. Patching the native platform libraries with ncurses5 and ncurses6 dependencies fixes the issue. For some reason both ncurses5 and ncurses6 are required. Gradle will refuse to start if, for example, the ncurses5 native platform jar is missing. --- .../tools/build-managers/gradle/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 308a006ecba69..74b4e9322c5b9 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -6,7 +6,7 @@ rec { { version, nativeVersion, sha256, defaultJava ? jdk8 }: { lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava - , javaToolchains ? [ ] }: + , javaToolchains ? [ ], ncurses5, ncurses6 }: stdenv.mkDerivation rec { pname = "gradle"; @@ -52,18 +52,25 @@ rec { fixupPhase = let arch = if stdenv.is64bit then "amd64" else "i386"; in '' - mkdir patching - pushd patching - jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so - jar cf native-platform-linux-${arch}-${nativeVersion}.jar . - mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/ - popd + for variant in "" "-ncurses5" "-ncurses6"; do + mkdir "patching$variant" + pushd "patching$variant" + jar xf $out/lib/gradle/lib/native-platform-linux-${arch}$variant-${nativeVersion}.jar + patchelf \ + --set-rpath "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" \ + net/rubygrapefruit/platform/linux-${arch}$variant/libnative-platform*.so + jar cf native-platform-linux-${arch}$variant-${nativeVersion}.jar . + mv native-platform-linux-${arch}$variant-${nativeVersion}.jar $out/lib/gradle/lib/ + popd + done # The scanner doesn't pick up the runtime dependency in the jar. # Manually add a reference where it will be found. mkdir $out/nix-support echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies + # Gradle will refuse to start without _both_ 5 and 6 versions of ncurses. + echo ${ncurses5} >> $out/nix-support/manual-runtime-dependencies + echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies ''; meta = with lib; { From b481b80b9fb6fb3a79161763f4a040fee389914a Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 30 Aug 2021 21:56:58 +0300 Subject: [PATCH 033/561] gradle: Add liff as maintainer --- pkgs/development/tools/build-managers/gradle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 74b4e9322c5b9..5c0f55b85d63d 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -88,7 +88,7 @@ rec { downloadPage = "https://gradle.org/next-steps/?version=${version}"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ lorenzleutgeb ]; + maintainers = with maintainers; [ lorenzleutgeb liff ]; }; }; From 630883559a68a3d17fcf7a2eb08de13c2d954b27 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 3 Nov 2021 18:02:59 +0000 Subject: [PATCH 034/561] pkgsStatic.gnutls: fix build --- pkgs/development/libraries/gnutls/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 0d39abe1ac3ca..f560529530337 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,8 +1,10 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autoconf, automake, libidn, p11-kit, libiconv +, perl, gmp, autoconf, automake, libidn, libiconv , unbound, dns-root-data, gettext, util-linux +, cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring +, withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit , withSecurity ? false, Security # darwin Security.framework }: @@ -51,13 +53,15 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; configureFlags = - lib.optionals stdenv.isLinux [ + lib.optionals withP11-kit [ "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" "--with-default-trust-store-pkcs11=pkcs11:" ] ++ [ "--disable-dependency-tracking" "--enable-fast-install" "--with-unbound-root-key-file=${dns-root-data}/root.key" + (lib.withFeature withP11-kit "p11-kit") + (lib.enableFeature cxxBindings "cxx") ] ++ lib.optional guileBindings [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" @@ -67,7 +71,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp libunistring unbound gettext libiconv ] + buildInputs = [ lzo lzip libtasn1 libidn zlib gmp libunistring unbound gettext libiconv ] + ++ lib.optional (withP11-kit) p11-kit ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile; From 2ebeb02a99aab4fc6813fe401e2d375a5c00bc8a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 5 Nov 2021 13:48:14 +0000 Subject: [PATCH 035/561] stdenv/setup: tell libtool about library paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Packages that use libtool run it as a wrapper around the linker. Before calling the linker, libtool will determine what libraries would be linked, and check if there's a corresponding libtool archive (libfoo.la) file in the same directory . This file contains extra information about the library. This is especially important for static linking, because static archives don't contain dependency information, so we need libtool to use the .la files to figure out which libraries actually need to be linked against. But in Nixpkgs, this has never worked. libtool isn't able to find any libraries, because only the compiler wrapper knows how to find them, and the compiler wrapper is opaque to libtool. This is why pkgsStatic.util-linuxMinimal doesn't build prior to this patch — it depends on libpam, which depends on libaudit, and if libtool can't find the .la file, nothing will tell the linker to also link against libaudit when linking libpam. (It was previously possible to build a static util-linux, because linux-pam only recently had the audit dependency added.) There are a couple of ways we could fix this, so that libtool knows where to look for .la files. * Set LD_LIBRARY_PATH/DYLD_LIBRARY_PATH/whatever, which libtool will examine. This would have major side effects though, because the dynamic linker looks at it too. * Inject libtool scripts with the appropriate information. That's what I've done here. It was the obvious choice because we're already finding and modifying the libtool scripts, to remove paths outside the Nix store that libtool might check in unsandboxed builds. Instead of emptying out the system paths, we can repopulate it with our own library paths. (We can't use a wrapper like we do for other tools in Nixpkgs, because libtool scripts are often distributed in source tarballs, so we can't just add a wrapped version of libtool as a dependency. That's why there's already the fixLibtool function in stdenv.) With this change, libtool is able to discover .la files, and pkgsStatic.util-linuxMinimal can build again, linking correctly against libpam and libaudit. --- pkgs/stdenv/generic/setup.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index b7645547abc99..2951813c0f715 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -986,7 +986,18 @@ patchPhase() { fixLibtool() { - sed -i -e 's^eval sys_lib_.*search_path=.*^^' "$1" + local search_path + for flag in $NIX_LDFLAGS; do + case $flag in + -L*) + search_path+=" ${flag#-L}" + ;; + esac + done + + sed -i "$1" \ + -e "s^eval \(sys_lib_search_path=\).*^\1'$search_path'^" \ + -e 's^eval sys_lib_.+search_path=.*^^' } From 92992026be26e81b6537fb4ddec24c226b15ff2e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 23 Nov 2021 21:05:22 +0100 Subject: [PATCH 036/561] wayland-protocols: 1.23 -> 1.24 --- 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 71131516f9428..73fef21eccb76 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.23"; + version = "1.24"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc"; + sha256 = "1hlb6gvyqlmsdkv5179ccj07p04cn6xacjkgklakbszczv7xiw5z"; }; postPatch = lib.optionalString doCheck '' From 2d05c5dcf20711577a34a1c56b099bb0b06d2c10 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 24 Nov 2021 21:01:23 +0100 Subject: [PATCH 037/561] git: 2.34.0 -> 2.34.1 --- .../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 634d82a6045d1..073b50c4bd51c 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.0"; + version = "2.34.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 = "07s1c9lzlm4kpbb5lmxy0869phg7037pv4faz5hlqyb5csrbjv7x"; + sha256 = "0b40vf315s1kz65x1wq47g8srl4wqac39pwnvlj1mdzs3kfma1rs"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; From 0b918814571265fd5d3f754085be4d070150e4dd Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Fri, 19 Nov 2021 09:26:48 -0800 Subject: [PATCH 038/561] curl: use lib.getDev to allow building with boringssl As suggested here: https://github.com/NixOS/nixpkgs/pull/143477#issuecomment-974180167 --- pkgs/tools/networking/curl/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5937249c07947..0cd31a8281352 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -96,17 +96,17 @@ stdenv.mkDerivation rec { # The build fails when using wolfssl with --with-ca-fallback (lib.withFeature (!wolfsslSupport) "ca-fallback") "--disable-manual" - (lib.withFeatureAs opensslSupport "openssl" openssl.dev) - (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev) - (lib.withFeatureAs scpSupport "libssh2" libssh2.dev) + (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl)) + (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls)) + (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2)) (lib.enableFeature ldapSupport "ldap") (lib.enableFeature ldapSupport "ldaps") - (lib.withFeatureAs idnSupport "libidn" libidn.dev) + (lib.withFeatureAs idnSupport "libidn" (lib.getDev libidn)) (lib.withFeature brotliSupport "brotli") ] - ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" + ++ lib.optional wolfsslSupport "--with-wolfssl=${lib.getDev wolfssl}" ++ lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" + ++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}" # For the 'urandom', maybe it should be a cross-system option ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { # Install completions make -C scripts install '' + lib.optionalString scpSupport '' - sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la + sed '/^dependency_libs/s|${lib.getDev libssh2}|${lib.getLib libssh2}|' -i "$out"/lib/*.la '' + lib.optionalString gnutlsSupport '' ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4 From 7e4880c21b0be51f412dd27cda9bc8e3f28ec111 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 9 Jun 2021 20:53:27 +0200 Subject: [PATCH 039/561] stdenv: update darwin bootstrap tools for llvm11 Build from bdffd0b276befa8782ef4936a59b32e7bdcfc2df. https://hydra.nixos.org/build/124753463 (cherry picked from commit f4a08349ed43a36ad5489a4ab548fcf0c129215d) --- pkgs/stdenv/darwin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b25a840f460ef..92634514a54ee 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -23,7 +23,7 @@ else let fetch = { file, sha256, executable ? true }: import { - url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/05ef940b94fe76e7ac06ea45a625adc8e4be96f9/${file}"; + url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/c253216595572930316f2be737dc288a1da22558/${file}"; inherit (localSystem) system; inherit sha256 executable; }; in @@ -32,7 +32,7 @@ bzip2 = fetch { file = "bzip2"; sha256 = "sha256-K3rhkJZipudT1Jgh+l41Y/fNsMkrPtiAsNRDha/lpZI="; }; mkdir = fetch { file = "mkdir"; sha256 = "sha256-VddFELwLDJGNADKB1fWwWPBtIAlEUgJv2hXRmC4NEeM="; }; cpio = fetch { file = "cpio"; sha256 = "sha256-SWkwvLaFyV44kLKL2nx720SvcL4ej/p2V/bX3uqAGO0="; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-b65dXbIm6o6s6U8tAiGpR6SMfvfn/VFcZgTHBetJZis="; executable = false; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-kRC/bhCmlD4L7KAvJQgcukk7AinkMz4IwmG1rqlh5tA="; executable = false; }; } }: From e07eef85e85f359be86f9f1b3f09c642b641fdbb Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 13 Apr 2021 20:54:01 +0200 Subject: [PATCH 040/561] xnu: Fix python3 patch This reverts 7da313e10a2b73b05f27a2f6bfeafa1c1d37ce8b because it's no longer necessary. --- .../darwin/apple-source-releases/xnu/python3.patch | 2 +- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch b/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch index 10778406c8e0e..9f29376187f4c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch @@ -18,7 +18,7 @@ index 73b2db4..d354ba0 100755 - m = id_name_pattern.match(line) - if m: + m = id_name_pattern.match(line) -+ if m: ++ if m: code_table += [(int(m.group(1),base=16), m.group(2))] # emit typedef: diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 434eadb38bf08..536bf251a9403 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -33,10 +33,7 @@ in rec { curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); # Avoid stdenv rebuild. - Libsystem_ = (darwin.Libsystem.override (args: - { xnu = darwin.xnu.overrideAttrs (oldAttrs: - { patches = [ ./fixed-xnu-python3.patch ]; }); - })).overrideAttrs (oldAttrs: + Libsystem_ = darwin.Libsystem.overrideAttrs (oldAttrs: { installPhase = oldAttrs.installPhase + '' cat < $out/include/TargetConditionals.h #ifndef __TARGETCONDITIONALS__ From 84454c32332e39bc84bab576e00c62ac88b3dbe3 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 21 Apr 2021 18:34:13 +0200 Subject: [PATCH 041/561] darwin.Libsystem: Patch TargetConditionals.h `TargetConditionals.h` was missing several definitions, like `TARGET_OS_TV` that are part of SDK 10.12 at least. And one that doesn't seem to occur in any SDK afaict, `TARGET_OS_EMBEDDED_OTHER`. I added the definitions from SDK 10.12 verbatim and defined `TARGET_OS_EMBEDDED_OTHER` to be equal to `0`. I think none of this works if `darwin.Libsystem` is used to build for linux or iOS though so maybe this needs a more thorough fix? This reverts 336d82617f1cdd2f5ae77e262afa3f88f5a5e578 because it's no longer necessary. --- .../Libsystem/default.nix | 30 ++++++------ pkgs/stdenv/darwin/make-bootstrap-tools.nix | 47 ++----------------- 2 files changed, 19 insertions(+), 58 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 66190b7b4e37c..86c91e9b55ccb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -63,20 +63,21 @@ appleDerivation' stdenv { cat < $out/include/TargetConditionals.h #ifndef __TARGETCONDITIONALS__ #define __TARGETCONDITIONALS__ - #define TARGET_OS_MAC 1 - #define TARGET_OS_OSX 1 - #define TARGET_OS_WIN32 0 - #define TARGET_OS_UNIX 0 - #define TARGET_OS_EMBEDDED 0 - #define TARGET_OS_IPHONE 0 - #define TARGET_OS_IOS 0 - #define TARGET_OS_WATCH 0 - #define TARGET_OS_BRIDGE 0 - #define TARGET_OS_TV 0 - #define TARGET_OS_SIMULATOR 0 - #define TARGET_IPHONE_SIMULATOR 0 - #define TARGET_OS_NANO 0 - #define TARGET_OS_LINUX 0 + #define TARGET_OS_MAC 1 + #define TARGET_OS_WIN32 0 + #define TARGET_OS_UNIX 0 + #define TARGET_OS_OSX 1 + #define TARGET_OS_IPHONE 0 + #define TARGET_OS_IOS 0 + #define TARGET_OS_WATCH 0 + #define TARGET_OS_BRIDGE 0 + #define TARGET_OS_TV 0 + #define TARGET_OS_SIMULATOR 0 + #define TARGET_OS_EMBEDDED 0 + #define TARGET_OS_EMBEDDED_OTHER 0 /* Used in configd */ + #define TARGET_IPHONE_SIMULATOR TARGET_OS_SIMULATOR /* deprecated */ + #define TARGET_OS_NANO TARGET_OS_WATCH /* deprecated */ + #define TARGET_OS_LINUX 0 #define TARGET_CPU_PPC 0 #define TARGET_CPU_PPC64 0 @@ -84,6 +85,7 @@ appleDerivation' stdenv { #define TARGET_CPU_X86 0 #define TARGET_CPU_X86_64 1 #define TARGET_CPU_ARM 0 + #define TARGET_CPU_ARM64 0 #define TARGET_CPU_MIPS 0 #define TARGET_CPU_SPARC 0 #define TARGET_CPU_ALPHA 0 diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 536bf251a9403..34578ecfba8e9 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -32,47 +32,6 @@ in rec { # Avoid messing with libkrb5 and libnghttp2. curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); - # Avoid stdenv rebuild. - Libsystem_ = darwin.Libsystem.overrideAttrs (oldAttrs: - { installPhase = oldAttrs.installPhase + '' - cat < $out/include/TargetConditionals.h - #ifndef __TARGETCONDITIONALS__ - #define __TARGETCONDITIONALS__ - #define TARGET_OS_MAC 1 - #define TARGET_OS_WIN32 0 - #define TARGET_OS_UNIX 0 - #define TARGET_OS_OSX 1 - #define TARGET_OS_IPHONE 0 - #define TARGET_OS_IOS 0 - #define TARGET_OS_WATCH 0 - #define TARGET_OS_BRIDGE 0 - #define TARGET_OS_TV 0 - #define TARGET_OS_SIMULATOR 0 - #define TARGET_OS_EMBEDDED 0 - #define TARGET_OS_EMBEDDED_OTHER 0 /* Used in configd */ - #define TARGET_IPHONE_SIMULATOR TARGET_OS_SIMULATOR /* deprecated */ - #define TARGET_OS_NANO TARGET_OS_WATCH /* deprecated */ - - #define TARGET_CPU_PPC 0 - #define TARGET_CPU_PPC64 0 - #define TARGET_CPU_68K 0 - #define TARGET_CPU_X86 0 - #define TARGET_CPU_X86_64 1 - #define TARGET_CPU_ARM 0 - #define TARGET_CPU_ARM64 0 - #define TARGET_CPU_MIPS 0 - #define TARGET_CPU_SPARC 0 - #define TARGET_CPU_ALPHA 0 - #define TARGET_RT_MAC_CFM 0 - #define TARGET_RT_MAC_MACHO 1 - #define TARGET_RT_LITTLE_ENDIAN 1 - #define TARGET_RT_BIG_ENDIAN 0 - #define TARGET_RT_64_BIT 1 - #endif /* __TARGETCONDITIONALS__ */ - EOF - ''; - }); - build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; @@ -84,12 +43,12 @@ in rec { ${lib.optionalString stdenv.targetPlatform.isx86_64 '' # Copy libSystem's .o files for various low-level boot stuff. - cp -d ${Libsystem_}/lib/*.o $out/lib + cp -d ${darwin.Libsystem}/lib/*.o $out/lib # Resolv is actually a link to another package, so let's copy it properly - cp -L ${Libsystem_}/lib/libresolv.9.dylib $out/lib + cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib - cp -rL ${Libsystem_}/include $out + cp -rL ${darwin.Libsystem}/include $out chmod -R u+w $out/include cp -rL ${darwin.ICU}/include* $out/include cp -rL ${libiconv}/include/* $out/include From cc767e1d05d5fa8988590323aab86270b4d1abd7 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 15 Apr 2021 14:06:41 +0200 Subject: [PATCH 042/561] darwin.stdenv: Update to LLVM 11 and clang 11.1.0 --- pkgs/stdenv/darwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 92634514a54ee..9b8d3e29e19ed 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -4,7 +4,7 @@ , config , overlays , crossOverlays ? [ ] -, bootstrapLlvmVersion ? if localSystem.isAarch64 then "11.1.0" else "7.1.0" +, bootstrapLlvmVersion ? "11.1.0" # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? if localSystem.isAarch64 then let From 968765401119a335b326fd8c1471d0e932902ce9 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 19 Apr 2021 14:18:23 +0200 Subject: [PATCH 043/561] all-packages: Define LLVM 11 as the default for Darwin The Darwin stdenv takes some of the llvmPackages from the top-level pkgs rather than explicitly from `llvmPackages_*`. This means you cannot simply bump the LLVM version in the stdenv, you have to bump the default version in all-packages.nix as well. --- 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 be2175cddabd4..daf37f8b6f03d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12500,7 +12500,7 @@ with pkgs; # This returns the minimum supported version for the platform. The # assumption is that or any later version is good. choose = platform: - /**/ if platform.isDarwin then (if platform.isAarch64 then 11 else 7) + /**/ if platform.isDarwin then 11 else if platform.isFreeBSD then 7 else if platform.isAndroid then 12 else if platform.isLinux then From 1be8e73fb3bc13892e94951099e7f62b9f3a3626 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 19 Apr 2021 15:02:40 +0200 Subject: [PATCH 044/561] stdenv: libcxxabi dropped standalone in favor of useLLVM The libcxxabi expression had a `standalone` argument in LLVM 7 which triggered passing of the `-DLLVM_ENABLE_LIBCXX=ON` flag. In LLVM 11 this flag and others are toggled by the `useLLVM` attribute of `stdenv.hostPlatform` but this toggles a flag we don't need on Darwin. Similar to the refactoring of LLVM 7 libc++abi by Ericson2314 in 3af7e984705, I have reintroduced the standalone argument for use in bootstrapping the Darwin stdenv. --- pkgs/development/compilers/llvm/11/libcxxabi/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix index 65e0139a59106..9f6e303d31f7a 100644 --- a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix @@ -1,4 +1,6 @@ { lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version +, standalone ? stdenv.hostPlatform.useLLVM or false +, withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -29,7 +31,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + buildInputs = lib.optional withLibunwind libunwind; cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" From 982f7228ffd01450338384a81b31f6527d674574 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 20 Apr 2021 21:54:28 +0200 Subject: [PATCH 045/561] cmake: Temporarily pass flags To mimic LLVM 7 behavior we need to pass `-Wno-elaborated-enum-base` in `CXXFLAGS`. Ideally this gets fixed upstream and won't be necessary. --- pkgs/development/tools/build-managers/cmake/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 33dbc25d9bf89..f74d0d46906da 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "CXXFLAGS=-Wno-elaborated-enum-base" "--docdir=share/doc/${pname}${version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup ++ lib.optional withQt5 "--qt-gui" From 2bb0e256ea97dbddb21490ad788db3a1cf443a6e Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 26 Apr 2021 21:24:03 +0200 Subject: [PATCH 046/561] darwin.CF: Include missing TARGET_OS_* defines This patch is static and may not be appropriate if the compilation target is iOS. --- .../0001-Add-missing-TARGET_OS_-defines.patch | 30 +++++++++++++++++++ .../darwin/swift-corelibs/corefoundation.nix | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/darwin/swift-corelibs/0001-Add-missing-TARGET_OS_-defines.patch diff --git a/pkgs/os-specific/darwin/swift-corelibs/0001-Add-missing-TARGET_OS_-defines.patch b/pkgs/os-specific/darwin/swift-corelibs/0001-Add-missing-TARGET_OS_-defines.patch new file mode 100644 index 0000000000000..db17c517c7202 --- /dev/null +++ b/pkgs/os-specific/darwin/swift-corelibs/0001-Add-missing-TARGET_OS_-defines.patch @@ -0,0 +1,30 @@ +From 549160574ee44656d50997b27ef83736e0848201 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Mon, 26 Apr 2021 20:51:05 +0200 +Subject: [PATCH] Add missing TARGET_OS_* defines + +--- + .../Base.subproj/SwiftRuntime/TargetConditionals.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/CoreFoundation/Base.subproj/SwiftRuntime/TargetConditionals.h b/CoreFoundation/Base.subproj/SwiftRuntime/TargetConditionals.h +index 6d42b873..abf746c9 100644 +--- a/CoreFoundation/Base.subproj/SwiftRuntime/TargetConditionals.h ++++ b/CoreFoundation/Base.subproj/SwiftRuntime/TargetConditionals.h +@@ -118,6 +118,13 @@ + + #define TARGET_OS_WIN32 TARGET_OS_WINDOWS + #define TARGET_OS_MAC TARGET_OS_DARWIN ++#define TARGET_OS_OSX TARGET_OS_DARWIN ++ ++#define TARGET_OS_IPHONE 0 ++#define TARGET_OS_WATCH 0 ++#define TARGET_OS_TV 0 ++#define TARGET_OS_EMBEDDED 0 ++ + + #if __x86_64__ + #define TARGET_CPU_PPC 0 +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 560be0c31ab61..59bff5fac1470 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ ninja python3 ]; buildInputs = [ curl libxml2 objc4 ICU ]; + patches = [ ./0001-Add-missing-TARGET_OS_-defines.patch ]; + postPatch = '' cd CoreFoundation @@ -76,7 +78,7 @@ stdenv.mkDerivation { # please remove this when updating the default llvm versions to 8 or # later. buildPhase = lib.optionalString true '' - for i in {1..512}; do + for i in {1..1}; do if ninja -j $NIX_BUILD_CORES; then break fi From 3b2d3f65b799d4c682fb4b0cf025f0812429faa4 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 27 Apr 2021 19:21:05 +0200 Subject: [PATCH 047/561] darwin.CF: Drop clang 7 workaround --- .../darwin/swift-corelibs/corefoundation.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 59bff5fac1470..d16cc3a12c7c0 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -73,24 +73,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - # FIXME: Workaround for intermittent build failures of CFRuntime.c. - # Based on testing this issue seems to only occur with clang_7, so - # please remove this when updating the default llvm versions to 8 or - # later. - buildPhase = lib.optionalString true '' - for i in {1..1}; do - if ninja -j $NIX_BUILD_CORES; then - break - fi - - echo >&2 - echo "[$i/512] retrying build, workaround for #66811" >&2 - echo " With clang_7 the build of CFRuntime.c fails intermittently." >&2 - echo " See https://github.com/NixOS/nixpkgs/issues/66811 for more details." >&2 - echo >&2 - continue - done - ''; + buildPhase = "ninja -j $NIX_BUILD_CORES"; # TODO: their build system sorta kinda can do this, but it doesn't seem to work right now # Also, this includes a bunch of private headers in the framework, which is not what we want From 7e9d4428373f780aed525bb5fc4d25d9d1117421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 30 Apr 2021 13:04:56 +0200 Subject: [PATCH 048/561] darwin.CF: Add pre-/postBuild hooks to buildPhase --- pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index d16cc3a12c7c0..bfe862eb3957d 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -73,7 +73,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildPhase = "ninja -j $NIX_BUILD_CORES"; + buildPhase = '' + runHook preBuild + + ninja -j $NIX_BUILD_CORES + + runHook postBuild + ''; # TODO: their build system sorta kinda can do this, but it doesn't seem to work right now # Also, this includes a bunch of private headers in the framework, which is not what we want From 77fc5f8c14f797fe2db78b8d1635dba4e81769db Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 1 Jun 2021 20:26:42 +0200 Subject: [PATCH 049/561] bootstrap-tools: Introduce getLib for lib outputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sternenseemann Co-authored-by: Jörg Thalheim --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 34578ecfba8e9..49f884cd8b3d9 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -43,10 +43,10 @@ in rec { ${lib.optionalString stdenv.targetPlatform.isx86_64 '' # Copy libSystem's .o files for various low-level boot stuff. - cp -d ${darwin.Libsystem}/lib/*.o $out/lib + cp -d ${lib.getLib darwin.Libsystem}/lib/*.o $out/lib # Resolv is actually a link to another package, so let's copy it properly - cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib + cp -L ${lib.getLib darwin.Libsystem}/lib/libresolv.9.dylib $out/lib cp -rL ${darwin.Libsystem}/include $out chmod -R u+w $out/include @@ -84,21 +84,21 @@ in rec { cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib cp -d ${lib.getLib libiconv}/lib/lib*.dylib $out/lib - cp -d ${gettext}/lib/libintl*.dylib $out/lib + cp -d ${lib.getLib gettext}/lib/libintl*.dylib $out/lib chmod +x $out/lib/libintl*.dylib cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib cp -d ${libxml2.out}/lib/libxml2*.dylib $out/lib # Copy what we need of clang cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin - cp -rd ${llvmPackages.clang-unwrapped.lib}/lib/* $out/lib + cp -rd ${lib.getLib llvmPackages.clang-unwrapped}/lib/* $out/lib - cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib - cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib - cp -d ${llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin - cp -d ${llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib - cp -d ${llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib - cp -d ${libffi}/lib/libffi*.dylib $out/lib + cp -d ${lib.getLib llvmPackages.libcxx}/lib/libc++*.dylib $out/lib + cp -d ${lib.getLib llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib + cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin + cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib + cp -d ${lib.getLib llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib + cp -d ${lib.getLib libffi}/lib/libffi*.dylib $out/lib mkdir $out/include cp -rd ${llvmPackages.libcxx.dev}/include/c++ $out/include @@ -106,11 +106,11 @@ in rec { ${lib.optionalString targetPlatform.isAarch64 '' # copy .tbd assembly utils cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin - cp -d ${pkgs.libyaml}/lib/libyaml*.dylib $out/lib + cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib # copy package extraction tools cp -d ${pkgs.pbzx}/bin/pbzx $out/bin - cp -d ${pkgs.xar}/lib/libxar*.dylib $out/lib + cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib # copy sigtool @@ -118,7 +118,7 @@ in rec { cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin ''} - cp -d ${darwin.ICU}/lib/libicu*.dylib $out/lib + cp -d ${lib.getLib darwin.ICU}/lib/libicu*.dylib $out/lib cp -d ${zlib.out}/lib/libz.* $out/lib cp -d ${gmpxx.out}/lib/libgmp*.* $out/lib cp -d ${xz.out}/lib/liblzma*.* $out/lib @@ -128,7 +128,7 @@ in rec { cp ${cctools_}/bin/$i $out/bin done - cp -d ${darwin.libtapi}/lib/libtapi* $out/lib + cp -d ${lib.getLib darwin.libtapi}/lib/libtapi* $out/lib ${lib.optionalString targetPlatform.isx86_64 '' cp -rd ${pkgs.darwin.CF}/Library $out From 63a3ead0848d7d8edc985871130fcafc1dd2d260 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 10 Jun 2021 11:26:48 +0200 Subject: [PATCH 050/561] stdenv: Darwin no longer needs 10.11 workaround Co-authored-by: happysalada --- pkgs/stdenv/darwin/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9b8d3e29e19ed..7578a274cb820 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -62,9 +62,6 @@ rec { export NIX_IGNORE_LD_THROUGH_GCC=1 unset SDKROOT - # Workaround for https://openradar.appspot.com/22671534 on 10.11. - export gl_cv_func_getcwd_abort_bug=no - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" ''; From d0c5ac23835e11ee5d01fd91e4739e9d5cab01e8 Mon Sep 17 00:00:00 2001 From: toonn Date: Sun, 4 Jul 2021 15:40:04 +0200 Subject: [PATCH 051/561] libtiff: Disable OpenGL entirely for Darwin On the Hydra builders and with Clang 7, CMake fails to find OpenGL. With Clang 11 it manages to find the the OpenGL and GLUT system frameworks for me. It does not find `gl.h` however. So the tests for `tiffgt` fail on a missing include. Since previously OpenGL wasn't detected I've opted to disable the CMake check for OpenGL for darwin. This means `tiffgt.c` is never built and tested. Ideally we'd provide the proper headers so the tests can succeed. --- .../libtiff/0001-Disable-OpenGL.patch | 26 +++++++++++++++++++ .../development/libraries/libtiff/default.nix | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libtiff/0001-Disable-OpenGL.patch diff --git a/pkgs/development/libraries/libtiff/0001-Disable-OpenGL.patch b/pkgs/development/libraries/libtiff/0001-Disable-OpenGL.patch new file mode 100644 index 0000000000000..60ce8ed49b16b --- /dev/null +++ b/pkgs/development/libraries/libtiff/0001-Disable-OpenGL.patch @@ -0,0 +1,26 @@ +From 6385dfa45c86b79da4f84df10f481f0ba260ab1f Mon Sep 17 00:00:00 2001 +From: toonn +Date: Sat, 3 Jul 2021 20:38:25 +0200 +Subject: [PATCH] Disable OpenGL + +--- + CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index efe857d..e72897b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -611,9 +611,6 @@ endif() + find_package(OpenGL) + find_package(GLUT) + set(HAVE_OPENGL FALSE) +-if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND) +- set(HAVE_OPENGL TRUE) +-endif() + # Purely to satisfy the generated headers: + check_include_file(GL/gl.h HAVE_GL_GL_H) + check_include_file(GL/glu.h HAVE_GL_GLU_H) +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index ea246790020e6..d004f35d3f1c6 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -22,7 +22,12 @@ stdenv.mkDerivation rec { }; # FreeImage needs this patch - patches = [ ./headers.patch ]; + patches = [ ./headers.patch ] + # CMake manages to detect the OpenGL and GLUT system frameworks but doesn't + # find the `gl.h` header, making the tests fail. With older Clangs OpenGL + # wasn't detected so the simplest fix was to keep CMake from checking for + # it. This means `tiffgt` isn't built and tested. + ++ lib.optional stdenv.isDarwin ./0001-Disable-OpenGL.patch; outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; From 5a12a87aedc9fc549da4fb183506bf73a7526cff Mon Sep 17 00:00:00 2001 From: toonn Date: Sun, 27 Jun 2021 12:50:44 +0200 Subject: [PATCH 052/561] cups: Include TargetConditionals.h on Darwin --- pkgs/misc/cups/0001-TargetConditionals.patch | 29 ++++++++++++++++++++ pkgs/misc/cups/default.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/misc/cups/0001-TargetConditionals.patch diff --git a/pkgs/misc/cups/0001-TargetConditionals.patch b/pkgs/misc/cups/0001-TargetConditionals.patch new file mode 100644 index 0000000000000..42cd4c051d4bf --- /dev/null +++ b/pkgs/misc/cups/0001-TargetConditionals.patch @@ -0,0 +1,29 @@ +From 1204c841999808ba27267a0039777dcbccdcd6e3 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Sun, 27 Jun 2021 12:30:08 +0200 +Subject: [PATCH] TargetConditionals + +--- + test/ippserver.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/test/ippserver.c b/test/ippserver.c +index 38b304f..68ccab1 100644 +--- a/test/ippserver.c ++++ b/test/ippserver.c +@@ -25,7 +25,11 @@ + * Include necessary headers... + */ + +-#include /* CUPS configuration header */ ++#ifdef __APPLE__ ++# include /* CUPS configuration header macOS */ ++#else ++# include /* CUPS configuration header */ ++#endif /* __APPLE__ */ + #include /* Public API */ + #include /* CUPS string functions */ + #include /* For multithreading functions */ +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 1d467f0a53473..bbada33054d37 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; + patches = lib.optional (version == "2.2.6") ./0001-TargetConditionals.patch; + postPatch = '' substituteInPlace cups/testfile.c \ --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin' From e4d62a5ad5b86ed600d3303b18d0a0bb6fb840ab Mon Sep 17 00:00:00 2001 From: toonn Date: Sun, 4 Jul 2021 21:58:11 +0200 Subject: [PATCH 053/561] mariadb: Avoid building with clang-11 libcxx-11.1.0 uses `#include ` in several places. There's a `storage/mroonga/version` file in the mariadb source and this gets picked up by libcxx when building mroonga but that file doesn't contain valid source code. To avoid the issue altogether we're sticking with a clang-7 stdenv to build mariadb for now. Based on 787f934b247e41f7bb6d04959a66e0a111a0f0db from LnL7's WIP LLVM 9 update. Co-authored-by: Daiderd Jordan --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daf37f8b6f03d..5098e93f690b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21188,6 +21188,10 @@ with pkgs; }; mariadb = callPackage ../servers/sql/mariadb { + # libcxx-11.1.0 includes `` in some places and this picks up + # storage/mroonga/version under clang-11 so we build mariadb with a clang-7 + # stdenv instead. + stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; }; From 3791134fa040f4729db9eeff4fea3cb0355e9f6c Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 6 Jul 2021 20:33:56 +0200 Subject: [PATCH 054/561] portaudio: Disable new clang-11 warning Clang 11 complains about implicit conversion from int to float so we disable `-Wimplicit-const-int-float-conversion`. The conversion causes a difference in the constant of 1, so how bad can it be? ; ) --- pkgs/development/libraries/portaudio/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index b0ab32c9e392c..68780a162bb8e 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - postConfigure = '' - substituteInPlace Makefile --replace "-Werror" "" - ''; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays -Wno-error=implicit-const-int-float-conversion"; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; From b02908c2133057cc88b4465285ce2c306952526d Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 7 Jul 2021 00:16:59 +0200 Subject: [PATCH 055/561] libtiff: Reenable OpenGL support on Darwin I found the correct inputs to get `libtiff` to compile with OpenGL support on Darwin. Allowing us to get rid of the ugly build system patch. --- .../libtiff/0001-Disable-OpenGL.patch | 26 ------------------- .../development/libraries/libtiff/default.nix | 15 ++++++----- pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 11 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/libraries/libtiff/0001-Disable-OpenGL.patch diff --git a/pkgs/development/libraries/libtiff/0001-Disable-OpenGL.patch b/pkgs/development/libraries/libtiff/0001-Disable-OpenGL.patch deleted file mode 100644 index 60ce8ed49b16b..0000000000000 --- a/pkgs/development/libraries/libtiff/0001-Disable-OpenGL.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6385dfa45c86b79da4f84df10f481f0ba260ab1f Mon Sep 17 00:00:00 2001 -From: toonn -Date: Sat, 3 Jul 2021 20:38:25 +0200 -Subject: [PATCH] Disable OpenGL - ---- - CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index efe857d..e72897b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -611,9 +611,6 @@ endif() - find_package(OpenGL) - find_package(GLUT) - set(HAVE_OPENGL FALSE) --if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND) -- set(HAVE_OPENGL TRUE) --endif() - # Purely to satisfy the generated headers: - check_include_file(GL/gl.h HAVE_GL_GL_H) - check_include_file(GL/glu.h HAVE_GL_GLU_H) --- -2.17.2 (Apple Git-113) - diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index d004f35d3f1c6..51c0d02def6c8 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -8,6 +8,11 @@ , libjpeg , xz , zlib + +, Cocoa +, GLUT +, libGL +, libGLU }: #FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix @@ -22,12 +27,7 @@ stdenv.mkDerivation rec { }; # FreeImage needs this patch - patches = [ ./headers.patch ] - # CMake manages to detect the OpenGL and GLUT system frameworks but doesn't - # find the `gl.h` header, making the tests fail. With older Clangs OpenGL - # wasn't detected so the simplest fix was to keep CMake from checking for - # it. This means `tiffgt` isn't built and tested. - ++ lib.optional stdenv.isDarwin ./0001-Disable-OpenGL.patch; + patches = [ ./headers.patch ]; outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; @@ -43,7 +43,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) - buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs. + buildInputs = [ libdeflate ] # TODO: move all propagatedBuildInputs to buildInputs. + ++ lib.optionals (stdenv.isDarwin) [ Cocoa GLUT libGL libGLU ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5098e93f690b9..60b38b7ca3582 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18285,7 +18285,9 @@ with pkgs; libtiff = if stdenv.isDarwin && stdenv.isAarch64 then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { } - else callPackage ../development/libraries/libtiff { }; + else callPackage ../development/libraries/libtiff { + inherit (darwin.apple_sdk.frameworks) Cocoa GLUT; + }; libtiger = callPackage ../development/libraries/libtiger { }; From 73d3d0de7f7ba4a7ca4cea949acf47c16aed1e16 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 7 Jul 2021 00:34:59 +0200 Subject: [PATCH 056/561] libcxxabi: Use standalone instead of expression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sandro Jäckel --- pkgs/development/compilers/llvm/11/libcxxabi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix index 9f6e303d31f7a..6201992512ec4 100644 --- a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional withLibunwind libunwind; - cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = lib.optionals standalone [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ From 530b000f0983b91d2f450e8d7c6d41ca649ca7b7 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 7 Jul 2021 14:01:49 +0200 Subject: [PATCH 057/561] portaudio: Fix version mashup Co-authored-by: Pavol Rusnak --- pkgs/development/libraries/portaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 68780a162bb8e..c1c76a900175a 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "portaudio"; - version = "190700_20210406"; + version = "190700_20210406"; src = fetchurl { url = "http://files.portaudio.com/archives/pa_stable_v${version}.tgz"; From ea50c9776c004d4f5ec39f547c93a5957fee3faa Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 7 Jul 2021 19:32:45 +0200 Subject: [PATCH 058/561] cups: Change condition so patch won't remain forever MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By changing the condition for the patch it'll hopefully break when the version is updated for Darwin and not stick around forever. Co-authored-by: Sandro Jäckel --- pkgs/misc/cups/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index bbada33054d37..38026adc52c11 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - patches = lib.optional (version == "2.2.6") ./0001-TargetConditionals.patch; + patches = lib.optional stdenv.isDarwin ./0001-TargetConditionals.patch; postPatch = '' substituteInPlace cups/testfile.c \ From 2253728351e712677bff9514ff70cf132b9ce32f Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 12 Jul 2021 17:37:04 +0200 Subject: [PATCH 059/561] sphinx: Patch source file for normalization One of the test files has a different encoding depending on the filesystem's normalization. By picking a character that does not have multiple possible encodings we make the source indifferent to normalization. This allows the FOD hash to match across platforms with differently normalizing filesystems. --- ...e-normalization-equivalent-character.patch | 35 +++++++++++++++++++ .../python-modules/sphinx/default.nix | 8 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch diff --git a/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch b/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch new file mode 100644 index 0000000000000..805e724d0c8c1 --- /dev/null +++ b/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch @@ -0,0 +1,35 @@ +From 181617387841b695ee77b162babf9fb177002fcb Mon Sep 17 00:00:00 2001 +From: toonn +Date: Mon, 20 Sep 2021 11:39:46 +0200 +Subject: [PATCH] test-images: Use normalization equivalent character +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +One of the test images used a combining character `ä` that can be +encoded multiple ways. This means the file's name can end up encoded +differently depending on whether/which normal form the filesystem uses. + +For Nix this causes a different hash for a FOD depending on the +filesystem where it is evaluated. This is problematic because hashes +fail to match up when evaluating the FOD across multiple platforms. +--- + tests/roots/test-images/index.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst +index 14a2987..219842e 100644 +--- a/tests/roots/test-images/index.rst ++++ b/tests/roots/test-images/index.rst +@@ -13,7 +13,7 @@ test-image + + The caption of img + +-.. image:: testimäge.png ++.. image:: testimæge.png + + .. image:: rimg.png + :target: https://www.sphinx-doc.org/ +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 9d82b4c598103..abe3035074432 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -35,7 +35,13 @@ buildPythonPackage rec { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "1i38n5bxqiycjwmiv9dl72r3f5ks4zmif30znqg8zilclbx6g16x"; + sha256 = "1bl0k326h32dag41axbsjq1d9w59rm11naj6bfirg116nqw56mk6"; + extraPostFetch = '' + cd $out + mv tests/roots/test-images/testimäge.png \ + tests/roots/test-images/testimæge.png + patch -p1 < ${./0001-test-images-Use-normalization-equivalent-character.patch} + ''; }; propagatedBuildInputs = [ From b1b5b40c8d5b1ed53b30b4cd032885fdc0614737 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 12 Jul 2021 17:38:08 +0200 Subject: [PATCH 060/561] Qt5: WebEngine turn off warning causing errors Co-authored-by: Jonathan Ringer --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index b49efa600fa5d..0e44399631113 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -110,6 +110,8 @@ qtModule { # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 # TODO: investigate and fix properly "-march=westmere" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-elaborated-enum-base" ] ++ 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" From 8b09fd98eb7b87f4ae71e3a0aed770831941450e Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 13 Jul 2021 00:23:45 +0200 Subject: [PATCH 061/561] mariadb: Rename "version" files for LLVM 11 Libc++abi 11 has `#include ` in some places. This clashes with projects that have files named "version" in directories that end up on the include path. This includes files named "VERSION" on case-insensitive file systems. --- pkgs/servers/sql/mariadb/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 82fdc2a3a38b6..f183a1fb12b54 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -47,6 +47,10 @@ common = rec { # attributes common to both builds prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt + sed -i 's,/version\>,/version_full,' storage/mroonga/CMakeLists.txt + mv storage/mroonga/version storage/mroonga/version_full + sed -i 's,/VERSION\>,/VERSION_FULL,' cmake/mysql_version.cmake + mv VERSION VERSION_FULL ''; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60b38b7ca3582..64376cc3a901f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21190,10 +21190,6 @@ with pkgs; }; mariadb = callPackage ../servers/sql/mariadb { - # libcxx-11.1.0 includes `` in some places and this picks up - # storage/mroonga/version under clang-11 so we build mariadb with a clang-7 - # stdenv instead. - stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; }; From 2a97abdc2117d950269589cc9886bc1cbc1c9e30 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 13 Jul 2021 00:28:34 +0200 Subject: [PATCH 062/561] Qt5: WebEngine build with old LLVM Qt Base is built with LLVM 5 on Darwin. LLVM 11 causes problems for WebEngine because of the "version" includes in libc++abi. LLVM 7 would work but since parts are built with LLVM 5 anyway it seemed like a more straightforward option. --- pkgs/development/libraries/qt-5/5.12/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index a047b5b71081e..f4a9d11c75166 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -191,6 +191,7 @@ let inherit (darwin.apple_sdk.libs) sandbox; inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; + stdenv = stdenvActual; }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix { From 504b89e2d3f38f93ef669eb1e1b7dd85f6ab6cf1 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 14 Jul 2021 18:26:54 +0200 Subject: [PATCH 063/561] groonga: Fix LLVM 11 build by removing version file --- pkgs/servers/search/groonga/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index b405a4c2f09df..34c46f5b64942 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -2,6 +2,7 @@ , suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib +, autoconf, automake }: stdenv.mkDerivation rec { @@ -14,12 +15,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-oBABhMKLezjPeHkWfqesy+ze+CPnWfmS17vCKC7fWEU="; }; + preConfigure = '' + rm version + aclocal + ''; + buildInputs = with lib; - [ pkg-config mecab kytea libedit ] + [ mecab kytea libedit ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; + configureFlags = with lib; optional zlibSupport "--with-zlib" ++ optional lz4Support "--with-lz4"; From be6bf14e4acb3e27071a9390956470f45b5a3dcf Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 19 Jul 2021 22:48:02 +0200 Subject: [PATCH 064/561] sphinx: Disable test_inspect_main_url on Darwin --- pkgs/development/python-modules/sphinx/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index abe3035074432..ec109c68e5654 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -82,6 +83,9 @@ buildPythonPackage rec { # requires imagemagick (increases build closure size), doesn't # test anything substantial "test_ext_imgconverter" + ] ++ lib.optional stdenv.isDarwin [ + # Due to lack of network sandboxing can't guarantee port 7777 isn't bound + "test_inspect_main_url" ]; meta = with lib; { From 63686605e9b36450ba423f5d6ebdb1c12bad4960 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 20 Jul 2021 15:32:33 +0200 Subject: [PATCH 065/561] sphinx: Disable most networking tests on Darwin --- .../python-modules/sphinx/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index ec109c68e5654..685ac41ce2ff9 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -86,6 +86,24 @@ buildPythonPackage rec { ] ++ lib.optional stdenv.isDarwin [ # Due to lack of network sandboxing can't guarantee port 7777 isn't bound "test_inspect_main_url" + "test_auth_header_uses_first_match" + "test_linkcheck_request_headers" + "test_linkcheck_request_headers_no_slash" + "test_follows_redirects_on_HEAD" + "test_invalid_ssl" + "test_connect_to_selfsigned_with_tls_verify_false" + "test_connect_to_selfsigned_with_tls_cacerts" + "test_connect_to_selfsigned_with_requests_env_var" + "test_connect_to_selfsigned_nonexistent_cert_file" + "test_TooManyRedirects_on_HEAD" + "test_too_many_requests_retry_after_int_del" + "test_too_many_requests_retry_after_HTTP_date" + "test_too_many_requests_retry_after_without_header" + "test_too_many_requests_user_timeout" + "test_raises_for_invalid_status" + "test_auth_header_no_match" + "test_follows_redirects_on_GET" + "test_connect_to_selfsigned_fails" ]; meta = with lib; { From 36a953f78c070794214e5fac6d0048b2d4ed1f0d Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 20 Jul 2021 16:09:04 +0200 Subject: [PATCH 066/561] cups: Apply patch unconditionally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sandro Jäckel --- pkgs/misc/cups/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 38026adc52c11..7c23d44bfc9f9 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - patches = lib.optional stdenv.isDarwin ./0001-TargetConditionals.patch; + patches = [ ./0001-TargetConditionals.patch ]; postPatch = '' substituteInPlace cups/testfile.c \ From 99bef3183511661808859a6c4d11643d37543099 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 26 Jul 2021 16:27:38 +0200 Subject: [PATCH 067/561] Libc: stdlib uses undefined TARGET_OS_EMBEDDED --- ...Include-Targetconditionals-in-stdlib.patch | 24 +++++++++++++++++++ .../apple-source-releases/Libc/default.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Include-Targetconditionals-in-stdlib.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Include-Targetconditionals-in-stdlib.patch b/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Include-Targetconditionals-in-stdlib.patch new file mode 100644 index 0000000000000..57386ab096620 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Include-Targetconditionals-in-stdlib.patch @@ -0,0 +1,24 @@ +From 6e573a85b46dcfae323a99aa561c0dcc016a7791 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Mon, 26 Jul 2021 16:19:44 +0200 +Subject: [PATCH] Include Targetconditionals in stdlib + +--- + include/stdlib.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/stdlib.h b/include/stdlib.h +index c04d3a7..94a9812 100644 +--- a/include/stdlib.h ++++ b/include/stdlib.h +@@ -59,6 +59,7 @@ + #define _STDLIB_H_ + + #include ++#include + + #include <_types.h> + #if !defined(_ANSI_SOURCE) +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 9bec0b103c9db..dc6dd785d0385 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -3,6 +3,8 @@ appleDerivation' stdenvNoCC { nativeBuildInputs = [ ed unifdef ]; + patches = [ ./0001-Include-Targetconditionals-in-stdlib.patch ]; + # TODO: asl.h actually comes from syslog project now installPhase = '' export SRCROOT=$PWD From 5aa4c46dcd0da403f2bf25432c72aedaf5e9a202 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 27 Jul 2021 15:26:03 +0200 Subject: [PATCH 068/561] Libc: Define target instead of including Including `TargetConditionals.h` had knock-on effects, breaking the zlib build because `TARGET_OS_MAC` gets defined, for instance. Defining `TARGET_OS_EMBEDDED` to be `0` if it's not defined is simpler and maintains the default behavior so it shouldn't break any dependents. --- ...OS_EMBEDDED-in-stdlib-if-not-defined.patch | 32 +++++++++++++++++++ ...Include-Targetconditionals-in-stdlib.patch | 24 -------------- .../apple-source-releases/Libc/default.nix | 2 +- 3 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Include-Targetconditionals-in-stdlib.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch b/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch new file mode 100644 index 0000000000000..0464e15c36241 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch @@ -0,0 +1,32 @@ +From c0ab867bb7888401957539b0348902028a2be6e0 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Tue, 27 Jul 2021 15:12:14 +0200 +Subject: [PATCH] Define TARGET_OS_EMBEDDED in stdlib if not defined + +Originally attempted including `TargetConditionals.h` but this had +knock-on effects, for example, breaking the zlib build because of +`TARGET_OS_MAC` getting defined. + +This should be the lowest impact solution and corresponds to the default +behavior IIUC. +--- + include/stdlib.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/stdlib.h b/include/stdlib.h +index c04d3a7..0b454ba 100644 +--- a/include/stdlib.h ++++ b/include/stdlib.h +@@ -183,6 +183,9 @@ unsigned long long + #ifndef LIBC_ALIAS_SYSTEM + //End-Libc + ++#ifndef TARGET_OS_EMBEDDED ++# define TARGET_OS_EMBEDDED 0 ++#endif + #if TARGET_OS_EMBEDDED + #define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(ios_msg) + #else +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Include-Targetconditionals-in-stdlib.patch b/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Include-Targetconditionals-in-stdlib.patch deleted file mode 100644 index 57386ab096620..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Include-Targetconditionals-in-stdlib.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6e573a85b46dcfae323a99aa561c0dcc016a7791 Mon Sep 17 00:00:00 2001 -From: toonn -Date: Mon, 26 Jul 2021 16:19:44 +0200 -Subject: [PATCH] Include Targetconditionals in stdlib - ---- - include/stdlib.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/stdlib.h b/include/stdlib.h -index c04d3a7..94a9812 100644 ---- a/include/stdlib.h -+++ b/include/stdlib.h -@@ -59,6 +59,7 @@ - #define _STDLIB_H_ - - #include -+#include - - #include <_types.h> - #if !defined(_ANSI_SOURCE) --- -2.17.2 (Apple Git-113) - diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index dc6dd785d0385..542e0c3f4381b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -3,7 +3,7 @@ appleDerivation' stdenvNoCC { nativeBuildInputs = [ ed unifdef ]; - patches = [ ./0001-Include-Targetconditionals-in-stdlib.patch ]; + patches = [ ./0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch ]; # TODO: asl.h actually comes from syslog project now installPhase = '' From 459dc34b2b69310b0e19c03b6b2320fd4ec7dd09 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 27 Jul 2021 20:06:16 +0200 Subject: [PATCH 069/561] Libc: Define target in stdio too --- ..._OS_EMBEDDED-in-stdio-if-not-defined.patch | 26 +++++++++++++++++++ .../apple-source-releases/Libc/default.nix | 5 +++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch b/pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch new file mode 100644 index 0000000000000..880c80883bf43 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch @@ -0,0 +1,26 @@ +From 26a721ca68bb06cb815c49f4ac28bb9de8bb2cba Mon Sep 17 00:00:00 2001 +From: toonn +Date: Tue, 27 Jul 2021 20:03:40 +0200 +Subject: [PATCH 2/2] Define TARGET_OS_EMBEDDED in stdio if not defined + +--- + include/stdio.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/stdio.h b/include/stdio.h +index d0cf7a5..487496e 100644 +--- a/include/stdio.h ++++ b/include/stdio.h +@@ -351,6 +351,9 @@ __END_DECLS + /* Additional functionality provided by: + * POSIX.2-1992 C Language Binding Option + */ ++#ifndef TARGET_OS_EMBEDDED ++# define TARGET_OS_EMBEDDED 0 ++#endif + #if TARGET_OS_EMBEDDED + #define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(ios_msg) + #else +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 542e0c3f4381b..5a8498a137d68 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -3,7 +3,10 @@ appleDerivation' stdenvNoCC { nativeBuildInputs = [ ed unifdef ]; - patches = [ ./0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch ]; + patches = [ + ./0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch + ./0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch + ]; # TODO: asl.h actually comes from syslog project now installPhase = '' From 3ed6885aa8fdec8dee00bb746fc8ed9edb303d81 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 28 Jul 2021 18:27:12 +0200 Subject: [PATCH 070/561] wheel: Fix hash mismatch due to filesystem normalization One file in the testdata has a name with accented unicode characters that can be encoded differently depending on normalization. This causes Nix to calculate a different hash for the tarball output depending on whether or not and which unicode normal form the filesystem uses. This is worked around by renaming the file to consist of unicode characters that are unaffected by normalization. The file is renamed and the test patched in the `extraPostFetch` phase of the the fetcher. --- .../0001-tests-Rename-a-a-o-_-.py-_-.py.patch | 37 +++++++++++++++++++ .../python-modules/wheel/default.nix | 8 +++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch diff --git a/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch new file mode 100644 index 0000000000000..93db54b0c6e6c --- /dev/null +++ b/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch @@ -0,0 +1,37 @@ +From 5879a4bbc34d1eb25e160b15b2f5a4f10eac6bd2 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Mon, 13 Sep 2021 18:07:26 +0200 +Subject: [PATCH] =?UTF-8?q?tests:=20Rename=20a=CC=8Aa=CC=88o=CC=88=5F?= + =?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E.py=20=3D>=20=C3=A6=C9=90=C3=B8=5F?= + =?UTF-8?q?=E6=97=A5=E6=9C=AC=E5=83=B9.py?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +`åäö_日本語.py` normalizes differently in NFC and NFD normal forms. This +means a hash generated for the source directory can differ depending on +whether or not the filesystem is normalizing and which normal form it +uses. + +By renaming the file to `æɐø_日本價.py` we avoid this issue by using a +name that has the same encoding in each normal form. +--- + tests/test_bdist_wheel.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py +index 651c034..9b94ac8 100644 +--- a/tests/test_bdist_wheel.py ++++ b/tests/test_bdist_wheel.py +@@ -58,7 +58,7 @@ def test_unicode_record(wheel_paths): + with ZipFile(path) as zf: + record = zf.read('unicode.dist-0.1.dist-info/RECORD') + +- assert u'åäö_日本語.py'.encode('utf-8') in record ++ assert u'æɐø_日本價.py'.encode('utf-8') in record + + + def test_licenses_default(dummy_dist, monkeypatch, tmpdir): +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 60398998380a9..3a3b5a4fb9451 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -14,8 +14,14 @@ buildPythonPackage rec { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-8lK2UvqBIxUYm6IOuT+Jk71wYbEEjvI7typS3749N9g="; + sha256 = "13bj49psan1s1fxfrq613dm2l7jvrg2dpgb36lz81z3b1h7zig6j"; name = "${pname}-${version}-source"; + extraPostFetch = '' + cd $out + mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ + tests/testdata/unicode.dist/unicodedist/æɐø_日本價.py + patch -p1 < ${./0001-tests-Rename-a-a-o-_-.py-_-.py.patch} + ''; }; nativeBuildInputs = [ From 18ba22baba75abd245a8e167213003f60824acf0 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 3 Aug 2021 15:15:03 +0200 Subject: [PATCH 071/561] pulseaudio: Remove /usr/include impurity on Darwin --- pkgs/servers/pulseaudio/default.nix | 13 ++++--------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index a2836be7ef8cc..aecf46efe41d9 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -26,7 +26,7 @@ , # Whether to build only the library. libOnly ? false -, CoreServices, AudioUnit, Cocoa +, AudioUnit, Cocoa, CoreServices, Libc, sdk }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool libsndfile soxr speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] - ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices Libc ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" ++ lib.optionals stdenv.isDarwin [ - "--with-mac-sysroot=/" + "--with-mac-sysroot=${sdk}" "--disable-neon-opt" ] ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" @@ -102,12 +102,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # not sure what the best practices are here -- can't seem to find a way - # for the compiler to bring in stdlib and stdio (etc.) properly - # the alternative is to copy the files from /usr/include to src, but there are - # probably a large number of files that would need to be copied (I stopped - # after the seventh) - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${Libc}"; installFlags = [ "sysconfdir=${placeholder "out"}/etc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64376cc3a901f..a73b09a018bf6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21121,6 +21121,8 @@ with pkgs; }; pulseaudio = callPackage ../servers/pulseaudio ({ + inherit (darwin) Libc; + inherit (darwin.apple_sdk) sdk; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; } // lib.optionalAttrs stdenv.isDarwin { # Default autoreconfHook (2.70) fails on darwin, From 7eaf240e720d8d5e3e1379d538e56730622686f5 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 11 Aug 2021 17:47:27 +0200 Subject: [PATCH 072/561] pulseaudio: Drop Apple SDK dependency The x86_64 and aarch64 SDK attributes are named differently and don't have the same contents. This was the motivation to try dropping the SDK dependency altogether, relying only on the Libc and some frameworks. --- pkgs/servers/pulseaudio/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index aecf46efe41d9..e0beb051daa85 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation rec { ] ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" ++ lib.optionals stdenv.isDarwin [ - "--with-mac-sysroot=${sdk}" "--disable-neon-opt" ] ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" From 40b7dd7cced72910db5628a2b7b606e31edafeea Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 11 Aug 2021 17:51:36 +0200 Subject: [PATCH 073/561] pulseaudio: Stop passing sdk argument --- pkgs/servers/pulseaudio/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index e0beb051daa85..47d0384720f4d 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -26,7 +26,7 @@ , # Whether to build only the library. libOnly ? false -, AudioUnit, Cocoa, CoreServices, Libc, sdk +, AudioUnit, Cocoa, CoreServices, Libc }: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73b09a018bf6..354a51a55889a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21122,7 +21122,6 @@ with pkgs; pulseaudio = callPackage ../servers/pulseaudio ({ inherit (darwin) Libc; - inherit (darwin.apple_sdk) sdk; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; } // lib.optionalAttrs stdenv.isDarwin { # Default autoreconfHook (2.70) fails on darwin, From 35ddc19667d3e5c3d45308d464dc8fec8616426e Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 23 Sep 2021 03:05:54 -0700 Subject: [PATCH 074/561] libtiff: fix case-insensitive build --- .../development/libraries/libtiff/default.nix | 9 ++++++++- .../libraries/libtiff/rename-version.patch | 20 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libtiff/rename-version.patch diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 51c0d02def6c8..6a3abe93b1b7a 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -27,7 +27,14 @@ stdenv.mkDerivation rec { }; # FreeImage needs this patch - patches = [ ./headers.patch ]; + patches = [ + ./headers.patch + ./rename-version.patch + ]; + + postPatch = '' + mv VERSION VERSION.txt + ''; outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch new file mode 100644 index 0000000000000..30601c0f04ee2 --- /dev/null +++ b/pkgs/development/libraries/libtiff/rename-version.patch @@ -0,0 +1,20 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,7 @@ docfiles = \ + README.md \ + RELEASE-DATE \ + TODO \ +- VERSION ++ VERSION.txt + + EXTRA_DIST = \ + cmake \ +@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test man html + + release: + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) +- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) ++ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) + + pkgconfigdir = $(libdir)/pkgconfig From 8e1914d43f72ef44cc4d63f662ec4ce589a784ba Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 28 Sep 2021 14:49:39 +0200 Subject: [PATCH 075/561] sphinx: Update FOD source hash The hash has changed because of the renamed file but will no longer vary depending on whether the filesystem where it is calculated is case-sensitive or not. --- pkgs/development/python-modules/sphinx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 685ac41ce2ff9..3f797909a7076 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "1bl0k326h32dag41axbsjq1d9w59rm11naj6bfirg116nqw56mk6"; + sha256 = "129x3kljxq7sbg5cc12z3cmjsili6l3qrsxllkx97id1a85f7zmj"; extraPostFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ From 1f8566980df1ce558a1d09b282035982d281b0ea Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 11 Oct 2021 21:47:03 +0200 Subject: [PATCH 076/561] cryptography: Drop impure host deps Nix 1.11 has long come and gone. It seems this is no longer necessary. --- pkgs/development/python-modules/cryptography/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index eddd7e0b44024..d21e6d060fe1a 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -79,10 +79,6 @@ buildPythonPackage rec { py.test ${pytestFlags} tests ''; - # IOKit's dependencies are inconsistent between OSX versions, so this is the best we - # can do until nix 1.11's release - __impureHostDeps = [ "/usr/lib" ]; - meta = with lib; { description = "A package which provides cryptographic recipes and primitives"; longDescription = '' From c14efb058628b97d02895ab58b89421093d858c3 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 11 Oct 2021 21:49:29 +0200 Subject: [PATCH 077/561] cffi: Drop unnecessary libm substitutes --- pkgs/development/python-modules/cffi/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 94aecdcc4ec43..dd0cdd0615d44 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -15,18 +15,7 @@ if isPyPy then null else buildPythonPackage rec { propagatedBuildInputs = [ pycparser ]; - # On Darwin, the cffi tests want to hit libm a lot, and look for it in a global - # impure search path. It's obnoxious how much repetition there is, and how difficult - # it is to get it to search somewhere else (since we do actually have a libm symlink in libSystem) prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace testing/cffi0/test_parsing.py \ - --replace 'lib_m = "m"' 'lib_m = "System"' \ - --replace '"libm" in name' '"libSystem" in name' - substituteInPlace testing/cffi0/test_unicode_literals.py --replace 'lib_m = "m"' 'lib_m = "System"' - substituteInPlace testing/cffi0/test_zdistutils.py --replace 'self.lib_m = "m"' 'self.lib_m = "System"' - substituteInPlace testing/cffi1/test_recompiler.py --replace 'lib_m = "m"' 'lib_m = "System"' - substituteInPlace testing/cffi0/test_function.py --replace "lib_m = 'm'" "lib_m = 'System'" - substituteInPlace testing/cffi0/test_verify.py --replace "lib_m = ['m']" "lib_m = ['System']" ''; # The tests use -Werror but with python3.6 clang detects some unreachable code. From 54b5495e4e632aa5797b04509acc93baf8800580 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 11 Oct 2021 21:52:04 +0200 Subject: [PATCH 078/561] cffi: Reenable checks to reveal Darwin problem This problem can now be considered investigated. --- pkgs/development/python-modules/cffi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index dd0cdd0615d44..e5e5e90b04362 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -22,7 +22,7 @@ if isPyPy then null else buildPythonPackage rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code"; - doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate + doCheck = !stdenv.hostPlatform.isMusl; checkInputs = [ pytestCheckHook ]; From 169c34a6a7af67bf9fed7cf596af226339af79b1 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 11 Oct 2021 22:05:28 +0200 Subject: [PATCH 079/561] cffi: Include pkg-config The build was falling back on impure paths because pkg-config was missing. This caused a mismatch between headers picked up at compile-time and run-time, specifically `ffi.h` from libffi and then one in `/usr/include/ffi` on macOS. --- pkgs/development/python-modules/cffi/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index e5e5e90b04362..3092ebec23fbd 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytestCheckHook }: +{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, pytestCheckHook, + libffi, pkg-config, pycparser +}: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -13,9 +15,15 @@ if isPyPy then null else buildPythonPackage rec { buildInputs = [ libffi ]; + nativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ pycparser ]; prePatch = lib.optionalString stdenv.isDarwin '' + # Remove setup.py impurities + substituteInPlace setup.py --replace "'-iwithsysroot/usr/include/ffi'" "" + substituteInPlace setup.py --replace "'/usr/include/ffi'," "" + substituteInPlace setup.py --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; # The tests use -Werror but with python3.6 clang detects some unreachable code. From 1be74eb17dc8baaf2b8f96811f527ec82b8d994f Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 11 Oct 2021 22:07:40 +0200 Subject: [PATCH 080/561] cffi: Silence warning causing test failures --- pkgs/development/python-modules/cffi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 3092ebec23fbd..57806426d95a9 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -28,7 +28,7 @@ if isPyPy then null else buildPythonPackage rec { # The tests use -Werror but with python3.6 clang detects some unreachable code. NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang - "-Wno-unused-command-line-argument -Wno-unreachable-code"; + "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing"; doCheck = !stdenv.hostPlatform.isMusl; From cb3813b7b67842487abf8b5169537121a042d790 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 13 Oct 2021 15:52:57 +0200 Subject: [PATCH 081/561] wheel: Normalize the filename with NFC The original problem with the normalization of the filename only occurred because it was in NFC. However, when trying to fix it by `mv`ing the file to a normalization-indifferent name, I used the NFD normalized name from my file system. This means it only works on normalizing file systems. The filename must be in the original encoding and will be normalized by normalizing file systems like HFS+. --- pkgs/development/python-modules/wheel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 3a3b5a4fb9451..1b899b59897ff 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { name = "${pname}-${version}-source"; extraPostFetch = '' cd $out - mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ + mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ tests/testdata/unicode.dist/unicodedist/æɐø_日本價.py patch -p1 < ${./0001-tests-Rename-a-a-o-_-.py-_-.py.patch} ''; From 9b277c2891eb519622ec98b9565d45632d575182 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 13 Oct 2021 16:00:28 +0200 Subject: [PATCH 082/561] sphinx: Normalize the filename with NFC The original problem with the normalization of the filename only occurred because it was in NFC. However, when trying to fix it by `mv`ing the file to a normalization-indifferent name, I used the NFD normalized name from my file system. This means it only works on normalizing file systems. The filename must be in the original encoding and will be normalized by normalizing file systems like HFS+. --- pkgs/development/python-modules/sphinx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 3f797909a7076..374838df54f08 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { sha256 = "129x3kljxq7sbg5cc12z3cmjsili6l3qrsxllkx97id1a85f7zmj"; extraPostFetch = '' cd $out - mv tests/roots/test-images/testimäge.png \ + mv tests/roots/test-images/testimäge.png \ tests/roots/test-images/testimæge.png patch -p1 < ${./0001-test-images-Use-normalization-equivalent-character.patch} ''; From 33e89d4134248c59f6b4b2c94acf071ea2bf89ac Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 22 Oct 2021 18:29:23 +0200 Subject: [PATCH 083/561] release.nix: Re-enable full stdenv bootstrap test --- pkgs/top-level/release.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index fca5d37609426..db3d82fc771e5 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -175,8 +175,7 @@ let # Lightweight distribution and test inherit (bootstrap) dist test; # Test a full stdenv bootstrap from the bootstrap tools definition - # TODO re-enable with https://github.com/NixOS/nixpkgs/pull/126411 - # inherit (bootstrap.test-pkgs) stdenv; + inherit (bootstrap.test-pkgs) stdenv; }; # Cross compiled bootstrap tools From 19678c4e90baf5ef384d891298a30876ab20bc89 Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 22 Oct 2021 19:35:04 +0200 Subject: [PATCH 084/561] libtiff: Clarify patch comments --- pkgs/development/libraries/libtiff/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 6a3abe93b1b7a..2fe6159556f60 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -26,9 +26,11 @@ stdenv.mkDerivation rec { sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf"; }; - # FreeImage needs this patch patches = [ + # FreeImage needs this patch ./headers.patch + # libc++abi 11 has an `#include `, this picks up files name + # `version` in the project's include paths ./rename-version.patch ]; From e33c11a5578a7154a80dd680ef3793ded3601144 Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 22 Oct 2021 20:16:15 +0200 Subject: [PATCH 085/561] Libc: Merge TARGET_OS_EMBEDDED patches Both patches implement the same fix so they'll probably have to be removed at the same time. This avoids one of them being left behind. --- ...EMBEDDED-in-std-lib-io-if-not-defin.patch} | 21 ++++++++++++--- ..._OS_EMBEDDED-in-stdio-if-not-defined.patch | 26 ------------------- .../apple-source-releases/Libc/default.nix | 3 +-- 3 files changed, 19 insertions(+), 31 deletions(-) rename pkgs/os-specific/darwin/apple-source-releases/Libc/{0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch => 0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch} (55%) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch b/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch similarity index 55% rename from pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch rename to pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch index 0464e15c36241..2ba67734c5444 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch @@ -1,7 +1,7 @@ -From c0ab867bb7888401957539b0348902028a2be6e0 Mon Sep 17 00:00:00 2001 +From 187d0e8847d080790b22724352e51de50d214dd8 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 27 Jul 2021 15:12:14 +0200 -Subject: [PATCH] Define TARGET_OS_EMBEDDED in stdlib if not defined +Subject: [PATCH] Define TARGET_OS_EMBEDDED in std{lib,io} if not defined Originally attempted including `TargetConditionals.h` but this had knock-on effects, for example, breaking the zlib build because of @@ -10,9 +10,24 @@ knock-on effects, for example, breaking the zlib build because of This should be the lowest impact solution and corresponds to the default behavior IIUC. --- + include/stdio.h | 3 +++ include/stdlib.h | 3 +++ - 1 file changed, 3 insertions(+) + 2 files changed, 6 insertions(+) +diff --git a/include/stdio.h b/include/stdio.h +index d0cf7a5..487496e 100644 +--- a/include/stdio.h ++++ b/include/stdio.h +@@ -351,6 +351,9 @@ __END_DECLS + /* Additional functionality provided by: + * POSIX.2-1992 C Language Binding Option + */ ++#ifndef TARGET_OS_EMBEDDED ++# define TARGET_OS_EMBEDDED 0 ++#endif + #if TARGET_OS_EMBEDDED + #define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(ios_msg) + #else diff --git a/include/stdlib.h b/include/stdlib.h index c04d3a7..0b454ba 100644 --- a/include/stdlib.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch b/pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch deleted file mode 100644 index 880c80883bf43..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 26a721ca68bb06cb815c49f4ac28bb9de8bb2cba Mon Sep 17 00:00:00 2001 -From: toonn -Date: Tue, 27 Jul 2021 20:03:40 +0200 -Subject: [PATCH 2/2] Define TARGET_OS_EMBEDDED in stdio if not defined - ---- - include/stdio.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/stdio.h b/include/stdio.h -index d0cf7a5..487496e 100644 ---- a/include/stdio.h -+++ b/include/stdio.h -@@ -351,6 +351,9 @@ __END_DECLS - /* Additional functionality provided by: - * POSIX.2-1992 C Language Binding Option - */ -+#ifndef TARGET_OS_EMBEDDED -+# define TARGET_OS_EMBEDDED 0 -+#endif - #if TARGET_OS_EMBEDDED - #define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(ios_msg) - #else --- -2.17.2 (Apple Git-113) - diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 5a8498a137d68..915d3a61f8169 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -4,8 +4,7 @@ appleDerivation' stdenvNoCC { nativeBuildInputs = [ ed unifdef ]; patches = [ - ./0001-Define-TARGET_OS_EMBEDDED-in-stdlib-if-not-defined.patch - ./0002-Define-TARGET_OS_EMBEDDED-in-stdio-if-not-defined.patch + ./0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch ]; # TODO: asl.h actually comes from syslog project now From 787a8b85fb34d0a84facd7f89245b0ac9a7ed7c0 Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 22 Oct 2021 20:52:44 +0200 Subject: [PATCH 086/561] mariadb: Add comment to clarify version file renames --- pkgs/servers/sql/mariadb/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index f183a1fb12b54..7501dab6a1bb3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -47,6 +47,10 @@ common = rec { # attributes common to both builds prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt + # libc++abi 11 uses `#include `, include paths often include + # project dirs and that means files with version numbers get included as if + # they were a header. This includes files name `VERSION` on + # case-insensitive file systems. sed -i 's,/version\>,/version_full,' storage/mroonga/CMakeLists.txt mv storage/mroonga/version storage/mroonga/version_full sed -i 's,/VERSION\>,/VERSION_FULL,' cmake/mysql_version.cmake From 8edba0e2177c3fa29de034bc25c60fbc08110ab2 Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 22 Oct 2021 21:09:55 +0200 Subject: [PATCH 087/561] groonga: Switch to autoreconfHook Use `autoreconfHook` rather than manually running `aclocal`. Clarify removal of `version` file. --- pkgs/servers/search/groonga/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 34c46f5b64942..037bf96ab7b9b 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config +{ lib, stdenv, fetchurl, autoreconfHook, mecab, kytea, libedit, pkg-config , suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib -, autoconf, automake }: stdenv.mkDerivation rec { @@ -16,8 +15,8 @@ stdenv.mkDerivation rec { }; preConfigure = '' + # To avoid problems due to libc++abi 11 using `#include `. rm version - aclocal ''; buildInputs = with lib; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; - nativeBuildInputs = [ autoconf automake pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = with lib; optional zlibSupport "--with-zlib" From 24dd96ebd4d248b3d40c7b75729c387d1b40ca48 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 25 Oct 2021 20:30:23 +0200 Subject: [PATCH 088/561] cups: Only apply patch for appropriate version --- pkgs/misc/cups/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 7c23d44bfc9f9..bbada33054d37 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - patches = [ ./0001-TargetConditionals.patch ]; + patches = lib.optional (version == "2.2.6") ./0001-TargetConditionals.patch; postPatch = '' substituteInPlace cups/testfile.c \ From d964f211f678e042587ee8c759423f2995b33b51 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 15 Nov 2021 16:07:31 +0100 Subject: [PATCH 089/561] llvmPackages_11.libcxxabi: More precise libunwind inclusion --- pkgs/development/compilers/llvm/11/libcxxabi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix index 6201992512ec4..61cfe8eede926 100644 --- a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version +, enableShared ? !stdenv.hostPlatform.isStatic , standalone ? stdenv.hostPlatform.useLLVM or false , withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm -, enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation { @@ -35,6 +35,7 @@ stdenv.mkDerivation { cmakeFlags = lib.optionals standalone [ "-DLLVM_ENABLE_LIBCXX=ON" + ] ++ lib.optionals (standalone && withLibunwind) [ "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" From d90fb1c038c23cb70799726e44bd7f3a2cdbca09 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 15 Nov 2021 16:12:37 +0100 Subject: [PATCH 090/561] llvmPackages_12.libcxxabi: Align with 11 libcxxabi LLVM 11 libcxxabi has some flags to support usage in the Darwin stdenv, in particular, `standalone` and `withLibunwind`. Darwin stdenv needs the `standalone` flag because its `hostPlatform` set doesn't have `useLLVM` set to true. And it needs `withLibunwind` to explicitly disable including `libunwind` as a build input. We also prefix `install_name_tool` in case we're cross-compiling. --- pkgs/development/compilers/llvm/12/libcxxabi/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix index 16eaed20d78c4..803fe6a62fac0 100644 --- a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, llvm_meta, cmake, python3, fetch, libcxx, libunwind, llvm, version , enableShared ? !stdenv.hostPlatform.isStatic +, standalone ? stdenv.hostPlatform.useLLVM or false +, withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm }: stdenv.mkDerivation { @@ -28,9 +30,9 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake python3 ]; - buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + buildInputs = lib.optional withLibunwind libunwind; - cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = lib.optionals standalone [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ @@ -47,7 +49,7 @@ stdenv.mkDerivation { # the magic combination of necessary CMake variables # if you fancy a try, take a look at # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - install_name_tool -id $out/$file $file + ${stdenv.cc.targetPrefix}install_name_tool -id $out/$file $file done make install install -d 755 $out/include From 21df776a314b955d480bcd83dfbe0932f4aecf63 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 23 Nov 2021 19:57:33 +0100 Subject: [PATCH 091/561] llvmPackages_13.libcxxabi: Align with 11 libcxxabi LLVM 11 libcxxabi has some flags to support usage in the Darwin stdenv, in particular, `standalone` and `withLibunwind`. Darwin stdenv needs the `standalone` flag because its `hostPlatform` set doesn't have `useLLVM` set to true. And it needs `withLibunwind` to explicitly disable including `libunwind` as a build input. We also prefix `install_name_tool` in case we're cross-compiling. --- .../compilers/llvm/13/libcxxabi/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 6267678c46d55..5ae92645c9c4a 100644 --- a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version +{ lib, stdenv, llvm_meta, cmake, python3, src, libunwind, libcxx, version , enableShared ? !stdenv.hostPlatform.isStatic -, libcxx +, standalone ? stdenv.hostPlatform.useLLVM or false +, withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm }: stdenv.mkDerivation rec { @@ -23,12 +24,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake python3 ]; - buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + buildInputs = lib.optional withLibunwind libunwind; cmakeFlags = [ "-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1" - ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + ] ++ lib.optionals standalone [ "-DLLVM_ENABLE_LIBCXX=ON" + ] ++ lib.optionals (standalone && withLibunwind) [ "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" From 5d23e617ec5a66681809755f99cbcfa603684f62 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 23 Nov 2021 20:17:53 +0100 Subject: [PATCH 092/561] stdenv: Pass standalone argument for libcxxabi --- pkgs/stdenv/darwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 7578a274cb820..24ad0cb6959f3 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -469,7 +469,7 @@ rec { }; libcxxabi = libSuper.libcxxabi.override ({ stdenv = overrideCC self.stdenv self.ccNoLibcxx; - } // lib.optionalAttrs (finalLlvmVersion == "7") { + } // lib.optionalAttrs (builtins.any (v: finalLlvmVersion == v) [ 7 11 12 13 ]) { # TODO: the bootstrapping of llvm packages isn't consistent. # `standalone` may be redundant if darwin behaves like useLLVM (or # has useLLVM = true). From e157b5dc28023545ced7dc38eed7361a9bcb74ab Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 22 Nov 2021 18:19:10 +0900 Subject: [PATCH 093/561] llvmPackages_13.libcxx: fix darwin build --- .../development/compilers/llvm/13/default.nix | 13 +++++-- .../compilers/llvm/13/libcxx/default.nix | 37 ++++++++++++++----- .../compilers/llvm/13/libcxxabi/default.nix | 4 +- pkgs/top-level/all-packages.nix | 2 + 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 13be739671438..b7a1f65335793 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -247,11 +247,18 @@ let else stdenv; }; - libcxxabi = callPackage ./libcxxabi { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false + libcxxabi = let + stdenv_ = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoLibcxx else stdenv; + cxx-headers = callPackage ./libcxx { + inherit llvm_meta; + stdenv = stdenv_; + isCxxHeaders = true; + }; + in callPackage ./libcxxabi { + stdenv = stdenv_; + inherit llvm_meta cxx-headers; }; libunwind = callPackage ./libunwind { diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index c60039274deb9..65fe550f43fa1 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -1,15 +1,23 @@ { lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version +, libcxxabi , enableShared ? !stdenv.hostPlatform.isStatic + +# If isCxxHeaders is true, the resulting package would only include the headers. +# Use this to break the circular dependency between libcxx and libcxxabi. +# +# Some context: +# https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb +, isCxxHeaders ? false }: stdenv.mkDerivation rec { - pname = "libcxx"; + pname = if isCxxHeaders then "cxx-headers" else "libcxx"; inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "source/libcxx"; - outputs = [ "out" "dev" ]; + outputs = [ "out" ] ++ lib.optional (!isCxxHeaders) "dev"; patches = [ ./gnu-install-dirs.patch @@ -24,15 +32,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = [ - ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + buildInputs = lib.optional (!isCxxHeaders) [ libcxxabi ]; + + cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] + ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ lib.optional stdenv.hostPlatform.isWasm [ + ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + buildFlags = lib.optional isCxxHeaders "generate-cxx-headers"; + installTargets = lib.optional isCxxHeaders "install-cxx-headers"; + + # At this point, cxxabi headers would be installed in the dev output, which + # prevents moveToOutput from doing its job later in the build process. + postInstall = lib.optionalString (!isCxxHeaders) '' + mv "$dev/include/c++/v1/"* "$out/include/c++/v1/" + pushd "$dev" + rmdir -p include/c++/v1 + popd + ''; + passthru = { isLLVM = true; }; @@ -45,9 +67,6 @@ stdenv.mkDerivation rec { C++14 and above. ''; - # https://github.com/NixOS/nixpkgs/pull/133217#issuecomment-895742807 - broken = stdenv.isDarwin; - # "All of the code in libc++ is dual licensed under the MIT license and the # UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 5ae92645c9c4a..0bdbee07b738b 100644 --- a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, cmake, python3, src, libunwind, libcxx, version +{ lib, stdenv, llvm_meta, cmake, python3, src, cxx-headers, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic , standalone ? stdenv.hostPlatform.useLLVM or false , withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withLibunwind libunwind; cmakeFlags = [ - "-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1" + "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1" ] ++ lib.optionals standalone [ "-DLLVM_ENABLE_LIBCXX=ON" ] ++ lib.optionals (standalone && withLibunwind) [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d9cf52415c91..e9cbe8434ce78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12578,6 +12578,8 @@ with pkgs; targetLlvmLibraries = targetPackages.llvmPackages_13.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + stdenv = llvmPackages_11.stdenv; })); llvmPackages_latest = llvmPackages_13; From d8338cbe068d0150bb650a3ff099a44613560fa1 Mon Sep 17 00:00:00 2001 From: midchildan Date: Thu, 25 Nov 2021 20:20:49 +0900 Subject: [PATCH 094/561] fixup! llvmPackages_13.libcxx: fix darwin build Co-authored-by: Sandro --- pkgs/development/compilers/llvm/13/libcxx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index 65fe550f43fa1..87a7c86ca1c83 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optional (!isCxxHeaders) [ libcxxabi ]; + buildInputs = lib.optionals (!isCxxHeaders) [ libcxxabi ]; cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" From 455f69804d886c8fcb12a4df3d07646a7203c6c0 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 25 Nov 2021 14:25:10 +0100 Subject: [PATCH 095/561] libexif: 0.6.23 -> 0.6.24 --- pkgs/development/libraries/libexif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 1c650ad60de0d..0ab1f8fa984ab 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libexif"; - version = "0.6.23"; + version = "0.6.24"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release"; - sha256 = "sha256-Os0yI/IPoe9MuhXgNdDaIg6uohclA2bjeu9t3tbUoNA="; + sha256 = "sha256-Eqgnm31s8iPJdhTpk5HM89HSZTXTK+e7YZ/CCdbeJX4="; }; nativeBuildInputs = [ autoreconfHook gettext ]; From 4c60ee3da1e3a9c2441ebeb1c755049555624924 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Thu, 25 Nov 2021 09:29:37 -0800 Subject: [PATCH 096/561] nodejs: switch from 14.x to 16.x to keep up with the lts release (#142915) * nodejs: switch from 14.x to 16.x to keep up with the lts release See: https://nodejs.org/en/about/releases/ * nodePackages: stick to nodejs-14_x while node2nix is broken on 16.x --- pkgs/top-level/all-packages.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0edd1c6f90ec..aa3397e3f6ff9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7117,9 +7117,9 @@ with pkgs; nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; - nodejs = hiPrio nodejs-14_x; + nodejs = hiPrio nodejs-16_x; - nodejs-slim = nodejs-slim-14_x; + nodejs-slim = nodejs-slim-16_x; nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { @@ -7152,7 +7152,10 @@ with pkgs; nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs; - nodePackages = dontRecurseIntoAttrs nodejs.pkgs; + nodePackages = (dontRecurseIntoAttrs nodejs.pkgs).override { + # It does not work on 16.x: https://github.com/NixOS/nixpkgs/issues/132456 + nodejs = nodejs-14_x; + }; np2kai = callPackage ../misc/emulators/np2kai { }; From 7994b1dfc0a5431cbb4c052c740db8992045af8c Mon Sep 17 00:00:00 2001 From: midchildan Date: Fri, 26 Nov 2021 02:36:39 +0900 Subject: [PATCH 097/561] fixup! llvmPackages_13.libcxx: fix darwin build --- pkgs/development/compilers/llvm/13/default.nix | 2 +- .../compilers/llvm/13/libcxx/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index b7a1f65335793..d1c950c4aeb30 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -254,7 +254,7 @@ let cxx-headers = callPackage ./libcxx { inherit llvm_meta; stdenv = stdenv_; - isCxxHeaders = true; + headersOnly = true; }; in callPackage ./libcxxabi { stdenv = stdenv_; diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index 87a7c86ca1c83..0ce73ed97af6c 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -2,22 +2,22 @@ , libcxxabi , enableShared ? !stdenv.hostPlatform.isStatic -# If isCxxHeaders is true, the resulting package would only include the headers. +# If headersOnly is true, the resulting package would only include the headers. # Use this to break the circular dependency between libcxx and libcxxabi. # # Some context: # https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb -, isCxxHeaders ? false +, headersOnly ? false }: stdenv.mkDerivation rec { - pname = if isCxxHeaders then "cxx-headers" else "libcxx"; + pname = if headersOnly then "cxx-headers" else "libcxx"; inherit version; inherit src; sourceRoot = "source/libcxx"; - outputs = [ "out" ] ++ lib.optional (!isCxxHeaders) "dev"; + outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; patches = [ ./gnu-install-dirs.patch @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!isCxxHeaders) [ libcxxabi ]; + buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" @@ -43,12 +43,12 @@ stdenv.mkDerivation rec { "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; - buildFlags = lib.optional isCxxHeaders "generate-cxx-headers"; - installTargets = lib.optional isCxxHeaders "install-cxx-headers"; + buildFlags = lib.optional headersOnly "generate-cxx-headers"; + installTargets = lib.optional headersOnly "install-cxx-headers"; # At this point, cxxabi headers would be installed in the dev output, which # prevents moveToOutput from doing its job later in the build process. - postInstall = lib.optionalString (!isCxxHeaders) '' + postInstall = lib.optionalString (!headersOnly) '' mv "$dev/include/c++/v1/"* "$out/include/c++/v1/" pushd "$dev" rmdir -p include/c++/v1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9cbe8434ce78..6d9cf52415c91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12578,8 +12578,6 @@ with pkgs; targetLlvmLibraries = targetPackages.llvmPackages_13.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; - } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - stdenv = llvmPackages_11.stdenv; })); llvmPackages_latest = llvmPackages_13; From 756109b58d34b6a602d06dbf318bcff547ef5dc7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 11 Nov 2021 16:56:28 +0000 Subject: [PATCH 098/561] pkgsStatic.libselinux: fix build --- pkgs/os-specific/linux/libselinux/default.nix | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 1e0a294516297..fd697fed77638 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, pcre, pkg-config, libsepol -, enablePython ? true, swig ? null, python3 ? null +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, pcre, pkg-config, libsepol +, enablePython ? !stdenv.hostPlatform.isStatic, swig ? null, python3 ? null , fts }: @@ -19,7 +19,28 @@ stdenv.mkDerivation rec { sha256 = "0mvh793g7fg6wb6zqhkdyrv80x6k84ypqwi8ii89c91xcckyxzdc"; }; - nativeBuildInputs = [ pkg-config ] ++ optionals enablePython [ swig python3 ]; + patches = [ + # Make it possible to disable shared builds (for pkgsStatic). + # + # We can't use fetchpatch because it processes includes/excludes + # /after/ stripping the prefix, which wouldn't work here because + # there would be no way to distinguish between + # e.g. libselinux/src/Makefile and libsepol/src/Makefile. + # + # This is a static email, so we shouldn't have to worry about + # normalizing the patch. + (fetchurl { + url = "https://lore.kernel.org/selinux/20211113141616.361640-1-hi@alyssa.is/raw"; + sha256 = "16a2s2ji9049892i15yyqgp4r20hi1hij4c1s4s8law9jsx65b3n"; + postFetch = '' + mv "$out" $TMPDIR/patch + ${buildPackages.patchutils_0_3_3}/bin/filterdiff \ + -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out" + ''; + }) + ]; + + nativeBuildInputs = [ pkg-config python3 ] ++ optionals enablePython [ swig ]; buildInputs = [ libsepol pcre fts ] ++ optionals enablePython [ python3 ]; # drop fortify here since package uses it by default, leading to compile error: @@ -40,6 +61,8 @@ stdenv.mkDerivation rec { "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" "ARCH=${stdenv.hostPlatform.linuxArch}" + ] ++ optionals stdenv.hostPlatform.isStatic [ + "DISABLE_SHARED=y" ] ++ optionals enablePython [ "PYTHON=${python3.pythonForBuild.interpreter}" "PYTHONLIBDIR=$(py)/${python3.sitePackages}" From 35853737b7ed01814885e5254982e7018a8d00a2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 25 Nov 2021 23:35:34 +0100 Subject: [PATCH 099/561] libdrm: 2.4.108 -> 2.4.109 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ae442e69836a9..731039e26a08b 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.108"; + version = "2.4.109"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "186nwf7qnzh805iz8k3djq3pd1m79mgfnjsbw7yn6rskpj699mx1"; + sha256 = "09kzrdsd14zr0i3izvi5mck4vqccl3c9hr84r9i4is0zikh554v2"; }; outputs = [ "out" "dev" "bin" ]; From 1f0ef842ca88a57613faf1ef4cd9a5d4e77efd81 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Fri, 26 Nov 2021 00:00:24 +0100 Subject: [PATCH 100/561] util-linux: fix static build --- pkgs/os-specific/linux/util-linux/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 0818d7bde794e..b3536e038f0bb 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,8 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, zlib, shadow, libcap_ng , ncurses ? null, pam, systemd ? null , nlsSupport ? true +, audit ? null }: +assert stdenv.hostPlatform.isStatic -> audit != null; + stdenv.mkDerivation rec { pname = "util-linux"; version = "2.37.2"; @@ -57,7 +60,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib pam libcap_ng ] - ++ lib.filter (p: p != null) [ ncurses systemd ]; + ++ lib.filter (p: p != null) [ ncurses systemd ] + # not sure how util-linux is linking with linux-pam, + # probably just with a simplistic -lpam. + # linux-pam doesn't seem to have a .pc file so I can't + # add -laudit to the Requires.private. + # libaudit is also needed directly anyway cf login-utils/login.c + # and sys-utils/hwclock.c, not sure how we got it working + # without audit on dynamic builds. + ++ lib.optionals stdenv.hostPlatform.isStatic [ audit ]; + + NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isStatic "-laudit"; doCheck = false; # "For development purpose only. Don't execute on production system!" From 53e928ed5f1c2c07b17d0bf18179754ecd920e49 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 24 Nov 2021 14:42:49 +0000 Subject: [PATCH 101/561] gdb: pull upstream fix for gcc-12 Without the change the build fails as: sim/cr16/interp.c: In function 'lookup_hash': sim/cr16/interp.c:89:25: error: the comparison will always evaluate as 'true' for the address of 'mnimonic' will never be NULL [-Werror=address] 89 | if ((h->ops->mnimonic != NULL) && | ^~ --- pkgs/development/tools/misc/gdb/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 62290548ec7bc..c173b96f6eb06 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, targetPackages # Build time -, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight @@ -41,6 +41,13 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch + + # Pull upstream fix for gcc-12. Will be included in gdb-12. + (fetchpatch { + name = "gcc-12.patch"; + url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=e97436b1b789dcdb6ffb502263f4c86f8bc22996"; + sha256 = "1mpgw6s9qgnwhwyg3hagc6vhqhvia0l1s8nr22bcahwqxi3wvzcw"; + }) ] ++ lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch ]; From 9a57309c8283799160dc37134517d63bfb99fd45 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Sat, 21 Aug 2021 15:09:30 +0200 Subject: [PATCH 102/561] dbus: use autoreconfHook and fix static build --- pkgs/development/libraries/dbus/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 22798fb1d8455..a3c5bbbf70be6 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch , fetchurl , pkg-config , expat @@ -15,6 +16,8 @@ , docbook_xml_dtd_44 , docbook-xsl-nons , xmlto +, autoreconfHook +, autoconf-archive }: stdenv.mkDerivation rec { @@ -32,15 +35,23 @@ stdenv.mkDerivation rec { # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189, # expected in version 1.14 ./docs-reproducible-ids.patch + # AC_PATH_XTRA doesn't seem to find X11 libs even though libX11 seems + # to provide valid pkg-config files. This replace AC_PATH_XTRA with + # PKG_CHECK_MODULES. + # MR merged cf https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/212/diffs?commit_id=23880a181e82ee7f + (fetchpatch { + url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/6bfaea0707ba1a7788c4b6d30c18fb094f3a1dd4.patch"; + sha256 = "1d8ay55n2ksw5faqx3hsdpfni3xl3gq9hnjl65073xcfnx67x8d2"; + }) ] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch); postPatch = '' - substituteInPlace tools/Makefile.in \ - --replace 'install-localstatelibDATA:' 'disabled:' \ + substituteInPlace bus/Makefile.am \ + --replace 'install-data-hook:' 'disabled:' \ + --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':' + substituteInPlace tools/Makefile.am \ --replace 'install-data-local:' 'disabled:' \ --replace 'installcheck-local:' 'disabled:' - substituteInPlace bus/Makefile.in \ - --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':' '' + /* cleanup of runtime references */ '' substituteInPlace ./dbus/dbus-sysdeps-unix.c \ --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\"" @@ -51,6 +62,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" "doc" "man" ]; nativeBuildInputs = [ + autoreconfHook + autoconf-archive pkg-config docbook_xml_dtd_44 docbook-xsl-nons From 5abb1856ce2276d975f24586d8b3895b0eaf02df Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 24 Nov 2021 22:57:25 +0100 Subject: [PATCH 103/561] haskell-modules/lib: make postFixup more resilient MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Putting the string on one line (instead of using a multiline string) means it is not ended with \n, which means if somebody wants to append more lines, they have to start it with \n or it will get concatenated to the `postFixup` here, so add \n. 2. Previously, ignoring `drv.postFixup` would throw away any `postFixup`s set in `drv`, which is not something we want. The extra empty line is a cute trick to prevent concatenating the code with any previous `postFixup` that doesn’t end in \n. --- pkgs/development/haskell-modules/lib/compose.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index d84c804272dbe..065dc2dcad86b 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -285,7 +285,11 @@ rec { enableLibraryProfiling = false; isLibrary = false; doHaddock = false; - postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + postFixup = drv.postFixup or "" + '' + + # Remove every directory which could have links to other store paths. + rm -rf $out/lib $out/nix-support $out/share/doc + ''; }); /* Build a source distribution tarball instead of using the source files From 24d1fc7c739c82c3bb65c22499bac7677e0bdd21 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 28 Nov 2021 00:58:53 +0900 Subject: [PATCH 104/561] llvmPackages_git.libcxx: fix darwin build --- .../compilers/llvm/git/default.nix | 13 +++++-- .../compilers/llvm/git/libcxx/default.nix | 34 +++++++++++++++---- .../compilers/llvm/git/libcxxabi/default.nix | 5 ++- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index fb2baf0e29a31..666e9be3cd89e 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -247,11 +247,18 @@ let else stdenv; }; - libcxxabi = callPackage ./libcxxabi { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false + libcxxabi = let + stdenv_ = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoLibcxx else stdenv; + cxx-headers = callPackage ./libcxx { + inherit llvm_meta; + stdenv = stdenv_; + headersOnly = true; + }; + in callPackage ./libcxxabi { + stdenv = stdenv_; + inherit llvm_meta cxx-headers; }; libunwind = callPackage ./libunwind { diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index f511eba81dc50..0ddf28909b8e8 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,15 +1,23 @@ { lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version +, libcxxabi , enableShared ? !stdenv.hostPlatform.isStatic + +# If headersOnly is true, the resulting package would only include the headers. +# Use this to break the circular dependency between libcxx and libcxxabi. +# +# Some context: +# https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb +, headersOnly ? false }: stdenv.mkDerivation rec { - pname = "libcxx"; + pname = if headersOnly then "cxx-headers" else "libcxx"; inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "source/libcxx"; - outputs = [ "out" "dev" ]; + outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; patches = [ ./gnu-install-dirs.patch @@ -24,15 +32,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = [ - ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; + + cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] + ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ lib.optional stdenv.hostPlatform.isWasm [ + ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + buildFlags = lib.optional headersOnly "generate-cxx-headers"; + installTargets = lib.optional headersOnly "install-cxx-headers"; + + # At this point, cxxabi headers would be installed in the dev output, which + # prevents moveToOutput from doing its job later in the build process. + postInstall = lib.optionalString (!headersOnly) '' + mv "$dev/include/c++/v1/"* "$out/include/c++/v1/" + pushd "$dev" + rmdir -p include/c++/v1 + popd + ''; + passthru = { isLLVM = true; }; diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 6267678c46d55..9f14f87a7a024 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -1,6 +1,5 @@ -{ lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version +{ lib, stdenv, llvm_meta, cmake, python3, src, cxx-headers, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic -, libcxx }: stdenv.mkDerivation rec { @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; cmakeFlags = [ - "-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1" + "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1" ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" From 50a148ddf42d937eb7785b4729ae8a872ec477c2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 28 Nov 2021 02:48:51 +0000 Subject: [PATCH 105/561] audit: pull upstream fix for linux-headers-5.15 (#144077) Co-authored-by: Sandro --- pkgs/os-specific/linux/audit/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index a7f17e4495054..9fd24eea6d9b4 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, buildPackages, fetchurl, fetchpatch, runCommand, + autoreconfHook, autoconf, automake, libtool, enablePython ? false, python ? null, }: @@ -19,8 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isMusl - [ autoconf automake libtool ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optional enablePython python; configureFlags = [ @@ -44,8 +44,7 @@ stdenv.mkDerivation rec { url = "https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f.patch"; sha256 = "100xa1rzkv0mvhjbfgpfm72f7c4p68syflvgc3xm6pxgrqqmfq8h"; }) - ] - ++ lib.optional stdenv.hostPlatform.isMusl [ + ( let patch = fetchpatch { url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch"; @@ -60,6 +59,14 @@ stdenv.mkDerivation rec { '-* Copyright (c) 2007-09,2011-16 Red Hat Inc., Durham, North Carolina.' '' ) + + # upstream fix for linux-headers-5.15 which removed ipx.h + (fetchpatch { + name = "no-ipx.patch"; + url = "https://github.com/linux-audit/audit-userspace/commit/6b09724c69d91668418ddb3af00da6db6755208c.patch"; + sha256 = "0qjq41ridyamajz9v9nyplgq7f8nn3fxw375s9sa5a0igsrx9pm0"; + excludes = [ "ChangeLog" ]; + }) ]; prePatch = '' From 391a967b6435ce269fe85511819b6af87b934217 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 28 Nov 2021 07:32:05 +0000 Subject: [PATCH 106/561] linuxHeaders: 5.14 -> 5.15.5 --- 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 27428b37284d3..3c7e899cba71a 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.14"; in + linuxHeaders = let version = "5.15.5"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "sha256-fgaLXg0mpisQ5TILJdzldYjLvG94HAkEQhOMnJwycbI="; + sha256 = "sha256-6VZaMBUlrIHBQs64MvkFPdVoXhB9vPdT0N5MWLyYhR8="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms From 98ab93d1915b9fa27fa0854772a2b9c07d155c4a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 28 Nov 2021 08:17:25 +0000 Subject: [PATCH 107/561] glibc: 2.33-56 -> 2.33-59 --- .../libraries/glibc/2.33-master.patch.gz | Bin 63411 -> 65714 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 3dc7774cf8416bfcb829fd28dc4c554295c1bdf8..50f74b15822e9b9fa94b55c722e059a5d650f168 100644 GIT binary patch delta 4288 zcmV;x5I^s;?*p=d1h5_Of9+jsbK5o+{cO+v2-cl8a%?FC_;#9|@!Cr3UB}5-PTOso z(SjssE0Ha&C_mEa{`b8PfFdQ@R-1lI;;}5^K@zwC?!CA;r&g|B=XRSMuZZxH^uoxH z5iBbaGL(YS=_i>eiZu=f2ai_@xe@e;zQn+ z?}rqT|1dE2ljl60*j$67U-}GS^a)R);+nCGqyyNwm_~{|`Z$a_L5d5XVpKderlWI= z3AoZI5US!8YILNTqaPB5=Iik2SXCxM8)C=S9f%)Ja`CR8zcv~q=1!f6=gkuZ>+0z8l?{5|2WtfK=janVnhJ8uq-hOdrZla4z$ z>N`LDbg*CFdHe@%Hlkj_3C=AopjUH7)3VE7Eq;Ywu(ZZPf23pI^^lJ#j{U-OqcoIJ z0WTa0KME4z<+)7YztQKnN_sFnC`tDl;)4$DGs42$KYr;j569Nx4l)2;4valdC$aD} z#xuft6b7*BMFOlqU&th?-{Bcou?O7 zQ(NWZE(SEvUVh!vvzllrdqw1HXmu~>^+XU9Zki{FZujrBRMPb7v}B-7-f&lV&JKTo z=8V&Z^OX&adUN{v03#%Zhy8nZgPNXV+aJ-L9 zL<^N2rJ=b$S>Nn7K^==|b*IwKhKIaPFX$G>y_plj!) z`6Bs~sw@$~jP5XoPoqI$B4xU|nyM|M8Z|G%f9EtCU5+MH2_n$2KdIIXi%#Uea(@5a zY3gV>FGJ?(2xdtj9YYf9|JV-m|Mg=BIuh+!t=|)>$fLojue|a_omSnZR2Lg`)4m-pS~J!jt$}3 ze^>^>tPPR)nxILqFR^!OGuz?I<1;+G;C%O;BjVkq)E|F79Sq+b_GOhNScu}^a>9i?8BRPY9)W!KRx)t`MqA*@!`?njq~ez zzHaJLvTSJKXb9D#c`YzklIC6*`+3^yf4N|;c?!fVUC-;iTIa*A@74Uw8%Bh4k}1ux z?Vde_9(uaOJ$H#l@g;J~)Ye+mGA|LszjuN0piiBX2`W8je||B>O8&~l80-6M7GtdG z4=%<~gj({XuBPD8P*B>CSoG-v|3I-HaB%kewC}v!Kj6c!$47%R2YU<`c0}1|e~LA| zOnB~57%|~OndI;B#gD6}~ zKP|(VZ|o+K2xMzU9M;u8UnIWg`jx^Sf(&Ja@I1Fr1rkh%NWv|HxbS3@rP52|M5l$Q z6!wR)RO{d&w6B1>lY27R6VVEMe=zZlo-(DSgGc4qenVcQ9(}d6qHa?2bXnNdG1_eanugG zn728y$E_@mGh$AC8X}K(4dz(Y%n%eZFqUxQh@+5a4s?yvq3Vk66lRATe`sSmO^NPi z1MlD2-r8PlAK_6(O}IA75GXp6j10Ei$**UOwW849U9rA9_cFihyG+wz_ueWk)%N1# z3#(5%)dTDkGLS_`Rx{ezQBDqnoi>mbCp~$4fl%d;!V(=-Rb7{AO1?g0g5w00YK<2t zXa$n!X(8L37TdFL``Ta4{t6r7c?@-X*_iS}_)-q?O#$`JJ z9g_|S5|Jlqob;6>mW1^MVs|qU18(;9Pn}LzZtqs!1jGO7n36*RCYvpb{0pkAw~~z+ zGRsBIP4lwsp=jP2!Kw{oOQRAKpR;QU-OgxljQ2C}B<@Vq zQ8kX&v#Nv^I)kAtb(|zBOM^J`3NUyIi znezNVgYA?iVc-W*=C=~)nQ{#RJ#&plZA=O$e|*lM{me15@u!B%<3pvp@#rYosb#5T zqirVV)C1vs>_ zzEd~}^P5&dfjTc_Qsj|@wLzvbjr=UmV=tCch9b;$km@kc;y=Z$je+ndlN;LK3HGGe z^QuUAVb?l#{~)yoZAhmxb(InME~-|gZ3)^3=K~;}59b$kfBKIP7d1q!Ljt3$ZId&t zGbmM)68haBpD=VLZ;y+R4w0Y*i(~qd8WTwpS;hOn_rh=s+LcBW%<{S@M%l=01%qrD zeRU2!t>6vr?f$ zFPB*sKj_#2nTDS(`V)lL8!Vf!OUc%`6QE>f2~ws6abCn(o(lf~Q+c_X7Grri3rF#D z5I;{|{gboPe|KK>U%}51jX6Sa``R&j#2Ivq1G34fdNXW5GvV$TNfAYcp>9_#KH1`E3Vx#0aB2_pl3?(N8> zWZRLEe~3LDf)?HD!8D^_mPv$qpd**7Y3a!2EYy+2d18rr|`3OM{>3IcO<8` zcBF4R(%f>9_>P`|`2*XNgEA(ICBe@Uk!k4(H`JLFe~BAtk-1=3r#f>z=_!?Ez7GEiiNR-gmS*-+lRxU&F|A4lWyTF0>0)2v(>yD11#k>-9D1S)dlBo1Pk z?P ze}_TrLo_4r zc#wMse$&|}?)hvIo9PzfBxQZ$_e?wq2 zt9+z)5bUTHY(XAtd}ykhAr=r=k6QpAZCGMBhC$sPQeFz{Fp92uq^dxBW^?NO`6fFE z=gap+0MN6uQzlHNIvBWsWBtlGzS9_OK7+zgX;4KHBr*>Ju#D2ki$zhmMG>b-n#iKa ze4&F-7OAT~%cz#V*>6 zQ#lUZsOD5Q-dZkCL2)p}U=NVpYNk;3my!Lvhi(cAgPbXj;pKyH^*fop6!Q?o+ty*X znH3NMeKUk;)rciL+KRpa?dh~c4HLacG$W;mcZ*B~>;horksiFXZeD}je~0xqL!XJp zf#L1FOldF4v$Rms_hjl7pz+E$4*Wb;Sr8R&u0i4x@snWw7Pe^Zf?UZB%BY0hGlohL5(lTN`9OtWWTnwwjH>Ge5dvzb`> z+%7WE&xTKe0*v0tD00L1AUtF8kXddFb_0_z;fg#letuiT_uo4MgE50|rzutoMB7N$ zvvE#-!wLG7W}x?Q@cMb4I^C(MBu?aeXF9pnvuU>Hl-Uj9wHS48f59KxBF z(t_*HJ04%oD;S7~erRMv(Xu@rF-0l4t|~d*bpE#K{8(v4p0~`~gcA6y8YQI4la}0i z-5MhTdRqIw^1&GKA{BwStFYOH?d46td21RO-O#@=Sl!gwaA9x;s*SNp-%R=ETu~GanvxGIXc=D0et3 z-HpsBxq|N#I`~~yzTox^AT^&{jxv~|c&B!#vj5uqP<_J!O`2WDC7_wEw7Wudd3cNQ zXKmTVuJiKkS^wwZo71Bo_s{z9w2W;YFu1vij%aO9yU8`Tf3e~?6WOL>>Sa8zQ%o9e zZd1vifA*^X3RY)~f#xzpn5;Qy^4mo(SZJ$E&{PrNP7+CDBG9koqLeY(BN zXlYkAk=!A-Ro=<%)naSSd2?6+A$26xfYqv$7(6GK8MAbRskOv2+cP?6f?g6E*-h*P zmT`p)fLn|Tf4q7!XR`^aV8#w)szC9$)$N`zJBQSL0QV$WG!!ol16_E2((B2*Nc<>E z-Mrlcwo*mY`?ZqHz!e0Hfgd$U{2hkG&#qvNQ6-oTgf~CG>&|DNaB*6s&R`yd9+)o> z;X(XyZmfMrvFMt4s=7R#cW+?g{3sgV7-yan?iPQ`f4c?By?Ko;&Ujs;t^7(Hbjam@!FKEt6eDwLL%Avx-ZbM=>>o;tp?`I=0@<;OP6egHyqRW5|WJ+x#po zE|r$lnmeWe_U=60+~JZ4vTj+gvhk$6p6LqrdUTGKIvJn%!q3e`m@dW!^L?Qu)Lb*> zD!mLTC;NkcA+9%HHc;iyS6$MTdjV_%P~2egHaD%onH#ocXHkiiPd+(PJK{qXPhg?r(1Z delta 1967 zcmV;g2T=I3fdsSf1F#+Nf300vQyV!DeuiH$@k?SL&PbY*BwOV*X5%UcD4XnVC7beU zF6=D~l!qj+mHqGAhh|1TIC4N0gFQM%qn6a&Qh%S7&n~mQNsiYD?%}OET+=5Ge)mvP$h-q*It%8j)?Ubw6r>NPMu+f43auUGe>pBJwu_ zV?TY#(@B+TJb2${0Ha%sLd7*>4@n2GbMYQ2`sm{@>I5k+9L1=4YD{KlcqZT?M}g2a zuh3FQnmPJDQCMyckB&#n+K*L6dzg&9zBQS=8}}!8${#neM{KZYgDU!oyj4T>_JtjLpd zBrz(l&u5Iq*qJ5sb>HhT%vC-HBnod|xNGa^Sj8^-2{Y%UH<-K~9FvYa9`v0zfAqTc z&f~AR*@$`x-*CRr0(x=HXj;|sXPsZ629}kv5ayBRD&%8|egVC<W1nPR=GV4zGWygh7lm;+pZ1aIXRw% z9p|jJkaqYu#i5Y78$f?#uBYQ7P29j$kt?-VL}?yse+`;s;rf1lm*<$?Rd)Uy4>ZtT zzU}E*zgbcCiqOm9tt-FN5x!rzNfyWXX8+EHLYBQc8xqhaZ?Gqnv&$FIoN?N4o>WJp zPDaN)JRvbT==X*c6K!r7MhAFn9b`_x!Y3dJ6C_0{QMn*Ekve;C*hMCyMkQI#^g)V` zAL5VOf4kq7Nl~U+n}MfCpugn@-*#Tt3~sHw)E5eYE&tVvbc+9!*RX`*Kl4)KDkqSV9c+npwBn_H{%O^cUGDYlCM-`i3ny? z!#P}y28A~%(Z$7;ZW+~R`AfK7rL+0$k_tfte;W2DS+Ak#MD8o+>sM!Ew?0y0r}xQH zr8>wgPL=CNZq(`IUaoQlR;m9;iJd+qv8+-^CMOi6P(V`+O4Q_FIH}w9W=r5ps1BE( zXXPd1ME!#JNOl&UUwX&yj!qpZws-HmM_aT@l?}V6hsUG0V@|Op-0Ca?Vb%snd`-}# zf1l>qJJ!s0a5y~0;05Q^D@R0oD|dhYb2Ofu9Q0+KBwkH&bac|K?n;h9*s$7E3B+mw zTqdiV63YJXrQJ48ICzVJ2VH3SGb`u&?x^?1`Dzz7JQ$2moWCCD>!vOx%Z3(?C82sS zZ3WB~Cz%Q&FH1Td7tA%KLCliJdA--mf4txIy`G+V!-#NBGNn1byB9mqLpv+nb8|F` z=g28zt+l9S&Jn}EGsW|uJI>K1Dm|y)zZhd7KXWn0@_x=@j3s^JVhma6O&-~53WkP) z(uTyMI}QGUWF4!b=LejN_Rrw;ZQF6@Z1u`JfqnEtqXq^e_)f|tPvf9a@v zwdXHQDyxIG`jLSYAZ(k`HNzKveCf$3+L(^UaQzUj7x`h(Og|fjGgs`!q44F#ggC70 zA5X-da=lt%4?u>}LMY`Hx|hLtdl~e|@ZIMcvr)bXBnLX{E z!Vg5K3NLY4!~F)vR7`Js?z&eCM|vnmT=;T!hmNEbd6I`bxn5)v%_b2#}rM8?q&n;|E%3=H`_-Tf6AB>u8lSX ziq2(923zK2pB9X@qS4=7v%WibGQa0HX->iJopoBOb`$x+>eFuh09`@`st}U(f;M)v zlfhu84WuU0leZTLRSqdE(NR^GHP=_<>oX=ePEbjn;}>*j1#Z#PLb9eMR`}c#5+TOX z=9AdnVJD1?`RTeg;M^P}Mes^4&vI-&20429dZir;h4z{5Y#hf8-)hVQ9-diesH7 zew3;L4BtdaSG$n{+d6ZzqFA-63~3EMl1-q;pN*EF6EMrP^86fZrz8%1&ks{?BY~dD zw?v?4zN1kak;2KB9~rbiIA*rKYq&f-RGx1=I7)V{B(-d88ckMfO>87>i6#FK4J>wj zjhlxdF!~mEAqj{PCH_(zHSP;vV`CXsYgX8R;57v}yyg5x<0Q;2{U4Bu376!90|2WT BzH0yg diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 57c2e259e0663..6fa46d6d6c10e 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.33"; - patchSuffix = "-56"; + patchSuffix = "-59"; 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-56-g6090cf1330 + glibc-2.33-59-gf9592d65f2 $ 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 2372b2861eada61ae1ae5138c574fe68592d6a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 28 Nov 2021 12:42:12 +0100 Subject: [PATCH 108/561] iana-etc: 20210225 -> 20211124 --- pkgs/data/misc/iana-etc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 29ebac848d855..5e7e70a1b05d5 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip, stdenvNoCC, writeText }: let - version = "20210225"; + version = "20211124"; in stdenvNoCC.mkDerivation { name = "iana-etc-${version}"; src = fetchzip { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "sha256:1bbbnj2ya0apyyhnw37521yl1hrz3zy3l8dw6sacmir0y6pmx9gi"; + sha256 = "sha256-4mM/ZeGd91e1AklGHFK5UB4llg9IgCo9DKcM0iXcBls="; }; installPhase = '' From d957d3ed9cfdb83ef6e6b7e4d4d9017d0dbfb44d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Nov 2021 18:35:30 +0100 Subject: [PATCH 109/561] python3Packages.httplib2: 0.20.1 -> 0.20.3 --- .../python-modules/httplib2/default.nix | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index c399049816196..3f48af86e5816 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, cryptography , fetchFromGitHub , isPy27 , mock @@ -15,27 +16,22 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.20.1"; + version = "0.20.3"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1zqs3YRVtm5DwewETLtRg5XhMJPJsMi0QLfeGirOURs="; + sha256 = "sha256-Q5KkhVqyHDoIeKjvvYoHRbZPY7LUXGDwgp4CSuyvQ1g="; }; - postPatch = '' - sed -i "/--cov/d" setup.cfg - ''; - - propagatedBuildInputs = [ pyparsing ]; - - pythonImportsCheck = [ "httplib2" ]; - - # Don't run tests for Python 2.7 - doCheck = !isPy27; + propagatedBuildInputs = [ + pyparsing + ]; checkInputs = [ + cryptography mock pytest-forked pytest-randomly @@ -45,16 +41,29 @@ buildPythonPackage rec { pytestCheckHook ]; + # Don't run tests for Python 2.7 + doCheck = !isPy27; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + disabledTests = lib.optionals (stdenv.isDarwin) [ # fails with HTTP 408 Request Timeout, instead of expected 200 OK "test_timeout_subsequent" ]; - pytestFlagsArray = [ "--ignore python2" ]; + pytestFlagsArray = [ + "--ignore python2" + ]; + + pythonImportsCheck = [ + "httplib2" + ]; meta = with lib; { description = "A comprehensive HTTP client library"; - homepage = "https://httplib2.readthedocs.io"; + homepage = "https://github.com/httplib2/httplib2"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From caf08b7a9d7856f00e54008bda8457a66e2affb3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 28 Nov 2021 07:18:06 +1000 Subject: [PATCH 110/561] sqlite: 3.36.0 -> 3.37.0 https://www.sqlite.org/releaselog/3_37_0.html --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index acfce3d2e77af..de433ba5008da 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -11,12 +11,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.36.0"; + version = "3.37.0"; # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-vZDD65a+6ZYga4O+cGXJzhmu84w/T7Uwc62g0LabvOM="; + sha256 = "sha256-cxpGUdTUs2/H0h21hrLeTdAK8x/VT7WppLf0kgV0efc="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 352577fd2daea..7309e1de0b687 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,11 +4,11 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.36.0"; + version = "3.37.0"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip"; - sha256 = "092khwfm0m0i80sjb4fc5569jj0kilm6pa867w0akcv6h38bk8r5"; + sha256 = "sha256-cJd/s5Qhh9RidBOv3pqUkvoCuVSFCBK1OXS2ox7Oj68="; }; nativeBuildInputs = [ unzip ]; From 1f65b4c41697b20d5efb3fa4282760f32e5546ae Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Mon, 29 Nov 2021 08:03:26 +0100 Subject: [PATCH 111/561] linux: enable X86_SGX and X86_SGX_KVM on x86 Enable Intel Software Guard eXtensions (SGX) on x86 when using Linux 5.11.0 or later. Also enable KVM guests to create SGX enclaves if running Linux 5.13.0 or later. --- pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 9ddb4ef38001d..ebaec16d6d952 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -473,6 +473,11 @@ let # Detect buffer overflows on the stack CC_STACKPROTECTOR_REGULAR = {optional = true; tristate = whenOlder "4.18" "y";}; + } // optionalAttrs stdenv.hostPlatform.isx86 { + # Enable Intel SGX + X86_SGX = whenAtLeast "5.11" yes; + # Allow KVM guests to load SGX enclaves + X86_SGX_KVM = whenAtLeast "5.13" yes; }; microcode = { From a06fe88f7566eddd66535be81a6fa57308430c13 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 13:51:20 -0800 Subject: [PATCH 112/561] python/pythonNamespacesSetupHook: add to addtional files to remove --- .../interpreters/python/hooks/python-namespaces-hook.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh index 15d2bd0eb34c5..12ae50a198123 100644 --- a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh @@ -24,6 +24,12 @@ pythonNamespacesHook() { rm -v "$pathToRemove" fi + # remove ${pname}-${version}-${python-interpeter}-nspkg.pth + if [ -z ${dontRemovePth-} ]; then + # .pth files are located in the parent directory of a module + @findutils@/bin/find ${constructedPath}/../ -name '*-nspkg.pth' -exec rm -v "{}" + + fi + # remove __pycache__/ entry, can be interpreter specific. E.g. __init__.cpython-38.pyc # use null characters to perserve potential whitespace in filepath if [ -d "$pycachePath" ]; then From abb6f3efe8ee5b0f7e48b756dd38a3df9b7c2338 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 13 Nov 2021 14:22:28 +0100 Subject: [PATCH 113/561] python39: 3.9.6 -> 3.9.8 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 471320ee2c113..c0e25be5b0374 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -132,10 +132,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "9"; - patch = "6"; + patch = "8"; suffix = ""; }; - sha256 = "12hhw2685i68pwfx5hdkqngzhbji4ccyjmqb5rzvkigg6fpj0y9r"; + sha256 = "sha256-Z1zgm/I8CYNr8ZabdEsepMGhjDJ4hiZjJSXwhETrrVw="; }; }; From 6dd0b1b8fc6db95762de76d820d864cc13d44a7a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 13 Nov 2021 14:28:38 +0100 Subject: [PATCH 114/561] python311: init at 3.11.0a2 --- doc/languages-frameworks/python.section.md | 1 + .../python/cpython/3.11/no-ldconfig.patch | 107 ++++++++++++++++++ .../interpreters/python/default.nix | 14 +++ pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 53466921887c7..9fd475261c0b3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -834,6 +834,7 @@ sets are * `pkgs.python38Packages` * `pkgs.python39Packages` * `pkgs.python310Packages` +* `pkgs.python311Packages` * `pkgs.pypyPackages` and the aliases diff --git a/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch new file mode 100644 index 0000000000000..ca6a76d0ffd98 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch @@ -0,0 +1,107 @@ +From 5330b6af9f832af59aa5c61d9ef6971053a8e709 Mon Sep 17 00:00:00 2001 +From: Jonathan Ringer +Date: Mon, 9 Nov 2020 10:24:35 -0800 +Subject: [PATCH] CPython: Don't use ldconfig + +--- + Lib/ctypes/util.py | 77 ++-------------------------------------------- + 1 file changed, 2 insertions(+), 75 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 0c2510e161..7fb98af308 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -100,53 +100,7 @@ def _is_elf(filename): + return thefile.read(4) == elf_header + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.findall(expr, trace) +- if not res: +- return None +- +- for file in res: +- # Check if the given file is an elf file: gcc can report +- # some files that are linker scripts and not actual +- # shared objects. See bpo-41976 for more details +- if not _is_elf(file): +- continue +- return os.fsdecode(file) ++ return None + + + if sys.platform == "sunos5": +@@ -268,34 +222,7 @@ def find_library(name, is64 = False): + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +-- +2.33.1 + diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index c0e25be5b0374..b748397fa10cf 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -95,6 +95,7 @@ with pkgs; isPy38 = pythonVersion == "3.8"; isPy39 = pythonVersion == "3.9"; isPy310 = pythonVersion == "3.10"; + isPy311 = pythonVersion == "3.11"; isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; isPy3k = isPy3; @@ -192,6 +193,19 @@ in { inherit passthruFun; }; + python311 = callPackage ./cpython { + self = python311; + sourceVersion = { + major = "3"; + minor = "11"; + patch = "0"; + suffix = "a2"; + }; + sha256 = "sha256-aKjE1s4lSKe2F9aZ+9s0iTe9rODPltsaoIOEnfXa0T8="; + inherit (darwin) configd; + inherit passthruFun; + }; + # Minimal versions of Python (built without optional dependencies) python3Minimal = (callPackage ./cpython ({ self = python3Minimal; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08fc6d18d0b41..1719637fb6974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13604,7 +13604,7 @@ with pkgs; python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python37 python38 python39 python310 python3Minimal pypy27 pypy37; + inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy37; # Python package sets. python27Packages = python27.pkgs; @@ -13612,6 +13612,7 @@ with pkgs; python38Packages = recurseIntoAttrs python38.pkgs; python39Packages = recurseIntoAttrs python39.pkgs; python310Packages = python310.pkgs; + python311Packages = python311.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; From 23a970185feeec47810231914fbf5472b8710437 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Nov 2021 10:40:19 +0100 Subject: [PATCH 115/561] python3Packages.traitlets: 5.1.0 -> 5.1.1 --- pkgs/development/python-modules/traitlets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 9c09a206f4d3b..0b96ba37c156e 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.1.0"; + version = "5.1.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d"; + sha256 = "sha256-BZ9FbFp8HIK5jC6MeZ85ybgSj20NRpQe4RjarOnrcMc="; }; checkInputs = [ glibcLocales pytest mock ]; From 95122911957745378f640170b264fc79ddeb7452 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 14:33:10 +0100 Subject: [PATCH 116/561] python39: 3.9.8 -> 3.9.9 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b748397fa10cf..9c61eeb5a1d5f 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -133,10 +133,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "9"; - patch = "8"; + patch = "9"; suffix = ""; }; - sha256 = "sha256-Z1zgm/I8CYNr8ZabdEsepMGhjDJ4hiZjJSXwhETrrVw="; + sha256 = "sha256-BoKMBKVzwHOk5RxCkqJ8G+SuJmIcPtx8+TGEGM47bSc="; }; }; From 7678aa30b4f013976667ecdb4f068430a8b2a344 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 9 Nov 2021 23:12:55 +0100 Subject: [PATCH 117/561] pkgs/development: rename name to pname&version --- pkgs/development/compilers/gwt/2.4.0.nix | 7 ++++--- pkgs/development/compilers/opendylan/bin.nix | 9 +++++---- pkgs/development/interpreters/love/0.7.nix | 6 ++++-- pkgs/development/interpreters/love/0.9.nix | 6 ++++-- .../interpreters/python/cpython/docs/2.7-html.nix | 8 +++++--- .../interpreters/python/cpython/docs/2.7-pdf-a4.nix | 8 +++++--- .../python/cpython/docs/2.7-pdf-letter.nix | 8 +++++--- .../interpreters/python/cpython/docs/2.7-text.nix | 8 +++++--- .../interpreters/python/cpython/docs/3.7-html.nix | 8 +++++--- .../interpreters/python/cpython/docs/3.7-pdf-a4.nix | 8 +++++--- .../python/cpython/docs/3.7-pdf-letter.nix | 8 +++++--- .../interpreters/python/cpython/docs/3.7-text.nix | 8 +++++--- pkgs/development/libraries/aalib/default.nix | 7 ++++--- pkgs/development/libraries/acl/default.nix | 5 +++-- pkgs/development/libraries/aubio/default.nix | 5 +++-- pkgs/development/libraries/audiofile/default.nix | 5 +++-- pkgs/development/libraries/beecrypt/default.nix | 8 +++++--- pkgs/development/libraries/boost-process/default.nix | 11 ++++++----- pkgs/development/libraries/ccrtp/default.nix | 5 +++-- pkgs/development/libraries/clearsilver/default.nix | 5 +++-- pkgs/development/libraries/cloog/0.18.0.nix | 5 +++-- pkgs/development/libraries/clucene-core/2.x.nix | 5 +++-- pkgs/development/libraries/clucene-core/default.nix | 5 +++-- pkgs/development/libraries/cminpack/default.nix | 5 +++-- pkgs/development/libraries/cpptest/default.nix | 5 +++-- pkgs/development/libraries/dbus-glib/default.nix | 5 +++-- pkgs/development/libraries/dclib/default.nix | 7 ++++--- pkgs/development/libraries/dclxvi/default.nix | 3 ++- pkgs/development/libraries/freealut/default.nix | 5 +++-- pkgs/development/libraries/giblib/default.nix | 5 +++-- pkgs/development/libraries/giflib/4.1.nix | 7 ++++--- pkgs/development/libraries/giflib/default.nix | 5 +++-- pkgs/development/libraries/gle/default.nix | 9 +++++---- pkgs/development/libraries/glew/1.10.nix | 5 +++-- pkgs/development/libraries/glfw/2.x.nix | 5 +++-- pkgs/development/libraries/grantlee/default.nix | 7 ++++--- pkgs/development/libraries/gsl/gsl-1_16.nix | 5 +++-- pkgs/development/libraries/gss/default.nix | 2 +- .../libraries/gtk-engine-bluecurve/default.nix | 7 ++++--- pkgs/development/libraries/gtk-engines/default.nix | 7 ++++--- pkgs/development/libraries/hotpatch/default.nix | 3 ++- .../libraries/java/commons/bsf/default.nix | 7 ++++--- .../libraries/java/commons/logging/default.nix | 7 ++++--- pkgs/development/libraries/java/geoipjava/default.nix | 8 +++++--- pkgs/development/libraries/java/jflex/default.nix | 7 ++++--- .../libraries/java/libmatthew-java/default.nix | 8 +++++--- pkgs/development/libraries/java/lombok/default.nix | 5 +++-- .../libraries/java/mockobjects/default.nix | 9 +++++---- pkgs/development/libraries/java/smack/default.nix | 9 +++++---- pkgs/development/tools/build-managers/cmake/2.8.nix | 5 +++-- 50 files changed, 191 insertions(+), 129 deletions(-) diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 011a7979df7f9..38f29cb3200ce 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "gwt-java-2.4.0"; +stdenv.mkDerivation rec { + pname = "gwt-java"; + version = "2.4.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-web-toolkit/gwt-2.4.0.zip"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-web-toolkit/gwt-${version}.zip"; sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17"; }; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 9687f1b1a662f..f105707f93363 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -2,15 +2,16 @@ # The binaries can also be used as is. {lib, stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}: -stdenv.mkDerivation { - name = "opendylan-2013.2"; +stdenv.mkDerivation rec { + pname = "opendylan"; + version = "2013.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2"; + url = "https://opendylan.org/downloads/opendylan/${version}/opendylan-${version}-x86_64-linux.tar.bz2"; sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2"; + url = "https://opendylan.org/downloads/opendylan/${version}/opendylan-${version}-x86-linux.tar.bz2"; sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5"; } else throw "platform ${stdenv.hostPlatform.system} not supported."; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 6cba19bff0f16..6d8b996f18358 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -6,9 +6,11 @@ }: stdenv.mkDerivation rec { - name = "love-0.7.2"; + pname = "love"; + version = "0.7.2"; + src = fetchurl { - url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; + url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz"; sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; }; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index b7e20498a39c3..512aade7f9539 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -5,9 +5,11 @@ }: stdenv.mkDerivation rec { - name = "love-0.9.1"; + pname = "love"; + version = "0.9.1"; + src = fetchurl { - url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; + url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz"; sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84"; }; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index e033858acc018..dbfe1c51b4d04 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -2,10 +2,12 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation { - name = "python27-docs-html-2.7.16"; +stdenv.mkDerivation rec { + pname = "python27-docs-html"; + version = "2.7.16"; + src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2"; + url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-html.tar.bz2"; sha256 = "1razs1grzhai65ihaiyph8kz6ncjkgp1gsn3c8v7kanf13lqim02"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index c9a770a6fcf1c..cf03df68b0f38 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -2,10 +2,12 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation { - name = "python27-docs-pdf-a4-2.7.16"; +stdenv.mkDerivation rec { + pname = "python27-docs-pdf-a4"; + version = "2.7.16"; + src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2"; + url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-a4.tar.bz2"; sha256 = "14ml1ynrlbhg43737bdsb8k5y39wsffqj4iwhylhb8n8l5dplfdq"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index e03d031bae487..d75ea77f78775 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -2,10 +2,12 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation { - name = "python27-docs-pdf-letter-2.7.16"; +stdenv.mkDerivation rec { + pname = "python27-docs-pdf-letter"; + version = "2.7.16"; + src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2"; + url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-letter.tar.bz2"; sha256 = "019i8n48m71mn31v8d85kkwyqfgcgqnqh506y4a7fcgf656bajs0"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index d19d7be193572..0c217d188410d 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -2,10 +2,12 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation { - name = "python27-docs-text-2.7.16"; +stdenv.mkDerivation rec { + pname = "python27-docs-text"; + version = "2.7.16"; + src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2"; + url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-text.tar.bz2"; sha256 = "1da7swlykvc013684nywycinfz3v8dqkcmv0zj8p7l5lyi5mq03r"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix index a83363b5c4738..2e399aa52fcd6 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix @@ -2,10 +2,12 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation { - name = "python37-docs-html-3.7.2"; +stdenv.mkDerivation rec { + pname = "python37-docs-html"; + version = "3.7.2"; + src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2"; + url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-html.tar.bz2"; sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix index e60032f71bf8b..9879a26be525f 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix @@ -2,10 +2,12 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation { - name = "python37-docs-pdf-a4-3.7.2"; +stdenv.mkDerivation rec { + pname = "python37-docs-pdf-a4"; + version = "3.7.2"; + src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2"; + url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-a4.tar.bz2"; sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix index b737a1e32995b..7c58c45776e7a 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix @@ -2,10 +2,12 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation { - name = "python37-docs-pdf-letter-3.7.2"; +stdenv.mkDerivation rec { + pname = "python37-docs-pdf-letter"; + version = "3.7.2"; + src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2"; + url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-letter.tar.bz2"; sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix index 2897042ec04a3..641e4913f65a3 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix @@ -2,10 +2,12 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation { - name = "python37-docs-text-3.7.2"; +stdenv.mkDerivation rec { + pname = "python37-docs-text"; + version = "3.7.2"; + src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2"; + url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-text.tar.bz2"; sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2"; }; installPhase = '' diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index b007e71ce44d7..af0fa61740150 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, ncurses, automake}: -stdenv.mkDerivation { - name = "aalib-1.4rc5"; +stdenv.mkDerivation rec { + pname = "aalib"; + version = "1.4rc5"; src = fetchurl { - url = "mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz"; + url = "mirror://sourceforge/aa-project/aalib-${version}.tar.gz"; sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; }; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 936e793cafef4..1ac577e19cdb8 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -6,10 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "acl-2.3.1"; + pname = "acl"; + version = "2.3.1"; src = fetchurl { - url = "mirror://savannah/acl/${name}.tar.gz"; + url = "mirror://savannah/acl/acl-${version}.tar.gz"; sha256 = "sha256-dgxhxokBs3/dXu/ur0wMeia9/disdHoe3/HODiQ8Ea8="; }; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index e1f2d326879c2..22cac39dbe10c 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "aubio-0.4.9"; + pname = "aubio"; + version = "0.4.9"; src = fetchurl { - url = "https://aubio.org/pub/${name}.tar.bz2"; + url = "https://aubio.org/pub/aubio-${version}.tar.bz2"; sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 54df6d7b25508..64c6d8ee4f516 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -11,7 +11,8 @@ let in stdenv.mkDerivation rec { - name = "audiofile-0.3.6"; + pname = "audiofile"; + version = "0.3.6"; buildInputs = lib.optionals stdenv.isLinux [ @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://audiofile.68k.org/${name}.tar.gz"; + url = "https://audiofile.68k.org/audiofile-${version}.tar.gz"; sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index 6b86fca868f6b..f6c61254c1010 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, m4}: -stdenv.mkDerivation { - name = "beecrypt-4.2.1"; +stdenv.mkDerivation rec { + pname = "beecrypt"; + version = "4.2.1"; + src = fetchurl { - url = "mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz"; + url = "mirror://sourceforge/beecrypt/beecrypt-${version}.tar.gz"; sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8"; }; buildInputs = [ m4 ]; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 148e27faa2b66..551c1247949ea 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -1,18 +1,19 @@ { lib, stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "boost-process-0.5"; +stdenv.mkDerivation rec { + pname = "boost-process"; + version = "0.5"; src = fetchurl { - url = "http://www.highscore.de/boost/process0.5/process.zip"; + url = "http://www.highscore.de/boost/process${version}/process.zip"; sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831"; }; nativeBuildInputs = [ unzip ]; unpackPhase = '' - mkdir $name - cd $name + mkdir boost-process-$version + cd boost-process-$version unzip $src ''; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 39792d4fd6a13..3fdbbd23ecdc5 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }: stdenv.mkDerivation rec { - name = "ccrtp-2.1.2"; + pname = "ccrtp"; + version = "2.1.2"; src = fetchurl { - url = "mirror://gnu/ccrtp/${name}.tar.gz"; + url = "mirror://gnu/ccrtp/ccrtp-${version}.tar.gz"; sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; }; diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 73ffd6c12b23a..1a3e261c60ed5 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, python2 }: stdenv.mkDerivation rec { - name = "clearsilver-0.10.5"; + pname = "clearsilver"; + version = "0.10.5"; src = fetchurl { - url = "http://www.clearsilver.net/downloads/${name}.tar.gz"; + url = "http://www.clearsilver.net/downloads/clearsilver-${version}.tar.gz"; sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; }; diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix index c952c1a563b80..12e279797e764 100644 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ b/pkgs/development/libraries/cloog/0.18.0.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, gmp, isl }: stdenv.mkDerivation rec { - name = "cloog-0.18.0"; + pname = "cloog"; + version = "0.18.0"; src = fetchurl { - url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz"; + url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-${version}.tar.gz"; sha256 = "1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228"; }; diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 9c1f3c21cd278..52caa26c9c58b 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, cmake, boost, zlib}: stdenv.mkDerivation rec { - name = "clucene-core-2.3.3.4"; + pname = "clucene-core"; + version = "2.3.3.4"; src = fetchurl { - url = "mirror://sourceforge/clucene/${name}.tar.gz"; + url = "mirror://sourceforge/clucene/clucene-core-${version}.tar.gz"; sha256 = "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx"; }; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 8d5b389150a41..6f0eb8dfff008 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "clucene-core-0.9.21b"; + pname = "clucene-core"; + version = "0.9.21b"; src = fetchurl { - url = "mirror://sourceforge/clucene/${name}.tar.bz2"; + url = "mirror://sourceforge/clucene/clucene-core-${version}.tar.bz2"; sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317"; }; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 10d0686043699..02ad6acfbe2a6 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cminpack-1.3.6"; + pname = "cminpack"; + version = "1.3.6"; src = fetchurl { - url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz"; + url = "http://devernay.free.fr/hacks/cminpack/cminpack-${version}.tar.gz"; sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw"; }; diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix index 17bd390038613..a3558e0ef4937 100644 --- a/pkgs/development/libraries/cpptest/default.nix +++ b/pkgs/development/libraries/cpptest/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cpptest-2.0.0"; + pname = "cpptest"; + version = "2.0.0"; src = fetchurl { - url = "mirror://sourceforge/project/cpptest/cpptest/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/cpptest/cpptest/cpptest-${version}/cpptest-${version}.tar.gz"; sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm"; }; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 0bab4eb1949ee..c6be0dd419db9 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "dbus-glib-0.112"; + pname = "dbus-glib"; + version = "0.112"; src = fetchurl { - url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; + url = "${meta.homepage}/releases/dbus-glib/dbus-glib-${version}.tar.gz"; sha256 = "sha256-fVUNzN/NKG4ziVUBgp7Zce62XGFOc6rbSgiu73GbFDo="; }; diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index b393b74f2b2fe..05ea7db2caccd 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libxml2, openssl, bzip2}: -stdenv.mkDerivation { - name = "dclib-0.3.7"; +stdenv.mkDerivation rec { + pname = "dclib"; + version = "0.3.7"; src = fetchurl { - url = "ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2"; + url = "ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-${version}.tar.bz2"; sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc"; }; diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index 8d7dc5a01781a..ac2664a1c9f99 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "dclxvi-2013-01-27"; + pname = "dclxvi"; + version = "unstable-2013-01-27"; src = fetchFromGitHub { owner = "agl"; diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 3bb6eaddfa366..36bc4a2567770 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, darwin, fetchurl, openal }: stdenv.mkDerivation rec { - name = "freealut-1.1.0"; + pname = "freealut"; + version = "1.1.0"; src = fetchurl { - url = "http://www.openal.org/openal_webstf/downloads/${name}.tar.gz"; + url = "http://www.openal.org/openal_webstf/downloads/freealut-${version}.tar.gz"; sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"; }; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index e66f7bfe2a8c2..ca4a3c98e0a60 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, xlibsWrapper, imlib2 }: stdenv.mkDerivation rec { - name = "giblib-1.2.4"; + pname = "giblib"; + version = "1.2.4"; src = fetchurl { - url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; + url = "http://linuxbrit.co.uk/downloads/giblib-${version}.tar.gz"; sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index c0afe067c499c..8f3ebcf7d3be8 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "giflib-4.1.6"; +stdenv.mkDerivation rec { + pname = "giflib"; + version = "4.1.6"; src = fetchurl { - url = "mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2"; + url = "mirror://sourceforge/giflib/giflib-${version}.tar.bz2"; sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1"; }; diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index c86b706e13c82..2016742351cd1 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames, pkgsStatic }: stdenv.mkDerivation rec { - name = "giflib-5.2.1"; + pname = "giflib"; + version = "5.2.1"; src = fetchurl { - url = "mirror://sourceforge/giflib/${name}.tar.gz"; + url = "mirror://sourceforge/giflib/giflib-${version}.tar.gz"; sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii"; }; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index b7a4f7f2fef18..79be821faaecb 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -1,11 +1,12 @@ {lib, stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: -stdenv.mkDerivation { - name = "gle-3.1.0"; +stdenv.mkDerivation rec { + pname = "gle"; + version = "3.1.0"; buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext]; src = fetchurl { urls = [ - "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz" - "https://www.linas.org/gle/pub/gle-3.1.0.tar.gz" + "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz" + "https://www.linas.org/gle/pub/gle-${version}.tar.gz" ]; sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; }; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 29376cb256721..ab2e740cd8646 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -5,10 +5,11 @@ with lib; stdenv.mkDerivation rec { - name = "glew-1.10.0"; + pname = "glew"; + version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/glew/${name}.tgz"; + url = "mirror://sourceforge/glew/glew-${version}.tgz"; sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index d05fa6e5f7721..75a7c97db2bda 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libGLU, libGL, libX11, libXext }: stdenv.mkDerivation rec { - name = "glfw-2.7.9"; + pname = "glfw"; + version = "2.7.9"; src = fetchurl { - url = "mirror://sourceforge/glfw/${name}.tar.bz2"; + url = "mirror://sourceforge/glfw/glfw-${version}.tar.bz2"; sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 869430538e898..53ae099b1bb62 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, qt4, cmake }: stdenv.mkDerivation rec { - name = "grantlee-0.5.1"; + pname = "grantlee"; + version = "0.5.1"; # Upstream download server has country code firewall, so I made a mirror. src = fetchurl { urls = [ - "http://downloads.grantlee.org/${name}.tar.gz" - "http://www.loegria.net/grantlee/${name}.tar.gz" + "http://downloads.grantlee.org/grantlee-${version}.tar.gz" + "http://www.loegria.net/grantlee/grantlee-${version}.tar.gz" ]; sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r"; }; diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index 4370314f6ec3a..2cda6c7955c23 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -1,10 +1,11 @@ { fetchurl, fetchpatch, lib, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.16"; + pname = "gsl"; + version = "1.16"; src = fetchurl { - url = "mirror://gnu/gsl/${name}.tar.gz"; + url = "mirror://gnu/gsl/gsl-${version}.tar.gz"; sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 6406dad7d6cc8..0c49e97a56bd8 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.0.3"; src = fetchurl { - url = "mirror://gnu/gss/${pname}-${version}.tar.gz"; + url = "mirror://gnu/gss/gss-${version}.tar.gz"; sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz"; }; diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix index 918e1679eba20..43cf8675735fa 100644 --- a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix +++ b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: -stdenv.mkDerivation { - name = "gtk-engine-bluecurve-1.0"; +stdenv.mkDerivation rec { + pname = "gtk-engine-bluecurve"; + version = "1.0"; src = fetchurl { - url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2"; + url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-${version}.tar.bz2"; sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm"; }; diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix index 70b2c4d1e229b..e553efa5f2520 100644 --- a/pkgs/development/libraries/gtk-engines/default.nix +++ b/pkgs/development/libraries/gtk-engines/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: -stdenv.mkDerivation { - name = "gtk-engines-2.20.2"; +stdenv.mkDerivation rec { + pname = "gtk-engines"; + version = "2.20.2"; src = fetchurl { - url = "mirror://gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"; + url = "mirror://gnome/sources/gtk-engines/${lib.versions.majorMinor version}/gtk-engines-${version}.tar.bz2"; sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix index 2dd894ff4a36a..84803159a2b3c 100644 --- a/pkgs/development/libraries/hotpatch/default.nix +++ b/pkgs/development/libraries/hotpatch/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "hotpatch-0.2"; + pname = "hotpatch"; + version = "0.2"; src = fetchFromGitHub { owner = "vikasnkumar"; diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix index 629ab7ec131a4..08b6a99a55dad 100644 --- a/pkgs/development/libraries/java/commons/bsf/default.nix +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "commons-bsf-1.2"; +stdenv.mkDerivation rec { + pname = "commons-bsf"; + version = "2.4.0"; src = fetchurl { - url = "mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz"; + url = "mirror://apache/commons/bsf/binaries/bsf-bin-${version}.tar.gz"; sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8"; }; diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix index d63a214e2ad7e..5b6c8b36b3491 100644 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "commons-logging-1.2"; +stdenv.mkDerivation rec { + pname = "commons-logging"; + version = "1.2"; src = fetchurl { - url = "mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz"; + url = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz"; sha256 = "1gc70pmcv0x6ibl89jglmr22f8zpr63iaifi49nrq399qw2qhx9z"; }; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 0e5b1084b49c8..cbb6b35a65c92 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, jdk, unzip}: -stdenv.mkDerivation { - name = "GeoIPJava-1.2.5"; +stdenv.mkDerivation rec { + pname = "GeoIPJava"; + version = "1.2.5"; + src = fetchurl { - url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip"; + url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-${version}.zip"; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index cf5b42a0ac215..4f5a9de7bd5c2 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -1,14 +1,15 @@ {lib, stdenv, fetchurl, jre} : stdenv.mkDerivation rec { - name = "jflex-1.8.2"; + pname = "jflex"; + version = "1.8.2"; src = fetchurl { - url = "http://jflex.de/release/${name}.tar.gz"; + url = "http://jflex.de/release/jflex-${version}.tar.gz"; sha256 = "1ar7g6zb2xjgnws3j4cqcp86jplhc9av8cpcjdmxw08x6igd5q51"; }; - sourceRoot = name; + sourceRoot = "${pname}-${version}"; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index a3cdaa37ed065..6f736403e0565 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, jdk}: -stdenv.mkDerivation { - name = "libmatthew-java-0.8"; +stdenv.mkDerivation rec { + pname = "libmatthew-java"; + version = "0.8"; + src = fetchurl { - url = "https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz"; + url = "https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-${version}.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-${version}.tar.gz"; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index b4f0f4525f79e..af75be5375796 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { - name = "lombok-1.18.20"; + pname = "lombok"; + version = "1.18.20"; src = fetchurl { - url = "https://projectlombok.org/downloads/${name}.jar"; + url = "https://projectlombok.org/downloads/lombok-${version}.jar"; sha256 = "sha256-zpR75sL751n7vo7ztCtoJfgUyYyIU/EBPy2WMM7fdLA="; }; diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index 3780ef4abed2d..93b222357840d 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl} : +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "mockobjects-0.09"; +stdenv.mkDerivation rec { + pname = "mockobjects"; + version = "0.09"; src = fetchurl { - url = "mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar"; + url = "mirror://sourceforge/mockobjects/mockobjects-bin-${version}.tar"; sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index c5d6098a3cde2..5c032f5469ce0 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "smack-4.1.9"; +stdenv.mkDerivation rec { + pname = "smack"; + version = "4.1.9"; src = fetchurl { - url = "http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz"; + url = "http://www.igniterealtime.org/downloadServlet?filename=smack/smack_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp"; }; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 9dabd7b35560d..ec03e285603fa 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -15,7 +15,8 @@ let in stdenv.mkDerivation rec { - name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + pname = "cmake${os useNcurses "-cursesUI"}${os useQt4 "-qt4UI"}"; + inherit version; inherit majorVersion; @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); configureFlags = [ - "--docdir=/share/doc/${name}" + "--docdir=/share/doc/${pname}-${version}" "--mandir=/share/man" "--system-libs" "--no-system-libarchive" From af0f9d30b3ef4d974f34625fa5535a274527888e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:45:37 -0800 Subject: [PATCH 118/561] python3Packages.absl-py: 0.14.1 -> 0.15.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 611686e5c0aff..30a0e68dea0cf 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.14.1"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "eb0383bd431c0d7b2320179904cab00120a10977e3c9671d99efbbed17efb55a"; + sha256 = "72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81"; }; propagatedBuildInputs = [ From 086eb40fed73ab4645de3116146718d7f58a3f50 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:36 -0800 Subject: [PATCH 119/561] python3Packages.aiocron: 1.7 -> 1.8 --- pkgs/development/python-modules/aiocron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocron/default.nix b/pkgs/development/python-modules/aiocron/default.nix index 3e6f33a23e575..4776a1035bfe4 100644 --- a/pkgs/development/python-modules/aiocron/default.nix +++ b/pkgs/development/python-modules/aiocron/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "aiocron"; - version = "1.7"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rX07m9iIl5NP/RiTf/I1q5+wE1goD9QOAUYf1fdjSL0="; + sha256 = "48546513faf2eb7901e65a64eba7b653c80106ed00ed9ca3419c3d10b6555a01"; }; propagatedBuildInputs = [ From 856701c43cd3888f26509e56dcc50b7a99a704b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:36 -0800 Subject: [PATCH 120/561] python3Packages.aiohttp: 3.8.0 -> 3.8.1 --- pkgs/development/python-modules/aiohttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index db1f810cbc871..f96fa8820384c 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.8.0"; + version = "3.8.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-07GdjRg7z9aLJb7rq43DMIKC/iyj1uo8tM0QGzwnn40="; + sha256 = "fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578"; }; postPatch = '' From 764a8bd5fcc885af2db5dba38ba9605894dadbbe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:37 -0800 Subject: [PATCH 121/561] python3Packages.amazon_kclpy: 2.0.2 -> 2.0.6 --- pkgs/development/python-modules/amazon_kclpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index b39d3902740de..06f61981561b2 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "amazon_kclpy"; - version = "2.0.2"; + version = "2.0.6"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; rev = "v${version}"; - sha256 = "12yxcwml6g86sv1pj3wc2k97md9szdj6xx07qwri1mr9bdkzw7rv"; + sha256 = "0gbpwhpd9i13vi0cch48qqrma90p230psqrkbfcjvdah69w434l4"; }; # argparse is just required for python2.6 From c00381f4703ea491fe19607da8a6f1a316bd6e42 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:37 -0800 Subject: [PATCH 122/561] python3Packages.ansible-runner: 2.0.3 -> 2.1.1 --- pkgs/development/python-modules/ansible-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index a23f668529d18..f4ec1c1846272 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.0.3"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "15j0ljgw1rjxq4xiywxxxnxj4r6vwk8dwljkdsjmq3qmwgifcswg"; + sha256 = "7684612f7543c5f07f3e8135667eeb22a9dbd98f625cc69901ba9924329ef24f"; }; checkInputs = [ From 5c654939690f63cc9fa8c3daa45ef116f97cdd53 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:37 -0800 Subject: [PATCH 123/561] python3Packages.arrow: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/arrow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 72bbdb7b977cb..fc66509a194a1 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "16fc29bbd9e425e3eb0fef3018297910a0f4568f21116fc31771e2760a50e074"; + sha256 = "c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840"; }; postPatch = '' From ffe488fc0f18f2b9db924647aeae68c676dc4769 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:37 -0800 Subject: [PATCH 124/561] python3Packages.asyncio-nats-client: 0.11.4 -> 0.11.5 --- .../python-modules/asyncio-nats-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio-nats-client/default.nix b/pkgs/development/python-modules/asyncio-nats-client/default.nix index b5017123850fc..46dbcdbacd5e5 100644 --- a/pkgs/development/python-modules/asyncio-nats-client/default.nix +++ b/pkgs/development/python-modules/asyncio-nats-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncio-nats-client"; - version = "0.11.4"; + version = "0.11.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.py"; rev = "v${version}"; - sha256 = "1aj57xi2rj1xswq8air13xdsll1ybpi0nmz5f6jq01azm0zy9xyd"; + sha256 = "0zwiijaswmfdk71diqmdpb6nx54fmgi8hy0vwx2m3ihhsyjxj82h"; }; propagatedBuildInputs = [ From 5fba48f794408233a13e2fe46e53b7975c46b4d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:37 -0800 Subject: [PATCH 125/561] python3Packages.asyncpg: 0.24.0 -> 0.25.0 --- pkgs/development/python-modules/asyncpg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 9c9e2d623dc4c..7ae4cb1b7898a 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.24.0"; + version = "0.25.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-3S+gY8M0SCNIfZ3cy0CALwJiLd+L+KbMU4he56LBwMY="; + sha256 = "63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540"; }; checkInputs = [ From 8f48296bd47c664a161edb3aeb56167def61342a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:38 -0800 Subject: [PATCH 126/561] python3Packages.atom: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index cb9503fe6e9c6..80e29932ee2d7 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atom"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "df65a654744ccdc4843ce09c38612fd8f702c84be501b1d955c3ac0b9ad28dc5"; + sha256 = "4055fbdeeb692d3d52c6e3c628d7513fc71f147920cac7d0da05b6dbb5ec8c8d"; }; buildInputs = [ cppy ]; From 21b0a961a6cc3a18353d699869711de159124792 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:38 -0800 Subject: [PATCH 127/561] python3Packages.authcaptureproxy: 1.0.2 -> 1.1.1 --- pkgs/development/python-modules/authcaptureproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index c03b423932dfb..73422a0624c8c 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.0.2"; + version = "1.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "v${version}"; - sha256 = "1cg63qhf823nf785kyl96r7vyxfl6dlbwsmhcpny8vb65pl9gng5"; + sha256 = "08zpaclg5f9g1pix0jaq42i2ph12xc8djjrmhxz0yygw5rsilgl4"; }; postPatch = '' From 40c3ecafdaf94cbaf064a2740a6194ea74977b8f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:38 -0800 Subject: [PATCH 128/561] python3Packages.autopep8: 1.5.7 -> 1.6.0 --- pkgs/development/python-modules/autopep8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 737989ac3183c..80c57ef732c21 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.7"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0"; + sha256 = "44f0932855039d2c15c4510d6df665e4730f2b8582704fa48f9c55bd3e17d979"; }; propagatedBuildInputs = [ pycodestyle toml ]; From eb468bae8ba162006a52a0216bd7514c25977dd7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:38 -0800 Subject: [PATCH 129/561] python3Packages.avro: 1.10.2 -> 1.11.0 --- pkgs/development/python-modules/avro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 4c1fb77dc69b8..e85f2e9bf0429 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "avro"; - version = "1.10.2"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "381b990cc4c4444743c3297348ffd46e0c3a5d7a17e15b2f4a9042f6e955c31a"; + sha256 = "1206365cc30ad561493f735329857dd078533459cee4e928aec2505f341ce445"; }; patchPhase = '' From 91fafcff6c3f00ec5861b1a914d746ff8638932d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:38 -0800 Subject: [PATCH 130/561] python3Packages.bitstruct: 8.11.1 -> 8.12.1 --- pkgs/development/python-modules/bitstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 43edd16f66aab..78b34dfbf17c1 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.11.1"; + version = "8.12.1"; src = fetchPypi { inherit pname version; - sha256 = "4e7b8769c0f09fee403d0a5f637f8b575b191a79a92e140811aa109ce7461f0c"; + sha256 = "45b2b932ce6681f5c6ce8cba39abdd423b579b0568c76fa48b1e09c88368ede7"; }; meta = with lib; { From eb2aefe966c4ad39a32e0ea6ba7f6b3957e36f32 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:39 -0800 Subject: [PATCH 131/561] python3Packages.bokeh: 2.3.3 -> 2.4.2 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 63cd373abf776..9017cbed0d6d8 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.3.3"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "a5fdcc181835561447fcc5a371300973fce4114692d5853addec284d1cdeb677"; + sha256 = "f0a4b53364ed3b7eb936c5cb1a4f4132369e394c7ae0a8ef420459410958033d"; }; patches = [ From 5bd40af3c6807aeb0de3ad4ceb2c5e7f9c25b397 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:39 -0800 Subject: [PATCH 132/561] python3Packages.boto3: 1.18.54 -> 1.20.13 --- 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 6d8cb85fa884f..bf26eca41b647 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.18.54"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.20.13"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-LYHcSEAgBZ/HOBZZhDBBB9TbHGd0tjENCMiSoXUfaYA="; + sha256 = "bbf53a077d6a0575ddec8026f0475ca6ee6f41b227914bf315bf3e049a3d653a"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 2f9b29d1fd73aaa6c51c02a191f8e8cb6561d590 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:39 -0800 Subject: [PATCH 133/561] python3Packages.botocore: 1.21.54 -> 1.23.13 --- 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 bf291411608a3..46d3dba449635 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.21.54"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.23.13"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-RhJ7OjhdDsc9GZS4lYsjt54GE+EsSGNxoQDfmStyobk="; + sha256 = "35792b2196049ef900f538cae51fb8359c940156eef187962aa9e3bd2c0b8e8c"; }; propagatedBuildInputs = [ From c064af6e4a3786baa4ce1d294734cd23a90eceb0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:39 -0800 Subject: [PATCH 134/561] python3Packages.bpython: 0.21 -> 0.22.1 --- pkgs/development/python-modules/bpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 64fe3c455ee59..0cedc7655ac05 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.21"; + version = "0.22.1"; src = fetchPypi { inherit pname version; - sha256 = "88aa9b89974f6a7726499a2608fa7ded216d84c69e78114ab2ef996a45709487"; + sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200"; }; patches = [ (substituteAll { From 280f2ffeef1acdf371e2a6f636b39e26a820196f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:39 -0800 Subject: [PATCH 135/561] python3Packages.braintree: 4.13.0 -> 4.13.1 --- pkgs/development/python-modules/braintree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 95e24e98d51c1..8cf820edbfec3 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.13.0"; + version = "4.13.1"; src = fetchPypi { inherit pname version; - sha256 = "de8270c24c4557bcb76d2079bb4cabf380ce467d17c65f10ee5159da7ff8496a"; + sha256 = "4f6addf89f5cd6123243ddc89db325e50fceec825845901dad553fde115bd938"; }; propagatedBuildInputs = [ requests ]; From d813b61e0990c1160223234a8e1b5902786916cb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:39 -0800 Subject: [PATCH 136/561] python3Packages.zc.buildout: 2.13.4 -> 2.13.6 --- pkgs/development/python-modules/buildout-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 834dd42bc087a..8056cd181d531 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.4"; + version = "2.13.6"; src = fetchPypi { inherit pname version; - sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63"; + sha256 = "ac6edd48b1d7b1fba383dd0840fd49c53266f6bd426111a0195bcc640f4aff0f"; }; patches = [ ./nix.patch ]; From 1cb0ba4e061c019636472f4094408a309897e05d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:40 -0800 Subject: [PATCH 137/561] python3Packages.bumps: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/bumps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 7e94bd55b28fb..6e0637d2a6bc6 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bumps"; - version = "0.8.0"; + version = "0.8.1"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9f92c05effd8175763799d19ca55592e89b053318f611148a6725159aea41d67"; + sha256 = "f4f2ee712a1e468a2ce5c0a32f67739a83331f0cb7b9c50b9e7510daefc12169"; }; meta = with lib; { From 2e536dc6f06327756fa3eb7f70ce9154998e2637 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:40 -0800 Subject: [PATCH 138/561] python3Packages.bx-python: 0.8.11 -> 0.8.12 --- pkgs/development/python-modules/bx-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index aa1e3d1d86486..b7e906c3b91b8 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "bx-python"; - version = "0.8.11"; + version = "0.8.12"; disabled = isPy27; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "v${version}"; - sha256 = "0cz5vgw19hmkcg689vr540q2gl2lb3xcf1lphm7zbfp8wmypcadm"; + sha256 = "0mclahslz34vq9x424jmzsxk0nmpm1j716fa8h3zwr9ssvch7skc"; }; nativeBuildInputs = [ cython ]; From c1d154d794fc67f823ce7f788b8bbc44b3a3b1f1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:40 -0800 Subject: [PATCH 139/561] python3Packages.castepxbin: 0.1.0 -> 0.2.0 --- pkgs/development/python-modules/castepxbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix index 3c4466648633f..993684bd5a389 100644 --- a/pkgs/development/python-modules/castepxbin/default.nix +++ b/pkgs/development/python-modules/castepxbin/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "castepxbin"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "zhubonan"; repo = "castepxbin"; rev = "v${version}"; - sha256 = "16wnd1mwhl204d1s3har2fhyhyjg86sypg00bj812dxk8zixxszf"; + sha256 = "0bqicpdyisbcz8argy4ppm59zzkcn9lcs4y1mh2f31f75x732na3"; }; propagatedBuildInputs = [ From 8ad3aa09e67d29dc97b44cf32dbdd8944a323f65 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:40 -0800 Subject: [PATCH 140/561] python3Packages.celery: 5.1.2 -> 5.2.1 --- pkgs/development/python-modules/celery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index cd6d21b7c6515..123703d4aa350 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "celery"; - version = "5.1.2"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "8d9a3de9162965e97f8e8cc584c67aad83b3f7a267584fa47701ed11c3e0d4b0"; + sha256 = "b41a590b49caf8e6498a57db628e580d5f8dc6febda0f42de5d783aed5b7f808"; }; # click is only used for the repl, in most cases this shouldn't impact From a0cf282a69783edd521e85eb293c7bd6bd526eed Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:40 -0800 Subject: [PATCH 141/561] python3Packages.cffi: 1.14.6 -> 1.15.0 --- pkgs/development/python-modules/cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 57806426d95a9..07af19a438463 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -4,11 +4,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.14.6"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"; + sha256 = "920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"; }; outputs = [ "out" "dev" ]; From 25e735fcae2fe37f6221ea3588d345704134e313 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:41 -0800 Subject: [PATCH 142/561] python3Packages.cfn-lint: 0.54.2 -> 0.56.2 --- 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 f0769f57275a3..c9d500ac836ab 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.54.2"; + version = "0.56.2"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "04d5zyjnrl3b6cb2fxmbpii27mnq77wqsglfxfv2a1zj2p9xby0p"; + sha256 = "0wpsj719r0p122qmi3nznzqnxqb0nx53isg9fma75894pvq2v5wc"; }; postPatch = '' From 5796d23bdf2478f49d04f4e1a49b654b8936bc6a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:41 -0800 Subject: [PATCH 143/561] python3Packages.chart-studio: 5.3.1 -> 5.4.0 --- pkgs/development/python-modules/chart-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 2873b7e99ef06..0e80ee1a41e46 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.3.1"; + version = "5.4.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "11jazr5s2rmcxbkpb79gllwlyxvji3f0ryfrj7mkbyvfnfv43gly"; + sha256 = "1ay9dlblxkx3pxqmizj2am9gf60j1pl6ir23yj7chg8dbafdbv8p"; }; sourceRoot = "source/packages/python/chart-studio"; From d8763a3e20e922776b357cbe917c50132028a72f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:41 -0800 Subject: [PATCH 144/561] python3Packages.cliff: 3.9.0 -> 3.10.0 --- pkgs/development/python-modules/cliff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 8b8f536bab6fd..ce229665c659e 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3"; + sha256 = "c68aac08d0d25853234a38fdbf1f33503849af3d5d677a4d0aacd42b0be6a4a1"; }; postPatch = '' From 58761fdd779d22f4fca44d60cccfda2a9c134d1f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:41 -0800 Subject: [PATCH 145/561] python3Packages.cmd2: 2.2.0 -> 2.3.2 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index f7308fd8ba93d..8339af8094c47 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "cmd2"; - version = "2.2.0"; + version = "2.3.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "34cd12424d9e2835eff125146af3d9f4a4c2931c6bc5a3cea9790bd4f55756d9"; + sha256 = "cad18787a26147dad4b161d75c5ab7de16ffe91fef1cfad8e6f18b712746e800"; }; LC_ALL = "en_US.UTF-8"; From 19c77f0d88a37f5fff38dd9898fb978937d17ce9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:41 -0800 Subject: [PATCH 146/561] python3Packages.cocotb: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/cocotb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 17fe45f1cf49f..90616dc1f8ab1 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.5.2"; + version = "1.6.0"; # - we need to use the tarball from PyPi # or the full git checkout (with .git) @@ -20,7 +20,7 @@ buildPythonPackage rec { # because it does not include required metadata src = fetchPypi { inherit pname version; - sha256 = "9f4f3e6eb9caeb479e98d604770645b57469cd25b39e28df1916ffcd593efbe6"; + sha256 = "a695544ab314e6d795b72ece9e67b51c6668c569b21303158e00452db43c5756"; }; nativeBuildInputs = [ setuptools-scm ]; From 84d1ecb380535410eed4124ddb1bb79c7c8eb0c0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:41 -0800 Subject: [PATCH 147/561] python3Packages.cogapp: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/cogapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 16059fe3d6b55..facbc3206894d 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "09a6e82a55af45f5e946d7002ed997869abf6f57d28fdc79f128132b5da18bf8"; + sha256 = "1be95183f70282422d594fa42426be6923070a4bd8335621f6347f3aeee81db0"; }; # there are no tests From 038def5b1ee813f31ec645b22004f1307a581b54 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:42 -0800 Subject: [PATCH 148/561] python3Packages.configparser: 5.0.2 -> 5.1.0 --- pkgs/development/python-modules/configparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 3eeae353d1158..5f227fa4f9efd 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "configparser"; - version = "5.0.2"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "85d5de102cfe6d14a5172676f09d19c465ce63d6019cf0a4ef13385fc535e828"; + sha256 = "202b9679a809b703720afa2eacaad4c6c2d63196070e5d9edc953c0489dfd536"; }; # No tests available From de1b54e25defbaa22d3b5823782146ca92447c1c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:42 -0800 Subject: [PATCH 149/561] python3Packages.crccheck: 1.0 -> 1.1 --- pkgs/development/python-modules/crccheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index 1762d60dfde5e..891e67f644661 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -3,7 +3,7 @@ let pname = "crccheck"; - version = "1.0"; + version = "1.1"; in buildPythonPackage { inherit pname version; @@ -11,7 +11,7 @@ in buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "1ay9lgy80j7lklm07iw2wq7giwnv9fbv50mncblqlc39y322vi0p"; + sha256 = "45962231cab62b82d05160553eebd9b60ef3ae79dc39527caef52e27f979fa96"; }; disabled = !isPy3k; From f0adb93c1b3250afa9dfbbb8dcee8a1d731907a4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:42 -0800 Subject: [PATCH 150/561] python3Packages.curtsies: 0.3.9 -> 0.3.10 --- pkgs/development/python-modules/curtsies/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 549d6062c1749..3ef99936c47a4 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "curtsies"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "933b503767ce38fe32a1f77639d9a4fa3d5229d41abb31a91a6fcbdf01511a55"; + sha256 = "11efbb153d9cb22223dd9a44041ea0c313b8411e246e7f684aa843f6aa9c1600"; }; propagatedBuildInputs = [ blessings cwcwidth ] From 577f3b838bbe80b4ac59fb9ddf4febfb50df31a9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:42 -0800 Subject: [PATCH 151/561] python3Packages.cx_Freeze: 6.8.1 -> 6.8.3 --- pkgs/development/python-modules/cx_freeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 2f1797bf4fed8..514b53b873a99 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.8.1"; + version = "6.8.3"; src = fetchPypi { inherit pname version; - sha256 = "3f16d3d40f7f2e1f6032132170d8fd4ba2f4f9ea419f13d7a68091bbe1949583"; + sha256 = "05e7a2b099d4eb36e74116311b693dcc3103763aee92ef32079be0b6d4832fa0"; }; disabled = pythonOlder "3.5"; From 4ff8cacdf2250dff0157476b8006f657b83c38be Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:42 -0800 Subject: [PATCH 152/561] python3Packages.cx_Oracle: 8.2.1 -> 8.3.0 --- pkgs/development/python-modules/cx_oracle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index a5606ac3dd200..3b7d701f1114a 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "8.2.1"; + version = "8.3.0"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "12e7e913a7a10fd8caafb9855e6703a601b7dd5cc596fcd489d0ac9529608b6c"; + sha256 = "3b2d215af4441463c97ea469b9cc307460739f89fdfa8ea222ea3518f1a424d9"; }; preConfigure = '' From 811e5c9340d5d38084d89b33f7816c234c92fc12 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:43 -0800 Subject: [PATCH 153/561] python3Packages.cycler: 0.10.0 -> 0.11.0 --- pkgs/development/python-modules/cycler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index 643a57e259ff5..b9bd167c6a945 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cycler"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"; + sha256 = "9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f"; }; checkInputs = [ coverage nose ]; From c2476c11cf71647b2330b16db9eb636179e2bf2e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:43 -0800 Subject: [PATCH 154/561] python3Packages.cytoolz: 0.11.0 -> 0.11.2 --- pkgs/development/python-modules/cytoolz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 86ee238eb10f6..70c7e6f3c9fad 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.11.0"; + version = "0.11.2"; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "c64f3590c3eb40e1548f0d3c6b2ccde70493d0b8dc6cc7f9f3fec0bb3dcd4222"; + sha256 = "ea23663153806edddce7e4153d1d407d62357c05120a4e8485bddf1bd5ab22b4"; }; checkInputs = [ nose ]; From 322020494b0528efce4e263694d1d4009e274c21 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:43 -0800 Subject: [PATCH 155/561] python3Packages.databricks-connect: 9.1.2 -> 9.1.4 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index f0aa7a074c6de..c3bc5aee76c2c 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.2"; + version = "9.1.4"; src = fetchPypi { inherit pname version; - sha256 = "9672aae60b299de58a527f320df45769cadf436398e21f4ce73424a25badb7a7"; + sha256 = "0e4c9178635d47b18ca12284c8ba970747e0b2e2fb7dd6f0a06d35788e81cb91"; }; sourceRoot = "."; From 1113bf589b96f89577bfb6bdf011a64c909cacd6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:43 -0800 Subject: [PATCH 156/561] python3Packages.distributed: 2021.10.0 -> 2021.11.2 --- 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 b623fe302783e..3a7b12478b7f2 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.10.0"; + version = "2021.11.2"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "0kfq7lwv2n2wiws4v2rj36wx56jvkp2fl6zxg04p2lc3vcgha9za"; + sha256 = "f86a01a2e1e678865d2e42300c47552b5012cd81a2d354e47827a1fd074cc302"; }; propagatedBuildInputs = [ From e29d4461a05e2a53140befa8ef74bdf54e524313 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:43 -0800 Subject: [PATCH 157/561] python3Packages.django-configurations: 2.2 -> 2.3.1 --- .../python-modules/django-configurations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index de01f4f704176..a414979a01934 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "2.2"; + version = "2.3.1"; pname = "django-configurations"; src = fetchPypi { inherit pname version; - sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915"; + sha256 = "e2ca25530e184f0ee3b7f5ae69563461a93a8914493306ee0bf6d71e7d8ad1d0"; }; buildInputs = [ setuptools-scm ]; From 51cac4ea0812aab75139ebb90bddf12132bfd4fb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:43 -0800 Subject: [PATCH 158/561] python3Packages.django-formtools: 2.2 -> 2.3 --- pkgs/development/python-modules/django-formtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-formtools/default.nix b/pkgs/development/python-modules/django-formtools/default.nix index 311fae425a5e3..b8db4ccfd4049 100644 --- a/pkgs/development/python-modules/django-formtools/default.nix +++ b/pkgs/development/python-modules/django-formtools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-formtools"; - version = "2.2"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "1chkbl188yj6hvhh1wgjpfgql553k6hrfwxzb8vv4lfdq41jq9y5"; + sha256 = "9663b6eca64777b68d6d4142efad8597fe9a685924673b25aa8a1dcff4db00c3"; }; propagatedBuildInputs = [ django ]; From dee8795590c99c082226c46670cdf3e9a07d9c7c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:44 -0800 Subject: [PATCH 159/561] python3Packages.djangoql: 0.15.3 -> 0.16.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 e0e83e0c0619e..facfc2fafcdbc 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.15.3"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "e1a2f32573396335a8935dfc2afb29e34eff34babec1150927ff74fcd4bbdb9d"; + sha256 = "23cea52eca76e605fa2f34b13ae8d2bf60240737ee9ed3f60c667a4f64d28adf"; }; propagatedBuildInputs = [ ply ]; From 6d3a8482d4a653e2b5d3f1b3ff06949e1a63fdb4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:44 -0800 Subject: [PATCH 160/561] python3Packages.django-reversion: 4.0.0 -> 4.0.1 --- pkgs/development/python-modules/django_reversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 348228a8c0281..97836b247a33d 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "4.0.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "ad6d714b4b9b824e22b88d47201cc0f74b5c4294c8d4e1f8d7ac7c3631ef3188"; + sha256 = "6991f16e5d3a972912db3d56e3a714d10b07becd566ab87f85f2e9b671981339"; }; # tests assume the availability of a mysql/postgresql database From 4635cd2e61a7df72d45d2e04826484825b49bc85 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:44 -0800 Subject: [PATCH 161/561] python3Packages.django-rq: 2.4.1 -> 2.5.1 --- pkgs/development/python-modules/django-rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 18a6808a21ef7..de8db96839633 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.4.1"; + version = "2.5.1"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "v${version}"; - sha256 = "1dy3mhj60xlqy7f65zh80sqn6qywsp697r6yy3jcl5wmwizzhybr"; + sha256 = "169mj0i8x9184ggks2l6ck669b2kxg75na1a09kqk3rzrb6kg1z2"; }; propagatedBuildInputs = [ From f635e61f4ea7ba9c3642dcff8d1f7edb3e4a3347 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:44 -0800 Subject: [PATCH 162/561] python3Packages.django-statici18n: 2.0.1 -> 2.1.1 --- pkgs/development/python-modules/django-statici18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 95b860a3331de..7282cf3b98726 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-statici18n"; - version = "2.0.1"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0cqwfirzjbanibq3mfz9lcwqnc8655zpysf9hk9g3lbwj2m478sp"; + sha256 = "5c85192fa95e3ef3727517ac104add8959fc0a54be3d13440a8a3319fddbc778"; }; propagatedBuildInputs = [ django django_appconf ]; From 10909deb1b3d48e192d1ba7b66d489b7f725a5ac Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:44 -0800 Subject: [PATCH 163/561] python3Packages.doc8: 0.9.1 -> 0.10.1 --- pkgs/development/python-modules/doc8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index a1010f96d62e0..b8b040feb8af5 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "doc8"; - version = "0.9.1"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "0e967db31ea10699667dd07790f98cf9d612ee6864df162c64e4954a8e30f90d"; + sha256 = "376e50f4e70a1ae935416ddfcf93db35dd5d4cc0e557f2ec72f0667d0ace4548"; }; buildInputs = [ pbr ]; From 9731fc503815814fc466b5464623ed58dc6561a8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:44 -0800 Subject: [PATCH 164/561] python3Packages.docstring-to-markdown: 0.9 -> 0.10 --- .../python-modules/docstring-to-markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix index f4f2a36f5394a..432f77220adcd 100644 --- a/pkgs/development/python-modules/docstring-to-markdown/default.nix +++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "docstring-to-markdown"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XVTlSqqWmvnB5nvjvgGDJmg71KKTq2hHB4//QW7ugvA="; + sha256 = "0rflkbms94wkcypjcnz30bc4w4iww91h7sqq3j2b6ypzl4g48csa"; }; patches = [ From d9fe890a9e72ae6a8f5a00e7b634d7aa07f37807 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:45 -0800 Subject: [PATCH 165/561] python3Packages.docutils: 0.17.1 -> 0.18.1 --- pkgs/development/python-modules/docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 529a09d3f0468..65167343f8c3c 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "docutils"; - version = "0.17.1"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"; + sha256 = "679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06"; }; # Only Darwin needs LANG, but we could set it in general. From 29e66c2ec1ffd5ba27a1e2cf03b0b363d7753b0c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:45 -0800 Subject: [PATCH 166/561] python3Packages.dropbox: 11.23.0 -> 11.25.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 7fc0cb3b12ba1..e43f7d7f2d1d8 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.23.0"; + version = "11.25.0"; src = fetchFromGitHub { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "1zrwr73dirmkbkcpy8v49hb52xffh0k9wp2603aysg9435w1rxvx"; + sha256 = "1ln6m6wiym5608i26abs8a5nm4mnn7s3czhnpg9nyjyndnr7k0xj"; }; postPatch = '' From b3d7c394ad3bcef1202492e00710c27f448b6d1b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:45 -0800 Subject: [PATCH 167/561] python3Packages.easy-thumbnails: 2.7.2 -> 2.8 --- pkgs/development/python-modules/easy-thumbnails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 53913f77d2b5d..58489c2534afc 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.7.2"; + version = "2.8"; meta = { description = "Easy thumbnails for Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a7dd9cf97efaf70ba5d76484a962f08ba65b31f1681bc417257743650e9e8a8a"; + sha256 = "fd2249d936671847fc54a2d6c8c87bcca8f803001967dd03bab6b8bcb7590825"; }; propagatedBuildInputs = [ django pillow ]; From 1051f3798e122b07244dc31651536dc88bf13073 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:45 -0800 Subject: [PATCH 168/561] python3Packages.eliot: 1.13.0 -> 1.14.0 --- pkgs/development/python-modules/eliot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 152561b69ceec..b8f75776217ad 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "eliot"; - version = "1.13.0"; + version = "1.14.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5760194b308a7ab35514ae1b942d88e9f2359071556d82580383f09ca586fff7"; + sha256 = "c2f099a3e8d5ecfc22745766e7cc664a48db64b6b89d986dff270491d8683149"; }; checkInputs = [ From ba2c39f551d212b6362c29157c471c79e83536d4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:45 -0800 Subject: [PATCH 169/561] python3Packages.env-canada: 0.5.17 -> 0.5.18 --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 587dcf1492314..f755d545598c8 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.17"; + version = "0.5.18"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-viuBuyGzAUcfb4qSecZsDvoAU++FNhuwNJET/s0qyOI="; + sha256 = "1w2fclpmcb41k2a3226jk62hdclc8b18kxih2ads90r4yxgpxc8p"; }; propagatedBuildInputs = [ From dba2f82701ae2b00586a3d35c3ee6dcce8e2468f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:45 -0800 Subject: [PATCH 170/561] python3Packages.eventlet: 0.32.0 -> 0.33.0 --- pkgs/development/python-modules/eventlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 24639b98e64b9..038b66a8efed5 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.32.0"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "2f0bb8ed0dc0ab21d683975d5d8ab3c054d588ce61def9faf7a465ee363e839b"; + sha256 = "80144f489c1bb273a51b6f96ff9785a382d2866b9bab1f5bd748385019f4141f"; }; propagatedBuildInputs = [ dnspython greenlet pyopenssl six ] From 14cf0ed8161bda61289ff217b0173064e65312cf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:46 -0800 Subject: [PATCH 171/561] python3Packages.ffmpeg-progress-yield: 0.1.2 -> 0.2.0 --- .../python-modules/ffmpeg-progress-yield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 4b4d6bdd7fc25..add6f3f90c566 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.1.2"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "92ae36ff5cf38428bd3695629b5065d161c658fb0de0faf2c20cd7a99dac3820"; + sha256 = "26696726cc70c019d1b76bb25e4823c93f0837ddc86bc4ea26c08165270b4d92"; }; propagatedBuildInputs = [ colorama tqdm ]; From 154169daede359b0f9983769d64deae8c75c1caa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:46 -0800 Subject: [PATCH 172/561] python3Packages.folium: 0.12.0 -> 0.12.1.post1 --- pkgs/development/python-modules/folium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index c0adaeaa55892..ff8c097d6ff32 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.12.0"; + version = "0.12.1.post1"; src = fetchPypi { inherit pname version; - sha256 = "d45ace0a813ae65f202ce0356eb29c40a5e8fde071e4d6b5be0a89587ebaeab2"; + sha256 = "e91e57d8298f3ccf4cce3c5e065bea6eb17033e3c5432b8a22214009c266b2ab"; }; disabled = pythonOlder "3.5"; From 3dffd60b206b07b087ce1d589d2fccfe107cd342 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:46 -0800 Subject: [PATCH 173/561] python3Packages.frozendict: 2.0.7 -> 2.1.0 --- pkgs/development/python-modules/frozendict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index e2ebc07ae31ba..2d0e540b4fc9c 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.0.7"; # 2.0.6 breaks canonicaljson + version = "2.1.0"; # 2.0.6 breaks canonicaljson format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a68f609d1af67da80b45519fdcfca2d60249c0a8c96e68279c1b6ddd92128204"; + sha256 = "0189168749ddea8601afd648146c502533f93ae33840eb76cd71f694742623cd"; }; pythonImportsCheck = [ From 6f031035b7119fecf0df5c38ddd85199048a422a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:46 -0800 Subject: [PATCH 174/561] python3Packages.fs: 2.4.13 -> 2.4.14 --- pkgs/development/python-modules/fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 88aba15544453..ac7fae213b003 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.4.13"; + version = "2.4.14"; src = fetchPypi { inherit pname version; - sha256 = "caab4dc1561d63c92f36ee78976f6a4a01381830d8420ce34a78d4f1bb1dc95f"; + sha256 = "9555dc2bc58c58cac03478ac7e9f622d29fe2d20a4384c24c90ab50de2c7b36c"; }; buildInputs = [ glibcLocales ]; From 172b5bdc98330411c9e3400d1a59190c7299930a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:46 -0800 Subject: [PATCH 175/561] python3Packages.gdown: 4.0.2 -> 4.2.0 --- pkgs/development/python-modules/gdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 851f761287612..bb9085e0d674e 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.0.2"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XSYc3mCsFW+x6aZFDNtUE9lHv9vPUvkdsqmbtFX7aQw="; + sha256 = "bd871c125242a9d3691aa74f360b6b5268a58c13991bb2405fdb3ec3028307dc"; }; propagatedBuildInputs = [ filelock requests tqdm setuptools six ]; From d3cb5892cc320d33def6acf1418655f5a57f7b37 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:47 -0800 Subject: [PATCH 176/561] python3Packages.genanki: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/genanki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index 2c54bc4910b58..627a8598fa997 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "f2be87e3c2850bba21627d26728238f9655b448e564f8c70ab47caef558b63ef"; + sha256 = "f787ac440ff37a3ef3389030e992e3527f000f7a69498f797033ccfad07ebe62"; }; propagatedBuildInputs = [ From c8ef4c8df241256f01da80f00f9c8703b30ad655 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:47 -0800 Subject: [PATCH 177/561] python3Packages.geoip2: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/geoip2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index fcf2441b2e83f..2a626c9c9ea89 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "4.4.0"; + version = "4.5.0"; pname = "geoip2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f150bed3190d543712a17467208388d31bd8ddb49b2226fba53db8aaedb8ba89"; + sha256 = "b542252e87eb40adc3a2fc0f4e84b514c4c5e04ed46923a3a74d509f25f3103a"; }; patchPhase = '' From 6900ecfe769675dde4953af8286dd72ffcb389ad Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:47 -0800 Subject: [PATCH 178/561] python3Packages.geventhttpclient: 1.5.2 -> 1.5.3 --- pkgs/development/python-modules/geventhttpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 0d5b46b4dd30d..7e30b8e83f490 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "1.5.2"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "f3c5884d62be75162426728e3d86788740b13e363b197ef592f1443dba240709"; + sha256 = "d80ec9ff42b7219f33558185499d0b4365597fc55ff886207b45f5632e099780"; }; propagatedBuildInputs = [ From c8784b389e869c1e18347124b2f198e8c29941c4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:47 -0800 Subject: [PATCH 179/561] python3Packages.gitdb: 4.0.7 -> 4.0.9 --- pkgs/development/python-modules/gitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index a5fa115781461..0895270d6c9cc 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "gitdb"; - version = "4.0.7"; + version = "4.0.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005"; + sha256 = "bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa"; }; propagatedBuildInputs = [ smmap ]; From 48eb97f0b83a5c4948c57bf0bf6a1ebb79430132 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:47 -0800 Subject: [PATCH 180/561] python3Packages.google-api-core: 2.1.0 -> 2.2.2 --- pkgs/development/python-modules/google-api-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index ae6f465b1bf2f..ea18d4fb77197 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.1.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XsJ7lCs00EVZy/NnRDC7g/w9dOfTK4u9McRGbnF0C4M="; + sha256 = "97349cc18c2bb2415f64f1353a80273a289a61294ce3eb2f7ce682d251bdd997"; }; propagatedBuildInputs = [ From 7c60fb0c2ab11e07ee4932c46308a42bf3e9e88c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:47 -0800 Subject: [PATCH 181/561] python3Packages.google-api-python-client: 2.25.0 -> 2.31.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 b612a58c4f9ed..e4046ab2637c8 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.25.0"; + version = "2.31.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dNgF7xC4sfWL04U53T0D+vEYj2TuPKQorAQtU59fVcc="; + sha256 = "3f64a5eee6fa03ab51806dccf48e342fda83fea60c290518c6a2dfdbf2de9efd"; }; # No tests included in archive From a28502a48692404998e72db9d2334af55bdbe640 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:48 -0800 Subject: [PATCH 182/561] python3Packages.google-auth: 2.3.0 -> 2.3.3 --- pkgs/development/python-modules/google-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 076d1e2da4f76..b51a5569a5958 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.3.0"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KAD2360pxs7V+vnKDDjqi6Hr4lWbEMApvQIePeMwFic="; + sha256 = "d83570a664c10b97a1dc6f8df87e5fdfff012f48f62be131e449c20dfc32630e"; }; propagatedBuildInputs = [ From 899138fa6856c67e1b2de8c62d4d68267962b5c3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:48 -0800 Subject: [PATCH 183/561] python3Packages.google-cloud-access-context-manager: 0.1.8 -> 0.1.9 --- .../google-cloud-access-context-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index a3ecf1a6ec4b8..c9690b6e31046 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "29101f61fa0e07db6385a94da45aef8edb4efde0d2b700fbbf65164c045744a8"; + sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8"; }; postPatch = '' From e6bfbc614d365df6c4b407872e41804d59152de5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:48 -0800 Subject: [PATCH 184/561] python3Packages.google-cloud-bigquery: 2.28.1 -> 2.30.1 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index b96d61bf6724b..58be00adb9c0e 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.28.1"; + version = "2.30.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DiNT2X5SktyM5URHtxL7nolJbnFLXKz8PVNmFNHEYdw="; + sha256 = "4e3b5e3dcc475d5a601d84872ac0b63e059540be2251b1c4165c51106d572855"; }; propagatedBuildInputs = [ From 9328e926a6a92b6b2a0e19bbd1e615a0d68480b5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:48 -0800 Subject: [PATCH 185/561] python3Packages.google-cloud-core: 2.1.0 -> 2.2.1 --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index ef02d0671b058..0351bd51e2eee 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NaH18CqG4PouKMZp8NtKdtkoZxoo+7u0k6tZup0cuak="; + sha256 = "476d1f71ab78089e0638e0aaf34bfdc99bab4fce8f4170ba6321a5243d13c5c7"; }; propagatedBuildInputs = [ google-api-core ]; From e48c4d07c736bb77787dd10fde6252a3446ae4f5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:48 -0800 Subject: [PATCH 186/561] python3Packages.google-cloud-datacatalog: 3.6.0 -> 3.6.1 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 72d8e7ec60abc..0e0d5982c6e2c 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "b4a3ba5bc93fb38008077335546daef9f5ea59a1b3accb98b0d07ca7fe6c6e37"; + sha256 = "136fb153740d4154d8c9ef306284f7f899399de45eef2c9027ca3e56249c4e2d"; }; propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; From 633dc083d05151c24351ecbee85e5d69f5b688a8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:49 -0800 Subject: [PATCH 187/561] python3Packages.google-cloud-monitoring: 2.7.0 -> 2.8.0 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index cf2ff18eddba2..4872f7ac448a5 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "973f33f4da9598a30769e27510fc0cd4470f9081ba694c6c589bb8c0b86a0a6d"; + sha256 = "2a25f7535f21cdeabfccb07fe4a75eae5a47bb36b82025537755b37d3376da46"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From ac7602aa0c9bf09c9ac751059f67110b8993e495 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:49 -0800 Subject: [PATCH 188/561] python3Packages.google-cloud-resource-manager: 1.3.2 -> 1.3.3 --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 4a83a96be332a..98c9f31632026 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "b99e11360668ed0c034c8cf3a34caf6fd4a52efaf62d54dd85407c3ad20b715c"; + sha256 = "b13e0a614b4865287a4b5fc43f4810d3d48fef7e24d9bcf54cb4bd93bfbb2bf2"; }; propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; From 49ada48c12f0e972ef3871fb86169efd87e04ffe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:49 -0800 Subject: [PATCH 189/561] python3Packages.google-cloud-storage: 1.42.3 -> 1.43.0 --- .../python-modules/google-cloud-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 5ad4c2a31f66d..9d97437b81515 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.42.3"; + version = "1.43.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d1TU3KpFl1UUtATs4NortCkqy8Z8pVmmnhKhnVT82wY="; + sha256 = "f3b4f4be5c8a1b5727a8f7136c94d3bacdd4b7bf11f9553f51ae4c1d876529d3"; }; propagatedBuildInputs = [ From 15867e7d43d0e2d4f724aa11d33dd59a0d8c5be0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:49 -0800 Subject: [PATCH 190/561] python3Packages.google-cloud-testutils: 1.1.0 -> 1.2.0 --- .../python-modules/google-cloud-testutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 2c208511ee3f0..24775464a120c 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "3d79051b6ca170c2a4f159bf56ac3f66c1e5360486121e72c06fdaa3911154bf"; + sha256 = "9c60ea86b28998935875b5aea0b89b0a3aac5e433e0039236f633c5d0ff5f8b8"; }; propagatedBuildInputs = [ click google-auth six ]; From 0ffa5ebfa301d9f073d8957d7092911a2ab79434 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:49 -0800 Subject: [PATCH 191/561] python3Packages.google-cloud-texttospeech: 2.7.1 -> 2.9.0 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 5e0de87f44b93..06c1eeb857f99 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.7.1"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "e81beafa612f288fe74db55dd3a409f96cb01d2bac117bcd06a4e5b427d81476"; + sha256 = "e8e272ab54be00285c8f9451081d833980c9fc2a1eff828448dfe315dfa61250"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From 7d34fdb0a9aa4f977b24771041738bdc5d6fe501 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:49 -0800 Subject: [PATCH 192/561] python3Packages.gradient: 1.8.9 -> 1.8.13 --- pkgs/development/python-modules/gradient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 556688323b1e2..735dc03b6df76 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.8.9"; + version = "1.8.13"; src = fetchPypi { inherit pname version; - sha256 = "c05913efe7fcc9f75c1fe84c157d2c2cf3ec0983e132d418c6e59fabc6361a1e"; + sha256 = "0fa4a0553c28839e364d3aac27ec7292d26c1df27b8c54701d57eb7eda0b14f2"; }; postPatch = '' From 9e0253aa5904c99c5c2558da33ac8fac23fd7cdd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:50 -0800 Subject: [PATCH 193/561] python3Packages.gradient-utils: 0.3.2 -> 0.5.0 --- pkgs/development/python-modules/gradient-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix index 171f87b5ddb22..b7424c44f6def 100644 --- a/pkgs/development/python-modules/gradient-utils/default.nix +++ b/pkgs/development/python-modules/gradient-utils/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gradient-utils"; - version = "0.3.2"; + version = "0.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Paperspace"; repo = pname; rev = "v${version}"; - sha256 = "083hnkv19mhvdc8nx28f1nph50c903gxh9g9q8531abv0w8m0744"; + sha256 = "19plkgwwfs6298vjplgsvhirixi3jbngq5y07x9c0fjxk39fa2dk"; }; postPatch = '' From fc9ce57a1dce93bd5d089222711f9fc5c31c42f9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:50 -0800 Subject: [PATCH 194/561] python3Packages.graphene: 3.0.0b8 -> 3.0.0 --- pkgs/development/python-modules/graphene/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index 38c11cc4c8bef..7a28bc08cda42 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "graphene"; - version = "3.0.0b8"; + version = "3.0.0"; src = fetchFromGitHub { owner = "graphql-python"; repo = "graphene"; rev = "v${version}"; - sha256 = "sha256-Pgln369s4qXdKqLxhX+AkgpDQm+MfSZ/OVmB1AaawHI="; + sha256 = "0qgp3nl6afyz6y27bw175hyqppx75pp1vqwl7nvlpwvgwyyc2mnl"; }; propagatedBuildInputs = [ From fded6f39879f9626cea15f2ee16de69f02e7ae36 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:50 -0800 Subject: [PATCH 195/561] python3Packages.graspologic: 0.3 -> 0.3.1 --- pkgs/development/python-modules/graspologic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 2096f22a249c9..10e7190d1fde7 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "graspologic"; - version = "0.3"; + version = "0.3.1"; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "v${version}"; - sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r"; + sha256 = "07dmfb1aplha01d22b41js7634dac4v28pv1l3bzssqhi4yyds7h"; }; propagatedBuildInputs = [ From 94dc838bdd892c040b66117c4d3c121765b90893 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:50 -0800 Subject: [PATCH 196/561] python3Packages.gruut-ipa: 0.9.3 -> 0.11.0 --- pkgs/development/python-modules/gruut-ipa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index 50140ef8308d9..4fa9d62b7ac87 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "gruut-ipa"; - version = "0.9.3"; + version = "0.11.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d/AbvgAD3GHXpwhqjT5Xt9q7Kix+eFMX4kW2BywZWX0="; + sha256 = "08n79v60jhkz5vhychsicjz4bhz8v4gb2djmz5dfdaivyr0h3bsf"; }; postPatch = '' From c3880e1d52ec850008bfd1d7d4e05dba94037ab1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:50 -0800 Subject: [PATCH 197/561] python3Packages.gsd: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/gsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index e781c2127dab6..f4f3a7eb13fa9 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "2.5.0"; + version = "2.5.1"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "0zw3ihbzkldwijz9phwivnzwylj30a2a4lknfbwm6vkx78rdrb1a"; + sha256 = "00cy4lw7xnl2skfx7fg7cs1c8lrbaxvkym9j6zfi1dbvsdd0r103"; }; nativeBuildInputs = [ cython ]; From b5acc0a5e089e199e3e01bb69a3d5f4e6591caa8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:50 -0800 Subject: [PATCH 198/561] python3Packages.gssapi: 1.7.0 -> 1.7.2 --- pkgs/development/python-modules/gssapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index ce2ba8d3730fe..330172f56ceec 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.7.0"; + version = "1.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "0ybijgsr4ra7x1w86sva4qljhm54ilm2zv4z0ry1r14kq9hmjfa4"; + sha256 = "1xdcnm66b07m7chf04pp58p3khvy547hns1fw1xffd4n51kl42pp"; }; # It's used to locate headers From 8ba1b71f0753aef4fcc85db2761e8d088b832632 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:51 -0800 Subject: [PATCH 199/561] python3Packages.gviz_api: 1.9.0 -> 1.10.0 --- pkgs/development/python-modules/gviz-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix index 3ec69d686952f..04ba3b9520faf 100644 --- a/pkgs/development/python-modules/gviz-api/default.nix +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "gviz_api"; - version = "1.9.0"; + version = "1.10.0"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg"; + sha256 = "a05055fed8c279f34f4b496eace7648c7fe9c1b06851e8a36e748541f1adbb05"; }; propagatedBuildInputs = [ From 871750cf62cacd9a20a31cc0e2050cade12648ce Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:51 -0800 Subject: [PATCH 200/561] python3Packages.h5py: 3.4.0 -> 3.6.0 --- pkgs/development/python-modules/h5py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index e555a41cfb0a7..701b8f78f83b8 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -8,13 +8,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.4.0"; + version = "3.6.0"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ee1c683d91ab010d5e85cb61e8f9e7ee0d8eab545bf3dd50a9618f1d0e8f615e"; + sha256 = "8752d2814a92aba4e2b2a5922d2782d0029102d99caaf3c201a566bc0b40db29"; }; # avoid strict pinning of numpy From 6189985e00df9d936394ba7a897e6410a4e1fea9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:51 -0800 Subject: [PATCH 201/561] python3Packages.hg-evolve: 10.4.0 -> 10.4.1 --- pkgs/development/python-modules/hg-evolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 70b1a1fe52765..27c2167ff1dd2 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.4.0"; + version = "10.4.1"; src = fetchPypi { inherit pname version; - sha256 = "64fd249a7fcabea60953fc3e7f08da6a85960aca367c04d078b999b7f6fd0246"; + sha256 = "b47d9a1e0af3d7b54edd646581ac3e3ab046a572368eeb22dfd89dff7f9964d2"; }; checkInputs = [ From 4888f321dd11227e22f2f21c0aba846d841dfec4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:51 -0800 Subject: [PATCH 202/561] python3Packages.hg-git: 0.10.2 -> 0.10.3 --- pkgs/development/python-modules/hg-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index 69756083e5d8c..eccdcdaed422a 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "hg-git"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "aae1c47328bb7f928778712654c3d5f100445190e2891f175dac66d743fdb2e8"; + sha256 = "27e6d7686a1548d4632dcc977f2ff3ce2e42d80735339b1f3b389b7481260cc4"; }; propagatedBuildInputs = [ dulwich mercurial ]; From 310645114ddc7f4e72e2b24031bfde0a79d5935a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:52 -0800 Subject: [PATCH 203/561] python3Packages.httpx-socks: 0.4.1 -> 0.7.2 --- pkgs/development/python-modules/httpx-socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index f73d81cc6aaa6..47e39dcef3c4f 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.4.1"; + version = "0.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "romis2012"; repo = pname; rev = "v${version}"; - sha256 = "1rz69z5fcw7d5nzy5q2q0r9gxrsqijgpg70cnyr5br6xnfgy01ar"; + sha256 = "1wigmkhn4ymfr12z9vhdaimjcma9llicwrr29q0cc8xmy23f3445"; }; propagatedBuildInputs = [ From 10121e5cdae41e89716ea0079f7e3c98f4b8929d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:52 -0800 Subject: [PATCH 204/561] python3Packages.huggingface-hub: 0.0.18 -> 0.1.2 --- pkgs/development/python-modules/huggingface-hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 9744a74873002..b0aa6a48d3529 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.0.18"; + version = "0.1.2"; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "v${version}"; - sha256 = "sha256-SxA7rAdKuSrSYFIuxG81lblPJOL69Yx4rBccVrbQa/g="; + sha256 = "1pmi76vinwwn0bcxy5hj8pxhzqxdbzp0y3hsd631yyys01s0n6xd"; }; nativeBuildInputs = [ packaging ]; From 80ffb4c8b6cee6ac8b94372ee9214fdfa96dedcb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:52 -0800 Subject: [PATCH 205/561] python3Packages.hyperopt: 0.2.5 -> 0.2.7 --- pkgs/development/python-modules/hyperopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix index d407ff95a010a..2b439762ac95d 100644 --- a/pkgs/development/python-modules/hyperopt/default.nix +++ b/pkgs/development/python-modules/hyperopt/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "hyperopt"; - version = "0.2.5"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "bc6047d50f956ae64eebcb34b1fd40f186a93e214957f20e87af2f10195295cc"; + sha256 = "1bf89ae58050bbd32c7307199046117feee245c2fd9ab6255c7308522b7ca149"; }; propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ]; From 47f83636a05d122a33a27fe7b9359505944e2824 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:52 -0800 Subject: [PATCH 206/561] python3Packages.hypothesis: 6.24.5 -> 6.27.1 --- 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 799d7e0702fed..4cf8acf708725 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.24.5"; + version = "6.27.1"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "+pPnMgbLdYbh0xqPewNOJRaL7VtxeN73wbHHuK0fNYo="; + sha256 = "05kfz041vrd9fy8gl8ch05g806jj4j6l1cnwhqgygagn9z3aq1jx"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From 1373d4c206bc35d32f61538367a431e2e68af4a4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:52 -0800 Subject: [PATCH 207/561] python3Packages.ibm-cloud-sdk-core: 3.13.0 -> 3.13.2 --- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 8c3c3670c424c..1f8b4063dd796 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.13.0"; + version = "3.13.2"; src = fetchPypi { inherit pname version; - sha256 = "b27aec03e8c666b3e36c68b2331871f37a0c6c0467fe0f73462fda7300d3c19f"; + sha256 = "9c615b3a6e9d9dc1c69d8f38742b156e12408521fa180a66558bbb7b850bbbc2"; }; propagatedBuildInputs = [ From e749bfaf01f4421232ae4e64c8306dba3810a0aa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:52 -0800 Subject: [PATCH 208/561] python3Packages.idna: 3.2 -> 3.3 --- pkgs/development/python-modules/idna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index cb8636f135a8e..dd01128601050 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "idna"; - version = "3.2"; + version = "3.3"; src = fetchPypi { inherit pname version; - sha256 = "467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"; + sha256 = "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"; }; checkInputs = [ pytestCheckHook ]; From f44b8a7564a7dfa7a5c62484bad491fdf5db840c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:53 -0800 Subject: [PATCH 209/561] python3Packages.ignite: 0.4.6 -> 0.4.7 --- pkgs/development/python-modules/ignite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index da5dfddcfb13d..c027eba987422 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dlKGXjUUnyYmPDilo0LQg9OkSkBnMYNgzlFLIfI0T6I="; + sha256 = "11gvw0yqb3y5ddifs5f38bgslvfmw1bmd9rga1ynlrmmgmhxym6h"; }; checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; From 12e5254d5afdb4bd73f584e8dc2d55399235e1cb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:53 -0800 Subject: [PATCH 210/561] python3Packages.imageio: 2.9.0 -> 2.12.0 --- pkgs/development/python-modules/imageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 1672e798f3040..d47525d18a4ce 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.9.0"; + version = "2.12.0"; disabled = isPy27; src = fetchPypi { - sha256 = "52ddbaeca2dccf53ba2d6dec5676ca7bc3b2403ef8b37f7da78b7654bb3e10f0"; + sha256 = "c416dd68328ace8536ff333cbb8927954036be56e201fed416e53e8f95e08a6c"; inherit pname version; }; From 0110962579c6c177a14963f5047da35ac2f433b3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:53 -0800 Subject: [PATCH 211/561] python3Packages.imagesize: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/imagesize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix index 42cf6b50764dd..0fbe88a520fe1 100644 --- a/pkgs/development/python-modules/imagesize/default.nix +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "imagesize"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"; + sha256 = "cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"; }; meta = with lib; { From 822770bae0343a3e2993d1945164725cc74271e1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:53 -0800 Subject: [PATCH 212/561] python3Packages.ipykernel: 6.4.1 -> 6.5.1 --- 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 21e371c1a48bd..f18750af1ffb3 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.4.1"; + version = "6.5.1"; src = fetchPypi { inherit pname version; - sha256 = "df3355e5eec23126bc89767a676c5f0abfc7f4c3497d118c592b83b316e8c0cd"; + sha256 = "dd27172bccbbcfef952991e49372e4c6fd1c14eed0df05ebd5b4335cb27a81a2"; }; propagatedBuildInputs = [ From 88330c49b87dbfbee3a0ec826f7d780734089591 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:54 -0800 Subject: [PATCH 213/561] python3Packages.ipython: 7.28.0 -> 7.29.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 7b844228225b3..2065dc2349fd6 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.28.0"; + version = "7.29.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11"; + sha256 = "4f69d7423a5a1972f6347ff233e38bbf4df6a150ef20fbb00c635442ac3060aa"; }; prePatch = lib.optionalString stdenv.isDarwin '' From 9eec6c3821a41273b7203ee023b0441f9e17a3c5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:54 -0800 Subject: [PATCH 214/561] python3Packages.ipyvue: 1.6.1 -> 1.7.0 --- pkgs/development/python-modules/ipyvue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 0c46ecd8e1d3c..6c0b15c41b37e 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.6.1"; + version = "1.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6cc15428bfcd5c7daae73c45c776b34056fe4d885a34192fb93efc80d6b9753f"; + sha256 = "fa8ff9b9a73b5a925c4af4c05f1839df2bd0fae0063871f403ee821792d5ab72"; }; propagatedBuildInputs = [ ipywidgets ]; From f754a536f249d8b6c770439dbf1dcd1a108d9a08 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:54 -0800 Subject: [PATCH 215/561] python3Packages.iterm2: 1.29 -> 1.30 --- pkgs/development/python-modules/iterm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 125dc2691e5bc..1cba03531b5be 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.29"; + version = "1.30"; src = fetchPypi { inherit pname version; - sha256 = "8245562ed713fd473520f81361cdc1b15835920e1ceb7d588678cd153e77c2b6"; + sha256 = "148b32a593f3d932a33daad01fdaa4639918eca74a6e153d9729dd8b3cba3345"; }; propagatedBuildInputs = [ protobuf websockets ]; From 855c2893cfd2e4b8345861dc99b68b557c807ff3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:54 -0800 Subject: [PATCH 216/561] python3Packages.janus: 0.6.2 -> 0.7.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 b68bcc3032569..f46ef2e62f5cb 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "janus"; - version = "0.6.2"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "127edc891f9e13420dd12f230d5113fa3de7f93662b81acfaf845989edf5eebf"; + sha256 = "f10dcf5776e8d49cc30ec86d5eb7268eeec39abaa24fe0332ee8fb8fa3611845"; }; disabled = pythonOlder "3.6"; From 4e54dcd2d48bfd0991b04c203033170cdabfbff7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:54 -0800 Subject: [PATCH 217/561] python3Packages.jaraco.functools: 3.3.0 -> 3.4.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 3ad652af7643a..1316c2b4e729d 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.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314"; + sha256 = "659a64743047d00c6ae2a2aa60573c62cfc0b4b70eaa14fa50c80360ada32aa8"; }; nativeBuildInputs = [ setuptools-scm ]; From 2f230f7d5074406a8b744c95dd2bd6bb7ac665c7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:55 -0800 Subject: [PATCH 218/561] python3Packages.jaraco.text: 3.5.1 -> 3.6.0 --- pkgs/development/python-modules/jaraco_text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 32e8aa23aeb4f..ea7067b587734 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.5.1"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "ede4e9103443b62b3d1d193257dfb85aab7c69a6cef78a0887d64bb307a03bc3"; + sha256 = "901d3468eaaa04f1d8a8f141f54b8887bfd943ccba311fc1c1de62c66604dfe0"; }; pythonNamespaces = [ "jaraco" ]; From 685788d164613d614502b6c508dd03b3cc4053b8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:55 -0800 Subject: [PATCH 219/561] python3Packages.jax: 0.2.24 -> 0.2.25 --- pkgs/development/python-modules/jax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index ce9a7758bc61f..dd9680abcc0d3 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "jax"; - version = "0.2.24"; + version = "0.2.25"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "jax-v${version}"; - sha256 = "1mmn1m4mprpwqlb1smjfdy3f74zm9p3l9dhhn25x6jrcj2cgc5pi"; + sha256 = "0f32is9896g4shfhjipj3rlgpjxci5y607lp8gxlgsdzdqfpckm2"; }; # jaxlib is _not_ included in propagatedBuildInputs because there are From 1a056f473379d8df5d5afbcb1374f06415c17173 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:55 -0800 Subject: [PATCH 220/561] python3Packages.jedi-language-server: 0.34.8 -> 0.34.11 --- .../python-modules/jedi-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 8aead2738f401..90e4634b46c97 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.34.8"; + version = "0.34.11"; format = "pyproject"; src = fetchFromGitHub { owner = "pappasam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mJGgDDjPZXde4M4OHwj81KYoaFXFAwOZ+v18YE+arFE="; + sha256 = "0gxpq93mfyzhjz5yvjwv2jjda1djpf20x38893ngswsm7lrh62x5"; }; nativeBuildInputs = [ From 3fb68c727315a8d10992a5d462cd939f5bb88bf4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:55 -0800 Subject: [PATCH 221/561] python3Packages.jellyfin-apiclient-python: 1.7.2 -> 1.8.0 --- .../python-modules/jellyfin-apiclient-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index ca96e63060da2..8c7687511628d 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jellyfin-apiclient-python"; - version = "1.7.2"; + version = "1.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A="; + sha256 = "a47d66166d1e9d3f0b38260004081bfd3fd9c07ca1b50181bbb980c4d7aeee34"; }; propagatedBuildInputs = [ From b9ef2146c8d5183ebaf06ac88358a12010559538 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:55 -0800 Subject: [PATCH 222/561] python3Packages.jenkins-job-builder: 3.10.0 -> 3.11.0 --- .../python-modules/jenkins-job-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index f2b014ff52400..5613b904f63df 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.10.0"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8MP8YHIkxDqjPsUYv6ROmuRwcGMzPpsVCRwxga3XdYU="; + sha256 = "42ea423f44beafee0e985009124968e300447f6e3be4180e83568cf21520d1b1"; }; postPatch = '' From b1596a7b6e96cc6f1881804bbfe2b62dacb068ea Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:55 -0800 Subject: [PATCH 223/561] python3Packages.Jinja2: 3.0.2 -> 3.0.3 --- pkgs/development/python-modules/jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 7be9367da916f..5d7ca68b19b79 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "Jinja2"; - version = "3.0.2"; + version = "3.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"; + sha256 = "611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"; }; propagatedBuildInputs = [ From 29576844b1282e7a4442365419897b161a0c9be4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:56 -0800 Subject: [PATCH 224/561] python3Packages.josepy: 1.10.0 -> 1.11.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 b262e6883322e..c091480f63c6a 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.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "e9bcaf605411cadaec04841ae2d5f77ebb178b7b6df7c9aed1d97399ac18685b"; + sha256 = "40ef59f2f537ec01bafe698dad66281f6ccf4642f747411647db403ab8fa9a2d"; }; postPatch = '' From e2de0eff5d86e10419931c1b61afee6d804bf45a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:56 -0800 Subject: [PATCH 225/561] python3Packages.jsonpointer: 2.1 -> 2.2 --- pkgs/development/python-modules/jsonpointer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index 39249c648f561..2bd41e0815b4d 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "2.1"; + version = "2.2"; src = fetchPypi { inherit pname version; - sha256 = "5a34b698db1eb79ceac454159d3f7c12a451a91f6334a4f638454327b7a89962"; + sha256 = "f09f8deecaaa5aea65b5eb4f67ca4e54e1a61f7a11c75085e360fe6feb6a48bf"; }; meta = with lib; { From 83c05188fec052cb700b17dc2138e9189d2346e8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:56 -0800 Subject: [PATCH 226/561] python3Packages.jsonwatch: 0.2.0 -> 0.6.0 --- pkgs/development/python-modules/jsonwatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix index aec66d4ec4b77..d7080b71f79e6 100644 --- a/pkgs/development/python-modules/jsonwatch/default.nix +++ b/pkgs/development/python-modules/jsonwatch/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "jsonwatch"; - version = "0.2.0"; + version = "0.6.0"; disabled = isPyPy; # doesn't find setuptools src = fetchFromGitHub { owner = "dbohdan"; repo = "jsonwatch"; rev = "v${version}"; - sha256 = "sha256-yLN6jOxAz+B7zvV3tGT6Nxi17v9ZOtWpbtSi0o1h48U="; + sha256 = "0abmyv3nrfqhjmfnvpn4q3yc05a1gamfxj5frlbn1lidzzhb8rac"; }; propagatedBuildInputs = [ six ]; From 880c445069fb57a61b6c25ae850285f8a45478f7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:56 -0800 Subject: [PATCH 227/561] python3Packages.jupyter_client: 7.0.6 -> 7.1.0 --- pkgs/development/python-modules/jupyter-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index b543008988ea3..9cb465947551a 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.0.6"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "8b6e06000eb9399775e0a55c52df6c1be4766666209c22f90c2691ded0e338dc"; + sha256 = "a5f995a73cffb314ed262713ae6dfce53c6b8216cea9f332071b8ff44a6e1654"; }; propagatedBuildInputs = [ From 3a2b069e464af3a6a12cda36d2bdbba658fb08ea Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:56 -0800 Subject: [PATCH 228/561] python3Packages.jupyter_core: 4.8.1 -> 4.9.1 --- pkgs/development/python-modules/jupyter_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index f83ba1362341f..a7dd89a1f89a0 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.8.1"; + version = "4.9.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ef210dcb4fca04de07f2ead4adf408776aca94d17151d6f750ad6ded0b91ea16"; + sha256 = "dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa"; }; checkInputs = [ pytest mock glibcLocales nose ]; From e57d6c9f4ca2d5b2c682e8796db089e27e7ecaf8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:56 -0800 Subject: [PATCH 229/561] python3Packages.jupyterlab: 3.2.3 -> 3.2.4 --- 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 686be89d2a7e9..ab2900a2f88b7 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.2.3"; + version = "3.2.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7d74593e52d4dbfacbb98e14cac4bc765ea2cffb1b980675f44930d622871705"; + sha256 = "f692e0d95338d60f72dde660f16f3955a087775c59ec541ddb25952e3f97e9b1"; }; nativeBuildInputs = [ jupyter-packaging ]; From b73ad32af2d225028d35ccc176da09010a366740 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:57 -0800 Subject: [PATCH 230/561] python3Packages.k5test: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/k5test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 0079194f4fa71..f5efb24633bb3 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "k5test"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "fc5e7e5e286b2f331c1396c33f2a1cd8cf34e78d8d482168a50ffd8576a1455c"; + sha256 = "2c9181133f3d52c8e29a5ba970b668273c08f855e5da834aaee2ea9efeb6b069"; }; patches = [ From 2d7a757ffb46f3d93729e2fc6335b9233f246138 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:57 -0800 Subject: [PATCH 231/561] python3Packages.kombu: 5.2.1 -> 5.2.2 --- pkgs/development/python-modules/kombu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 53b83fe95755b..319461b98344d 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.2.1"; + version = "5.2.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f262a2adc71b53e5b7dad4933bbdee65d8766ca4df6a9043b13edaad2144aaec"; + sha256 = "0f5d0763fb916808f617b886697b2be28e6bc35026f08e679697fc814b48a608"; }; propagatedBuildInputs = [ From 583eefaac70d5b7d815b7fc69099bbb65d5ed55b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:57 -0800 Subject: [PATCH 232/561] python3Packages.labelbox: 3.6.1 -> 3.10.0 --- 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 5c7d7afedc431..ba7579d10670b 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.6.1"; + version = "3.10.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "v${version}"; - sha256 = "0mix7ajdvyhyvi8nwmxz62mzwl3242h2pzj84zikrmh1ampwvg3g"; + sha256 = "0afrzxy8hmsvqp84mf89k7sqlzzyh6xwp2pz5abj0981mqlzf2x9"; }; propagatedBuildInputs = [ From b77946afe2af2e088436426fcf9cf79c7696aa39 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:57 -0800 Subject: [PATCH 233/561] python3Packages.langcodes: 3.2.1 -> 3.3.0 --- pkgs/development/python-modules/langcodes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 292a13d7bd09c..4e8f108a1ed77 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "langcodes"; - version = "3.2.1"; + version = "3.3.0"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "779a6da5036f87b6b56c180b2782ab111ddd6aa9157670a9b918402b0e07cd93"; + sha256 = "794d07d5a28781231ac335a1561b8442f8648ca07cd518310aeb45d6f0807ef6"; }; propagatedBuildInputs = [ marisa-trie ]; From 576b386d3e067d72b9238bb2cd62f2b6ce20ecbb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:57 -0800 Subject: [PATCH 234/561] python3Packages.ledgerblue: 0.1.38 -> 0.1.41 --- pkgs/development/python-modules/ledgerblue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 84c3ad8c614d6..ff489f4cf222b 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.38"; + version = "0.1.41"; src = fetchPypi { inherit pname version; - sha256 = "df1fffc4f586eaa95b8cf910176d28997e65a3ecd43d9c0af34e46078b6b6ee3"; + sha256 = "7246a1a0442a63aff0b5de2796d306f0033e1937b3c9b9c2a92c9101cde4fe8d"; }; propagatedBuildInputs = [ From 7c887c96083f63a73cd1d301673688ae561c2886 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:57 -0800 Subject: [PATCH 235/561] python3Packages.libcst: 0.3.21 -> 0.3.23 --- pkgs/development/python-modules/libcst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 712b15f17f229..8ef73f48e856f 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.21"; + version = "0.3.23"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "063bl21gyyd25i2v0j6kz29cxxdfhng2nins4i2qblmac90f2nqy"; + sha256 = "1r4aiqpndqa75119faknsghi7zxyjrx5r6i7cb3d0liwiqrkzrvx"; }; propagatedBuildInputs = [ From 4483ea6e175c8597093df1833cebd59afa3de8aa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:58 -0800 Subject: [PATCH 236/561] python3Packages.limnoria: 2021.10.9 -> 2021.11.20 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 1753b0dce8c14..ba45ffbdeac4e 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.10.9"; + version = "2021.11.20"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "907a4a0765ab29ccd1c2247efa0eda7a9bd82d3be3a2ecfdeb9b9e6fbb9aa56e"; + sha256 = "da9c33497a09b4ed0cff6ed44954bbde6cb317edb68d56c73ef235128a802c11"; }; postPatch = '' From af2a1ca6e34b4e68b21e724d5607aeda3b2080e9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:58 -0800 Subject: [PATCH 237/561] python3Packages.lxml: 4.6.3 -> 4.6.4-5 --- pkgs/development/python-modules/lxml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 984219b802b7d..60deaa5af1272 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.6.3"; + version = "4.6.4-5"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${pname}-${version}"; - sha256 = "1rhkv75qr4ij3653l97sy752gyp6f20sxfpiqp1vp08fpy47q8qn"; + rev = "lxml-${version}"; + sha256 = "159cc48nl40qsx8pc8sasgny5xc0s3y0xrq3w3aw53s3ijncsgfl"; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs From 6d0c13124db867e11e7d6824af3d1933b1e7c3f2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:58 -0800 Subject: [PATCH 238/561] python3Packages.python-lz4: 3.1.3 -> 3.1.10 --- pkgs/development/python-modules/lz4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 180264f102d04..cc84fa75c6997 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "3.1.3"; + version = "3.1.10"; # get full repository inorder to run tests src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; + rev = version; + sha256 = "0a4gic8xh3simkk5k8302rxwf765pr6y63k3js79mkl983vpxcim"; }; nativeBuildInputs = [ setuptools-scm pkgconfig pytest-runner ]; From 3aa03de60baf895fafdf76b72fa221b23d26ceaa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:58 -0800 Subject: [PATCH 239/561] python3Packages.Mako: 1.1.5 -> 1.1.6 --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index cf30286126986..4c16861823fdc 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.5"; + version = "1.1.6"; src = fetchPypi { inherit pname version; - sha256 = "169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3"; + sha256 = "4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2"; }; propagatedBuildInputs = [ markupsafe ]; From 74e16f491fbfdb5dd7e0d50f0975b91940d760c5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:59 -0800 Subject: [PATCH 240/561] python3Packages.Markups: 3.1.2 -> 3.1.3 --- pkgs/development/python-modules/Markups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index bacfe95a9a137..1fa304f57a8ae 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Markups"; - version = "3.1.2"; + version = "3.1.3"; src = fetchPypi { inherit pname version; - sha256 = "2954d53656d9ec84f2f6c077e91a1de534e05647f20d327757283bbb5a857770"; + sha256 = "ab9747a72c1c6457418eb4276c79871977c13a654618e4f12e2a1f0990fbf2fc"; }; checkInputs = [ markdown docutils pygments pyyaml ]; From ebb34bc2e6e4851ce5343b79a8774e34e4944d86 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:59 -0800 Subject: [PATCH 241/561] python3Packages.matplotlib: 3.4.3 -> 3.5.0 --- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 0e874d25f679e..72a32ae4b4feb 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -17,14 +17,14 @@ let in buildPythonPackage rec { - version = "3.4.3"; + version = "3.5.0"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "06032j0ccjxldx4z9kf97qps2g36mfgvy1nap3b9n75kzmnm4kzw"; + sha256 = "38892a254420d95594285077276162a5e9e9c30b6da08bdc2a4d53331ad9a6fa"; }; XDG_RUNTIME_DIR = "/tmp"; From adc6a4d07465516f4d385e70b8d524a289739e29 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:59 -0800 Subject: [PATCH 242/561] python3Packages.mautrix: 0.11.3 -> 0.12.4 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index c7aa300928f07..0c5b587149334 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.11.3"; + version = "0.12.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eZ8fWemS808Hz6KoQWfMsk5WfaO+vj0kTyInhtE20Qk="; + sha256 = "c8d226a96e57d52bb532d7e572ba5670d2e2143f720063a4bbd04a77049030d4"; }; propagatedBuildInputs = [ From c0273b6a743a772ba5104a6cdc695c4fff46f5d9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:59 -0800 Subject: [PATCH 243/561] python3Packages.mayavi: 4.7.3 -> 4.7.4 --- pkgs/development/python-modules/mayavi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 169928e48b685..6f13e63b93415 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mayavi"; - version = "4.7.3"; + version = "4.7.4"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "Zw0AI7nNLSNGxFHbm6L2HaI6XfUDOyWuqJy22BuUZPA="; + sha256 = "ec50e7ec6afb0f9224ad1863d104a0d1ded6c8deb13e720652007aaca2303332"; }; postPatch = '' From 62238fb3124b90c4362baacefa06b9910461c38e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:59 -0800 Subject: [PATCH 244/561] python3Packages.metakernel: 0.27.5 -> 0.28.1 --- pkgs/development/python-modules/metakernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index b87b87a1e4b86..b07f68401e253 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.27.5"; + version = "0.28.1"; src = fetchPypi { inherit pname version; - sha256 = "0aqq9zil6h7kxsg3v2008nr6lv47qvcsash8qzmi1xh6r4x606zy"; + sha256 = "3b57eb7b3b332614dcba1fa53c8cc1253dbccf962b111517ea16cbecce9a11d5"; }; propagatedBuildInputs = [ ipykernel ]; From 829b980e077ce9cd1c02e6f485124057f37d8c9b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:46:59 -0800 Subject: [PATCH 245/561] python3Packages.mlflow: 1.20.2 -> 1.21.0 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index abd79d22dc168..255c9039ae973 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.20.2"; + version = "1.21.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b15ff0c7e5e64f864a0b40c99b9a582227315eca2065d9f831db9aeb8f24637b"; + sha256 = "5524a371f19c66a18e7ebe9b1085a77f63a6ae514271e487428f28187d79fc8f"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config From 9770d52fdabc315f9f57acdfd45bb626c091d1d2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:00 -0800 Subject: [PATCH 246/561] python3Packages.mocket: 3.10.0 -> 3.10.1 --- 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 8739c08128333..7225e695c878c 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.0"; + version = "3.10.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1fcb4203ae257145b97c865135b3a064b47f20f42dde88c8579f43d88f1a7dfb"; + sha256 = "c77e75432c21108e5a28a529793eb2b82753b6f7050ac9f59fc5d7a72fa74c0f"; }; propagatedBuildInputs = [ From f8c10c4768aafb950cc1f09e197a3346a77ea0ae Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:00 -0800 Subject: [PATCH 247/561] python3Packages.more-itertools: 8.10.0 -> 8.12.0 --- pkgs/development/python-modules/more-itertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index a03b3a06c3934..21f0b70f63acf 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.10.0"; + version = "8.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HevKvrHfeTgUhZ1kqBrXyxBQTCQ0k2jM8hTGZMR09B8="; + sha256 = "7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064"; }; checkInputs = [ nose ]; From 74de648af69d42cbba95e644d011a36e0a7fbc2f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:00 -0800 Subject: [PATCH 248/561] python3Packages.msgpack: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/msgpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 262e5d5ecd0ef..3feeca74ccd67 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "msgpack"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1109s2yynrahwi64ikax68hx0mbclz8p35afmpphw5dwynb49q7s"; + sha256 = "51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e"; }; checkPhase = '' From 0cd2c9afd2c80f09352185a98330932e9a7bdc56 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:00 -0800 Subject: [PATCH 249/561] python3Packages.mysqlclient: 2.0.3 -> 2.1.0 --- pkgs/development/python-modules/mysqlclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index b7a0f39990ea4..ad1e321e9f845 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.0.3"; + version = "2.1.0"; nativeBuildInputs = [ libmysqlclient @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432"; + sha256 = "973235686f1b720536d417bf0a0d39b4ab3d5086b2b6ad5e6752393428c02b12"; }; meta = with lib; { From d8b34fe5220d919703355498348dcdfbc9dc3370 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:00 -0800 Subject: [PATCH 250/561] python3Packages.natsort: 7.1.1 -> 7.2.0 --- pkgs/development/python-modules/natsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 0aad9299f5b92..3c9d625db70f9 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "natsort"; - version = "7.1.1"; + version = "7.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "00c603a42365830c4722a2eb7663a25919551217ec09a243d3399fa8dd4ac403"; + sha256 = "e7054b4e1f47365f141602a742685165a552291b643a214652d0dd9d6cea58d1"; }; propagatedBuildInputs = [ From 8c8c33262031dc9bce0aba8043cca2e28f18aec7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:01 -0800 Subject: [PATCH 251/561] python3Packages.nbconvert: 6.2.0 -> 6.3.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 a6b09cbe31e91..400d59272ee1d 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.2.0"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - sha256 = "16ceecd0afaa8fd26c245fa32e2c52066c02f13aa73387fffafd84750baea863"; + sha256 = "5e77d6203854944520105e38f2563a813a4a3708e8563aa598928a3b5ee1081a"; }; # Add $out/share/jupyter to the list of paths that are used to search for From 68ff633dee8bc113f6a65920031798b68973d1c2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:01 -0800 Subject: [PATCH 252/561] python3Packages.nipype: 1.6.1 -> 1.7.0 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 8d0c597a1af0a..68a544c9ab07c 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -49,12 +49,12 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.6.1"; + version = "1.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8428cfc633d8e3b8c5650e241e9eedcf637b7969bcd40f3423334d4c6b0992b5"; + sha256 = "e689fe2e5049598c9cd3708e8df1cac732fa1a88696f283e3bc0a70fecb8ab51"; }; postPatch = '' From cba0be583d79333af1430019b0df105676030775 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:01 -0800 Subject: [PATCH 253/561] python3Packages.notebook: 6.4.4 -> 6.4.6 --- 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 d17ad5884f371..b40a95ded33e1 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.4"; + version = "6.4.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "26b0095c568e307a310fd78818ad8ebade4f00462dada4c0e34cbad632b9085d"; + sha256 = "7bcdf79bd1cda534735bd9830d2cbedab4ee34d8fe1df6e7b946b3aab0902ba3"; }; LC_ALL = "en_US.utf8"; From 6044d785ec3812b7830104c00c76c5f49004aea7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:01 -0800 Subject: [PATCH 254/561] python3Packages.numpy: 1.21.2 -> 1.21.4 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index fef5dfb163bdf..945828fbc19fd 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.21.2"; + version = "1.21.4"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "423216d8afc5923b15df86037c6053bf030d15cc9e3224206ef868c2d63dd6dc"; + sha256 = "e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0"; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From f589b2d3f6616852dbae723fc281d148a1b51223 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:01 -0800 Subject: [PATCH 255/561] python3Packages.openstacksdk: 0.59.0 -> 0.60.0 --- pkgs/development/python-modules/openstacksdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index db2043a6f9292..9bb807784ca7c 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "0.59.0"; + version = "0.60.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PfdgzScjmKv6yM6+Yu64LLxJe7JdTdcHV290qM6avw0="; + sha256 = "aa6efead2ac116482f29aecc2c14ba3b4c76a6f8dede93bf296a2b65492ef420"; }; propagatedBuildInputs = [ From 6d07e169c8367f9d0df9a4151ba72c46acde5b83 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:02 -0800 Subject: [PATCH 256/561] python3Packages.packet-python: 1.44.1 -> 1.44.2 --- pkgs/development/python-modules/packet-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 6c7935c39b9a5..b63baa80b3977 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.44.1"; + version = "1.44.2"; src = fetchPypi { inherit pname version; - sha256 = "ec0f40465fad5260a1b2c1ad39dc12c5df65828e171bf2aafb13c1c3883628ba"; + sha256 = "4ce0827bc41d5bf5558284c18048344343f7c4c6e280b64bbe53fb51ab454892"; }; nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; From 9b1636a0efbc5798412e9485e0286f231600cac8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:02 -0800 Subject: [PATCH 257/561] python3Packages.pandas: 1.3.3 -> 1.3.4 --- 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 476a2433ee077..bacd253defa16 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,11 +27,11 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.3.3"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "272c8cb14aa9793eada6b1ebe81994616e647b5892a370c7135efb2924b701df"; + sha256 = "a2aa18d3f0b7d538e21932f637fbfe8518d085238b429e4790a35e1e44a96ffc"; }; nativeBuildInputs = [ cython ]; From b551ff9b93d2049f1702b54d6059497fb9e0a570 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:02 -0800 Subject: [PATCH 258/561] python3Packages.panel: 0.12.1 -> 0.12.5 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 3f6875f4986fd..cfb95b23f41c8 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -17,7 +17,7 @@ let in buildPythonPackage rec { pname = "panel"; - version = "0.12.1"; + version = "0.12.5"; # Don't forget to also update the node packages # 1. retrieve the package.json file @@ -25,7 +25,7 @@ buildPythonPackage rec { # 3. node2nix src = fetchPypi { inherit pname version; - sha256 = "e4898d60abdb82f8a429df7f59dbf8bcaf7e19b3e633555512ceb4ce06678458"; + sha256 = "351481f2a2176359b28effa64c9d9fce487d6758514109cab96f9ed84787ae99"; }; # Since 0.10.0 panel attempts to fetch from the web. From 3eaff13cc8c2c9e0d3a2c8b68a2f897e64d13879 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:02 -0800 Subject: [PATCH 259/561] python3Packages.paramiko: 2.7.2 -> 2.8.0 --- 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 88d63f0de93f5..a64befa1bbd4d 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.7.2"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035"; + sha256 = "e673b10ee0f1c80d46182d3af7751d033d9b573dd7054d2d0aa46be186c3c1d2"; }; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; From e5e5371d90301040a159fb708171289fffece44d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:02 -0800 Subject: [PATCH 260/561] python3Packages.parsy: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/parsy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix index ab4aeba84b695..53743052f4e44 100644 --- a/pkgs/development/python-modules/parsy/default.nix +++ b/pkgs/development/python-modules/parsy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "parsy"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bfc941ea5a69e6ac16bd4f7d9f807bbc17e35edd8b95bcd2499a25b059359012"; + sha256 = "7c411373e520e97431f0b390db9d2cfc5089bc1d33f4f1584d2cdc9e6368f302"; }; checkInputs = [ pytest ]; From 1808c18ecc4dfbce739a899953c0aa901a3b6dc3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:02 -0800 Subject: [PATCH 261/561] python3Packages.pbr: 5.7.0 -> 5.8.0 --- pkgs/development/python-modules/pbr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index d9887b626afa0..8775faa53c24f 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.7.0"; + version = "5.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1dvkqixz227bhhk7c9r2bwcm7kmkfqyxw1bkha0jf3z88laclla6"; + sha256 = "672d8ebee84921862110f23fcec2acea191ef58543d34dfe9ef3d9f13c31cddf"; }; propagatedBuildInputs = [ setuptools ]; From 6b01c518f5215ba337660f939cea193219b908e1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:03 -0800 Subject: [PATCH 262/561] python3Packages.pc-ble-driver-py: 0.16.1 -> 0.16.2 --- pkgs/development/python-modules/pc-ble-driver-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 202e6fdaf6a82..093e3e67ab234 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.16.1"; + version = "0.16.2"; disabled = pythonOlder "3.7" || pythonAtLeast "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; rev = "v${version}"; - sha256 = "0q2zag77drcjkjm0cbvy2sf6fq2a4yl5li1zv1xfwmy53ami9b5l"; + sha256 = "013kpj2df5grkrzxak22k01mskpmwf7g3aa1fmxdwi90bb1sabs5"; }; nativeBuildInputs = [ From 1a98579d015bc7c51798a8509220d60ee79c6058 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:03 -0800 Subject: [PATCH 263/561] python3Packages.pdftotext: 2.2.1 -> 2.2.2 --- pkgs/development/python-modules/pdftotext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index 2ba18dd92e4e9..2ff55f732cd5d 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.2.1"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "a067c121654917ecbe07fbd71c807c34bbdb1ea029e269ddd11925ee7e191d3f"; + sha256 = "2a9aa89bc62022408781b39d188fabf5a3ad1103b6630f32c4e27e395f7966ee"; }; postPatch = lib.optionalString stdenv.isDarwin '' From 2f216c504bcb0101be706fe98c4de4b99f8e6b8e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:03 -0800 Subject: [PATCH 264/561] python3Packages.pex: 2.1.55 -> 2.1.56 --- 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 8a95acc211d21..38073094b1d7f 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.55"; + version = "2.1.56"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1f6b60b9c50996ec3476e36dddff34afa98dc2d68fa73ed121d3c41232df1379"; + sha256 = "8dfb7ef551cc9d3d03a6e2dc1b1ba6183cd94f3cde7431836f017d60cc992d53"; }; nativeBuildInputs = [ From 20a779bf9361094129d96e2578617d578fa1f0b3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:03 -0800 Subject: [PATCH 265/561] python3Packages.Pillow: 8.3.2 -> 8.4.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 c6bb944c232b6..e0f29d366e106 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.3.2"; + version = "8.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1361y215ydmdh4il1vay5831aqivmpwgzjqrphqjdiq0ipnz7qyx"; + sha256 = "b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed"; }; meta = with lib; { From 68f6e0321f2325a06ad25b3c7ab8b11b7691331a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:03 -0800 Subject: [PATCH 266/561] python3Packages.pip-tools: 6.3.1 -> 6.4.0 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 62bab6694d790..9d54eef4d706f 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.3.1"; + version = "6.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "992d968df6f1a19d4d37c53b68b3d4b601b894fb3ee0926d1fa762ebc7c7e9e9"; + sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b"; }; checkInputs = [ From e12c856e5121cb66956b24a5a5c5a47095337060 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:04 -0800 Subject: [PATCH 267/561] python3Packages.plotly: 5.3.1 -> 5.4.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 5ef6c785fed0b..c4811044ae2b3 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.3.1"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6598393e898a9c5ae78397f76f07002ec41fd92e5f746d3b9806248d53885643"; + sha256 = "735d50738c760ecbf3a38e2336b8c1b119bff2d857096e4f68af31089b798161"; }; propagatedBuildInputs = [ From bfc846ae78ab3c31a84bfa67fbcc8962e0ef2469 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:04 -0800 Subject: [PATCH 268/561] python3Packages.plumbum: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/plumbum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 278caa44b143e..a99591c259d9e 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.7.0"; + version = "1.7.1"; checkInputs = [ pytest ]; @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "317744342c755319907c773cc87c3a30adaa3a41b0d34c0ce02d9d1904922dce"; + sha256 = "3c0ac8c4ee57b2adddc82909d3c738a62ef5f77faf24ec7cb6f0a117e1679740"; }; } From c154822e004c09f2af832e9444faffb85c8951ac Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:04 -0800 Subject: [PATCH 269/561] python3Packages.prettytable: 2.2.1 -> 2.4.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 ddaa842e9b111..85aaa1e656d80 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.2.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6d465005573a5c058d4ca343449a5b28c21252b86afcdfa168cdc6a440f0b24c"; + sha256 = "18e56447f636b447096977d468849c1e2d3cfa0af8e7b5acfcf83a64790c0aca"; }; nativeBuildInputs = [ setuptools-scm ]; From 4ba9a841a5a8b0e18265ecbfc690b38d62be5176 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:04 -0800 Subject: [PATCH 270/561] python3Packages.prometheus-client: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/prometheus-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 9a01769695ac0..6c7cede280cfc 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "client_python"; rev = "v${version}"; - sha256 = "14swmy4dgpk6cyjsm2advgc2c8api7xaca1sl7swznblh5fyzgzg"; + sha256 = "1a0kllal5vkkdv325k0mx1mha2l9808mcz4dqx6qrgfskz8c2xjl"; }; checkInputs = [ From 5dcb5c2d277597aa8dc12ceae0d3e54b4e702ed9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:04 -0800 Subject: [PATCH 271/561] python3Packages.proto-plus: 1.19.4 -> 1.19.8 --- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index a6d60567ef96d..dd2494729efd7 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.19.4"; + version = "1.19.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "416dc38b090ca2093f6fac74977ac4a5599e496483a43c0076e6f6a4dd77ed9c"; + sha256 = "bdf45f0e0be71510eb2ec9db4da78afde7b5fb8b0a507a36340a9b6ce8e48e58"; }; propagatedBuildInputs = [ protobuf ]; From 5d052c96037100372e55260ce8678fa3adeb0dd1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:05 -0800 Subject: [PATCH 272/561] python3Packages.psycopg2: 2.9.1 -> 2.9.2 --- 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 1af8fd38bad83..34660a84cd606 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.1"; + version = "2.9.2"; # 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 = "0z0v2d5gpgy0wf2ypqxv955c9k44yszd7r20km5s79yhy6k06lyy"; + sha256 = "a84da9fa891848e0270e8e04dcca073bc9046441eeb47069f5c0e36783debbea"; }; nativeBuildInputs = [ From 5534fde29da41291d4fd54a5750ddf05010de842 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:05 -0800 Subject: [PATCH 273/561] python3Packages.pudb: 2021.1 -> 2021.2.2 --- pkgs/development/python-modules/pudb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 3459c5c99742f..b156bce135041 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pudb"; - version = "2021.1"; + version = "2021.2.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e"; + sha256 = "82a524ab4b89d2c701b089071ccc6afa9c8a838504e3d68eb33faa8a8abbe4cb"; }; propagatedBuildInputs = [ From bd63fdc62c0c10b574c84456b57ff8f3af36e15c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:05 -0800 Subject: [PATCH 274/561] python3Packages.py4j: 0.10.9.2 -> 0.10.9.3 --- pkgs/development/python-modules/py4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index 6ad9673b97554..cf24d21e17f56 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.9.2"; + version = "0.10.9.3"; src = fetchPypi { inherit pname version; - sha256 = "624f97c363b8dd84822bc666b12fa7f7d97824632b2ff3d852cc491359ce7615"; + sha256 = "0d92844da4cb747155b9563c44fc322c9a1562b3ef0979ae692dbde732d784dd"; }; # No tests in archive From 81a761f6da2dce9f453b13bc8f448c8d930c9ff9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:05 -0800 Subject: [PATCH 275/561] python3Packages.pyaml: 21.8.3 -> 21.10.1 --- pkgs/development/python-modules/pyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 8642c9affbdc8..cbab9bacfb813 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "21.8.3"; + version = "21.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oWNtY8R2MooHIT0LcRG7Y1cPGrij7d9gUiYwJQwj2XU="; + sha256 = "c6519fee13bf06e3bb3f20cacdea8eba9140385a7c2546df5dbae4887f768383"; }; propagatedBuildInputs = [ From 3a36b9820958b37e31422b10c9434e20ba5645f3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:05 -0800 Subject: [PATCH 276/561] python3Packages.pybids: 0.13.2 -> 0.14.0 --- pkgs/development/python-modules/pybids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index daa879a58a0d0..3ad29916575a9 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.13.2"; + version = "0.14.0"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "9692013af3b86b096b5423b88179c6c9b604baff5a6b6f89ba5f40429feb7a3e"; + sha256 = "73c4d03aad333f2a7cb4405abe96f55a33cffa4b5a2d23fad6ac5767c45562ef"; }; propagatedBuildInputs = [ From 513147e144d8fd5b4415304d8831169d707d7004 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:06 -0800 Subject: [PATCH 277/561] python3Packages.pycparser: 2.20 -> 2.21 --- pkgs/development/python-modules/pycparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index 5fe7cab1cdb29..c8283f93c512e 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pycparser"; - version = "2.20"; + version = "2.21"; src = fetchPypi { inherit pname version; - sha256 = "2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"; + sha256 = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"; }; checkPhase = '' From b1b1d64f99af31f54a1059eaa38419a207a747aa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:06 -0800 Subject: [PATCH 278/561] python3Packages.pydeck: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/pydeck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index 7e95c60be828a..6626ee19d9200 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pydeck"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1zi0gqzd0byj16ja74m2dm99a1hmrlhk26y0x7am07vb1d8lvvsy"; + sha256 = "907601c99f7510e16d27d7cb62bfa145216d166a2b5c9c50cfe2b65b032ebd2e"; }; pythonImportsCheck = [ "pydeck" ]; From 9a8ef65d8bfeddabb761622053fd3f44afc08837 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:06 -0800 Subject: [PATCH 279/561] python3Packages.py: 1.10.0 -> 1.11.0 --- pkgs/development/python-modules/py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index ce7abe4dc2735..c1cf60ca4d779 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "py"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"; + sha256 = "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"; }; # Circular dependency on pytest From 54322b045b2cf00b821530026e0b7f4bd31da107 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:06 -0800 Subject: [PATCH 280/561] python3Packages.pydmd: 0.3.3 -> 0.4 --- pkgs/development/python-modules/pydmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 32f0dde17af82..dd166b78f8625 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pydmd"; - version = "0.3.3"; + version = "0.4"; src = fetchFromGitHub { owner = "mathLab"; repo = "PyDMD"; rev = "v${version}"; - sha256 = "1516dhmpwi12v9ly9jj18wpz9k696q5k6aamlrbby8wp8smajgrv"; + sha256 = "1qwa3dyrrm20x0pzr7rklcw7433fd822n4m8bbbdd7z83xh6xm8g"; }; propagatedBuildInputs = [ future numpy scipy matplotlib ]; From e5a276ef0ee86b4c9056e188320f010d3a6dfd29 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:07 -0800 Subject: [PATCH 281/561] python3Packages.pyfaidx: 0.6.2 -> 0.6.3.1 --- pkgs/development/python-modules/pyfaidx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 317691066f47b..a50c8accb8587 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.6.2"; + version = "0.6.3.1"; src = fetchPypi { inherit pname version; - sha256 = "d1258f8d053cba0c90fe329254e8ec59eb28b535b48d9d06e8c7f1d74b8e4531"; + sha256 = "93adf036a75e08dc9b1dcd59de6a4db2f65a48c603edabe2e499764b6535ed50"; }; propagatedBuildInputs = [ six ]; From 5546399af13d31bf0c1f797781883917357244d5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:07 -0800 Subject: [PATCH 282/561] python3Packages.pyfakefs: 4.5.1 -> 4.5.3 --- 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 217e552aa0e12..eb5eb993ef485 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.1"; + version = "4.5.3"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "002a065dcbf59c2caa039e4fc4ba01d1d636aa63ee9c794d4c9fc01f0e2d6dc0"; + sha256 = "f49db689c1d5db6172131479ca77bd474ba2cb886c869b9867fb89cdab2df397"; }; postPatch = '' From f34176c089710635f85f2658580a4bfe791a0953 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:07 -0800 Subject: [PATCH 283/561] python3Packages.pygit2: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 27bfcff16d812..ab4ca1efdc152 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "602bffa8b4dbc185a6c7f36515563b600e0ee9002583c97ae3150eedaf340edb"; + sha256 = "d7faa29558436decc2e78110f38d6677eb366b683ba5cdc2803d47195711165d"; }; preConfigure = lib.optionalString stdenv.isDarwin '' From db81fb28832dd25390e5053f1099af337e103926 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:07 -0800 Subject: [PATCH 284/561] python3Packages.pylint: 2.11.1 -> 2.12.1 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 4bf6c4ad93e8a..ebe73e7287f99 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.11.1"; + version = "2.12.1"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "08kc9139v1sd0vhna0rqikyds0xq8hxv0j9707n2i1nbv2z6xhsv"; + sha256 = "0vvf5b9cwp85mcz7j7zn2pa1m5avmnadi4z50jh3dga9njp8hl97"; }; nativeBuildInputs = [ From 650bcd9992e347995788adb416bf7bfcfe4b5125 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:07 -0800 Subject: [PATCH 285/561] python3Packages.pymavlink: 2.4.17 -> 2.4.18 --- pkgs/development/python-modules/pymavlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 50dc87a926f2a..66eb934a2a9d2 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.17"; + version = "2.4.18"; src = fetchPypi { inherit pname version; - sha256 = "84e2af4d8099afd37c5d887261a168e7bde4ec2354f12f65c72dad1a4cd8f21d"; + sha256 = "ee40af9fad9c054237800cc835df5c0975504de13e5c29001be496893083fa83"; }; propagatedBuildInputs = [ future lxml ]; From 3397bdbeed76f163a6ba847dd7612bc9df55bd79 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:07 -0800 Subject: [PATCH 286/561] python3Packages.pymongo: 3.12.0 -> 3.12.1 --- pkgs/development/python-modules/pymongo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 0d18175d7e6df..6b627ca672ff0 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.12.0"; + version = "3.12.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uI0XQhWbyToHhzP5eJ9WPO8m9eNw66gQR2pxqpjl+8I="; + sha256 = "704879b6a54c45ad76cea7c6789c1ae7185050acea7afd15b58318fa1932ed45"; }; # Tests call a running mongodb instance From 435d2e1037ddba14da950ad9c7f1120584cf0666 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:08 -0800 Subject: [PATCH 287/561] python3Packages.pymunk: 6.2.0 -> 6.2.1 --- pkgs/development/python-modules/pymunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index 4d8dbee2c2e7d..c98fb6dddcf8d 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.2.0"; + version = "6.2.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1r3jfjg4cpdilrmlyml514hqmjgabyrrs4cvmdr56rylg1sp4gf3"; + sha256 = "18ae0f83ec2dc20892b98c84127ce9149ab40fa3c3120097377e1506884b27b8"; }; propagatedBuildInputs = [ cffi ]; From e21c4b303660322f0fc240f13d800b9b77e39c01 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:08 -0800 Subject: [PATCH 288/561] python3Packages.pysam: 0.17.0 -> 0.18.0 --- pkgs/development/python-modules/pysam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 41cdcad20385b..2f65aa899e396 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.17.0"; + version = "0.18.0"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "v${version}"; - sha256 = "sha256-RDeBq6pwBGCBNIn8YOPQr96GuL6FKEYeLAPQD6XN0iE="; + sha256 = "042ca27r6634xg2ixgvq1079cp714wmm6ml7bwc1snn0wxxzywfg"; }; nativeBuildInputs = [ samtools ]; From 4b780ecc5d26e7152d48e98499e04a0533cc5985 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:08 -0800 Subject: [PATCH 289/561] python3Packages.pytest-asyncio: 0.15.1 -> 0.16.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 3ec6392f884c2..9e09724624c2c 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.15.1"; + version = "0.16.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f"; + sha256 = "7496c5977ce88c34379df64a66459fe395cd05543f0a2f837016e7144391fcfb"; }; buildInputs = [ pytest ] From f70ebad87d6e65d70e46d8e68d33f9e9e75f6405 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:08 -0800 Subject: [PATCH 290/561] python3Packages.pytest-doctestplus: 0.11.0 -> 0.11.1 --- .../development/python-modules/pytest-doctestplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 0ae23ff572763..74e4c77c0fa27 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.11.0"; + version = "0.11.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "efcb24a366d3b033d343298c2a60eae418b06803c85373450f10306815c7c632"; + sha256 = "b7a0aeb79b85ee81a3c72c49019b4bfeb57fa920abaa6c17ba8be3be9c5290f1"; }; nativeBuildInputs = [ From 3fe2f3857c02f5f84f505f94d1fc5bb0c449431c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:08 -0800 Subject: [PATCH 291/561] python3Packages.pytest-httpx: 0.13.0 -> 0.15.0 --- pkgs/development/python-modules/pytest-httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index b0bc07b6c1629..819c0a14832f5 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.13.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "0lh7df3ysxmjzvx6242xb6qiwpfxrnj70kjmw5sndvzmy5dfpxfc"; + sha256 = "08dxvjkxlnam3r0yp17495d1vksyawzzkpykacjql1gi6hqlfrwg"; }; buildInputs = [ pytest ]; From 2d14cf9a7189b01ba05536292720caef0003915f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:09 -0800 Subject: [PATCH 292/561] python3Packages.pytest-localserver: 0.5.0 -> 0.5.1 --- .../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 577400b859eb3..a3f57ff40e7a3 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3a5427909d1dfda10772c1bae4b9803679c0a8f04adb66c338ac607773bfefc2"; + sha256 = "ef6f04193dc0f7e8df5b27b3a8834318fa12eaf025436d2a99afff1b73cde761"; }; propagatedBuildInputs = [ werkzeug ]; From 0a54aa3fb0b7ced65d22c4937e8a89ec819b4d40 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:09 -0800 Subject: [PATCH 293/561] python3Packages.python-cinderclient: 8.1.0 -> 8.2.0 --- .../python-modules/python-cinderclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index 8346074c9c51e..fe421fa55d386 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "8.1.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "b57b432b2ac9161c2482a569a023211d2d3d0ada81c4da62c8f6e47f0b2bf82d"; + sha256 = "7b2f08a2d1cc05d2c1f84f02fadb2208678b1acb501acfe2de33720078ec7b9f"; }; propagatedBuildInputs = [ From 1d819642eb817ee9d508bf758b14a3ea454aa632 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:09 -0800 Subject: [PATCH 294/561] python3Packages.python-dotenv: 0.19.0 -> 0.19.2 --- pkgs/development/python-modules/python-dotenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index 22bf7ea7ece49..774ca6855aee3 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.19.0"; + version = "0.19.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"; + sha256 = "a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"; }; propagatedBuildInputs = [ click ]; From 321f948cce32612c49e90f82ef4e868b08f56c0d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:09 -0800 Subject: [PATCH 295/561] python3Packages.python-gnupg: 0.4.7 -> 0.4.8 --- pkgs/development/python-modules/python-gnupg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 7189a235dedad..e26e60c43ec46 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.4.7"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7"; + sha256 = "b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7"; }; # Let's make the library default to our gpg binary From 375735cc5881f78db7054562cf87987d18389f1b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:09 -0800 Subject: [PATCH 296/561] python3Packages.python-lsp-server: 1.2.4 -> 1.3.1 --- pkgs/development/python-modules/python-lsp-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 39597afa85409..4aa8d853ebdba 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.2.4"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "0c1g46hpzjhqbjcmv6xm3by3jprcjhzjslqzrp95hdkbykvrgs5x"; + sha256 = "067dlhwwv4mkrirnmqinrvkbfx59hf7fiah081d62a46vxvpnv9s"; }; postPatch = '' From fef2486db5f7176ba27230ad80c6422b82ad7518 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:10 -0800 Subject: [PATCH 297/561] python3Packages.python-manilaclient: 3.0.0 -> 3.1.0 --- .../python-modules/python-manilaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 5ffe1a1ea730d..aea8b6dab3031 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "python-manilaclient"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "2d90af35c5beccc53fa6b0f5a3c4b330a065e86924c33c42b017f18943ab2b05"; + sha256 = "d53f69238cdc454c0297f513e0b481a039d0bac723990ebd5ab9d3d29633956e"; }; propagatedBuildInputs = [ From 59391a4bfdc880a76e130b8dca9490ec9e6fcf31 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:10 -0800 Subject: [PATCH 298/561] python3Packages.python-swiftclient: 3.12.0 -> 3.13.0 --- .../development/python-modules/python-swiftclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index adb675c0db557..cb3b5b850e36b 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "3.12.0"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MTtEShTQ+bYoy/PoxS8sQnFlj56KM9QiKFHC5PD3t6A="; + sha256 = "b200dcfbc6842bd4cac29efd0ea9ef34d3b8625957472ba7aa3ae0242437e2cc"; }; propagatedBuildInputs = [ pbr python-keystoneclient ]; From 809760dc0e846b952fcf5adf00d8928da0584e53 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:10 -0800 Subject: [PATCH 299/561] python3Packages.pytwitchapi: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/pytwitchapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix index 423f87c1f7d31..27289a13d5d60 100644 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ b/pkgs/development/python-modules/pytwitchapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytwitchapi"; - version = "2.5.0"; + version = "2.5.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "v${version}"; - sha256 = "0sbzl9a4zxnvnvkmmmfc9c157dgq7y6qfb2cid5nym6jhxkixnqk"; + sha256 = "091p9yx0cc7aclj76s1n1jdzkypicy9b2mxgmk2fym5viqlgpbkk"; }; propagatedBuildInputs = [ From 08605f5314518dac4b639a6e62873a3401fe87db Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:10 -0800 Subject: [PATCH 300/561] python3Packages.pyvips: 2.1.15 -> 2.1.16 --- pkgs/development/python-modules/pyvips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index c3eb750783fd0..b25d9d3b5ae44 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.1.15"; + version = "2.1.16"; src = fetchPypi { inherit pname version; - sha256 = "8bca4077dbdc1434dcbc6759407367b6561e3505aa9555b1bc0b45989dcf50b2"; + sha256 = "654c03014a15f846786807a2ece6f525a8fec883d1c857742c8e37da149a81ed"; }; nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; From 134fd41f77537e6bc252adb8d87e427010801a82 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:10 -0800 Subject: [PATCH 301/561] python3Packages.PyWavelets: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/pywavelets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index 66c996a487ba9..cbd7681c63f92 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "PyWavelets"; - version = "1.1.1"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1a64b40f6acb4ffbaccce0545d7fc641744f95351f62e4c6aaa40549326008c9"; + sha256 = "6cbd69b047bb4e00873097472133425f5f08a4e6bc8b3f0ae709274d4d5e9a8d"; }; checkInputs = [ nose pytest ]; From e8bbd13873a92ed76064e4095c7643392546b97d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:10 -0800 Subject: [PATCH 302/561] python3Packages.pywick: 0.5.6 -> 0.6.5 --- pkgs/development/python-modules/pywick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywick/default.nix b/pkgs/development/python-modules/pywick/default.nix index c675686ef8332..0db11576203a5 100644 --- a/pkgs/development/python-modules/pywick/default.nix +++ b/pkgs/development/python-modules/pywick/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pywick"; - version = "0.5.6"; + version = "0.6.5"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "achaiah"; repo = pname; rev = "v${version}"; - sha256 = "1gmlifnv9kji0d1jwg1pa8d96zg48w17qg0sgxwy1y1jf3hn37bm"; + sha256 = "0wnijdvqgdpzfdsy1cga3bsr0n7zzsl8hp4dskqwxx087g5h1r84"; }; propagatedBuildInputs = [ From f72419a917c1128cae189278f160b15388547c0b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:11 -0800 Subject: [PATCH 303/561] python3Packages.qtconsole: 5.1.1 -> 5.2.1 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 9d6a483071be2..b56e80eb80c7e 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.1.1"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "bbc34bca14f65535afcb401bc74b752bac955e5313001ba640383f7e5857dc49"; + sha256 = "bb3b9f0d674055e627c1097779c0d5e028176706d3b6be39cf52235f6ddcc88e"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From 8c47bfd533535b20fc5bc2b673b5a54e3e39bc5b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:11 -0800 Subject: [PATCH 304/561] python3Packages.r2pipe: 1.6.4 -> 1.6.5 --- pkgs/development/python-modules/r2pipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 1d7b4e95e8547..7498c9c1e0f25 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.6.4"; + version = "1.6.5"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a79877781b8e8e9bd5612faebd3991d75d7189f2941021d2adea9b4b4c5b9b7b"; + sha256 = "512d2aca27c4515e55743852e0ab227190739d9595d2c4b6ae97b23d1a2bdd26"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't From 7b8449111ec04f5532d14d91121a98c03a3f79d6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:11 -0800 Subject: [PATCH 305/561] python3Packages.rcssmin: 1.0.6 -> 1.1.0 --- pkgs/development/python-modules/rcssmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index 3de6f2038038a..ab74662e3b4c7 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rcssmin"; - version = "1.0.6"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0w42l4dhxghcz7pj3q7hkxp015mvb8z2cq9sfxbl31npsfavd1ya"; + sha256 = "27fc400627fd3d328b7fe95af2a01f5d0af6b5af39731af5d071826a1f08e362"; }; # The package does not ship tests, and the setup machinary confuses From 700cd6c491938430761ffc8e5aaf0a086ef16602 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:11 -0800 Subject: [PATCH 306/561] python3Packages.reikna: 0.7.5 -> 0.7.6 --- pkgs/development/python-modules/reikna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 873a39244fe3b..c9c5011da6178 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; + sha256 = "722fefbd253d0bbcbf5250b7b9c4aca5722cde4ca38bfbf863a551a5fc26edfa"; }; checkInputs = [ sphinx pytest-cov pytest ]; From 8237fa8e2ff06939350c89d97dbf000c15f2917a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:11 -0800 Subject: [PATCH 307/561] python3Packages.reportlab: 3.6.1 -> 3.6.2 --- 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 71d4cd7425d16..de2b799a051b1 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.1"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "68f9324000cfc5570b5a59a92306691b5d655078a399f20bc72c2581fe903261"; + sha256 = "f0c4b47b012d893b0b9f5703cf6f01b5593714a3fc1e7dc73efbbfe26bb7e16a"; }; checkInputs = [ glibcLocales ]; From b3b33e4882a3614b15a96a34f7211d766983f61b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:12 -0800 Subject: [PATCH 308/561] python3Packages.requests-kerberos: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/requests-kerberos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index 0a023dab87149..37455d8f78b73 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "requests-kerberos"; - version = "0.12.0"; + version = "0.13.0"; # tests are not present in the PyPI version src = fetchFromGitHub { owner = "requests"; repo = pname; rev = "v${version}"; - sha256 = "1qw96aw84nljh9cip372mfv50p1yyirfgigavvavgpc3c5g278s6"; + sha256 = "0yvfg2cj3d10l8fd8kyal4hmpd7fd1c3bca13cj9ril5l573in76"; }; propagatedBuildInputs = [ From c5405da7dc2285cff56dc1495fc3b754be751ee2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:12 -0800 Subject: [PATCH 309/561] python3Packages.rfc6555: 0.0.0 -> 0.1.0 --- pkgs/development/python-modules/rfc6555/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix index 4e47915bdf767..e38ad9c2a337c 100644 --- a/pkgs/development/python-modules/rfc6555/default.nix +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rfc6555"; - version = "0.0.0"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "05sjrd6jc0sdvx0z7d3llk82rx366jlmc7ijam0nalsv66hbn70r"; + sha256 = "123905b8f68e2bec0c15f321998a262b27e2eaadea29a28bd270021ada411b67"; }; propagatedBuildInputs = with pythonPackages; [ selectors2 ]; From 072d20e54b3b5ad3d3ed999c57360f7a90d9eb7a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:12 -0800 Subject: [PATCH 310/561] python3Packages.rich: 10.12.0 -> 10.14.0 --- pkgs/development/python-modules/rich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index ff330289734d8..98c26c7a7ff37 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.12.0"; + version = "10.14.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "1qq4k0pxq3r0463z4h65i9rb8cvilpnqmparklj5y5qk6svz0y2n"; + sha256 = "1j1m1064gmy07ah4crds5sd0k7dcwvf2b1z6rvjfvq4v9fx962qv"; }; nativeBuildInputs = [ poetry-core ]; From 52cb0a32ded9d63f8799992db6f006ddc59a9e24 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:12 -0800 Subject: [PATCH 311/561] python3Packages.rjsmin: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/rjsmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index d78c445a3e56a..2dbc72b1d0ca8 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0cmc72rlkvzz8fl89bc83czkx0pcvhzj7yn7m29r8pgnf5fcfpdi"; + sha256 = "6c529feb6c400984452494c52dd9fdf59185afeacca2afc5174a28ab37751a1b"; }; # The package does not ship tests, and the setup machinary confuses From 82b235137a3f71f539ae6611932b577baaddf2b4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:12 -0800 Subject: [PATCH 312/561] python3Packages.robotframework-sshlibrary: 3.7.0 -> 3.8.0 --- .../python-modules/robotframework-sshlibrary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 82a5fd3fed671..e72a723086432 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.7.0"; + version = "3.8.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "55bd5a11bb1fe60a5a83446e6a3e1e81b13fc671e3b660aa55912a263c1f63aa"; + sha256 = "aedf8a02bcb7344404cf8575d0ada25d6c7dc2fcb65de2113c4e07c63d2446c2"; }; # unit tests are impure From a544afcb276b8b99df81f78a4fc00811e7f34c4a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:12 -0800 Subject: [PATCH 313/561] python3Packages.rsa: 4.7.2 -> 4.8 --- pkgs/development/python-modules/rsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index b4668e3d2eaf6..ccfd237862d7e 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rsa"; - version = "4.7.2"; + version = "4.8"; src = fetchPypi { inherit pname version; - sha256 = "9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9"; + sha256 = "5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17"; }; checkInputs = [ unittest2 mock ]; From 616f080a090bd7b3b9671e780a13b4904cb6b357 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:13 -0800 Subject: [PATCH 314/561] python3Packages.s3fs: 2021.10.1 -> 2021.11.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 2ed6361b256e7..e8a8bbea801b4 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.10.1"; + version = "2021.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-STriUFPlJiVSokep8cOiyPvNIPWQf85jp0kSa6WP4F4="; + sha256 = "3c23eac1fa5b685c9d507950b24f75929e8bcd1ea98b9a95cf2a9cb66ee6c9f5"; }; buildInputs = [ From 9c76ce7c2d36366fd1827c5088123502f5ef7879 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:13 -0800 Subject: [PATCH 315/561] python3Packages.sagemaker: 2.63.1 -> 2.69.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index ece8af476d876..3df0a94cf8e5a 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.63.1"; + version = "2.69.0"; src = fetchPypi { inherit pname version; - sha256 = "924847e9793b76d188049718aabbcad975296bb267812ad18e0279e7af0cb748"; + sha256 = "8e9051a44a82be07e32d83cfc12d724fd1cb76f83ade34cd9e69c45a8d37c676"; }; pythonImportsCheck = [ From 9a767bf884df0e2eb7dcc85f14a7c5b9e6c5131a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:13 -0800 Subject: [PATCH 316/561] python3Packages.sanic: 21.9.1 -> 21.9.3 --- 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 6161f5c5eb022..62c2bd36944cb 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "sanic"; - version = "21.9.1"; + version = "21.9.3"; src = fetchFromGitHub { owner = "sanic-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TRrJr/L8AXLAARPjhBi2FxNh+jvxxdeMN24cT1njmqY="; + sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i"; }; postPatch = '' From 6067e35787dae50a5742e111640f41827d8a48a5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:13 -0800 Subject: [PATCH 317/561] python3Packages.schema-salad: 8.2.20211104054942 -> 8.2.20211116214159 --- pkgs/development/python-modules/schema-salad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index c3445c1d3ad92..bf836fa45831c 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.2.20211104054942"; + version = "8.2.20211116214159"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1crKyAON8iZBYxP6bhj0MxV3fSpnCh3Lqp8x91KLBT8="; + sha256 = "0c737af600e0a03dd97c93b9867e862463b65d95580ba711fd22f542bc80ad00"; }; propagatedBuildInputs = [ From eb73d15d3bbf68d5830b955655b3d727867b3535 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:13 -0800 Subject: [PATCH 318/561] python3Packages.scikit-hep-testdata: 0.4.10 -> 0.4.11 --- .../python-modules/scikit-hep-testdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 0f76efe2ea597..d8240fd83333b 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.10"; + version = "0.4.11"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "0x6ba02f3sba9341nhyg9jdcbl9c1h880d8m75ybdpbn7zlaya1d"; + sha256 = "18r5nk8d5y79ihzjkjm5l0hiw2sjgj87px7vwb0bxbs73f5v353b"; }; nativeBuildInputs = [ From efc0861b651c10ffcf574834b54f61773bf35cf6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:13 -0800 Subject: [PATCH 319/561] python3Packages.scipy: 1.7.1 -> 1.7.3 --- pkgs/development/python-modules/scipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 2e19d2d42042b..9c3b28e0a9aca 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.7.1"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "6b47d5fa7ea651054362561a28b1ccc8da9368a39514c1bbf6c0977a1c376764"; + sha256 = "ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf"; }; nativeBuildInputs = [ cython gfortran pythran ]; From a4fc69a0da41169f96f74bfe26e2b8c4d9c8688b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:14 -0800 Subject: [PATCH 320/561] python3Packages.secp256k1: 0.13.2 -> 0.14.0 --- pkgs/development/python-modules/secp256k1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 58fa81b444f37..1637814cadd26 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "secp256k1"; - version = "0.13.2"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c"; + sha256 = "82c06712d69ef945220c8b53c1a0d424c2ff6a1f64aee609030df79ad8383397"; }; nativeBuildInputs = [ pkg-config ]; From d6cc92583729bc96313f02f2a3281c69c88a358c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:14 -0800 Subject: [PATCH 321/561] python3Packages.sentry-sdk: 1.4.3 -> 1.5.0 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index b7349caa233fa..afda360b41271 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.4.3"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b9844751e40710e84a457c5bc29b21c383ccb2b63d76eeaad72f7f1c808c8828"; + sha256 = "789a11a87ca02491896e121efdd64e8fd93327b69e8f2f7d42f03e2569648e88"; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond From 94808e74d116a63540931d35f12fbc60f6fe3bc3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:14 -0800 Subject: [PATCH 322/561] python3Packages.shap: 0.39.0 -> 0.40.0 --- pkgs/development/python-modules/shap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 128dacfd55a8f..fbd43953b5924 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "shap"; - version = "0.39.0"; + version = "0.40.0"; disabled = isPy27; src = fetchFromGitHub { owner = "slundberg"; repo = pname; rev = "v${version}"; - sha256 = "065c40k6g8sy6ynzk4k8k7iddl18g2b6kb9kg4m6g7npclmn5wvp"; + sha256 = "0ra0dp319qj13wxaqh2vz4xhn59m9h3bfg1m6wf3cxsix737b1k4"; }; propagatedBuildInputs = [ From 0f09e25b7b1ff3582ae84fb2ca4562a30d95e89b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:15 -0800 Subject: [PATCH 323/561] python3Packages.shortuuid: 1.0.1 -> 1.0.8 --- pkgs/development/python-modules/shortuuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index f1c1efbc0ec21..9ec4fc1b31de4 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "shortuuid"; - version = "1.0.1"; + version = "1.0.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3c11d2007b915c43bee3e10625f068d8a349e04f0d81f08f5fa08507427ebf1f"; + sha256 = "9435e87e5a64f3b92f7110c81f989a3b7bdb9358e22d2359829167da476cfc23"; }; buildInputs = [pep8]; From d8830ecd0cc625656f9551319ce02b812e04730c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:15 -0800 Subject: [PATCH 324/561] python3Packages.simple_di: 0.1.2 -> 0.1.4 --- pkgs/development/python-modules/simple-di/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simple-di/default.nix b/pkgs/development/python-modules/simple-di/default.nix index 4977c3a4bf146..612d913b7b6f0 100644 --- a/pkgs/development/python-modules/simple-di/default.nix +++ b/pkgs/development/python-modules/simple-di/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "simple_di"; - version = "0.1.2"; + version = "0.1.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0wqbfbajnwmkzih0jl3mncalr7dslvmwhb5mk11asqvmbp1xhn30"; + sha256 = "2667f2b9095e86c7726b3853c30b37f527f7d247282c7dd0b3428a7fb5d1a8a9"; }; propagatedBuildInputs = [ From 7638406a03f933a2bea37ea1c35292ea591b924e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:15 -0800 Subject: [PATCH 325/561] python3Packages.simplejson: 3.17.5 -> 3.17.6 --- pkgs/development/python-modules/simplejson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 52e55c71aff0e..1e6def5ae78a6 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.17.5"; + version = "3.17.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1vljsd5bk12gasadkxcddwhmp38fj64x1aqi4frk3frq9lp8h3a1"; + sha256 = "1irlp5sakbdfcf717qmrx0r9rjlmwk0vza6zm3y55d32zw5c1cxg"; }; checkInputs = [ From 00515d28d2ae0d14994bb95353d845fcdc19b022 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:15 -0800 Subject: [PATCH 326/561] python3Packages.smpplib: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/smpplib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 4966e8c8fb286..179ab7ce1bfc7 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "smpplib"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "3d513178a35573f66faac4ef2127c4bd73307ddb463d145b17b013cf709d9ddd"; + sha256 = "c0b01947b47e404f42ccb59e906b6e4eb507963c971d59b44350db0f29c76166"; }; propagatedBuildInputs = [ six ]; From 2bb30bc324821507d4977db1aafbe7b7f85ff42a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:15 -0800 Subject: [PATCH 327/561] python3Packages.snowballstemmer: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/snowballstemmer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 5f3029de2a706..a1813fac54e23 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snowballstemmer"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"; + sha256 = "09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"; }; # No tests included From 087153560642095e5f26a0da33976ca5df7f5d7f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:15 -0800 Subject: [PATCH 328/561] python3Packages.snowflake-connector-python: 2.6.2 -> 2.7.1 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 3f4ec9a0f5615..af6cd8defc7aa 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.6.2"; + version = "2.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ce131b1dd059a4d081e78595d618654bf9b9fc184d78352f24512375467257d1"; + sha256 = "81175ff9fe0355a7e9007a087458dddc0816985ec10dc122e690de03549afbff"; }; propagatedBuildInputs = [ From 5c7aa6dd14b0f042590c579d8435239b7c30e97f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:16 -0800 Subject: [PATCH 329/561] python3Packages.soupsieve: 2.2.1 -> 2.3.1 --- pkgs/development/python-modules/soupsieve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 954599ffefaa5..6c50cc6e11500 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.2.1"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "052774848f448cf19c7e959adf5566904d525f33a3f8b6ba6f6f8f26ec7de0cc"; + sha256 = "b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9"; }; checkPhase = '' From 5978b69575f8d85958ab0272bed21139e0b81cda Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:16 -0800 Subject: [PATCH 330/561] python3Packages.spacy-alignments: 0.8.3 -> 0.8.4 --- pkgs/development/python-modules/spacy-alignments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index 32506c2d9e749..110483f1b56dd 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "spacy-alignments"; - version = "0.8.3"; + version = "0.8.4"; disabled = !isPy3k; @@ -31,7 +31,7 @@ buildPythonPackage rec { # https://github.com/explosion/spacy-alignments/pull/3 (fetchpatch { url = "https://github.com/explosion/spacy-alignments/commit/7b0ba13ff0d245bfbbe344a36fb7bbd311dd4906.diff"; - sha256 = "sha256-jx97SSC+3z+ByInNs8Uq58H50eCo4fDCwEi6VKxRs2k="; + sha256 = "d4702997f459d30e537f638fbb540151adfab88aa2969f9d0db3e3ba39f47bdb"; excludes = [ ".gitignore" ]; }) ]; From c8be38ec627e30dfb387813766ea4fe8e8bb598b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:16 -0800 Subject: [PATCH 331/561] python3Packages.spacy: 3.1.3 -> 3.2.0 --- pkgs/development/python-modules/spacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index d959ad8947d65..0d095cfef07e0 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -29,13 +29,13 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.1.3"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WAhOZKJ5lxkupI8Yq7MOwUjFu+edBNF7pNL8JiEAwqI="; + sha256 = "68e54b2a14ce74eeecea9bfb0b9bdadf8a4a8157765dbefa7e50d25a1bf0f2f3"; }; propagatedBuildInputs = [ From 960b771ede89d27703ce37a2354662c937dfcfa8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:16 -0800 Subject: [PATCH 332/561] python3Packages.sphinxext-opengraph: 0.4.2 -> 0.5.0 --- .../python-modules/sphinxext-opengraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 08a87a2f7c023..d20fdafee1a80 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-978aPtaqUDHcswDdFynzi+IjDYaBmCZDZk+dmDkhajY="; + sha256 = "0iri6sh6h7l1p8xg04bj3bphs1hwxh43sfnrv1c8b1wy84w988y9"; }; propagatedBuildInputs = [ From a5f8543979aea2aa5e783d926ed87743a1c1284c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:16 -0800 Subject: [PATCH 333/561] python3Packages.spyder: 5.1.5 -> 5.2.0 --- 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 25389f2784ed7..38558f004984f 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.1.5"; + version = "5.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f9ce23187f5de18f489fb03c38d884e4484b9c7292f9831faaa029fb7752fc93"; + sha256 = "cd04acc88426acee9c4ce6bb91f50c13fc161a437e68bca701243b3415ce9d08"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; From 4d0f5ae908c2023ba7a66ae066cfd4dc84a0208d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:17 -0800 Subject: [PATCH 334/561] python3Packages.sqlite-utils: 3.17.1 -> 3.19 --- pkgs/development/python-modules/sqlite-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index b2715b4d29ed8..ec18a1ee76d0f 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.17.1"; + version = "3.19"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0cfde0c46a2d4c09d6df8609fe53642bc3ab443bcef3106d8f1eabeb3fccbe3d"; + sha256 = "509099fce5f25faada6e76b6fb90e8ef5ba0f1715177933a816718be0c8e7244"; }; postPatch = '' From ad026308fd483fcb38f9a6a249cab106c17f25c2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:17 -0800 Subject: [PATCH 335/561] python3Packages.strictyaml: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/strictyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 9b76edc1bae5d..1d74a62babd43 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "273a6382cc98a404d20779351cd5bb12e746397fbe18a8e9ccec4ae3c0ffa0e2"; + sha256 = "73fa9769214a310486d7916453a09bd38b07d28a9dcbdf27719183c1d7d949f6"; }; postPatch = '' From c739ba9fec1281a88a32f206eac2de9170656971 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:17 -0800 Subject: [PATCH 336/561] python3Packages.stripe: 2.62.0 -> 2.63.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index a8c451ebf9a90..ddb3a314f0a79 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.62.0"; + version = "2.63.0"; src = fetchPypi { inherit pname version; - sha256 = "1fb51d67a961ea889c5be324f020535ed511c6f483bd13a07f48f6e369fa8df0"; + sha256 = "816c935e31d82737a9e4362c662e8702bdf9000ea1bd36882cd4cbd23eb81ae1"; }; propagatedBuildInputs = [ requests ]; From cc67cc0f43c3a4ea6d01f98e0b5d389778df4d80 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:17 -0800 Subject: [PATCH 337/561] python3Packages.structlog: 21.2.0 -> 21.4.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 3d1a8f8af6744..7dc7f3e69de0d 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "21.2.0"; + version = "21.4.0"; src = fetchPypi { inherit pname version; - sha256 = "7ac42b565e1295712313f91edbcb64e0840a9037d888c8954f11fa6c43270e99"; + sha256 = "305a66201f9605a2e8a2595271a446f258175901c09c01e4c2c2a8ac5b68edf1"; }; checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] From 5bd4ada4aa9e0df143e123a38e28ed0645a84e99 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:17 -0800 Subject: [PATCH 338/561] python3Packages.stumpy: 1.9.2 -> 1.10.0 --- pkgs/development/python-modules/stumpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index a72ca40c21a12..a1cdd5b84e0e0 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; rev = "v${version}"; - sha256 = "0x5kac8fqsi3fkfwjdn0d7anslprxaz6cizky9cyj0rpbp0b0yc3"; + sha256 = "1h3mqz570s9rc45d217xrykcy8f4fnpyk178smam2fzynlr90gd8"; }; propagatedBuildInputs = [ From 86267d9a224b6586021a088d3e3728b29ac66a87 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:18 -0800 Subject: [PATCH 339/561] python3Packages.taskw: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/taskw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 80d86c3edb014..ac8a55e24d803 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.3.1"; pname = "taskw"; src = fetchPypi { inherit pname version; - sha256 = "7673d80b3d5bace5b35eb71f5035e313a92daab6e437694128d8ce7dcdaf66fb"; + sha256 = "1a68e49cac2d4f6da73c0ce554fd6f94932d95e20596f2ee44a769a28c12ba7d"; }; patches = [ ./use-template-for-taskwarrior-install-path.patch ]; From 0de74cb8ea2bad39f9eb6d4181ee128763bff2f2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:18 -0800 Subject: [PATCH 340/561] python3Packages.tifffile: 2021.8.30 -> 2021.11.2 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index f495541f5de17..2e46762672156 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2021.8.30"; + version = "2021.11.2"; src = fetchPypi { inherit pname version; - sha256 = "8760e61e30106ea0dab9ec42a238d70a3ff55dde9c54456e7b748fe717cb782d"; + sha256 = "153e31fa1d892f482fabb2ae9f2561fa429ee42d01a6f67e58cee13637d9285b"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; From 9608d7c50d1da0b67dd4352f01c2ae8f8015e010 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:18 -0800 Subject: [PATCH 341/561] python3Packages.toolz: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/toolz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 6100d2a7c53d3..aa30af2d5d6de 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "toolz"; - version = "0.11.1"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1grz3zvw5ixwqqlbv0n7j11mlcxb66cirh5i9x9zw8kqy0hpk967"; + sha256 = "6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33"; }; checkInputs = [ nose ]; From 856a77be32a6bb8ddbdd35da34a5bd08f16b6978 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:18 -0800 Subject: [PATCH 342/561] python3Packages.transformers: 4.12.2 -> 4.12.5 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 6bf5c069c64a9..5479a0b12258b 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.12.2"; + version = "4.12.5"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SndnMiXWiDW+E1G+WaUTVv3lySavJWF0nFDZLOxzObc="; + sha256 = "07v72fyhm1s3bzg2kvaff15d7d8na39nlqpf5gyxaqvp3hglc3qy"; }; nativeBuildInputs = [ packaging ]; From c6e932dbbf943b02625cacaf914e3f6e913a114b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:18 -0800 Subject: [PATCH 343/561] python3Packages.trytond: 6.2.0 -> 6.2.1 --- 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 4ad2f9f959c50..8ee48d938e38b 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.0"; + version = "6.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U73dzLTUJnOw24/ELQzjnxJ0PvjV+zE/PNuQHXbEukw="; + sha256 = "418f16c45b7130555447af901639b92bb188d39f46ce7fe4dfcd941c5959ed7e"; }; # Tells the tests which database to use From 936564323c58c140446dd261c4dce98e56bf1777 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:19 -0800 Subject: [PATCH 344/561] python3Packages.twentemilieu: 0.3.0 -> 0.4.2 --- pkgs/development/python-modules/twentemilieu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index fb5617321747b..1a32eb2cb5344 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "0.3.0"; + version = "0.4.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "frenck"; repo = "python-twentemilieu"; rev = "v${version}"; - sha256 = "1ff35sh73m2s7fh4d8p2pjwdbfljswr8b8lpcjybz8nsh0286xph"; + sha256 = "1lf31ldbrsmxhbrcg284pwpvjfmwnssv3gqwd5vm2hvd9lwqn6ii"; }; propagatedBuildInputs = [ From 0b897497330aa3f129d7b135650a3c23f523969c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:19 -0800 Subject: [PATCH 345/561] python3Packages.typeguard: 2.12.1 -> 2.13.2 --- 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 0385bd7070685..63e1502226d92 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.12.1"; + version = "2.13.2"; src = fetchPypi { inherit pname version; - sha256 = "c2af8b9bdd7657f4bd27b45336e7930171aead796711bc4cfc99b4731bb9d051"; + sha256 = "7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"; }; buildInputs = [ setuptools-scm ]; From df9cb897e6657d6d640e6a6f10e3e4500334d0e0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:19 -0800 Subject: [PATCH 346/561] python3Packages.types-protobuf: 3.18.0 -> 3.18.1 --- pkgs/development/python-modules/types-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index b3e38c8640701..8545db539fbfc 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.18.0"; + version = "3.18.1"; src = fetchPypi { inherit pname version; - sha256 = "a391d1a9138fe53fe08aeb6aa15ca7f1a188659b9a6c12af5313c55730eccd6c"; + sha256 = "6696bf3cabc51dcc076e8de025c405dbdea7488c5268c2febd14527dac82c233"; }; propagatedBuildInputs = [ types-futures ]; From 148103f5292935ce178340d2502a3824ba2d6493 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:19 -0800 Subject: [PATCH 347/561] python3Packages.ujson: 4.2.0 -> 4.3.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 70e676f6b2ccb..4d12af0689d8a 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.2.0"; + version = "4.3.0"; disabled = isPyPy || pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "fffe509f556861c7343c6cba57ed05fe7bcf4b48a934a5b946ccb45428cf8883"; + sha256 = "baee56eca35cb5fbe02c28bd9c0936be41a96fa5c0812d9d4b7edeb5c3d568a0"; }; nativeBuildInputs = [ From 8e1785094af62def7ef5fa3f2326dc329134cb00 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:19 -0800 Subject: [PATCH 348/561] python3Packages.virtualenv: 20.8.1 -> 20.10.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 c5aa9f0bac94c..349f0f8ef9a15 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.8.1"; + version = "20.10.0"; src = fetchPypi { inherit pname version; - sha256 = "bcc17f0b3a29670dd777d6f0755a4c04f28815395bca279cdcb213b97199a6b8"; + sha256 = "576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218"; }; nativeBuildInputs = [ From 40171cbc74ba486d854dca3b07da8e19e74e7240 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:19 -0800 Subject: [PATCH 349/561] python3Packages.vispy: 0.9.3 -> 0.9.4 --- pkgs/development/python-modules/vispy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index c13f7b6d7d3a6..5967b9b9abb76 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "bc3aec042637947d4e999121bab224077a6f7ede4af745102f41737f7c81c05a"; + sha256 = "8561e41bbcca5fadce4a8d974ca2f96cbe7710d835bfed6a55ed6d10900ef5d5"; }; patches = [ From 20db939b5d6d55ea9c22a522316261b06383f629 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:20 -0800 Subject: [PATCH 350/561] python3Packages.widgetsnbextension: 3.5.1 -> 3.5.2 --- .../development/python-modules/widgetsnbextension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index bb8f1ab3b4d5c..8f6cb6ad1867c 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.5.1"; + version = "3.5.2"; src = fetchPypi { inherit pname version; - sha256 = "079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7"; + sha256 = "e0731a60ba540cd19bbbefe771a9076dcd2dde90713a8f87f27f53f2d1db7727"; }; propagatedBuildInputs = [ notebook ]; From 6a31d494102fc1f46bf544ff7f86049aa2e9128f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:20 -0800 Subject: [PATCH 351/561] python3Packages.wled: 0.8.0 -> 0.10.0 --- pkgs/development/python-modules/wled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index cb6ec2b606d5c..784588e082bdc 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.8.0"; + version = "0.10.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "1jhykilb81sp1srxk91222qglwdlr993ssvgfnl837nbcx6ws1hw"; + sha256 = "0ivh6yxpswz730i33fwr4hj8nwdmdyw4n6p89x9sxmvjmd7ihkgm"; }; nativeBuildInputs = [ From d21f15799071b9ea2641786a1c4611a7416b3096 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:20 -0800 Subject: [PATCH 352/561] python3Packages.wrapt: 1.13.1 -> 1.13.3 --- pkgs/development/python-modules/wrapt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index d4bdac9e6f5de..e567a8a672ef8 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.13.1"; + version = "1.13.3"; # No tests in archive doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "909a80ce028821c7ad01bdcaa588126825931d177cdccd00b3545818d4a195ce"; + sha256 = "1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185"; }; meta = { From 5fe49c36a3108f9bee72a9869a701e43a8b5b7af Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:20 -0800 Subject: [PATCH 353/561] python3Packages.xattr: 0.9.7 -> 0.9.8 --- pkgs/development/python-modules/xattr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index a39c3532f4b8e..cbec33483ccd6 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xattr"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44"; + sha256 = "bf11c8c857215e3ef60b031e7807264f30af4348d7565a7e9b8dca70593753c7"; }; propagatedBuildInputs = [ cffi ]; From 9b502c81c10a266f0a41fb46999b9b6e761abb1a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:20 -0800 Subject: [PATCH 354/561] python3Packages.XStatic-jquery-ui: 1.12.1.1 -> 1.13.0.1 --- pkgs/development/python-modules/xstatic-jquery-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix index 8c872d0bbd19c..f5509676d1144 100644 --- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "XStatic-jquery-ui"; - version = "1.12.1.1"; + version = "1.13.0.1"; src = fetchPypi { inherit version pname; - sha256 = "d6ba48bb474420a8bcb2be02eef6ae96281ec24eff6befa54f04ebc9e4cc8910"; + sha256 = "3697e5f0ef355b8f4a1c724221592683c2db031935cbb57b46224eef474bd294"; }; # no tests implemented From b03880cdc64ed9cc1658803917ee9332302c1871 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:21 -0800 Subject: [PATCH 355/561] python3Packages.youtube-search-python: 1.5.1 -> 1.5.2 --- .../python-modules/youtube-search-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 634ff5ec54e18..ad23a6cc169d2 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.5.1"; + version = "1.5.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "68c70e1b6a2ce5c2c0ee64ba9c63efc9ab6e6f8acb2f51e19d570b0287e61cc9"; + sha256 = "33f0d58f4803b0b2badf860cd31fb83d3f7edecdd2c01dd09cd6511abbf0e6b9"; }; propagatedBuildInputs = [ httpx ]; From f2eb344280696fa3ce437ed67fb5068bedeba3fc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:21 -0800 Subject: [PATCH 356/561] python3Packages.zarr: 2.10.2 -> 2.10.3 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 9e5b058212957..11c6f84850bd5 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.10.2"; + version = "2.10.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5c6ae914ab9215631bb95c09e76b9b9b4fffa70fec0c7bca26b68387d858ebe2"; + sha256 = "76932665c2146ebdf15f6dba254f9e0030552fbfcf9322dea822bff96fbce693"; }; nativeBuildInputs = [ From f37698185fc02dc352b86cad874e0d2e7a8212ed Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:21 -0800 Subject: [PATCH 357/561] python3Packages.zope.proxy: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/zope_proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 2d1a5880d0dee..70e329cce9e96 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.4.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b244904c5148067c3f1899d29a2c1a28faca747b143192c0f825e6bf3170a347"; + sha256 = "1329846261cf6c552b05579f3cfad199b2d178510d0b4703eb5f7cdd6ebad01a"; }; propagatedBuildInputs = [ zope_interface ]; From 94eb60f77641c9a08500af0699561d6a73d097cd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:21 -0800 Subject: [PATCH 358/561] python3Packages.zope.schema: 6.1.0 -> 6.2.0 --- pkgs/development/python-modules/zope_schema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index 00defd1615090..9472000f15d1b 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.schema"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "9fa04d95e8e7e9056091eed9819da6e65dde68de39c2b93617d361d1eb8a7c0c"; + sha256 = "2201aef8ad75ee5a881284d7a6acd384661d6dca7bde5e80a22839a77124595b"; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; From 1c017973cacee168b7cfbd5944f52102289ca3a9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 14:47:21 -0800 Subject: [PATCH 359/561] python3Packages.zope.testrunner: 5.3.0 -> 5.4.0 --- pkgs/development/python-modules/zope_testrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index c3bc0d0bff4d7..2638d43147841 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.3.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "39a5ba631830703ea011383447135063db6d182794487dda9b8c1f515bb70b0f"; + sha256 = "4869229fc909e4aa8e76665a718f90dc88f73858b32ca5fa3dea6840e9210fb4"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; From a28f6c075615bd08c060dfc9bea04b616f92a572 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 16:10:30 -0800 Subject: [PATCH 360/561] python3Packages.paramiko: disable tests Deprecation warnings kill the test suite https://github.com/pyinvoke/invoke/issues/829 --- pkgs/development/python-modules/paramiko/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index a64befa1bbd4d..86cdb73b2607d 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -22,6 +22,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; + # with python 3.9.6+, the deprecation warnings will fail the test suite + # see: https://github.com/pyinvoke/invoke/issues/829 + doCheck = false; checkInputs = [ invoke pytestCheckHook pytest-relaxed mock ]; disabledTestPaths = [ From e2f35475d083ae855cf94c2634c291e806e6f2bc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Nov 2021 16:16:06 -0800 Subject: [PATCH 361/561] Revert "python3Packages.docutils: 0.17.1 -> 0.18.1" This reverts commit e94af69c7c01067f64bef5bdc0e21cf18677b988. --- pkgs/development/python-modules/docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 65167343f8c3c..529a09d3f0468 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "docutils"; - version = "0.18.1"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06"; + sha256 = "686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"; }; # Only Darwin needs LANG, but we could set it in general. From f6123952df170259ea31fb3dc1615062335059e9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Nov 2021 01:45:22 +0100 Subject: [PATCH 362/561] python3Packages.astroid: 2.8.2 -> 2.9.0 --- .../python-modules/astroid/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index b6ba53055d36f..101f84b4fceab 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , isPyPy , lazy-object-proxy @@ -15,32 +14,23 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.8.2"; # Check whether the version is compatible with pylint + version = "2.9.0"; # Check whether the version is compatible with pylint - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6.2"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "0140h4l7licwdw0scnfzsbi5b2ncxi7fxhdab7c1i3sk01r4asp6"; + sha256 = "sha256-sImWiWULZ1HS3JyQHfEhc4ZRZ6anOUTqZZGNIYj2MaY="; }; - SETUPTOOLS_SCM_PRETEND_VERSION=version; - - patches = [ - (fetchpatch { - # Allow wrapt 1.13 (https://github.com/PyCQA/astroid/pull/1203) - url = "https://github.com/PyCQA/astroid/commit/fd510e08c2ee862cd284861e02b9bcc9a7fd9809.patch"; - sha256 = "1s10whslcqnyz251fb76qkc9p41gagxljpljsmw89id1wywmjib4"; - }) - ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptools-scm ]; - # From astroid/__pkginfo__.py propagatedBuildInputs = [ lazy-object-proxy wrapt @@ -52,6 +42,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # assert (1, 1) == (1, 16) + "test_end_lineno_string" + ]; + passthru.tests = { inherit pylint; }; From 86f75850923c90c2fb75c1e297664be5decf953b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Nov 2021 01:45:42 +0100 Subject: [PATCH 363/561] python3Packages.pylint: fix tests --- pkgs/development/python-modules/pylint/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index ebe73e7287f99..a2814c5b18eaf 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -6,6 +6,7 @@ , installShellFiles , astroid , isort +, GitPython , mccabe , platformdirs , toml @@ -46,6 +47,7 @@ buildPythonPackage rec { ''; checkInputs = [ + GitPython pytest-benchmark pytest-xdist pytestCheckHook @@ -56,6 +58,7 @@ buildPythonPackage rec { # calls executable in one of the tests preCheck = '' export PATH=$PATH:$out/bin + export HOME=$TEMPDIR ''; pytestFlagsArray = [ From b66f0fbf31bb5b110cae475321d6957e620a4aa2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Nov 2021 02:06:12 +0100 Subject: [PATCH 364/561] python3Packages.aiohttp-wsgi: disable failing test --- pkgs/development/python-modules/aiohttp-wsgi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index ed270cddd9814..1e4763453209a 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { disabledTests = [ # makes http request to another server + # https://github.com/etianen/aiohttp-wsgi/issues/32 "testEnviron" ]; From 2f970424f95585f779c3acbe867d324c9e6af510 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Nov 2021 02:12:10 +0100 Subject: [PATCH 365/561] python3Packages.aiopvapi: 1.6.14 -> unstable-2021-09-07; apply patch to drop loop kwarg --- .../python-modules/aiopvapi/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index 5565108289146..cbf7415ef9f58 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -2,23 +2,36 @@ , aiohttp , async-timeout , buildPythonPackage +, fetchFromGitHub , fetchPypi +, fetchpatch , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "aiopvapi"; - version = "1.6.14"; + version = "unstable-2021-09-27"; format = "setuptools"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "02bl7q166j6rb8av9n1jz11xlwhrzmbkjq70mwr86qaj63pcxrak"; + src = fetchFromGitHub { + owner = "sander76"; + repo = "aio-powerview-api"; + rev = "7b362e28a8ec8c9a53905879d8b519e03fd88e13"; + sha256 = "sha256-7bZLCv9PEJr61vimw39m89w/rha3tQWM8TWMtfd8kjQ="; }; + patches = [ + (fetchpatch { + # Drop loop= kwarg from async_timeout and ClientSession calls + # https://github.com/sander76/aio-powerview-api/pull/13 + url = "https://github.com/sander76/aio-powerview-api/commit/7be67268050fbbf7652ce5a020d2ff26f34d0b27.patch"; + sha256 = "sha256-7QPwrMP1Sbrayg63YZJcRkVDAqcm6hqh0fuJdrUk5WY="; + }) + ]; + propagatedBuildInputs = [ aiohttp async-timeout From 6c6f8f450dbcf56f9e677b527bb97107245d4d68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Nov 2021 02:14:13 +0100 Subject: [PATCH 366/561] python3Packages.plugwise: 0.15.2 -> 0.15.3 --- pkgs/development/python-modules/plugwise/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 2534ebcedf91b..28a67f1da82e0 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,16 +19,21 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.15.2"; + version = "0.15.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "sha256-VmLQ3L9FTHgdRPYmMg7ZoUApLEGKd5NANrSofhP1OQY="; + sha256 = "sha256-HaH0LcH6L3R9vLT0vlM1absMTbfqgEeVi/aP2FqdnQY="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "aiohttp==3.8.0" "aiohttp>=3.8.0" + ''; + propagatedBuildInputs = [ aiohttp async-timeout From 15037e6e38885e0a28a5ea9dfda60d80e002e5c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Nov 2021 10:19:26 +0100 Subject: [PATCH 367/561] python3Packages.screenlogicpy: add pytest-asyncio --- pkgs/development/python-modules/screenlogicpy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index c8663478d8828..5586fa2383232 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pytest-asyncio , pytestCheckHook }: @@ -20,6 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ + pytest-asyncio pytestCheckHook ]; From a272aaea4f607d14e474e0cc95e0d64c772f8752 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Nov 2021 14:37:02 +0100 Subject: [PATCH 368/561] python3Packages.charset-normalizer: 2.0.5 -> 2.0.8 --- .../development/python-modules/charset-normalizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index 66d9e23668b4b..7f7f54b73d91c 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "2.0.5"; + version = "2.0.8"; src = fetchFromGitHub { owner = "Ousret"; repo = "charset_normalizer"; rev = version; - sha256 = "0pv6yf5ialc82iimsjbq3gp5hh02pg4a7sdma48gd81h4h8qd627"; + sha256 = "sha256-+acnzdDcujnMa0FYlWaAX7Ga9APMRlvBLKoogIyY8YM="; }; checkInputs = [ From 0f27fc3d9451671ada1dd2fa0d7cc7c3a483632c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Nov 2021 11:50:41 +0100 Subject: [PATCH 369/561] python3Packages.websockets: 10.0 -> 10.1 --- .../python-modules/websockets/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 611c84ea814c3..2e13d95c3825c 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -1,21 +1,23 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , python , pythonOlder -, stdenv }: buildPythonPackage rec { pname = "websockets"; - version = "10.0"; + version = "10.1"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aaugustin"; repo = pname; rev = version; - sha256 = "sha256-F10C8ukjYfbn2X2PMzrdSDqvs51/A9lx8Y3kv8YJ8Cw="; + sha256 = "sha256-FFaoqxa+TmKJ+P6T7HrwodjbVCir+2qJSfZsoj6deJU="; }; # Tests fail on Darwin with `OSError: AF_UNIX path too long` @@ -34,7 +36,9 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "websockets" ]; + pythonImportsCheck = [ + "websockets" + ]; meta = with lib; { description = "WebSocket implementation in Python"; From a506eb42d1966097ce7a8c5624f364b425c6ecd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Nov 2021 18:42:55 +0100 Subject: [PATCH 370/561] python3Packages.watchdog: disable flaky tests --- pkgs/development/python-modules/watchdog/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 6d2725796a097..9fba5785c4478 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "watchdog"; version = "2.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -38,7 +39,14 @@ buildPythonPackage rec { --replace "--cov-report=term-missing" "" ''; - pythonImportsCheck = [ "watchdog" ]; + disabledTestPaths = [ + # Tests are flaky + "tests/test_inotify_buffer.py" + ]; + + pythonImportsCheck = [ + "watchdog" + ]; meta = with lib; { description = "Python API and shell utilities to monitor file system events"; From 7f9f1ecd900c163362b69685ec6d799edcdbb334 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 28 Nov 2021 16:40:42 -0800 Subject: [PATCH 371/561] python3Packages.frozendict: disable formatting tests Too sensitive to interpreter's __repr__ format --- pkgs/development/python-modules/frozendict/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 2d0e540b4fc9c..ccc637a32fb76 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -34,6 +34,10 @@ buildPythonPackage rec { disabledTests = [ # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict' "test_union" + # non-standard assertions + "test_repr" + "test_format" + "test_str" ]; disabledTestPaths = [ From d7f80b4e734539f725427884b06e067c7b16271d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 28 Nov 2021 16:45:39 -0800 Subject: [PATCH 372/561] awscli: 1.20.54 -> 1.22.14 --- pkgs/tools/admin/awscli/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 0b9d6b4738316..754b2e8cea6ab 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -20,17 +20,18 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.20.54"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.22.14"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-stnuPobBKIpKA4iTKGTO5kmMEl7grFdZNryz40S599M="; + sha256 = "sha256-FTGtUqdjZel8XqSrO3s3XQNqR6fyTO3mc1gyIQfk9n8="; }; # https://github.com/aws/aws-cli/issues/4837 postPatch = '' substituteInPlace setup.py \ - --replace "docutils>=0.10,<0.16" "docutils>=0.10" + --replace "docutils>=0.10,<0.16" "docutils>=0.10" \ + --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2" ''; propagatedBuildInputs = [ From ace86cb8dbd8707af00c1e6e7d9bff3eca79d063 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 28 Nov 2021 16:45:51 -0800 Subject: [PATCH 373/561] python3Packages.botocore: 1.23.13 -> 1.23.14 --- 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 46d3dba449635..b34dbfbac98cc 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.13"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.23.14"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "35792b2196049ef900f538cae51fb8359c940156eef187962aa9e3bd2c0b8e8c"; + sha256 = "sha256-6NUsvy5zxiaM8sIH9H48+z7eCYP5PotZZ0tUYo5+8fE="; }; propagatedBuildInputs = [ From 016e0c494f03d4f2a8e7205f659aa372e0a32e0b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 28 Nov 2021 16:59:03 -0800 Subject: [PATCH 374/561] python3Packages.sphinx: 4.2.0 -> 4.3.1 --- 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 374838df54f08..75693f3657e43 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.2.0"; + version = "4.3.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "129x3kljxq7sbg5cc12z3cmjsili6l3qrsxllkx97id1a85f7zmj"; + sha256 = "sha256-8Yj6cPZFG8ycbbZtMR+fsIAOX0brxroi6nYjP+WhnxA="; extraPostFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ From de93eeee943ed09ab95eeb6e243b03cbf5ef6a2d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 28 Nov 2021 23:45:15 -0800 Subject: [PATCH 375/561] python3Packages.fonttools: avoid matplotlib in closure, cyclic dependencies --- .../python-modules/fonttools/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 96ea9d4be1e83..ec3acfc775d0f 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -4,17 +4,14 @@ , pythonOlder , brotlipy , zopfli -, fs , lxml , scipy , munkres , unicodedata2 , sympy -, matplotlib , reportlab , sphinx , pytestCheckHook -, pytest-randomly , glibcLocales }: @@ -34,13 +31,11 @@ buildPythonPackage rec { # all dependencies are optional, but # we run the checks with them + checkInputs = [ pytestCheckHook - pytest-randomly # etree extra lxml - # ufo extra - fs # woff extra brotlipy zopfli @@ -49,8 +44,6 @@ buildPythonPackage rec { munkres # symfont sympy - # varLib - matplotlib # pens reportlab sphinx @@ -72,6 +65,15 @@ buildPythonPackage rec { "test_ttcompile_timestamp_calcs" ]; + disabledTestPaths = [ + # avoid test which depend on fs and matplotlib + # fs and matplotlib were removed to prevent strong cyclic dependencies + "Tests/misc/plistlib_test.py" + "Tests/pens" + "Tests/ufoLib" + ]; + + meta = with lib; { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; From d20fc633dbac10fed609325f1748ec2df9c05108 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 28 Nov 2021 23:46:11 -0800 Subject: [PATCH 376/561] python3Packages.fs: disable tests due to cyclic dependencies with parameterized --- pkgs/development/python-modules/fs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index ac7fae213b003..0ab3778f55cf4 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -28,6 +28,9 @@ buildPythonPackage rec { }; buildInputs = [ glibcLocales ]; + + # strong cycle with paramaterized + doCheck = false; checkInputs = [ pyftpdlib mock psutil pytestCheckHook ]; propagatedBuildInputs = [ six appdirs pytz ] ++ lib.optionals (!isPy3k) [ backports_os ] From 819d9f9a60705ccc15ebabdfb4f6bdee6c693e65 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 28 Nov 2021 23:46:45 -0800 Subject: [PATCH 377/561] python3Packages.matplotlib: fix build, disable network fetch of deps --- .../python-modules/matplotlib/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 72a32ae4b4feb..081051480ef90 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo , which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection -, certifi, pillow +, certifi, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive , enableGhostscript ? true, ghostscript, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -29,14 +29,18 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + setuptools-scm + setuptools-scm-git-archive + ]; buildInputs = [ which sphinx ] ++ lib.optional enableGhostscript ghostscript ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler python-dateutil numpy pyparsing tornado freetype qhull + [ cycler fonttools python-dateutil numpy pyparsing tornado freetype qhull kiwisolver certifi libpng mock pytz pillow ] ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] @@ -74,6 +78,13 @@ buildPythonPackage rec { substituteInPlace src/_c_internal_utils.c \ --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 + '' + '' + # avoid matplotlib trying to download dependencies + echo "[libs] + system_freetype=true + system_qhull=true" > mplsetup.cfg + cat mplsetup.cfg + echo FFFFFFFFFFFFFFFFFFFFFFFFFFFFF ''; # Matplotlib needs to be built against a specific version of freetype in From cdb7c0139a829c169f28950656b17c605872cbf5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 28 Nov 2021 23:53:42 -0800 Subject: [PATCH 378/561] python3Packages.toolz: fix tests --- pkgs/development/python-modules/toolz/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index aa30af2d5d6de..234cb471e46dd 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pytestCheckHook }: buildPythonPackage rec { @@ -13,11 +13,7 @@ buildPythonPackage rec { sha256 = "6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33"; }; - checkInputs = [ nose ]; - - checkPhase = '' - nosetests toolz/tests - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/pytoolz/toolz"; From e87bd4c03ecfa96e193a52fbe8ec47caf04bca9b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 00:00:54 -0800 Subject: [PATCH 379/561] python3Packages.requests-kerberos: fix build and tests --- .../python-modules/requests-kerberos/default.nix | 13 ++++++++++--- .../requests-kerberos/fix_setup.patch | 9 --------- 2 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 pkgs/development/python-modules/requests-kerberos/fix_setup.patch diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index 37455d8f78b73..17a8191455aed 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -4,7 +4,9 @@ , cryptography , requests , pykerberos +, pyspnego , pytestCheckHook +, pytest-mock , mock }: @@ -20,20 +22,25 @@ buildPythonPackage rec { sha256 = "0yvfg2cj3d10l8fd8kyal4hmpd7fd1c3bca13cj9ril5l573in76"; }; + # avoid needing to package krb5 + postPatch = '' + substituteInPlace setup.py \ + --replace "pyspnego[kerberos]" "pyspnego" + ''; + propagatedBuildInputs = [ cryptography requests pykerberos + pyspnego ]; checkInputs = [ mock pytestCheckHook + pytest-mock ]; - # they have a setup.py which mentions a test suite that doesn't exist... - patches = [ ./fix_setup.patch ]; - pythonImportsCheck = [ "requests_kerberos" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/requests-kerberos/fix_setup.patch b/pkgs/development/python-modules/requests-kerberos/fix_setup.patch deleted file mode 100644 index 67cc3a60f77e2..0000000000000 --- a/pkgs/development/python-modules/requests-kerberos/fix_setup.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- ./setup.py 1980-01-02 00:00:00.000000000 +0000 -+++ ./setup.py 1980-01-02 00:00:00.000000000 +0000 -@@ -56,6 +56,5 @@ - ':sys_platform=="win32"': ['winkerberos>=0.5.0'], - ':sys_platform!="win32"': ['pykerberos>=1.1.8,<2.0.0'], - }, -- test_suite='test_requests_kerberos', - tests_require=['mock'], - ) From 84479ea577dfb10c5f328f7aa4751069c23c99f0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 00:03:31 -0800 Subject: [PATCH 380/561] python3Packages.janus: fix missing dep --- pkgs/development/python-modules/janus/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index f46ef2e62f5cb..c8a9efdb54f84 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, pytest-asyncio }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, pytest-asyncio +, typing-extensions +}: buildPythonPackage rec { pname = "janus"; @@ -11,6 +13,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ + typing-extensions + ]; + checkInputs = [ pytest-asyncio pytestCheckHook ]; # also fails upstream: https://github.com/aio-libs/janus/pull/258 From 8dd4b068947e4e3a26dffa25212600e0497941ca Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 00:04:29 -0800 Subject: [PATCH 381/561] python3Packages.shortuuid: fix tests --- pkgs/development/python-modules/shortuuid/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index 9ec4fc1b31de4..5b7aad436fe11 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy3k , fetchPypi +, django , pep8 }: @@ -16,7 +17,10 @@ buildPythonPackage rec { sha256 = "9435e87e5a64f3b92f7110c81f989a3b7bdb9358e22d2359829167da476cfc23"; }; - buildInputs = [pep8]; + checkInputs = [ + django + pep8 + ]; meta = with lib; { description = "A generator library for concise, unambiguous and URL-safe UUIDs"; From 83d2f12a0263ed1eec3ebb364dd73a1047f323fe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 00:13:43 -0800 Subject: [PATCH 382/561] python3Packages.structlog: fetch from github, fix tests --- .../python-modules/structlog/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 7dc7f3e69de0d..2e90d3350dbe7 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub +, pytestCheckHook , pytest-asyncio -, python-rapidjson , pretend , freezegun , twisted @@ -15,24 +14,22 @@ buildPythonPackage rec { pname = "structlog"; version = "21.4.0"; + format = "flit"; - src = fetchPypi { - inherit pname version; - sha256 = "305a66201f9605a2e8a2595271a446f258175901c09c01e4c2c2a8ac5b68edf1"; + # sdist is missing conftest.py + src = fetchFromGitHub { + owner = "hynek"; + repo = "structlog"; + rev = version; + sha256 = "sha256-uXFSrC1TvQV46uu0sadC3eMq7yk5TnrpQE8m6NSv1Bg="; }; - checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] - ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ]; + checkInputs = [ pytestCheckHook pytest-asyncio pretend freezegun simplejson twisted ]; propagatedBuildInputs = [ six ]; - checkPhase = '' - # rm tests/test_twisted.py* - py.test - ''; - meta = { description = "Painless structural logging"; - homepage = "http://www.structlog.org/"; + homepage = "https://github.com/hynek/structlog"; license = lib.licenses.asl20; }; } From 82545a328f863415579e50ecb0b022b6ecb94100 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 00:19:10 -0800 Subject: [PATCH 383/561] python3Packages.spacy-alignments: fix build, remove old patch --- .../python-modules/spacy-alignments/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index 110483f1b56dd..95ba3c946343c 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -17,25 +17,15 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-zrqBjaIjtF6bJMbmw7Zo+BeApN6sxxfLkrzsDjdvC78="; + sha256 = "sha256-1HApl/RZ0w5Tf2OPu1QBUa36uIqilp+dDbPjujn0e9s="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit patches src; + inherit src; name = "${pname}-${version}"; - hash = "sha256-YRyG2yflEXKklNqXiDD9oK3J1lq4o704+Eeu2hyY3xI="; + sha256 = "sha256-oFSruBnoodv6/0/OrmJ/2SVoWm3u3FGtzVJ9xgp0+Cg="; }; - patches = [ - # Add Cargo.lock, from upstream PR: - # https://github.com/explosion/spacy-alignments/pull/3 - (fetchpatch { - url = "https://github.com/explosion/spacy-alignments/commit/7b0ba13ff0d245bfbbe344a36fb7bbd311dd4906.diff"; - sha256 = "d4702997f459d30e537f638fbb540151adfab88aa2969f9d0db3e3ba39f47bdb"; - excludes = [ ".gitignore" ]; - }) - ]; - nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ From 174e8f7b15a8054c0dbae216568a2c383c4f354b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 08:58:25 -0800 Subject: [PATCH 384/561] python3Packages.httpcore: 0.13.7 -> 0.14.3 --- .../python-modules/httpcore/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 089c2d9fcc428..99eb08a35a9d4 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -3,12 +3,14 @@ , pythonOlder , fetchFromGitHub , anyio +, certifi , h11 , h2 , pproxy , pytest-asyncio , pytestCheckHook , pytest-cov +, pytest-httpbin , sniffio , trio , trustme @@ -17,18 +19,19 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.13.7"; + version = "0.14.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-9hG9MqqEYMT2j7tXafToGYwHbJfp9/klNqZozHSbweE="; + sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo="; }; propagatedBuildInputs = [ anyio + certifi h11 h2 sniffio @@ -39,19 +42,12 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook pytest-cov + pytest-httpbin trio trustme uvicorn ]; - disabledTestPaths = [ - # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known - "tests/test_threadsafety.py" - "tests/async_tests/" - "tests/sync_tests/test_interfaces.py" - "tests/sync_tests/test_retries.py" - ]; - pythonImportsCheck = [ "httpcore" ]; meta = with lib; { From 0f6c4562d9188f30911a385a6c997a2f35dffacf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 08:58:02 -0800 Subject: [PATCH 385/561] python3Packages.httpx: 0.19.0 -> 0.21.1 --- .../python-modules/httpx/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 014272bcc107e..543308a3fdc12 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -9,6 +9,7 @@ , httpcore , rfc3986 , sniffio +, python , pytestCheckHook , pytest-asyncio , pytest-trio @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.19.0"; + version = "0.21.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-bUxxeUYqOHBmSL2gPQG5cIq6k5QY4Kyhj9ToA5yZXPA="; + sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc="; }; propagatedBuildInputs = [ @@ -50,12 +51,24 @@ buildPythonPackage rec { pythonImportsCheck = [ "httpx" ]; + # testsuite wants to find installed packages for testing entrypoint + preCheck = '' + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; + disabledTests = [ # httpcore.ConnectError: [Errno 101] Network is unreachable "test_connect_timeout" # httpcore.ConnectError: [Errno -2] Name or service not known "test_async_proxy_close" "test_sync_proxy_close" + # sensitive to charset_normalizer output + "iso-8859-1" + "test_response_no_charset_with_iso_8859_1_content" + ]; + + disabledTestPaths = [ + "tests/test_main.py" ]; __darwinAllowLocalNetworking = true; From ab6591fb9a7373c3d8d07c0f0979de1ecd54e60c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 09:58:19 -0800 Subject: [PATCH 386/561] python3Packages.send2trash: 1.5.0 -> 1.8.1b0 --- pkgs/development/python-modules/send2trash/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index a91be01511191..8a35d3ed71a66 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -6,13 +6,14 @@ buildPythonPackage rec { pname = "Send2Trash"; - version = "1.5.0"; + version = "1.8.1b0"; + format = "pyproject"; src = fetchFromGitHub { owner = "hsoft"; repo = "send2trash"; rev = version; - sha256 = "1c76zldhw2ay7q7r00nnzcampjz9lkqfcbzqpm0iqp5i6bmmv30v"; + sha256 = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q="; }; doCheck = !stdenv.isDarwin; From 478e92ba24ead2cb32707aad4096282ed858e9d2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 10:01:17 -0800 Subject: [PATCH 387/561] python3Packages.matplotlib: remove debug lines --- pkgs/development/python-modules/matplotlib/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 081051480ef90..be53c995d72d7 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -78,13 +78,12 @@ buildPythonPackage rec { substituteInPlace src/_c_internal_utils.c \ --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 - '' + '' - # avoid matplotlib trying to download dependencies + '' + + # avoid matplotlib trying to download dependencies + '' echo "[libs] system_freetype=true system_qhull=true" > mplsetup.cfg - cat mplsetup.cfg - echo FFFFFFFFFFFFFFFFFFFFFFFFFFFFF ''; # Matplotlib needs to be built against a specific version of freetype in From 4679a09afd1df837eaece7beffcfb827f677afc0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 10:07:33 -0800 Subject: [PATCH 388/561] python3Packages.django_compressor: fix build --- .../python-modules/django_compressor/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index 2e58047d8a9cb..61a32e2561a30 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, rcssmin, rjsmin, django_appconf }: + buildPythonPackage rec { pname = "django_compressor"; version = "2.4.1"; @@ -9,8 +10,9 @@ buildPythonPackage rec { sha256 = "3358077605c146fdcca5f9eaffb50aa5dbe15f238f8854679115ebf31c0415e0"; }; postPatch = '' - substituteInPlace setup.py --replace 'rcssmin == 1.0.6' 'rcssmin' \ - --replace 'rjsmin == 1.0.12' 'rjsmin' + substituteInPlace setup.py \ + --replace 'rcssmin == 1.0.6' 'rcssmin' \ + --replace 'rjsmin == 1.1.0' 'rjsmin' ''; # requires django-sekizai, which we don't have packaged yet From 5d63bf250ebb8c860bced7d9c9b6954946f91f07 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 10:10:37 -0800 Subject: [PATCH 389/561] python3Packages.xdist: disable flakey test --- pkgs/development/python-modules/pytest-xdist/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b8f4814e533fa..f71522a40dc63 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { "test_rsync_report" "test_init_rsync_roots" "test_rsyncignore" + # flakey + "test_internal_errors_propagate_to_controller" ]; meta = with lib; { From a661f124235cfa9366ce745be250637d096276ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 17 Oct 2021 12:58:53 +0200 Subject: [PATCH 390/561] python3Packages.datasette: 0.58.1 -> 0.59 --- pkgs/development/python-modules/datasette/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 5a611c989f4d8..ef681bce9846d 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -31,14 +31,15 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.58.1"; + version = "0.59"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-dtKqp7LV1fRjwOMAlmmAnC19j8hLA1oixGextATW6z0="; + sha256 = "sha256-sr4sUDNdkFhPWbtLjzMGxo6vC+mlnAM1G+RUuh75tbg="; }; nativeBuildInputs = [ pytest-runner ]; @@ -79,7 +80,6 @@ buildPythonPackage rec { --replace "pint~=0.9" "pint" \ --replace "pluggy~=0.13.0" "pluggy" \ --replace "uvicorn~=0.11" "uvicorn" \ - --replace "PyYAML~=5.3" "PyYAML" ''; # takes 30-180 mins to run entire test suite, not worth the CPU resources, slows down reviews @@ -108,6 +108,6 @@ buildPythonPackage rec { description = "Multi-tool for exploring and publishing data"; homepage = "https://datasette.io/"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From f042c47fa21f3427a0af5cb05de809de578b7c1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 17:51:12 +0100 Subject: [PATCH 391/561] python3Packages.aiofiles: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/aiofiles/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 05027dc0170de..033ba87933a7e 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Tinche"; repo = pname; rev = "v${version}"; - sha256 = "0vvk9j8cfdqvq8hw2qc6ajfzsy8x1afabf83mxafffq92rwknd4y"; + sha256 = "sha256-V7F+xalFGMgTgT30Gmd9FVV3cPndI/i9cB5vEuW/KVc="; }; nativeBuildInputs = [ @@ -35,7 +35,9 @@ buildPythonPackage rec { "test_sendfile_file" ]; - pythonImportsCheck = [ "aiofiles" ]; + pythonImportsCheck = [ + "aiofiles" + ]; meta = { description = "File support for asyncio"; From 4c3f9d8b757f1a3ae5d49956727d60ab80b3a522 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 Nov 2021 22:47:52 +0100 Subject: [PATCH 392/561] python3Packages.envoy-reader: allow later httpx releases --- .../python-modules/envoy-reader/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index 0f2ca79d64119..a327c3f457d29 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , envoy-utils , fetchFromGitHub +, fetchpatch , httpx , pytest-asyncio , pytest-raises @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "envoy-reader"; version = "0.20.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jesserizzo"; @@ -37,7 +39,18 @@ buildPythonPackage rec { --replace "pytest-runner>=5.2" "" ''; - pythonImportsCheck = [ "envoy_reader" ]; + patches = [ + # Support for later httpx, https://github.com/jesserizzo/envoy_reader/pull/82 + (fetchpatch { + name = "support-later-httpx.patch"; + url = "https://github.com/jesserizzo/envoy_reader/commit/6019a89419fe9c830ba839be7d39ec54725268b0.patch"; + sha256 = "17vsrx13rskvh8swvjisb2dk6x1jdbjcm8ikkpidia35pa24h272"; + }) + ]; + + pythonImportsCheck = [ + "envoy_reader" + ]; meta = with lib; { description = "Python module to read from Enphase Envoy units"; From 0cc6103d5b269f3e61bdc534bd539bf79894c94d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 17:49:28 +0100 Subject: [PATCH 393/561] python3Packages.ephem: 4.1 -> 4.1.1 --- pkgs/development/python-modules/ephem/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 58c14699880e8..1e5db008dea9f 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -7,11 +7,12 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.1"; + version = "4.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "c076794a511a34b5b91871c1cf6374dbc323ec69fca3f50eb718f20b171259d6"; + sha256 = "sha256-26ngXHjOkQrnWgY1GlWSR5GRqNxXCsDNbRinfpgTiHM="; }; checkInputs = [ @@ -24,7 +25,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8" pytest --pyargs ephem.tests -k "not JPLTest" ''; - pythonImportsCheck = [ "ephem" ]; + pythonImportsCheck = [ + "ephem" + ]; meta = with lib; { description = "Compute positions of the planets and stars"; From 66591e17b03279bdd9f6832ff7c0bb769b7d9c8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 11:58:42 +0100 Subject: [PATCH 394/561] python3Packages.google-api-core: disable failing grpc tests --- .../google-api-core/default.nix | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index ea18d4fb77197..8296dbfacf8d5 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -10,11 +10,15 @@ , mock , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-api-core"; version = "2.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -30,14 +34,35 @@ buildPythonPackage rec { requests ]; - checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - pythonImportsCheck = [ "google.api_core" ]; + disabledTests = [ + # Those grpc_helpers tests are failing + "test_wrap_unary_errors" + "test_wrap_stream_errors_raised" + "test_wrap_stream_errors_read" + "test_wrap_stream_errors_aiter" + "test_wrap_stream_errors_write" + "test_wrap_unary_errors" + "test___next___w_rpc_error" + "test_wrap_stream_errors_invocation" + "test_wrap_stream_errors_iterator_initialization" + "test_wrap_stream_errors_during_iteration" + "test_exception_with_error_code" + ]; + + pythonImportsCheck = [ + "google.api_core" + ]; meta = with lib; { description = "Core Library for Google Client Libraries"; From 904bb80628ee14dda2655122b1da8b3b13c6996d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 11:59:36 +0100 Subject: [PATCH 395/561] python3Packages.google-api-python-client: remove six --- .../google-api-python-client/default.nix | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 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 e4046ab2637c8..185c7579e4f71 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,24 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi -, google-auth, google-auth-httplib2, google-api-core -, httplib2, six, uritemplate, oauth2client, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, google-auth +, google-auth-httplib2 +, google-api-core +, httplib2 +, uritemplate +, oauth2client +, setuptools +, pythonOlder +}: buildPythonPackage rec { pname = "google-api-python-client"; version = "2.31.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "3f64a5eee6fa03ab51806dccf48e342fda83fea60c290518c6a2dfdbf2de9efd"; }; - # No tests included in archive - doCheck = false; - propagatedBuildInputs = [ - google-auth google-auth-httplib2 google-api-core - httplib2 six uritemplate oauth2client setuptools + google-auth + google-auth-httplib2 + google-api-core + httplib2 + uritemplate + oauth2client + setuptools ]; + # No tests included in archive + doCheck = false; + pythonImportsCheck = [ "googleapiclient" ]; From 9a0cdde9ab7636c06933386f7a427f97dc308c9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 12:15:23 +0100 Subject: [PATCH 396/561] python3Packages.grpcio-status: init at 1.42.0 --- .../python-modules/grpcio-status/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/grpcio-status/default.nix diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix new file mode 100644 index 0000000000000..cb36e4387ef33 --- /dev/null +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, googleapis-common-protos +, grpc +, grpcio +, protobuf +, pythonOlder +}: + +buildPythonPackage rec { + pname = "grpcio-status"; + inherit (grpc) version; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "JVM8TWXX1ROmOPDEuIsrZnAOO/Q+aZWlWjvRXsC3eQI="; + }; + + propagatedBuildInputs = [ + googleapis-common-protos + grpcio + protobuf + ]; + + # Projec thas no tests + doCheck = false; + + pythonImportsCheck = [ + "grpc_status" + ]; + + meta = with lib; { + description = "GRPC Python status proto mapping"; + homepage = "https://github.com/grpc/grpc/tree/master/src/python/grpcio_status"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b165b4dd8b05c..8a0cffc04a2ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3398,6 +3398,8 @@ in { grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + grpcio-status = callPackage ../development/python-modules/grpcio-status { }; + grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; gruut = callPackage ../development/python-modules/gruut { }; From fc0317ee0d3f2ccb05beb30f70cc53949c33b35b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 12:16:39 +0100 Subject: [PATCH 397/561] python3Packages.google-cloud-pubsub: add grpcio-status --- .../development/python-modules/google-cloud-pubsub/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 28116c61f7096..67a8daf6f9974 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -5,6 +5,7 @@ , google-api-core , google-cloud-testutils , grpc-google-iam-v1 +, grpcio-status , libcst , mock , proto-plus @@ -14,6 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; version = "2.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -23,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core + grpcio-status libcst proto-plus ]; From 7d7b596e6a3e8e0a966d6aa1c1b880b3a28a7273 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 12:27:33 +0100 Subject: [PATCH 398/561] python3Packages.wled: add missing dependencies --- .../python-modules/wled/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 784588e082bdc..ead63367f8ce2 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -1,23 +1,25 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub , aiohttp +, aresponses +, awesomeversion , backoff +, buildPythonPackage +, cachetools +, fetchFromGitHub , poetry-core -, packaging -, yarl -, aresponses , pytest-asyncio , pytestCheckHook +, pythonOlder +, yarl }: buildPythonPackage rec { pname = "wled"; version = "0.10.0"; - disabled = pythonOlder "3.8"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "frenck"; repo = "python-wled"; @@ -31,8 +33,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + awesomeversion backoff - packaging + cachetools yarl ]; @@ -49,7 +52,9 @@ buildPythonPackage rec { --replace "--cov" "" ''; - pythonImportsCheck = [ "wled" ]; + pythonImportsCheck = [ + "wled" + ]; meta = with lib; { description = "Asynchronous Python client for WLED"; From 3281194f48846a1fc99af6fcba2c7ac4157836e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 14:07:58 +0100 Subject: [PATCH 399/561] python3Packages.pyfaidx: fix build --- .../python-modules/pyfaidx/default.nix | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index a50c8accb8587..a2815c3e1e2d2 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -1,24 +1,52 @@ { lib , buildPythonPackage , fetchPypi +, nose +, numpy +, setuptools-scm , six +, pytestCheckHook }: buildPythonPackage rec { pname = "pyfaidx"; version = "0.6.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "93adf036a75e08dc9b1dcd59de6a4db2f65a48c603edabe2e499764b6535ed50"; }; - propagatedBuildInputs = [ six ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + nose + numpy + pytestCheckHook + ]; + + disabledTests = [ + # PyPI releases don't ship all the needed files for the tests + "test_index_zero_length" + "test_fetch_zero_length" + "test_read_back_index" + ]; + + pythonImportsCheck = [ + "pyfaidx" + ]; meta = with lib; { homepage = "https://github.com/mdshw5/pyfaidx"; description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; license = licenses.bsd3; - maintainers = [ maintainers.jbedo ]; + maintainers = with maintainers; [ jbedo ]; }; } From 2f3e4c9d1cbde64369c5d4b36076c5734c5b0419 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 14:12:52 +0100 Subject: [PATCH 400/561] python3Packages.pudb: add missing dependencies --- .../python-modules/pudb/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index b156bce135041..81e1627324ad8 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,17 +1,22 @@ { lib , buildPythonPackage +, dataclasses , isPy3k , fetchPypi , jedi , pygments , urwid +, urwid-readline , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pudb"; version = "2021.2.2"; + format = "setuptools"; + disabled = !isPy3k; src = fetchPypi { @@ -23,15 +28,22 @@ buildPythonPackage rec { jedi pygments urwid + urwid-readline + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook ]; preCheck = '' export HOME=$TMPDIR ''; - checkInputs = [ - pytest-mock - pytestCheckHook + pythonImportsCheck = [ + "pudb" ]; meta = with lib; { From 997383276e181e00c4101a89b56b33b183442415 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 14:16:05 +0100 Subject: [PATCH 401/561] python3Packages.pex: switch to flit --- pkgs/development/python-modules/pex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 38073094b1d7f..438360260822b 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, setuptools +, flit-core }: buildPythonPackage rec { pname = "pex"; version = "2.1.56"; - format = "setuptools"; + format = "flit"; src = fetchPypi { inherit pname version; @@ -15,7 +15,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools + flit-core ]; # A few more dependencies I don't want to handle right now... From b0034f21446d4d88ee98f1fb60defcbad5c1584f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 14:33:58 +0100 Subject: [PATCH 402/561] python3Packages.async_stagger: disable failing test --- .../python-modules/async_stagger/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/async_stagger/default.nix b/pkgs/development/python-modules/async_stagger/default.nix index 638e326e0da4b..3dafd2b21941e 100644 --- a/pkgs/development/python-modules/async_stagger/default.nix +++ b/pkgs/development/python-modules/async_stagger/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { pname = "async_stagger"; version = "0.3.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -23,7 +25,14 @@ buildPythonPackage rec { pytest-mock ]; - pythonImportsCheck = [ "async_stagger" ]; + disabledTests = [ + # RuntimeError: Logic bug in... + "test_stagger_coro_gen" + ]; + + pythonImportsCheck = [ + "async_stagger" + ]; meta = with lib; { description = "Happy Eyeballs connection algorithm and underlying scheduling logic in asyncio"; From 75f7a59002b54bfc99233315e859013e9e4fa6ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 17:36:51 +0100 Subject: [PATCH 403/561] python3Packages.genanki: add missing dependency --- .../python-modules/genanki/default.nix | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index 627a8598fa997..7b37be48f1002 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -1,10 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, cached-property, frozendict, pystache, pyyaml, pytest, pytest-runner +{ lib +, buildPythonPackage +, cached-property +, chevron +, fetchPypi +, frozendict +, pystache +, pythonOlder +, pyyaml }: buildPythonPackage rec { pname = "genanki"; version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -12,26 +22,28 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pytest-runner cached-property + chevron frozendict pystache pyyaml ]; - checkInputs = [ pytest ]; - - disabled = !isPy3k; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; # relies on upstream anki doCheck = false; - checkPhase = '' - py.test - ''; + + pythonImportsCheck = [ + "genanki" + ]; meta = with lib; { - homepage = "https://github.com/kerrickstaley/genanki"; description = "Generate Anki decks programmatically"; + homepage = "https://github.com/kerrickstaley/genanki"; license = licenses.mit; maintainers = with maintainers; [ teto ]; }; From 88961280231fea495046f55cca10ccf692e1ffbd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 11:16:13 +0100 Subject: [PATCH 404/561] python3Packages.homematicip: add support for async_timeout>4 --- .../python-modules/homematicip/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index e6759f498a327..cd7d523c2a7c2 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { pname = "homematicip"; version = "1.0.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -42,6 +44,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace homematicip/aio/connection.py \ + --replace ", loop=self._loop" "" + ''; + disabledTests = [ # Assert issues with datetime "test_contact_interface_device" @@ -67,7 +74,9 @@ buildPythonPackage rec { "test_websocket" ]; - pythonImportsCheck = [ "homematicip" ]; + pythonImportsCheck = [ + "homematicip" + ]; meta = with lib; { description = "Python module for the homematicIP REST API"; From 998db37980f831d252892e2ea880c052f5b72f4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Nov 2021 23:28:38 +0100 Subject: [PATCH 405/561] python3Packages.python-socks: 1.2.4 -> 2.0.0 --- .../python-modules/python-socks/default.nix | 45 ++++++++++++++++--- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index dcf2688082754..e6c2d016bb09d 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -1,17 +1,48 @@ -{ lib, buildPythonPackage, trio, curio, async-timeout, fetchPypi, pythonOlder }: +{ lib +, async-timeout +, buildPythonPackage +, curio +, fetchFromGitHub +, flask +, pytest-asyncio +, pytest-trio +, pythonOlder +, pytestCheckHook +, trio +, yarl +}: buildPythonPackage rec { pname = "python-socks"; - version = "1.2.4"; + version = "2.0.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1n6xb18jy41ybgkmamakg6psp3qididd45qknxiggngaiibz43kx"; + disabled = pythonOlder "3.6.1"; + + src = fetchFromGitHub { + owner = "romis2012"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-iTwlUyfTD2ZhOvBX3IDqjkeW4Z2tfKxvQjIV7GGBVJA="; }; - disabled = pythonOlder "3.6.1"; + propagatedBuildInputs = [ + trio + curio + async-timeout + ]; + + checkInputs = [ + flask + pytest-asyncio + pytest-trio + pytestCheckHook + yarl + ]; - propagatedBuildInputs = [ trio curio async-timeout ]; + pythonImportsCheck = [ + "python_socks" + ]; meta = with lib; { description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; From 5365e6ea25e1e51b5f4309e2d12907c65365e3b1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 12:36:33 -0800 Subject: [PATCH 406/561] python3Packages.androguard: fix build --- .../development/python-modules/androguard/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 492c835f018eb..42f37e130994f 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -11,6 +11,7 @@ , click , pydot , ipython +, packaging , pyqt5 , pyperclip , nose @@ -39,6 +40,12 @@ buildPythonPackage rec { sha256 = "1aparxiq11y0hbvkayp92w684nyxyyx7mi0n1x6x51g5z6c58vmy"; }; + nativeBuildInputs = [ + packaging + ] ++ lib.optionals withGui [ + qt5.wrapQtAppsHook + ]; + propagatedBuildInputs = [ asn1crypto click @@ -67,10 +74,6 @@ buildPythonPackage rec { ]; inherit doCheck; - nativeBuildInputs = lib.optionals withGui [ - qt5.wrapQtAppsHook - ]; - # If it won't be verbose, you'll see nothing going on for a long time. checkPhase = '' runHook preCheck From f8628e91abeefa1ab908ed1e105df6b4cd9372b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 12:41:13 -0800 Subject: [PATCH 407/561] python3Packages.frozendict: remove no longer relevant comment --- pkgs/development/python-modules/frozendict/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index ccc637a32fb76..e1ab3d9da89b6 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.1.0"; # 2.0.6 breaks canonicaljson + version = "2.1.0"; format = "setuptools"; disabled = !isPy3k; From 3b0f66c2db6d8249b483f324fee40afee1530231 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 12:45:09 -0800 Subject: [PATCH 408/561] python3Packages.twentemilieu: fix build --- .../python-modules/twentemilieu/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index 1a32eb2cb5344..d60db84d68afe 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -5,6 +5,7 @@ , aiohttp , yarl , aresponses +, poetry-core , pytest-asyncio , pytestCheckHook }: @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "twentemilieu"; version = "0.4.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -21,6 +23,16 @@ buildPythonPackage rec { sha256 = "1lf31ldbrsmxhbrcg284pwpvjfmwnssv3gqwd5vm2hvd9lwqn6ii"; }; + # coverage tests aren't useful when consuming releases + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '--cov' "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp yarl From 0d420cc9cb291d890d498caaa73376f8d8d36095 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 12:51:06 -0800 Subject: [PATCH 409/561] python3Packages.libcst: fix build --- pkgs/development/python-modules/libcst/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 8ef73f48e856f..774cb572e95b2 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -9,6 +9,7 @@ , python , pythonOlder , pyyaml +, setuptools-scm , typing-extensions , typing-inspect }: @@ -27,6 +28,18 @@ buildPythonPackage rec { sha256 = "1r4aiqpndqa75119faknsghi7zxyjrx5r6i7cb3d0liwiqrkzrvx"; }; + postPatch = '' + # test try to format files, which isn't necessary when consuming releases + sed -i libcst/codegen/generate.py \ + -e '/ufmt/c\ pass' + ''; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ hypothesis typing-extensions From 253a56ff91b58af4c1441e231607efb072e13d3f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 12:53:09 -0800 Subject: [PATCH 410/561] python2Packages.jinja2: disable tests, pytest no longer filters warnings --- pkgs/development/python-modules/jinja2/2.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jinja2/2.nix b/pkgs/development/python-modules/jinja2/2.nix index 3cdf83a74db90..02127a50df746 100644 --- a/pkgs/development/python-modules/jinja2/2.nix +++ b/pkgs/development/python-modules/jinja2/2.nix @@ -21,7 +21,8 @@ buildPythonPackage rec { # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 - doCheck = !stdenv.is32bit || isPy3k; + # warnings are no longer being filtered correctly for python2 + doCheck = !stdenv.is32bit && isPy3k; checkPhase = '' pytest -v tests -W ignore::DeprecationWarning From d7c38ae221d586da5910d55da7bd1fb0ba8e258b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 Nov 2021 21:03:55 +0100 Subject: [PATCH 411/561] wapiti: 3.0.5 -> 3.0.7 --- pkgs/tools/security/wapiti/default.nix | 37 +++++++++++++++++++------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 38ba47a512234..4d877030e5375 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = pname; rev = version; - sha256 = "0663hzpmn6p5xh65d2gk4yk2zh992lfd9lhdwwabhpv3n85nza75"; + sha256 = "0kya9a2zs1c518z4p34pfjx2sms6843gh3c9qc9zvk4lr4g7hw3x"; }; nativeBuildInputs = with python3.pkgs; [ @@ -19,19 +19,26 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ + aiocache + aiosqlite beautifulsoup4 browser-cookie3 cryptography - Mako - markupsafe - pysocks + dnspython httpx httpx-ntlm httpx-socks + loguru + Mako + markupsafe + pysocks six + sqlalchemy tld yaswfp - ] ++ lib.optionals (python3.pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (python3.pythonOlder "3.8") [ + importlib-metadata + ]; checkInputs = with python3.pkgs; [ respx @@ -42,9 +49,18 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # Ignore pinned versions substituteInPlace setup.py \ - --replace "==" ">=" + --replace "httpx-socks[asyncio] == 0.5.1" "httpx-socks[asyncio]" \ + --replace "markupsafe==1.1.1" "markupsafe" \ + --replace "importlib_metadata==3.7.2" "importlib_metadata" \ + --replace "browser-cookie3==0.11.4" "browser-cookie3" \ + --replace "cryptography==3.3.2" "cryptography" \ + --replace "httpx[brotli]==0.20.0" "httpx" \ + --replace "sqlalchemy>=1.4.26" "sqlalchemy" \ + --replace "aiocache==0.11.1" "aiocache" \ + --replace "aiosqlite==0.17.0" "aiosqlite" \ + --replace "dnspython==2.1.0" "dnspython" substituteInPlace setup.cfg \ - --replace " --cov" "" + --replace " --cov --cov-report=xml" "" ''; preCheck = '' @@ -92,6 +108,7 @@ python3.pkgs.buildPythonApplication rec { "test_title_false_positive" "test_title_positive" "test_true_positive_request_count" + "test_unregistered_cname" "test_url_detection" "test_warning" "test_whole" @@ -108,7 +125,9 @@ python3.pkgs.buildPythonApplication rec { "test_persister_upload" ]; - pythonImportsCheck = [ "wapitiCore" ]; + pythonImportsCheck = [ + "wapitiCore" + ]; meta = with lib; { description = "Web application vulnerability scanner"; From 63185324b9a58a26aaae5033488ce4fc9060d26e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 21:22:18 +0100 Subject: [PATCH 412/561] python3Packages.respx: 0.17.1 -> 0.19.0 --- 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 0d7f509b4a0e7..d085d43008bb1 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.17.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "0w8idh6l2iq04ydz7r2qisq9jsxq8wszkx97kx4g3yjwg4ypvc6k"; + sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8="; }; propagatedBuildInputs = [ From a851789de9591b7dd6b651eecafe0944d002a532 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 21:45:08 +0100 Subject: [PATCH 413/561] python3Packages.karton-dashboard: fix build --- pkgs/development/python-modules/karton-dashboard/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index ad7d871385694..08eeed7141ae5 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "karton-dashboard"; version = "1.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "CERT-Polska"; @@ -28,7 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "Flask==1.1.1" "Flask" \ - --replace "prometheus-client==0.9.0" "prometheus-client" + --replace "prometheus-client==0.10.0" "prometheus-client" ''; # Project has no tests. pythonImportsCheck requires MinIO configuration From 19b862bc4ccb37ec8ead31dd81739ac7a787ba41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 21:46:58 +0100 Subject: [PATCH 414/561] python3Packages.gdown: add missing dependency --- pkgs/development/python-modules/gdown/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index bb9085e0d674e..195a7e822d761 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -1,4 +1,5 @@ { lib +, beautifulsoup4 , buildPythonApplication , fetchPypi , filelock @@ -11,18 +12,30 @@ buildPythonApplication rec { pname = "gdown"; version = "4.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "bd871c125242a9d3691aa74f360b6b5268a58c13991bb2405fdb3ec3028307dc"; }; - propagatedBuildInputs = [ filelock requests tqdm setuptools six ]; + propagatedBuildInputs = [ + beautifulsoup4 + filelock + requests + tqdm + setuptools + six + ]; checkPhase = '' $out/bin/gdown --help > /dev/null ''; + pythonImportsCheck = [ + "gdown" + ]; + meta = with lib; { description = "A CLI tool for downloading large files from Google Drive"; homepage = "https://github.com/wkentaro/gdown"; From ced4c16f5760030b1262bd062f1ea363d29353b3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 13:35:35 -0800 Subject: [PATCH 415/561] python3Packages.imageio: fix tests --- .../python-modules/imageio/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index d47525d18a4ce..f27c9fded9b29 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -7,6 +7,7 @@ , pillow , psutil , pytestCheckHook +, tifffile }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { checkInputs = [ psutil pytestCheckHook + tifffile ]; preCheck = '' @@ -36,6 +38,20 @@ buildPythonPackage rec { export HOME="$(mktemp -d)" ''; + disabledTests = [ + # tries to pull remote resources, even with IMAGEIO_NO_INTERNET + "test_png_remote" + # needs git history + "test_mvolread_out_of_bytes" + "test_imiter" + "test_memory_size" + "test_legacy_write_empty" + ]; + + disabledTestPaths = [ + "tests/test_pillow.py" + ]; + meta = with lib; { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; homepage = "http://imageio.github.io/"; From 7e1f5ca64273139acccc0e951c82c9d1e65d73ed Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 13:35:51 -0800 Subject: [PATCH 416/561] python3Packages.cytoolz: fix tests --- pkgs/development/python-modules/cytoolz/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 70c7e6f3c9fad..9b1b9ecb8da61 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPyPy -, nose +, pytestCheckHook , toolz , python , isPy27 @@ -18,13 +18,17 @@ buildPythonPackage rec { sha256 = "ea23663153806edddce7e4153d1d407d62357c05120a4e8485bddf1bd5ab22b4"; }; - checkInputs = [ nose ]; propagatedBuildInputs = [ toolz ]; - checkPhase = '' - nosetests -v $out/${python.sitePackages} + # tests are located in cytoolz/tests, however we can't import cytoolz + # from $PWD, as it will break relative imports + preCheck = '' + cd cytoolz + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; + checkInputs = [ pytestCheckHook ]; + meta = { homepage = "https://github.com/pytoolz/cytoolz/"; description = "Cython implementation of Toolz: High performance functional utilities"; From 59325220e5ccd7cc2050f55f2e21a457aa734b3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 22:44:59 +0100 Subject: [PATCH 417/561] python3Packages.elmax: 0.1.3 -> 0.1.5 --- pkgs/development/python-modules/elmax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix index db1ff91ee0eb0..77bbd480e9ba8 100644 --- a/pkgs/development/python-modules/elmax/default.nix +++ b/pkgs/development/python-modules/elmax/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax"; - version = "0.1.3"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-OiVPjWqQw1u0OL6/uYlT+FP2XDh7l3OZyVtQfycHICI="; + sha256 = "sha256-EcYEpYv+EwwEfW8Sy7aQjFAPpmsA6qVbmlwrPdxdnEw="; }; nativeBuildInputs = [ poetry-core ]; From f9ee9559d54b2b1c48a02aa350a953d81db5e9d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 22:49:33 +0100 Subject: [PATCH 418/561] python3Packages.language-data: init at 1.0.1 --- .../python-modules/language-data/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/language-data/default.nix diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix new file mode 100644 index 0000000000000..98d4885b1e949 --- /dev/null +++ b/pkgs/development/python-modules/language-data/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, marisa-trie +, poetry-core +, pythonOlder +}: + +buildPythonApplication rec { + pname = "language-data"; + version = "1.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "rspeer"; + repo = "language_data"; + rev = "v${version}"; + sha256 = "51TUVHXPHG6ofbnxI6+o5lrtr+QCIpGKu+OjDK3l7Mc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + marisa-trie + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "language_data" + ]; + + meta = with lib; { + description = "Supplement module for langcodes"; + homepage = "https://github.com/rspeer/language_data"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a0cffc04a2ac..1fa579ce0114d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4269,6 +4269,8 @@ in { langdetect = callPackage ../development/python-modules/langdetect { }; + language-data = callPackage ../development/python-modules/language-data { }; + lark-parser = callPackage ../development/python-modules/lark-parser { }; latexcodec = callPackage ../development/python-modules/latexcodec { }; From 307559ca0f7e058cd1336527394f91fc8de801f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 22:54:57 +0100 Subject: [PATCH 419/561] python3Packages.langcodes: add language-data --- .../python-modules/langcodes/default.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 4e8f108a1ed77..e3454acd5cd92 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -3,30 +3,48 @@ , marisa-trie , pythonOlder , fetchPypi -, nose +, poetry-core +, pytestCheckHook +, language-data }: buildPythonPackage rec { pname = "langcodes"; version = "3.3.0"; - disabled = pythonOlder "3.3"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "794d07d5a28781231ac335a1561b8442f8648ca07cd518310aeb45d6f0807ef6"; }; - propagatedBuildInputs = [ marisa-trie ]; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + language-data + marisa-trie + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ nose ]; + disabledTests = [ + # AssertionError: assert 'Unknown language [aqk]' == 'Aninka' + "test_updated_iana" + ]; - checkPhase = '' - nosetests - ''; + pythonImportsCheck = [ + "langcodes" + ]; meta = with lib; { - description = "A toolkit for working with and comparing the standardized codes for languages, such as ‘en’ for English or ‘es’ for Spanish"; - homepage = "https://github.com/LuminosoInsight/langcodes"; + description = "Python toolkit for working with and comparing the standardized codes for languages"; + homepage = "https://github.com/LuminosoInsight/langcodes"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; From aa0dcc60e004a8ae1c2769acbe4d4ba67b8b6e9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 00:23:09 +0100 Subject: [PATCH 420/561] python3Packages.jaraco-context: init at 4.1.1 --- .../python-modules/jaraco-context/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/jaraco-context/default.nix diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix new file mode 100644 index 0000000000000..7be059359259d --- /dev/null +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "jaraco-context"; + version = "4.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.context"; + rev = "v${version}"; + sha256 = "O9Lwv2d/qbiXxIVCp6FLmVKaz0MzAUkoUd0jAyIvgJc="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonNamespaces = [ + "jaraco" + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "jaraco.context" ]; + + + meta = with lib; { + description = "Python module for context management"; + homepage = "https://github.com/jaraco/jaraco.context"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1fa579ce0114d..01f3a1299c90e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3962,6 +3962,8 @@ in { jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + jaraco-context = callPackage ../development/python-modules/jaraco-context { }; + jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; From 04412150cde9164fcf2bb2c6874b262253e9ebcd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 00:25:16 +0100 Subject: [PATCH 421/561] python3Packages.jaraco_text: add jaraco-context --- .../python-modules/jaraco_text/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index ea7067b587734..054f68ba2f244 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -1,33 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , importlib-resources , jaraco_functools +, jaraco-context , setuptools-scm }: buildPythonPackage rec { pname = "jaraco.text"; version = "3.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "901d3468eaaa04f1d8a8f141f54b8887bfd943ccba311fc1c1de62c66604dfe0"; }; - pythonNamespaces = [ "jaraco" ]; + pythonNamespaces = [ + "jaraco" + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; - nativeBuildInputs =[ setuptools-scm ]; propagatedBuildInputs = [ + jaraco-context jaraco_functools - ] ++ lib.optional (pythonOlder "3.7") [ importlib-resources ]; + ] ++ lib.optional (pythonOlder "3.9") [ + importlib-resources + ]; # no tests in pypi package doCheck = false; + pythonImportsCheck = [ + "jaraco.text" + ]; + meta = with lib; { description = "Module for text manipulation"; homepage = "https://github.com/jaraco/jaraco.text"; license = licenses.mit; maintainers = with maintainers; [ ]; }; - } From c586350dfbfbdefde0e718f9c531420314bec154 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 00:28:28 +0100 Subject: [PATCH 422/561] flatcam: add packaging --- pkgs/applications/science/electronics/flatcam/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index b8a80c5e9c117..1f6679625ec77 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -18,6 +18,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ matplotlib numpy + packaging pyqt4 Rtree scipy From a00e7e357ce5680d18cbff8d1678fda6098b3f5d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 00:34:13 +0100 Subject: [PATCH 423/561] corrscope: add packaging --- pkgs/applications/video/corrscope/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix index c1d6669c8c2f9..0e1d377be28e7 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/applications/video/corrscope/default.nix @@ -11,6 +11,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "corrscope"; version = "0.7.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "corrscope"; @@ -19,8 +20,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m"; }; - format = "pyproject"; - patches = [ # Remove when bumping past 0.7.1 (fetchpatch { @@ -30,11 +29,28 @@ mkDerivationWith python3Packages.buildPythonApplication rec { }) ]; - nativeBuildInputs = [ wrapQtAppsHook ] ++ (with python3Packages; [ poetry-core ]); + nativeBuildInputs = [ + wrapQtAppsHook + ] ++ (with python3Packages; [ + poetry-core + ]); - buildInputs = [ ffmpeg qtbase ]; + buildInputs = [ + ffmpeg + qtbase + ]; - propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy pyqt5 ruamel-yaml ]; + propagatedBuildInputs = with python3Packages; [ + appdirs + atomicwrites + attrs + click + matplotlib + numpy + packaging + pyqt5 + ruamel-yaml + ]; dontWrapQtApps = true; From 15159db026d38dc9a943c59b1357e07bdf8805f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 00:45:25 +0100 Subject: [PATCH 424/561] python3Packages.rfc6555: switch to GitHub and pytestCheckHook --- .../python-modules/rfc6555/default.nix | 41 +++++++++++++------ .../rfc6555/disable_network_tests.patch | 31 -------------- 2 files changed, 28 insertions(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/rfc6555/disable_network_tests.patch diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix index e38ad9c2a337c..5be65fee23951 100644 --- a/pkgs/development/python-modules/rfc6555/default.nix +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -1,27 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, pythonPackages }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, selectors2 +}: buildPythonPackage rec { pname = "rfc6555"; version = "0.1.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "123905b8f68e2bec0c15f321998a262b27e2eaadea29a28bd270021ada411b67"; + src = fetchFromGitHub { + owner = "sethmlarson"; + repo = pname; + rev = "v${version}"; + sha256 = "Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM="; }; - propagatedBuildInputs = with pythonPackages; [ selectors2 ]; + propagatedBuildInputs = [ + selectors2 + ]; - checkInputs = with pythonPackages; [ mock pytest ]; - # disabling tests that require a functional DNS IPv{4,6} stack to pass. - patches = [ ./disable_network_tests.patch ]; - # default doCheck = true; is not enough, apparently - postCheck = '' - py.test tests/ - ''; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Disabling tests that require a functional DNS IPv{4,6} stack to pass + "test_create_connection_has_proper_timeout" + ]; + + pythonImportsCheck = [ + "rfc6555" + ]; meta = with lib; { description = "Python implementation of the Happy Eyeballs Algorithm"; - homepage = "https://pypi.org/project/rfc6555"; + homepage = "https://github.com/sethmlarson/rfc6555"; license = licenses.asl20; maintainers = with maintainers; [ endocrimes ]; }; diff --git a/pkgs/development/python-modules/rfc6555/disable_network_tests.patch b/pkgs/development/python-modules/rfc6555/disable_network_tests.patch deleted file mode 100644 index dc59111ac43f0..0000000000000 --- a/pkgs/development/python-modules/rfc6555/disable_network_tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tests/test_create_connection.py b/tests/test_create_connection.py -index fe38026..cdb26b4 100644 ---- a/tests/test_create_connection.py -+++ b/tests/test_create_connection.py -@@ -6,10 +6,12 @@ from .test_utils import requires_network - - - class _BasicCreateConnectionTests(object): -+ - @requires_network - def test_create_connection_google(self): - sock = rfc6555.create_connection(('www.google.com', 80)) - -+ @requires_network - @pytest.mark.parametrize('timeout', [None, 5.0]) - def test_create_connection_has_proper_timeout(self, timeout): - sock = rfc6555.create_connection(('www.google.com', 80), timeout=timeout) -diff --git a/tests/test_ipv6.py b/tests/test_ipv6.py -index 3ee8564..f0db28e 100644 ---- a/tests/test_ipv6.py -+++ b/tests/test_ipv6.py -@@ -2,7 +2,9 @@ import socket - import mock - import rfc6555 - -+from .test_utils import requires_network - -+@requires_network - def test_ipv6_available(): - assert rfc6555._detect_ipv6() - From 19142373dbd699bbf66eb1fe36ff4db458ac5cfb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 15:49:33 -0800 Subject: [PATCH 425/561] python3Packages.pastescript: disable tests suite, doesn't respect PYTHONPATH --- .../python-modules/pastescript/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index bc15e5e9f2a63..244b51f3f844e 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , nose +, python +, pytestCheckHook , six , paste , pastedeploy @@ -23,10 +25,22 @@ buildPythonPackage rec { six ]; - checkInputs = [ nose ]; + # test suite seems to unset PYTHONPATH + doCheck = false; + checkInputs = [ nose pytestCheckHook ]; pythonNamespaces = [ "paste" ]; + disabledTestPaths = [ + "appsetup/testfiles" + ]; + + pythonImportsCheck = [ + "paste.script" + "paste.deploy" + "paste.util" + ]; + meta = with lib; { description = "A pluggable command-line frontend, including commands to setup package file layouts"; homepage = "https://github.com/cdent/pastescript/"; From 7fd5aa824c087f107adf3e78bdfa2b495c0205c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 01:01:38 +0100 Subject: [PATCH 426/561] python3Packages.adjusttext: add packaging --- .../python-modules/adjusttext/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index 82613ffa52aa0..9685f5c9969db 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -1,13 +1,15 @@ -{ buildPythonPackage -, numpy -, matplotlib +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, matplotlib +, numpy +, packaging }: buildPythonPackage rec { pname = "adjusttext"; version = "0.7.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "Phlya"; @@ -16,12 +18,21 @@ buildPythonPackage rec { sha256 = "02apaznnnmwmrn342f22dj5dldn56gdl9v5qix07ah6kgp9503yw"; }; - propagatedBuildInputs = [ matplotlib numpy ]; + nativeBuildInputs = [ + packaging + ]; + + propagatedBuildInputs = [ + matplotlib + numpy + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "adjustText" ]; + pythonImportsCheck = [ + "adjustText" + ]; meta = with lib; { description = "Iteratively adjust text position in matplotlib plots to minimize overlaps"; From 9e3234aa9f7720f8f3abd18110e18586d457a8c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 01:04:27 +0100 Subject: [PATCH 427/561] python3Packages.avro: switch to pytestCheckHook --- .../python-modules/avro/default.nix | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index e85f2e9bf0429..d69f009aaf4cb 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,30 +1,44 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, typing-extensions +, pytestCheckHook +}: buildPythonPackage rec { pname = "avro"; version = "1.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "1206365cc30ad561493f735329857dd078533459cee4e928aec2505f341ce445"; }; - patchPhase = '' - # this test requires network access - sed -i 's/test_server_with_path/noop/' avro/test/test_ipc.py - '' + (lib.optionalString isPy3k '' - # these files require twisted, which is not python3 compatible - rm avro/txipc.py - rm avro/test/txsample* - ''); + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Requires network access + "test_server_with_path" + ]; - nativeBuildInputs = [ pycodestyle ]; - propagatedBuildInputs = [ isort ]; + pythonImportsCheck = [ + "avro" + ]; meta = with lib; { - description = "A serialization and RPC framework"; - homepage = "https://pypi.python.org/pypi/avro/"; + description = "Python serialization and RPC framework"; + homepage = "https://github.com/apache/avro"; license = licenses.asl20; - maintainers = [ maintainers.zimbatm ]; + maintainers = with maintainers; [ zimbatm ]; }; } From 87acd0eb02104ba22ccbc146d54bf425f911fbd3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 22:14:30 -0800 Subject: [PATCH 428/561] python3Packages.jschema-to-python: init at 1.2.3 --- .../jschema-to-python/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/jschema-to-python/default.nix diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix new file mode 100644 index 0000000000000..a9100e061d7b0 --- /dev/null +++ b/pkgs/development/python-modules/jschema-to-python/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchPypi +, attrs +, jsonpickle +, pbr +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jschema-to-python"; + version = "1.2.3"; + + src = fetchPypi { + pname = "jschema_to_python"; + inherit version; + sha256 = "76ff14fe5d304708ccad1284e4b11f96a658949a31ee7faed9e0995279549b91"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + attrs + jsonpickle + ]; + + checkInputs =[ + pytestCheckHook + ]; + + pythonImportsCheck = [ "jschema_to_python" ]; + + meta = with lib; { + description = "Generate source code for Python classes from a JSON schema"; + homepage = "https://github.com/microsoft/jschema-to-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01f3a1299c90e..86aaf89231d96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4040,6 +4040,8 @@ in { jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; + jschema-to-python = callPackage ../development/python-modules/jschema-to-python { }; + jsmin = callPackage ../development/python-modules/jsmin { }; json5 = callPackage ../development/python-modules/json5 { }; From 7270fad50f590a50834b800e9b6bf64a49175982 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 22:29:40 -0800 Subject: [PATCH 429/561] python3Packages.sarif-om: init at 1.0.4 --- .../python-modules/sarif-om/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/sarif-om/default.nix diff --git a/pkgs/development/python-modules/sarif-om/default.nix b/pkgs/development/python-modules/sarif-om/default.nix new file mode 100644 index 0000000000000..b7b334ebf9ba3 --- /dev/null +++ b/pkgs/development/python-modules/sarif-om/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi +, attrs +, pbr +}: + +buildPythonPackage rec { + pname = "sarif-om"; + version = "1.0.4"; + + src = fetchPypi { + pname = "sarif_om"; + inherit version; + sha256 = "cd5f416b3083e00d402a92e449a7ff67af46f11241073eea0461802a3b5aef98"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + attrs + ]; + + pythonImportsCheck = [ "sarif_om" ]; + + # no tests included with tarball + doCheck = false; + + meta = with lib; { + description = "Classes implementing the SARIF 2.1.0 object model"; + homepage = "https://github.com/microsoft/sarif-python-om"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86aaf89231d96..9885c175b926c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8467,6 +8467,8 @@ in { sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; + sarif-om = callPackage ../development/python-modules/sarif-om { }; + sarge = callPackage ../development/python-modules/sarge { }; sasmodels = callPackage ../development/python-modules/sasmodels { }; From d590b27cc6060282110920d3dbf91b684b038a63 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 29 Nov 2021 22:30:02 -0800 Subject: [PATCH 430/561] python3Packages.cfn-lint: add missing deps --- pkgs/development/python-modules/cfn-lint/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index c9d500ac836ab..4a409cb41e034 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -5,6 +5,7 @@ , aws-sam-translator , importlib-metadata , importlib-resources +, jschema-to-python , jsonpatch , jsonschema , junit-xml @@ -12,6 +13,7 @@ , pathlib2 , pyyaml , requests +, sarif-om , setuptools , six , mock @@ -37,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aws-sam-translator + jschema-to-python jsonpatch jsonschema junit-xml @@ -44,6 +47,7 @@ buildPythonPackage rec { pathlib2 pyyaml requests + sarif-om setuptools six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; @@ -70,6 +74,7 @@ buildPythonPackage rec { # Tests depend on network access (fails in getaddrinfo) "test_update_resource_specs_python_2" "test_update_resource_specs_python_3" + "test_sarif_formatter" ]; pythonImportsCheck = [ From 0585bd31a14529e25b21112436f45ea7f638d680 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 15:04:31 +0100 Subject: [PATCH 431/561] python3Packages.google-api-core: add grpcio-status --- pkgs/development/python-modules/google-api-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 8296dbfacf8d5..9d548b685efd8 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -4,6 +4,7 @@ , google-auth , googleapis-common-protos , grpcio +, grpcio-status , protobuf , proto-plus , requests @@ -29,6 +30,7 @@ buildPythonPackage rec { googleapis-common-protos google-auth grpcio + grpcio-status protobuf proto-plus requests From 12584440b0073ea6ac99a46cfc1cfea07df858b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 15:06:36 +0100 Subject: [PATCH 432/561] python3Packages.google-cloud-access-context-manager: remove stale substituteInPlace --- .../default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index c9690b6e31046..05963856edcef 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -1,20 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, google-api-core }: +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; version = "0.1.9"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "google-api-core[grpc] >= 1.26.0, < 2.0.0dev" "google-api-core[grpc] >= 1.26.0, < 2.0.1" - ''; - - propagatedBuildInputs = [ google-api-core ]; + propagatedBuildInputs = [ + google-api-core + ]; # No tests in repo doCheck = false; From a008c576cf0d006646253fbb5f506c1e3237ca3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 15:40:31 +0100 Subject: [PATCH 433/561] python3Packages.apsw: switch to pytestCheckHook, disable failing tests --- .../python-modules/apsw/default.nix | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index c0f7274a80dd0..bc35e804551bc 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,8 +1,15 @@ -{ lib, buildPythonPackage, fetchFromGitHub, sqlite, isPyPy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, sqlite +, isPyPy +, pytestCheckHook +}: buildPythonPackage rec { pname = "apsw"; version = "3.33.0-r1"; + format = "setuptools"; disabled = isPyPy; @@ -13,11 +20,35 @@ buildPythonPackage rec { sha256 = "05mxcw1382xx22285fnv92xblqby3adfrvvalaw4dc6rzsn6kcan"; }; - buildInputs = [ sqlite ]; + buildInputs = [ + sqlite + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + disabledTests = [ + "testCursor" + "testLoadExtension" + "testShell" + "testVFS" + "testVFSWithWAL" + "testdb" + ]; + + pythonImportsCheck = [ + "apsw" + ]; meta = with lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; homepage = "https://github.com/rogerbinns/apsw"; license = licenses.zlib; + maintainers = with maintainers; [ ]; }; } From b36da4216a8e3d245770cb511b59acb1ab649851 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 15:47:23 +0100 Subject: [PATCH 434/561] python3Packages.webssh: switch to pytestCheckHook --- .../python-modules/webssh/default.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index 00aff794372d5..49b7097549d6a 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -1,21 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, tornado, paramiko }: +{ lib +, buildPythonPackage +, fetchPypi +, paramiko +, pytestCheckHook +, tornado +}: buildPythonPackage rec { pname = "webssh"; version = "1.5.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4="; }; - propagatedBuildInputs = [ tornado paramiko ]; + propagatedBuildInputs = [ + paramiko + tornado + ]; - pythonImportsCheck = [ "webssh" ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "webssh" + ]; meta = with lib; { + description = "Web based SSH client"; homepage = "https://github.com/huashengdun/webssh/"; - description = "Web based ssh client"; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; }; From cfc4e636fcb347e4e639b7a2be932ffc8d4133de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 16:03:42 +0100 Subject: [PATCH 435/561] python3Packages.hyperopt: add py4j --- .../python-modules/hyperopt/default.nix | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix index 2b439762ac95d..605377a2ec391 100644 --- a/pkgs/development/python-modules/hyperopt/default.nix +++ b/pkgs/development/python-modules/hyperopt/default.nix @@ -1,29 +1,53 @@ -{ lib, fetchPypi, buildPythonPackage -, cloudpickle, numpy, future, networkx -, six, tqdm, scipy, pymongo +{ lib +, buildPythonPackage +, cloudpickle +, fetchPypi +, future +, networkx +, numpy +, py4j +, pymongo +, pyspark +, scipy +, six +, tqdm }: buildPythonPackage rec { pname = "hyperopt"; version = "0.2.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "1bf89ae58050bbd32c7307199046117feee245c2fd9ab6255c7308522b7ca149"; }; - propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ]; + propagatedBuildInputs = [ + cloudpickle + future + networkx + numpy + py4j + pymongo + pyspark + scipy + six + tqdm + ]; # tries to use /homeless-shelter to mimic container usage, etc doCheck = false; - pythonImportsCheck = [ "hyperopt" ]; + pythonImportsCheck = [ + "hyperopt" + ]; meta = with lib; { description = "Distributed Asynchronous Hyperparameter Optimization"; - homepage = "http://hyperopt.github.com/hyperopt/"; - license = licenses.bsd2; - platforms = platforms.unix; + homepage = "http://hyperopt.github.io/hyperopt/"; + license = licenses.bsd2; + platforms = platforms.unix; maintainers = with maintainers; [ freezeboy ]; }; } From 502cf1f3a5422c3ac66296664431c4f66eded021 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 08:23:55 -0800 Subject: [PATCH 436/561] azure-cli: fix namespacing of dependency --- pkgs/tools/admin/azure-cli/python-packages.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 2b820aa956997..7e2970861c17d 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -119,9 +119,6 @@ let ''; }; - azure-appconfiguration = overrideAzureMgmtPackage super.azure-appconfiguration "1.1.1" "zip" - "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; - azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip" "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32da"; @@ -311,6 +308,17 @@ let azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.7.0" "tar.gz" "cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9"; + azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec { + version = "1.1.1"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; + extension = "zip"; + }; + }); + azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; From 4a557a8e5f88248d4f444ea01c5fdee47eaeb66c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 08:36:00 -0800 Subject: [PATCH 437/561] python3Packages.azure-keyvault: fix build --- pkgs/development/python-modules/azure-keyvault/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index f5b83df266403..8a4799c688b4b 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -21,10 +21,9 @@ buildPythonPackage rec { azure-keyvault-secrets ]; - # this is just a meta package, which contains keys and secrets + # this is just a meta package, which contains keys and secrets packages doCheck = false; - - pythonNamespaces = [ "azure" ]; + doBuild = false; pythonImportsCheck = [ "azure.keyvault.keys" From 5967ec6c4cd963b14a2ed1eb7cd1d66c544ebb70 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 08:39:47 -0800 Subject: [PATCH 438/561] python3Packages.scikit-learn: 0.24.1 -> 1.0.1 --- .../python-modules/scikit-learn/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index e7ac79b428376..b717432a653ee 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,23 +19,14 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.24.1"; + version = "1.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "oDNKGALmTWVgIsO/q1anP71r9LEpg0PzaIryFRgQu98="; + sha256 = "sha256-rCyp27dU1hz+HIO6hINJjvlR0puT7AnW8AKEfyEKmdo="; }; - patches = [ - # This patch fixes compatibility with numpy 1.20. It was merged before 0.24.1 was released, - # but for some reason was not included in the 0.24.1 release tarball. - (fetchpatch { - url = "https://github.com/scikit-learn/scikit-learn/commit/e7ef22c3ba2334cb3b476e95d7c083cf6b48ce56.patch"; - sha256 = "174554k1pbf92bj7wgq0xjj16bkib32ailyhwavdxaknh4bd9nmv"; - }) - ]; - buildInputs = [ pillow glibcLocales From 8f84e4d91077d929ec81768120896b0f5288aef2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 08:44:21 -0800 Subject: [PATCH 439/561] python3Packages.apsw: 3.33.0-r1 -> 3.36.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 bc35e804551bc..a2e35265d4483 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.33.0-r1"; + version = "3.36.0-r1"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "05mxcw1382xx22285fnv92xblqby3adfrvvalaw4dc6rzsn6kcan"; + sha256 = "sha256-kQqJqDikvEC0+PNhQxSNTcjQc+RwvaOSGz9VL3FCetg="; }; buildInputs = [ From feeb70756bf41229f4d748431610e63cb8e9e48a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 09:19:06 -0800 Subject: [PATCH 440/561] python3Packages.dask-ml: 1.9.0 -> 2021.11.30 --- pkgs/development/python-modules/dask-ml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 62f2a30507b54..60df07076827d 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -17,13 +17,13 @@ }: buildPythonPackage rec { - version = "1.9.0"; + version = "2021.11.30"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "2f376a7114133b484a6d393f62298473116fc49c79ec7d50d5b031d752f54307"; + sha256 = "4f73306b5ee56e9b41b133697062d0028d30b1ece883ac6b56532fea5bd3e94a"; }; nativeBuildInputs = [ From 582ebd22875629d5395c8d0109c4af52b89b5e49 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 09:19:06 -0800 Subject: [PATCH 441/561] python3Packages.dask-mpi: 2.21.0 -> 2021.11.0 --- pkgs/development/python-modules/dask-mpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index d656b055d119a..cc44a6e97eb7b 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "2.21.0"; + version = "2021.11.0"; pname = "dask-mpi"; src = fetchPypi { inherit pname version; - sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7"; + sha256 = "602d2e2d7816a4abc1eb17998e1acc93a43b6f82bf94a6accca169a42de21898"; }; propagatedBuildInputs = [ dask distributed mpi4py ]; From df82ec2ad04ed0ddce085c415b9fbdc267845e67 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 09:22:04 -0800 Subject: [PATCH 442/561] python3Packages.distributed: fix build --- pkgs/development/python-modules/distributed/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 3a7b12478b7f2..6dfb531a78b67 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { sha256 = "f86a01a2e1e678865d2e42300c47552b5012cd81a2d354e47827a1fd074cc302"; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "dask == 2021.11.2" "dask" + ''; + propagatedBuildInputs = [ bokeh click From 2b3c4986d89b37fc8cd784a55a74eae641e207f0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 09:23:14 -0800 Subject: [PATCH 443/561] python3Packages.huggingface-hub: add missing pyyaml dependency --- pkgs/development/python-modules/huggingface-hub/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index b0aa6a48d3529..cf0b27c6c5b3a 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -5,6 +5,7 @@ , filelock , importlib-metadata , packaging +, pyyaml , requests , ruamel-yaml , tqdm @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ filelock + pyyaml requests ruamel-yaml tqdm From cd392432c7c1ec09846225b59398b0bf8702963b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 09:24:03 -0800 Subject: [PATCH 444/561] python3Packages.datasets: 1.11.0 -> 1.16.1 --- 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 0c1b8137bc985..b4b60da17f9ff 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.11.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "0pm14cp7xaagpf4j96v0ybi5gn3r9p0if3pc197ckwx6sw3lx29p"; + sha256 = "sha256-5J2hhy52eZqVSaeJNIOM9RzZatq3aewAulS3OX76+Io="; }; propagatedBuildInputs = [ From a67c264ec4fea6bfaccb94513da658eafb688301 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 23:12:03 +0100 Subject: [PATCH 445/561] python3Packages.werkzeug: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/werkzeug/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 898fa4556ec3e..c75c59ac1c9c5 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -12,13 +12,15 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.0.1"; + version = "2.0.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Werkzeug"; inherit version; - sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"; + sha256 = "sha256-qiu2/I3ujWxQTArB5/X33FgQqZA+eTtvcVqfAVva25o="; }; propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ @@ -54,5 +56,6 @@ buildPythonPackage rec { utility libraries. ''; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 6cfac3c9736e24197316ad678bc9cbc6f4fab889 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 23:18:59 +0100 Subject: [PATCH 446/561] odoo: update dependencies --- pkgs/applications/finance/odoo/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index 69acb43af8617..c2f201774fea4 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -56,6 +56,7 @@ buildPythonApplication rec { libsass lxml markupsafe + mock num2words ofxparse passlib @@ -76,7 +77,7 @@ buildPythonApplication rec { reportlab requests vobject - werkzeug1 + werkzeug xlrd XlsxWriter xlwt @@ -92,6 +93,6 @@ buildPythonApplication rec { description = "Open Source ERP and CRM"; homepage = "https://www.odoo.com/"; license = licenses.lgpl3Only; - maintainers = [ maintainers.mkg20001 ]; + maintainers = with maintainers; [ mkg20001 ]; }; } From ab7c7330a9eb621a9500017d391fc0c5bcc3670d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 23:29:29 +0100 Subject: [PATCH 447/561] python3Packages.google-cloud-bigquery: disable failing tests --- .../python-modules/google-cloud-bigquery/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 58be00adb9c0e..5daa88ed94923 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; version = "2.30.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -59,6 +60,8 @@ buildPythonPackage rec { "test_list_rows_page_size" "test_list_rows_scalars" "test_list_rows_scalars_extreme" + "test_dry_run" + "test_session" # Mocking of _ensure_bqstorage_client fails "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" # requires network From 2711b62a095bde2754c7559e184f8b9ef93b88c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 23:51:05 +0100 Subject: [PATCH 448/561] python3Packages.doc8: fix build and enable tests --- .../python-modules/doc8/default.nix | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index b8b040feb8af5..dbfb857614e19 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -1,39 +1,52 @@ { lib , buildPythonPackage +, chardet +, docutils , fetchPypi , pbr -, docutils -, six -, chardet -, stevedore -, restructuredtext_lint , pygments +, pytestCheckHook +, pythonOlder +, restructuredtext_lint +, stevedore }: buildPythonPackage rec { pname = "doc8"; version = "0.10.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "376e50f4e70a1ae935416ddfcf93db35dd5d4cc0e557f2ec72f0667d0ace4548"; }; - buildInputs = [ pbr ]; + buildInputs = [ + pbr + ]; + propagatedBuildInputs = [ docutils - six chardet stevedore restructuredtext_lint pygments ]; - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "doc8" + ]; - meta = { + meta = with lib; { description = "Style checker for Sphinx (or other) RST documentation"; - homepage = "https://launchpad.net/doc8"; - license = lib.licenses.asl20; + homepage = "https://github.com/pycqa/doc8"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From fed6ea42930c1efaad440db91e36cc207bb4e634 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 00:34:06 +0100 Subject: [PATCH 449/561] python3Packages.sanic: disable redirect tests --- pkgs/development/python-modules/sanic/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 62c2bd36944cb..2fab2a3df889c 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -12,6 +12,7 @@ , pytest-benchmark , pytest-sugar , pytestCheckHook +, pythonOlder , sanic-routing , sanic-testing , ujson @@ -23,6 +24,9 @@ buildPythonPackage rec { pname = "sanic"; version = "21.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sanic-org"; @@ -85,6 +89,10 @@ buildPythonPackage rec { "test_auto_reload" "test_no_exceptions_when_cancel_pending_request" "test_ipv6_address_is_not_wrapped" + # Failure of the redirect tests seems to be related to httpx>0.20.0 + "test_redirect" + "test_chained_redirect" + "test_unix_connection" # These appear to be very sensitive to output of commands "test_access_logs" "test_auto_reload" @@ -99,7 +107,9 @@ buildPythonPackage rec { # for the same local port __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "sanic" ]; + pythonImportsCheck = [ + "sanic" + ]; meta = with lib; { description = "Web server and web framework"; From 3b032c60a5b3295b657ff5454a08178bc11f6913 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 Nov 2021 22:49:19 +0100 Subject: [PATCH 450/561] python3Packages.sanic-auth: support later httpx releases --- .../python-modules/sanic-auth/default.nix | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix index 38d73d461c2dc..c854017ae782d 100644 --- a/pkgs/development/python-modules/sanic-auth/default.nix +++ b/pkgs/development/python-modules/sanic-auth/default.nix @@ -1,24 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, sanic, sanic-testing, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, sanic +, sanic-testing +, pytestCheckHook +}: buildPythonPackage rec { pname = "Sanic-Auth"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198"; }; - propagatedBuildInputs = [ sanic ]; + propagatedBuildInputs = [ + sanic + ]; - checkInputs = [ pytestCheckHook sanic-testing ]; + checkInputs = [ + pytestCheckHook + sanic-testing + ]; - pythonImportsCheck = [ "sanic_auth" ]; + postPatch = '' + # Support for httpx>=0.20.0 + substituteInPlace tests/test_auth.py \ + --replace "allow_redirects=False" "follow_redirects=False" + ''; + + pythonImportsCheck = [ + "sanic_auth" + ]; meta = with lib; { description = "Simple Authentication for Sanic"; homepage = "https://github.com/pyx/sanic-auth/"; license = licenses.bsdOriginal; - maintainers = [ maintainers.arnoldfarkas ]; + maintainers = with maintainers; [ arnoldfarkas ]; }; } From 20bf164237c5ee5744fff14c59f50b963a0024c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 00:47:19 +0100 Subject: [PATCH 451/561] python3Packages.green: limit to three test cases --- .../python-modules/green/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 540d3027b94ed..e4a3401109b4a 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy3k , fetchPypi +, django , colorama , coverage , unidecode @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "green"; version = "3.3.0"; + format = "setuptools"; disabled = !isPy3k; @@ -29,17 +31,28 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - colorama coverage unidecode lxml + colorama + coverage + unidecode + lxml ]; # let green run it's own test suite checkPhase = '' - $out/bin/green -tvvv green + $out/bin/green -tvvv \ + green.test.test_version \ + green.test.test_cmdline \ + green.test.test_command ''; + pythonImportsCheck = [ + "green" + ]; + meta = with lib; { description = "Python test runner"; homepage = "https://github.com/CleanCut/green"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 9845b94ab645e2bbd4f56c98d0ddcd58b001cc05 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 10:03:24 -0800 Subject: [PATCH 452/561] python3Packages.datashader: disable failing tests, upstream notified --- .../python-modules/datashader/default.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 5738dc64e759e..587f73d81ed8c 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -31,6 +31,13 @@ buildPythonPackage rec { sha256 = "sha256-6JscHm1QjDmXOLLa83qhAvY/xwvlPM6duQ1lSxnCVV8="; }; + # the complete extra is for usage with conda, which we + # don't care about + postPatch = '' + substituteInPlace setup.py \ + --replace "dask[complete]" "dask" + ''; + propagatedBuildInputs = [ dask bokeh @@ -56,11 +63,24 @@ buildPythonPackage rec { netcdf4 ]; + preCheck = '' + export HOME=$TMPDIR + ''; + pytestFlagsArray = [ "-n $NIX_BUILD_CORES" "datashader" ]; + disabledTests = [ + # not compatible with current version of bokeh + # see: https://github.com/holoviz/datashader/issues/1031 + "test_interactive_image_update" + # latest dask broken array marshalling + # see: https://github.com/holoviz/datashader/issues/1032 + "test_raster_quadmesh_autorange_reversed" + ]; + disabledTestPaths = [ # 31/50 tests fail with TypeErrors "datashader/tests/test_datatypes.py" From 754460f861874108887e4bba193c8c46e3ae919f Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 1 Dec 2021 10:47:28 +0800 Subject: [PATCH 453/561] llvmPackages_13.clang: revert D100879 The malloc alignment assumption is incorrect for jemalloc and causes mis-compilation in firefox. https://reviews.llvm.org/D100879 https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 --- .../compilers/llvm/13/clang/default.nix | 5 ++ .../revert-malloc-alignment-assumption.patch | 78 +++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 pkgs/development/compilers/llvm/13/clang/revert-malloc-alignment-assumption.patch diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index a775af3031b7f..ab826fa315261 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -37,6 +37,11 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch + # Revert of https://reviews.llvm.org/D100879 + # The malloc alignment assumption is incorrect for jemalloc and causes + # mis-compilation in firefox. + # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 + ./revert-malloc-alignment-assumption.patch (substituteAll { src = ../../clang-11-12-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; diff --git a/pkgs/development/compilers/llvm/13/clang/revert-malloc-alignment-assumption.patch b/pkgs/development/compilers/llvm/13/clang/revert-malloc-alignment-assumption.patch new file mode 100644 index 0000000000000..f8e55ff7f8971 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/clang/revert-malloc-alignment-assumption.patch @@ -0,0 +1,78 @@ +--- b/include/clang/Basic/TargetInfo.h ++++ a/include/clang/Basic/TargetInfo.h +@@ -612,8 +612,8 @@ + } + + /// Return the largest alignment for which a suitably-sized allocation with ++ /// '::operator new(size_t)' is guaranteed to produce a correctly-aligned ++ /// pointer. +- /// '::operator new(size_t)' or 'malloc' is guaranteed to produce a +- /// correctly-aligned pointer. + unsigned getNewAlign() const { + return NewAlign ? NewAlign : std::max(LongDoubleAlign, LongLongAlign); + } +--- b/lib/CodeGen/CGCall.cpp ++++ a/lib/CodeGen/CGCall.cpp +@@ -2048,24 +2048,6 @@ + // allows it to work on indirect virtual function calls. + if (AttrOnCallSite && TargetDecl->hasAttr()) + FuncAttrs.addAttribute(llvm::Attribute::NoMerge); +- +- // Add known guaranteed alignment for allocation functions. +- if (unsigned BuiltinID = Fn->getBuiltinID()) { +- switch (BuiltinID) { +- case Builtin::BIaligned_alloc: +- case Builtin::BIcalloc: +- case Builtin::BImalloc: +- case Builtin::BImemalign: +- case Builtin::BIrealloc: +- case Builtin::BIstrdup: +- case Builtin::BIstrndup: +- RetAttrs.addAlignmentAttr(Context.getTargetInfo().getNewAlign() / +- Context.getTargetInfo().getCharWidth()); +- break; +- default: +- break; +- } +- } + } + + // 'const', 'pure' and 'noalias' attributed functions are also nounwind. +--- b/test/CodeGen/alloc-fns-alignment.c ++++ /dev/null +@@ -1,35 +0,0 @@ +-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16 +-// RUN: %clang_cc1 -triple x86_64-windows-msvc -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16 +-// RUN: %clang_cc1 -triple i386-apple-darwin -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16 +-// RUN: %clang_cc1 -triple i386-unknown-linux-gnu -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN8 +-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-malloc -emit-llvm < %s | FileCheck %s --check-prefix=NOBUILTIN-MALLOC +-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-calloc -emit-llvm < %s | FileCheck %s --check-prefix=NOBUILTIN-CALLOC +-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-realloc -emit-llvm < %s | FileCheck %s --check-prefix=NOBUILTIN-REALLOC +- +-typedef __SIZE_TYPE__ size_t; +- +-void *malloc(size_t); +-void *calloc(size_t, size_t); +-void *realloc(void *, size_t); +- +-void *malloc_test(size_t n) { +- return malloc(n); +-} +- +-void *calloc_test(size_t n) { +- return calloc(1, n); +-} +- +-void *raalloc_test(void *p, size_t n) { +- return realloc(p, n); +-} +- +-// ALIGN16: align 16 i8* @malloc +-// ALIGN16: align 16 i8* @calloc +-// ALIGN16: align 16 i8* @realloc +-// ALIGN8: align 8 i8* @malloc +-// ALIGN8: align 8 i8* @calloc +-// ALIGN8: align 8 i8* @realloc +-// NOBUILTIN-MALLOC: declare i8* @malloc +-// NOBUILTIN-CALLOC: declare i8* @calloc +-// NOBUILTIN-REALLOC: declare i8* @realloc From cd44576bff17680e248e32e1cc36f21fde5268c3 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 1 Dec 2021 10:51:18 +0800 Subject: [PATCH 454/561] firefox: re-enable jemalloc --- pkgs/applications/networking/browsers/firefox/common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index b0d11bd835b62..f3801a9dbe0ce 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -27,9 +27,8 @@ , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire -# Workaround: disabled since currently jemalloc causes crashes with LLVM 13. -# https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 -, jemallocSupport ? false, jemalloc +# Jemalloc could reduce memory consumption. +, jemallocSupport ? true, jemalloc ## privacy-related options From 5390a7030247627e5b28e35ec87cc23a9d17c726 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 14 Oct 2021 21:44:09 +0200 Subject: [PATCH 455/561] mesa: 21.2.6 -> 21.3.1 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a5d41d48629f7..97b5613ea2637 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -33,7 +33,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.2.6"; + version = "21.3.1"; branch = versions.major version; self = stdenv.mkDerivation { @@ -47,7 +47,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0m69h3f9fr66h6xjxfc485zfdci6kl8j24ab0kx5k23f7kcj4zhy"; + sha256 = "0ka7rh00inkzkir6bz6shn8k91j5pinp03yh85bm54mi1iac439b"; }; # TODO: From 8f633d6fb42359c7111cff25abdb6de36dee0a2d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 8 Nov 2021 15:28:18 +0800 Subject: [PATCH 456/561] epoxy: 1.5.4 -> 1.5.9 autotools -> meson as upstream no longer supports the former. --- .../libraries/libepoxy/default.nix | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 83b8ba8960d59..bd9520da1c4f8 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -1,37 +1,56 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3 -, libGL, libX11 +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, utilmacros +, python3 +, libGL +, libX11 }: -with lib; +let + inherit (lib) getLib optional optionalString; +in stdenv.mkDerivation rec { pname = "libepoxy"; - version = "1.5.4"; + version = "1.5.9"; src = fetchFromGitHub { owner = "anholt"; repo = pname; rev = version; - sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6"; + sha256 = "sha256-8rdmC8FZUkKkEvWPJIdfrBQHiwa81vl5tmVqRdU4UIY="; }; - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ autoreconfHook pkg-config utilmacros python3 ]; - buildInputs = [ libGL libX11 ]; + patches = [ ./libgl-path.patch ]; - preConfigure = optionalString stdenv.isDarwin '' - substituteInPlace configure --replace build_glx=no build_glx=yes + postPatch = '' + patchShebangs src/*.py + '' + + optionalString stdenv.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" ''; - patches = [ ./libgl-path.patch ]; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; + + buildInputs = [ libGL libX11 ]; + + mesonFlags = [ + "-Dtests=${if doCheck then "true" else "false"}" + ] + ++ optional stdenv.isDarwin "-Dglx=yes"; NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"''; - doCheck = false; # needs X11 + # tests are running from version 1.5.9 + doCheck = true; - meta = { + meta = with lib; { description = "A library for handling OpenGL function pointer management"; homepage = "https://github.com/anholt/libepoxy"; license = licenses.mit; From 0bac59f8e8ab8783235088954739bf3a645008f7 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 12 Nov 2021 13:20:38 +0300 Subject: [PATCH 457/561] curl: 7.79.1 -> 7.80.0 --- pkgs/tools/networking/curl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 0cd31a8281352..a5abbc26a7414 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -43,14 +43,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.79.1"; + version = "7.80.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "0lbq73wz44p4fm2gp05mzrqrzfvhlmvlgfg8c8wkj5lkkamw8qny"; + sha256 = "170qb2w2p5fga0vqhhnzi417z4h4vy764sz16pzhm5fd9471a3fx"; }; patches = [ @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line tool for transferring files with URL syntax"; - homepage = "https://curl.haxx.se/"; + homepage = "https://curl.se/"; license = licenses.curl; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; From bd05c93449ed16e47bb116ce067059793a04867c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 10:37:04 +0100 Subject: [PATCH 458/561] python3Packages.policy-sentry: 0.11.18 -> 0.11.19 --- pkgs/development/python-modules/policy-sentry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index a9e3930f67f47..86bbd847aa28e 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.11.18"; + version = "0.11.19"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = version; - sha256 = "sha256-1wpy4WofqrPusOI2BHRqSHfXlRpbuLOx97egzSAbB8E="; + sha256 = "sha256-zYX2MMFIgts5brFb/hsgLHZbY5mncqnCmk7nGdxj/BM="; }; propagatedBuildInputs = [ From b59406317b94936aca53a23ef7faba11b4c90bab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 16:00:08 +0100 Subject: [PATCH 459/561] python3Packages.matplotlib: update requirements --- .../python-modules/matplotlib/default.nix | 53 +++++++++++++++---- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index be53c995d72d7..a9ecee77dce9d 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo , which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection -, certifi, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive +, certifi, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging , enableGhostscript ? true, ghostscript, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -19,6 +19,7 @@ in buildPythonPackage rec { version = "3.5.0"; pname = "matplotlib"; + format = "setuptools"; disabled = !isPy3k; @@ -35,16 +36,45 @@ buildPythonPackage rec { setuptools-scm-git-archive ]; - buildInputs = [ which sphinx ] - ++ lib.optional enableGhostscript ghostscript - ++ lib.optional stdenv.isDarwin [ Cocoa ]; + buildInputs = [ + which + sphinx + ] ++ lib.optional enableGhostscript [ + ghostscript + ] ++ lib.optional stdenv.isDarwin [ + Cocoa + ]; - propagatedBuildInputs = - [ cycler fonttools python-dateutil numpy pyparsing tornado freetype qhull - kiwisolver certifi libpng mock pytz pillow ] - ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] - ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] - ++ lib.optionals enableQt [ pyqt5 ]; + propagatedBuildInputs = [ + certifi + cycler + fonttools + freetype + kiwisolver + libpng + mock + numpy + packaging + pillow + pyparsing + python-dateutil + pytz + qhull + tornado + ] ++ lib.optionals enableGtk3 [ + cairo + gobject-introspection + gtk3 + pycairo + pygobject3 + ] ++ lib.optionals enableTk [ + libX11 + tcl + tk + tkinter + ] ++ lib.optionals enableQt [ + pyqt5 + ]; passthru.config = { directories = { basedirlist = "."; }; @@ -56,7 +86,9 @@ buildPythonPackage rec { enable_lto = false; }; }; + setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config); + preBuild = '' cp "$setup_cfg" ./setup.cfg ''; @@ -96,5 +128,4 @@ buildPythonPackage rec { license = with licenses; [ psfl bsd0 ]; maintainers = with maintainers; [ lovek323 veprbl ]; }; - } From acc6771654f4ec768ea2578d1db2240c768a2e23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 16:01:02 +0100 Subject: [PATCH 460/561] python3Packages.ase: 3.22.0 -> 3.22.1 --- pkgs/development/python-modules/ase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 25210e4740bde..c3ec514844c22 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.22.0"; + version = "3.22.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-5gJZx7UIZ7HLgXyvk4/MHtODcCQT320uGv5+oH9lrO4="; + sha256 = "sha256-AE32sOoEsRFMeQ+t/kXUEl6w5TElxmqTQlr4U9gqtDI="; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; From 3616afb52e06b409b3066f2bea5339e37e46b145 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 16:18:16 +0100 Subject: [PATCH 461/561] python3Packages.datasette: 0.59 -> 0.59.4 --- 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 ef681bce9846d..7908b3c6b4966 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.59"; + version = "0.59.4"; disabled = pythonOlder "3.6"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-sr4sUDNdkFhPWbtLjzMGxo6vC+mlnAM1G+RUuh75tbg="; + sha256 = "sha256-bH/VREo2f84wloA2jgXnQkGNSRRRYmSvUXmI0wMfmYM="; }; nativeBuildInputs = [ pytest-runner ]; From 7aae03a9dd5460e9b383f853f50016a14405daed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 16:22:18 +0100 Subject: [PATCH 462/561] python3Packages.django-configurations: fix build --- .../django-configurations/default.nix | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index a414979a01934..4cb23d989fae0 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -1,29 +1,48 @@ { lib , buildPythonPackage -, fetchPypi -, django-discover-runner -, mock , dj-database-url , dj-email-url , dj-search-url -, django-cache-url -, six , django +, django-cache-url +, django-discover-runner +, fetchPypi +, importlib-metadata +, mock +, pythonOlder , setuptools-scm }: buildPythonPackage rec { - version = "2.3.1"; pname = "django-configurations"; + version = "2.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "e2ca25530e184f0ee3b7f5ae69563461a93a8914493306ee0bf6d71e7d8ad1d0"; }; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ six ]; - checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url ]; + buildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + django-discover-runner + mock + dj-database-url + dj-email-url + dj-search-url + django-cache-url + ]; checkPhase = '' export PYTHONPATH=.:$PYTHONPATH @@ -35,10 +54,14 @@ buildPythonPackage rec { # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed doCheck = false; + pythonImportsCheck = [ + "configurations" + ]; + meta = with lib; { - homepage = "https://django-configurations.readthedocs.io/"; description = "A helper for organizing Django settings"; + homepage = "https://django-configurations.readthedocs.io/"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From e4f2f91888056cd573f4e40e0f681a9a0782c2c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 16:24:26 +0100 Subject: [PATCH 463/561] python3Packages.django-formtools: fix build --- .../django-formtools/default.nix | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-formtools/default.nix b/pkgs/development/python-modules/django-formtools/default.nix index b8db4ccfd4049..c85d5d3fcc75e 100644 --- a/pkgs/development/python-modules/django-formtools/default.nix +++ b/pkgs/development/python-modules/django-formtools/default.nix @@ -1,19 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, django, python }: +{ lib +, buildPythonPackage +, django +, fetchPypi +, python +, pythonOlder +, setuptools-scm +}: buildPythonPackage rec { pname = "django-formtools"; version = "2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "9663b6eca64777b68d6d4142efad8597fe9a685924673b25aa8a1dcff4db00c3"; }; - propagatedBuildInputs = [ django ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ]; + checkPhase = '' ${python.interpreter} -m django test --settings=tests.settings ''; + pythonImportsCheck = [ + "formtools" + ]; + meta = with lib; { description = "A set of high-level abstractions for Django forms"; homepage = "https://github.com/jazzband/django-formtools"; From 8d39962f9ba4c20c8362cc631fb2d30ae9fb88e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 16:29:16 +0100 Subject: [PATCH 464/561] python3Packages.easy-thumbnails: fix build --- .../easy-thumbnails/default.nix | 39 +++++++++++++++---- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 58489c2534afc..e896e79908b6c 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -1,21 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, - django, pillow +{ lib +, buildPythonPackage +, django +, fetchPypi +, pillow +, pytestCheckHook +, pythonOlder +, reportlab +, svglib }: buildPythonPackage rec { pname = "easy-thumbnails"; version = "2.8"; + format = "setuptools"; - meta = { - description = "Easy thumbnails for Django"; - homepage = "https://github.com/SmileyChris/easy-thumbnails"; - license = lib.licenses.bsd3; - }; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "fd2249d936671847fc54a2d6c8c87bcca8f803001967dd03bab6b8bcb7590825"; }; - propagatedBuildInputs = [ django pillow ]; + propagatedBuildInputs = [ + django + pillow + svglib + reportlab + ]; + + # Tests require a Django instance which is setup + doCheck = false; + + pythonImportsCheck = [ + "easy_thumbnails" + ]; + + meta = with lib; { + description = "Easy thumbnails for Django"; + homepage = "https://github.com/SmileyChris/easy-thumbnails"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; } From 7dfe5277ce7339ba1f238ad9550d599c66840e72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 17:40:38 +0100 Subject: [PATCH 465/561] python3Packages.graphql-core: add pytest-asyncio --- pkgs/development/python-modules/graphql-core/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 1909dd99fe0f7..8906af53ce193 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest-benchmark +, pytest-asyncio , pytestCheckHook , pythonOlder }: @@ -9,6 +10,8 @@ buildPythonPackage rec { pname = "graphql-core"; version = "3.1.6"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -19,11 +22,14 @@ buildPythonPackage rec { }; checkInputs = [ + pytest-asyncio pytest-benchmark pytestCheckHook ]; - pythonImportsCheck = [ "graphql" ]; + pythonImportsCheck = [ + "graphql" + ]; meta = with lib; { description = "Port of graphql-js to Python"; From ab0d6cb4a85faf6e1a9c0a2b92b3481087d1bcfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 18:48:31 +0100 Subject: [PATCH 466/561] python3Packages.httpx-socks: add missing dependencies --- .../development/python-modules/httpx-socks/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 47e39dcef3c4f..fac9ecba6ce9a 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -6,12 +6,14 @@ , flask , httpcore , httpx +, hypercorn , pytest-asyncio , pytest-trio , pytestCheckHook , python-socks , pythonOlder , sniffio +, starlette , trio , yarl }: @@ -19,6 +21,8 @@ buildPythonPackage rec { pname = "httpx-socks"; version = "0.7.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -40,13 +44,17 @@ buildPythonPackage rec { checkInputs = [ flask + hypercorn pytest-asyncio pytest-trio pytestCheckHook + starlette yarl ]; - pythonImportsCheck = [ "httpx_socks" ]; + pythonImportsCheck = [ + "httpx_socks" + ]; meta = with lib; { description = "Proxy (HTTP, SOCKS) transports for httpx"; From f6cfdc97cc852e30ed17577358bd3590486baa3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 20:44:36 +0100 Subject: [PATCH 467/561] python3Packages.pandas: disable failing test --- pkgs/development/python-modules/pandas/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index bacd253defa16..880a5afdce63c 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { pname = "pandas"; version = "1.3.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -91,6 +92,8 @@ buildPythonPackage rec { "test_from_coo" # AssertionError: No common DType exists for the given inputs "test_comparison_invalid" + # AssertionError: Regex pattern '"quotechar" must be string, not int' + "python-kwargs2" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" From 349544f7c7343c6a8ae2a75037a6bc6736a30860 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 20:45:07 +0100 Subject: [PATCH 468/561] python3Packages.seaborn: disable failing tests --- .../python-modules/seaborn/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index d1095b199972f..c190093bb30fc 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -32,14 +32,24 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Tests fail because of AttributeError:... + "TestKDEPlotBivariate" + "TestBoxPlotter" + "TestCatPlot" + "TestKDEPlotUnivariate" + "test_with_rug" + "test_bivariate_kde_norm" + ]; + pythonImportsCheck= [ "seaborn" ]; - meta = { + meta = with lib; { description = "Statisitical data visualization"; homepage = "https://seaborn.pydata.org/"; - license = with lib.licenses; [ bsd3 ]; - maintainers = with lib.maintainers; [ fridh ]; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fridh ]; }; } From d19a4ef31f2562252054c776ba0b25137af4370c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 20:46:55 +0100 Subject: [PATCH 469/561] python3Packages.thinc: 8.0.10 -> 8.0.13 --- .../python-modules/thinc/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index d2123d207eb17..9524f7e44970a 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -7,6 +7,8 @@ , catalogue , cymem , cython +, contextvars +, dataclasses , Accelerate , CoreFoundation , CoreGraphics @@ -27,17 +29,19 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.10"; + version = "8.0.13"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-teTbjSTmvopfHkoXhUdyt5orVgIkUZ9Qoh85UcokAB8="; + sha256 = "sha256-R2YqOuM9RFp3tup7dyREgFx7uomR8SLjUNr3Le3IFxo="; }; - buildInputs = [ cython ] - ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ + cython + ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreFoundation CoreGraphics @@ -56,7 +60,12 @@ buildPythonPackage rec { tqdm pydantic wasabi - ] ++ lib.optional (pythonOlder "3.8") typing-extensions; + ] ++ lib.optional (pythonOlder "3.8") [ + typing-extensions + ] ++ lib.optional (pythonOlder "3.7") [ + contextvars + dataclasses + ]; checkInputs = [ hypothesis @@ -71,7 +80,9 @@ buildPythonPackage rec { "thinc/tests" ]; - pythonImportsCheck = [ "thinc" ]; + pythonImportsCheck = [ + "thinc" + ]; meta = with lib; { description = "Practical Machine Learning for NLP in Python"; From 10e582c7eeb85bc36fca1758e2bf957e18cbabc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 20:56:50 +0100 Subject: [PATCH 470/561] python3Packages.rpcq: disable failing test --- pkgs/development/python-modules/rpcq/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rpcq/default.nix b/pkgs/development/python-modules/rpcq/default.nix index 671038c8b468f..82db76bc859ff 100644 --- a/pkgs/development/python-modules/rpcq/default.nix +++ b/pkgs/development/python-modules/rpcq/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "rpcq"; version = "3.9.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -42,7 +43,14 @@ buildPythonPackage rec { --replace "msgpack>=0.6,<1.0" "msgpack" ''; - pythonImportsCheck = [ "rpcq" ]; + disabledTests = [ + # Test doesn't work properly on Hydra + "test_client_backlog" + ]; + + pythonImportsCheck = [ + "rpcq" + ]; meta = with lib; { description = "The RPC framework and message specification for rigetti Quantum Cloud services"; From de032480299d2178878315f79b85e52554486c73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Dec 2021 21:21:12 +0100 Subject: [PATCH 471/561] python3Packages.typical: disable failing test --- .../python-modules/typical/default.nix | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix index ec9cd4d173316..ee815fa15e1f7 100644 --- a/pkgs/development/python-modules/typical/default.nix +++ b/pkgs/development/python-modules/typical/default.nix @@ -1,18 +1,19 @@ { lib , buildPythonPackage +, fastjsonschema , fetchFromGitHub -, pytestCheckHook +, future-typing , inflection -, pendulum -, fastjsonschema -, typing-extensions +, mypy , orjson -, future-typing +, pandas +, pendulum , poetry-core , pydantic +, pytestCheckHook +, pythonOlder , sqlalchemy -, pandas -, mypy +, typing-extensions }: buildPythonPackage rec { @@ -20,6 +21,8 @@ buildPythonPackage rec { version = "2.7.9"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "seandstewart"; repo = "typical"; @@ -31,15 +34,18 @@ buildPythonPackage rec { ./use-poetry-core.patch ]; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ inflection pendulum fastjsonschema orjson - typing-extensions future-typing + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; checkInputs = [ @@ -51,18 +57,23 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_ujson" # We use orjson + # We use orjson + "test_ujson" + # ConstraintValueError: Given value <{'key... + "test_tagged_union_validate" ]; disabledTestPaths = [ "benchmark/" ]; - pythonImportsCheck = [ "typic" ]; + pythonImportsCheck = [ + "typic" + ]; meta = with lib; { + description = "Python library for runtime analysis, inference and validation of Python types"; homepage = "https://python-typical.org/"; - description = "Typical: Python's Typing Toolkit."; license = licenses.mit; maintainers = with maintainers; [ kfollesdal ]; }; From 4217371c1c347b6cea7cce26c59ca2b10a0422a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Nov 2021 10:54:45 -0800 Subject: [PATCH 472/561] python3Packages.pydocstyle: 5.0.2 -> 6.1.1 --- .../python-modules/pydocstyle/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 36c61ace8563e..0658e1857174f 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -1,33 +1,40 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, mock -, pytest +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub , snowballstemmer +, pytestCheckHook }: buildPythonPackage rec { pname = "pydocstyle"; - version = "5.0.2"; + version = "6.1.1"; disabled = !isPy3k; + format = "setuptools"; + src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "03z8miyppm2xncrc9yjilwl7z5c5cpv51zha580v64p8sb2l0j7j"; + sha256 = "sha256-j0WMD2qKDdMaKG2FxrrM/O7zX4waJ1afaRPRv70djkE="; }; - propagatedBuildInputs = [ snowballstemmer ]; + propagatedBuildInputs = [ + snowballstemmer + ]; - checkInputs = [ pytest mock ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - # test_integration.py installs packages via pip - py.test --cache-clear -vv src/tests -k "not test_integration" - ''; + disabledTestPaths = [ + "src/tests/test_integration.py" # runs pip install + ]; meta = with lib; { description = "Python docstring style checker"; - homepage = "https://github.com/PyCQA/pydocstyle/"; + homepage = "https://github.com/PyCQA/pydocstyle"; license = licenses.mit; maintainers = with maintainers; [ dzabraev ]; }; From 795894a347183de9a8e1eba5a6267f2b0834559c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Nov 2021 10:52:22 -0800 Subject: [PATCH 473/561] python3Packages.pylama: 7.7.1 -> 8.0.6 https://github.com/klen/pylama/blob/8.0.6/Changelog --- .../python-modules/pylama/default.nix | 56 +++++++++++++++---- .../python-modules/pylama/paths.patch | 13 +++++ 2 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/pylama/paths.patch diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 1aa96dfe464db..12378cfd72d1e 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -1,34 +1,66 @@ -{ lib, buildPythonPackage, fetchPypi -, eradicate, mccabe, pycodestyle, pydocstyle, pyflakes -, pytest, ipdb }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, git +, eradicate +, mccabe +, mypy +, pycodestyle +, pydocstyle +, pyflakes +, vulture +, pytestCheckHook +}: buildPythonPackage rec { pname = "pylama"; - version = "7.7.1"; + version = "8.0.6"; - src = fetchPypi { - inherit pname version; - sha256 = "9bae53ef9c1a431371d6a8dca406816a60d547147b60a4934721898f553b7d8f"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "klen"; + repo = "pylama"; + rev = version; + sha256 = "sha256-Olq/CZ/t1wqACoknAKsvdDKnyLZkxRtHokpu33I3trg="; }; + patches = [ + (substituteAll { + src = ./paths.patch; + git = "${lib.getBin git}/bin/git"; + }) + ]; + propagatedBuildInputs = [ eradicate mccabe + mypy pycodestyle pydocstyle pyflakes + vulture ]; - checkInputs = [ pytest ipdb ]; + checkInputs = [ + pytestCheckHook + ]; - # tries to mess with the file system - doCheck = false; + disabledTests = [ + "test_pylint" # infinite recursion + "test_quotes" # FIXME package pylama-quotes + "test_radon" # FIXME package radon + ]; + + pythonImportsCheck = [ + "pylama.main" + ]; meta = with lib; { description = "Code audit tool for python"; homepage = "https://github.com/klen/pylama"; - # ambiguous license declarations: https://github.com/klen/pylama/issues/64 - license = [ licenses.lgpl3 ]; + license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pylama/paths.patch b/pkgs/development/python-modules/pylama/paths.patch new file mode 100644 index 0000000000000..ab6a4719f354e --- /dev/null +++ b/pkgs/development/python-modules/pylama/paths.patch @@ -0,0 +1,13 @@ +diff --git a/pylama/hook.py b/pylama/hook.py +index 029c9dc..9f1a9b9 100644 +--- a/pylama/hook.py ++++ b/pylama/hook.py +@@ -26,7 +26,7 @@ def run(command: str) -> Tuple[int, List[bytes], List[bytes]]: + + def git_hook(error=True): + """Run pylama after git commit.""" +- _, files_modified, _ = run("git diff-index --cached --name-only HEAD") ++ _, files_modified, _ = run("@git@ diff-index --cached --name-only HEAD") + + options = parse_options() + setup_logger(options) From 7cab7431b3903226a08d2d15bf85b6608cb481c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Nov 2021 15:44:04 -0800 Subject: [PATCH 474/561] python3Packages.trio: don't depend on pylint --- pkgs/development/python-modules/trio/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index acd7c7acfb472..0e95da38eaea0 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -11,7 +11,6 @@ , sniffio , stdenv , jedi -, pylint , astor , yapf }: @@ -26,7 +25,7 @@ buildPythonPackage rec { sha256 = "895e318e5ec5e8cea9f60b473b6edb95b215e82d99556a03eb2d20c5e027efe1"; }; - checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ]; + checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi yapf ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. disabledTests = [ "getnameinfo" From 4912ee7bf1bb49f753fc4d5a39415aaea9754086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Nov 2021 15:47:15 -0800 Subject: [PATCH 475/561] python2Packages.pydocstyle: drop It's not used by any leaf package. --- .../python-modules/pydocstyle/2.nix | 33 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 pkgs/development/python-modules/pydocstyle/2.nix diff --git a/pkgs/development/python-modules/pydocstyle/2.nix b/pkgs/development/python-modules/pydocstyle/2.nix deleted file mode 100644 index 9ce4ffc0f816a..0000000000000 --- a/pkgs/development/python-modules/pydocstyle/2.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder -, snowballstemmer, six, configparser -, pytest, mock, pathlib }: - -buildPythonPackage rec { - pname = "pydocstyle"; - version = "2.1.1"; - - # no tests on PyPI - # https://github.com/PyCQA/pydocstyle/issues/302 - src = fetchFromGitHub { - owner = "PyCQA"; - repo = pname; - rev = version; - sha256 = "1h0k8lpx14svc8dini62j0kqiam10pck5sdzvxa4xhsx7y689g5l"; - }; - - propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; - - checkInputs = [ pytest mock ] ++ lib.optional (pythonOlder "3.4") pathlib; - - checkPhase = '' - # test_integration.py installs packages via pip - py.test --cache-clear -vv src/tests -k "not test_integration" - ''; - - meta = with lib; { - description = "Python docstring style checker"; - homepage = "https://github.com/PyCQA/pydocstyle/"; - license = licenses.mit; - maintainers = with maintainers; [ dzabraev ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index d96d5a4252f7c..e62803108071e 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -438,8 +438,6 @@ with self; with super; { pydns = callPackage ../development/python-modules/pydns { }; - pydocstyle = callPackage ../development/python-modules/pydocstyle/2.nix { }; - pyechonest = callPackage ../development/python-modules/pyechonest { }; pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; From 801078806b8664c8c5aa90587dcabf8b285e9269 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 3 Nov 2021 16:57:34 +0000 Subject: [PATCH 476/561] pkg-config: always pass --static in static builds By default, pkg-config output will not include Requires.private dependencies (which specify dependencies that only apply when building statically). It will only do this when passed --static. In pkgsStatic, let's ensure pkg-config is always operating in static mode, because pkgsStatic will ensure that any libraries pkg-config might find will always be static, and so will always need their Requires.private dependencies. This is very useful for Meson builds, because otherwise Meson will only pass --static to pkg-config if the dependency was explicitly "static : true", which is not likely to be the case for most stuff we're building. An alternative proposal was to patch Meson to add a special environment variable to force dependencies to be "static : true". I feel that the approach I've taken here is less invasive. --- pkgs/build-support/pkg-config-wrapper/default.nix | 3 +++ pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index bbc49d6728c98..aa8f57ffb04df 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -47,6 +47,9 @@ stdenv.mkDerivation { dontBuild = true; dontConfigure = true; + # Additional flags passed to pkg-config. + addFlags = lib.optional stdenv.targetPlatform.isStatic "--static"; + unpackPhase = '' src=$PWD ''; diff --git a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh index a5a4427166889..9d0f7b028d85f 100644 --- a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh +++ b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh @@ -12,6 +12,8 @@ if [ -z "${NIX_PKG_CONFIG_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi +set -- "$@" @addFlags@ + if (( ${#role_suffixes[@]} > 0 )); then # replace env var with nix-modified one PKG_CONFIG_PATH=$PKG_CONFIG_PATH_@suffixSalt@ exec @prog@ "$@" From 4760a907ea08f94f569c6f9bcc91ce00ae05dbf9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 30 Nov 2021 13:10:41 +0000 Subject: [PATCH 477/561] pkg-config: make comment clearer for non-natives MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested-by: Jörg Thalheim --- pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh index 9d0f7b028d85f..1aa14cfeb7cc7 100644 --- a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh +++ b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh @@ -18,6 +18,6 @@ if (( ${#role_suffixes[@]} > 0 )); then # replace env var with nix-modified one PKG_CONFIG_PATH=$PKG_CONFIG_PATH_@suffixSalt@ exec @prog@ "$@" else - # pkg-config isn't a bonafied dependency so ignore setup hook entirely + # pkg-config isn't a real dependency so ignore setup hook entirely exec @prog@ "$@" fi From e0d3296babcfb401d3fa3c43995fdebe8dfaeaa4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 1 Dec 2021 23:46:27 +0000 Subject: [PATCH 478/561] cpio: add debug output --- pkgs/tools/archivers/cpio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 1ae8de975a5e2..274fe0ac83267 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { }) ]; + separateDebugInfo = true; + preConfigure = lib.optionalString stdenv.isCygwin '' sed -i gnu/fpending.h -e 's,include ,,' ''; From 80b7fda9fe764a8f1668eefd58a2d471c4aca3a0 Mon Sep 17 00:00:00 2001 From: "S. Nordin Abouzahra" Date: Sun, 28 Nov 2021 14:44:41 -0500 Subject: [PATCH 479/561] libwebp: 1.1.0 -> 1.2.1 --- pkgs/development/libraries/libwebp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 4908dc4a9ce1d..4333b4fbda495 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,13 +27,13 @@ in with lib; stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; - rev = version; - sha256 = "1kl6qqa29ygqb2fpv140y59v539gdqx4vcf3mlaxhca2bks98qgm"; + rev = "v${version}"; + hash = "sha256-KrvB5d3KNmujbfekWaevz2JZrWtK3PjEG9NEzRBYIDw="; }; prePatch = "patchShebangs ."; From f56f3f7dccb39d31bee9c8f6abb4b225a2b6cd9b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 2 Dec 2021 20:35:42 +0000 Subject: [PATCH 480/561] rustc: 1.56.1 -> 1.57.0 --- .../compilers/rust/{1_56.nix => 1_57.nix} | 30 +++++++++---------- pkgs/top-level/all-packages.nix | 8 ++--- 2 files changed, 19 insertions(+), 19 deletions(-) rename pkgs/development/compilers/rust/{1_56.nix => 1_57.nix} (58%) diff --git a/pkgs/development/compilers/rust/1_56.nix b/pkgs/development/compilers/rust/1_57.nix similarity index 58% rename from pkgs/development/compilers/rust/1_56.nix rename to pkgs/development/compilers/rust/1_57.nix index 49df8bcd5ecdc..f6b9d3c72a321 100644 --- a/pkgs/development/compilers/rust/1_56.nix +++ b/pkgs/development/compilers/rust/1_57.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.56.1"; - rustcSha256 = "04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3"; + rustcVersion = "1.57.0"; + rustcSha256 = "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim"; 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.55.0"; + bootstrapVersion = "1.56.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "6e42b6c44d2eb4170f4144423fa3c33338d8d5c3ea00b03bbac200c877bc9e98"; - x86_64-unknown-linux-gnu = "2080253a2ec36ac8ed6e060d30802d888533124b8d16545cfd4af898b365eaac"; - x86_64-unknown-linux-musl = "f24f68587253c4bfbe59d3d10fe4897068d9130538de6b2d02097a25718030c2"; - arm-unknown-linux-gnueabihf = "483444153d35cda51c6aec2c24bc4c97fa4fd30b28df4b60bf9763bd6e06da3a"; - armv7-unknown-linux-gnueabihf = "8c72f0eb75b10db970fb546c3b41f5e97df294d5dbbf0b8fa96e17f2b281ee9c"; - aarch64-unknown-linux-gnu = "eebdb2e659ed14884a49f0457d44e5e8c9f89fca3414533752c6dbb96232c156"; - aarch64-unknown-linux-musl = "2ce36a7d34f1f2aa43b4cbc0b437d96eefb45743828bf9ae699ff581ae257f28"; - x86_64-apple-darwin = "2e345ac7724c192c9487a2c6bd4f6c52c884d791981510288830d27d9a0bf2f3"; - aarch64-apple-darwin = "70c71d30d0de76912fcd88d503a6cb4323cfe6250c1a255be7e0d4e644b3d40a"; - powerpc64le-unknown-linux-gnu = "12bf6447d338cbe2b55539b84e6369b17e7eefe938d1ba7e3dd69781c9cc9812"; - riscv64gc-unknown-linux-gnu = "effceb45346fef3b0b54b357336e6f374f788b803bb1bee4084f25eace8907f3"; + 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"; }; - selectRustPackage = pkgs: pkgs.rust_1_56; + selectRustPackage = pkgs: pkgs.rust_1_57; rustcPatches = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3077daf8d2dd9..ca17856aad3e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12826,18 +12826,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_56 = callPackage ../development/compilers/rust/1_56.nix { + rust_1_57 = callPackage ../development/compilers/rust/1_57.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_13 = llvmPackages_13.libllvm; }; - rust = rust_1_56; + rust = rust_1_57; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_56 = rust_1_56.packages.stable; - rustPackages = rustPackages_1_56; + rustPackages_1_57 = rust_1_57.packages.stable; + rustPackages = rustPackages_1_57; inherit (rustPackages) cargo clippy rustc rustPlatform; From ae418d54d34bfead1996cfdd48ca7998e64e36af Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 30 Nov 2021 09:13:52 -0800 Subject: [PATCH 481/561] python.pkgs.pythonNamespacesHook: check parent directory exists before removing child --- .../interpreters/python/hooks/python-namespaces-hook.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh index 12ae50a198123..37479d9d4111c 100644 --- a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh @@ -25,7 +25,12 @@ pythonNamespacesHook() { fi # remove ${pname}-${version}-${python-interpeter}-nspkg.pth - if [ -z ${dontRemovePth-} ]; then + # + # Still need to check that parent directory exists in the + # event of a "meta-package" package, which will just install + # other packages, but not produce anything in site-packages + # besides meta information + if [ -d "${constructedPath}/../" -a -z ${dontRemovePth-} ]; then # .pth files are located in the parent directory of a module @findutils@/bin/find ${constructedPath}/../ -name '*-nspkg.pth' -exec rm -v "{}" + fi From 8169ad8838ceb9f7a9a5315d72f456057b4923aa Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 28 Nov 2021 15:04:03 +0800 Subject: [PATCH 482/561] libunwind: 1.4.0 -> 1.6.2 --- .../libunwind/backtrace-only-with-glibc.patch | 45 ------------------- .../libraries/libunwind/default.nix | 18 ++------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch diff --git a/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch b/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch deleted file mode 100644 index 5fcaa72c0c013..0000000000000 --- a/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 04437142399662b576bd55a85485c6dcc14d0812 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 31 Dec 2015 06:44:07 +0000 -Subject: [PATCH] backtrace: Use only with glibc and uclibc - -backtrace API is glibc specific not linux specific -so make it behave so. - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - tests/test-coredump-unwind.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c -index 5254708..8767b42 100644 ---- a/tests/test-coredump-unwind.c -+++ b/tests/test-coredump-unwind.c -@@ -57,7 +57,9 @@ - #include - - /* For SIGSEGV handler code */ -+#ifdef __GLIBC__ - #include -+#endif - #include - - #include -@@ -238,11 +240,11 @@ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext) - ip); - - { -+#ifdef __GLIBC__ - /* glibc extension */ - void *array[50]; - int size; - size = backtrace(array, 50); --#ifdef __linux__ - backtrace_symbols_fd(array, size, 2); - #endif - } --- -2.6.4 - diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 643752da1dc57..4e0fe9a4aa8d8 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,24 +1,14 @@ -{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, coreutils }: +{ stdenv, lib, fetchurl, autoreconfHook, xz, coreutils }: stdenv.mkDerivation rec { pname = "libunwind"; - version = "1.4.0"; + version = "1.6.2"; src = fetchurl { url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz"; - sha256 = "0dc46flppifrv2z0mrdqi60165ghxm1wk0g47vcbyzjdplqwjnfz"; + sha256 = "sha256-SmrsZmmR+0XQiJxErt6K1usQgHHDVU/N/2cfnJR5SXY="; }; - patches = [ - ./backtrace-only-with-glibc.patch - - (fetchpatch { - # upstream build fix against -fno-common compilers like >=gcc-10 - url = "https://github.com/libunwind/libunwind/commit/29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e.patch"; - sha256 = "1angwfq6h0jskg6zx8g6w9min38g5mgmrcbppcy5hqn59cgsxbw0"; - }) - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh" ''; @@ -46,7 +36,7 @@ stdenv.mkDerivation rec { description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; - badPlatforms = [ "riscv32-linux" "riscv64-linux" ]; + badPlatforms = [ "riscv32-linux" ]; license = licenses.mit; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca17856aad3e1..3844f0f8731c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18427,7 +18427,7 @@ with pkgs; libunwind = if stdenv.isDarwin then darwin.libunwind - else if stdenv.hostPlatform.isRiscV then llvmPackages_latest.libunwind + else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages_latest.libunwind else callPackage ../development/libraries/libunwind { }; libuv = callPackage ../development/libraries/libuv { From 35e41e6f89ffc4e8f69d1dcecab035787c2eca09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Nov 2021 10:30:19 +0100 Subject: [PATCH 483/561] python3Packages.prompt-toolkit: 3.0.19 -> 3.0.22 --- .../python-modules/prompt-toolkit/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 9aed0211a956d..ae67d3d556dcd 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -2,28 +2,39 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, six +, pythonOlder , wcwidth }: buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.19"; + version = "3.0.22"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "08360ee3a3148bdb5163621709ee322ec34fc4375099afa4bbf751e9b7b7fa4f"; + sha256 = "sha256-RJ8zPdEgvQH10paozhRSEUujpx+ucojS8K4skYdk+nI="; }; - propagatedBuildInputs = [ six wcwidth ]; + propagatedBuildInputs = [ + wcwidth + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; disabledTests = [ "test_pathcompleter_can_expanduser" ]; + pythonImportsCheck = [ + "prompt_toolkit" + ]; + meta = with lib; { description = "Python library for building powerful interactive command lines"; longDescription = '' @@ -33,7 +44,7 @@ buildPythonPackage rec { with a nice interactive Python shell (called ptpython) built on top. ''; homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; - maintainers = with maintainers; [ ]; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 05eb41e468f7f83cf298ea492121866a9ab486b4 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 22 Nov 2021 13:17:49 +0100 Subject: [PATCH 484/561] gd: 2.3.2 -> 2.3.3 --- pkgs/development/libraries/gd/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 3a64cc5639798..3d2a83dca4f4a 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , autoconf , automake , pkg-config @@ -14,21 +14,14 @@ stdenv.mkDerivation rec { pname = "gd"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; - sha256 = "1yypywkh8vphcy4qqpf51kxpb0a3r7rjqk3fc61rpn70hiq092j7"; + sha256 = "0qas3q9xz3wgw06dm2fj0i189rain6n60z1vyq50d5h7wbn25s1z"; }; hardeningDisable = [ "format" ]; - patches = [ - (fetchpatch { - name = "CVE-2021-40812.partial.patch"; - url = "https://github.com/libgd/libgd/commit/6f5136821be86e7068fcdf651ae9420b5d42e9a9.patch"; - sha256 = "11rvhd23bl05ksj8z39hwrhqqjm66svr4hl3y230wrc64rvnd2d2"; - }) - ]; # -pthread gets passed to clang, causing warnings configureFlags = lib.optional stdenv.isDarwin "--enable-werror=no"; From 59cd736ec271291cd1875ae5f16a8b42adba28ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 18 Nov 2021 10:56:12 +0100 Subject: [PATCH 485/561] python39: backport patch to accomodate system library changes in Big Sur (cherry picked from commit 9738723b2486cfe9988abbff0c873cce5cba1849) --- ....util.find_library-now-finds-macOS-1.patch | 84 +++++++++++++++++++ .../interpreters/python/cpython/default.nix | 3 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch diff --git a/pkgs/development/interpreters/python/cpython/3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch b/pkgs/development/interpreters/python/cpython/3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch new file mode 100644 index 0000000000000..b45d7507ba840 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch @@ -0,0 +1,84 @@ +From 4b55837e7c747e0f3bd2df1b5c8996ce86c6f60a Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Mon, 30 Aug 2021 02:08:16 -0700 +Subject: [PATCH] bpo-44689: ctypes.util.find_library() now finds macOS 11+ + system libraries when built on older macOS systems (GH-27251) (GH-28053) + +Previously, when built on older macOS systems, `find_library` was not able to find macOS system libraries when running on Big Sur due to changes in how system libraries are stored. +(cherry picked from commit 71853a73024a98aa38a3c0444fe364dbd9709134) + +Co-authored-by: Tobias Bergkvist +--- + .../2021-07-20-22-27-01.bpo-44689.mmT_xH.rst | 5 ++++ + Modules/_ctypes/callproc.c | 29 +++++++++++++++++-- + 2 files changed, 31 insertions(+), 3 deletions(-) + create mode 100644 Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst + +diff --git a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst +new file mode 100644 +index 0000000000..b1e878d1ee +--- /dev/null ++++ b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst +@@ -0,0 +1,5 @@ ++ :meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur ++ even if Python is built on an older version of macOS. Previously, when ++ built on older macOS systems, ``find_library`` was not able to find ++ macOS system libraries when running on Big Sur due to changes in ++ how system libraries are stored. +diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c +index 18984d15ab..b0f1e0bd04 100644 +--- a/Modules/_ctypes/callproc.c ++++ b/Modules/_ctypes/callproc.c +@@ -1449,14 +1449,37 @@ copy_com_pointer(PyObject *self, PyObject *args) + return r; + } + #else +- ++#ifdef __APPLE__ + #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH ++#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ ++ __builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *) ++#else ++// Support the deprecated case of compiling on an older macOS version ++static void *libsystem_b_handle; ++static bool (*_dyld_shared_cache_contains_path)(const char *path); ++ ++__attribute__((constructor)) void load_dyld_shared_cache_contains_path(void) { ++ libsystem_b_handle = dlopen("/usr/lib/libSystem.B.dylib", RTLD_LAZY); ++ if (libsystem_b_handle != NULL) { ++ _dyld_shared_cache_contains_path = dlsym(libsystem_b_handle, "_dyld_shared_cache_contains_path"); ++ } ++} ++ ++__attribute__((destructor)) void unload_dyld_shared_cache_contains_path(void) { ++ if (libsystem_b_handle != NULL) { ++ dlclose(libsystem_b_handle); ++ } ++} ++#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ ++ _dyld_shared_cache_contains_path != NULL ++#endif ++ + static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *args) + { + PyObject *name, *name2; + char *name_str; + +- if (__builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)) { ++ if (HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME) { + int r; + + if (!PyArg_ParseTuple(args, "O", &name)) +@@ -1999,7 +2022,7 @@ PyMethodDef _ctypes_module_methods[] = { + {"dlclose", py_dl_close, METH_VARARGS, "dlclose a library"}, + {"dlsym", py_dl_sym, METH_VARARGS, "find symbol in shared library"}, + #endif +-#ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH ++#ifdef __APPLE__ + {"_dyld_shared_cache_contains_path", py_dyld_shared_cache_contains_path, METH_VARARGS, "check if path is in the shared cache"}, + #endif + {"alignment", align_func, METH_O, alignment_doc}, +-- +2.33.1 + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index e4a974a255b89..bcfe2b8cd9651 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -240,6 +240,9 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals (pythonAtLeast "3.9" && stdenv.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch + # ctypes.util.find_library() now finds macOS 11+ system libraries when built on older macOS systems + # https://github.com/python/cpython/pull/28053 + ./3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [ # Fix for http://bugs.python.org/issue1222585 # Upstream distutils is calling C compiler to compile C++ code, which From 2100043ba9c5d173c7b2213e3ef7ca6c693f35e9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Dec 2021 12:48:21 +1000 Subject: [PATCH 486/561] go_1_16: 1.16.10 -> 1.16.11 --- pkgs/development/compilers/go/1.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index dad133337e85b..8f78c4de0e104 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.10"; + version = "1.16.11"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-qQVHIBFYXkA9ANKkHefO0puIhDCdc0gqMH9on9DzILU="; + sha256 = "sha256-WAQe3NgUY7TPG8KLhtwMF/TZVo1jxa/IU2fdj6577+c="; }; # perl is used for testing go vet From 92123f61bd552e36bc93902bd934f25723f0a5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 2 Dec 2021 19:17:55 -0800 Subject: [PATCH 487/561] python3Packages.validators: remove superfluous dependencies --- pkgs/development/python-modules/validators/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 37f00b734800b..29ec9cd73d73b 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -2,11 +2,8 @@ , buildPythonPackage , fetchPypi , isPy27 -, six , decorator , pytestCheckHook -, isort -, flake8 }: buildPythonPackage rec { @@ -20,18 +17,13 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - six decorator ]; checkInputs = [ pytestCheckHook - flake8 - isort ]; - disabledTests = lib.optionals isPy27 [ "url" ]; - meta = with lib; { description = "Python Data Validation for Humans™"; homepage = "https://github.com/kvesteri/validators"; From 18c32a4394b13de6d463692741bc55eb8e9acd85 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 3 Dec 2021 11:03:55 -0800 Subject: [PATCH 488/561] python3Packages.pylint: 2.12.1 -> 2.12.2 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index a2814c5b18eaf..b52cb3e2f95cb 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.12.1"; + version = "2.12.2"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "0vvf5b9cwp85mcz7j7zn2pa1m5avmnadi4z50jh3dga9njp8hl97"; + sha256 = "sha256-seBYBTB+8PLIovqxVohkoQEfDAZI1fehLgXuHeTx9Wo="; }; nativeBuildInputs = [ From 925bbece2f8dbfb93e2d53eef7aff30ad29df1cb Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 3 Dec 2021 13:18:38 -0800 Subject: [PATCH 489/561] cpython: remove upstreamed patch This patch has been merged in python 3.9.7. https://github.com/python/cpython/commit/4b55837e7c747e0f3bd2df1b5c8996ce86c6f60a --- ....util.find_library-now-finds-macOS-1.patch | 84 ------------------- .../interpreters/python/cpython/default.nix | 3 - 2 files changed, 87 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch diff --git a/pkgs/development/interpreters/python/cpython/3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch b/pkgs/development/interpreters/python/cpython/3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch deleted file mode 100644 index b45d7507ba840..0000000000000 --- a/pkgs/development/interpreters/python/cpython/3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 4b55837e7c747e0f3bd2df1b5c8996ce86c6f60a Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Mon, 30 Aug 2021 02:08:16 -0700 -Subject: [PATCH] bpo-44689: ctypes.util.find_library() now finds macOS 11+ - system libraries when built on older macOS systems (GH-27251) (GH-28053) - -Previously, when built on older macOS systems, `find_library` was not able to find macOS system libraries when running on Big Sur due to changes in how system libraries are stored. -(cherry picked from commit 71853a73024a98aa38a3c0444fe364dbd9709134) - -Co-authored-by: Tobias Bergkvist ---- - .../2021-07-20-22-27-01.bpo-44689.mmT_xH.rst | 5 ++++ - Modules/_ctypes/callproc.c | 29 +++++++++++++++++-- - 2 files changed, 31 insertions(+), 3 deletions(-) - create mode 100644 Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst - -diff --git a/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst -new file mode 100644 -index 0000000000..b1e878d1ee ---- /dev/null -+++ b/Misc/NEWS.d/next/macOS/2021-07-20-22-27-01.bpo-44689.mmT_xH.rst -@@ -0,0 +1,5 @@ -+ :meth:`ctypes.util.find_library` now works correctly on macOS 11 Big Sur -+ even if Python is built on an older version of macOS. Previously, when -+ built on older macOS systems, ``find_library`` was not able to find -+ macOS system libraries when running on Big Sur due to changes in -+ how system libraries are stored. -diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index 18984d15ab..b0f1e0bd04 100644 ---- a/Modules/_ctypes/callproc.c -+++ b/Modules/_ctypes/callproc.c -@@ -1449,14 +1449,37 @@ copy_com_pointer(PyObject *self, PyObject *args) - return r; - } - #else -- -+#ifdef __APPLE__ - #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH -+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ -+ __builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *) -+#else -+// Support the deprecated case of compiling on an older macOS version -+static void *libsystem_b_handle; -+static bool (*_dyld_shared_cache_contains_path)(const char *path); -+ -+__attribute__((constructor)) void load_dyld_shared_cache_contains_path(void) { -+ libsystem_b_handle = dlopen("/usr/lib/libSystem.B.dylib", RTLD_LAZY); -+ if (libsystem_b_handle != NULL) { -+ _dyld_shared_cache_contains_path = dlsym(libsystem_b_handle, "_dyld_shared_cache_contains_path"); -+ } -+} -+ -+__attribute__((destructor)) void unload_dyld_shared_cache_contains_path(void) { -+ if (libsystem_b_handle != NULL) { -+ dlclose(libsystem_b_handle); -+ } -+} -+#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ -+ _dyld_shared_cache_contains_path != NULL -+#endif -+ - static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *args) - { - PyObject *name, *name2; - char *name_str; - -- if (__builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)) { -+ if (HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME) { - int r; - - if (!PyArg_ParseTuple(args, "O", &name)) -@@ -1999,7 +2022,7 @@ PyMethodDef _ctypes_module_methods[] = { - {"dlclose", py_dl_close, METH_VARARGS, "dlclose a library"}, - {"dlsym", py_dl_sym, METH_VARARGS, "find symbol in shared library"}, - #endif --#ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH -+#ifdef __APPLE__ - {"_dyld_shared_cache_contains_path", py_dyld_shared_cache_contains_path, METH_VARARGS, "check if path is in the shared cache"}, - #endif - {"alignment", align_func, METH_O, alignment_doc}, --- -2.33.1 - diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index bcfe2b8cd9651..e4a974a255b89 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -240,9 +240,6 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals (pythonAtLeast "3.9" && stdenv.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch - # ctypes.util.find_library() now finds macOS 11+ system libraries when built on older macOS systems - # https://github.com/python/cpython/pull/28053 - ./3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [ # Fix for http://bugs.python.org/issue1222585 # Upstream distutils is calling C compiler to compile C++ code, which From 5df292dcc8c9f3082bcaed6fdc0f865c12b51e35 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Dec 2021 12:20:50 +0000 Subject: [PATCH 490/561] perlPackages.DBDSQLite: 1.66 -> 1.70 While at it pull upstream fix for sqlite-3.37 test compatibilty. --- pkgs/top-level/perl-packages.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9609c122727aa..dc8e980fd121a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6078,11 +6078,11 @@ let DBDSQLite = buildPerlPackage { pname = "DBD-SQLite"; - version = "1.66"; + version = "1.70"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.66.tar.gz"; - sha256 = "1zljln5nh61gj3k22a1fv2vhx5l83waizmarwkh77hk6kzzmvrw9"; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.70.tar.gz"; + sha256 = "0gpyv89p3yfwifbm005bz5ci8c63jikkfvafg8x7f3lyaggqvza0"; }; propagatedBuildInputs = [ DBI ]; @@ -6091,6 +6091,13 @@ let patches = [ # Support building against our own sqlite. ../development/perl-modules/DBD-SQLite/external-sqlite.patch + + # Pull upstream fix for test failures against sqlite-3.37. + (fetchpatch { + name = "sqlite-3.37-compat.patch"; + url = "https://github.com/DBD-SQLite/DBD-SQLite/commit/ba4f472e7372dbf453444c7764d1c342e7af12b8.patch"; + sha256 = "02lg1y6px7h89pfvgrf23anhbl3v050gn0kmaajvv5h6layhjzly"; + }) ]; makeMakerFlags = "SQLITE_INC=${pkgs.sqlite.dev}/include SQLITE_LIB=${pkgs.sqlite.out}/lib"; From ddaafeeebc2c7bfaa437bef19675d752a5b4b30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 6 Dec 2021 07:24:28 +0100 Subject: [PATCH 491/561] rav1e: switch to checkType debug see https://github.com/xiph/rav1e/issues/2851 --- pkgs/tools/video/rav1e/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index d6fc422b4cd40..bbf1e81a83d31 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -16,6 +16,8 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ nasm cargo-c ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + checkType = "debug"; + postBuild = '' cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} ''; From 62572ee90976a39f148b0b23c6bd5b99925f2103 Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 6 Dec 2021 19:28:16 +0100 Subject: [PATCH 492/561] mariadb: Drop stale LLVM 11 fix Upstream has updated to no longer need the changes messing with the `version` file. --- pkgs/servers/sql/mariadb/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7501dab6a1bb3..82fdc2a3a38b6 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -47,14 +47,6 @@ common = rec { # attributes common to both builds prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt - # libc++abi 11 uses `#include `, include paths often include - # project dirs and that means files with version numbers get included as if - # they were a header. This includes files name `VERSION` on - # case-insensitive file systems. - sed -i 's,/version\>,/version_full,' storage/mroonga/CMakeLists.txt - mv storage/mroonga/version storage/mroonga/version_full - sed -i 's,/VERSION\>,/VERSION_FULL,' cmake/mysql_version.cmake - mv VERSION VERSION_FULL ''; patches = [ From 259565656c0107a3f112d41c120ab9ef4e79b5d3 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 8 Dec 2021 00:54:15 -0800 Subject: [PATCH 493/561] libepoxy: fix build on darwin --- pkgs/development/libraries/libepoxy/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index bd9520da1c4f8..86f6843bfb5a0 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -8,6 +8,8 @@ , python3 , libGL , libX11 +, Carbon +, OpenGL }: let @@ -38,7 +40,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ]; - buildInputs = [ libGL libX11 ]; + buildInputs = [ + libGL + libX11 + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + OpenGL + ]; mesonFlags = [ "-Dtests=${if doCheck then "true" else "false"}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b65783f114f7..ff8d86c27548b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16142,7 +16142,9 @@ with pkgs; entt = callPackage ../development/libraries/entt { }; - libepoxy = callPackage ../development/libraries/libepoxy {}; + libepoxy = callPackage ../development/libraries/libepoxy { + inherit (darwin.apple_sdk.frameworks) Carbon OpenGL; + }; libesmtp = callPackage ../development/libraries/libesmtp { }; From 5d33b5183b2efa38002cf3eff5ff8b352cfa5c19 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 10 Dec 2021 01:17:46 +1000 Subject: [PATCH 494/561] go_1_16: 1.16.11 -> 1.16.12 --- pkgs/development/compilers/go/1.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 8f78c4de0e104..16fa8823c8dba 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.11"; + version = "1.16.12"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-WAQe3NgUY7TPG8KLhtwMF/TZVo1jxa/IU2fdj6577+c="; + sha256 = "sha256-Kv2Dnct20rsILFAsAaClzb/An9YwdXg1NjxP3o4vv+g="; }; # perl is used for testing go vet From e67892e15ba181476f05fd103d2ce5c9ff8b1088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Dec 2021 15:39:22 -0800 Subject: [PATCH 495/561] python3Packages.click-repl: depends on six Also run tests. --- .../python-modules/click-repl/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 84665ecb0950a..5934adab7a7f1 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -1,15 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, click, prompt-toolkit }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, prompt-toolkit +, six +, pytestCheckHook +}: buildPythonPackage rec { pname = "click-repl"; version = "0.2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8"; + src = fetchFromGitHub { + owner = "click-contrib"; + repo = "click-repl"; + rev = version; + hash = "sha256-kaTUKaIomJL0u3NX40bL0I54vkR+Utcdw1QKSbnVy5s="; }; - propagatedBuildInputs = [ click prompt-toolkit ]; + propagatedBuildInputs = [ + click + prompt-toolkit + six + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/click-contrib/click-repl"; From 2c843266c4300148504924da6fa4ca3e928d1fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Dec 2021 16:46:52 -0800 Subject: [PATCH 496/561] python3Packages.chalice: skip failing tests https://github.com/aws/chalice/issues/1850 --- pkgs/development/python-modules/chalice/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index dfdde6b0d6443..ab804b359dc06 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -85,6 +85,9 @@ buildPythonPackage rec { # Don't build "test_can_generate_pipeline_for_all" "test_build_wheel" + # https://github.com/aws/chalice/issues/1850 + "test_resolve_endpoint" + "test_endpoint_from_arn" ]; pythonImportsCheck = [ "chalice" ]; From 0f3a6e0cf7f35e02a8043abfd14893b39dec0287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Dec 2021 15:58:45 -0800 Subject: [PATCH 497/561] python3Packages.chalice: 1.24.2 -> 1.26.2 --- 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 ab804b359dc06..43767cb1a3193 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.24.2"; + version = "1.26.2"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = version; - sha256 = "0xpzc3rizdkjxclgxngswz0a22kdv1pw235gsw517ma7i06d0lw6"; + sha256 = "sha256-zF7wmrJTMX0Cr3wpJECUqhH58G2SLiVoC4Z2XbblQdQ="; }; propagatedBuildInputs = [ From 83b45c228556168cb22183d5fbc772fb5a192559 Mon Sep 17 00:00:00 2001 From: Ryan Burns <52847440+r-burns@users.noreply.github.com> Date: Sat, 11 Dec 2021 09:17:01 -0800 Subject: [PATCH 498/561] treewide: pin boost version for problematic dependers (#148668) These packages started failing now that the default boost version has been bumped from 1.69 to 1.77. They are now pinned to the highest boost version they will build against. (Some of the larger builds would have taken too long to bisect to the latest working boost version, so I just used boost16x for those.) --- pkgs/top-level/all-packages.nix | 86 +++++++++++++++++++++++++-------- 1 file changed, 65 insertions(+), 21 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a455ea32f5ba..4ddd4c94953de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4002,7 +4002,7 @@ with pkgs; libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { - boost = boost17x.override { enablePython = true; python = python3; }; + boost = boost175.override { enablePython = true; python = python3; }; lua = lua5_4; }) ceph @@ -5042,13 +5042,17 @@ with pkgs; emv = callPackage ../tools/misc/emv { }; - enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; + enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { + boost = boost172; + }; endlessh = callPackage ../servers/endlessh { }; ericw-tools = callPackage ../applications/misc/ericw-tools { }; - cryfs = callPackage ../tools/filesystems/cryfs { }; + cryfs = callPackage ../tools/filesystems/cryfs { + boost = boost175; + }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; @@ -6622,7 +6626,9 @@ with pkgs; isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { }; isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { }; - ispike = callPackage ../development/libraries/science/robotics/ispike { }; + ispike = callPackage ../development/libraries/science/robotics/ispike { + boost = boost16x; + }; isrcsubmit = callPackage ../tools/audio/isrcsubmit { }; @@ -8791,7 +8797,9 @@ with pkgs; postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; - povray = callPackage ../tools/graphics/povray { }; + povray = callPackage ../tools/graphics/povray { + boost = boost175; + }; power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; @@ -13068,7 +13076,9 @@ with pkgs; smlpkg = callPackage ../tools/package-management/smlpkg { }; - solc = callPackage ../development/compilers/solc { }; + solc = callPackage ../development/compilers/solc { + boost = boost172; + }; souffle = callPackage ../development/compilers/souffle { autoreconfHook = buildPackages.autoreconfHook269; @@ -15490,7 +15500,9 @@ with pkgs; uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { }; - uhd = callPackage ../applications/radio/uhd { }; + uhd = callPackage ../applications/radio/uhd { + boost = boost175; + }; uisp = callPackage ../development/embedded/uisp { }; @@ -15872,7 +15884,9 @@ with pkgs; captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; + ndn-cxx = callPackage ../development/libraries/ndn-cxx { + boost = boost175; + }; ndn-tools = callPackage ../tools/networking/ndn-tools { }; @@ -17709,7 +17723,9 @@ with pkgs; libgtop = callPackage ../development/libraries/libgtop {}; - libLAS = callPackage ../development/libraries/libLAS { }; + libLAS = callPackage ../development/libraries/libLAS { + boost = boost172; + }; liblaxjson = callPackage ../development/libraries/liblaxjson { }; @@ -17930,7 +17946,9 @@ with pkgs; librevisa = callPackage ../development/libraries/librevisa { }; - librime = callPackage ../development/libraries/librime {}; + librime = callPackage ../development/libraries/librime { + boost = boost174; + }; librsb = callPackage ../development/libraries/librsb { # Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec @@ -18122,7 +18140,9 @@ with pkgs; libndctl = callPackage ../development/libraries/libndctl { }; - libnest2d = callPackage ../development/libraries/libnest2d { }; + libnest2d = callPackage ../development/libraries/libnest2d { + boost = boost174; + }; libnet = callPackage ../development/libraries/libnet { }; @@ -20185,7 +20205,9 @@ with pkgs; wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { }; wt = wt4; - inherit (callPackages ../development/libraries/wt {}) + inherit (callPackages ../development/libraries/wt { + boost = boost175; + }) wt3 wt4; @@ -21551,7 +21573,9 @@ with pkgs; }; # Fails to compile with boost <= 1.72 - rippled = callPackage ../servers/rippled { }; + rippled = callPackage ../servers/rippled { + boost = boost172; + }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { }; @@ -27506,7 +27530,9 @@ with pkgs; openfx = callPackage ../development/libraries/openfx {}; - openimageio = callPackage ../applications/graphics/openimageio { }; + openimageio = callPackage ../applications/graphics/openimageio { + boost = boost175; + }; openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; @@ -28841,7 +28867,9 @@ with pkgs; swt = swt_jdk8; }; - twister = callPackage ../applications/networking/p2p/twister { }; + twister = callPackage ../applications/networking/p2p/twister { + boost = boost16x; + }; twmn = libsForQt5.callPackage ../applications/misc/twmn { }; @@ -29712,7 +29740,9 @@ with pkgs; ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS - aeon = callPackage ../applications/blockchains/aeon { }; + aeon = callPackage ../applications/blockchains/aeon { + boost = boost172; + }; alfis = callPackage ../applications/blockchains/alfis { inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; @@ -29801,8 +29831,14 @@ with pkgs; dcrd = callPackage ../applications/blockchains/dcrd { }; dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; - digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte { withGui = true; }; - digibyted = callPackage ../applications/blockchains/digibyte { withGui = false; }; + digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte { + withGui = true; + boost = boost170; + }; + digibyted = callPackage ../applications/blockchains/digibyte { + withGui = false; + boost = boost170; + }; dogecoin = callPackage ../applications/blockchains/dogecoin { boost = boost165; @@ -29822,10 +29858,12 @@ with pkgs; elements = libsForQt5.callPackage ../applications/blockchains/elements { miniupnpc = miniupnpc_2; withGui = true; + boost = boost175; }; elementsd = callPackage ../applications/blockchains/elements { miniupnpc = miniupnpc_2; withGui = false; + boost = boost175; }; ergo = callPackage ../applications/blockchains/ergo { }; @@ -29876,7 +29914,9 @@ with pkgs; masari = callPackage ../applications/blockchains/masari { boost = boost165; }; - nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { + boost = boost172; + }; namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; }; @@ -29915,7 +29955,9 @@ with pkgs; wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; }; - wownero = callPackage ../applications/blockchains/wownero { }; + wownero = callPackage ../applications/blockchains/wownero { + boost = boost175; + }; zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; @@ -33669,7 +33711,9 @@ with pkgs; NSPlist = callPackage ../development/libraries/NSPlist {}; - PlistCpp = callPackage ../development/libraries/PlistCpp {}; + PlistCpp = callPackage ../development/libraries/PlistCpp { + boost = boost172; + }; xib2nib = callPackage ../development/tools/xib2nib {}; From bd7a6594055ef1024c2f477c4c222202af1d5e68 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 11 Dec 2021 13:42:04 -0500 Subject: [PATCH 499/561] nix: fix darwin build --- pkgs/tools/package-management/nix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 59651c973c377..1a8a488934697 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -78,6 +78,9 @@ common = propagatedBuildInputs = [ boehmgc ]; + # src/nix-build/nix-build.cc:463:41: error: 'value' is unavailable: introduced in macOS 10.13 + NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + NIX_LDFLAGS = lib.optionals (!is24) [ # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba (lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto") From 59fdf0e3642602333b3a4fbfdeaa33128defca81 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 11 Dec 2021 23:43:39 -0500 Subject: [PATCH 500/561] libepoxy: disable cgl_epoxy_api test --- pkgs/development/libraries/libepoxy/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 86f6843bfb5a0..4141de4fc00da 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -16,7 +16,7 @@ let inherit (lib) getLib optional optionalString; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "libepoxy"; version = "1.5.9"; @@ -65,4 +65,10 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ goibhniu erictapen ]; platforms = platforms.unix; }; -} +} // lib.optionalAttrs stdenv.isDarwin { + # cgl_epoxy_api fails in darwin sandbox and on Hydra (because it's headless?) + preCheck = '' + substituteInPlace ../test/meson.build \ + --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" + ''; +}) From 484c7df808df9c678731533a1df83c39e8edad8e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 12 Dec 2021 08:25:02 -0500 Subject: [PATCH 501/561] python3Packages.gdown: fix eval (broken by a merge conflict) --- pkgs/development/python-modules/gdown/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index d178a7063b2be..195a7e822d761 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -7,7 +7,6 @@ , tqdm , setuptools , six -, beautifulsoup4 }: buildPythonApplication rec { From 8525e831a83de7a8d27aa3fba27e6800b4d0c0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Dec 2021 21:07:39 -0800 Subject: [PATCH 502/561] python2Packages.pyjwt: init at 1.7.1 needed for NixOps --- pkgs/development/python-modules/pyjwt/1.nix | 44 +++++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pyjwt/1.nix diff --git a/pkgs/development/python-modules/pyjwt/1.nix b/pkgs/development/python-modules/pyjwt/1.nix new file mode 100644 index 0000000000000..9978302d1cc44 --- /dev/null +++ b/pkgs/development/python-modules/pyjwt/1.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, ecdsa +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyjwt"; + version = "1.7.1"; + + src = fetchPypi { + pname = "PyJWT"; + inherit version; + sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; + }; + + postPatch = '' + sed -i '/^addopts/d' setup.cfg + ''; + + propagatedBuildInputs = [ + cryptography + ecdsa + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_ec_verify_should_return_false_if_signature_invalid" + ]; + + pythonImportsCheck = [ "jwt" ]; + + meta = with lib; { + description = "JSON Web Token implementation in Python"; + homepage = "https://github.com/jpadilla/pyjwt"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index ab20487e0d07a..210be5eb2ae04 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -457,6 +457,8 @@ with self; with super; { pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { }; + pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { }; + pykickstart = callPackage ../development/python-modules/pykickstart { }; pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { }; From f10e8df3b91be91e8f9c0ae939f44835a0e0a219 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Dec 2021 12:31:01 +0100 Subject: [PATCH 503/561] python3Packages.{aiopvapi,twentemilieu,wled}: fix merge --- pkgs/development/python-modules/aiopvapi/default.nix | 9 --------- pkgs/development/python-modules/twentemilieu/default.nix | 1 - pkgs/development/python-modules/wled/default.nix | 4 ++-- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index 0c0d195402125..3aa3116b0f5ed 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -22,15 +22,6 @@ buildPythonPackage rec { sha256 = "18gbz9rcf183syvxvvhhl62af3b7463rlqxxs49w4m805hkvirdp"; }; - patches = [ - (fetchpatch { - # Drop loop= kwarg from async_timeout and ClientSession calls - # https://github.com/sander76/aio-powerview-api/pull/13 - url = "https://github.com/sander76/aio-powerview-api/commit/7be67268050fbbf7652ce5a020d2ff26f34d0b27.patch"; - sha256 = "sha256-7QPwrMP1Sbrayg63YZJcRkVDAqcm6hqh0fuJdrUk5WY="; - }) - ]; - propagatedBuildInputs = [ aiohttp async-timeout diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index 1e235ccdfb3f9..a8a0fd0c99a63 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, poetry-core , aiohttp , yarl , aresponses diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index a31030d50640d..886ffea60b79a 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -2,20 +2,20 @@ , aiohttp , awesomeversion , backoff +, buildPythonPackage , cachetools +, fetchFromGitHub , poetry-core , yarl , aresponses , pytest-asyncio , pytestCheckHook , pythonOlder -, yarl }: buildPythonPackage rec { pname = "wled"; version = "0.10.2"; - disabled = pythonOlder "3.8"; format = "pyproject"; disabled = pythonOlder "3.8"; From 6bda212f691a94f5b16385a432e86b9e0c98cbf5 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 13 Dec 2021 07:27:59 -0500 Subject: [PATCH 504/561] jemalloc: fix darwin build --- pkgs/development/libraries/jemalloc/common.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index d5fe07b00f2ac..5abde13a2e6ec 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -1,5 +1,6 @@ { version, sha256 }: { lib, stdenv, fetchurl +, fetchpatch # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { inherit sha256; }; + patches = [ + # workaround https://github.com/jemalloc/jemalloc/issues/2091 + (fetchpatch { + url = "https://github.com/jemalloc/jemalloc/commit/3b4a03b92b2e415415a08f0150fdb9eeb659cd52.diff"; + sha256 = "sha256-6AYtADREhfj93ZLk9xnXtjc6vHDU0EKLLOvLd6YdJeI="; + }) + ]; + # see the comment on stripPrefix configureFlags = [] ++ optional stripPrefix "--with-jemalloc-prefix=" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2fdff664b40a..7ed38a1dea6c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17193,7 +17193,11 @@ with pkgs; jbigkit = callPackage ../development/libraries/jbigkit { }; - jemalloc = callPackage ../development/libraries/jemalloc { }; + jemalloc = callPackage ../development/libraries/jemalloc { + # tests fail with LLVM 11+ + # https://github.com/jemalloc/jemalloc/issues/2091 + stdenv = if stdenv.cc.isClang then llvmPackages_10.stdenv else stdenv; + }; jemalloc450 = callPackage ../development/libraries/jemalloc/jemalloc450.nix { }; From 8f0a587d4a57d9ac20c048ba73347adb5e1c421d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 13 Dec 2021 07:42:47 -0500 Subject: [PATCH 505/561] z3: fix darwin build --- pkgs/applications/science/logic/z3/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 4153ba5f66fce..0e500af6a595a 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" ) + "\n" + "cd build"; + # ../src/ast/ast.h:183:39: error: 'get' is unavailable: introduced in macOS 10.13 + NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + postInstall = '' mkdir -p $dev $lib mv $out/lib $lib/lib From dc67304893acc06be4feb3ff03b843bbfd3fd0fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 08:03:09 +0000 Subject: [PATCH 506/561] koka: 2.3.2 -> 2.3.6 --- pkgs/development/compilers/koka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 9e4e446b12311..51d0a9ed7b908 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -4,12 +4,12 @@ , parsec, process, regex-compat, text, time }: let - version = "2.3.2"; + version = "2.3.6"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-+w99Jvsd1tccUUYaP2TRgCNyGnMINWamuNRumHGzFWA="; + sha256 = "sha256-AibS/HudJKFQZlTxGD5LfwjBawIy1xwO2Hm8qzAUP2M="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { From dfe70100691395c0b3fe6d1737b3b719209b0cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 15 Dec 2021 11:17:28 +0100 Subject: [PATCH 507/561] gd: apply upstream patch The last version (PR #146992) broke API unintentionally, breaking php build. Upstream reverted the breakage. --- pkgs/development/libraries/gd/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 3d2a83dca4f4a..983ec33cdbdf9 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, fetchpatch , autoconf , automake , pkg-config @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "0qas3q9xz3wgw06dm2fj0i189rain6n60z1vyq50d5h7wbn25s1z"; }; + patches = [ + (fetchpatch { # included in > 2.3.3 + name = "restore-GD_FLIP.patch"; + url = "https://github.com/libgd/libgd/commit/f4bc1f5c26925548662946ed7cfa473c190a104a.diff"; + sha256 = "XRXR3NOkbEub3Nybaco2duQk0n8vxif5mTl2AUacn9w="; + }) + ]; + hardeningDisable = [ "format" ]; # -pthread gets passed to clang, causing warnings From 5f5bc79a1bf33493a5fb0e599c4f206fc0cb491e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Dec 2021 09:57:12 -0500 Subject: [PATCH 508/561] qt5{14,15}.qtbase: fix build on darwin --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 44f08699824fb..b97a4dd5492f0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -184,6 +184,12 @@ stdenv.mkDerivation { ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optional stdenv.isLinux "-DUSE_X11" + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ + # fix "introduced in macOS 10.13" + "-D_LIBCPP_DISABLE_AVAILABILITY" + # ignore "is only available on macOS 10.12.2 or newer" in obj-c code + "-Wno-error=unguarded-availability" + ] ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' From 69221cf2d2eacc8b6aee36ad002411700deaf461 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Dec 2021 14:47:51 -0500 Subject: [PATCH 509/561] python3Packages.matplotlib: setup.cfg -> mplsetup.cfg This addresses a regression on darwin. An alternative to this would be to set MPLSETUPCFG as was suggested in --- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index a9ecee77dce9d..806576b2965e7 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -87,10 +87,10 @@ buildPythonPackage rec { }; }; - setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config); + mplsetup_cfg = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config); preBuild = '' - cp "$setup_cfg" ./setup.cfg + cp "$mplsetup_cfg" ./mplsetup.cfg ''; # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the From a7a3675563cd4044abd2230f7ec6fcc114ca882e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Dec 2021 15:22:10 -0500 Subject: [PATCH 510/561] gromacs: fix build on darwin --- .../science/molecular-dynamics/gromacs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index f30e94f03d88e..5743d8df041e3 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -41,6 +41,9 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; + # error: 'value' is unavailable: introduced in macOS 10.13 + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + cmakeFlags = [ "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" "-DGMX_OPENMP:BOOL=TRUE" From 7dc44307515de130daf661814891d8844fdf701f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Dec 2021 14:47:51 -0500 Subject: [PATCH 511/561] python3Packages.matplotlib: switch to use an absolute path in MPLSETUPCFG The upstream made a transition setup.cfg -> mplsetup.cfg https://github.com/matplotlib/matplotlib/commit/93b5c0fb08b5426623fa3927a515eaec0aac0c36 This should allow us to be compatible with some reasonable version overrides https://github.com/NixOS/nixpkgs/pull/147742#issuecomment-995178116 --- pkgs/development/python-modules/matplotlib/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 806576b2965e7..9f47eab639bbf 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -87,11 +87,7 @@ buildPythonPackage rec { }; }; - mplsetup_cfg = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config); - - preBuild = '' - cp "$mplsetup_cfg" ./mplsetup.cfg - ''; + MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config); # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the # corresponding interpreter object for its library paths. This fails if From 53e0f6daf25c30ffd8be0499c41623dc8f4d4d11 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Dec 2021 17:45:15 -0500 Subject: [PATCH 512/561] darktable: fix darwin build --- pkgs/applications/graphics/darktable/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 50e26677377f6..1f5732f9e36da 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isDarwin gtk-mac-integration ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; + # VC5Decompressor.cpp:718:55: error: 'value' is unavailable: introduced in macOS 10.13 + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + cmakeFlags = [ "-DBUILD_USERMANUAL=False" ] ++ lib.optionals stdenv.isDarwin [ From bd7796dfcd94149b915a36ad2b23b8eaf78d92cd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Dec 2021 17:52:01 -0500 Subject: [PATCH 513/561] imagelol: fix darwin build --- pkgs/tools/compression/imagelol/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/compression/imagelol/default.nix b/pkgs/tools/compression/imagelol/default.nix index d54d2da2f90e4..10d217e7b33a7 100644 --- a/pkgs/tools/compression/imagelol/default.nix +++ b/pkgs/tools/compression/imagelol/default.nix @@ -12,8 +12,19 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + # fix for case-sensitive filesystems + # https://github.com/MCredstoner2004/ImageLOL/issues/1 + postPatch = '' + mv ImageLOL src + substituteInPlace CMakeLists.txt \ + --replace 'add_subdirectory("imagelol")' 'add_subdirectory("src")' + ''; + nativeBuildInputs = [ cmake ]; + # error: 'path' is unavailable: introduced in macOS 10.15 + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + installPhase = '' mkdir -p $out/bin cp ./ImageLOL $out/bin From b6eea0848576b197c6761fb9d0b695646fbcc70b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Dec 2021 17:55:08 -0500 Subject: [PATCH 514/561] openrw: fix darwin build --- pkgs/games/openrw/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index f1bcab2895fb0..d86962b9abeaa 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -28,8 +28,16 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + postPatch = lib.optional (stdenv.cc.isClang && (lib.versionAtLeast stdenv.cc.version "9"))'' + substituteInPlace cmake_configure.cmake \ + --replace 'target_link_libraries(rw_interface INTERFACE "stdc++fs")' "" + ''; + nativeBuildInputs = [ cmake ]; + # error: 'path' is unavailable: introduced in macOS 10.15 + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + buildInputs = [ sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; From 75f54128ac6012bea2e91392bbc05e0a0c91133a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Dec 2021 17:55:36 -0500 Subject: [PATCH 515/561] python3Packages.tweedledum: fix darwin build --- pkgs/development/python-modules/tweedledum/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix index 81f0dad52eb03..d0d989d291227 100644 --- a/pkgs/development/python-modules/tweedledum/default.nix +++ b/pkgs/development/python-modules/tweedledum/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , cmake @@ -23,6 +24,9 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ninja scikit-build ]; dontUseCmakeConfigure = true; + # error: 'value' is unavailable: introduced in macOS 10.13 + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + pythonImportsCheck = [ "tweedledum" ]; checkInputs = [ pytestCheckHook ]; From 2a403838eb8d0c6296c9febd041bfafb2934dab9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 16 Dec 2021 17:57:54 -0500 Subject: [PATCH 516/561] zxing-cpp: fix darwin build --- pkgs/development/libraries/zxing-cpp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index aa7db78c4c32a..a6f83f2859d4b 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { pkg-config ]; + # error: 'path' is unavailable: introduced in macOS 10.15 + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" ]; From 173bcf18a4c62c815127d4eb3f82cbf089448bfd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 17 Dec 2021 09:52:49 -0500 Subject: [PATCH 517/561] imagelol: fix for case-sensitive filesystems --- pkgs/tools/compression/imagelol/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/imagelol/default.nix b/pkgs/tools/compression/imagelol/default.nix index 10d217e7b33a7..5a175611b930e 100644 --- a/pkgs/tools/compression/imagelol/default.nix +++ b/pkgs/tools/compression/imagelol/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # fix for case-sensitive filesystems # https://github.com/MCredstoner2004/ImageLOL/issues/1 postPatch = '' - mv ImageLOL src + mv imagelol src substituteInPlace CMakeLists.txt \ --replace 'add_subdirectory("imagelol")' 'add_subdirectory("src")' ''; From ffdad422d0dcb6f33cfe29f9adb25b0db35a1682 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 17 Dec 2021 21:10:16 -0500 Subject: [PATCH 518/561] waifu2x-converter-cpp: fix darwin build --- pkgs/tools/graphics/waifu2x-converter-cpp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 8d8ae6e71e424..8afca16eb09bb 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; + # main.cpp:498:12: error: 'is_directory' is unavailable: introduced in macOS 10.15 + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + preFixup = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib" ''; From f3246ce6833660abe2cc599be31ba87ab7f3d41d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 17 Dec 2021 21:23:52 -0500 Subject: [PATCH 519/561] caf: fix darwin build --- pkgs/development/libraries/caf/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 045595a84fde7..71db183afc606 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io ''; + # error: 'get< ... >' is unavailable: introduced in macOS 10.13 + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + meta = with lib; { description = "An open source implementation of the actor model in C++"; homepage = "http://actor-framework.org/"; From 636ec221ec6a74b1a8672a4c497c9fa40b1df3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Dec 2021 16:06:15 +0100 Subject: [PATCH 520/561] mapnik: use boost175 PR #138309 switched the default to 177 and that broke the build. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd171ce596808..644b5cc1e47e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18714,6 +18714,7 @@ with pkgs; proj = proj_7; }; proj = proj_7; + boost = boost175; }; From f7775a4c2c9cd5b24890194a4644ae06a4d4fd1c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 18 Dec 2021 10:05:55 -0500 Subject: [PATCH 521/561] hercules-ci-cnix-store: fix darwin build --- pkgs/development/haskell-modules/configuration-darwin.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 5248523e0cd1f..13367c61be30b 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -30,6 +30,10 @@ self: super: ({ double-conversion = addExtraLibrary pkgs.libcxx super.double-conversion; + hercules-ci-cnix-store = super.hercules-ci-cnix-store.overrideAttrs (drv: { + NIX_CFLAGS_COMPILE = "-D_LIBCPP_DISABLE_AVAILABILITY"; + }); + apecs-physics = addPkgconfigDepends [ darwin.apple_sdk.frameworks.ApplicationServices ] super.apecs-physics; From 4bffea9aa96e2cbc5df4d81a3d8c8b8d3e922be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Dec 2021 16:07:21 +0100 Subject: [PATCH 522/561] powerdns: use boost172 PR #138309 switched the default to 177 and that broke the build. --- 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 644b5cc1e47e8..c308ea725ea88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22718,7 +22718,9 @@ with pkgs; semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; - powerdns = callPackage ../servers/dns/powerdns { }; + powerdns = callPackage ../servers/dns/powerdns { + boost = boost172; + }; powerdns-admin = callPackage ../applications/networking/powerdns-admin { }; From b6b6bc501a4fc679f52b9baf2e14fbd901c73f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Dec 2021 16:07:47 +0100 Subject: [PATCH 523/561] librecad: use boost175 PR #138309 switched the default to 177 and that broke the build. --- 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 c308ea725ea88..7b641b86915ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26666,7 +26666,9 @@ with pkgs; libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; - librecad = libsForQt514.callPackage ../applications/misc/librecad { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { + boost = boost175; + }; libreoffice = hiPrio libreoffice-still; libreoffice-unwrapped = libreoffice.libreoffice; From e1aaaa90fee8665ef84c87eae558f387196d220e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 17 Dec 2021 21:39:30 -0500 Subject: [PATCH 524/561] llvmPackages.libcxx: unset _LIBCPP_USE_AVAILABILITY_APPLE --- pkgs/applications/graphics/darktable/default.nix | 3 --- pkgs/applications/science/logic/z3/default.nix | 3 --- .../science/molecular-dynamics/gromacs/default.nix | 3 --- pkgs/development/compilers/llvm/10/libcxx/default.nix | 6 ++++++ pkgs/development/compilers/llvm/11/libcxx/default.nix | 6 ++++++ pkgs/development/compilers/llvm/12/libcxx/default.nix | 6 ++++++ pkgs/development/compilers/llvm/13/libcxx/default.nix | 6 ++++++ pkgs/development/compilers/llvm/6/libcxx/default.nix | 6 ++++++ pkgs/development/compilers/llvm/7/libcxx/default.nix | 6 ++++++ pkgs/development/compilers/llvm/8/libcxx/default.nix | 6 ++++++ pkgs/development/compilers/llvm/9/libcxx/default.nix | 6 ++++++ pkgs/development/compilers/llvm/git/libcxx/default.nix | 6 ++++++ pkgs/development/haskell-modules/configuration-darwin.nix | 4 ---- pkgs/development/libraries/caf/default.nix | 3 --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ------ pkgs/development/libraries/zxing-cpp/default.nix | 3 --- pkgs/development/python-modules/tweedledum/default.nix | 3 --- pkgs/development/tools/build-managers/bear/default.nix | 3 --- pkgs/games/openrw/default.nix | 3 --- pkgs/tools/compression/imagelol/default.nix | 3 --- pkgs/tools/graphics/waifu2x-converter-cpp/default.nix | 3 --- pkgs/tools/package-management/nix/default.nix | 3 --- 22 files changed, 54 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 1f5732f9e36da..50e26677377f6 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -27,9 +27,6 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isDarwin gtk-mac-integration ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - # VC5Decompressor.cpp:718:55: error: 'value' is unavailable: introduced in macOS 10.13 - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - cmakeFlags = [ "-DBUILD_USERMANUAL=False" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 0e500af6a595a..4153ba5f66fce 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -49,9 +49,6 @@ stdenv.mkDerivation rec { ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" ) + "\n" + "cd build"; - # ../src/ast/ast.h:183:39: error: 'get' is unavailable: introduced in macOS 10.13 - NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - postInstall = '' mkdir -p $dev $lib mv $out/lib $lib/lib diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 5743d8df041e3..f30e94f03d88e 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -41,9 +41,6 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; - # error: 'value' is unavailable: introduced in macOS 10.13 - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - cmakeFlags = [ "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" "-DGMX_OPENMP:BOOL=TRUE" diff --git a/pkgs/development/compilers/llvm/10/libcxx/default.nix b/pkgs/development/compilers/llvm/10/libcxx/default.nix index 7c01e73171164..d438294bdd0b6 100644 --- a/pkgs/development/compilers/llvm/10/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/10/libcxx/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; + # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" + postPatch = '' + substituteInPlace include/__config \ + --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" + ''; + preConfigure = '' # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") diff --git a/pkgs/development/compilers/llvm/11/libcxx/default.nix b/pkgs/development/compilers/llvm/11/libcxx/default.nix index 596d7f9976bbd..9aa49c9a009e6 100644 --- a/pkgs/development/compilers/llvm/11/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/11/libcxx/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; + # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" + postPatch = '' + substituteInPlace include/__config \ + --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" + ''; + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/compilers/llvm/12/libcxx/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix index 3ddcb79975050..30dc3f4f206cb 100644 --- a/pkgs/development/compilers/llvm/12/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; + # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" + postPatch = '' + substituteInPlace include/__config \ + --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" + ''; + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index 0ce73ed97af6c..ddf51d9a2fa4d 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { ../../libcxx-0001-musl-hacks.patch ]; + # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" + postPatch = '' + substituteInPlace include/__config \ + --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" + ''; + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/compilers/llvm/6/libcxx/default.nix b/pkgs/development/compilers/llvm/6/libcxx/default.nix index 3e39dd840424d..7077081c59173 100644 --- a/pkgs/development/compilers/llvm/6/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/6/libcxx/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; + # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" + postPatch = '' + substituteInPlace include/__config \ + --replace "#define _LIBCPP_USE_AVAILABILITY_APPLE" "" + ''; + prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" ''; diff --git a/pkgs/development/compilers/llvm/7/libcxx/default.nix b/pkgs/development/compilers/llvm/7/libcxx/default.nix index ac10e8eb77e34..07d84432d4220 100644 --- a/pkgs/development/compilers/llvm/7/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/7/libcxx/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; + # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" + postPatch = '' + substituteInPlace include/__config \ + --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" + ''; + prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" ''; diff --git a/pkgs/development/compilers/llvm/8/libcxx/default.nix b/pkgs/development/compilers/llvm/8/libcxx/default.nix index 804b9a53c24a1..87cd734899fa2 100644 --- a/pkgs/development/compilers/llvm/8/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/8/libcxx/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; + # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" + postPatch = '' + substituteInPlace include/__config \ + --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" + ''; + prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" ''; diff --git a/pkgs/development/compilers/llvm/9/libcxx/default.nix b/pkgs/development/compilers/llvm/9/libcxx/default.nix index b2022f23e511f..2719711031070 100644 --- a/pkgs/development/compilers/llvm/9/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/9/libcxx/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; + # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" + postPatch = '' + substituteInPlace include/__config \ + --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" + ''; + preConfigure = '' # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index 0ddf28909b8e8..bedfd5afee150 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { ../../libcxx-0001-musl-hacks.patch ]; + # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" + postPatch = '' + substituteInPlace include/__config \ + --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" + ''; + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 13367c61be30b..5248523e0cd1f 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -30,10 +30,6 @@ self: super: ({ double-conversion = addExtraLibrary pkgs.libcxx super.double-conversion; - hercules-ci-cnix-store = super.hercules-ci-cnix-store.overrideAttrs (drv: { - NIX_CFLAGS_COMPILE = "-D_LIBCPP_DISABLE_AVAILABILITY"; - }); - apecs-physics = addPkgconfigDepends [ darwin.apple_sdk.frameworks.ApplicationServices ] super.apecs-physics; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 71db183afc606..045595a84fde7 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -26,9 +26,6 @@ stdenv.mkDerivation rec { export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io ''; - # error: 'get< ... >' is unavailable: introduced in macOS 10.13 - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - meta = with lib; { description = "An open source implementation of the actor model in C++"; homepage = "http://actor-framework.org/"; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index b97a4dd5492f0..44f08699824fb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -184,12 +184,6 @@ stdenv.mkDerivation { ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optional stdenv.isLinux "-DUSE_X11" - ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ - # fix "introduced in macOS 10.13" - "-D_LIBCPP_DISABLE_AVAILABILITY" - # ignore "is only available on macOS 10.12.2 or newer" in obj-c code - "-Wno-error=unguarded-availability" - ] ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index a6f83f2859d4b..aa7db78c4c32a 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -21,9 +21,6 @@ stdenv.mkDerivation rec { pkg-config ]; - # error: 'path' is unavailable: introduced in macOS 10.15 - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" ]; diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix index d0d989d291227..69b126481d3e5 100644 --- a/pkgs/development/python-modules/tweedledum/default.nix +++ b/pkgs/development/python-modules/tweedledum/default.nix @@ -24,9 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ninja scikit-build ]; dontUseCmakeConfigure = true; - # error: 'value' is unavailable: introduced in macOS 10.13 - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - pythonImportsCheck = [ "tweedledum" ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 552cb0573665b..21f7512588c00 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -47,9 +47,6 @@ stdenv.mkDerivation rec { ./no-double-relative.patch ]; - # 'path' is unavailable: introduced in macOS 10.15 - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - meta = with lib; { description = "Tool that generates a compilation database for clang tooling"; longDescription = '' diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index d86962b9abeaa..95ec3d64cfb43 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -35,9 +35,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - # error: 'path' is unavailable: introduced in macOS 10.15 - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - buildInputs = [ sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; diff --git a/pkgs/tools/compression/imagelol/default.nix b/pkgs/tools/compression/imagelol/default.nix index 5a175611b930e..187435d4eb343 100644 --- a/pkgs/tools/compression/imagelol/default.nix +++ b/pkgs/tools/compression/imagelol/default.nix @@ -22,9 +22,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - # error: 'path' is unavailable: introduced in macOS 10.15 - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - installPhase = '' mkdir -p $out/bin cp ./ImageLOL $out/bin diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 8afca16eb09bb..8d8ae6e71e424 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -26,9 +26,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; - # main.cpp:498:12: error: 'is_directory' is unavailable: introduced in macOS 10.15 - CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - preFixup = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib" ''; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1a8a488934697..59651c973c377 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -78,9 +78,6 @@ common = propagatedBuildInputs = [ boehmgc ]; - # src/nix-build/nix-build.cc:463:41: error: 'value' is unavailable: introduced in macOS 10.13 - NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; - NIX_LDFLAGS = lib.optionals (!is24) [ # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba (lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto") From 62dc6893b763e8aa0a4c4217e636c57e874f4b9e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 18 Dec 2021 12:20:29 +0100 Subject: [PATCH 525/561] mesa: 21.3.1 -> 21.3.2 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 97b5613ea2637..4b9849fd87880 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -33,7 +33,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.3.1"; + version = "21.3.2"; branch = versions.major version; self = stdenv.mkDerivation { @@ -47,7 +47,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0ka7rh00inkzkir6bz6shn8k91j5pinp03yh85bm54mi1iac439b"; + sha256 = "1g96y59bw10ml8h4jl259g41jdmf5ww3jbwqpz1sprq7hgxvmrz2"; }; # TODO: From 28e731742c20ac9a8950772e5cce471bb3fd1008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Dec 2021 10:21:28 +0100 Subject: [PATCH 526/561] Revert "Merge #142792: gcc9: 9.3.0 -> 9.4.0" This reverts commit d71611fb7221eaa8804a355ca22fadecacc4b9f6, reversing changes made to cae9272c92a8967ad56f8501a7ae006dfcab729d. The update caused an issue on aarch64-linux where it's the default compiler, many packages got broken (usually through `mariadb`; I think). File lib/gcc/aarch64-unknown-linux-gnu/9.4.0/include/arm_acle.h got unbalanced braces (look at `cplusplus` lines), e.g. see in /nix/store/fvkdvx69sf8h99xgx0m42dzfd5ly5csr-gcc-9.4.0/ I don't know how exactly it happened, as in the source this header is OK and hasn't even changed between 9.3.0 and 9.4.0. I assume that some post-processing on headers got broken. Anyway, I don't have much motivation to dig deeper here, but perhaps someone else will. --- .../gcc/9/avoid-cycling-subreg-reloads.patch | 261 ++++++++++++++++++ pkgs/development/compilers/gcc/9/default.nix | 21 +- 2 files changed, 278 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch diff --git a/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch b/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch new file mode 100644 index 0000000000000..17a4e0a2447b3 --- /dev/null +++ b/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch @@ -0,0 +1,261 @@ +From 6001db79c477b03eacc7e7049560921fb54b7845 Mon Sep 17 00:00:00 2001 +From: Richard Sandiford +Date: Mon, 7 Sep 2020 20:15:36 +0100 +Subject: [PATCH] lra: Avoid cycling on certain subreg reloads [PR96796] + +This PR is about LRA cycling for a reload of the form: + +---------------------------------------------------------------------------- +Changing pseudo 196 in operand 1 of insn 103 on equiv [r105:DI*0x8+r140:DI] + Creating newreg=287, assigning class ALL_REGS to slow/invalid mem r287 + Creating newreg=288, assigning class ALL_REGS to slow/invalid mem r288 + 103: r203:SI=r288:SI<<0x1+r196:DI#0 + REG_DEAD r196:DI + Inserting slow/invalid mem reload before: + 316: r287:DI=[r105:DI*0x8+r140:DI] + 317: r288:SI=r287:DI#0 +---------------------------------------------------------------------------- + +The problem is with r287. We rightly give it a broad starting class of +POINTER_AND_FP_REGS (reduced from ALL_REGS by preferred_reload_class). +However, we never make forward progress towards narrowing it down to +a specific choice of class (POINTER_REGS or FP_REGS). + +I think in practice we rely on two things to narrow a reload pseudo's +class down to a specific choice: + +(1) a restricted class is specified when the pseudo is created + + This happens for input address reloads, where the class is taken + from the target's chosen base register class. It also happens + for simple REG reloads, where the class is taken from the chosen + alternative's constraints. + +(2) uses of the reload pseudo as a direct input operand + + In this case get_reload_reg tries to reuse the existing register + and narrow its class, instead of creating a new reload pseudo. + +However, neither occurs here. As described above, r287 rightly +starts out with a wide choice of class, ultimately derived from +ALL_REGS, so we don't get (1). And as the comments in the PR +explain, r287 is never used as an input reload, only the subreg is, +so we don't get (2): + +---------------------------------------------------------------------------- + Choosing alt 13 in insn 317: (0) r (1) w {*movsi_aarch64} + Creating newreg=291, assigning class FP_REGS to r291 + 317: r288:SI=r291:SI + Inserting insn reload before: + 320: r291:SI=r287:DI#0 +---------------------------------------------------------------------------- + +IMO, in this case we should rely on the reload of r316 to narrow +down the class of r278. Currently we do: + +---------------------------------------------------------------------------- + Choosing alt 7 in insn 316: (0) r (1) m {*movdi_aarch64} + Creating newreg=289 from oldreg=287, assigning class GENERAL_REGS to r289 + 316: r289:DI=[r105:DI*0x8+r140:DI] + Inserting insn reload after: + 318: r287:DI=r289:DI +--------------------------------------------------- + +i.e. we create a new pseudo register r289 and give *that* pseudo +GENERAL_REGS instead. This is because get_reload_reg only narrows +down the existing class for OP_IN and OP_INOUT, not OP_OUT. + +But if we have a reload pseudo in a reload instruction and have chosen +a specific class for the reload pseudo, I think we should simply install +it for OP_OUT reloads too, if the class is a subset of the existing class. +We will need to pick such a register whatever happens (for r289 in the +example above). And as explained in the PR, doing this actually avoids +an unnecessary move via the FP registers too. + +The patch is quite aggressive in that it does this for all reload +pseudos in all reload instructions. I wondered about reusing the +condition for a reload move in in_class_p: + + INSN_UID (curr_insn) >= new_insn_uid_start + && curr_insn_set != NULL + && ((OBJECT_P (SET_SRC (curr_insn_set)) + && ! CONSTANT_P (SET_SRC (curr_insn_set))) + || (GET_CODE (SET_SRC (curr_insn_set)) == SUBREG + && OBJECT_P (SUBREG_REG (SET_SRC (curr_insn_set))) + && ! CONSTANT_P (SUBREG_REG (SET_SRC (curr_insn_set))))))) + +but I can't really justify that on first principles. I think we +should apply the rule consistently until we have a specific reason +for doing otherwise. + +gcc/ + PR rtl-optimization/96796 + * lra-constraints.c (in_class_p): Add a default-false + allow_all_reload_class_changes_p parameter. Do not treat + reload moves specially when the parameter is true. + (get_reload_reg): Try to narrow the class of an existing OP_OUT + reload if we're reloading a reload pseudo in a reload instruction. + +gcc/testsuite/ + PR rtl-optimization/96796 + * gcc.c-torture/compile/pr96796.c: New test. +--- + gcc/lra-constraints.c | 54 ++++++++++++++---- + gcc/testsuite/gcc.c-torture/compile/pr96796.c | 55 +++++++++++++++++++ + 2 files changed, 99 insertions(+), 10 deletions(-) + create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr96796.c + +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c +index 580da9c3ed6..161b721efb1 100644 +--- a/gcc/lra-constraints.c ++++ b/gcc/lra-constraints.c +@@ -236,12 +236,17 @@ get_reg_class (int regno) + CL. Use elimination first if REG is a hard register. If REG is a + reload pseudo created by this constraints pass, assume that it will + be allocated a hard register from its allocno class, but allow that +- class to be narrowed to CL if it is currently a superset of CL. ++ class to be narrowed to CL if it is currently a superset of CL and ++ if either: ++ ++ - ALLOW_ALL_RELOAD_CLASS_CHANGES_P is true or ++ - the instruction we're processing is not a reload move. + + If NEW_CLASS is nonnull, set *NEW_CLASS to the new allocno class of + REGNO (reg), or NO_REGS if no change in its class was needed. */ + static bool +-in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) ++in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class, ++ bool allow_all_reload_class_changes_p = false) + { + enum reg_class rclass, common_class; + machine_mode reg_mode; +@@ -266,7 +271,8 @@ in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) + typically moves that have many alternatives, and restricting + reload pseudos for one alternative may lead to situations + where other reload pseudos are no longer allocatable. */ +- || (INSN_UID (curr_insn) >= new_insn_uid_start ++ || (!allow_all_reload_class_changes_p ++ && INSN_UID (curr_insn) >= new_insn_uid_start + && curr_insn_set != NULL + && ((OBJECT_P (SET_SRC (curr_insn_set)) + && ! CONSTANT_P (SET_SRC (curr_insn_set))) +@@ -598,13 +604,12 @@ canonicalize_reload_addr (rtx addr) + return addr; + } + +-/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse already +- created input reload pseudo (only if TYPE is not OP_OUT). Don't +- reuse pseudo if IN_SUBREG_P is true and the reused pseudo should be +- wrapped up in SUBREG. The result pseudo is returned through +- RESULT_REG. Return TRUE if we created a new pseudo, FALSE if we +- reused the already created input reload pseudo. Use TITLE to +- describe new registers for debug purposes. */ ++/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse an existing ++ reload pseudo. Don't reuse an existing reload pseudo if IN_SUBREG_P ++ is true and the reused pseudo should be wrapped up in a SUBREG. ++ The result pseudo is returned through RESULT_REG. Return TRUE if we ++ created a new pseudo, FALSE if we reused an existing reload pseudo. ++ Use TITLE to describe new registers for debug purposes. */ + static bool + get_reload_reg (enum op_type type, machine_mode mode, rtx original, + enum reg_class rclass, bool in_subreg_p, +@@ -616,6 +621,35 @@ get_reload_reg (enum op_type type, machine_mode mode, rtx original, + + if (type == OP_OUT) + { ++ /* Output reload registers tend to start out with a conservative ++ choice of register class. Usually this is ALL_REGS, although ++ a target might narrow it (for performance reasons) through ++ targetm.preferred_reload_class. It's therefore quite common ++ for a reload instruction to require a more restrictive class ++ than the class that was originally assigned to the reload register. ++ ++ In these situations, it's more efficient to refine the choice ++ of register class rather than create a second reload register. ++ This also helps to avoid cycling for registers that are only ++ used by reload instructions. */ ++ if (REG_P (original) ++ && (int) REGNO (original) >= new_regno_start ++ && INSN_UID (curr_insn) >= new_insn_uid_start ++ && in_class_p (original, rclass, &new_class, true)) ++ { ++ unsigned int regno = REGNO (original); ++ if (lra_dump_file != NULL) ++ { ++ fprintf (lra_dump_file, " Reuse r%d for output ", regno); ++ dump_value_slim (lra_dump_file, original, 1); ++ } ++ if (new_class != lra_get_allocno_class (regno)) ++ lra_change_class (regno, new_class, ", change to", false); ++ if (lra_dump_file != NULL) ++ fprintf (lra_dump_file, "\n"); ++ *result_reg = original; ++ return false; ++ } + *result_reg + = lra_create_new_reg_with_unique_value (mode, original, rclass, title); + return true; +diff --git a/gcc/testsuite/gcc.c-torture/compile/pr96796.c b/gcc/testsuite/gcc.c-torture/compile/pr96796.c +new file mode 100644 +index 00000000000..8808e62fe77 +--- /dev/null ++++ b/gcc/testsuite/gcc.c-torture/compile/pr96796.c +@@ -0,0 +1,55 @@ ++/* { dg-additional-options "-fcommon" } */ ++ ++struct S0 { ++ signed f0 : 8; ++ unsigned f1; ++ unsigned f4; ++}; ++struct S1 { ++ long f3; ++ char f4; ++} g_3_4; ++ ++int g_5, func_1_l_32, func_50___trans_tmp_31; ++static struct S0 g_144, g_834, g_1255, g_1261; ++ ++int g_273[120] = {}; ++int *g_555; ++char **g_979; ++static int g_1092_0; ++static int g_1193; ++int safe_mul_func_int16_t_s_s(int si1, int si2) { return si1 * si2; } ++static struct S0 *func_50(); ++int func_1() { func_50(g_3_4, g_5, func_1_l_32, 8, 3); } ++void safe_div_func_int64_t_s_s(int *); ++void safe_mod_func_uint32_t_u_u(struct S0); ++struct S0 *func_50(int p_51, struct S0 p_52, struct S1 p_53, int p_54, ++ int p_55) { ++ int __trans_tmp_30; ++ char __trans_tmp_22; ++ short __trans_tmp_19; ++ long l_985_1; ++ long l_1191[8]; ++ safe_div_func_int64_t_s_s(g_273); ++ __builtin_printf((char*)g_1261.f4); ++ safe_mod_func_uint32_t_u_u(g_834); ++ g_144.f0 += 1; ++ for (;;) { ++ struct S1 l_1350 = {&l_1350}; ++ for (; p_53.f3; p_53.f3 -= 1) ++ for (; g_1193 <= 2; g_1193 += 1) { ++ __trans_tmp_19 = safe_mul_func_int16_t_s_s(l_1191[l_985_1 + p_53.f3], ++ p_55 % (**g_979 = 10)); ++ __trans_tmp_22 = g_1255.f1 * p_53.f4; ++ __trans_tmp_30 = __trans_tmp_19 + __trans_tmp_22; ++ if (__trans_tmp_30) ++ g_1261.f0 = p_51; ++ else { ++ g_1255.f0 = p_53.f3; ++ int *l_1422 = g_834.f0 = g_144.f4 != (*l_1422)++ > 0 < 0 ^ 51; ++ g_555 = ~0; ++ g_1092_0 |= func_50___trans_tmp_31; ++ } ++ } ++ } ++} +-- +2.18.4 + diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 6426f7434d5fe..ebdc55ee3f8f1 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -63,11 +63,22 @@ with lib; with builtins; let majorVersion = "9"; - version = "${majorVersion}.4.0"; + /* + If you update, please build on aarch64-linux + and check braces adjacent to `cplusplus` lines in file + ./result/lib/gcc/aarch64-unknown-linux-gnu/9.*.0/include/arm_acle.h + */ + version = "${majorVersion}.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = [] + patches = + # Fix ICE: Max. number of generated reload insns per insn is achieved (90) + # + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96796 + # + # This patch can most likely be removed by a post 9.3.0-release. + [ ./avoid-cycling-subreg-reloads.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch @@ -81,7 +92,9 @@ let majorVersion = "9"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + + ++ [ ../libsanitizer-no-cyclades-9.patch ]; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -98,7 +111,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "13l3p6g2krilaawbapmn9zmmrh3zdwc36mfr3msxfy038hps6pf9"; + sha256 = "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi"; }; inherit patches; From 3eaca311d4009413b43fea10759b64dd266cc819 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Mon, 20 Dec 2021 10:09:35 -0300 Subject: [PATCH 527/561] sage: import matplotlib and sphinx update patches --- pkgs/applications/science/math/sage/sage-src.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 1678567b77fbd..a48eeb6b4eadf 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -140,6 +140,22 @@ stdenv.mkDerivation rec { rev = "f5f7a86908daf60b25e66e6a189c51ada7e0a732"; sha256 = "sha256-H/caGx3q4KcdsyGe+ojV9bUTQ5y0siqM+QHgDbeEnbw="; }) + + # https://trac.sagemath.org/ticket/32909 + (fetchSageDiff { + base = "9.5.beta7"; + name = "matplotlib-3.5-deprecation-warnings.patch"; + rev = "a5127dc56fdf5c2e82f6bc781cfe78dbd04e97b7"; + sha256 = "sha256-p23qUu9mgEUbdbX6cy7ArxZAtpcFjCKbgyxN4jWvj1o="; + }) + + # https://trac.sagemath.org/ticket/32968 + (fetchSageDiff { + base = "9.5.beta8"; + name = "sphinx-4.3-update.patch"; + rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841"; + sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; From 88171cca9b3b9fa2b8bb5b1d47536fa84f04d175 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Dec 2021 11:48:22 -0500 Subject: [PATCH 528/561] qt5.qtbase: reinstate -Wno-error=unguarded-availability on darwin --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 44f08699824fb..ddcfc3323398b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -184,6 +184,10 @@ stdenv.mkDerivation { ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optional stdenv.isLinux "-DUSE_X11" + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ + # ignore "is only available on macOS 10.12.2 or newer" in obj-c code + "-Wno-error=unguarded-availability" + ] ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' From b28ccde5bede589761951f2253d4c621e8b7b148 Mon Sep 17 00:00:00 2001 From: Mauricio Collares <244239+collares@users.noreply.github.com> Date: Mon, 20 Dec 2021 14:17:20 -0300 Subject: [PATCH 529/561] python3Packages.matplotlib: 3.5.0 -> 3.5.1 (#151423) --- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 9f47eab639bbf..cc118d9f0ab08 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -17,7 +17,7 @@ let in buildPythonPackage rec { - version = "3.5.0"; + version = "3.5.1"; pname = "matplotlib"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "38892a254420d95594285077276162a5e9e9c30b6da08bdc2a4d53331ad9a6fa"; + sha256 = "b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c"; }; XDG_RUNTIME_DIR = "/tmp"; From 61865cfcda1529ac5ce4ec5b147e3b47f9f25cff Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Dec 2021 13:22:40 -0500 Subject: [PATCH 530/561] libbitcoin: use boost175 --- pkgs/top-level/all-packages.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b641b86915ae..0d82ed0e275c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24281,11 +24281,21 @@ with pkgs; jnetmap = callPackage ../applications/networking/jnetmap {}; - libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { }; - libbitcoin-protocol = callPackage ../tools/misc/libbitcoin/libbitcoin-protocol.nix { }; - libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { }; - libbitcoin-network = callPackage ../tools/misc/libbitcoin/libbitcoin-network.nix { }; - libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; + libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { + boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found + }; + libbitcoin-protocol = callPackage ../tools/misc/libbitcoin/libbitcoin-protocol.nix { + boost = boost175; + }; + libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { + boost = boost175; + }; + libbitcoin-network = callPackage ../tools/misc/libbitcoin/libbitcoin-network.nix { + boost = boost175; + }; + libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { + boost = boost175; + }; aumix = callPackage ../applications/audio/aumix { From 16b7b89fbebc880a4be18b9e48262dc125d09a9e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Dec 2021 14:01:26 -0500 Subject: [PATCH 531/561] cpp-netlib: use boost169 --- 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 0d82ed0e275c5..a4254a4638670 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16059,7 +16059,9 @@ with pkgs; cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; - cpp-netlib = callPackage ../development/libraries/cpp-netlib {}; + cpp-netlib = callPackage ../development/libraries/cpp-netlib { + boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found + }; ubus = callPackage ../development/libraries/ubus { }; From c1d88dd0e60e73062e3d44f6d706b986114f62a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 20 Dec 2021 20:34:37 +0000 Subject: [PATCH 532/561] python3Packages.pyperclip: run tests --- .../python-modules/pyperclip/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 7f91cc8aecceb..127301752d657 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, stdenv +, python +}: buildPythonPackage rec { version = "1.8.2"; @@ -9,11 +14,19 @@ buildPythonPackage rec { sha256 = "105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57"; }; - doCheck = false; + # No such file or directory: 'pbcopy' + doCheck = !stdenv.isDarwin; + + checkPhase = '' + ${python.interpreter} tests/test_pyperclip.py + ''; + + pythonImportsCheck = [ "pyperclip" ]; meta = with lib; { homepage = "https://github.com/asweigart/pyperclip"; license = licenses.bsd3; description = "Cross-platform clipboard module"; + maintainers = with maintainers; [ dotlambda ]; }; } From 2bcedb75d1de0eeaa1293fe434e9a7aabe4fad57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 20 Dec 2021 20:40:40 +0000 Subject: [PATCH 533/561] python3Packages.bpython: update dependencies --- .../clipboard-make-which-substitutable.patch | 27 ------------------- .../python-modules/bpython/default.nix | 22 +++++++++------ 2 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch diff --git a/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch b/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch deleted file mode 100644 index 685d34228a1b9..0000000000000 --- a/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6f544a5bd43446859754cb80e012af933b843db9 Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Wed, 3 Jun 2020 22:05:34 +0200 -Subject: [PATCH] clipboard: make which substitutable - -This is used to detect the presence of xclip and other clipboard -handling tools. ---- - bpython/clipboard.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bpython/clipboard.py b/bpython/clipboard.py -index aee429b..f346429 100644 ---- a/bpython/clipboard.py -+++ b/bpython/clipboard.py -@@ -58,7 +58,7 @@ class OSXClipboard(object): - - def command_exists(command): - process = subprocess.Popen( -- ["which", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE -+ ["@which@", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE - ) - process.communicate() - --- -2.26.2 - diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 0cedc7655ac05..3285f3dee9736 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -2,15 +2,18 @@ , buildPythonPackage , fetchPypi , curtsies +, cwcwidth , greenlet , jedi , pygments +, pytestCheckHook +, pyperclip , pyxdg , requests , substituteAll +, typing-extensions , urwid , watchdog -, which }: buildPythonPackage rec { @@ -22,18 +25,18 @@ buildPythonPackage rec { sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200"; }; - patches = [ (substituteAll { - src = ./clipboard-make-which-substitutable.patch; - which = "${which}/bin/which"; - })]; - propagatedBuildInputs = [ curtsies + cwcwidth greenlet + jedi pygments + pyperclip pyxdg requests + typing-extensions urwid + watchdog ]; postInstall = '' @@ -41,13 +44,16 @@ buildPythonPackage rec { --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" ''; - checkInputs = [ jedi watchdog ]; + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "bpython" ]; meta = with lib; { description = "A fancy curses interface to the Python interactive interpreter"; homepage = "https://bpython-interpreter.org/"; license = licenses.mit; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli dotlambda ]; }; } From 0810294d6f27c0711695b13e3f9db5e63f092e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Dec 2021 16:40:35 +0000 Subject: [PATCH 534/561] gplates: use boost175 (#151505) GPlates currently doesn't work with Boost 1.77: https://discourse.gplates.org/t/compilation-error-with-boost-1-77/452 --- 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 fb35cd16f10f8..dc7f6ecd18150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32219,7 +32219,9 @@ with pkgs; gildas = callPackage ../applications/science/astronomy/gildas { }; - gplates = libsForQt5.callPackage ../applications/science/misc/gplates { }; + gplates = libsForQt5.callPackage ../applications/science/misc/gplates { + boost = boost175; + }; gravit = callPackage ../applications/science/astronomy/gravit { }; From fad107ba43fc7b601033e0d37b3ac64a0fb8bbb3 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 21 Dec 2021 16:41:26 +0000 Subject: [PATCH 535/561] bombono: fix build after boost upgrade (#151574) context: https://github.com/NixOS/nixpkgs/issues/151469 --- pkgs/applications/video/bombono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index a6633904c2013..e39d09b6fe720 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -3,7 +3,7 @@ , pkg-config , fetchpatch , scons -, boost +, boost172 , dvdauthor , dvdplusrwtools , enca @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ]; buildInputs = [ - boost + boost172 dvdauthor dvdplusrwtools enca From 65c986fbfab1de2c0f9bc79667f77941d82461a1 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Tue, 21 Dec 2021 17:43:24 +0100 Subject: [PATCH 536/561] mozart2: pin boost to most recent supported version (#151576) --- pkgs/development/compilers/mozart/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index d9ab475880e0b..4c066de860a53 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -4,7 +4,8 @@ , cmake , unzip , makeWrapper -, boost +, boost169 +, pinnedBoost ? boost169 , llvmPackages , llvmPackages_5 , gmp @@ -67,7 +68,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - boost + pinnedBoost llvmPackages_5.llvm llvmPackages_5.clang llvmPackages_5.clang-unwrapped From 0649635b59dda810a1ba705ce72f305a42233414 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 21 Dec 2021 13:20:47 -0500 Subject: [PATCH 537/561] exiv2: fix for darwin sandbox --- pkgs/development/libraries/exiv2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index e532898f80e22..5ef3bfa2ac408 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -79,6 +79,10 @@ stdenv.mkDerivation rec { rm -f ../tests/bugfixes/redmine/test_issue_460.py rm -f ../tests/bugfixes/redmine/test_issue_662.py rm -f ../tests/bugfixes/github/test_issue_1046.py + + # disable tests that requires loopback networking + substituteInPlace ../tests/bash_tests/testcases.py \ + --replace "def io_test(self):" "def io_disabled(self):" ''} ''; From c90ff89e57e38175e64de11c044e623860a9966b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 21 Dec 2021 14:52:44 -0500 Subject: [PATCH 538/561] python3Packages.aiofiles: fix for darwin sandbox --- pkgs/development/python-modules/aiofiles/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 033ba87933a7e..592f8facaebbf 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -33,6 +33,12 @@ buildPythonPackage rec { disabledTests = lib.optionals stdenv.isDarwin [ "test_sendfile_file" + + # require loopback networking: + "test_sendfile_socket" + "test_serve_small_bin_file_sync" + "test_serve_small_bin_file" + "test_slow_file" ]; pythonImportsCheck = [ From a4f010b0b2c8e6aa9fab3a10b574172c31b72220 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 21 Dec 2021 14:56:49 -0500 Subject: [PATCH 539/561] mirtk: pin boost (#151596) Cmake configuration fails against boost 1.77 now in staging-next. --- 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 9afca714744e1..141d924fd2553 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31467,7 +31467,9 @@ with pkgs; minia = callPackage ../applications/science/biology/minia { }; - mirtk = callPackage ../development/libraries/science/biology/mirtk { }; + mirtk = callPackage ../development/libraries/science/biology/mirtk { + boost = boost16x; + }; muscle = callPackage ../applications/science/biology/muscle { }; From 1b0014970d8f345195401076cb733e2553139b63 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 21 Dec 2021 21:09:44 +0200 Subject: [PATCH 540/561] gnuradio3_8: Fix build with boost177 Fails to compile otherwise, see: #151469 --- pkgs/applications/radio/gnuradio/3.8.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 0e5b7701e9871..a6d4099c8639e 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -248,6 +248,11 @@ stdenv.mkDerivation rec { url = "https://github.com/gnuradio/gnuradio/commit/9d7343526dd793120b6425cd9a6969416ed32503.patch"; sha256 = "sha256-usSoRDDuClUfdX4yFbQNu8wDzve6UEhZYTFj1oZbFic="; }) + # Fix compilation with boost 177 + (fetchpatch { + url = "https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec.patch"; + sha256 = "sha256-l4dSzkXb5s3vcCeuKMMwiKfv83hFI9Yg+EMEX+sl+Uo="; + }) ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must From 17e31128d3820b4664982f8e06191046559bc6b1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 21 Dec 2021 15:24:32 -0500 Subject: [PATCH 541/561] python3Packages.apsw: fix darwin build --- pkgs/development/python-modules/apsw/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index a2e35265d4483..034e3e0df256d 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , sqlite @@ -39,6 +40,11 @@ buildPythonPackage rec { "testVFS" "testVFSWithWAL" "testdb" + ] ++ lib.optionals stdenv.isDarwin [ + # This is https://github.com/rogerbinns/apsw/issues/277 but + # because we use pytestCheckHook we need to blacklist the test + # manually + "testzzForkChecker" ]; pythonImportsCheck = [ From 9c5a157ef6913810ff372080d44143d5fe517f3c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 22 Dec 2021 00:09:29 +0000 Subject: [PATCH 542/561] vala-lint: fix build on vala-0.54 Without the change the build fails as: ../lib/Utils.vala:103.21-103.27: error: too many type arguments for `bool' public delegate bool FilterFunction (G element); ^^^^^^^ --- pkgs/development/tools/vala-lint/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index e91bceeae7a3f..bc0d24f4b5941 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , glib , meson , ninja @@ -22,6 +23,16 @@ stdenv.mkDerivation rec { sha256 = "KwJ5sCp9ZrrxIqc6qi2+ZdHBt1esNOO1+uDkS+d9mW8="; }; + patches = [ + # Fix build against vala-0.54+. Pull fix pending upstream + # inclusion: https://github.com/vala-lang/vala-lint/pull/155 + (fetchpatch { + name = "vala-0.54.patch"; + url = "https://github.com/vala-lang/vala-lint/commit/739f9a0b7d3e92db41eb32f2bfa527efdacc223b.patch"; + sha256 = "sha256-1IbQu3AQXRCrrjoMZKhEOqzExmPAo1SQOFHa/IrqnNA="; + }) + ]; + nativeBuildInputs = [ gettext meson From 93f9a9c36de62ff9a6a236791a420a5a50889cb9 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 21 Dec 2021 17:02:36 -0300 Subject: [PATCH 543/561] sage: assume fonttools DeprecationWarnings are expected for now --- .../fonttools-deprecation-warnings.patch | 39 +++++++++++++++++++ .../science/math/sage/sage-src.nix | 8 ++++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch diff --git a/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch b/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch new file mode 100644 index 0000000000000..93c03a04ddb16 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch @@ -0,0 +1,39 @@ +diff --git a/src/doc/en/prep/Advanced-2DPlotting.rst b/src/doc/en/prep/Advanced-2DPlotting.rst +index 337457afef..f7c76f4b56 100644 +--- a/src/doc/en/prep/Advanced-2DPlotting.rst ++++ b/src/doc/en/prep/Advanced-2DPlotting.rst +@@ -695,6 +695,8 @@ by the cells. + + sage: pdf_savename = name+'.pdf' + sage: p.save(pdf_savename) ++ ... ++ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. + + Notably, we can export in formats ready for inclusion in web pages. + +diff --git a/src/sage/plot/disk.py b/src/sage/plot/disk.py +index 8680a1c9b1..e83763b678 100644 +--- a/src/sage/plot/disk.py ++++ b/src/sage/plot/disk.py +@@ -156,6 +156,8 @@ class Disk(GraphicPrimitive): + sage: f = tmp_filename(ext='.pdf') + sage: p = disk((0,0), 5, (0, pi/4), alpha=0.5) + sage: p.save(f) ++ ... ++ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. + + """ + import matplotlib.patches as patches +diff --git a/src/sage/plot/text.py b/src/sage/plot/text.py +index 04cbdedf76..a970f97b79 100644 +--- a/src/sage/plot/text.py ++++ b/src/sage/plot/text.py +@@ -325,6 +325,8 @@ def text(string, xy, **options): + You can save text as part of PDF output:: + + sage: text("sage", (0,0), rgbcolor=(0,0,0)).save(os.path.join(SAGE_TMP, 'a.pdf')) ++ ... ++ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. + + Some examples of bounding box:: + diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index a48eeb6b4eadf..eb07434b4cc03 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -109,6 +109,14 @@ stdenv.mkDerivation rec { # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch + # fonttools 4.26.2, used by matplotlib, uses deprecated methods internally. + # This is fixed in fonttools 4.27.0, but since fonttools is a dependency of + # 2000+ packages and DeprecationWarnings are hidden almost everywhere by + # default (not on Sage's doctest harness, though), it doesn't make sense to + # backport the fix (see https://github.com/NixOS/nixpkgs/pull/151415). + # Let's just assume warnings are expected until we update to 4.27.0. + ./patches/fonttools-deprecation-warnings.patch + # https://trac.sagemath.org/ticket/32305 (fetchSageDiff { base = "9.4"; From 2b50067a1ed7b482c1aaeb166233c6ac90c3f018 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 21 Dec 2021 17:56:43 -0800 Subject: [PATCH 544/561] python3Packages.grpcio-status: 1.42.0 -> 1.43.0 - Don't inherit version from grpc - Avoid version, FOD mismatch --- pkgs/development/python-modules/grpcio-status/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index cb36e4387ef33..b20426c0288fa 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , googleapis-common-protos -, grpc , grpcio , protobuf , pythonOlder @@ -10,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - inherit (grpc) version; + version = "1.43.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "JVM8TWXX1ROmOPDEuIsrZnAOO/Q+aZWlWjvRXsC3eQI="; + sha256 = "sha256-IXWQBvNqf/v/GH1BkfQRjActiqn6aCOhGq14QqPGzNA="; }; propagatedBuildInputs = [ From de9249f9dac6a824793b5dd8d19c46c5e53f2422 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 21 Dec 2021 17:59:19 -0800 Subject: [PATCH 545/561] grpc: add comment about updating python3Packages.grpcio-status - Add python packages as tests --- pkgs/development/libraries/grpc/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index dab210d6b1e12..28c47640ca6a9 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -13,11 +13,16 @@ , grpc , abseil-cpp , libnsl + +# tests +, python3 }: stdenv.mkDerivation rec { pname = "grpc"; - version = "1.43.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.43.0"; # N.B: if you change this, please update: + # pythonPackages.grpcio-tools + # pythonPackages.grpcio-status src = fetchFromGitHub { owner = "grpc"; @@ -86,6 +91,10 @@ stdenv.mkDerivation rec { enableParallelBuilds = true; + passthru.tests = { + inherit (python3.pkgs) grpcio-status grpcio-tools; + }; + meta = with lib; { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; From 74962f7f2e02f2496ec877e92f81c4dae9808807 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 21 Dec 2021 20:37:47 +0100 Subject: [PATCH 546/561] freecad: use boost169 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9afca714744e1..32dc5a03afba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25558,9 +25558,9 @@ with pkgs; fragments = callPackage ../applications/networking/p2p/fragments { }; freecad = libsForQt5.callPackage ../applications/graphics/freecad { + boost = python3Packages.boost169; inherit (python3Packages) GitPython - boost matplotlib pivy ply diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 912142ae5f1b7..5e0c900ac0976 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1267,6 +1267,11 @@ in { enablePython = true; }); + boost169 = toPythonModule (pkgs.boost169.override { + inherit (self) python numpy; + enablePython = true; + }); + boschshcpy = callPackage ../development/python-modules/boschshcpy { }; boost-histogram = callPackage ../development/python-modules/boost-histogram { From a5159c5d297894aad9a560acd6ce494a8c9c406c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Dec 2021 19:04:14 +0000 Subject: [PATCH 547/561] python3Packages.graph-tool: 2.32 -> 2.43 (#151638) --- pkgs/development/python-modules/graph-tool/2.x.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index bcf1664b690e9..c8725dfd1167b 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "graph-tool"; format = "other"; - version = "2.32"; + version = "2.43"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "0jir6fhi09lf8xf56dcsdk2knx32vq8wrzh0d0zdp22n7baavq70"; + hash = "sha256-XxvuCUIgz7JIaNsPr0f44v/Sb3fdcJmVhC5NnomNqGw="; }; configureFlags = [ From 775f5098c7b17806aad449d30307c273d67fe127 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Dec 2021 00:07:22 -0500 Subject: [PATCH 548/561] packer,cdk-go,gotop: mark as broken on darwin due to using an outdated gopsutil --- pkgs/development/tools/packer/default.nix | 8 +++++++- pkgs/tools/security/cdk-go/default.nix | 2 ++ pkgs/tools/system/gotop/default.nix | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index aea34c5d57c15..6c7fdda336bc6 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,4 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "packer"; @@ -30,5 +35,6 @@ buildGoModule rec { maintainers = with maintainers; [ cstrahan zimbatm ma27 ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; platforms = platforms.unix; + broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 }; } diff --git a/pkgs/tools/security/cdk-go/default.nix b/pkgs/tools/security/cdk-go/default.nix index 465b987ec74fc..14f7e05140e0c 100644 --- a/pkgs/tools/security/cdk-go/default.nix +++ b/pkgs/tools/security/cdk-go/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub }: @@ -25,5 +26,6 @@ buildGoModule rec { license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; mainProgram = "cdk"; + broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 }; } diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index dffbaaa818327..27b24b869cf29 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -28,5 +28,6 @@ buildGoModule rec { changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; + broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 }; } From 32fdd7a9fd6b9d7a4d6a67d749d1235ef4a184b7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Dec 2021 00:14:26 -0500 Subject: [PATCH 549/561] gd: add --enable-gd-formats fixes "GD Warning: GD2 image support has been disabled" for example in perl5Packages.GD --- pkgs/development/libraries/gd/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 983ec33cdbdf9..cd971b291b980 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -32,8 +32,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - # -pthread gets passed to clang, causing warnings - configureFlags = lib.optional stdenv.isDarwin "--enable-werror=no"; + configureFlags = + [ + "--enable-gd-formats" + ] + # -pthread gets passed to clang, causing warnings + ++ lib.optional stdenv.isDarwin "--enable-werror=no"; nativeBuildInputs = [ autoconf automake pkg-config ]; From af46b3113043fad06d6dd8552b30d9dfd44f092e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Dec 2021 00:21:18 -0500 Subject: [PATCH 550/561] python3Packages.python-sat: 0.1.6.dev6 -> 0.1.7.dev1 --- pkgs/development/python-modules/python-sat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index ea3d1bfb444a8..e75920345ec40 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-sat"; - version = "0.1.6.dev6"; + version = "0.1.7.dev1"; src = fetchFromGitHub { owner = "pysathq"; repo = "pysat"; rev = version; - sha256 = "1gckxhqkvzyw7pmwg8xzxq146jysqy0s23l5mjc3awm6swdij66y"; + sha256 = "sha256-zGdgD+SgoMB7/zDQI/trmV70l91TB7OkDxaJ30W3dkI="; }; propagatedBuildInputs = [ six pypblib ]; From 71088b0b108e445cb5f294027d2a1228a70f67ac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Dec 2021 00:42:22 -0500 Subject: [PATCH 551/561] python3Packages.python-sat: fix on darwin --- .../python-modules/python-sat/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index e75920345ec40..43b5e635294b7 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -15,6 +15,19 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + # https://github.com/pysathq/pysat/pull/102 + postPatch = '' + # Fix for case-insensitive filesystem + cat >>solvers/patches/cadical.patch < Date: Thu, 23 Dec 2021 00:57:12 -0500 Subject: [PATCH 552/561] python3Packages.sqlite-utils: fix build --- .../python-modules/sqlite-utils/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index ec18a1ee76d0f..ee1181e9c93c6 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pythonOlder , click , click-default-group @@ -21,6 +22,15 @@ buildPythonPackage rec { sha256 = "509099fce5f25faada6e76b6fb90e8ef5ba0f1715177933a816718be0c8e7244"; }; + patches = [ + # https://github.com/simonw/sqlite-utils/pull/347 + (fetchpatch { + name = "sqlite-utils-better-test_rebuild_fts.patch"; + url = "https://github.com/simonw/sqlite-utils/pull/347/commits/1a7ef2fe2064ace01d5535fb771f941296fb642a.diff"; + sha256 = "sha256-WKCQGMqr8WYjG7cmAH5pYBhgikowbt3r6hObwtMDDUY="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" From 03572bd8d94947dcb60c789b36df37fe474251be Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 22 Dec 2021 17:13:49 +0200 Subject: [PATCH 553/561] uhd: 4.0.0.0 -> 4.1.0.5 Update and remove some input arguments due to changes in cmake variables upstream. Add @doronbehar as maintainer. --- pkgs/applications/radio/uhd/default.nix | 29 ++++++++++--------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 9f2f39aab2c5d..6ebd15a27c96d 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -6,14 +6,13 @@ , pkg-config # See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations , boost -, enableLibuhd_C_api ? true +, enableCApi ? true # requires numpy -, enableLibuhd_Python_api ? false +, enablePythonApi ? false , python3 , enableExamples ? false , enableUtils ? false -, enableLiberio ? false -, liberio +, enableSim ? false , libusb1 , enableDpdk ? false , dpdk @@ -25,7 +24,6 @@ , enableUsrp1 ? true , enableUsrp2 ? true , enableX300 ? true -, enableN230 ? true , enableN300 ? true , enableN320 ? true , enableE300 ? true @@ -41,18 +39,18 @@ stdenv.mkDerivation rec { pname = "uhd"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "4.0.0.0"; + version = "4.1.0.5"; src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; rev = "v${version}"; - sha256 = "NCyiI4pIPw0nBRFdUGpgZ/x2mWz+Qm78ZGACUnSbGSs="; + sha256 = "sha256-XBq4GkLRR2SFunFRvpPOMiIbTuUkMYf8tPAoHCoveRA="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; - sha256 = "Xfx0bsHUQ5+Dp+xk0sVWWP83oyXQcUH5AX4PNEE7fY4="; + sha256 = "HctHB90ikOMkrYNyWmjGE/2HvA7xXKCUezdtiqzN+1A="; }; cmakeFlags = [ @@ -61,9 +59,8 @@ stdenv.mkDerivation rec { "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases "-DENABLE_EXAMPLES=${onOffBool enableExamples}" "-DENABLE_UTILS=${onOffBool enableUtils}" - "-DENABLE_LIBUHD_C_API=${onOffBool enableLibuhd_C_api}" - "-DENABLE_LIBUHD_PYTHON_API=${onOffBool enableLibuhd_Python_api}" - "-DENABLE_LIBERIO=${onOffBool enableLiberio}" + "-DENABLE_C_API=${onOffBool enableCApi}" + "-DENABLE_PYTHON_API=${onOffBool enablePythonApi}" "-DENABLE_DPDK=${onOffBool enableDpdk}" # Devices "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}" @@ -73,7 +70,6 @@ stdenv.mkDerivation rec { "-DENABLE_USRP1=${onOffBool enableUsrp1}" "-DENABLE_USRP2=${onOffBool enableUsrp2}" "-DENABLE_X300=${onOffBool enableX300}" - "-DENABLE_N230=${onOffBool enableN230}" "-DENABLE_N300=${onOffBool enableN300}" "-DENABLE_N320=${onOffBool enableN320}" "-DENABLE_E300=${onOffBool enableE300}" @@ -87,7 +83,7 @@ stdenv.mkDerivation rec { # Python + Mako are always required for the build itself but not necessary for runtime. pythonEnv = python3.withPackages (ps: with ps; [ Mako ] - ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] + ++ optionals (enablePythonApi) [ numpy setuptools ] ++ optionals (enableUtils) [ requests six ] ); @@ -98,7 +94,7 @@ stdenv.mkDerivation rec { # If both enableLibuhd_Python_api and enableUtils are off, we don't need # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime # dependency - ++ optionals (!enableLibuhd_Python_api && !enableUtils) [ pythonEnv ] + ++ optionals (!enablePythonApi && !enableUtils) [ pythonEnv ] ; buildInputs = [ boost @@ -107,8 +103,7 @@ stdenv.mkDerivation rec { # However, if enableLibuhd_Python_api *or* enableUtils is on, we need # pythonEnv for runtime as well. The utilities' runtime dependencies are # handled at the environment - ++ optionals (enableLibuhd_Python_api || enableUtils) [ pythonEnv ] - ++ optionals (enableLiberio) [ liberio ] + ++ optionals (enablePythonApi || enableUtils) [ pythonEnv ] ++ optionals (enableDpdk) [ dpdk ] ; @@ -154,6 +149,6 @@ stdenv.mkDerivation rec { homepage = "https://uhd.ettus.com/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor fpletz tomberek ]; + maintainers = with maintainers; [ bjornfor fpletz tomberek doronbehar ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a25b0ffc1228..3d71ad8bffca4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15546,9 +15546,7 @@ with pkgs; uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { }; - uhd = callPackage ../applications/radio/uhd { - boost = boost175; - }; + uhd = callPackage ../applications/radio/uhd { }; uisp = callPackage ../development/embedded/uisp { }; From 44ee31f6c64130b2a4cd918b9b9c0c6ba694cef9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 23 Dec 2021 11:28:32 +0200 Subject: [PATCH 554/561] uhd: Disable tests on darwin --- pkgs/applications/radio/uhd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 6ebd15a27c96d..2928b19f29df2 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -107,7 +107,8 @@ stdenv.mkDerivation rec { ++ optionals (enableDpdk) [ dpdk ] ; - doCheck = true; + # many tests fails on darwin, according to ofborg + doCheck = !stdenv.isDarwin; # Build only the host software preConfigure = "cd host"; From a14356187f00be3c934a21543bed82d3beb8d640 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Dec 2021 16:35:36 -0500 Subject: [PATCH 555/561] netcdffortran: fix build on darwin --- pkgs/development/libraries/netcdf-fortran/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index fc13fbe85bfda..40f22b0cabe50 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran }: +{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation }: stdenv.mkDerivation rec { pname = "netcdf-fortran"; version = "4.4.5"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ gfortran ]; - buildInputs = [ netcdf hdf5 curl ]; + buildInputs = [ netcdf hdf5 curl ] + ++ lib.optional stdenv.isDarwin CoreFoundation; doCheck = true; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3be7e01984a20..0f84f9c7690e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7948,7 +7948,9 @@ with pkgs; netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; - netcdffortran = callPackage ../development/libraries/netcdf-fortran { }; + netcdffortran = callPackage ../development/libraries/netcdf-fortran { + inherit (darwin.apple_sdk.frameworks) CoreFoundation; + }; networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { }; From 2d571be5e4cedd247d3c469ce4d81c28c83e9e54 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Dec 2021 16:52:21 -0500 Subject: [PATCH 556/561] rdmidi: fix build on darwin --- pkgs/development/libraries/audio/rtmidi/default.nix | 3 +++ .../rtmidi/macos_include_targetconditionals.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 6c75b9866e897..2ba981ae46edd 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -42,6 +42,9 @@ stdenv.mkDerivation rec { url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch"; sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj"; }) + + # https://github.com/thestk/rtmidi/pull/277 + ./macos_include_targetconditionals.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch b/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch new file mode 100644 index 0000000000000..58eaf5f490b1a --- /dev/null +++ b/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch @@ -0,0 +1,13 @@ +diff -ru a/RtMidi.cpp b/RtMidi.cpp +--- a/RtMidi.cpp 2021-12-23 16:46:33.000000000 -0500 ++++ b/RtMidi.cpp 2021-12-23 16:48:19.000000000 -0500 +@@ -39,6 +39,9 @@ + + #include "RtMidi.h" + #include ++#if defined(__APPLE__) ++#include ++#endif + + #if defined(__MACOSX_CORE__) + #if TARGET_OS_IPHONE From a38c345989a936ffaa66fe80235719af4f04e246 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Dec 2021 16:59:27 -0500 Subject: [PATCH 557/561] cryfs: fix eval --- 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 ebb8f8b3778ab..6c81786c90268 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5074,9 +5074,7 @@ with pkgs; ericw-tools = callPackage ../applications/misc/ericw-tools { }; - cryfs = callPackage ../tools/filesystems/cryfs { - boost = boost175; - }; + cryfs = callPackage ../tools/filesystems/cryfs { }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; From 6b0a11382588ebdf52f9b6a8524865014ea2c005 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 25 Dec 2021 04:03:33 +0100 Subject: [PATCH 558/561] ethminer: use boost16x (#151989) Upstream uses 1.66 --- pkgs/tools/misc/ethminer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index e159622bc8e10..ce68e9f82098f 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -5,7 +5,7 @@ opencl-headers, cmake, jsoncpp, - boost, + boost16x, makeWrapper, cudatoolkit, cudaSupport, @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ cli11 - boost + boost16x # 1.7x support is broken, see https://github.com/ethereum-mining/ethminer/issues/2393 opencl-headers mesa ethash From 34ae1959b7c0a8d64556a4a6de87210b7d6d9e96 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 24 Dec 2021 22:36:36 -0500 Subject: [PATCH 559/561] goofys: mark as broken on darwin --- pkgs/tools/filesystems/goofys/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix index 94ce7be08e556..f82ebece73139 100644 --- a/pkgs/tools/filesystems/goofys/default.nix +++ b/pkgs/tools/filesystems/goofys/default.nix @@ -29,6 +29,7 @@ buildGoModule { description = "A high-performance, POSIX-ish Amazon S3 file system written in Go."; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.adisbladis ]; + broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 }; } From b912e423137a075b1275460e6cb33a4e95f19569 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 25 Dec 2021 01:04:48 -0500 Subject: [PATCH 560/561] goofys: add stdenv arg --- pkgs/tools/filesystems/goofys/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix index f82ebece73139..16c555473f3c7 100644 --- a/pkgs/tools/filesystems/goofys/default.nix +++ b/pkgs/tools/filesystems/goofys/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub }: From 597743cf9c62c21ec55a6d2ad64cdf062f117aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 25 Dec 2021 10:40:18 +0100 Subject: [PATCH 561/561] ycmd: use boost174 PR #138309 switched the default to 177 and that broke the build. /cc #151469. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8913afd7e019..5573d06072810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15670,6 +15670,7 @@ with pkgs; ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; python = python3; + boost = boost174; }; yodl = callPackage ../development/tools/misc/yodl { };