From ee9eec33539e1e2961334374b5ae1f7560ea871b Mon Sep 17 00:00:00 2001 From: Timothy Date: Fri, 1 Oct 2021 12:02:04 +0700 Subject: [PATCH 001/737] adoptopenjdk: add 17.0.1 --- .../adoptopenjdk-bin/generate-sources.py | 2 +- .../adoptopenjdk-bin/jdk17-darwin.nix | 8 +++ .../adoptopenjdk-bin/jdk17-linux.nix | 8 +++ .../compilers/adoptopenjdk-bin/sources.json | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +++ 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 967612619a73..6c60fc5c490d 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16") +releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17") oses = ("mac", "linux") types = ("jre", "jdk") impls = ("hotspot", "openj9") diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix new file mode 100644 index 000000000000..7f211ac1f1e1 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix @@ -0,0 +1,8 @@ +{ lib }: + +let + sources = lib.importJSON ./sources.json; +in +{ + jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix new file mode 100644 index 000000000000..f1bd072bc929 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix @@ -0,0 +1,8 @@ +{ lib }: + +let + sources = lib.importJSON ./sources.json; +in +{ + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jdk.hotspot; }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 80b3d1709cde..3b93a26c158d 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -793,6 +793,60 @@ } } }, + "openjdk17": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "12", + "sha256": "f23d482b2b4ada08166201d1a0e299e3e371fdca5cd7288dcbd81ae82f3a75e3", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz", + "version": "17.0.1" + }, + "armv6l": { + "build": "12", + "sha256": "f5945a39929384235e7cb1c57df071b8c7e49274632e2a54e54b2bad05de21a5", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz", + "version": "17.0.1" + }, + "armv7l": { + "build": "12", + "sha256": "f5945a39929384235e7cb1c57df071b8c7e49274632e2a54e54b2bad05de21a5", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz", + "version": "17.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "6ea18c276dcbb8522feeebcfc3a4b5cb7c7e7368ba8590d3326c6c3efc5448b6", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz", + "version": "17.0.1" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "12", + "sha256": "02073590da24421e119ddebe6b061bf132fa68694c60706f092d32d963822554", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.1_12.tar.gz", + "version": "17.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "98a759944a256dbdd4d1113459c7638501f4599a73d06549ac309e1982e2fa70", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz", + "version": "17.0.1" + } + } + } + } + }, "openjdk8": { "linux": { "jdk": { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 432f56dd83c8..6bccca1c9ba5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12388,6 +12388,13 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit lib; }; + adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; + + adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-17-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-17-packages-darwin.jdk-hotspot {}; + adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; }; adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; }; From 6aa7258b1cbf2aaa61af9b6b0b469cb1772f67f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 18:44:56 +0000 Subject: [PATCH 002/737] kbd: 2.4.0 -> 2.5.1 --- pkgs/os-specific/linux/kbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 4d08a38dbe85..c58a1b8db07e 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "kbd"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "17wvrqz2kk0w87idinhyvd31ih1dp7ldfl2yfx7ailygb0279w2m"; + sha256 = "sha256-zN9FI4emOAlz0pJzY+nLuTn6IGiRWm+Tf/nSRSICRoM="; }; configureFlags = [ From b4c4869942dc2513701e7ec124343ba106f28e67 Mon Sep 17 00:00:00 2001 From: betaboon Date: Sun, 7 Aug 2022 13:55:40 +0200 Subject: [PATCH 003/737] python310Packages.requests-wsgi-adapter: init at 0.4.1 --- .../requests-wsgi-adapter/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/requests-wsgi-adapter/default.nix diff --git a/pkgs/development/python-modules/requests-wsgi-adapter/default.nix b/pkgs/development/python-modules/requests-wsgi-adapter/default.nix new file mode 100644 index 000000000000..77386c21a869 --- /dev/null +++ b/pkgs/development/python-modules/requests-wsgi-adapter/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "requests-wsgi-adapter"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WncJ6Qq/SdGB9sMqo3eUU39yXeD23UI2K8jIyQgSyHg="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # tests are not contained in pypi-release + doCheck = false; + + meta = with lib; { + description = "WSGI Transport Adapter for Requests"; + homepage = "https://github.com/seanbrant/requests-wsgi-adapter"; + license = licenses.bsd3; + maintainers = with maintainers; [ betaboon ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 641cde900b0e..cc134cdee47b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9380,6 +9380,8 @@ in { requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; + requests-wsgi-adapter = callPackage ../development/python-modules/requests-wsgi-adapter { }; + requirements-detector = callPackage ../development/python-modules/requirements-detector { }; requirements-parser = callPackage ../development/python-modules/requirements-parser { }; From 355a150e8aa39c40861825fcc55452ac7d92eae1 Mon Sep 17 00:00:00 2001 From: betaboon Date: Tue, 26 Jul 2022 16:50:34 +0200 Subject: [PATCH 004/737] python310Packages.unearth: init at 0.6.1 --- .../python-modules/unearth/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/unearth/default.nix diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix new file mode 100644 index 000000000000..c12074136930 --- /dev/null +++ b/pkgs/development/python-modules/unearth/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +, cached-property +, packaging +, pdm-pep517 +, requests + +, flask +, pytest-httpserver +, pytestCheckHook +, requests-wsgi-adapter +, trustme +}: + +buildPythonPackage rec { + pname = "unearth"; + version = "0.6.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-S3v719NKEWc9gN+uf6u/khwTmqx4OD+wyhapDTtTpm4="; + }; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + packaging + requests + ] ++ lib.optionals (pythonOlder "3.8") [ + cached-property + ]; + + checkInputs = [ + flask + pytest-httpserver + pytestCheckHook + requests-wsgi-adapter + trustme + ]; + + meta = with lib; { + homepage = "https://github.com/frostming/unearth"; + description = "A utility to fetch and download python packages"; + license = licenses.mit; + maintainers = with maintainers; [ betaboon ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc134cdee47b..a4de5ddffa5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11100,6 +11100,8 @@ in { uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; + unearth = callPackage ../development/python-modules/unearth { }; + unicodecsv = callPackage ../development/python-modules/unicodecsv { }; unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; From d5fdcb7e777b1dd2d219f2e232f6073736da983d Mon Sep 17 00:00:00 2001 From: betaboon Date: Sun, 7 Aug 2022 13:56:45 +0200 Subject: [PATCH 005/737] python310Packages.pdm-pep517: 1.0.2 -> 1.0.4 --- pkgs/development/python-modules/pdm-pep517/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 9cfe5a5e9244..4c05afe0fbd2 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "1.0.2"; + version = "1.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nVoqpYlvNzN1UJeUXsKnUc0Z7jOZMG4JlRQBSx5JrfE="; + sha256 = "sha256-OS+MK0fG7CBVDLjhniS529Jzc0E/BntW7Ndfl2f5MBU="; }; preCheck = '' From 1f6366d38cdd8b858b903ebcad9166cd48196f40 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 19 Aug 2022 00:08:11 -0700 Subject: [PATCH 006/737] cc-wrapper: fortran: enable stackprotector on M1 Was failing due to https://github.com/iains/gcc-darwin-arm64/issues/54, fix picked up in https://github.com/NixOS/nixpkgs/pull/186477. --- pkgs/build-support/cc-wrapper/default.nix | 9 +-------- pkgs/build-support/cc-wrapper/fortran-hook.sh | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b9dc9fc9a723..797a735f5a6e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -251,19 +251,12 @@ stdenv.mkDerivation { wrap ${targetPrefix}gdc $wrapper $ccPath/${targetPrefix}gdc '' - + optionalString cc.langFortran or false ('' + + optionalString cc.langFortran or false '' wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77 export named_fc=${targetPrefix}gfortran '' - # Darwin aarch64 fortran compilations seem to fail otherwise, see: - # https://github.com/NixOS/nixpkgs/issues/140041 - + (if (stdenvNoCC.isDarwin && stdenvNoCC.isAarch64) then '' - export fortran_hardening="pic strictoverflow relro bindnow" - '' else '' - export fortran_hardening="pic strictoverflow relro bindnow stackprotector" - '')) + optionalString cc.langJava or false '' wrap ${targetPrefix}gcj $wrapper $ccPath/${targetPrefix}gcj diff --git a/pkgs/build-support/cc-wrapper/fortran-hook.sh b/pkgs/build-support/cc-wrapper/fortran-hook.sh index 59e493e1836d..d72f314c01ce 100644 --- a/pkgs/build-support/cc-wrapper/fortran-hook.sh +++ b/pkgs/build-support/cc-wrapper/fortran-hook.sh @@ -5,7 +5,7 @@ export FC${role_post}=@named_fc@ # If unset, assume the default hardening flags. # These are different for fortran. -: ${NIX_HARDENING_ENABLE="@fortran_hardening@"} +: ${NIX_HARDENING_ENABLE="stackprotector pic strictoverflow relro bindnow"} export NIX_HARDENING_ENABLE unset -v role_post From 0a32d87be64f16f14108ca81f481683691698912 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 22 Aug 2022 03:13:00 +0200 Subject: [PATCH 007/737] libstemmer: unstable-2017-03-02 -> 2.2.0 --- .../libraries/libstemmer/default.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix index 835d13d51b4f..b0beafbcee26 100644 --- a/pkgs/development/libraries/libstemmer/default.nix +++ b/pkgs/development/libraries/libstemmer/default.nix @@ -1,21 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libstemmer"; - version = "unstable-2017-03-02"; + version = "2.2.0"; src = fetchFromGitHub { - owner = "zvelo"; - repo = "libstemmer"; - rev = "78c149a3a6f262a35c7f7351d3f77b725fc646cf"; - sha256 = "06md6n6h1f2zvnjrpfrq7ng46l1x12c14cacbrzmh5n0j98crpq7"; + owner = "snowballstem"; + repo = "snowball"; + rev = "v${version}"; + sha256 = "sha256-qXrypwv/I+5npvGHGsHveijoui0ZnoGYhskCfLkewVE="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ perl ]; + + prePatch = '' + patchShebangs . + ''; + + makeTarget = "libstemmer.a"; + + installPhase = '' + runHook preInstall + install -Dt $out/lib libstemmer.a + install -Dt $out/include include/libstemmer.h + runHook postInstall + ''; meta = with lib; { description = "Snowball Stemming Algorithms"; - homepage = "http://snowball.tartarus.org/"; + homepage = "https://snowballstem.org/"; license = licenses.bsd3; maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; From 2c59b12503f70bf743f24424ac295abf3feb434e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 Aug 2022 11:18:18 +0200 Subject: [PATCH 008/737] libcap_ng: remove unused code for python bindings The code was introduced way back in 2015 and is unused since then. https://github.com/NixOS/nixpkgs/commit/2dc9cb1120cc172055601182e76ee4759cd22fe9 --- pkgs/os-specific/linux/libcap-ng/default.nix | 25 ++++---------------- pkgs/top-level/all-packages.nix | 6 +---- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index ad01a83ac935..1ba14c5f4714 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -1,36 +1,19 @@ -{ lib, stdenv, fetchurl, swig ? null, python2 ? null, python3 ? null }: - -assert python2 != null || python3 != null -> swig != null; +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libcap-ng"; - # When updating make sure to test that the version with - # all of the python bindings still works version = "0.8.3"; src = fetchurl { - url = "${meta.homepage}/${pname}-${version}.tar.gz"; + url = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${version}.tar.gz"; sha256 = "sha256-vtb2hI4iuy+Dtfdksq7w7TkwVOgDqOOocRyyo55rSS0="; }; - nativeBuildInputs = [ swig ]; - buildInputs = [ python2 python3 ]; - - postPatch = '' - function get_header() { - echo -e "#include <$1>" | gcc -M -xc - | tr ' ' '\n' | grep "$1" | head -n 1 - } - - # Fix some hardcoding of header paths - sed -i "s,/usr/include/linux/capability.h,$(get_header linux/capability.h),g" bindings/python{,3}/Makefile.in - ''; - configureFlags = [ - (if python2 != null then "--with-python" else "--without-python") - (if python3 != null then "--with-python3" else "--without-python3") + "--without-python" ]; - meta = let inherit (lib) platforms licenses; in { + meta = with lib; { description = "Library for working with POSIX capabilities"; homepage = "https://people.redhat.com/sgrubb/libcap-ng/"; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cf743a4a780..9adaa895ce78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24184,11 +24184,7 @@ with pkgs; libcap = callPackage ../os-specific/linux/libcap { }; - libcap_ng = callPackage ../os-specific/linux/libcap-ng { - swig = null; # Currently not using the python2/3 bindings - python2 = null; # Currently not using the python2 bindings - python3 = null; # Currently not using the python3 bindings - }; + libcap_ng = callPackage ../os-specific/linux/libcap-ng { }; libnotify = callPackage ../development/libraries/libnotify { }; From 4db470acb63e4990c0c5b693561671d4375e62bd Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 24 Aug 2022 23:18:02 +0200 Subject: [PATCH 009/737] libopenmpt: 0.6.4 -> 0.6.5 --- pkgs/development/libraries/audio/libopenmpt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index bd383ffe39c4..270e4632aef1 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.6.4"; + version = "0.6.5"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "4J+4RcMpJwCnrBPDsx1mns072+vL/hMo66I3bOvkAWI="; + sha256 = "8iq+l3za5AX2hbdRUOf7FVsseJa0cA/VSr5ohA9m6cA="; }; enableParallelBuilding = true; From 465ab2af0ec3317b2973ee9f6066caefb33e7ff9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Aug 2022 04:23:51 +0000 Subject: [PATCH 010/737] ethtool: 5.18 -> 5.19 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 48d7a009c013..d2c0dfe37166 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "5.18"; + version = "5.19"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lXey/7znELZZ+yOVmOySvO0cpADKDxKGdiv6ROR4QnA="; + sha256 = "sha256-O3UqMymCeQesOBLygx3+z1HIxBxV0tac+5xTygZEn8Y="; }; nativeBuildInputs = [ From c49f26ddd1a44246942163631dd092b9319e76c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Aug 2022 12:01:40 +0000 Subject: [PATCH 011/737] nghttp2: 1.47.0 -> 1.49.0 --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index ca8cb6418190..6d28b79565e7 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -31,11 +31,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.47.0"; + version = "1.49.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "11d6w8iqrhnxmjd9ss9fzf66f7a32d48h2ihyk1580lg8d3rkj07"; + sha256 = "sha256-LNTbfXX3FJQVMknL6UoJLaTG7NdCQPirGM9kTZ1l9u4="; }; outputs = [ "bin" "out" "dev" "lib" ] From 3c697db9725f56e61c72f0d80051267a4fa4c32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 25 Aug 2022 17:25:58 +0200 Subject: [PATCH 012/737] removeReferencesTo: kill lone hashes Nix counts any occurrence of a store path's *hash* as a reference, even without a store directory prefix. The current version only kills references of the form `/nix/store/-`, which can fail e.g. for compressed files. --- pkgs/build-support/remove-references-to/remove-references-to.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 pkgs/build-support/remove-references-to/remove-references-to.sh diff --git a/pkgs/build-support/remove-references-to/remove-references-to.sh b/pkgs/build-support/remove-references-to/remove-references-to.sh old mode 100644 new mode 100755 index d8d38dbd80a9..f1b5dde5f073 --- a/pkgs/build-support/remove-references-to/remove-references-to.sh +++ b/pkgs/build-support/remove-references-to/remove-references-to.sh @@ -27,7 +27,7 @@ for i in "$@"; do done for target in "${targets[@]}" ; do - sed -i -e "s|@storeDir@/$target-|@storeDir@/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "${regions[@]}" + sed -i -e "s|$target|eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee|g" "${regions[@]}" done for region in "${regions[@]}"; do From 560604038a9bcd6f81f3512e559f3342e0a3fad5 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 25 Aug 2022 00:20:22 +0200 Subject: [PATCH 013/737] w3m: 0.5.3+git20190105 -> 0.5.3+git20220429 * Removed `no-x11.patch` patch in favor of `--without-x` flag * Some clean up: * `? null` in the inputs is not required * `with lib` should be removed * functions from `lib` should be prefixed with `lib` * remove useless assert --- .../networking/browsers/w3m/default.nix | 50 ++++++++----------- .../networking/browsers/w3m/no-x11.patch | 14 ------ 2 files changed, 22 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/w3m/no-x11.patch diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 2a4dc9e389ab..6f628f0d8d51 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,19 +1,12 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib -, sslSupport ? true, openssl ? null -, graphicsSupport ? !stdenv.isDarwin, imlib2 ? null -, x11Support ? graphicsSupport, libX11 ? null -, mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null +, sslSupport ? true, openssl +, graphicsSupport ? !stdenv.isDarwin, imlib2 +, x11Support ? graphicsSupport, libX11 +, mouseSupport ? !stdenv.isDarwin, gpm-ncurses , perl, man, pkg-config, buildPackages, w3m }: -assert sslSupport -> openssl != null; -assert graphicsSupport -> imlib2 != null; -assert x11Support -> graphicsSupport && libX11 != null; -assert mouseSupport -> gpm-ncurses != null; - -with lib; - let mktable = buildPackages.stdenv.mkDerivation { name = "w3m-mktable"; @@ -26,16 +19,16 @@ let }; in stdenv.mkDerivation rec { pname = "w3m"; - version = "0.5.3+git20190105"; + version = "0.5.3+git20220429"; src = fetchFromGitHub { owner = "tats"; repo = pname; rev = "v${version}"; - sha256 = "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i"; + hash = "sha256-aPPLZjjL3A5Tk0hv0NoAwJnjemC7a5RUoubhUr3lQE4="; }; - NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl"; + NIX_LDFLAGS = lib.optionalString stdenv.isSunOS "-lsocket -lnsl"; # we must set these so that the generated files (e.g. w3mhelp.cgi) contain # the correct paths. @@ -51,9 +44,9 @@ in stdenv.mkDerivation rec { url = "https://aur.archlinux.org/cgit/aur.git/plain/https.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03"; sha256 = "08skvaha1hjyapsh8zw5dgfy433mw2hk7qy9yy9avn8rjqj7kjxk"; }) - ] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]; + ]; - postPatch = optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' ln -s ${mktable}/bin/mktable mktable # stop make from recompiling mktable sed -ie 's!mktable.*:.*!mktable:!' Makefile.in @@ -61,12 +54,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ ncurses boehmgc zlib ] - ++ optional sslSupport openssl - ++ optional mouseSupport gpm-ncurses - ++ optional graphicsSupport imlib2 - ++ optional x11Support libX11; + ++ lib.optional sslSupport openssl + ++ lib.optional mouseSupport gpm-ncurses + ++ lib.optional graphicsSupport imlib2 + ++ lib.optional x11Support libX11; - postInstall = optionalString graphicsSupport '' + postInstall = lib.optionalString graphicsSupport '' ln -s $out/libexec/w3m/w3mimgdisplay $out/bin ''; @@ -74,10 +67,11 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-ssl=${openssl.dev}" "--with-gc=${boehmgc.dev}" ] - ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_func_setpgrp_void=yes" ] - ++ optional graphicsSupport "--enable-image=${optionalString x11Support "x11,"}fb"; + ++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb" + ++ lib.optional (graphicsSupport && !x11Support) "--without-x"; preConfigure = '' substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path @@ -88,13 +82,13 @@ in stdenv.mkDerivation rec { # for w3mimgdisplay # see: https://bbs.archlinux.org/viewtopic.php?id=196093 - LIBS = optionalString x11Support "-lX11"; + LIBS = lib.optionalString x11Support "-lX11"; - meta = { + meta = with lib; { homepage = "http://w3m.sourceforge.net/"; description = "A text-mode web browser"; - maintainers = [ maintainers.cstrahan ]; - platforms = lib.platforms.unix; - license = lib.licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/applications/networking/browsers/w3m/no-x11.patch b/pkgs/applications/networking/browsers/w3m/no-x11.patch deleted file mode 100644 index 0816c022926d..000000000000 --- a/pkgs/applications/networking/browsers/w3m/no-x11.patch +++ /dev/null @@ -1,14 +0,0 @@ -Forget about X11 in fb module. -This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb. -diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c -index 1a5151c..d3d7bc3 100644 ---- a/w3mimg/fb/fb_imlib2.c -+++ b/w3mimg/fb/fb_imlib2.c -@@ -3,6 +3,7 @@ - fb_imlib2.c 0.3 Copyright (C) 2002, hito - **************************************************************************/ - -+#define X_DISPLAY_MISSING - #include - #include "fb.h" - #include "fb_img.h" From 545e00fab7cae14b1269482388802fbf9912efb6 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 24 Aug 2022 22:18:17 +0200 Subject: [PATCH 014/737] w3m: add anthonyroussel to maintainers --- pkgs/applications/networking/browsers/w3m/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 6f628f0d8d51..898c3febc170 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "http://w3m.sourceforge.net/"; description = "A text-mode web browser"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan anthonyroussel ]; platforms = platforms.unix; license = licenses.mit; }; From 9e77929f19641a8c2dae0adbfb5d67b20aaae44d Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Wed, 24 Aug 2022 23:30:03 +0200 Subject: [PATCH 015/737] boost: allow enablePython in cross compilation --- pkgs/development/libraries/boost/generic.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index b9bdec0cd077..013496a54d5a 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -28,8 +28,6 @@ # We must build at least one type of libraries assert enableShared || enableStatic; -# Python isn't supported when cross-compiling -assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; # Boost <1.69 can't be built on linux with clang >8, because pth was removed From b1f80738f157c37fe8d150b7ee19bdd9abd5d5dc Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 22 Aug 2022 17:42:58 +0300 Subject: [PATCH 016/737] lua-packages.nix: run nixpkgs-fmt --- pkgs/top-level/lua-packages.nix | 268 +++++++++++++++++--------------- 1 file changed, 142 insertions(+), 126 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 012a4d1e0c77..2598fd314fee 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -1,141 +1,157 @@ /* This file defines the composition for Lua packages. It has - been factored out of all-packages.nix because there are many of - them. Also, because most Nix expressions for Lua packages are - trivial, most are actually defined here. I.e. there's no function - for each package in a separate file: the call to the function would - be almost as must code as the function itself. */ + been factored out of all-packages.nix because there are many of + them. Also, because most Nix expressions for Lua packages are + trivial, most are actually defined here. I.e. there's no function + for each package in a separate file: the call to the function would + be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, unzip, pkg-config -, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat -, autoreconfHook, gnum4 -, postgresql, cyrus_sasl -, fetchFromGitHub, which, writeText +{ fetchurl +, stdenv +, lua +, unzip +, pkg-config +, pcre +, oniguruma +, gnulib +, tre +, glibc +, sqlite +, openssl +, expat +, autoreconfHook +, gnum4 +, postgresql +, cyrus_sasl +, fetchFromGitHub +, which +, writeText , pkgs , lib }@args: let - packages = ( self: + packages = (self: -let - callPackage = pkgs.newScope self; + let + callPackage = pkgs.newScope self; - buildLuaApplication = args: buildLuarocksPackage ({namePrefix="";} // args ); + buildLuaApplication = args: buildLuarocksPackage ({ namePrefix = ""; } // args); - buildLuarocksPackage = lib.makeOverridable(callPackage ../development/interpreters/lua-5/build-lua-package.nix { - inherit lua; - inherit (pkgs) lib; - inherit (luaLib) toLuaModule; - }); + buildLuarocksPackage = lib.makeOverridable (callPackage ../development/interpreters/lua-5/build-lua-package.nix { + inherit lua; + inherit (pkgs) lib; + inherit (luaLib) toLuaModule; + }); - luaLib = import ../development/lua-modules/lib.nix { - inherit (pkgs) lib; - inherit pkgs lua; - }; + luaLib = import ../development/lua-modules/lib.nix { + inherit (pkgs) lib; + inherit pkgs lua; + }; - #define build lua package function - buildLuaPackage = callPackage ../development/lua-modules/generic { - inherit writeText; - }; + #define build lua package function + buildLuaPackage = callPackage ../development/lua-modules/generic { + inherit writeText; + }; - getPath = drv: pathListForVersion: - lib.concatMapStringsSep ";" (path: "${drv}/${path}") pathListForVersion; + getPath = drv: pathListForVersion: + lib.concatMapStringsSep ";" (path: "${drv}/${path}") pathListForVersion; + in + { + # helper functions for dealing with LUA_PATH and LUA_CPATH + lib = luaLib; + + getLuaPath = drv: getPath drv luaLib.luaPathList; + getLuaCPath = drv: getPath drv luaLib.luaCPathList; + + inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib; }) + luarocksMoveDataFolder luarocksCheckHook lua-setup-hook; + + inherit lua callPackage; + inherit buildLuaPackage buildLuarocksPackage buildLuaApplication; + inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT + requiredLuaModules toLuaModule hasLuaModule; + + # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH + wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { + inherit lua lib; + inherit (pkgs.buildPackages) makeSetupHook makeWrapper; + }; + + luarocks = callPackage ../development/tools/misc/luarocks/default.nix { + inherit lua lib; + }; + + # a fork of luarocks used to generate nix lua derivations from rockspecs + luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; + + luxio = buildLuaPackage { + pname = "luxio"; + version = "13"; + + src = fetchurl { + url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2"; + sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; + }; + + nativeBuildInputs = [ which pkg-config ]; + + postPatch = '' + patchShebangs . + ''; + + preBuild = '' + makeFlagsArray=( + INST_LIBDIR="$out/lib/lua/${lua.luaversion}" + INST_LUADIR="$out/share/lua/${lua.luaversion}" + LUA_BINDIR="$out/bin" + INSTALL=install + ); + ''; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "Lightweight UNIX I/O and POSIX binding for Lua"; + homepage = "https://www.gitano.org.uk/luxio/"; + license = licenses.mit; + maintainers = with maintainers; [ richardipsum ]; + platforms = platforms.unix; + }; + }; + + nfd = callPackage ../development/lua-modules/nfd { + inherit (lib) maintainers; + inherit (pkgs.gnome) zenity; + }; + + vicious = luaLib.toLuaModule (stdenv.mkDerivation rec { + pname = "vicious"; + version = "2.5.1"; + + src = fetchFromGitHub { + owner = "vicious-widgets"; + repo = "vicious"; + rev = "v${version}"; + sha256 = "sha256-geu/g/dFAVxtY1BuJYpZoVtFS/oL66NFnqiLAnJELtI="; + }; + + buildInputs = [ lua ]; + + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion}/ + cp -r . $out/lib/lua/${lua.luaversion}/vicious/ + printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua + ''; + + meta = with lib; { + description = "A modular widget library for the awesome window manager"; + homepage = "https://vicious.rtfd.io"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ makefu mic92 McSinyx ]; + platforms = platforms.linux; + }; + }); + + }); in -{ - # helper functions for dealing with LUA_PATH and LUA_CPATH - lib = luaLib; - - getLuaPath = drv: getPath drv luaLib.luaPathList; - getLuaCPath = drv: getPath drv luaLib.luaCPathList; - - inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib;}) - luarocksMoveDataFolder luarocksCheckHook lua-setup-hook; - - inherit lua callPackage; - inherit buildLuaPackage buildLuarocksPackage buildLuaApplication; - inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT - requiredLuaModules toLuaModule hasLuaModule; - - # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH - wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { - inherit lua lib; - inherit (pkgs.buildPackages) makeSetupHook makeWrapper; - }; - - luarocks = callPackage ../development/tools/misc/luarocks/default.nix { - inherit lua lib; - }; - - # a fork of luarocks used to generate nix lua derivations from rockspecs - luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; - - luxio = buildLuaPackage { - pname = "luxio"; - version = "13"; - - src = fetchurl { - url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2"; - sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; - }; - - nativeBuildInputs = [ which pkg-config ]; - - postPatch = '' - patchShebangs . - ''; - - preBuild = '' - makeFlagsArray=( - INST_LIBDIR="$out/lib/lua/${lua.luaversion}" - INST_LUADIR="$out/share/lua/${lua.luaversion}" - LUA_BINDIR="$out/bin" - INSTALL=install - ); - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Lightweight UNIX I/O and POSIX binding for Lua"; - homepage = "https://www.gitano.org.uk/luxio/"; - license = licenses.mit; - maintainers = with maintainers; [ richardipsum ]; - platforms = platforms.unix; - }; - }; - - nfd = callPackage ../development/lua-modules/nfd { - inherit (lib) maintainers; - inherit (pkgs.gnome) zenity; - }; - - vicious = luaLib.toLuaModule( stdenv.mkDerivation rec { - pname = "vicious"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "vicious-widgets"; - repo = "vicious"; - rev = "v${version}"; - sha256 = "sha256-geu/g/dFAVxtY1BuJYpZoVtFS/oL66NFnqiLAnJELtI="; - }; - - buildInputs = [ lua ]; - - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion}/ - cp -r . $out/lib/lua/${lua.luaversion}/vicious/ - printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua - ''; - - meta = with lib; { - description = "A modular widget library for the awesome window manager"; - homepage = "https://vicious.rtfd.io"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ makefu mic92 McSinyx ]; - platforms = platforms.linux; - }; - }); - -}); -in packages +packages From f0ba59156ff76082ba5c9aebd8247a0b3eb6cee3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 22 Aug 2022 17:44:02 +0300 Subject: [PATCH 017/737] lua-packages.nix: remove unused args --- pkgs/top-level/lua-packages.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 2598fd314fee..bea7c8142f1c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -8,20 +8,7 @@ { fetchurl , stdenv , lua -, unzip , pkg-config -, pcre -, oniguruma -, gnulib -, tre -, glibc -, sqlite -, openssl -, expat -, autoreconfHook -, gnum4 -, postgresql -, cyrus_sasl , fetchFromGitHub , which , writeText From 613c4107502b9d9906584dec11487947bcc70c53 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 22 Aug 2022 23:09:29 +0300 Subject: [PATCH 018/737] lua-modules: use composeManyExtensions --- pkgs/development/lua-modules/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix index 0c8bc1814b53..8f1ca7deea16 100644 --- a/pkgs/development/lua-modules/default.nix +++ b/pkgs/development/lua-modules/default.nix @@ -17,13 +17,13 @@ let generatedPackages = if (builtins.pathExists ./generated-packages.nix) then (final: prev: pkgs.callPackage ./generated-packages.nix { inherit (final) callPackage; } final prev) else (final: prev: {}); - extensible-self = lib.makeExtensible - (extends overrides - (extends overridenPackages - (extends generatedPackages - initialPackages - ) - ) - ); + extensions = lib.composeManyExtensions [ + generatedPackages + overridenPackages + overrides + ]; + + extensible-self = lib.makeExtensible (lib.extends extensions initialPackages); + in extensible-self From ec35f6341bc64bea3cfd4f384085c6c28f3590b8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 23 Aug 2022 01:45:37 +0300 Subject: [PATCH 019/737] lua-packages: try splicing --- .../editors/neovim/build-neovim-plugin.nix | 2 +- pkgs/applications/editors/neovim/utils.nix | 4 +- .../interpreters/lua-5/build-lua-package.nix | 12 +- .../interpreters/lua-5/interpreter.nix | 9 +- pkgs/development/interpreters/luajit/2.0.nix | 1 + pkgs/development/interpreters/luajit/2.1.nix | 1 + .../interpreters/luajit/default.nix | 13 +- pkgs/development/lua-modules/default.nix | 23 +- pkgs/development/lua-modules/nfd/default.nix | 6 +- pkgs/development/lua-modules/overrides.nix | 60 ++--- .../tools/misc/luarocks/default.nix | 9 +- pkgs/misc/openrussian-cli/default.nix | 4 +- pkgs/servers/nfd/default.nix | 2 +- pkgs/top-level/lua-packages.nix | 233 ++++++++---------- 14 files changed, 194 insertions(+), 185 deletions(-) diff --git a/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/pkgs/applications/editors/neovim/build-neovim-plugin.nix index cb69b5ecacdb..f89d36741e94 100644 --- a/pkgs/applications/editors/neovim/build-neovim-plugin.nix +++ b/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -20,7 +20,7 @@ in }@attrs: let originalLuaDrv = lua51Packages.${luaAttr}; - luaDrv = lua51Packages.lib.overrideLuarocks originalLuaDrv (drv: { + luaDrv = lua51Packages.luaLib.overrideLuarocks originalLuaDrv (drv: { extraConfig = '' -- to create a flat hierarchy lua_modules_path = "lua" diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index cb0c005759b8..fe3ffc3830f6 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -115,8 +115,8 @@ let ] ++ lib.optionals (binPath != "") [ "--suffix" "PATH" ":" binPath ] ++ lib.optionals (luaEnv != null) [ - "--prefix" "LUA_PATH" ";" (neovim-unwrapped.lua.pkgs.lib.genLuaPathAbsStr luaEnv) - "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.lib.genLuaCPathAbsStr luaEnv) + "--prefix" "LUA_PATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaPathAbsStr luaEnv) + "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv) ]; manifestRc = vimUtils.vimrcContent ({ customRC = ""; }) ; diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 0af7b470b0b3..918bca238639 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -1,10 +1,12 @@ # Generic builder for lua packages { lib , lua +, buildPackages , wrapLua +, luarocks # Whether the derivation provides a lua module or not. -, toLuaModule , luarocksCheckHook +, luaLib }: { @@ -82,7 +84,7 @@ let # configured trees) luarocks_config = "luarocks-config.lua"; luarocks_content = let - generatedConfig = lua.pkgs.lib.generateLuarocksConfig { + generatedConfig = luaLib.generateLuarocksConfig { externalDeps = externalDeps ++ externalDepsGenerated; inherit extraVariables; inherit rocksSubdir; @@ -107,14 +109,14 @@ let ); externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; - luarocksDrv = toLuaModule ( lua.stdenv.mkDerivation ( + luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation ( builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariables"] // { name = namePrefix + pname + "-" + version; nativeBuildInputs = [ wrapLua - lua.pkgs.luarocks + luarocks ] ++ buildInputs ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ checkInputs) @@ -156,7 +158,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab nix_debug "Using LUAROCKS_CONFIG=$LUAROCKS_CONFIG" - LUAROCKS=${lua.pkgs.luarocks}/bin/luarocks + LUAROCKS=luarocks if (( ''${NIX_DEBUG:-0} >= 1 )); then LUAROCKS="$LUAROCKS --verbose" fi diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 1fb56851ce52..c392a2c3bb52 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -11,9 +11,12 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let + luaversion = with sourceVersion; "${major}.${minor}"; + luaPackages = callPackage ../../lua-modules { lua = self; overrides = packageOverrides; + packagesAttr = "lua${lib.replaceChars ["."] ["_"] luaversion}.pkgs"; }; plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" @@ -28,7 +31,6 @@ plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux self = stdenv.mkDerivation rec { pname = "lua"; - luaversion = with sourceVersion; "${major}.${minor}"; version = "${luaversion}.${sourceVersion.patch}"; src = fetchurl { @@ -36,8 +38,8 @@ self = stdenv.mkDerivation rec { sha256 = hash; }; - LuaPathSearchPaths = luaPackages.lib.luaPathList; - LuaCPathSearchPaths = luaPackages.lib.luaCPathList; + LuaPathSearchPaths = luaPackages.luaLib.luaPathList; + LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList; setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; nativeBuildInputs = [ makeWrapper ]; @@ -124,6 +126,7 @@ self = stdenv.mkDerivation rec { ''; passthru = rec { + inherit luaversion; buildEnv = callPackage ./wrapper.nix { lua = self; inherit makeWrapper; diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index f2fc16963cad..0816ecb548fb 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,6 +1,7 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; + packagesAttr = "luajit_2_0.pkgs"; version = "2.0.5-2022-03-13"; rev = "93a65d3cc263aef2d2feb3d7ff2206aca3bee17e"; isStable = true; diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 507bc40fcf6a..25232a52c4b4 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,6 +1,7 @@ { self, callPackage }: callPackage ./default.nix { inherit self; + packagesAttr = "luajit_2_1.pkgs"; version = "2.1.0-2022-04-05"; rev = "5e3c45c43bb0e0f1f2917d432e9d2dba12c42a6e"; isStable = false; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 480e34244134..9fe697d887a7 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -7,6 +7,7 @@ , hash , rev , version +, packagesAttr , extraMeta ? { } , callPackage , self @@ -27,7 +28,11 @@ assert enableJITDebugModule -> enableJIT; assert enableGDBJITSupport -> enableJIT; assert enableValgrindSupport -> valgrind != null; let - luaPackages = callPackage ../../lua-modules { lua = self; overrides = packageOverrides; }; + luaPackages = callPackage ../../lua-modules { + lua = self; + overrides = packageOverrides; + inherit packagesAttr; + }; XCFLAGS = with lib; optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" @@ -93,10 +98,10 @@ stdenv.mkDerivation rec { ln -s "$out"/bin/luajit-* "$out"/bin/luajit ''; - LuaPathSearchPaths = luaPackages.lib.luaPathList; - LuaCPathSearchPaths = luaPackages.lib.luaCPathList; + LuaPathSearchPaths = luaPackages.luaLib.luaPathList; + LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList; - setupHook = luaPackages.lua-setup-hook luaPackages.lib.luaPathList luaPackages.lib.luaCPathList; + setupHook = luaPackages.lua-setup-hook luaPackages.luaLib.luaPathList luaPackages.luaLib.luaCPathList; passthru = rec { buildEnv = callPackage ../lua-5/wrapper.nix { diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix index 8f1ca7deea16..30492b79d9c1 100644 --- a/pkgs/development/lua-modules/default.nix +++ b/pkgs/development/lua-modules/default.nix @@ -1,6 +1,8 @@ # inspired by pkgs/development/haskell-modules/default.nix { pkgs, lib , lua +, packagesAttr +, stdenv , overrides ? (final: prev: {}) }: @@ -8,9 +10,9 @@ let inherit (lib) extends; - initialPackages = (pkgs.callPackage ../../top-level/lua-packages.nix { - inherit lua; - }); + initialPackages = import ../../top-level/lua-packages.nix { + inherit lua pkgs lib stdenv; + }; overridenPackages = import ./overrides.nix { inherit pkgs; }; @@ -23,7 +25,18 @@ let overrides ]; - extensible-self = lib.makeExtensible (lib.extends extensions initialPackages); + otherSplices = let + packagesAttrFun = set: lib.getAttrFromPath (lib.splitString "." packagesAttr) set; + in { + selfBuildBuild = packagesAttrFun pkgs.pkgsBuildBuild; + selfBuildHost = packagesAttrFun pkgs.pkgsBuildHost; + selfBuildTarget = packagesAttrFun pkgs.pkgsBuildTarget; + selfHostHost = packagesAttrFun pkgs.pkgsHostHost; + selfTargetTarget = if pkgs.pkgsTargetTarget.__raw or false then {} else packagesAttrFun pkgs.pkgsTargetTarget; # might be missing; + }; + keep = self: { }; + extra = spliced0: { }; in - extensible-self + lib.makeScopeWithSplicing pkgs.splicePackages pkgs.newScope otherSplices keep extra + (lib.extends extensions initialPackages) diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 6605202f6bd1..ab6e1b83d79b 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildLuarocksPackage, lua, maintainers, pkg-config +{ fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib , substituteAll, zenity }: buildLuarocksPackage { @@ -35,7 +35,7 @@ buildLuarocksPackage { description = "A tiny, neat lua library that portably invokes native file open and save dialogs."; homepage = "https://github.com/Alloyed/nativefiledialog/tree/master/lua"; - license.fullName = "zlib"; - maintainers = [ maintainers.scoder12 ]; + license = lib.licenses.zlib; + maintainers = [ lib.maintainers.scoder12 ]; }; } diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 418db1b7bd3b..cbd93554bdec 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -29,7 +29,7 @@ with prev; ''; }); - cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: { + cqueues = (prev.luaLib.overrideLuarocks prev.cqueues (drv: { externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl_1_1; } { name = "OPENSSL"; dep = pkgs.openssl_1_1; } @@ -63,7 +63,7 @@ with prev; ''; }); - cyrussasl = prev.lib.overrideLuarocks prev.cyrussasl (drv: { + cyrussasl = prev.luaLib.overrideLuarocks prev.cyrussasl (drv: { externalDeps = [ { name = "LIBSASL"; dep = pkgs.cyrus_sasl; } ]; @@ -83,7 +83,7 @@ with prev; */ }); - ldbus = prev.lib.overrideLuarocks prev.ldbus (drv: { + ldbus = prev.luaLib.overrideLuarocks prev.ldbus (drv: { extraVariables = { DBUS_DIR="${pkgs.dbus.lib}"; DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include"; @@ -94,7 +94,7 @@ with prev; ]; }); - ljsyscall = prev.lib.overrideLuarocks prev.ljsyscall (drv: rec { + ljsyscall = prev.luaLib.overrideLuarocks prev.ljsyscall (drv: rec { version = "unstable-20180515"; # package hasn't seen any release for a long time src = pkgs.fetchFromGitHub { @@ -135,7 +135,7 @@ with prev; ''; }); - lmathx = prev.lib.overrideLuarocks prev.lmathx (drv: + lmathx = prev.luaLib.overrideLuarocks prev.lmathx (drv: if luaAtLeast "5.1" && luaOlder "5.2" then { version = "20120430.51-1"; knownRockspec = (pkgs.fetchurl { @@ -167,7 +167,7 @@ with prev; ''; }); - lmpfrlib = prev.lib.overrideLuarocks prev.lmpfrlib (drv: { + lmpfrlib = prev.luaLib.overrideLuarocks prev.lmpfrlib (drv: { externalDeps = [ { name = "GMP"; dep = pkgs.gmp; } { name = "MPFR"; dep = pkgs.mpfr; } @@ -177,25 +177,25 @@ with prev; ''; }); - lrexlib-gnu = prev.lib.overrideLuarocks prev.lrexlib-gnu (drv: { + lrexlib-gnu = prev.luaLib.overrideLuarocks prev.lrexlib-gnu (drv: { buildInputs = [ pkgs.gnulib ]; }); - lrexlib-pcre = prev.lib.overrideLuarocks prev.lrexlib-pcre (drv: { + lrexlib-pcre = prev.luaLib.overrideLuarocks prev.lrexlib-pcre (drv: { externalDeps = [ { name = "PCRE"; dep = pkgs.pcre; } ]; }); - lrexlib-posix = prev.lib.overrideLuarocks prev.lrexlib-posix (drv: { + lrexlib-posix = prev.luaLib.overrideLuarocks prev.lrexlib-posix (drv: { buildInputs = [ pkgs.glibc.dev ]; }); - lua-iconv = prev.lib.overrideLuarocks prev.lua-iconv (drv: { + lua-iconv = prev.luaLib.overrideLuarocks prev.lua-iconv (drv: { buildInputs = [ pkgs.libiconv ]; @@ -209,14 +209,14 @@ with prev; ''; }); - lua-zlib = prev.lib.overrideLuarocks prev.lua-zlib (drv: { + lua-zlib = prev.luaLib.overrideLuarocks prev.lua-zlib (drv: { buildInputs = [ pkgs.zlib.dev ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; }); - luadbi-mysql = prev.lib.overrideLuarocks prev.luadbi-mysql (drv: { + luadbi-mysql = prev.luaLib.overrideLuarocks prev.luadbi-mysql (drv: { extraVariables = { # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' MYSQL_INCDIR="${pkgs.libmysqlclient.dev}/include/mysql"; @@ -228,19 +228,19 @@ with prev; ]; }); - luadbi-postgresql = prev.lib.overrideLuarocks prev.luadbi-postgresql (drv: { + luadbi-postgresql = prev.luaLib.overrideLuarocks prev.luadbi-postgresql (drv: { buildInputs = [ pkgs.postgresql ]; }); - luadbi-sqlite3 = prev.lib.overrideLuarocks prev.luadbi-sqlite3 (drv: { + luadbi-sqlite3 = prev.luaLib.overrideLuarocks prev.luadbi-sqlite3 (drv: { externalDeps = [ { name = "SQLITE"; dep = pkgs.sqlite; } ]; }); - luaevent = prev.lib.overrideLuarocks prev.luaevent (drv: { + luaevent = prev.luaLib.overrideLuarocks prev.luaevent (drv: { propagatedBuildInputs = [ luasocket ]; @@ -250,7 +250,7 @@ with prev; disabled = luaOlder "5.1" || luaAtLeast "5.4"; }); - luaexpat = prev.lib.overrideLuarocks prev.luaexpat (drv: { + luaexpat = prev.luaLib.overrideLuarocks prev.luaexpat (drv: { externalDeps = [ { name = "EXPAT"; dep = pkgs.expat; } ]; @@ -258,7 +258,7 @@ with prev; # TODO Somehow automatically amend buildInputs for things that need luaffi # but are in luajitPackages? - luaffi = prev.lib.overrideLuarocks prev.luaffi (drv: { + luaffi = prev.luaLib.overrideLuarocks prev.luaffi (drv: { # The packaged .src.rock version is pretty old, and doesn't work with Lua 5.3 src = pkgs.fetchFromGitHub { owner = "facebook"; repo = "luaffifb"; @@ -269,7 +269,7 @@ with prev; disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; }); - luaossl = prev.lib.overrideLuarocks prev.luaossl (drv: { + luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ # https://github.com/wahern/luaossl/pull/199 { name = "CRYPTO"; dep = pkgs.openssl_1_1; } @@ -277,41 +277,41 @@ with prev; ]; }); - luasec = prev.lib.overrideLuarocks prev.luasec (drv: { + luasec = prev.luaLib.overrideLuarocks prev.luasec (drv: { externalDeps = [ { name = "OPENSSL"; dep = pkgs.openssl_1_1; } ]; }); - luasql-sqlite3 = prev.lib.overrideLuarocks prev.luasql-sqlite3 (drv: { + luasql-sqlite3 = prev.luaLib.overrideLuarocks prev.luasql-sqlite3 (drv: { externalDeps = [ { name = "SQLITE"; dep = pkgs.sqlite; } ]; }); - luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { + luasystem = prev.luaLib.overrideLuarocks prev.luasystem (drv: pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { buildInputs = [ pkgs.glibc.out ]; }); - luazip = prev.lib.overrideLuarocks prev.luazip (drv: { + luazip = prev.luaLib.overrideLuarocks prev.luazip (drv: { buildInputs = [ pkgs.zziplib ]; }); - lua-yajl = prev.lib.overrideLuarocks prev.lua-yajl (drv: { + lua-yajl = prev.luaLib.overrideLuarocks prev.lua-yajl (drv: { buildInputs = [ pkgs.yajl ]; }); - luaunbound = prev.lib.overrideLuarocks prev.luaunbound(drv: { + luaunbound = prev.luaLib.overrideLuarocks prev.luaunbound(drv: { externalDeps = [ { name = "libunbound"; dep = pkgs.unbound; } ]; }); - luuid = (prev.lib.overrideLuarocks prev.luuid (drv: { + luuid = (prev.luaLib.overrideLuarocks prev.luuid (drv: { externalDeps = [ { name = "LIBUUID"; dep = pkgs.libuuid; } ]; @@ -361,7 +361,7 @@ with prev; ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ]; }; - luv = prev.lib.overrideLuarocks prev.luv (drv: { + luv = prev.luaLib.overrideLuarocks prev.luv (drv: { buildInputs = [ pkgs.pkg-config pkgs.libuv ]; @@ -381,13 +381,13 @@ with prev; }); - lyaml = prev.lib.overrideLuarocks prev.lyaml (oa: { + lyaml = prev.luaLib.overrideLuarocks prev.lyaml (oa: { buildInputs = [ pkgs.libyaml ]; }); - mpack = prev.lib.overrideLuarocks prev.mpack (drv: { + mpack = prev.luaLib.overrideLuarocks prev.mpack (drv: { buildInputs = [ pkgs.libmpack ]; # the rockspec doesn't use the makefile so you may need to export more flags USE_SYSTEM_LUA = "yes"; @@ -401,7 +401,7 @@ with prev; ''; }); - readline = (prev.lib.overrideLuarocks prev.readline (drv: { + readline = (prev.luaLib.overrideLuarocks prev.readline (drv: { unpackCmd = '' unzip "$curSrc" tar xf *.tar.gz @@ -418,7 +418,7 @@ with prev; ''; }); - sqlite = prev.lib.overrideLuarocks prev.sqlite (drv: { + sqlite = prev.luaLib.overrideLuarocks prev.sqlite (drv: { doCheck = true; checkInputs = [ final.plenary-nvim pkgs.neovim-unwrapped ]; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 70df08af2de0..3628467617d2 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub +{lib, stdenv, fetchFromGitHub, buildPackages , curl, makeWrapper, which, unzip , lua # for 'luarocks pack' @@ -43,12 +43,13 @@ stdenv.mkDerivation rec { fi ''; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ makeWrapper installShellFiles lua unzip ]; - buildInputs = [ lua curl which ]; + buildInputs = [ curl which ]; postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* + for i in "$out"/bin/*; do test -L "$i" || { wrapProgram "$i" \ @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" } done - + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash) installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh) ''; diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index e6e089e88612..038bdd5a73f1 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { cp openrussian $out/bin wrapProgram $out/bin/openrussian \ - --prefix LUA_PATH ';' '${lua.pkgs.lib.genLuaPathAbsStr luaEnv}' \ - --prefix LUA_CPATH ';' '${lua.pkgs.lib.genLuaCPathAbsStr luaEnv}' + --prefix LUA_PATH ';' '${lua.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \ + --prefix LUA_CPATH ';' '${lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv}' runHook postInstall ''; diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 2f0176de2b82..3eda5e2b25dd 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "Named Data Neworking (NDN) Forwarding Daemon"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.bertof ]; + maintainers = [ lib.maintainers.bertof ]; }; } diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index bea7c8142f1c..42d7a44cf82c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,140 +5,123 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl -, stdenv +{ stdenv , lua -, pkg-config -, fetchFromGitHub -, which -, writeText , pkgs , lib -}@args: +}: + +self: let - packages = (self: + inherit (self) callPackage; - let - callPackage = pkgs.newScope self; + buildLuaApplication = args: buildLuarocksPackage ({ namePrefix = ""; } // args); - buildLuaApplication = args: buildLuarocksPackage ({ namePrefix = ""; } // args); + buildLuarocksPackage = lib.makeOverridable (callPackage ../development/interpreters/lua-5/build-lua-package.nix { }); - buildLuarocksPackage = lib.makeOverridable (callPackage ../development/interpreters/lua-5/build-lua-package.nix { - inherit lua; - inherit (pkgs) lib; - inherit (luaLib) toLuaModule; - }); + luaLib = callPackage ../development/lua-modules/lib.nix { }; - luaLib = import ../development/lua-modules/lib.nix { - inherit (pkgs) lib; - inherit pkgs lua; - }; + #define build lua package function + buildLuaPackage = callPackage ../development/lua-modules/generic { }; - #define build lua package function - buildLuaPackage = callPackage ../development/lua-modules/generic { - inherit writeText; - }; + getPath = drv: pathListForVersion: + lib.concatMapStringsSep ";" (path: "${drv}/${path}") pathListForVersion; - getPath = drv: pathListForVersion: - lib.concatMapStringsSep ";" (path: "${drv}/${path}") pathListForVersion; - - in - { - # helper functions for dealing with LUA_PATH and LUA_CPATH - lib = luaLib; - - getLuaPath = drv: getPath drv luaLib.luaPathList; - getLuaCPath = drv: getPath drv luaLib.luaCPathList; - - inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib; }) - luarocksMoveDataFolder luarocksCheckHook lua-setup-hook; - - inherit lua callPackage; - inherit buildLuaPackage buildLuarocksPackage buildLuaApplication; - inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT - requiredLuaModules toLuaModule hasLuaModule; - - # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH - wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { - inherit lua lib; - inherit (pkgs.buildPackages) makeSetupHook makeWrapper; - }; - - luarocks = callPackage ../development/tools/misc/luarocks/default.nix { - inherit lua lib; - }; - - # a fork of luarocks used to generate nix lua derivations from rockspecs - luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; - - luxio = buildLuaPackage { - pname = "luxio"; - version = "13"; - - src = fetchurl { - url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2"; - sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; - }; - - nativeBuildInputs = [ which pkg-config ]; - - postPatch = '' - patchShebangs . - ''; - - preBuild = '' - makeFlagsArray=( - INST_LIBDIR="$out/lib/lua/${lua.luaversion}" - INST_LUADIR="$out/share/lua/${lua.luaversion}" - LUA_BINDIR="$out/bin" - INSTALL=install - ); - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Lightweight UNIX I/O and POSIX binding for Lua"; - homepage = "https://www.gitano.org.uk/luxio/"; - license = licenses.mit; - maintainers = with maintainers; [ richardipsum ]; - platforms = platforms.unix; - }; - }; - - nfd = callPackage ../development/lua-modules/nfd { - inherit (lib) maintainers; - inherit (pkgs.gnome) zenity; - }; - - vicious = luaLib.toLuaModule (stdenv.mkDerivation rec { - pname = "vicious"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "vicious-widgets"; - repo = "vicious"; - rev = "v${version}"; - sha256 = "sha256-geu/g/dFAVxtY1BuJYpZoVtFS/oL66NFnqiLAnJELtI="; - }; - - buildInputs = [ lua ]; - - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion}/ - cp -r . $out/lib/lua/${lua.luaversion}/vicious/ - printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua - ''; - - meta = with lib; { - description = "A modular widget library for the awesome window manager"; - homepage = "https://vicious.rtfd.io"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ makefu mic92 McSinyx ]; - platforms = platforms.linux; - }; - }); - - }); in -packages +{ + + # Dont take luaPackages from "global" pkgs scope to avoid mixing lua versions + luaPackages = self; + + # helper functions for dealing with LUA_PATH and LUA_CPATH + inherit luaLib; + + getLuaPath = drv: getPath drv luaLib.luaPathList; + getLuaCPath = drv: getPath drv luaLib.luaCPathList; + + inherit (callPackage ../development/interpreters/lua-5/hooks { }) + luarocksMoveDataFolder luarocksCheckHook lua-setup-hook; + + inherit lua; + inherit buildLuaPackage buildLuarocksPackage buildLuaApplication; + inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT + requiredLuaModules toLuaModule hasLuaModule; + + # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH + wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { + inherit (pkgs.buildPackages) makeSetupHook makeWrapper; + }; + + luarocks = callPackage ../development/tools/misc/luarocks/default.nix { }; + + # a fork of luarocks used to generate nix lua derivations from rockspecs + luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; + + luxio = callPackage ({ fetchurl, which, pkg-config }: buildLuaPackage { + pname = "luxio"; + version = "13"; + + src = fetchurl { + url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2"; + sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; + }; + + nativeBuildInputs = [ which pkg-config ]; + + postPatch = '' + patchShebangs . + ''; + + preBuild = '' + makeFlagsArray=( + INST_LIBDIR="$out/lib/lua/${lua.luaversion}" + INST_LUADIR="$out/share/lua/${lua.luaversion}" + LUA_BINDIR="$out/bin" + INSTALL=install + ); + ''; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "Lightweight UNIX I/O and POSIX binding for Lua"; + homepage = "https://www.gitano.org.uk/luxio/"; + license = licenses.mit; + maintainers = with maintainers; [ richardipsum ]; + platforms = platforms.unix; + }; + }); + + nfd = callPackage ../development/lua-modules/nfd { + inherit (pkgs.gnome) zenity; + }; + + vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec { + pname = "vicious"; + version = "2.5.1"; + + src = fetchFromGitHub { + owner = "vicious-widgets"; + repo = "vicious"; + rev = "v${version}"; + sha256 = "sha256-geu/g/dFAVxtY1BuJYpZoVtFS/oL66NFnqiLAnJELtI="; + }; + + buildInputs = [ lua ]; + + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion}/ + cp -r . $out/lib/lua/${lua.luaversion}/vicious/ + printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua + ''; + + meta = with lib; { + description = "A modular widget library for the awesome window manager"; + homepage = "https://vicious.rtfd.io"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ makefu mic92 McSinyx ]; + platforms = platforms.linux; + }; + }) {}); + +} From a2c61752fb424f0f4345113d18a1b4a14a10c381 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 23 Aug 2022 02:31:38 +0300 Subject: [PATCH 020/737] lua.pkgs.luarocks: fix usage in cross-compilation copy of comment https://github.com/luarocks/luarocks/pull/1433/commits/8d878e4981d71c08090f509c390dcb4c879971f6#r954257465 with this patch the build of luasystem fails LD=ld ``` ld -shared -o system/core.so src/core.o src/compat.o src/time.o -L/nix/store/...-glibc-2.35-163/lib -Wl,-rpath,/nix/store/...-glibc-2.35-163/lib -lrt /nix/store/vhf2cr6immz4qdxd83y025fnxim8mmfg-binutils-2.38/bin/ld: unrecognized option '-Wl,-rpath,/nix/store/...-glibc-2.35-163/lib' /nix/store/vhf2cr6immz4qdxd83y025fnxim8mmfg-binutils-2.38/bin/ld: use the --help option for usage information Error: Build error: Failed compiling module system/core.so ``` LD=gcc ``` gcc -shared -o system/core.so src/core.o src/compat.o src/time.o -L/nix/store/...-glibc-2.35-163/lib -Wl,-rpath,/nix/store/...-glibc-2.35-163/lib -lrt ``` `-Wl,rpath... -lrt` are added by https://github.com/luarocks/luarocks/blob/ecb63347bf7d44c68210befc9d03c013350c7831/src/luarocks/build/builtin.lua#L249-L250 --- pkgs/development/tools/misc/luarocks/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 3628467617d2..533648c217d6 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -1,4 +1,5 @@ {lib, stdenv, fetchFromGitHub, buildPackages +, fetchpatch , curl, makeWrapper, which, unzip , lua # for 'luarocks pack' @@ -20,7 +21,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-i0NmF268aK5lr4zjYyhk4TPUO7Zyz0Cl0fSW43Pmd1Q="; }; - patches = [ ./darwin-3.7.0.patch ]; + patches = [ + ./darwin-3.7.0.patch + # follow standard environmental variables + # https://github.com/luarocks/luarocks/pull/1433 + (fetchpatch { + url = "https://github.com/luarocks/luarocks/commit/d719541577a89909185aa8de7a33cf73b7a63ac3.diff"; + sha256 = "sha256-rMnhZFqLEul0wnsxvw9nl6JXVanC5QgOZ+I/HJ0vRCM="; + }) + ]; postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' From a59a6bc4ea5ef1cd5d9148e8420b42495785592d Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 24 Aug 2022 19:06:16 +0300 Subject: [PATCH 021/737] lua-modules/overrides.nix: run nixpkgs-fmt --- pkgs/development/lua-modules/overrides.nix | 146 +++++++++++---------- 1 file changed, 75 insertions(+), 71 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index cbd93554bdec..36b04817987d 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -5,7 +5,7 @@ with prev; ##########################################3 #### manual fixes for generated packages ##########################################3 - bit32 = prev.bit32.overrideAttrs(oa: { + bit32 = prev.bit32.overrideAttrs (oa: { # Small patch in order to no longer redefine a Lua 5.2 function that Luajit # 2.1 also provides, see https://github.com/LuaJIT/LuaJIT/issues/325 for # more @@ -14,7 +14,7 @@ with prev; ]; }); - busted = prev.busted.overrideAttrs(oa: { + busted = prev.busted.overrideAttrs (oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ pkgs.installShellFiles ]; @@ -35,14 +35,15 @@ with prev; { name = "OPENSSL"; dep = pkgs.openssl_1_1; } ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; - })).overrideAttrs(oa: rec { + })).overrideAttrs (oa: rec { # Parse out a version number without the Lua version inserted version = with pkgs.lib; let version' = prev.cqueues.version; rel = splitVersion version'; date = head rel; rev = last (splitString "-" (last rel)); - in "${date}-${rev}"; + in + "${date}-${rev}"; nativeBuildInputs = oa.nativeBuildInputs ++ [ pkgs.gnum4 @@ -50,17 +51,18 @@ with prev; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua # version, which doesn't work well for us, so modify it - postConfigure = let inherit (prev.cqueues) pname; in '' - # 'all' target auto-detects correct Lua version, which is fine for us as - # we only have the right one available :) - sed -Ei ''${rockspecFilename} \ - -e 's|lua == 5.[[:digit:]]|lua >= 5.1, <= 5.3|' \ - -e 's|build_target = "[^"]+"|build_target = "all"|' \ - -e 's|version = "[^"]+"|version = "${version}"|' - specDir=$(dirname ''${rockspecFilename}) - cp ''${rockspecFilename} "$specDir/${pname}-${version}.rockspec" - rockspecFilename="$specDir/${pname}-${version}.rockspec" - ''; + postConfigure = let inherit (prev.cqueues) pname; in + '' + # 'all' target auto-detects correct Lua version, which is fine for us as + # we only have the right one available :) + sed -Ei ''${rockspecFilename} \ + -e 's|lua == 5.[[:digit:]]|lua >= 5.1, <= 5.3|' \ + -e 's|build_target = "[^"]+"|build_target = "all"|' \ + -e 's|version = "[^"]+"|version = "${version}"|' + specDir=$(dirname ''${rockspecFilename}) + cp ''${rockspecFilename} "$specDir/${pname}-${version}.rockspec" + rockspecFilename="$specDir/${pname}-${version}.rockspec" + ''; }); cyrussasl = prev.luaLib.overrideLuarocks prev.cyrussasl (drv: { @@ -69,7 +71,7 @@ with prev; ]; }); - http = prev.http.overrideAttrs(oa: { + http = prev.http.overrideAttrs (oa: { patches = [ (pkgs.fetchpatch { name = "invalid-state-progression.patch"; @@ -78,16 +80,16 @@ with prev; }) ]; /* TODO: separate docs derivation? (pandoc is heavy) - nativeBuildInputs = [ pandoc ]; - makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ]; + nativeBuildInputs = [ pandoc ]; + makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ]; */ }); ldbus = prev.luaLib.overrideLuarocks prev.ldbus (drv: { extraVariables = { - DBUS_DIR="${pkgs.dbus.lib}"; - DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include"; - DBUS_INCDIR="${pkgs.dbus.dev}/include/dbus-1.0"; + DBUS_DIR = "${pkgs.dbus.lib}"; + DBUS_ARCH_INCDIR = "${pkgs.dbus.lib}/lib/dbus-1.0/include"; + DBUS_INCDIR = "${pkgs.dbus.dev}/include/dbus-1.0"; }; buildInputs = with pkgs; [ dbus @@ -139,33 +141,33 @@ with prev; if luaAtLeast "5.1" && luaOlder "5.2" then { version = "20120430.51-1"; knownRockspec = (pkgs.fetchurl { - url = "https://luarocks.org/lmathx-20120430.51-1.rockspec"; + url = "https://luarocks.org/lmathx-20120430.51-1.rockspec"; sha256 = "148vbv2g3z5si2db7rqg5bdily7m4sjyh9w6r3jnx3csvfaxyhp0"; }).outPath; src = pkgs.fetchurl { - url = "https://web.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/lmathx.tar.gz"; + url = "https://web.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/lmathx.tar.gz"; sha256 = "0sa553d0zlxhvpsmr4r7d841f16yq4wr3fg7i07ibxkz6yzxax51"; }; } else - if luaAtLeast "5.2" && luaOlder "5.3" then { - version = "20120430.52-1"; - knownRockspec = (pkgs.fetchurl { - url = "https://luarocks.org/lmathx-20120430.52-1.rockspec"; - sha256 = "14rd625sipakm72wg6xqsbbglaxyjba9nsajsfyvhg0sz8qjgdya"; - }).outPath; - src = pkgs.fetchurl { - url = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/lmathx.tar.gz"; - sha256 = "19dwa4z266l2njgi6fbq9rak4rmx2fsx1s0p9sl166ar3mnrdwz5"; - }; - } else - { - disabled = luaOlder "5.1" || luaAtLeast "5.5"; - # works fine with 5.4 as well - postConfigure = '' - substituteInPlace ''${rockspecFilename} \ - --replace 'lua ~> 5.3' 'lua >= 5.3, < 5.5' - ''; - }); + if luaAtLeast "5.2" && luaOlder "5.3" then { + version = "20120430.52-1"; + knownRockspec = (pkgs.fetchurl { + url = "https://luarocks.org/lmathx-20120430.52-1.rockspec"; + sha256 = "14rd625sipakm72wg6xqsbbglaxyjba9nsajsfyvhg0sz8qjgdya"; + }).outPath; + src = pkgs.fetchurl { + url = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/lmathx.tar.gz"; + sha256 = "19dwa4z266l2njgi6fbq9rak4rmx2fsx1s0p9sl166ar3mnrdwz5"; + }; + } else + { + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + # works fine with 5.4 as well + postConfigure = '' + substituteInPlace ''${rockspecFilename} \ + --replace 'lua ~> 5.3' 'lua >= 5.3, < 5.5' + ''; + }); lmpfrlib = prev.luaLib.overrideLuarocks prev.lmpfrlib (drv: { externalDeps = [ @@ -201,7 +203,7 @@ with prev; ]; }); - lua-lsp = prev.lua-lsp.overrideAttrs(oa: { + lua-lsp = prev.lua-lsp.overrideAttrs (oa: { # until Alloyed/lua-lsp#28 postConfigure = '' substituteInPlace ''${rockspecFilename} \ @@ -219,8 +221,8 @@ with prev; luadbi-mysql = prev.luaLib.overrideLuarocks prev.luadbi-mysql (drv: { extraVariables = { # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR="${pkgs.libmysqlclient.dev}/include/mysql"; - MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql"; + MYSQL_INCDIR = "${pkgs.libmysqlclient.dev}/include/mysql"; + MYSQL_LIBDIR = "${pkgs.libmysqlclient}/lib/mysql"; }; buildInputs = [ pkgs.mariadb.client @@ -261,7 +263,8 @@ with prev; luaffi = prev.luaLib.overrideLuarocks prev.luaffi (drv: { # The packaged .src.rock version is pretty old, and doesn't work with Lua 5.3 src = pkgs.fetchFromGitHub { - owner = "facebook"; repo = "luaffifb"; + owner = "facebook"; + repo = "luaffifb"; rev = "532c757e51c86f546a85730b71c9fef15ffa633d"; sha256 = "1nwx6sh56zfq99rcs7sph0296jf6a9z72mxknn0ysw9fd7m1r8ig"; }; @@ -305,7 +308,7 @@ with prev; ]; }); - luaunbound = prev.luaLib.overrideLuarocks prev.luaunbound(drv: { + luaunbound = prev.luaLib.overrideLuarocks prev.luaunbound (drv: { externalDeps = [ { name = "libunbound"; dep = pkgs.unbound; } ]; @@ -316,7 +319,7 @@ with prev; { name = "LIBUUID"; dep = pkgs.libuuid; } ]; disabled = luaOlder "5.1" || (luaAtLeast "5.4"); - })).overrideAttrs(oa: { + })).overrideAttrs (oa: { meta = oa.meta // { platforms = pkgs.lib.platforms.linux; }; @@ -329,9 +332,10 @@ with prev; patches = [ ./luuid.patch ]; - postConfigure = let inherit (prev.luuid) version pname; in '' - sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|' - ''; + postConfigure = let inherit (prev.luuid) version pname; in + '' + sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|' + ''; }); @@ -342,23 +346,23 @@ with prev; pname = "libluv"; inherit (prev.luv) version meta src; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_MODULE=OFF" - "-DWITH_SHARED_LIBUV=ON" - "-DLUA_BUILD_TYPE=System" - "-DWITH_LUA_ENGINE=${if isLuaJIT then "LuaJit" else "Lua"}" - ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_MODULE=OFF" + "-DWITH_SHARED_LIBUV=ON" + "-DLUA_BUILD_TYPE=System" + "-DWITH_LUA_ENGINE=${if isLuaJIT then "LuaJit" else "Lua"}" + ]; - # to make sure we dont use bundled deps - postUnpack = '' - rm -rf deps/lua deps/libuv - ''; + # to make sure we dont use bundled deps + postUnpack = '' + rm -rf deps/lua deps/libuv + ''; - buildInputs = [ pkgs.libuv final.lua ]; + buildInputs = [ pkgs.libuv final.lua ]; - nativeBuildInputs = [ pkgs.pkg-config pkgs.cmake ] - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ]; + nativeBuildInputs = [ pkgs.pkg-config pkgs.cmake ] + ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ]; }; luv = prev.luaLib.overrideLuarocks prev.luv (drv: { @@ -394,7 +398,7 @@ with prev; USE_SYSTEM_MPACK = "yes"; }); - rapidjson = prev.rapidjson.overrideAttrs(oa: { + rapidjson = prev.rapidjson.overrideAttrs (oa: { preBuild = '' sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt @@ -418,7 +422,7 @@ with prev; ''; }); - sqlite = prev.luaLib.overrideLuarocks prev.sqlite (drv: { + sqlite = prev.luaLib.overrideLuarocks prev.sqlite (drv: { doCheck = true; checkInputs = [ final.plenary-nvim pkgs.neovim-unwrapped ]; @@ -435,14 +439,14 @@ with prev; }); - std-_debug = prev.std-_debug.overrideAttrs(oa: { + std-_debug = prev.std-_debug.overrideAttrs (oa: { # run make to generate lib/std/_debug/version.lua preConfigure = '' make all ''; }); - std-normalize = prev.std-normalize.overrideAttrs(oa: { + std-normalize = prev.std-normalize.overrideAttrs (oa: { # run make to generate lib/std/_debug/version.lua preConfigure = '' make all @@ -451,8 +455,8 @@ with prev; # TODO just while testing, remove afterwards # toVimPlugin should do it instead - gitsigns-nvim = prev.gitsigns-nvim.overrideAttrs(oa: { - nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ pkgs.vimUtils.vimGenDocHook ]; + gitsigns-nvim = prev.gitsigns-nvim.overrideAttrs (oa: { + nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ pkgs.vimUtils.vimGenDocHook ]; }); # aliases From 0345bab9a67b41b0d1b7fbe6f126e80174a20169 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 24 Aug 2022 19:34:46 +0300 Subject: [PATCH 022/737] lua-modules/overrides.nix: using pkgs. messes up splicing, dont use it commands used and then added -*'s manually because the word match doesn't match those ``` rg -o '\w*pkgs\.\w*' ./pkgs/development/lua-modules/overrides.nix | sort | uniq sd 'pkgs.' '' --string-mode ./pkgs/development/lua-modules/overrides.nix ``` --- pkgs/development/lua-modules/default.nix | 5 +- pkgs/development/lua-modules/overrides.nix | 167 +++++++++++++-------- 2 files changed, 107 insertions(+), 65 deletions(-) diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix index 30492b79d9c1..e7ce417d2f17 100644 --- a/pkgs/development/lua-modules/default.nix +++ b/pkgs/development/lua-modules/default.nix @@ -3,6 +3,7 @@ , lua , packagesAttr , stdenv +, callPackage , overrides ? (final: prev: {}) }: @@ -14,10 +15,10 @@ let inherit lua pkgs lib stdenv; }; - overridenPackages = import ./overrides.nix { inherit pkgs; }; + overridenPackages = callPackage ./overrides.nix { }; generatedPackages = if (builtins.pathExists ./generated-packages.nix) then - (final: prev: pkgs.callPackage ./generated-packages.nix { inherit (final) callPackage; } final prev) else (final: prev: {}); + (final: prev: callPackage ./generated-packages.nix { inherit (final) callPackage; } final prev) else (final: prev: {}); extensions = lib.composeManyExtensions [ generatedPackages diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 36b04817987d..475bfbe4598c 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1,4 +1,45 @@ -{ pkgs }: +# do not add pkgs, it messes up splicing +{ stdenv +, cmake +, cyrus_sasl +, dbus +, expat +, fetchFromGitHub +, fetchpatch +, fetchurl +, fixDarwinDylibNames +, glib +, glibc +, gmp +, gnulib +, gnum4 +, gobject-introspection +, installShellFiles +, lib +, libevent +, libiconv +, libmpack +, libmysqlclient +, libuuid +, libuv +, libyaml +, mariadb +, mpfr +, neovim-unwrapped +, openssl_1_1 +, pcre +, pkg-config +, postgresql +, readline +, sqlite +, unbound +, vimPlugins +, vimUtils +, yajl +, zlib +, zziplib +}: + final: prev: with prev; { @@ -16,7 +57,7 @@ with prev; busted = prev.busted.overrideAttrs (oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ - pkgs.installShellFiles + installShellFiles ]; postConfigure = '' substituteInPlace ''${rockspecFilename} \ @@ -31,13 +72,13 @@ with prev; cqueues = (prev.luaLib.overrideLuarocks prev.cqueues (drv: { externalDeps = [ - { name = "CRYPTO"; dep = pkgs.openssl_1_1; } - { name = "OPENSSL"; dep = pkgs.openssl_1_1; } + { name = "CRYPTO"; dep = openssl_1_1; } + { name = "OPENSSL"; dep = openssl_1_1; } ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; })).overrideAttrs (oa: rec { # Parse out a version number without the Lua version inserted - version = with pkgs.lib; let + version = with lib; let version' = prev.cqueues.version; rel = splitVersion version'; date = head rel; @@ -46,7 +87,7 @@ with prev; "${date}-${rev}"; nativeBuildInputs = oa.nativeBuildInputs ++ [ - pkgs.gnum4 + gnum4 ]; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua @@ -67,13 +108,13 @@ with prev; cyrussasl = prev.luaLib.overrideLuarocks prev.cyrussasl (drv: { externalDeps = [ - { name = "LIBSASL"; dep = pkgs.cyrus_sasl; } + { name = "LIBSASL"; dep = cyrus_sasl; } ]; }); http = prev.http.overrideAttrs (oa: { patches = [ - (pkgs.fetchpatch { + (fetchpatch { name = "invalid-state-progression.patch"; url = "https://github.com/daurnimator/lua-http/commit/cb7b59474a.diff"; sha256 = "1vmx039n3nqfx50faqhs3wgiw28ws416rhw6vh6srmh9i826dac7"; @@ -87,11 +128,11 @@ with prev; ldbus = prev.luaLib.overrideLuarocks prev.ldbus (drv: { extraVariables = { - DBUS_DIR = "${pkgs.dbus.lib}"; - DBUS_ARCH_INCDIR = "${pkgs.dbus.lib}/lib/dbus-1.0/include"; - DBUS_INCDIR = "${pkgs.dbus.dev}/include/dbus-1.0"; + DBUS_DIR = "${dbus.lib}"; + DBUS_ARCH_INCDIR = "${dbus.lib}/lib/dbus-1.0/include"; + DBUS_INCDIR = "${dbus.dev}/include/dbus-1.0"; }; - buildInputs = with pkgs; [ + buildInputs = [ dbus ]; }); @@ -99,7 +140,7 @@ with prev; ljsyscall = prev.luaLib.overrideLuarocks prev.ljsyscall (drv: rec { version = "unstable-20180515"; # package hasn't seen any release for a long time - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "justincormack"; repo = "ljsyscall"; rev = "e587f8c55aad3955dddab3a4fa6c1968037b5c6e"; @@ -112,19 +153,19 @@ with prev; ''; disabled = luaOlder "5.1" || luaAtLeast "5.3"; - propagatedBuildInputs = with pkgs.lib; optional (!isLuaJIT) luaffi; + propagatedBuildInputs = with lib; optional (!isLuaJIT) luaffi; }); lgi = prev.lgi.overrideAttrs (oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ - pkgs.pkg-config + pkg-config ]; buildInputs = [ - pkgs.glib - pkgs.gobject-introspection + glib + gobject-introspection ]; patches = [ - (pkgs.fetchpatch { + (fetchpatch { name = "lgi-find-cairo-through-typelib.patch"; url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; @@ -140,22 +181,22 @@ with prev; lmathx = prev.luaLib.overrideLuarocks prev.lmathx (drv: if luaAtLeast "5.1" && luaOlder "5.2" then { version = "20120430.51-1"; - knownRockspec = (pkgs.fetchurl { + knownRockspec = (fetchurl { url = "https://luarocks.org/lmathx-20120430.51-1.rockspec"; sha256 = "148vbv2g3z5si2db7rqg5bdily7m4sjyh9w6r3jnx3csvfaxyhp0"; }).outPath; - src = pkgs.fetchurl { + src = fetchurl { url = "https://web.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/lmathx.tar.gz"; sha256 = "0sa553d0zlxhvpsmr4r7d841f16yq4wr3fg7i07ibxkz6yzxax51"; }; } else if luaAtLeast "5.2" && luaOlder "5.3" then { version = "20120430.52-1"; - knownRockspec = (pkgs.fetchurl { + knownRockspec = (fetchurl { url = "https://luarocks.org/lmathx-20120430.52-1.rockspec"; sha256 = "14rd625sipakm72wg6xqsbbglaxyjba9nsajsfyvhg0sz8qjgdya"; }).outPath; - src = pkgs.fetchurl { + src = fetchurl { url = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/lmathx.tar.gz"; sha256 = "19dwa4z266l2njgi6fbq9rak4rmx2fsx1s0p9sl166ar3mnrdwz5"; }; @@ -171,8 +212,8 @@ with prev; lmpfrlib = prev.luaLib.overrideLuarocks prev.lmpfrlib (drv: { externalDeps = [ - { name = "GMP"; dep = pkgs.gmp; } - { name = "MPFR"; dep = pkgs.mpfr; } + { name = "GMP"; dep = gmp; } + { name = "MPFR"; dep = mpfr; } ]; unpackPhase = '' cp $src $(stripHash $src) @@ -181,25 +222,25 @@ with prev; lrexlib-gnu = prev.luaLib.overrideLuarocks prev.lrexlib-gnu (drv: { buildInputs = [ - pkgs.gnulib + gnulib ]; }); lrexlib-pcre = prev.luaLib.overrideLuarocks prev.lrexlib-pcre (drv: { externalDeps = [ - { name = "PCRE"; dep = pkgs.pcre; } + { name = "PCRE"; dep = pcre; } ]; }); lrexlib-posix = prev.luaLib.overrideLuarocks prev.lrexlib-posix (drv: { buildInputs = [ - pkgs.glibc.dev + glibc.dev ]; }); lua-iconv = prev.luaLib.overrideLuarocks prev.lua-iconv (drv: { buildInputs = [ - pkgs.libiconv + libiconv ]; }); @@ -213,7 +254,7 @@ with prev; lua-zlib = prev.luaLib.overrideLuarocks prev.lua-zlib (drv: { buildInputs = [ - pkgs.zlib.dev + zlib.dev ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; }); @@ -221,24 +262,24 @@ with prev; luadbi-mysql = prev.luaLib.overrideLuarocks prev.luadbi-mysql (drv: { extraVariables = { # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR = "${pkgs.libmysqlclient.dev}/include/mysql"; - MYSQL_LIBDIR = "${pkgs.libmysqlclient}/lib/mysql"; + MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql"; + MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql"; }; buildInputs = [ - pkgs.mariadb.client - pkgs.libmysqlclient + mariadb.client + libmysqlclient ]; }); luadbi-postgresql = prev.luaLib.overrideLuarocks prev.luadbi-postgresql (drv: { buildInputs = [ - pkgs.postgresql + postgresql ]; }); luadbi-sqlite3 = prev.luaLib.overrideLuarocks prev.luadbi-sqlite3 (drv: { externalDeps = [ - { name = "SQLITE"; dep = pkgs.sqlite; } + { name = "SQLITE"; dep = sqlite; } ]; }); @@ -247,14 +288,14 @@ with prev; luasocket ]; externalDeps = [ - { name = "EVENT"; dep = pkgs.libevent; } + { name = "EVENT"; dep = libevent; } ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; }); luaexpat = prev.luaLib.overrideLuarocks prev.luaexpat (drv: { externalDeps = [ - { name = "EXPAT"; dep = pkgs.expat; } + { name = "EXPAT"; dep = expat; } ]; }); @@ -262,7 +303,7 @@ with prev; # but are in luajitPackages? luaffi = prev.luaLib.overrideLuarocks prev.luaffi (drv: { # The packaged .src.rock version is pretty old, and doesn't work with Lua 5.3 - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "facebook"; repo = "luaffifb"; rev = "532c757e51c86f546a85730b71c9fef15ffa633d"; @@ -275,53 +316,53 @@ with prev; luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ # https://github.com/wahern/luaossl/pull/199 - { name = "CRYPTO"; dep = pkgs.openssl_1_1; } - { name = "OPENSSL"; dep = pkgs.openssl_1_1; } + { name = "CRYPTO"; dep = openssl_1_1; } + { name = "OPENSSL"; dep = openssl_1_1; } ]; }); luasec = prev.luaLib.overrideLuarocks prev.luasec (drv: { externalDeps = [ - { name = "OPENSSL"; dep = pkgs.openssl_1_1; } + { name = "OPENSSL"; dep = openssl_1_1; } ]; }); luasql-sqlite3 = prev.luaLib.overrideLuarocks prev.luasql-sqlite3 (drv: { externalDeps = [ - { name = "SQLITE"; dep = pkgs.sqlite; } + { name = "SQLITE"; dep = sqlite; } ]; }); - luasystem = prev.luaLib.overrideLuarocks prev.luasystem (drv: pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { - buildInputs = [ pkgs.glibc.out ]; + luasystem = prev.luaLib.overrideLuarocks prev.luasystem (drv: lib.optionalAttrs stdenv.isLinux { + buildInputs = [ glibc.out ]; }); luazip = prev.luaLib.overrideLuarocks prev.luazip (drv: { buildInputs = [ - pkgs.zziplib + zziplib ]; }); lua-yajl = prev.luaLib.overrideLuarocks prev.lua-yajl (drv: { buildInputs = [ - pkgs.yajl + yajl ]; }); luaunbound = prev.luaLib.overrideLuarocks prev.luaunbound (drv: { externalDeps = [ - { name = "libunbound"; dep = pkgs.unbound; } + { name = "libunbound"; dep = unbound; } ]; }); luuid = (prev.luaLib.overrideLuarocks prev.luuid (drv: { externalDeps = [ - { name = "LIBUUID"; dep = pkgs.libuuid; } + { name = "LIBUUID"; dep = libuuid; } ]; disabled = luaOlder "5.1" || (luaAtLeast "5.4"); })).overrideAttrs (oa: { meta = oa.meta // { - platforms = pkgs.lib.platforms.linux; + platforms = lib.platforms.linux; }; # Trivial patch to make it work in both 5.1 and 5.2. Basically just the # tiny diff between the two upstream versions placed behind an #if. @@ -341,7 +382,7 @@ with prev; # as advised in https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570 # we shouldn't use luarocks machinery to build complex cmake components - libluv = pkgs.stdenv.mkDerivation { + libluv = stdenv.mkDerivation { pname = "libluv"; inherit (prev.luv) version meta src; @@ -359,15 +400,15 @@ with prev; rm -rf deps/lua deps/libuv ''; - buildInputs = [ pkgs.libuv final.lua ]; + buildInputs = [ libuv final.lua ]; - nativeBuildInputs = [ pkgs.pkg-config pkgs.cmake ] - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ]; + nativeBuildInputs = [ pkg-config cmake ] + ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; }; luv = prev.luaLib.overrideLuarocks prev.luv (drv: { - buildInputs = [ pkgs.pkg-config pkgs.libuv ]; + buildInputs = [ pkg-config libuv ]; # Use system libuv instead of building local and statically linking extraVariables = { @@ -387,12 +428,12 @@ with prev; lyaml = prev.luaLib.overrideLuarocks prev.lyaml (oa: { buildInputs = [ - pkgs.libyaml + libyaml ]; }); mpack = prev.luaLib.overrideLuarocks prev.mpack (drv: { - buildInputs = [ pkgs.libmpack ]; + buildInputs = [ libmpack ]; # the rockspec doesn't use the makefile so you may need to export more flags USE_SYSTEM_LUA = "yes"; USE_SYSTEM_MPACK = "yes"; @@ -410,30 +451,30 @@ with prev; unzip "$curSrc" tar xf *.tar.gz ''; - propagatedBuildInputs = prev.readline.propagatedBuildInputs ++ [ pkgs.readline.out ]; + propagatedBuildInputs = prev.readline.propagatedBuildInputs ++ [ readline.out ]; extraVariables = rec { - READLINE_INCDIR = "${pkgs.readline.dev}/include"; + READLINE_INCDIR = "${readline.dev}/include"; HISTORY_INCDIR = READLINE_INCDIR; }; })).overrideAttrs (old: { # Without this, source root is wrongly set to ./readline-2.6/doc setSourceRoot = '' - sourceRoot=./readline-${pkgs.lib.versions.majorMinor old.version} + sourceRoot=./readline-${lib.versions.majorMinor old.version} ''; }); sqlite = prev.luaLib.overrideLuarocks prev.sqlite (drv: { doCheck = true; - checkInputs = [ final.plenary-nvim pkgs.neovim-unwrapped ]; + checkInputs = [ final.plenary-nvim neovim-unwrapped ]; # we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin checkPhase = '' - export LIBSQLITE="${pkgs.sqlite.out}/lib/libsqlite3.so" + export LIBSQLITE="${sqlite.out}/lib/libsqlite3.so" export HOME="$TMPDIR"; nvim --headless -i NONE \ - -u test/minimal_init.vim --cmd "set rtp+=${pkgs.vimPlugins.plenary-nvim}" \ + -u test/minimal_init.vim --cmd "set rtp+=${vimPlugins.plenary-nvim}" \ -c "PlenaryBustedDirectory test/auto/ { minimal_init = './test/minimal_init.vim' }" ''; @@ -456,7 +497,7 @@ with prev; # TODO just while testing, remove afterwards # toVimPlugin should do it instead gitsigns-nvim = prev.gitsigns-nvim.overrideAttrs (oa: { - nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ pkgs.vimUtils.vimGenDocHook ]; + nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ vimUtils.vimGenDocHook ]; }); # aliases From a13d38708998938c8f95e35292ef2ace24108a54 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 24 Aug 2022 23:44:04 +0300 Subject: [PATCH 023/737] build-lua-package: remove unnecessary adding of buildInputs to nativeBuildInputs and move externalDeps' back to buildInputs both accidentally caused in https://github.com/NixOS/nixpkgs/pull/178158/files --- .../interpreters/lua-5/build-lua-package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 918bca238639..b69c7443e7ec 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -117,11 +117,11 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab nativeBuildInputs = [ wrapLua luarocks - ] - ++ buildInputs - ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ checkInputs) - ++ (map (d: d.dep) externalDeps') - ; + ] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ checkInputs); + + buildInputs = buildInputs + ++ (map (d: d.dep) externalDeps'); + # propagate lua to active setup-hook in nix-shell propagatedBuildInputs = propagatedBuildInputs ++ [ lua ]; From 50a629cc3ade2e77c807702c14460239258a8016 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 25 Aug 2022 00:17:57 +0300 Subject: [PATCH 024/737] libmpack: fix cross libmpack-aarch64-unknown-linux-gnu> libtool: link: gcc -shared -fPIC -DPIC build/debug/src/.libs/core.o build/debug/src/.libs/conv.o build/debug/src/.libs/object.o build/debug/src/.libs/rpc.o -Wl,-soname -Wl,libmpack.so.0 -o build/debug/.libs/libmpack.so.0.0.0 libmpack-aarch64-unknown-linux-gnu> /nix/store/6rdvl63vp5p0gyknf0c3svlwfjd5nbjg-libtool-2.4.7/bin/libtool: line 10840: gcc: command not found libmpack-aarch64-unknown-linux-gnu> make: *** [Makefile:151: build/debug/libmpack.la] Error 127 --- pkgs/development/libraries/libmpack/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index b62da40499cd..a3e902c0f59f 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; }; - nativeBuildInputs = [ libtool ]; - - makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" ]; + makeFlags = [ "LIBTOOL=${libtool}/bin/libtool" "PREFIX=$(out)" ]; meta = with lib; { description = "Simple implementation of msgpack in C"; From bdb8ca175ab6c65d2b7db2c085f0c4e4ef4743f5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 25 Aug 2022 00:38:06 +0300 Subject: [PATCH 025/737] luaPackages.lgi: fix cross --- pkgs/development/lua-modules/overrides.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 475bfbe4598c..1f76b4e5a6c9 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -172,6 +172,12 @@ with prev; }) ]; + # https://github.com/lgi-devs/lgi/pull/300 + postPatch = '' + substituteInPlace lgi/Makefile tests/Makefile \ + --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' + ''; + # there is only a rockspec.in in the repo, the actual rockspec must be generated preConfigure = '' make rock From 39571bd6fa6d558c45d67e91333a3cfda645b738 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 26 Aug 2022 06:17:06 +0300 Subject: [PATCH 026/737] luaPackages: copy passthruFun from python --- .../interpreters/lua-5/build-lua-package.nix | 5 +- .../interpreters/lua-5/default.nix | 88 ++++++++++++++++++- .../interpreters/lua-5/interpreter.nix | 47 +++++----- pkgs/development/interpreters/luajit/2.0.nix | 6 +- pkgs/development/interpreters/luajit/2.1.nix | 6 +- .../interpreters/luajit/default.nix | 43 +++++---- pkgs/development/lua-modules/default.nix | 43 --------- pkgs/top-level/lua-packages.nix | 7 +- 8 files changed, 150 insertions(+), 95 deletions(-) delete mode 100644 pkgs/development/lua-modules/default.nix diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index b69c7443e7ec..b2f82ddb4694 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -1,7 +1,6 @@ # Generic builder for lua packages { lib , lua -, buildPackages , wrapLua , luarocks # Whether the derivation provides a lua module or not. @@ -14,9 +13,7 @@ pname , version # by default prefix `name` e.g. "lua5.2-${name}" -, namePrefix ? if lua.pkgs.isLuaJIT - then lua.name + "-" - else "lua" + lua.luaversion + "-" +, namePrefix ? "${lua.pname}${lua.sourceVersion.major}.${lua.sourceVersion.minor}-" # Dependencies for building the package , buildInputs ? [] diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 97e444ded903..39de72785437 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -1,11 +1,86 @@ # similar to interpreters/python/default.nix { stdenv, lib, callPackage, fetchurl, fetchpatch, makeBinaryWrapper }: + +let + + # Common passthru for all lua interpreters. + # copied from python + passthruFun = + { executable + , sourceVersion + , luaversion + , packageOverrides + , luaOnBuildForBuild + , luaOnBuildForHost + , luaOnBuildForTarget + , luaOnHostForHost + , luaOnTargetForTarget + , luaAttr ? null + , self # is luaOnHostForTarget + }: let + luaPackages = callPackage + # Function that when called + # - imports lua-packages.nix + # - adds spliced package sets to the package set + # - applies overrides from `packageOverrides` + ({ lua, overrides, callPackage, splicePackages, newScope }: let + luaPackagesFun = callPackage ../../../top-level/lua-packages.nix { + lua = self; + }; + generatedPackages = if (builtins.pathExists ../../lua-modules/generated-packages.nix) then + (final: prev: callPackage ../../lua-modules/generated-packages.nix { inherit (final) callPackage; } final prev) + else (final: prev: {}); + overridenPackages = callPackage ../../lua-modules/overrides.nix { }; + + otherSplices = { + selfBuildBuild = luaOnBuildForBuild.pkgs; + selfBuildHost = luaOnBuildForHost.pkgs; + selfBuildTarget = luaOnBuildForTarget.pkgs; + selfHostHost = luaOnHostForHost.pkgs; + selfTargetTarget = luaOnTargetForTarget.pkgs or {}; + }; + keep = self: { }; + extra = spliced0: {}; + extensions = lib.composeManyExtensions [ + generatedPackages + overridenPackages + overrides + ]; + in lib.makeScopeWithSplicing + splicePackages + newScope + otherSplices + keep + extra + (lib.extends extensions luaPackagesFun)) + { + overrides = packageOverrides; + lua = self; + }; + in rec { + buildEnv = callPackage ./wrapper.nix { + lua = self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/${executable}"; + inherit executable luaversion sourceVersion; + luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; }; + + inherit luaAttr; + }; + +in + rec { lua5_4 = callPackage ./interpreter.nix { + self = lua5_4; sourceVersion = { major = "5"; minor = "4"; patch = "3"; }; hash = "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq"; makeWrapper = makeBinaryWrapper; + inherit passthruFun; patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch ++ [ @@ -28,53 +103,62 @@ rec { }; lua5_4_compat = lua5_4.override({ + self = lua5_4_compat; compat = true; }); lua5_3 = callPackage ./interpreter.nix { + self = lua5_3; sourceVersion = { major = "5"; minor = "3"; patch = "6"; }; hash = "0q3d8qhd7p0b7a4mh9g7fxqksqfs6mr1nav74vq26qvkp2dxcpzw"; makeWrapper = makeBinaryWrapper; + inherit passthruFun; patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; }; lua5_3_compat = lua5_3.override({ + self = lua5_3_compat; compat = true; }); lua5_2 = callPackage ./interpreter.nix { + self = lua5_2; sourceVersion = { major = "5"; minor = "2"; patch = "4"; }; hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; makeWrapper = makeBinaryWrapper; + inherit passthruFun; patches = [ ./CVE-2022-28805.patch ] ++ lib.optional stdenv.isDarwin ./5.2.darwin.patch; }; lua5_2_compat = lua5_2.override({ + self = lua5_2_compat; compat = true; }); lua5_1 = callPackage ./interpreter.nix { + self = lua5_1; sourceVersion = { major = "5"; minor = "1"; patch = "5"; }; hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; makeWrapper = makeBinaryWrapper; + inherit passthruFun; patches = (lib.optional stdenv.isDarwin ./5.1.darwin.patch) ++ [ ./CVE-2014-5461.patch ]; }; luajit_2_0 = import ../luajit/2.0.nix { self = luajit_2_0; - inherit callPackage lib; + inherit callPackage lib passthruFun; }; luajit_2_1 = import ../luajit/2.1.nix { self = luajit_2_1; - inherit callPackage; + inherit callPackage passthruFun; }; } diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index c392a2c3bb52..d4af272e7cf6 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -2,22 +2,26 @@ , compat ? false , callPackage , makeWrapper +, self , packageOverrides ? (final: prev: {}) +, pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsHostHost +, pkgsTargetTarget , sourceVersion , hash +, passthruFun , patches ? [] , postConfigure ? null , postBuild ? null , staticOnly ? stdenv.hostPlatform.isStatic -}: +, luaAttr ? "lua${sourceVersion.major}_${sourceVersion.minor}" +} @ inputs: let - luaversion = with sourceVersion; "${major}.${minor}"; + luaPackages = self.pkgs; - luaPackages = callPackage ../../lua-modules { - lua = self; - overrides = packageOverrides; - packagesAttr = "lua${lib.replaceChars ["."] ["_"] luaversion}.pkgs"; - }; + luaversion = with sourceVersion; "${major}.${minor}"; plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" @@ -28,8 +32,9 @@ plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux else if stdenv.hostPlatform.isBSD then "bsd" else if stdenv.hostPlatform.isUnix then "posix" else "generic"; +in -self = stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "lua"; version = "${luaversion}.${sourceVersion.patch}"; @@ -125,16 +130,19 @@ self = stdenv.mkDerivation rec { ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc" ''; - passthru = rec { - inherit luaversion; - buildEnv = callPackage ./wrapper.nix { - lua = self; - inherit makeWrapper; - inherit (luaPackages) requiredLuaModules; - }; - withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; - pkgs = luaPackages; - interpreter = "${self}/bin/lua"; + # copied from python + passthru = let + # When we override the interpreter we also need to override the spliced versions of the interpreter + inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs; + override = attr: let lua = attr.override (inputs' // { self = lua; }); in lua; + in passthruFun rec { + inherit self luaversion packageOverrides luaAttr sourceVersion; + executable = "lua"; + luaOnBuildForBuild = override pkgsBuildBuild.${luaAttr}; + luaOnBuildForHost = override pkgsBuildHost.${luaAttr}; + luaOnBuildForTarget = override pkgsBuildTarget.${luaAttr}; + luaOnHostForHost = override pkgsHostHost.${luaAttr}; + luaOnTargetForTarget = if lib.hasAttr luaAttr pkgsTargetTarget then (override pkgsTargetTarget.${luaAttr}) else {}; }; meta = { @@ -151,5 +159,4 @@ self = stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -}; -in self +} diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 0816ecb548fb..fe7843caeb0f 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,7 +1,7 @@ -{ self, callPackage, lib }: +{ self, callPackage, lib, passthruFun }: callPackage ./default.nix { - inherit self; - packagesAttr = "luajit_2_0.pkgs"; + sourceVersion = { major = "2"; minor = "0"; patch = "5"; }; + inherit self passthruFun; version = "2.0.5-2022-03-13"; rev = "93a65d3cc263aef2d2feb3d7ff2206aca3bee17e"; isStable = true; diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 25232a52c4b4..d5c539331e00 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,7 +1,7 @@ -{ self, callPackage }: +{ self, callPackage, passthruFun }: callPackage ./default.nix { - inherit self; - packagesAttr = "luajit_2_1.pkgs"; + sourceVersion = { major = "2"; minor = "1"; patch = "0"; }; + inherit self passthruFun; version = "2.1.0-2022-04-05"; rev = "5e3c45c43bb0e0f1f2917d432e9d2dba12c42a6e"; isStable = false; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 9fe697d887a7..2d47b0395c36 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,16 +2,21 @@ , stdenv , fetchFromGitHub , buildPackages -, name ? "luajit-${version}" , isStable , hash , rev , version -, packagesAttr , extraMeta ? { } , callPackage , self , packageOverrides ? (final: prev: {}) +, pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsHostHost +, pkgsTargetTarget +, sourceVersion +, passthruFun , enableFFI ? true , enableJIT ? true , enableJITDebugModule ? enableJIT @@ -23,16 +28,14 @@ , enableAPICheck ? false , enableVMAssertions ? false , useSystemMalloc ? false -}: +, luaAttr ? "luajit_${sourceVersion.major}_${sourceVersion.minor}" +} @ inputs: assert enableJITDebugModule -> enableJIT; assert enableGDBJITSupport -> enableJIT; assert enableValgrindSupport -> valgrind != null; let - luaPackages = callPackage ../../lua-modules { - lua = self; - overrides = packageOverrides; - inherit packagesAttr; - }; + + luaPackages = self.pkgs; XCFLAGS = with lib; optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" @@ -47,7 +50,8 @@ let ; in stdenv.mkDerivation rec { - inherit name version; + pname = "luajit"; + inherit version; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; @@ -103,14 +107,19 @@ stdenv.mkDerivation rec { setupHook = luaPackages.lua-setup-hook luaPackages.luaLib.luaPathList luaPackages.luaLib.luaCPathList; - passthru = rec { - buildEnv = callPackage ../lua-5/wrapper.nix { - lua = self; - inherit (luaPackages) requiredLuaModules; - }; - withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages; }; - pkgs = luaPackages; - interpreter = "${self}/bin/lua"; + # copied from python + passthru = let + # When we override the interpreter we also need to override the spliced versions of the interpreter + inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs; + override = attr: let lua = attr.override (inputs' // { self = lua; }); in lua; + in passthruFun rec { + inherit self luaversion packageOverrides luaAttr sourceVersion; + executable = "lua"; + luaOnBuildForBuild = override pkgsBuildBuild.${luaAttr}; + luaOnBuildForHost = override pkgsBuildHost.${luaAttr}; + luaOnBuildForTarget = override pkgsBuildTarget.${luaAttr}; + luaOnHostForHost = override pkgsHostHost.${luaAttr}; + luaOnTargetForTarget = if lib.hasAttr luaAttr pkgsTargetTarget then (override pkgsTargetTarget.${luaAttr}) else {}; }; meta = with lib; { diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix deleted file mode 100644 index e7ce417d2f17..000000000000 --- a/pkgs/development/lua-modules/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -# inspired by pkgs/development/haskell-modules/default.nix -{ pkgs, lib -, lua -, packagesAttr -, stdenv -, callPackage -, overrides ? (final: prev: {}) -}: - -let - - inherit (lib) extends; - - initialPackages = import ../../top-level/lua-packages.nix { - inherit lua pkgs lib stdenv; - }; - - overridenPackages = callPackage ./overrides.nix { }; - - generatedPackages = if (builtins.pathExists ./generated-packages.nix) then - (final: prev: callPackage ./generated-packages.nix { inherit (final) callPackage; } final prev) else (final: prev: {}); - - extensions = lib.composeManyExtensions [ - generatedPackages - overridenPackages - overrides - ]; - - otherSplices = let - packagesAttrFun = set: lib.getAttrFromPath (lib.splitString "." packagesAttr) set; - in { - selfBuildBuild = packagesAttrFun pkgs.pkgsBuildBuild; - selfBuildHost = packagesAttrFun pkgs.pkgsBuildHost; - selfBuildTarget = packagesAttrFun pkgs.pkgsBuildTarget; - selfHostHost = packagesAttrFun pkgs.pkgsHostHost; - selfTargetTarget = if pkgs.pkgsTargetTarget.__raw or false then {} else packagesAttrFun pkgs.pkgsTargetTarget; # might be missing; - }; - keep = self: { }; - extra = spliced0: { }; - -in - lib.makeScopeWithSplicing pkgs.splicePackages pkgs.newScope otherSplices keep extra - (lib.extends extensions initialPackages) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 42d7a44cf82c..3617e7632333 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,12 +5,13 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ stdenv -, lua -, pkgs +{ pkgs +, stdenv , lib +, lua }: + self: let From 7b24b57c14b954ff15a0b49b8a0404a222e3f258 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 26 Aug 2022 20:00:31 +0300 Subject: [PATCH 027/737] luaPackages.luarocks: don't refer to luaOnBuild --- pkgs/development/tools/misc/luarocks/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 533648c217d6..18285481514b 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* + substituteInPlace $out/etc/luarocks/* \ + --replace '${lua.luaOnBuild}' '${lua}' for i in "$out"/bin/*; do test -L "$i" || { @@ -86,6 +88,10 @@ stdenv.mkDerivation rec { export LUA_PATH="src/?.lua;''${LUA_PATH:-}" ''; + disallowedReferences = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + lua.luaOnBuild + ]; + passthru = { updateScript = nix-update-script { attrPath = pname; From b84e8342dfe0f8aaea6dabf7531bd62a9c7e216d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Aug 2022 17:56:06 +0000 Subject: [PATCH 028/737] libssh: 0.9.6 -> 0.10.0 --- pkgs/development/libraries/libssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c5cd5c353960..5fbf7ed0a946 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.9.6"; + version = "0.10.0"; src = fetchurl { url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hrz4hb2bgEZv4OBUU8WLh332GvqLqUeljDVtfw+rgps="; + sha256 = "sha256-DcFYxTTNg4rQt4WoLexYbeQNp+CWUjrmwIybe9KvC1c="; }; postPatch = '' From 1725792452dc9c2e095acf426fbb6a9f1f741680 Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Wed, 24 Aug 2022 23:31:45 +0200 Subject: [PATCH 029/737] python3Packages.pybind11: use python interpreter from pythonForBuild --- pkgs/development/python-modules/pybind11/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 8f01ddd49adf..327a44690da3 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { "-DBoost_INCLUDE_DIR=${lib.getDev boost}/include" "-DEIGEN3_INCLUDE_DIR=${lib.getDev eigen}/include/eigen3" "-DBUILD_TESTING=on" + "-DPYTHON_EXECUTABLE:FILEPATH=${python.pythonForBuild.interpreter}" ] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ "-DPYBIND11_CXX_STANDARD=-std=c++17" ]; From 557684da242e2b8bb3e6a1abe2d09eb4b7ffcb44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Aug 2022 09:44:02 +0000 Subject: [PATCH 030/737] doxygen: 1.9.4 -> 1.9.5 --- pkgs/development/tools/documentation/doxygen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index eb2e1f6055b2..8cdb533da8e0 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-Dnr8d+ngSBkgL/BITvsvoERAHQyEXCoQDltbnQ2nXKM="; + sha256 = "sha256-968LGj2b8qLs/YQ1DxC1s/xf5qUwnrd8xu5iKrqNN+Y="; }; nativeBuildInputs = [ From 2e7c3920a07136c9b7321ba7b24dbdf5528d533f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 21 Aug 2022 16:27:25 +0200 Subject: [PATCH 031/737] pythonPackages: fix cross compilation This fixes, again, the issue with the wrong headers being used when cross compiling python packages with extensions. For context, see https://github.com/NixOS/nixpkgs/pull/173435. --- pkgs/development/python-modules/setuptools/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 883ca18e93e4..2d3c06d602f1 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , python , bootstrapped-pip , lib @@ -27,6 +28,14 @@ let patches = [ ./tag-date.patch ./setuptools-distutils-C++.patch + # Fix cross compilation of extension modules + # https://github.com/pypa/distutils/pull/173 + (fetchpatch { + url = "https://github.com/pypa/distutils/commit/22b9bcf2e2d2a66f7dc96661312972e2f6bd9e01.patch"; + hash = "sha256-IVb1LLgLIHO6HPn2911uksrLB1jG0MyQetdxkq5wcG4="; + stripLen = 2; + extraPrefix = "setuptools/_distutils/"; + }) ]; buildPhase = '' From 0b3ec7fbc83637a33d004f296c1b743ea4fafdcb Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 21 Aug 2022 12:07:34 +0200 Subject: [PATCH 032/737] mpv: fix cross compilation --- pkgs/applications/video/mpv/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index cf81c0e0446c..e67f6d117a65 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -100,6 +100,10 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + # These flags are not supported and cause the build + # to fail, even when cross compilation itself works. + dontAddWafCrossFlags = true; + wafConfigureFlags = [ "--enable-libmpv-shared" "--enable-manpage-build" From 5e04a1fd5d803a1e533be51e2273d6d4d140dbaa Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 27 Aug 2022 19:16:55 +0200 Subject: [PATCH 033/737] mpv: fix build with wayland support --- pkgs/applications/video/mpv/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index e67f6d117a65..beb6c70f4eea 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -24,6 +24,7 @@ , waylandSupport ? stdenv.isLinux , wayland , wayland-protocols + , wayland-scanner , libxkbcommon , x11Support ? stdenv.isLinux @@ -131,7 +132,8 @@ in stdenv.mkDerivation rec { python3 wafHook which - ] ++ lib.optionals swiftSupport [ swift ]; + ] ++ lib.optionals swiftSupport [ swift ] + ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = [ ffmpeg From 992773b898176baeb4934e90718ed3c61f7e4674 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 30 Aug 2022 09:39:09 +0300 Subject: [PATCH 034/737] boehmgc: 8.0.6 -> 8.2.2 https://github.com/ivmai/bdwgc/releases/tag/v8.2.2 Drop mcfgthread.patch (upstreamed). --- pkgs/development/libraries/boehm-gc/default.nix | 13 ++++--------- .../development/libraries/boehm-gc/mcfgthread.patch | 11 ----------- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/boehm-gc/mcfgthread.patch diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 1e74ddfc721e..2e1c0010f512 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , autoreconfHook -# doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG) +# doc: https://github.com/ivmai/bdwgc/blob/v8.2.2/doc/README.macros (LARGE_CONFIG) , enableLargeConfig ? false , enableMmap ? true , nixVersions @@ -10,22 +10,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "boehm-gc"; - version = "8.0.6"; + version = "8.2.2"; src = fetchurl { urls = [ - "https://www.hboehm.info/gc/gc_source/gc-${finalAttrs.version}.tar.gz" + # "https://www.hboehm.info/gc/gc_source/gc-${finalAttrs.version}.tar.gz" "https://github.com/ivmai/bdwgc/releases/download/v${finalAttrs.version}/gc-${finalAttrs.version}.tar.gz" ]; - sha256 = "sha256-O0kUq8n6dlk1lnc+TaZx1+1NU5Dj1G+/Ll8VXhIb6hE="; + sha256 = "sha256-8wEHvLBi4JIKeQ//+lbZUSNIVGhZNkwjoUviZLOINqA="; }; outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - # boehm-gc whitelists GCC threading models - patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch; - configureFlags = [ "--enable-cplusplus" "--with-libatomic-ops=none" @@ -33,8 +30,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableMmap "--enable-mmap" ++ lib.optional enableLargeConfig "--enable-large-config"; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; - doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boehm-gc/mcfgthread.patch b/pkgs/development/libraries/boehm-gc/mcfgthread.patch deleted file mode 100644 index c4aa996aebd7..000000000000 --- a/pkgs/development/libraries/boehm-gc/mcfgthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -277,7 +277,7 @@ case "$THREADS" in - ;; - esac - ;; -- win32) -+ win32 | mcf) - AC_DEFINE(GC_THREADS) - use_parallel_mark=$enable_parallel_mark - if test "${enable_parallel_mark}" != no \ From 372315edb82844e01b9e94c17d9f6c40dcc6f058 Mon Sep 17 00:00:00 2001 From: riceicetea <104317939+riceicetea@users.noreply.github.com> Date: Tue, 30 Aug 2022 15:35:40 +0200 Subject: [PATCH 035/737] hunspell: 1.7.0 -> 1.7.1 --- pkgs/development/libraries/hunspell/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 44f49adbd3a6..baaa07d7e7ea 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, readline, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.7.0"; + version = "1.7.1"; pname = "hunspell"; src = fetchFromGitHub { @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch - (fetchpatch { - name = "CVE-2019-16707.patch"; - url = "https://github.com/hunspell/hunspell/commit/ac938e2ecb48ab4dd21298126c7921689d60571b.patch"; - sha256 = "0bwfksz87iy7ikx3fb54zd5ww169qfm9kl076hsch3cs8p30s8az"; - }) ]; postPatch = '' From 1ab5ab5fca0f03881d3f356a03dd039c1212c4c9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 19 Aug 2022 15:55:18 +0200 Subject: [PATCH 036/737] =?UTF-8?q?xorg.libX11:=201.7.2=20=E2=86=92=201.8.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/xorg/lib/libx11/-/compare/libX11-1.7.2...libX11-1.8.1 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ef5b58787f33..77d68e1d9aab 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -858,11 +858,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { pname = "libX11"; - version = "1.7.2"; + version = "1.8.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.7.2.tar.bz2"; - sha256 = "0v7aj8q3rlchdyfwdna7n7vgpyzyir391dlv5rwy9fxagbikbyhw"; + url = "mirror://xorg/individual/lib/libX11-1.8.1.tar.xz"; + sha256 = "1xyry8i7zqmlkvpbyyqwi18rrdw6ycczlvfp63rh2570pfhimi0v"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index dbab8a4774f1..302d56a06636 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.7.2.tar.bz2 +mirror://xorg/individual/lib/libX11-1.8.1.tar.xz mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 From 267ef1f2dee1baee4d5da59a1c669e1e4e08065f Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 4 Aug 2022 08:51:06 +0300 Subject: [PATCH 037/737] gobject-introspection: wrapper: add .libs to LD_LIBRARY_PATH for emulator fixes issues like libdbusmenu-gtk3-aarch64-unknown-linux-gnu> /build/libdbusmenu-16.04.0/libdbusmenu-gtk/tmp-introspect2jhtiwwn/.libs/DbusmenuGtk3-0.4: error while loading shared libraries: libdbusmenu-glib.so.4: cannot open shared object file: No such file or directory in non-meson builds i think the reason we need this in all non-meson builds is because of ./pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch see: https://github.com/void-linux/void-packages/blob/master/srcpkgs/gobject-introspection/files/g-ir-scanner-qemuwrapper https://github.com/openembedded/openembedded-core/blob/c5a14f39a6717a99b510cb97aa2fb403d4b98d99/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.72.0.bb#L74 --- .../gobject-introspection/wrapper.nix | 6 ++--- .../wrappers/g-ir-compiler.sh | 2 +- .../wrappers/g-ir-scanner-qemuwrapper.sh | 23 +++++++++++++++++++ .../wrappers/g-ir-scanner.sh | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-qemuwrapper.sh diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 4b3fa1a19819..917debf98264 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -25,6 +25,7 @@ in ( export bash="${buildPackages.bash}" export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} + export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper" export buildobjdump="${buildPackages.stdenv.cc.bintools}/bin/objdump" export targetgir="${lib.getDev (targetPackages.gobject-introspection-unwrapped.override argsForTarget)}" @@ -32,9 +33,8 @@ in substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler" substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner" substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper" - chmod +x "$dev/bin/g-ir-compiler" - chmod +x "$dev/bin/g-ir-scanner" - chmod +x "$dev/bin/g-ir-scanner-lddwrapper" + substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper" + chmod +x $dev/bin/g-ir-* ) '' # when cross-compiling and using the wrapper then when a package looks up the g_ir_X diff --git a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh index 69642831c8a0..e82de18cae3d 100644 --- a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh +++ b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh @@ -1,4 +1,4 @@ #! @bash@/bin/bash # shellcheck shell=bash -exec @emulator@ @targetgir@/bin/g-ir-compiler "$@" +exec @emulatorwrapper@ @targetgir@/bin/g-ir-compiler "$@" diff --git a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-qemuwrapper.sh b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-qemuwrapper.sh new file mode 100644 index 000000000000..9b407bc4144a --- /dev/null +++ b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-qemuwrapper.sh @@ -0,0 +1,23 @@ +#! @bash@/bin/bash +# shellcheck shell=bash + +# fixes issues like +# libdbusmenu-gtk3-aarch64-unknown-linux-gnu> /build/libdbusmenu-16.04.0/libdbusmenu-gtk/tmp-introspect2jhtiwwn/.libs/DbusmenuGtk3-0.4: +# error while loading shared libraries: libdbusmenu-glib.so.4: cannot open shared object file: No such file or directory +# in non-meson builds + +# see: https://github.com/void-linux/void-packages/blob/master/srcpkgs/gobject-introspection/files/g-ir-scanner-qemuwrapper +# https://github.com/openembedded/openembedded-core/blob/c5a14f39a6717a99b510cb97aa2fb403d4b98d99/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.72.0.bb#L74 +while read -r d; do \ + # some meson projects may have subprojects which use makefiles for docs(e.g. gi-docgen), ignore those as they will never be needed + if [[ -f "$d/Makefile" && "$d" != *"subproject"* ]]; then + GIR_EXTRA_LIBS_PATH="$(readlink -f "$d/.libs"):$GIR_EXTRA_LIBS_PATH" + export GIR_EXTRA_LIBS_PATH + fi +done < <(find "$NIX_BUILD_TOP" -type d) + +# quoting broke the build of atk +# shellcheck disable=2086 +exec @emulator@ ${GIR_EXTRA_OPTIONS:-} \ + ${GIR_EXTRA_LIBS_PATH:+-E LD_LIBRARY_PATH="${GIR_EXTRA_LIBS_PATH}"} \ + "$@" diff --git a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh index 6a222191c7b2..7843bb91db97 100644 --- a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh +++ b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh @@ -2,6 +2,6 @@ # shellcheck shell=bash exec @dev@/bin/.g-ir-scanner-wrapped \ - --use-binary-wrapper=@emulator@ \ + --use-binary-wrapper=@emulatorwrapper@ \ --use-ldd-wrapper=@dev@/bin/g-ir-scanner-lddwrapper \ "$@" From 39bcbc32f10b122aed3f402455af9d9b7e1e3290 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 30 Aug 2022 22:19:13 +0100 Subject: [PATCH 038/737] libtiff: add patch for CVE-2022-2953 --- pkgs/development/libraries/libtiff/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 7f6d11d9e715..a87513174fb7 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990.patch"; sha256 = "sha256-faKsdJjvQwNdkAKjYm4vubvZvnULt9zz4l53zBFr67s="; }) + (fetchpatch { + name = "CVE-2022-2953.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/48d6ece8389b01129e7d357f0985c8f938ce3da3.patch"; + sha256 = "sha256-h9hulV+dnsUt/2Rsk4C1AKdULkvweM2ypIJXYQ3BqQU="; + }) ]; postPatch = '' From 190a5fe56d08fe1474d3975f6c07dbede3d0a6d3 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 31 Aug 2022 11:26:55 +0200 Subject: [PATCH 039/737] nix/boehmgc: Rebase patch --- .../boehmgc-coroutine-sp-fallback.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch index e659bf470d39..e4e2b3858ad5 100644 --- a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch +++ b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch @@ -1,17 +1,17 @@ diff --git a/pthread_stop_world.c b/pthread_stop_world.c -index 4b2c429..1fb4c52 100644 +index b5d71e62..aed7b0bf 100644 --- a/pthread_stop_world.c +++ b/pthread_stop_world.c -@@ -673,6 +673,8 @@ GC_INNER void GC_push_all_stacks(void) - struct GC_traced_stack_sect_s *traced_stack_sect; - pthread_t self = pthread_self(); - word total_size = 0; +@@ -768,6 +768,8 @@ STATIC void GC_restart_handler(int sig) + /* world is stopped. Should not fail if it isn't. */ + GC_INNER void GC_push_all_stacks(void) + { + size_t stack_limit; + pthread_attr_t pattr; - - if (!EXPECT(GC_thr_initialized, TRUE)) - GC_thr_init(); -@@ -722,6 +724,31 @@ GC_INNER void GC_push_all_stacks(void) + GC_bool found_me = FALSE; + size_t nthreads = 0; + int i; +@@ -851,6 +853,31 @@ GC_INNER void GC_push_all_stacks(void) hi = p->altstack + p->altstack_size; /* FIXME: Need to scan the normal stack too, but how ? */ /* FIXME: Assume stack grows down */ From a42926f2fe61dbba2d116955c07821f1c2f3dbd2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 31 Aug 2022 04:01:47 +0200 Subject: [PATCH 040/737] gobject-introspection: enable building doctool --- .../libraries/gobject-introspection/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index bb07d8c792ce..f4d1d2c80032 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -27,6 +27,12 @@ # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated +let + pythonModules = pp: [ + pp.Mako + pp.markdown + ]; +in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; version = "1.72.0"; @@ -67,12 +73,13 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc docbook-xsl-nons docbook_xml_dtd_45 - python3 + # Build definition checks for the Python modules needed at runtime by importing them. + (buildPackages.python3.withPackages pythonModules) finalAttrs.setupHook # move .gir files ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ gobject-introspection-unwrapped ]; buildInputs = [ - python3 + (python3.withPackages pythonModules) ]; checkInputs = lib.optionals stdenv.isDarwin [ @@ -86,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "--datadir=${placeholder "dev"}/share" - "-Ddoctool=disabled" "-Dcairo=disabled" "-Dgtk_doc=${lib.boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ From 154a55389c64dd28fc7c2c1a284a2e8b6cf7ba32 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 30 Aug 2022 22:19:20 +0300 Subject: [PATCH 041/737] libstemmer: install and use snowball binary from buildPackages libstemmer-aarch64-unknown-linux-gnu> ./snowball algorithms/arabic.sbl -o src_c/stem_UTF_8_arabic -eprefix arabic_UTF_8_ -r ../runtime -u libstemmer-aarch64-unknown-linux-gnu> /nix/store/p7bpdnxqd3i5hwm92mrscf7mvxk66404-bash-5.1-p16/bin/bash: line 4: ./snowball: cannot execute binary file: Exec format error ref https://github.com/archlinux/svntogit-packages/blob/packages/snowball/trunk/PKGBUILD for emulator alternative ref: https://github.com/void-linux/void-packages/blob/4976c61b3af5ce6039caf19365c9dfb536d495f9/srcpkgs/snowball/template#L16-L21 --- pkgs/development/libraries/libstemmer/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix index b0beafbcee26..3f66ee92a72e 100644 --- a/pkgs/development/libraries/libstemmer/default.nix +++ b/pkgs/development/libraries/libstemmer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl }: +{ lib, stdenv, fetchFromGitHub, perl, buildPackages }: stdenv.mkDerivation rec { pname = "libstemmer"; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { prePatch = '' patchShebangs . + '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace GNUmakefile \ + --replace './snowball' '${lib.getBin buildPackages.libstemmer}/bin/snowball' ''; makeTarget = "libstemmer.a"; @@ -23,6 +26,7 @@ stdenv.mkDerivation rec { runHook preInstall install -Dt $out/lib libstemmer.a install -Dt $out/include include/libstemmer.h + install -Dt $out/bin {snowball,stemwords} runHook postInstall ''; From f1927d014edeea6322c159821cb78a6a82381be6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Aug 2022 19:26:59 +0000 Subject: [PATCH 042/737] ninja: 1.11.0 -> 1.11.1 --- pkgs/development/tools/build-managers/ninja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index abc3dbefb9c2..ffa582b56187 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "ninja"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - sha256 = "sha256-xZwMdwvg29lauHKk9M318Vz7pXZFhf3kFcyOTBdjmJM="; + sha256 = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; }; nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; From 3d1f96e1b4aecea4ebca6edb0627c5ddbc91ed7c Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 1 Sep 2022 01:19:16 +0300 Subject: [PATCH 043/737] gobject-introspection: enable strictDeps and improve cross conditional the flags defined in it are required if the hostPlatform can't be executed --- .../development/libraries/gobject-introspection/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index f4d1d2c80032..8dae27e7ccae 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -64,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -76,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { # Build definition checks for the Python modules needed at runtime by importing them. (buildPackages.python3.withPackages pythonModules) finalAttrs.setupHook # move .gir files - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ gobject-introspection-unwrapped ]; + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ gobject-introspection-unwrapped ]; buildInputs = [ (python3.withPackages pythonModules) @@ -95,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { "--datadir=${placeholder "dev"}/share" "-Dcairo=disabled" "-Dgtk_doc=${lib.boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-Dgi_cross_ldd_wrapper=${substituteAll { name = "g-ir-scanner-lddwrapper"; isExecutable = true; From 4e2901d7cbdbc5e536ac6507eb1218640ab6dde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 1 Sep 2022 00:28:00 +0200 Subject: [PATCH 044/737] python310Packages.jsonschema: 4.13.0 -> 4.15.0 --- pkgs/development/python-modules/jsonschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 2ccbacbf61c8..49d23be4eadc 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.13.0"; + version = "4.15.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N3ZRLfT1P3Tm4o/jVxe1siPBdWh1SGmEoxvJFl5/ySA="; + sha256 = "sha256-IfSXk5G9zrBE5QL9jnnnOMDN+9yHc/mkm1dpRh6C/h4="; }; patches = [ From 8f40fcbb4cab70262f298070a68602288fcfc742 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 1 Sep 2022 05:52:51 +0300 Subject: [PATCH 045/737] gobject-introspection: propagate self/targetself to avoid having to add gobject-introspection to buildInputs i should probably move to use the wrapper when host != build and do the canExecute things inside the wrapper.nix then i could use gobject-introspection-unwrapped in it even when host == build void also adds gobject-introspection to makeDepends when its gir build helper is used --- .../libraries/gobject-introspection/default.nix | 8 ++++++++ .../libraries/gobject-introspection/wrapper.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 8dae27e7ccae..bd2873a04070 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -138,6 +138,14 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} ''; + # add self to buildInputs to avoid needing to add gobject-introspection to buildInputs in addition to nativeBuildInputs + # builds use target-pkg-config to look for gobject-introspection instead of just looking for binaries in $PATH + # wrapper uses depsTargetTargetPropagated so ignore it + preFixup = lib.optionalString (!lib.hasSuffix "-wrapped" finalAttrs.pname) '' + mkdir -p $dev/nix-support + echo "$out" > $dev/nix-support/propagated-target-target-deps + ''; + setupHook = ./setup-hook.sh; passthru = { diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 917debf98264..132104c1f645 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -18,6 +18,7 @@ in (gobject-introspection-unwrapped.override args).overrideAttrs (previousAttrs: { pname = "gobject-introspection-wrapped"; + depsTargetTargetPropagated = [ gobject-introspection-unwrapped ]; postFixup = (previousAttrs.postFixup or "") + '' mv $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped mv $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped From d4645efac056f348be418aaa3fc4f4e731617329 Mon Sep 17 00:00:00 2001 From: betaboon Date: Tue, 26 Jul 2022 16:51:50 +0200 Subject: [PATCH 046/737] pdm: 1.14.0 -> 2.1.2 Co-Authored-By: Martin Weinelt --- .../package-management/pdm/check-update.patch | 12 ------- pkgs/tools/package-management/pdm/default.nix | 35 ++++++++----------- 2 files changed, 14 insertions(+), 33 deletions(-) delete mode 100644 pkgs/tools/package-management/pdm/check-update.patch diff --git a/pkgs/tools/package-management/pdm/check-update.patch b/pkgs/tools/package-management/pdm/check-update.patch deleted file mode 100644 index 9bc216177e5b..000000000000 --- a/pkgs/tools/package-management/pdm/check-update.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/conftest.py b/tests/conftest.py -index d310d36..e15d398 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -252,6 +252,7 @@ def project_no_init(tmp_path, mocker): - old_config_map = Config._config_map.copy() - tmp_path.joinpath("caches").mkdir(parents=True) - p.global_config["cache_dir"] = tmp_path.joinpath("caches").as_posix() -+ p.global_config["check_update"] = False - do_use(p, getattr(sys, "_base_executable", sys.executable)) - with temp_environ(): - os.environ.pop("VIRTUAL_ENV", None) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 7458262b168a..29a39cf96614 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,28 +24,19 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "1.14.0"; + version = "2.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZUbcuIRutSoHW5egCpwCKca2IZCgQsRAd72ueDzGySI="; + hash = "sha256-U8aXskq3PdIVXNhUTZ7TVRza4dexZoheHO1GO0aGneo="; }; - # this patch allows us to run additional tests that invoke pdm, which checks - # itself for an update on every invocation by default, drammatically slowing - # down test runs inside the sandbox - # - # the patch is necessary because the fixture is creating a project and - # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream - patches = [ - ./check-update.patch - ]; - propagatedBuildInputs = [ blinker - click + cachecontrol + certifi findpython installer packaging @@ -54,12 +45,17 @@ buildPythonApplication rec { pip platformdirs python-dotenv - pythonfinder + requests-toolbelt resolvelib + rich shellingham tomli tomlkit - ] ++ lib.optionals (pythonOlder "3.8") [ + unearth + virtualenv + ] + ++ cachecontrol.optional-dependencies.filecache + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata typing-extensions ]; @@ -79,14 +75,11 @@ buildPythonApplication rec { ''; disabledTests = [ - # sys.executable and expected executable are different - "test_set_non_exist_python_path" + # fails to locate setuptools (maybe upstream bug) + "test_convert_setup_py_project" # pythonfinder isn't aware of nix's python infrastructure - "test_auto_isolate_site_packages" "test_use_wrapper_python" - "test_find_python_in_path" - # calls pip install and exits != 0 - "test_pre_and_post_hooks" + "test_use_invalid_wrapper_python" ]; meta = with lib; { From f3ac787b7a3734d6e6c3e252b4dc76438cbb303c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 31 Aug 2022 06:37:47 +1000 Subject: [PATCH 047/737] git: 2.37.2 -> 2.37.3 https://lore.kernel.org/git/xmqqzgflk211.fsf@gitster.g/T/#u --- .../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 20cc283af989..95327f31ddcd 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.37.2"; + version = "2.37.3"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-HD2cghxFOOem2sMKSvi9jc/k9lH5VHTFJrUvg0BtsAM="; + sha256 = "sha256-gUZB1/YWWc+8F4JdBGJJnKFAPjn/U9dqhRIFDmSD6Ho="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; From 1cf70d770d189ff13248d8e99fed6c561139de24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 22:03:07 +0000 Subject: [PATCH 048/737] nghttp3: 0.6.0 -> 0.7.0 --- pkgs/development/libraries/nghttp3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 41bf84c5b69b..1633de12e434 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q9rXvMeCXhyytiaGekRlowCYKzvq8aktfN0lk+VPG78="; + sha256 = "sha256-MZ5ynaGZTzO2w0hGHII19PFC0+kjfd+IlcsenGGgMgg="; }; outputs = [ "out" "dev" "doc" ]; From 237da4a2c046b26f20614ae62b2b24fbfa759358 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 30 Jul 2022 21:51:38 +0300 Subject: [PATCH 049/737] gtk4: fix cross --- pkgs/development/libraries/gtk/4.x.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index fc3e39b02261..07472e736e5d 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -42,6 +42,7 @@ , vulkan-headers , wayland , wayland-protocols +, wayland-scanner , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux , cups @@ -77,6 +78,10 @@ stdenv.mkDerivation rec { sha256 = "e7/k0TVp98KX7UmDSscmPjGLe/EC0ycctGbVlx9ZrnA="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ gettext gobject-introspection @@ -88,6 +93,7 @@ stdenv.mkDerivation rec { sassc gi-docgen libxml2 # for xmllint + wayland-scanner ] ++ setupHooks; buildInputs = [ @@ -183,6 +189,14 @@ stdenv.mkDerivation rec { chmod +x ''${files[@]} patchShebangs ''${files[@]} + + '' + + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + '' + substituteInPlace meson.build \ + --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" ''; preInstall = '' From 0c61634ac9c9b77c5f00b3b529d048f5d50dc7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 2 Sep 2022 07:33:54 +0200 Subject: [PATCH 050/737] Re-Revert "Merge #188995: bundler: 2.3.20 -> 2.3.21" Moved from master to staging. This reverts commit 21de2b973f9fee595a7a1ac4693efff791245c34. --- .../ruby-modules/bundler/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 04f97c68c6a6..8daf80400209 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -1,14 +1,31 @@ -{ buildRubyGem, ruby }: +{ lib, buildRubyGem, ruby, writeScript }: buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.3.20"; - source.sha256 = "sha256-gJJ3vHzrJo6XpHS1iwLb77jd9ZB39GGLcOJQSrgaBHw="; + version = "2.3.21"; + source.sha256 = "sha256-+u3H/8Fno8U7ZMRj2me1DVvkOAR2HeWmjdo0TCG/0d4="; dontPatchShebangs = true; + passthru.updateScript = writeScript "gem-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts jq + + set -eu -o pipefail + + latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) + update-source-version ${gemName} "$latest_version" + ''; + postFixup = '' sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle ''; + + meta = with lib; { + description = "Manage your Ruby application's gem dependencies"; + homepage = "https://bundler.io"; + license = licenses.mit; + maintainers = with maintainers; [anthonyroussel]; + }; } From 6a378e9c44064628234a1c783504f5a1ea833e11 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 5 Aug 2022 21:20:17 +0100 Subject: [PATCH 051/737] binutils: 2.38 -> 2.39 Changes: https://sourceware.org/pipermail/binutils/2022-August/122246.html --- ...libtool.m4-fix-nm-BSD-flag-detection.patch | 137 ------------------ .../tools/misc/binutils/default.nix | 39 ++--- .../deterministic-temp-prefixes.patch | 36 ----- .../binutils/gas-dwarf-zero-PR29451.patch | 71 +++++++++ .../tools/misc/binutils/libbfd.nix | 8 +- 5 files changed, 86 insertions(+), 205 deletions(-) delete mode 100644 pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch delete mode 100644 pkgs/development/tools/misc/binutils/deterministic-temp-prefixes.patch create mode 100644 pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch diff --git a/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch b/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch deleted file mode 100644 index f9c6e88d97b4..000000000000 --- a/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch +++ /dev/null @@ -1,137 +0,0 @@ -From beca4a2c25ee86e4020f8b8bddc4d8e0ed3430b3 Mon Sep 17 00:00:00 2001 -From: Andrew Childs -Date: Tue, 22 Feb 2022 11:28:04 +0900 -Subject: [PATCH] Revert "libtool.m4: fix nm BSD flag detection" - -This reverts commit bef9ef8ca0f941d743c77cc55b5fe7985990b2a7. ---- - ChangeLog | 9 ------ - libtool.m4 | 88 ++++++++++++++++++++++++++---------------------------- - 2 files changed, 43 insertions(+), 54 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 18e8b6835da..c12f07403c3 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -375,15 +375,6 @@ - - * src-release.sh (GDB_SUPPPORT_DIRS): Add libbacktrace. - --2021-09-27 Nick Alcock -- -- PR libctf/27967 -- * libtool.m4 (LT_PATH_NM): Try BSDization flags with a user-provided -- NM, if there is one. Run nm on itself, not on /dev/null, to avoid -- errors from nms that refuse to work on non-regular files. Remove -- other workarounds for this problem. Strip out blank lines from the -- nm output. -- - 2021-09-27 Nick Alcock - - PR libctf/27967 -diff --git a/libtool.m4 b/libtool.m4 -index a216bb14e99..7a711249304 100644 ---- a/libtool.m4 -+++ b/libtool.m4 -@@ -3200,55 +3200,53 @@ _LT_DECL([], [file_magic_cmd], [1], - - # LT_PATH_NM - # ---------- --# find the pathname to a BSD- or MS-compatible name lister, and any flags --# needed to make it compatible -+# find the pathname to a BSD- or MS-compatible name lister - AC_DEFUN([LT_PATH_NM], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, - [if test -n "$NM"; then -- # Let the user override the nm to test. -- lt_nm_to_check="$NM" -- else -- lt_nm_to_check="${ac_tool_prefix}nm" -- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -- lt_nm_to_check="$lt_nm_to_check nm" -- fi -- fi -- for lt_tmp_nm in $lt_nm_to_check; do -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- case "$lt_tmp_nm" in -- */*|*\\*) tmp_nm="$lt_tmp_nm";; -- *) tmp_nm="$ac_dir/$lt_tmp_nm";; -- esac -- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -- # Check to see if the nm accepts a BSD-compat flag. -- # Adding the `sed 1q' prevents false positives on HP-UX, which says: -- # nm: unknown option "B" ignored -- case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in -- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B" -- break -- ;; -- *) -- case `"$tmp_nm" -p "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in -- *$tmp_nm*) -- lt_cv_path_NM="$tmp_nm -p" -- break -- ;; -- *) -- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -- continue # so that we can try to find one that supports BSD flags -- ;; -- esac -- ;; -- esac -- fi -- done -- IFS="$lt_save_ifs" -- done -- : ${lt_cv_path_NM=no}]) -+ # Let the user override the test. -+ lt_cv_path_NM="$NM" -+else -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" -+ fi -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+ done -+ : ${lt_cv_path_NM=no} -+fi]) - if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" - else --- -2.34.1 - diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index a25c1ce87b07..fb891c67da40 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -32,12 +32,12 @@ assert enableGold -> execFormatIsELF stdenv.targetPlatform; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - version = "2.38"; + version = "2.39"; srcs = { normal = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "sha256-Bw7HHPB3pqWOC5WfBaCaNQFTeMLYpR6Q866r/jBZDvg="; + sha256 = "sha256-2iSoT+8iAQLdJAQt8G/eqFHCYUpTd/hu/6KPM7exYUg="; }; vc4-none = fetchFromGitHub { owner = "itszor"; @@ -68,10 +68,6 @@ stdenv.mkDerivation { # Make binutils output deterministic by default. ./deterministic.patch - - # Breaks nm BSD flag detection - ./0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch - # Required for newer macos versions ./0001-libtool.m4-update-macos-version-detection-block.patch @@ -83,11 +79,12 @@ stdenv.mkDerivation { # cross-compiling. ./always-search-rpath.patch - # Fixed in 2.39 - # https://sourceware.org/bugzilla/show_bug.cgi?id=28885 - # https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=99852365513266afdd793289813e8e565186c9e6 - # https://github.com/NixOS/nixpkgs/issues/170946 - ./deterministic-temp-prefixes.patch + # Upstream backport of https://sourceware.org/PR29451: + # Don't emit 0-sized debug entries for objects without size. + # Without the change elfutils on i686-linux fail dwarf validity test: + # https://sourceware.org/PR29450 + # Remove once 2.40 releases. + ./gas-dwarf-zero-PR29451.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch # This patch was suggested by Nick Clifton to fix @@ -105,17 +102,6 @@ stdenv.mkDerivation { (if stdenv.targetPlatform.isMusl then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; } else ./mips64-default-n64.patch) - # On PowerPC, when generating assembly code, GCC generates a `.machine` - # custom instruction which instructs the assembler to generate code for this - # machine. However, some GCC versions generate the wrong one, or make it - # too strict, which leads to some confusing "unrecognized opcode: wrtee" - # or "unrecognized opcode: eieio" errors. - # - # To remove when binutils 2.39 is released. - # - # Upstream commit: - # https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=cebc89b9328eab994f6b0314c263f94e7949a553 - ++ lib.optional stdenv.targetPlatform.isPower ./ppc-make-machine-less-strict.patch ; outputs = [ "out" "info" "man" ]; @@ -190,6 +176,11 @@ stdenv.mkDerivation { # for us to do is not leave it to chance, and force the program prefix to be # what we want it to be. "--program-prefix=${targetPrefix}" + + # Unconditionally disable: + # - musl target needs porting: https://sourceware.org/PR29477 + # - all targets rely on javac: https://sourceware.org/PR29479 + "--disable-gprofng" ] ++ lib.optionals withAllTargets [ "--enable-targets=all" ] ++ lib.optionals enableGold [ "--enable-gold" "--enable-plugins" ] @@ -201,10 +192,6 @@ stdenv.mkDerivation { # Fails doCheck = false; - # Remove on next bump. It's a vestige of past conditional. Stays here to avoid - # mass rebuild. - postFixup = ""; - # Break dependency on pkgsBuildBuild.gcc when building a cross-binutils stripDebugList = if stdenv.hostPlatform != stdenv.targetPlatform then "bin lib ${stdenv.hostPlatform.config}" else null; diff --git a/pkgs/development/tools/misc/binutils/deterministic-temp-prefixes.patch b/pkgs/development/tools/misc/binutils/deterministic-temp-prefixes.patch deleted file mode 100644 index 3c27340b9c04..000000000000 --- a/pkgs/development/tools/misc/binutils/deterministic-temp-prefixes.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 99852365513266afdd793289813e8e565186c9e6 Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Wed, 23 Mar 2022 11:39:49 +0000 -Subject: [PATCH] dlltool: Use the output name as basis for deterministic temp - prefixes - - PR 28885 - * dlltool.c (main): use imp_name rather than dll_name when - generating a temporary file name. ---- - binutils/ChangeLog | 9 +++++++++ - binutils/dlltool.c | 7 ++++--- - 2 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/binutils/dlltool.c b/binutils/dlltool.c -index d95bf3f5470..89871510b45 100644 ---- a/binutils/dlltool.c -+++ b/binutils/dlltool.c -@@ -3992,10 +3992,11 @@ main (int ac, char **av) - if (tmp_prefix == NULL) - { - /* If possible use a deterministic prefix. */ -- if (dll_name) -+ if (imp_name || delayimp_name) - { -- tmp_prefix = xmalloc (strlen (dll_name) + 2); -- sprintf (tmp_prefix, "%s_", dll_name); -+ const char *input = imp_name ? imp_name : delayimp_name; -+ tmp_prefix = xmalloc (strlen (input) + 2); -+ sprintf (tmp_prefix, "%s_", input); - for (i = 0; tmp_prefix[i]; i++) - if (!ISALNUM (tmp_prefix[i])) - tmp_prefix[i] = '_'; --- -2.31.1 - diff --git a/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch b/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch new file mode 100644 index 000000000000..5f1293f8f732 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch @@ -0,0 +1,71 @@ +https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=d7abcbcea5ddd40a3bf28758b62f35933c59f996 + +Don't emit 0-sized debug entries for objects without size. +Without the change elfutils on i686-linux fail dwarf validity test: + https://sourceware.org/PR29450 +--- a/gas/dwarf2dbg.c ++++ b/gas/dwarf2dbg.c +@@ -2882,6 +2882,7 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, + { + const char *name; + size_t len; ++ expressionS size = { .X_op = O_constant }; + + /* Skip warning constructs (see above). */ + if (symbol_get_bfdsym (symp)->flags & BSF_WARNING) +@@ -2895,6 +2896,18 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, + if (!S_IS_DEFINED (symp) || !S_IS_FUNCTION (symp)) + continue; + ++#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */ ++ size.X_add_number = S_GET_SIZE (symp); ++ if (size.X_add_number == 0 && IS_ELF ++ && symbol_get_obj (symp)->size != NULL) ++ { ++ size.X_op = O_add; ++ size.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size); ++ } ++#endif ++ if (size.X_op == O_constant && size.X_add_number == 0) ++ continue; ++ + subseg_set (str_seg, 0); + name_sym = symbol_temp_new_now_octets (); + name = S_GET_NAME (symp); +@@ -2920,29 +2933,17 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, + emit_expr (&exp, sizeof_address); + + /* DW_AT_high_pc */ +- exp.X_op = O_constant; +-#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */ +- exp.X_add_number = S_GET_SIZE (symp); +- if (exp.X_add_number == 0 && IS_ELF +- && symbol_get_obj (symp)->size != NULL) +- { +- exp.X_op = O_add; +- exp.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size); +- } +-#else +- exp.X_add_number = 0; +-#endif + if (DWARF2_VERSION < 4) + { +- if (exp.X_op == O_constant) +- exp.X_op = O_symbol; +- exp.X_add_symbol = symp; +- emit_expr (&exp, sizeof_address); ++ if (size.X_op == O_constant) ++ size.X_op = O_symbol; ++ size.X_add_symbol = symp; ++ emit_expr (&size, sizeof_address); + } +- else if (exp.X_op == O_constant) +- out_uleb128 (exp.X_add_number); ++ else if (size.X_op == O_constant) ++ out_uleb128 (size.X_add_number); + else +- emit_leb128_expr (symbol_get_value_expression (exp.X_op_symbol), 0); ++ emit_leb128_expr (symbol_get_value_expression (size.X_op_symbol), 0); + } + + /* End of children. */ diff --git a/pkgs/development/tools/misc/binutils/libbfd.nix b/pkgs/development/tools/misc/binutils/libbfd.nix index eed23a746d2a..ff5e2f1a1815 100644 --- a/pkgs/development/tools/misc/binutils/libbfd.nix +++ b/pkgs/development/tools/misc/binutils/libbfd.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped +, gnu-config, autoreconfHook, bison, binutils-unwrapped, texinfo , libiberty, libintl, zlib }: @@ -11,10 +11,6 @@ stdenv.mkDerivation { patches = binutils-unwrapped.patches ++ [ ./build-components-separately.patch - (fetchpatch { - url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; - sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q"; - }) ]; # We just want to build libbfd @@ -31,7 +27,7 @@ stdenv.mkDerivation { dontUpdateAutotoolsGnuConfigScripts = true; strictDeps = true; - nativeBuildInputs = [ autoreconfHook bison ]; + nativeBuildInputs = [ autoreconfHook bison texinfo ]; buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ]; configurePlatforms = [ "build" "host" ]; From 322e4d8fa39af8fdd3f085313a4f2bec7b2bd6c0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 30 Jul 2022 21:51:03 +0300 Subject: [PATCH 052/737] graphene: build gir when cross --- pkgs/development/libraries/graphene/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index b883c549da54..baf42430c299 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -5,6 +5,7 @@ , nix-update-script , pkg-config , meson +, mesonEmulatorHook , ninja , python3 , mutest @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { pname = "graphene"; version = "1.10.8"; - outputs = [ "out" ] - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" "installedTests" ]; + outputs = [ "out" "dev" "devdoc" ] + ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "installedTests" ]; src = fetchFromGitHub { owner = "ebassi"; @@ -59,6 +60,8 @@ stdenv.mkDerivation rec { gobject-introspection python3 makeWrapper + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -70,8 +73,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" + "-Dgtk_doc=true" + "-Dintrospection=enabled" "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" ]; @@ -80,7 +83,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests/gen-installed-test.py - '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py ''; From 24723644acd2d50aa30cd4d6829cc2d8949d5824 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 30 Jul 2022 21:51:21 +0300 Subject: [PATCH 053/737] gsettings-desktop-schemas: build gir when cross --- .../libraries/gsettings-desktop-schemas/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index acc143cd5566..8a26742ce23e 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -30,10 +30,6 @@ stdenv.mkDerivation rec { gobject-introspection ]; - mesonFlags = [ - "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - ]; - postPatch = '' chmod +x build-aux/meson/post-install.py patchShebangs build-aux/meson/post-install.py From a32cd711efe2b934b7a32b175f15ecba9962ba9b Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 7 Aug 2022 01:45:53 +0300 Subject: [PATCH 054/737] gnome-tour: work towards fixing cross doesn't work yet ``` gnome-tour-aarch64-unknown-linux-gnu> error: linking with `/nix/store/3d9zjv5vaqjxb9kwbdqsd194alwm97x1-gcc-wrapper-11.3.0/bin/cc` failed: exit status: 1 gnome-tour-aarch64-unknown-linux-gnu> | gnome-tour-aarch64-unknown-linux-gnu> = note: "/nix/store/3d9zjv5vaqjxb9kwbdqsd194alwm97x1-gcc-wrapper-11.3.0/bin/cc" "-m64" "/build/rustcd8pO0A/symbols.o" "/build/gnome-tour-42.0/build/src/release/deps/gnome_to ... gnome-tour-aarch64-unknown-linux-gnu> /nix/store/vhf2cr6immz4qdxd83y025fnxim8mmfg-binutils-2.38/bin/ld: skipping incompatible /nix/store/c84gzzifyh10w9m612wxcas04r7fq4h0-glib-aarch64-unknown-linux-gnu-2. 72.3/lib/libglib-2.0.so when searching for -lglib-2.0 gnome-tour-aarch64-unknown-linux-gnu> /nix/store/vhf2cr6immz4qdxd83y025fnxim8mmfg-binutils-2.38/bin/ld: cannot find -lglib-2.0: No such file or directory ... gnome-tour-aarch64-unknown-linux-gnu> collect2: error: ld returned 1 exit status ... gnome-tour-aarch64-unknown-linux-gnu> FAILED: src/gnome-tour gnome-tour-aarch64-unknown-linux-gnu> /nix/store/m5n32vy7rbfrqcxigw1p6wyx3cj7smg9-coreutils-9.1/bin/env CARGO_HOME=/build/gnome-tour-42.0/build/cargo-home /nix/store/76l9r44x1sv323c90j6vi401n4fvims2-cargo-1.62.1/b in/cargo build --manifest-path /build/gnome-tour-42.0/Cargo.toml --target-dir /build/gnome-tour-42.0/build/src --release && cp src/release/gnome-tour src/gnome-tour gnome-tour-aarch64-unknown-linux-gnu> ninja: build stopped: subcommand failed. ``` --- pkgs/desktops/gnome/core/gnome-tour/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index cbb33c2b2308..a26dcfa0a7b0 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -17,6 +17,8 @@ , libadwaita , librsvg , rustc +, rust +, writeText , cargo }: @@ -31,6 +33,10 @@ stdenv.mkDerivation rec { cargoVendorDir = "vendor"; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ appstream-glib cargo @@ -54,6 +60,16 @@ stdenv.mkDerivation rec { librsvg ]; + mesonFlags = + let + # ERROR: 'rust' compiler binary not defined in cross or native file + crossFile = writeText "cross-file.conf" '' + [binaries] + rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] + ''; + in + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 0f64ae72eae13bff1d1d5d8b50ea6932c172a1ef Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 31 Aug 2022 17:54:32 +1000 Subject: [PATCH 055/737] curl: 7.84.0 -> 7.85.0 https://curl.se/changes.html#7_85_0 --- pkgs/tools/networking/curl/atomic.patch | 30 ------------------- pkgs/tools/networking/curl/default.nix | 9 ++---- .../networking/curl/netrc-regression.patch | 16 ---------- pkgs/tools/networking/curl/sched.patch | 26 ---------------- pkgs/tools/package-management/nix/common.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 3 +- pkgs/top-level/all-packages.nix | 1 - 7 files changed, 5 insertions(+), 82 deletions(-) delete mode 100644 pkgs/tools/networking/curl/atomic.patch delete mode 100644 pkgs/tools/networking/curl/netrc-regression.patch delete mode 100644 pkgs/tools/networking/curl/sched.patch diff --git a/pkgs/tools/networking/curl/atomic.patch b/pkgs/tools/networking/curl/atomic.patch deleted file mode 100644 index 77ee610fc117..000000000000 --- a/pkgs/tools/networking/curl/atomic.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Tue, 28 Jun 2022 09:00:25 +0200 -Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool - -To work with more compilers without requiring separate libs to -link. Like with gcc-12 for RISC-V on Linux. - -Reported-by: Adam Sampson -Fixes #9055 -Closes #9061 ---- - lib/easy_lock.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/easy_lock.h b/lib/easy_lock.h -index 07c85c5ffdd19..9c11bc50c5f20 100644 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -40,8 +40,8 @@ - #include - #endif - --#define curl_simple_lock atomic_bool --#define CURL_SIMPLE_LOCK_INIT false -+#define curl_simple_lock atomic_int -+#define CURL_SIMPLE_LOCK_INIT 0 - - static inline void curl_simple_lock_lock(curl_simple_lock *lock) - { diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a62b6c8e27bb..07b9e58589a0 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -3,7 +3,6 @@ , c-aresSupport ? false, c-ares , gnutlsSupport ? false, gnutls , gsaslSupport ? false, gsasl -, patchNetrcRegression ? false , gssSupport ? with stdenv.hostPlatform; ( !isWindows && # disable gss becuase of: undefined reference to `k5_bcmp' @@ -48,21 +47,19 @@ assert !(opensslSupport && wolfsslSupport); stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "7.84.0"; + version = "7.85.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" ]; - sha256 = "sha256-cC+ybnMZCjvXcHGqFG9Qe5gXzE384hjSq4fwDNO8BZ0="; + sha256 = "sha256-IafoNijulhZKwrNv9r+Z1GfHsLYhwffjF9jw2WARU5w="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch - ./sched.patch - ./atomic.patch - ] ++ lib.optional patchNetrcRegression ./netrc-regression.patch; + ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/tools/networking/curl/netrc-regression.patch b/pkgs/tools/networking/curl/netrc-regression.patch deleted file mode 100644 index 90ad3e52d1a2..000000000000 --- a/pkgs/tools/networking/curl/netrc-regression.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/url.c b/lib/url.c -index a56e4b0..9f29593 100644 ---- a/lib/url.c -+++ b/lib/url.c -@@ -2971,6 +2971,12 @@ static CURLcode override_login(struct Curl_easy *data, - /* don't update the user name below */ - userp = NULL; - } -+ /* no user was set but a password, set a blank user */ -+ if(userp && !*userp && passwdp && *passwdp) { -+ *userp = strdup(""); -+ if(!*userp) -+ return CURLE_OUT_OF_MEMORY; -+ } - } - #endif diff --git a/pkgs/tools/networking/curl/sched.patch b/pkgs/tools/networking/curl/sched.patch deleted file mode 100644 index 33f08fa42f24..000000000000 --- a/pkgs/tools/networking/curl/sched.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Mon, 27 Jun 2022 08:46:21 +0200 -Subject: [PATCH] easy_lock.h: include sched.h if available to fix build - -Patched-by: Harry Sintonen - -Closes #9054 ---- - lib/easy_lock.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/easy_lock.h b/lib/easy_lock.h -index 819f50ce815b8..1f54289ceb2d3 100644 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -36,6 +36,9 @@ - - #elif defined (HAVE_ATOMIC) - #include -+#if defined(HAVE_SCHED_YIELD) -+#include -+#endif - - #define curl_simple_lock atomic_bool - #define CURL_SIMPLE_LOCK_INIT false diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index c2e9febea64d..b45cae436585 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub , version , suffix ? "" -, curl , sha256 ? null , src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit sha256; } , patches ? [ ] @@ -25,6 +24,7 @@ in , bzip2 , callPackage , coreutils +, curl , editline , flex , gnutar diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b3b2bc7c9b7a..46f92a468815 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,7 +1,6 @@ { lib , aws-sdk-cpp , boehmgc -, curl , callPackage , fetchFromGitHub , fetchurl @@ -32,7 +31,7 @@ let common = args: callPackage - (import ./common.nix ({ inherit lib fetchFromGitHub curl; } // args)) + (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) { inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd3030ddc084..54833f032524 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35606,7 +35606,6 @@ with pkgs; storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; inherit (darwin.apple_sdk.frameworks) Security; - curl = curl.override { patchNetrcRegression = true; }; }); nix = nixVersions.stable; From d1e2a371f039a448806472664a0ac89ae8b89f49 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 3 Sep 2022 12:45:41 +0200 Subject: [PATCH 056/737] nss: 3.68.4 -> 3.79.1 The 3.68.4 release was the last of the 3.68 ESR series and 3.79 is the new ESR series. https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_79.html https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_79_1.html --- pkgs/development/libraries/nss/esr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index a789f0306d32..b4a566030d07 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.68.4"; - hash = "sha256-K5/T9aG0nzs7KdEgAmdPcEgRViV1b7R3KELsfDm+Fgs="; + version = "3.79.1"; + hash = "sha256-NwxS5niE0dnCG5d+lzPcwYzIR2WmsgGBT77VDCbfThQ="; } From e68c8e82f12a42bc575ddd05b8a8e62b5924945d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 31 Aug 2022 23:42:14 +0100 Subject: [PATCH 057/737] poppler: enable tests --- .../development/libraries/poppler/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index b90987899085..cba1af704607 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchpatch +, fetchFromGitLab , cairo , cmake , pcre @@ -32,8 +33,20 @@ let mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; + + # unclear relationship between test data repo versions and poppler + # versions, though files don't appear to be updated after they're + # added, so it's probably safe to just always use the latest available + # version. + testData = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "poppler"; + repo = "test"; + rev = "920c89f8f43bdfe8966c8e397e7f67f5302e9435"; + sha256 = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos="; + }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! @@ -94,7 +107,10 @@ stdenv.mkDerivation rec { (mkFlag utils "UTILS") (mkFlag qt5Support "QT5") (mkFlag qt6Support "QT6") + ] ++ lib.optionals finalAttrs.doCheck [ + "-DTESTDATADIR=${testData}" ]; + disallowedReferences = lib.optional finalAttrs.doCheck testData; dontWrapQtApps = true; @@ -103,7 +119,10 @@ stdenv.mkDerivation rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + doCheck = true; + passthru = { + inherit testData; tests = { # These depend on internal poppler code that frequently changes. inherit inkscape cups-filters texlive scribus; @@ -121,4 +140,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; }; -} +}) From 27ff1af1cbf21eb4e24f6d4ac3598bb3c986ba45 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 19 Jul 2022 17:16:46 +0200 Subject: [PATCH 058/737] python3Packages.nose: fix cross-compiling --- pkgs/development/python-modules/nose/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 31fd824ee3da..961de55f5dad 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { preBuild = lib.optionalString ((python.isPy3k or false) && (python.pname != "pypy3")) '' - 2to3 -wn nose functional_tests unit_tests + ${python.pythonForBuild}/bin/2to3 -wn nose functional_tests unit_tests ''; propagatedBuildInputs = [ coverage ]; From 1c93ab362bc9c2a9275d7d2dd0a6268be86e495a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Aug 2022 00:47:23 +0000 Subject: [PATCH 059/737] =?UTF-8?q?libxml2:=202.9.14=20=E2=86=92=202.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Massive cleanups - CVE-2022-2309 - More security fixes - Removal of outdated development manpage libxml.3 https://gitlab.gnome.org/GNOME/libxml2/-/compare/v2.9.14...v2.10.0 - Python detection is broken by `strictDeps` for unknown reasons. - Also replaced `moveToOutput` with more declarative `outputMan`. --- .../development/libraries/libxml2/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c4571feb81ef..474afc4ba6ca 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , zlib , pkg-config , autoreconfHook @@ -21,15 +22,16 @@ stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.9.14"; + version = "2.10.0"; - outputs = [ "bin" "dev" "out" "man" "doc" ] + outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; + outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vnzk33wfms348lgz9pvkq9li7jm44pvm73lbr3w1khwgljlmmv0"; + sha256 = "LdMxEOp3hnbeFL6kmZ7hFzxMpV1f8UUryiJOBvAVJZU="; }; patches = [ @@ -45,9 +47,18 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/63174 # https://github.com/NixOS/nixpkgs/pull/72342 ./utf8-xmlErrorFuncHandler.patch - ]; - strictDeps = true; + # Fix PostgreSQL tests + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/397 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/4ad71c2d72beef0d10cf75aa417db10d77846f75.patch"; + sha256 = "gubGDhBhHNYdEty+sFQFd3pSWB9isN5AjD//ksujGQk="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/5b2d07a72670513e41b481a9d922c983a64027ca.patch"; + sha256 = "7jYvMW6bgImXubbaWpQhrIw3xBBnaNn+iJt3EQiW3yU="; + }) + ]; nativeBuildInputs = [ pkg-config @@ -88,6 +99,7 @@ stdenv.mkDerivation rec { installFlags = lib.optionals pythonSupport [ "pythondir=\"${placeholder "py"}/${python.sitePackages}\"" + "pyexecdir=\"${placeholder "py"}/${python.sitePackages}\"" ]; enableParallelBuilding = true; @@ -110,7 +122,6 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput bin/xml2-config "$dev" moveToOutput lib/xml2Conf.sh "$dev" - moveToOutput share/man/man1 "$bin" '' + lib.optionalString (enableStatic && enableShared) '' moveToOutput lib/libxml2.a "$static" ''; From 16a848885ebc8bdb02f0816df7c7d09d0457364a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Aug 2022 00:49:51 +0000 Subject: [PATCH 060/737] =?UTF-8?q?libxslt:=201.1.35=20=E2=86=92=201.1.36?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libxslt/-/compare/v1.1.35...v1.1.36 Additionally: - Fix installing Python module into a separate output. - Install gtk-doc documentation for devhelp to `devdoc` output. - Move the `devman` from `man3` to `devdoc` output. - Replace `moveToOutput` with more declarative `outputMan`. --- pkgs/development/libraries/libxslt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index a8ed68b088bd..ecca3fd4d2a8 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -16,13 +16,14 @@ stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.35"; + version = "1.1.36"; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; + outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; + outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "gkfzPpqHLGrIWapFAYvExNALl+L+rJ7rwQyTzh803Xk="; + sha256 = "EoSPCkQI9ltTDTlizZ/2cLaueWGRz+/zdSK1dy3o3I4="; }; nativeBuildInputs = [ @@ -59,11 +60,10 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" - moveToOutput share/man/man1 "$bin" '' + lib.optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs - moveToOutput ${python.libPrefix} "$py" + moveToOutput ${python.sitePackages} "$py" ''; passthru = { From 851e74a2f13aaceb448cf47aa0146ef993ebd202 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 3 Sep 2022 15:15:42 +0300 Subject: [PATCH 061/737] libcamera: unstable-2022-07-15 -> unstable-2022-09-03 --- pkgs/development/libraries/libcamera/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index 3841c205b7b9..7e6185308412 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -5,8 +5,6 @@ , ninja , pkg-config , makeFontsConf -, boost -, gnutls , openssl , libdrm , libevent @@ -23,12 +21,12 @@ stdenv.mkDerivation { pname = "libcamera"; - version = "unstable-2022-07-15"; + version = "unstable-2022-09-03"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; - rev = "e9b6b362820338d0546563444e7b1767f5c7044c"; - hash = "sha256-geqFcMBHcVe7dPdVOal8V2pVItYUdoC+5isISqRG4Wc="; + rev = "f1776100f55e70320a8938586bc8bf2f242addd4"; + hash = "sha256-96AMemH+mSyPE26eiucwqUGYbK5uWNDNDgwAyeIAg6g="; }; postPatch = '' @@ -39,8 +37,7 @@ stdenv.mkDerivation { buildInputs = [ # IPA and signing - gnutls - boost + openssl # gstreamer integration gst_all_1.gstreamer From 092f4eb681a6aee6b50614eedac74629cb48db23 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 3 Sep 2022 15:16:00 +0300 Subject: [PATCH 062/737] pipewire: 0.3.56 -> 0.3.57 --- pkgs/development/libraries/pipewire/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 991ac1ad594c..7b007ed9a1c9 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -46,6 +46,7 @@ , libfreeaptx , ldacbt , fdk_aac +, libopus , nativeHspSupport ? true , nativeHfpSupport ? true , ofonoSupport ? true @@ -69,7 +70,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.56"; + version = "0.3.57"; outputs = [ "out" @@ -87,7 +88,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-wbHHr7BW8Gdj9D1IjzOuD6VuXApJ5E0Zde2iKWImzxg="; + sha256 = "sha256-s38ob78XsPwQVUQ/8y8JOJTbGaceBHeL5v7oryAQhuY="; }; patches = [ @@ -133,7 +134,7 @@ let ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optionals libcameraSupport [ libcamera libdrm ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ] + ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac libopus ] ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi ++ lib.optional raopSupport openssl From 6c6f4a97242017ada74071f947e6538d353d62b2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 3 Sep 2022 15:44:53 +0200 Subject: [PATCH 063/737] llvm*: Fix core usage in tests lit (LLVM Integrated Tester) [0] by default uses as many threads as the build host has cores, ignoring the user's core settings for the build. This passes the configured core count on to lit, along with LLVM's default settings for it which we otherwise override in the process [1]. [0]: https://www.llvm.org/docs/CommandGuide/lit.html [1]: https://github.com/llvm/llvm-project/blob/329fda39c507e8740978d10458451dcdb21563be/llvm/CMakeLists.txt#L559-L565 --- pkgs/development/compilers/llvm/10/llvm/default.nix | 1 + pkgs/development/compilers/llvm/11/llvm/default.nix | 1 + pkgs/development/compilers/llvm/12/llvm/default.nix | 1 + pkgs/development/compilers/llvm/13/llvm/default.nix | 1 + pkgs/development/compilers/llvm/14/llvm/default.nix | 1 + pkgs/development/compilers/llvm/5/llvm/default.nix | 1 + pkgs/development/compilers/llvm/6/llvm/default.nix | 1 + pkgs/development/compilers/llvm/7/llvm/default.nix | 1 + pkgs/development/compilers/llvm/8/llvm/default.nix | 1 + pkgs/development/compilers/llvm/9/llvm/default.nix | 1 + pkgs/development/compilers/llvm/git/llvm/default.nix | 1 + 11 files changed, 11 insertions(+) diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index bb1b90b36a92..64e000fefdfd 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -179,6 +179,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index a038795a4df1..214d6b05caff 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -181,6 +181,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 435744b073f7..3428a1aa27c3 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -171,6 +171,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 6372655b7ed4..8ab3cd74c56f 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -133,6 +133,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 395f2b22b964..689358372ba3 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -144,6 +144,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix index cf668cd566a6..720268e34afb 100644 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -154,6 +154,7 @@ stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ lib.optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" diff --git a/pkgs/development/compilers/llvm/6/llvm/default.nix b/pkgs/development/compilers/llvm/6/llvm/default.nix index 61f9234274d3..7bb82a999191 100644 --- a/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -149,6 +149,7 @@ stdenv.mkDerivation (rec { "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index b324e1a0e4d6..5237d4383183 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -168,6 +168,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index efd1707eb337..383be10a17a6 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -161,6 +161,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index 1dd1455ed6d6..1d9dfca7f142 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -176,6 +176,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index fe6d650cdcd5..d161e664643f 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -130,6 +130,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" From bd332c848c521de8cdaf664ce307e914c5e5987d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 3 Sep 2022 17:14:18 +0200 Subject: [PATCH 064/737] llvm*: Don't show progress bar on tests Since the progress bar results in large output that is broken due to the use of ncurses and we already use the flag that gives verbose output on test failures, let's just disable the progress bar. --- pkgs/development/compilers/llvm/10/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/11/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/12/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/13/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/14/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/5/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/6/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/7/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/8/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/9/llvm/default.nix | 8 +++++++- pkgs/development/compilers/llvm/git/llvm/default.nix | 8 +++++++- 11 files changed, 77 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index 64e000fefdfd..78b0adcaadfb 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -151,6 +151,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -179,7 +186,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index 214d6b05caff..1623d06c7f7a 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -150,6 +150,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -181,7 +188,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 3428a1aa27c3..d330b7387595 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -140,6 +140,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -171,7 +178,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 8ab3cd74c56f..5b8ec69853f2 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -102,6 +102,13 @@ in stdenv.mkDerivation (rec { patchShebangs test/BugPoint/compile-custom.ll.py ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -133,7 +140,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 689358372ba3..191f465be6c9 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -113,6 +113,13 @@ in stdenv.mkDerivation (rec { patchShebangs test/BugPoint/compile-custom.ll.py ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -144,7 +151,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix index 720268e34afb..a4d04f0618c7 100644 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -125,6 +125,13 @@ stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -154,7 +161,6 @@ stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ lib.optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" diff --git a/pkgs/development/compilers/llvm/6/llvm/default.nix b/pkgs/development/compilers/llvm/6/llvm/default.nix index 7bb82a999191..d18bf2149e1d 100644 --- a/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -120,6 +120,13 @@ stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -149,7 +156,6 @@ stdenv.mkDerivation (rec { "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index 5237d4383183..1aa85f543ea2 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -139,6 +139,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -168,7 +175,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 383be10a17a6..3e01c7ac9ca1 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -133,6 +133,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -161,7 +168,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index 1d9dfca7f142..6c0a37cadd90 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -148,6 +148,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -176,7 +183,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index d161e664643f..656c226574a4 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -99,6 +99,13 @@ in stdenv.mkDerivation (rec { patchShebangs test/BugPoint/compile-custom.ll.py ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ @@ -130,7 +137,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LIT_ARGS=-svj\${NIX_BUILD_CORES}" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" From 8e4f6b26e144ee1d8626141221c50c823f9f2cf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 16:26:56 +0000 Subject: [PATCH 065/737] jdupes: 1.20.2 -> 1.21.0 --- pkgs/tools/misc/jdupes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 9545f71efbb6..c3b47a514db9 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.20.2"; + version = "1.21.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "sha256-3hKO+hNwYiJZ9Wn53vM7DHZmtvDhtgtSbW7bCMCT7s0="; + sha256 = "sha256-nDyRaV49bLVHlyqKJ7hf6OBWOLCfmHrTeHryK091c3w="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. From 72d2cd3208e8e293f7addb115f001405f6aee74c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 3 Sep 2022 12:32:49 +0100 Subject: [PATCH 066/737] inetutils: add patch for CVE-2022-39028 --- pkgs/tools/networking/inetutils/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index fb5e2aad5cce..c6362f544691 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, ncurses, perl, help2man -, apparmorRulesFromClosure +, apparmorRulesFromClosure, fetchpatch }: stdenv.mkDerivation rec { @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + (fetchpatch { + name = "CVE-2022-39028.patch"; + url = "https://sources.debian.org/data/main/i/inetutils/2%3A2.3-5/debian/patches/inetutils-telnetd-EC_EL_null_deref.patch"; + sha256 = "sha256-NYNDbEk3q3EhQdJaR12JBbnjJIRRpOcKLBF/EJJPiGU="; + }) ]; nativeBuildInputs = [ help2man perl /* for `whois' */ ]; From 816cb20bd320714b17164ba950d82736578e9984 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 4 Sep 2022 11:07:27 -0700 Subject: [PATCH 067/737] gcc12: switch to Homebrew patch on aarch64-darwin We can presume that this patch is better tested and better maintained. --- pkgs/development/compilers/gcc/12/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 4ef422c850ed..10ce704382a7 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -63,11 +63,9 @@ let majorVersion = "12"; ../gcc-12-gfortran-driving.patch ../ppc-musl.patch ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch { - # TODO: switch back to Homebrew patches: - # was "https://github.com/Homebrew/formula-patches/raw/76677f2b/gcc/gcc-12.1.0-arm.diff" name = "gcc-12-darwin-aarch64-support.patch"; - url = "https://github.com/tjni/gcc-12-branch/compare/releases/gcc-12.2...gcc-12-2-darwin.diff"; - sha256 = "sha256-hjM9q6tsdzoGOQWJ7v3BaeVxdWQGTaEnep2ZSwX5+74="; + url = "https://github.com/Homebrew/formula-patches/raw/1d184289/gcc/gcc-12.2.0-arm.diff"; + sha256 = "sha256-omclLslGi/2yCV4pNBMaIpPDMW3tcz/RXdupbNbeOHA="; }) ++ optional langD ../libphobos.patch From 0856bf8144233a1209a3069179ce79d5e9f70781 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Aug 2022 13:16:39 +0000 Subject: [PATCH 068/737] glib: remove unnecessary substituteInPlace /bin/true hasn't been hardcoded in this file since Glib 2.55.0. 2.56.0, the first stable version to include this change, was released in 2018. Fixes: 0973618e4ec ("gnome3: automated update") --- pkgs/development/libraries/glib/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 0316deee7bcc..2c616d9776d3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -201,8 +201,6 @@ stdenv.mkDerivation rec { export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" - substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop \ - --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" # Needs machine-id, comment the test sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.c From 3f3f318a6ba69e7d1453b02a5ed0c8ea1828c9ba Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Aug 2022 13:21:08 +0000 Subject: [PATCH 069/737] glib: fix paths of tests in sed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the switch to Meson, we're already in the build directory in preCheck, so we need to update the relative paths we're using accordingly. Fixes: 0149459f424 ("glib: 2.56.0 → 2.58.1") --- pkgs/development/libraries/glib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 2c616d9776d3..55e72585c99f 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -202,14 +202,14 @@ stdenv.mkDerivation rec { echo "PATH=$PATH" # Needs machine-id, comment the test - sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c - sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.c + sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i ../gio/tests/gdbus-peer.c + sed -e '/g_test_add_func/ s/^\/*/\/\//' -i ../gio/tests/gdbus-address-get-session.c # All gschemas fail to pass the test, upstream bug? - sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c + sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i ../gio/tests/gschema-compile.c # Cannot reproduce the failing test_associations on hydra - sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c + sed -e '/\/appinfo\/associations/d' -i ../gio/tests/appinfo.c # Needed because of libtool wrappers - sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c + sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i ../gio/tests/gsubprocess.c ''; inherit doCheck; From 1ea4a3bab629f62ce28730c41a415076bd8c99f0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Aug 2022 13:23:52 +0000 Subject: [PATCH 070/737] glib: fix tests by patching Python shebangs This has to happen in postConfigure rather than postPatch, because the files are generated by the configure phase. --- pkgs/development/libraries/glib/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 55e72585c99f..973f7d724bc8 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -159,6 +159,10 @@ stdenv.mkDerivation rec { --replace "libintl, " "" ''; + postConfigure = '' + patchShebangs gio/gdbus-2.0/codegen/gdbus-codegen gobject/glib-{genmarshal,mkenums} + ''; + DETERMINISTIC_BUILD = 1; postInstall = '' From e1656e231c8352c56d8e78e916700ef98026a4c7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Aug 2022 13:25:30 +0000 Subject: [PATCH 071/737] glib: move test substitutions into postPatch Doing this in preCheck means that the tests will already have been built before the substitutions are made, so they'll have to be rebuilt after the substitutions. Move the substitution earlier in the build, to avoid this unnecessary extra work. I've made the substitutions run even if tests aren't being run, to avoid a repeat of the situation where a glib update breaks the tests due to paths changing. --- pkgs/development/libraries/glib/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 973f7d724bc8..e045c26f1e6c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -154,6 +154,16 @@ stdenv.mkDerivation rec { patchShebangs glib/gen-unicode-tables.pl patchShebangs glib/tests/gen-casefold-txt.py patchShebangs glib/tests/gen-casemap-txt.py + + # Needs machine-id, comment the test + sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c + sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-address-get-session.c + # All gschemas fail to pass the test, upstream bug? + sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c + # Cannot reproduce the failing test_associations on hydra + sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c + # Needed because of libtool wrappers + sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c '' + lib.optionalString stdenv.hostPlatform.isWindows '' substituteInPlace gio/win32/meson.build \ --replace "libintl, " "" @@ -204,16 +214,6 @@ stdenv.mkDerivation rec { export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" - - # Needs machine-id, comment the test - sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i ../gio/tests/gdbus-peer.c - sed -e '/g_test_add_func/ s/^\/*/\/\//' -i ../gio/tests/gdbus-address-get-session.c - # All gschemas fail to pass the test, upstream bug? - sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i ../gio/tests/gschema-compile.c - # Cannot reproduce the failing test_associations on hydra - sed -e '/\/appinfo\/associations/d' -i ../gio/tests/appinfo.c - # Needed because of libtool wrappers - sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i ../gio/tests/gsubprocess.c ''; inherit doCheck; From 6b836517dba469b8aea63c7317cd1ad3e4ae32f2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Aug 2022 17:15:39 +0000 Subject: [PATCH 072/737] glib: skip g-file-info test if atime unsupported atime=off is probably not uncommon among Nix users using ZFS. --- pkgs/development/libraries/glib/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e045c26f1e6c..0af6f7dd3b46 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -90,6 +90,13 @@ stdenv.mkDerivation rec { # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) # * gio-launch-desktop ./split-dev-programs.patch + + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2866 + (fetchpatch { + name = "tests-skip-g-file-info-test-if-atime-unsupported.patch"; + url = "https://gitlab.gnome.org/qyliss/glib/-/commit/339a06d66685107280ca6bdca5da5d96b8222fb5.patch"; + sha256 = "sha256-/NdFkuiJvyass3jTDEJPeciA2Lwe53IUd3kAnKAvTaw="; + }) ] ++ optional doCheck ./skip-timer-test.patch; outputs = [ "bin" "out" "dev" "devdoc" ]; From 14adc91759c0566ae6be8c659c7c708a706cdf7e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 1 Sep 2022 12:01:04 +0000 Subject: [PATCH 073/737] glib: unconditionally apply test patch This patch shouldn't have any effect on builds that don't run the tests, so it doesn't need to be conditionally applied. Applying it unconditionally will make it easier to notice if it breaks e.g. when updating glib. --- pkgs/development/libraries/glib/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 0af6f7dd3b46..268ba985f944 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -97,7 +97,9 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/qyliss/glib/-/commit/339a06d66685107280ca6bdca5da5d96b8222fb5.patch"; sha256 = "sha256-/NdFkuiJvyass3jTDEJPeciA2Lwe53IUd3kAnKAvTaw="; }) - ] ++ optional doCheck ./skip-timer-test.patch; + + ./skip-timer-test.patch + ]; outputs = [ "bin" "out" "dev" "devdoc" ]; From 2be1bcb3d2291d406a280d38860e42706e5bcf76 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 1 Sep 2022 12:06:26 +0000 Subject: [PATCH 074/737] glib: use finalAttrs instead of rec This will be important when we replace the doCheck option with an overrideAttrs, because then we can use it in passthru.tests. --- pkgs/development/libraries/glib/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 268ba985f944..f625ea4e67cb 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -43,12 +43,12 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glib"; version = "2.72.3"; src = fetchurl { - url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; sha256 = "Sjmi9iS4US1QDVhAFz7af6hfUcEJBS6ugGrOzoXTRfA="; }; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; buildInputs = [ - libelf setupHook pcre + libelf finalAttrs.setupHook pcre ] ++ optionals (!stdenv.hostPlatform.isWindows) [ bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ optionals stdenv.isLinux [ @@ -190,7 +190,7 @@ stdenv.mkDerivation rec { sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. - sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + sed '1i#line 1 "glib-${finalAttrs.version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c for i in $bin/bin/*; do moveToOutput "share/bash-completion/completions/''${i##*/}" "$bin" @@ -214,7 +214,7 @@ stdenv.mkDerivation rec { checkInputs = [ tzdata desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' - export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" @@ -258,4 +258,4 @@ stdenv.mkDerivation rec { set of utility functions for strings and common data structures. ''; }; -} +}) From d65d8002c7fbca2144fce2480a65bec36768da9a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 1 Sep 2022 12:07:16 +0000 Subject: [PATCH 075/737] glib.tests.withChecks: init This will allow OfBorg to run the GLib tests, which it didn't do before. To do this correctly for the glib we're building, we need to override it rather than taking glib as an input. finalAttrs.finalPackage is not overrideable, so instead we need to use overrideAttrs. Since we can now consult finalAttrs.doCheck, there's no longer any need for a separate doCheck option, so I've removed it in favour of overrideAttrs. --- pkgs/development/libraries/glib/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f625ea4e67cb..942231ebb3ea 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -5,7 +5,6 @@ , buildPackages # this is just for tests (not in the closure of any regular package) -, doCheck ? config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info , darwin, fetchpatch @@ -213,7 +212,7 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ tzdata desktop-file-utils shared-mime-info ]; - preCheck = optionalString doCheck '' + preCheck = optionalString finalAttrs.doCheck or config.doCheckByDefault or false '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" @@ -225,8 +224,6 @@ stdenv.mkDerivation (finalAttrs: { echo "PATH=$PATH" ''; - inherit doCheck; - separateDebugInfo = stdenv.isLinux; passthru = rec { @@ -237,6 +234,8 @@ stdenv.mkDerivation (finalAttrs: { getSchemaPath = pkg: makeSchemaPath pkg pkg.name; getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; + tests.withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + inherit flattenInclude; updateScript = gnome.updateScript { packageName = "glib"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a11e3a4b6ad..6c876b7ef19a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18525,7 +18525,7 @@ with pkgs; gtkimageview = callPackage ../development/libraries/gtkimageview { }; glib = callPackage ../development/libraries/glib (let - glib-untested = glib.override { doCheck = false; }; + glib-untested = glib.overrideAttrs (_: { doCheck = false; }); in { # break dependency cycles # these things are only used for tests, they don't get into the closure From 81c37edce4ce14a25ff7b35cbd0e1cb22a48c401 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 26 Aug 2022 11:23:10 +0200 Subject: [PATCH 076/737] glibcLocales: follow host platform endianness --- pkgs/development/libraries/glibc/locales.nix | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index bada8b3f31f7..d2cf0f89cb07 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -19,19 +19,26 @@ callPackage ./common.nix { inherit stdenv; } { extraNativeBuildInputs = [ glibc ]; - # Awful hack: `localedef' doesn't allow the path to `locale-archive' - # to be overriden, but you *can* specify a prefix, i.e. it will use - # //lib/locale/locale-archive. So we use - # $TMPDIR as a prefix, meaning that the locale-archive is placed in - # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. - buildPhase = - '' + LOCALEDEF_FLAGS = [ + (if stdenv.hostPlatform.isLittleEndian + then "--little-endian" + else "--big-endian") + ]; + + buildPhase = '' + # Awful hack: `localedef' doesn't allow the path to `locale-archive' + # to be overriden, but you *can* specify a prefix, i.e. it will use + # //lib/locale/locale-archive. So we use + # $TMPDIR as a prefix, meaning that the locale-archive is placed in + # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. + LOCALEDEF_FLAGS+=" --prefix=$TMPDIR" + mkdir -p $TMPDIR/"${buildPackages.glibc.out}/lib/locale" echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED # Hack to allow building of the locales (needed since glibc-2.12) - sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile + sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef $(LOCALEDEF_FLAGS),' ../glibc-2*/localedata/Makefile '' + lib.optionalString (!allLocales) '' # Check that all locales to be built are supported From 09df3d551527d858fe1a870c54f59942586c9d2e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 26 Aug 2022 11:26:24 +0200 Subject: [PATCH 077/737] nixos/i18n: use glibcLocales from the host packages The locale-archive is dependent on the endianness of the host system --- nixos/modules/config/i18n.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index f73f10f0f369..b1efc00773dc 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -10,12 +10,12 @@ with lib; i18n = { glibcLocales = mkOption { type = types.path; - default = pkgs.buildPackages.glibcLocales.override { + default = pkgs.glibcLocales.override { allLocales = any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; }; defaultText = literalExpression '' - pkgs.buildPackages.glibcLocales.override { + pkgs.glibcLocales.override { allLocales = any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; } From 269df4a6e5a393ab8ca2fb568812b2c3b8cba381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 1 Sep 2022 12:09:04 -0300 Subject: [PATCH 078/737] vulkan-sdk: 1.3.224.0 -> 1.3.224.1 --- pkgs/development/compilers/glslang/default.nix | 4 ++-- pkgs/development/libraries/spirv-headers/default.nix | 2 +- pkgs/development/libraries/vulkan-headers/default.nix | 2 +- pkgs/development/libraries/vulkan-loader/default.nix | 2 +- pkgs/development/tools/spirv-tools/default.nix | 2 +- pkgs/development/tools/vulkan-validation-layers/default.nix | 4 ++-- pkgs/tools/graphics/vulkan-extension-layer/default.nix | 2 +- pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 2 +- pkgs/tools/graphics/vulkan-tools/default.nix | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 0da4b60a3ed6..72d895449111 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = "sdk-${version}"; - hash = "sha256-+NKp/4e3iruAcTunpxksvCHxoVYmPd0kFI8JDJJUVg4="; + hash = "sha256-VEOENuy/VhYBBX52O4QHJFXUjsj6jL4vDD4cLDlQcIA="; }; # These get set at all-packages, keep onto them for child drvs diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index c634b8330428..36ab5008e6ab 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = fetchFromGitHub { owner = "KhronosGroup"; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 0e1a01032f62..d27d2bf008cf 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.224.0"; + version = "1.3.224.1"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index b825214dbb55..0c3e48289cbc 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = (assert version == vulkan-headers.version; fetchFromGitHub { diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 150df6e25093..0a35478c5e36 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = (assert version == spirv-headers.version; fetchFromGitHub { diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 1ae5e520e0f7..0484ee47b88e 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.224.0"; + version = "1.3.224.1"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - hash = "sha256-MmAxUuV9CVJ6LHUb6ePEiE37meDB1TqPAwLsPdHQ1u8="; + hash = "sha256-5To5Llxl1i1XLaU2tR/O7g7dn2iV3FwLH7gFdXTMXxo="; }); # Include absolute paths to layer libraries in their associated diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 2a8e999565d1..22943bc12862 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = (assert version == vulkan-headers.version; fetchFromGitHub { diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index be708e6c605f..4c39671ffac3 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.3.224.0"; + version = "1.3.224.1"; src = (assert version == vulkan-headers.version; fetchFromGitHub { diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 93663ec2a2c6..f57cba28439e 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.224.0"; + version = "1.3.224.1"; # It's not strictly necessary to have matching versions here, however # since we're using the SDK version we may as well be consistent with From fef040afae46c0471820ecfd0b3657b52096f167 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 5 Sep 2022 19:16:31 +0100 Subject: [PATCH 079/737] binutils: restore `nm` autodetection on darwin The change restores the patch `nixpkgs` kept for `binutils-2.38`. On top of that we revert the second `binutils-2.39`-specific commit that attempted to fix it. We can drop both reverts once https://sourceware.org/PR29547 is fixed. --- ...libtool.m4-fix-nm-BSD-flag-detection.patch | 137 ++++++++++++++++++ ...4-fix-the-NM-nm-over-here-B-option-w.patch | 42 ++++++ .../tools/misc/binutils/default.nix | 6 + 3 files changed, 185 insertions(+) create mode 100644 pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch create mode 100644 pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch diff --git a/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch b/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch new file mode 100644 index 000000000000..f9c6e88d97b4 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch @@ -0,0 +1,137 @@ +From beca4a2c25ee86e4020f8b8bddc4d8e0ed3430b3 Mon Sep 17 00:00:00 2001 +From: Andrew Childs +Date: Tue, 22 Feb 2022 11:28:04 +0900 +Subject: [PATCH] Revert "libtool.m4: fix nm BSD flag detection" + +This reverts commit bef9ef8ca0f941d743c77cc55b5fe7985990b2a7. +--- + ChangeLog | 9 ------ + libtool.m4 | 88 ++++++++++++++++++++++++++---------------------------- + 2 files changed, 43 insertions(+), 54 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 18e8b6835da..c12f07403c3 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -375,15 +375,6 @@ + + * src-release.sh (GDB_SUPPPORT_DIRS): Add libbacktrace. + +-2021-09-27 Nick Alcock +- +- PR libctf/27967 +- * libtool.m4 (LT_PATH_NM): Try BSDization flags with a user-provided +- NM, if there is one. Run nm on itself, not on /dev/null, to avoid +- errors from nms that refuse to work on non-regular files. Remove +- other workarounds for this problem. Strip out blank lines from the +- nm output. +- + 2021-09-27 Nick Alcock + + PR libctf/27967 +diff --git a/libtool.m4 b/libtool.m4 +index a216bb14e99..7a711249304 100644 +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -3200,55 +3200,53 @@ _LT_DECL([], [file_magic_cmd], [1], + + # LT_PATH_NM + # ---------- +-# find the pathname to a BSD- or MS-compatible name lister, and any flags +-# needed to make it compatible ++# find the pathname to a BSD- or MS-compatible name lister + AC_DEFUN([LT_PATH_NM], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, + [if test -n "$NM"; then +- # Let the user override the nm to test. +- lt_nm_to_check="$NM" +- else +- lt_nm_to_check="${ac_tool_prefix}nm" +- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then +- lt_nm_to_check="$lt_nm_to_check nm" +- fi +- fi +- for lt_tmp_nm in $lt_nm_to_check; do +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- case "$lt_tmp_nm" in +- */*|*\\*) tmp_nm="$lt_tmp_nm";; +- *) tmp_nm="$ac_dir/$lt_tmp_nm";; +- esac +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in +- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in +- *$tmp_nm*) +- lt_cv_path_NM="$tmp_nm -p" +- break +- ;; +- *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- ;; +- esac +- ;; +- esac +- fi +- done +- IFS="$lt_save_ifs" +- done +- : ${lt_cv_path_NM=no}]) ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ : ${lt_cv_path_NM=no} ++fi]) + if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" + else +-- +2.34.1 + diff --git a/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch b/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch new file mode 100644 index 000000000000..b5083d81d71c --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch @@ -0,0 +1,42 @@ +This reverts upstream commit caf606c90d55305967b9253447dda93d2f1835ab +until https://sourceware.org/PR29547 is fixed. + +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -3214,31 +3214,25 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, + lt_nm_to_check="$lt_nm_to_check nm" + fi + fi +- for lt_tmp_nm in "$lt_nm_to_check"; do ++ for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. +- # Strip out any user-provided options from the nm to test twice, +- # the first time to test to see if nm (rather than its options) has +- # an explicit path, the second time to yield a file which can be +- # nm'ed itself. +- tmp_nm_path="`$ECHO "$lt_tmp_nm" | sed 's, -.*$,,'`" +- case "$tmp_nm_path" in ++ case "$lt_tmp_nm" in + */*|*\\*) tmp_nm="$lt_tmp_nm";; + *) tmp_nm="$ac_dir/$lt_tmp_nm";; + esac +- tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`" +- if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored +- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in ++ case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in + *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) +- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in ++ case `"$tmp_nm" -p "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in + *$tmp_nm*) + lt_cv_path_NM="$tmp_nm -p" + break diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index fb891c67da40..e5ecc365d48b 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -68,6 +68,12 @@ stdenv.mkDerivation { # Make binutils output deterministic by default. ./deterministic.patch + + # Breaks nm BSD flag detection, heeds an upstream fix: + # https://sourceware.org/PR29547 + ./0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch + ./0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch + # Required for newer macos versions ./0001-libtool.m4-update-macos-version-detection-block.patch From 8e00bc6e771c758dfdd0614faa56fdaa44334c87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 00:31:45 +0000 Subject: [PATCH 080/737] neon: 0.32.2 -> 0.32.3 --- pkgs/development/libraries/neon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 5250dcddf845..4a00044bb557 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.32.2"; + version = "0.32.3"; pname = "neon"; src = fetchurl { url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-mGVmRoxilfxdD7FBpZgeMcn4LuOOk4N0q+2Ece8vsoY="; + sha256 = "sha256-lMuHXcbb/N7ljwObdjxnSwIyiGzf16Xekb5c36K3WWo="; }; patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; From d2fa4f8f7a068fdc1544ecda039528c377a3385f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 5 Sep 2022 22:27:04 +1000 Subject: [PATCH 081/737] sqlite: 3.39.2 -> 3.39.3 https://www.sqlite.org/releaselog/3_39_3.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 0c90d2a70602..786c3c9e313c 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.39.2"; + version = "3.39.3"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-hSvophg6F7pHzuC7/3QAt6pa/9KDvzvu/DT80IiiOd4="; + sha256 = "sha256-eGj7MIK+Pyz0SRxvum3ivdy8KTo1/vsGJO48E/AUIrk="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 1d559dcb38bf..92d521b1916c 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.39.2"; + version = "3.39.3"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-6TPXcAD0Xz+8hgXwBQWGowE1Bajem0QDK9AO1y8VhvA="; + sha256 = "sha256-GMEvLh2hEkIRc8hcT4rtQyYScsGwR0qgdZKI/TD6ufw="; }; nativeBuildInputs = [ unzip ]; From cdf358d28c0b9672b9f256b0db6b60af52ba56fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 13:39:39 +0000 Subject: [PATCH 082/737] fluidsynth: 2.2.8 -> 2.2.9 --- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 45b25ec3d8af..1c0ddd1942d3 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.2.8"; + version = "2.2.9"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-zJMe2skFeXhrAx9vBcTXWJLfivI/iXyc0JFlNKpBETQ="; + sha256 = "sha256-8vsYn/4qkANp6f6avtdaXHfJD+9NTHTrl7i4RTlKXPQ="; }; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; From 7c0b72f40b6f2c7915d8877856b0735b76297e82 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 7 Sep 2022 04:50:26 +1000 Subject: [PATCH 083/737] go_1_18: 1.18.5 -> 1.18.6 --- pkgs/development/compilers/go/1.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 7b208da59882..c3ec8ceac009 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -45,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.18.5"; + version = "1.18.6"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-mSDTMGoaxTbN0seW1ss8VLxVnCJvw8w5wy8eC9f1DSo="; + sha256 = "sha256-p/HVBCQ1XavOZtERKxyuQ5tu5eTxXtum8QTApLFz6JU="; }; strictDeps = true; From da9a9a440415b236f22f57ba67a24ab3fb53f595 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 7 Aug 2022 01:48:42 +0300 Subject: [PATCH 084/737] treewide: cross fixes --- .../networking/browsers/netsurf/libnsgif.nix | 5 ++++- .../gnome/apps/gnome-characters/default.nix | 8 ++++++++ .../gnome/apps/gnome-clocks/default.nix | 3 +++ .../gnome/apps/gnome-logs/default.nix | 15 +++++++++++++++ .../gnome/apps/gnome-weather/default.nix | 3 ++- pkgs/desktops/gnome/apps/seahorse/default.nix | 9 +++++++-- pkgs/desktops/gnome/core/gdm/default.nix | 2 +- .../gnome/core/gnome-bluetooth/default.nix | 3 +++ .../gnome/core/gnome-font-viewer/default.nix | 1 + .../core/gnome-shell-extensions/default.nix | 2 +- .../core/gnome-system-monitor/default.nix | 1 + .../gnome/core/gnome-themes-extra/default.nix | 2 +- .../development/libraries/clutter/default.nix | 2 +- pkgs/development/libraries/cogl/default.nix | 4 +++- pkgs/development/libraries/gcr/default.nix | 3 ++- .../libraries/geocode-glib/default.nix | 3 +++ pkgs/development/libraries/gexiv2/default.nix | 7 ++++--- pkgs/development/libraries/gjs/default.nix | 7 +++++-- .../libraries/gnome-menus/default.nix | 4 ++-- pkgs/development/libraries/grilo/default.nix | 3 +++ pkgs/development/libraries/gspell/default.nix | 8 +++++++- pkgs/development/libraries/gtkmm/3.x.nix | 11 +++++++++-- pkgs/development/libraries/gusb/default.nix | 2 +- .../libraries/libaccounts-glib/default.nix | 10 +++++++++- .../libraries/libadwaita/default.nix | 6 +++++- .../libraries/libdazzle/default.nix | 3 +++ pkgs/development/libraries/libgsf/default.nix | 8 ++++++++ .../libraries/libgweather/default.nix | 19 +++++++++++++++++-- .../libraries/libhandy/default.nix | 8 +++++--- .../libraries/liblouis/default.nix | 4 +++- .../libraries/libmediaart/default.nix | 8 ++++++-- .../development/libraries/libpeas/default.nix | 4 ++++ .../libraries/libportal/default.nix | 4 ++++ .../libraries/pipewire/wireplumber.nix | 4 ++-- .../python-modules/gst-python/default.nix | 13 +++++++++---- .../tools/profiling/sysprof/default.nix | 2 +- pkgs/os-specific/linux/bolt/default.nix | 8 ++++++-- .../linux/power-profiles-daemon/default.nix | 19 ++++++++++--------- .../networkmanager/libnma/default.nix | 5 ++++- .../package-management/packagekit/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 4 ++-- 41 files changed, 187 insertions(+), 53 deletions(-) diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 582bcc84e4f1..2e1cb37a6468 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config, buildPackages , buildsystem }: @@ -12,12 +12,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + "BUILD_CC=$(CC_FOR_BUILD)" ]; meta = with lib; { diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index b43e0cdecadf..b4e9eee9712f 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +30,13 @@ stdenv.mkDerivation rec { sha256 = "XaD/uBb4prRPMDdEyoJ6NAgBGMHJONjXmvF7f+Z5gPg="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3e28a6ad668e2239b14f2e05bc477ec1bfb210ba.patch"; + sha256 = "sha256-2N4eewknhOXBABs6BPA5/YuqZMT8dyXW857iamrrtuA="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 3c57c6272e84..2700f769b083 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -45,6 +45,9 @@ stdenv.mkDerivation rec { desktop-file-utils libxml2 gobject-introspection # for finding vapi files + # error: Package `...' not found in specified Vala API directories or GObject-Introspection GIR directories + # TODO: the vala setuphook should look for vala filess in targetOffset instead of hostOffset + gsound ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index 16d487867b8f..105194123d00 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +30,19 @@ stdenv.mkDerivation rec { sha256 = "TV5FFp1r9DkC16npoHk8kW65LaumuoWzXI629nLNq9c="; }; + patches = [ + # meson: Remove redundant check for glib-mkenums + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/01386ce9a69652a00bdb163e569b51150ca8903e.diff"; + sha256 = "sha256-tJJEai4Jw8aVcyhsFTYILiUV1xhsysX/rleeLP13DVM="; + }) + # meson: remove redundant check for pkg-config + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/ad350729a8b81f2c8eb2122de0956bb2199b48da.patch"; + sha256 = "sha256-5qGYyKM+B9XNZKytWH8K4QfSuBf7wpaPCWT6YIO5FGY="; + }) + ]; + nativeBuildInputs = [ python3 meson @@ -41,6 +55,7 @@ stdenv.mkDerivation rec { libxslt docbook_xsl docbook_xml_dtd_43 + glib ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index b7921322d994..c04cd6f2dc96 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -31,13 +31,14 @@ stdenv.mkDerivation rec { ninja wrapGAppsHook python3 + gobject-introspection + gjs ]; buildInputs = [ gtk4 libadwaita gjs - gobject-introspection libgweather gnome.adwaita-icon-theme geoclue2 diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 60b1e2d572ed..07e39248bb70 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -42,6 +42,13 @@ stdenv.mkDerivation rec { itstool wrapGAppsHook python3 + openssh + gnupg + gcr + # error: Package `...' not found in specified Vala API directories or GObject-Introspection GIR directories + # TODO: the vala setuphook should look for vala filess in targetOffset instead of hostOffset + libhandy + libsecret ]; buildInputs = [ @@ -50,13 +57,11 @@ stdenv.mkDerivation rec { glib-networking gcr gsettings-desktop-schemas - gnupg gpgme libsecret avahi libsoup p11-kit - openssh openldap libpwquality libhandy diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index 990f1bef2119..cf435b1e9ea3 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -73,13 +73,13 @@ stdenv.mkDerivation rec { pkg-config python3 rsync + gobject-introspection ]; buildInputs = [ accountsservice audit glib - gobject-introspection gtk3 keyutils libX11 diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 678895ffbb50..8b6eb8c4f1bb 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -3,6 +3,7 @@ , fetchurl , gnome , meson +, mesonEmulatorHook , ninja , pkg-config , gtk4 @@ -49,6 +50,8 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 python3 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 397f0b9838f1..64eb22b186d6 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { gettext wrapGAppsHook4 libxml2 + glib ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 0d8e87b3642d..c60e06ea640a 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Fixup adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions - schemadir=${glib.makeSchemaPath "$out" "${pname}-${version}"} + schemadir=${glib.makeSchemaPath "$out" "$name"} glib-compile-schemas $schemadir diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index aad4744935be..cbce4ad8b05c 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { wrapGAppsHook meson ninja + glib ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix index 53f775833a8f..c7f70c76b2b3 100644 --- a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ pkg-config intltool gtk3 ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; propagatedBuildInputs = [ gnome.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index aacb8581c8fc..2bf1162fe192 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; propagatedBuildInputs = [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e58a500cf838..7eef53e4c625 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config libintl automake autoconf ]; + nativeBuildInputs = [ pkg-config libintl automake autoconf gobject-introspection ]; configureFlags = [ "--enable-introspection" @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional gstreamerSupport "--enable-cogl-gst" ++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; + # TODO: this shouldn't propagate so many things + # especially not gobject-introspection propagatedBuildInputs = with xorg; [ glib gdk-pixbuf gobject-introspection wayland mesa libGL libXrandr libXfixes libXcomposite libXdamage diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index cb833272923f..1241ae2a63f5 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -46,10 +46,11 @@ stdenv.mkDerivation rec { wrapGAppsHook vala shared-mime-info + gnupg + openssh ]; buildInputs = [ - gnupg libgcrypt libtasn1 pango diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index b55b5c19228a..e69ea93bb121 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -3,6 +3,7 @@ , fetchurl , fetchpatch , meson +, mesonEmulatorHook , ninja , pkg-config , gettext @@ -53,6 +54,8 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons gobject-introspection + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 0cf505660040..6c5f797a0981 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , meson +, mesonEmulatorHook , ninja , pkg-config , exiv2 @@ -35,13 +36,13 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ glib - # Python binding overrides - python3 - python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index c8e28236aa3c..e24211590054 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , meson +, mesonEmulatorHook , ninja , pkg-config , gnome @@ -55,15 +56,17 @@ in stdenv.mkDerivation rec { makeWrapper which # for locale detection libxml2 # for xml-stripblanks + dbus # for dbus-run-session + gobject-introspection + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ - gobject-introspection cairo readline libsysprof-capture spidermonkey_91 - dbus # for dbus-run-session ]; checkInputs = [ diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index 0b3d6689cb0b..498641bbdc30 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - nativeBuildInputs = [ pkg-config gettext ]; - buildInputs = [ glib gobject-introspection ]; + nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; + buildInputs = [ glib ]; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 16897c6f0446..2f8c291da0d6 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , meson +, mesonEmulatorHook , ninja , pkg-config , gettext @@ -47,6 +48,8 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index d4bd149e64e3..9592fd116766 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, buildPackages , fetchurl , pkg-config , libxml2 @@ -38,10 +39,10 @@ stdenv.mkDerivation rec { libxml2 autoreconfHook gtk-doc + glib ]; buildInputs = [ - glib gtk3 icu ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -53,6 +54,11 @@ stdenv.mkDerivation rec { enchant2 ]; + configureFlags = [ + "GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" + "GLIB_MKENUMS=${lib.getDev buildPackages.glib}/bin/glib-mkenums" + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 420dee6cbaaf..7245b9749303 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, libepoxy, gnome }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, libepoxy, gnome, glib, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "gtkmm"; @@ -11,7 +11,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson ninja python3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + glib + gdk-pixbuf # for gdk-pixbuf-pixdata + ]; buildInputs = [ libepoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index e3dac6c4ec70..af24e46efe2a 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -4,7 +4,7 @@ }: let - pythonEnv = python3.withPackages(ps: with ps; [ + pythonEnv = python3.pythonForBuild.withPackages(ps: with ps; [ setuptools ]); in diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 8dfc222f36ac..e20ad1c954d1 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales +{ lib, stdenv, fetchFromGitLab, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales , libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { ninja pkg-config vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -38,6 +40,12 @@ stdenv.mkDerivation rec { sqlite ]; + # TODO: send patch upstream to make running tests optional + postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace meson.build \ + --replace "subdir('tests')" "" + ''; + LC_ALL = "en_US.UTF-8"; mesonFlags = [ diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index a9185f0b4fec..862ecda2697b 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-xxnLgPKPOND/ITvDC6SOD2GlkzlIX3BzBbt6p2AEjgY="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ gi-docgen meson @@ -40,6 +44,7 @@ stdenv.mkDerivation rec { pkg-config sassc vala + gobject-introspection ]; mesonFlags = [ @@ -50,7 +55,6 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi - gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 22ef87e43d04..aa808d5b4aa8 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -3,6 +3,7 @@ , fetchurl , ninja , meson +, mesonEmulatorHook , pkg-config , vala , gobject-introspection @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { glib ] ++ lib.optionals stdenv.isLinux [ xvfb-run + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 30324b04d850..6897ed5a0973 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -55,6 +55,14 @@ stdenv.mkDerivation rec { patchShebangs ./tests/ ''; + # checking pkg-config is at least version 0.9.0... ./configure: line 15213: no: command not found + # configure: error: in `/build/libgsf-1.14.50': + # configure: error: The pkg-config script could not be found or is too old. Make sure it + # is in your PATH or set the PKG_CONFIG environment variable to the full + preConfigure = '' + export PKG_CONFIG="$(command -v "$PKG_CONFIG")" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index cae2095f8ebd..e9a4eb2a4ea1 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { ./fix-pkgconfig.patch ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -43,8 +47,7 @@ stdenv.mkDerivation rec { vala gi-docgen gobject-introspection - python3 - python3.pkgs.pygobject3 + (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) ]; buildInputs = [ @@ -63,6 +66,18 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build-aux/meson/meson_post_install.py patchShebangs build-aux/meson/gen_locations_variant.py + + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + substituteInPlace doc/meson.build \ + --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" + + # gir works for us even when cross-compiling + # TODO: send upstream because downstream users can use the option to disable gir if they don't have it working + substituteInPlace libgweather/meson.build \ + --replace "g_ir_scanner.found() and not meson.is_cross_build()" "g_ir_scanner.found()" ''; postFixup = '' diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 468062beaefb..58d9097d8378 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" - ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ] ++ lib.optionals enableGlade [ "glade" @@ -43,6 +42,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-R3iL01gE69M8sJkR6XU0TIQ1ngttlSCv0cgh66i6d/8="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ gobject-introspection gi-docgen @@ -70,9 +73,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dgtk_doc=true" "-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}" - "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" ]; # Uses define_variable in pkg-config, but we still need it to use the glade output diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 32e58c9be0b2..2f3093e2facc 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { pname = "liblouis"; version = "3.22.0"; - outputs = [ "out" "dev" "man" "info" "doc" ]; + outputs = [ "out" "dev" "info" "doc" ] + # configure: WARNING: cannot generate manual pages while cross compiling + ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "man" ]; src = fetchFromGitHub { owner = "liblouis"; diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 531ff8584fac..e8898698dca1 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome }: +{ lib, stdenv, fetchurl, meson, mesonEmulatorHook, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc="; }; - nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + buildInputs = [ glib gdk-pixbuf ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 712592431abe..95e56153e51c 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { sha256 = "1iVSD6AuiXcCmyRq5Dm8IYloll8egtYSIItxPx3MPQ4="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 93ca52c243c6..005bc2126652 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { }) ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 5f418efe9fab..d43a4331f98d 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -20,7 +20,7 @@ , pipewire , # options enableDocs ? true -, enableGI ? stdenv.hostPlatform == stdenv.buildPlatform +, enableGI ? true }: let mesonEnableFeature = b: if b then "enabled" else "disabled"; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals (enableDocs || enableGI) [ doxygen - (python3.withPackages (ps: with ps; + (python3.pythonForBuild.withPackages (ps: with ps; lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ lib.optionals enableGI [ lxml ] )) diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index e14223c1fd6d..52c7be56bc72 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -8,7 +8,7 @@ , python , pygobject3 , gobject-introspection -, gst-plugins-base +, gst_all_1 , isPy3k }: @@ -28,22 +28,27 @@ buildPythonPackage rec { # Python 2.x is not supported. disabled = !isPy3k; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config - python gobject-introspection - gst-plugins-base + gst_all_1.gst-plugins-base ]; propagatedBuildInputs = [ - gst-plugins-base + gst_all_1.gst-plugins-base pygobject3 ]; mesonFlags = [ "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides" + # Exec format error during configure + "-Dpython=${python.pythonForBuild.interpreter}" ]; doCheck = true; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index e21e71907869..118b55197da5 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { shared-mime-info wrapGAppsHook gnome.adwaita-icon-theme + glib ]; buildInputs = [ - glib gtk3 json-glib pango diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index d424f89fdfb3..2545c73ac588 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { }) ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 @@ -53,10 +57,10 @@ stdenv.mkDerivation rec { meson ninja pkg-config + glib ] ++ lib.optional (!doCheck) python3; buildInputs = [ - glib polkit systemd ]; @@ -71,7 +75,7 @@ stdenv.mkDerivation rec { dbus gobject-introspection umockdev - (python3.withPackages + (python3.pythonForBuild.withPackages (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) ]; diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index 402b2536163c..f2720f40f5d4 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -2,6 +2,7 @@ , lib , pkg-config , meson +, mesonEmulatorHook , ninja , fetchFromGitLab , fetchpatch @@ -24,13 +25,6 @@ , nixosTests }: -let - testPythonPkgs = ps: with ps; [ - pygobject3 - dbus-python - python-dbusmock - ]; -in stdenv.mkDerivation rec { pname = "power-profiles-daemon"; version = "0.12"; @@ -58,6 +52,14 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsNoGuiHook python3.pkgs.wrapPython + # checkInput but cheked for during the configuring + (python3.pythonForBuild.withPackages (ps: with ps; [ + pygobject3 + dbus-python + python-dbusmock + ])) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -81,13 +83,12 @@ stdenv.mkDerivation rec { checkInputs = [ umockdev dbus - (python3.withPackages testPythonPkgs) ]; mesonFlags = [ "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dgtk_doc=true" - "-Dtests=true" + "-Dtests=${lib.boolToString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)}" ]; doCheck = true; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 4993068d2a51..00e68176c107 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , meson +, mesonEmulatorHook , ninja , gettext , gtk-doc @@ -51,6 +52,8 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 libxml2 vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -72,7 +75,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/nma-ws/nma-eap.c --subst-var-by \ - NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$out" "${pname}-${version}"} + NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$out" "$name"} ''; postInstall = '' diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 66064139f380..0dfa433e6c40 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { glib polkit python3 - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gtk3 @@ -54,6 +53,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; nativeBuildInputs = [ + gobject-introspection + glib vala gettext pkg-config diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0117f946f73..f33700146e8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4010,8 +4010,8 @@ in { }; gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson; - inherit (pkgs.gst_all_1) gst-plugins-base; + # inherit (pkgs) meson won't work because it won't be spliced + inherit (pkgs.buildPackages) meson; }; gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { }; From a52d95ac10bda7b81383bac1c1f69d8ab1d6f842 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 7 Aug 2022 06:08:14 +0300 Subject: [PATCH 085/737] libgnomekbd: fix cross and build introspection data they weren't being built before at all --- pkgs/development/libraries/libgnomekbd/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 957c21342524..5efd751bbb1e 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome }: +{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome, gobject-introspection }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { intltool pkg-config wrapGAppsHook + glib + gobject-introspection ]; # Requires in libgnomekbd.pc @@ -25,6 +27,11 @@ stdenv.mkDerivation rec { glib ]; + postPatch = '' + substituteInPlace libgnomekbd/Makefile.in \ + --replace "shell pkg-config" 'shell $(PKG_CONFIG)' + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From b59f013860edef42fbabcb010932d4e2bb63d5f2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 7 Aug 2022 06:27:50 +0300 Subject: [PATCH 086/737] uhttpmock: fix cross no idea why this still happens here when this issue was fixed in gobject-introspection hook and the fix works for other packages --- pkgs/development/libraries/uhttpmock/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 7a27cd1fd678..a5bd2fd36162 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + # while cross + # /build/source/tmp-introspect3xf43lf3/.libs/Uhm-0.0: error while loading shared libraries: libuhttpmock-0.0.so.0: cannot open shared object file: No such file or directory + preBuild = '' + mkdir -p ${placeholder "out"}/lib + ln -s $PWD/libuhttpmock/.libs/libuhttpmock-0.0.so.0 ${placeholder "out"}/lib/libuhttpmock-0.0.so.0 + ''; + meta = with lib; { description = "Project for mocking web service APIs which use HTTP or HTTPS"; homepage = "https://gitlab.com/groups/uhttpmock/"; From 740ebffd5a07ff07c96f03bdd6531c6110fc65a0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 4 Sep 2022 18:35:00 +0300 Subject: [PATCH 087/737] gobject-introspection: use lddtree instead of objdump as ldd wrapper the wrong path was used in gir files because the format of objdump is different from ldd so the regex in gobject-introspection doesn't work https://gitlab.gnome.org/GNOME/gobject-introspection/-/blob/main/giscanner/shlibs.py#L42-57 NEEDED libgmodule-2.0.so.0 gobject-introspection> NEEDED libglib-2.0.so.0 ldd gobject-introspection> libgmodule-2.0.so.0 => /nix/store/ngm1wbwms13c2crsvrah2ypfj0b2yii5-glib-2.73.2/lib/libgmodule-2.0.so.0 (0x00007ffff7d6e000) gobject-introspection> libglib-2.0.so.0 => /nix/store/ngm1wbwms13c2crsvrah2ypfj0b2yii5-glib-2.73.2/lib/libglib-2.0.so.0 (0x00007ffff7c32000) --- pkgs/development/libraries/gobject-introspection/default.nix | 2 +- pkgs/development/libraries/gobject-introspection/wrapper.nix | 2 +- .../gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index bd2873a04070..175a149e5c6b 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { isExecutable = true; src = ./wrappers/g-ir-scanner-lddwrapper.sh; inherit (buildPackages) bash; - buildobjdump = "${buildPackages.stdenv.cc.bintools}/bin/objdump"; + buildlddtree = "${buildPackages.pax-utils}/bin/lddtree"; }}" "-Dgi_cross_use_prebuilt_gi=true" "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}" diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 132104c1f645..f887b7d18c77 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -27,7 +27,7 @@ in export bash="${buildPackages.bash}" export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper" - export buildobjdump="${buildPackages.stdenv.cc.bintools}/bin/objdump" + export buildlddtree="${buildPackages.pax-utils}/bin/lddtree" export targetgir="${lib.getDev (targetPackages.gobject-introspection-unwrapped.override argsForTarget)}" diff --git a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh index 1bf9c3659dc5..f9c2a29f1442 100644 --- a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh +++ b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh @@ -1,4 +1,4 @@ #! @bash@/bin/bash # shellcheck shell=bash -exec @buildobjdump@ -p "$@" +exec @buildlddtree@ "$@" From 61bffac9fa8efe418bcc3ba6bea9968bf56c52d6 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 07:36:22 +0300 Subject: [PATCH 088/737] zxing: fix paths in pkg-config file --- pkgs/development/libraries/zxing-cpp/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index 126ef2bc69d6..b9d61e5af626 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -26,6 +26,17 @@ stdenv.mkDerivation rec { "-DBUILD_BLACKBOX_TESTS=OFF" ]; + # https://github.com/nu-book/zxing-cpp/issues/335 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'configure_file(zxing.pc.in' \ + 'include(GNUInstallDirs) + configure_file(zxing.pc.in' + substituteInPlace zxing.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/nu-book/zxing-cpp"; description = "C++ port of zxing (a Java barcode image processing library)"; From 1554ab553bce931d0b4ab3b0415c6c937ea9d47d Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 07:37:36 +0300 Subject: [PATCH 089/737] gst_all_1.gst-plugins-bad: link with zxing-cpp --- pkgs/development/libraries/gstreamer/bad/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index be7509d4cfbf..b378c81c89f4 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -85,6 +85,7 @@ , srt , vo-aacenc , libfreeaptx +, zxing-cpp , VideoToolbox , AudioToolbox , AVFoundation @@ -171,6 +172,7 @@ stdenv.mkDerivation rec { srt vo-aacenc libfreeaptx + zxing-cpp ] ++ lib.optionals enableZbar [ zbar ] ++ lib.optionals faacSupport [ @@ -259,7 +261,6 @@ stdenv.mkDerivation rec { "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing - "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing "-Disac=disabled" # depends on `webrtc-audio-coding-1` not compatible with 0.3 "-Dgs=disabled" # depends on `google-cloud-cpp` "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing From 2ddb885824fafd5a188851aa92f253ba94f4cb13 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 07:48:49 +0300 Subject: [PATCH 090/737] spirv-tools: fix paths in pkg-config files --- pkgs/development/tools/spirv-tools/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 150df6e25093..4bf7d942cbca 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -17,6 +17,21 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; + # https://github.com/KhronosGroup/SPIRV-Tools/issues/3905 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '-P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' \ + '-DCMAKE_INSTALL_FULL_LIBDIR=''${CMAKE_INSTALL_FULL_LIBDIR} + -DCMAKE_INSTALL_FULL_INCLUDEDIR=''${CMAKE_INSTALL_FULL_INCLUDEDIR} + -P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' + substituteInPlace cmake/SPIRV-Tools.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace cmake/SPIRV-Tools-shared.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { inherit (src.meta) homepage; description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; From aa473c6476da21135b8dc5b28298f451252f4aa0 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 08:25:06 +0300 Subject: [PATCH 091/737] libjxl: fix paths in pkg-config files --- pkgs/development/libraries/libjxl/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 461a3579ddef..567d985fd3d4 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { }; patches = [ + # present in master, see https://github.com/libjxl/libjxl/pull/1403 + (fetchpatch { + name = "prefixless-pkg-config.patch"; + url = "https://github.com/libjxl/libjxl/commit/0b906564bfbfd8507d61c5d6a447f545f893227c.patch"; + sha256 = "1g5c6lrsmgxb9j64pjy8lbdgbvw834m5jyfivy9ppmd8iiv0kkq4"; + }) + # present in master, remove after 0.7? (fetchpatch { name = "fix-link-lld-macho.patch"; From 10249211987c6f4231a3d02abb35b89e61f985de Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 09:15:42 +0300 Subject: [PATCH 092/737] wildmidi: fix paths in pkg-config file --- pkgs/development/libraries/wildmidi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 7983806a3090..88dd403a31fd 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace CMakeLists.txt \ --replace /etc/wildmidi $out/etc + # https://github.com/Mindwerks/wildmidi/issues/236 + substituteInPlace src/wildmidi.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; postInstall = '' From 7baca962de986c6635ab74a3e8cfcff8df7b875e Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 09:48:25 +0300 Subject: [PATCH 093/737] usrsctp: fix paths in pkg-config file --- pkgs/development/libraries/usrsctp/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix index 64b1debc0ce5..af8979c79d13 100644 --- a/pkgs/development/libraries/usrsctp/default.nix +++ b/pkgs/development/libraries/usrsctp/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/sctplab/usrsctp/issues/662 + postPatch = '' + substituteInPlace usrsctplib/CMakeLists.txt \ + --replace '$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { homepage = "https://github.com/sctplab/usrsctp"; description = "A portable SCTP userland stack"; From 869539e07d199b1aacf583a360667401b00c3125 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 09:52:43 +0300 Subject: [PATCH 094/737] openalSoft: update homepage URL --- pkgs/development/libraries/openal-soft/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index fa1d5af48042..d11d2f78bbd9 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OpenAL alternative"; - homepage = "https://kcat.strangesoft.net/openal.html"; + homepage = "https://openal-soft.org/"; license = licenses.lgpl2; maintainers = with maintainers; [ftrvxmtrx]; platforms = platforms.unix; From 4f7b421cc9be4cc12465ac59c549de72c29fbefe Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 10:01:28 +0300 Subject: [PATCH 095/737] openalSoft: fix paths in pkg-config file --- .../development/libraries/openal-soft/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index d11d2f78bbd9..434918c0c87b 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , alsaSupport ? !stdenv.isDarwin, alsa-lib , dbusSupport ? !stdenv.isDarwin, dbus , pipewireSupport ? !stdenv.isDarwin, pipewire @@ -17,9 +17,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-MVM0qCZDWcO7/Hnco+0dBqzBLcWD279xjx0slxxlc4w="; }; - # this will make it find its own data files (e.g. HRTF profiles) - # without any other configuration - patches = [ ./search-out.patch ]; + patches = [ + # this will make it find its own data files (e.g. HRTF profiles) + # without any other configuration + ./search-out.patch + # merged after 1.22.0 in https://github.com/kcat/openal-soft/pull/696 + (fetchpatch { + url = "https://github.com/kcat/openal-soft/commit/0bf2abae9b2121c3bc5a56dab30eca308136bc29.patch"; + sha256 = "1fhjjy7nrhrj3a0wlmsqpf8h3ss6s487vz5jrhamyv04nbcahn20"; + }) + ]; postPatch = '' substituteInPlace core/helpers.cpp \ --replace "@OUT@" $out From 52938dde0d15a662d5ef180ae8c7260a91173fe3 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 11:18:19 +0300 Subject: [PATCH 096/737] libebur128: fix paths in pkg-config file --- pkgs/development/libraries/libebur128/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 656923da3d15..c91cb23189f7 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ speexdsp ]; + # https://github.com/jiixyj/libebur128/issues/121 + postPatch = '' + substituteInPlace ebur128/libebur128.pc.cmake \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Implementation of the EBU R128 loudness standard"; homepage = "https://github.com/jiixyj/libebur128"; From 5b12efa3f2480cbcc960755812e80ac177bfecf5 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 15:44:29 +0300 Subject: [PATCH 097/737] openobex: fix paths in pkg-config file --- pkgs/tools/bluetooth/openobex/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 831644bd4ac0..5d18319ac603 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i "s!/lib/udev!$out/lib/udev!" udev/CMakeLists.txt sed -i "/if ( PKGCONFIG_UDEV_FOUND )/,/endif ( PKGCONFIG_UDEV_FOUND )/d" udev/CMakeLists.txt + # https://sourceforge.net/p/openobex/bugs/66/ + substituteInPlace CMakeLists.txt \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} ''; meta = with lib; { From ca049040de130c77f671fef17442ab60da465c0b Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 15:58:02 +0300 Subject: [PATCH 098/737] ffmpegthumbnailer: fix path in pkg-config file --- pkgs/development/libraries/ffmpegthumbnailer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index cb7b8214c57d..bfe8f80032dd 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg libpng libjpeg ]; cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; + # https://github.com/dirkvdb/ffmpegthumbnailer/issues/215 + postPatch = '' + substituteInPlace libffmpegthumbnailer.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; description = "A lightweight video thumbnailer"; From 5dedecfd4c7e901ed492362b23a04aaa7575f49b Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 16:09:30 +0300 Subject: [PATCH 099/737] libmatroska: fix paths in pkg-config file --- pkgs/development/libraries/libmatroska/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index a89bf9fc4ab9..1d5d13259bb2 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libebml }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "01dg12ndxfdqgjx5v2qy4mff6xjdxglywyg82sr3if5aw6rp3dji"; }; + # in master post 1.6.3, see https://github.com/Matroska-Org/libmatroska/issues/62 + patches = [ + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/Matroska-Org/libmatroska/commit/53f6ea573878621871bca5f089220229fcb33a3b.patch"; + sha256 = "1lcxl3n32kk5x4aa4ja7p68km7qb2bwscavpv7qdmbhp3w5ia0mk"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libebml ]; From a693b0cda68d6e7ae0428cb16aba621ddcda75ce Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 17:21:51 +0300 Subject: [PATCH 100/737] extra-cmake-modules: fix paths in generated pkg-config files --- .../kde-frameworks/extra-cmake-modules/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index b274999010a2..e4168299c182 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,10 +1,15 @@ -{ mkDerivation, lib, cmake, pkg-config }: +{ mkDerivation, lib, fetchpatch, cmake, pkg-config }: mkDerivation { pname = "extra-cmake-modules"; patches = [ ./nix-lib-path.patch + # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/268 + (fetchpatch { + url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/5862a6f5b5cd7ed5a7ce2af01e44747c36318220.patch"; + sha256 = "10y36fc3hnpmcsmjgfxn1rp4chj5yrhgghj7m8gbmcai1q5jr0xj"; + }) ]; outputs = [ "out" ]; # this package has no runtime components From bb1d2fab3d2f967f567b247c2add781ed3ed3ecd Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 17:38:34 +0300 Subject: [PATCH 101/737] libebml: fix paths in pkg-config file --- pkgs/development/libraries/libebml/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 84025e24f659..00fc506add7f 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "1yd6rsds03kwx5jki4hihd2bpfh26g5l1pi82qzaqzarixdxwzvl"; excludes = [ "ChangeLog" ]; }) + # in master post 1.4.2, see https://github.com/Matroska-Org/libebml/issues/97 + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/Matroska-Org/libebml/commit/42fbae35d291b737f2bb4ad5d643fd0d48537a88.patch"; + sha256 = "020qp4a3l60mcm4n310ynxbbv5qlpmybb9xy10pjvx4brp83pmy3"; + }) ]; nativeBuildInputs = [ cmake pkg-config ]; From d5ad233c153b8060615f827d05d8dfedc8fb8c53 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Fri, 13 May 2022 13:49:14 +0300 Subject: [PATCH 102/737] libargs: fix path in pkg-config file --- pkgs/development/libraries/libargs/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix index f75f556fb0de..3b27df772117 100644 --- a/pkgs/development/libraries/libargs/default.nix +++ b/pkgs/development/libraries/libargs/default.nix @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/Taywee/args/issues/108 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR} + substituteInPlace packaging/pkgconfig.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "A simple header-only C++ argument parser library"; homepage = "https://github.com/Taywee/args"; From 89f39f58e571a0b2a9ef356163a9e65eff9d1289 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 09:43:36 +0300 Subject: [PATCH 103/737] arrow-cpp: fix paths in CMake and pkg-config files --- pkgs/development/libraries/arrow-cpp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index d3b736fbe0f0..1402fc6ed946 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , fetchFromGitHub , fixDarwinDylibNames , abseil-cpp @@ -112,6 +113,14 @@ stdenv.mkDerivation rec { patches = [ # patch to fix python-test ./darwin.patch + # in master post 8.0.0, see https://github.com/apache/arrow/pull/13182 + (fetchpatch { + name = "fix-pkg-config.patch"; + stripLen = 1; + excludes = [ "src/arrow/engine/arrow-substrait.pc.in" ]; # for < 8.0.0 + url = "https://github.com/apache/arrow/commit/a242eb17362c0352fc3291213542c48abfe18669.patch"; + sha256 = "15gz13f8q75l7d4z5blyvxd805hwfcvrbrxs2kbfal9vcbnirycx"; + }) ]; nativeBuildInputs = [ From 427ae9a1e147fe39385f6ac344e443a18623ba63 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 10:51:53 +0300 Subject: [PATCH 104/737] bcc: fix path in pkg-config file --- pkgs/os-specific/linux/bcc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index ab3e2232852b..bb042e31c0e8 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -52,6 +52,10 @@ python.pkgs.buildPythonApplication rec { substituteAll ${./absolute-ausyscall.patch} ./absolute-ausyscall.patch patch -p1 < absolute-ausyscall.patch + + # https://github.com/iovisor/bcc/issues/3996 + substituteInPlace src/cc/libbcc.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; postInstall = '' From da6a95493f416883f2d6b33cbe2ee3c3305110e1 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 10:59:18 +0300 Subject: [PATCH 105/737] bcg729: fix path in pkg-config file --- pkgs/development/libraries/bcg729/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/development/libraries/bcg729/default.nix index 125512c3fed6..ff5840b8373f 100644 --- a/pkgs/development/libraries/bcg729/default.nix +++ b/pkgs/development/libraries/bcg729/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} + ''; + meta = with lib; { description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; homepage = "https://linphone.org/technical-corner/bcg729"; From 3bf5a3cecfe22d1a26662edad3e235a7cb2550e2 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 11:13:38 +0300 Subject: [PATCH 106/737] cglm: fix paths in pkg-config file --- pkgs/development/libraries/cglm/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 50a9bf62c54b..0a1544df0ade 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/recp/cglm/issues/249 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { homepage = "https://github.com/recp/cglm"; description = "Highly Optimized Graphics Math (glm) for C"; From 6f1dd9a2094588b518fdb455f062e48bc4b2e499 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 11:16:34 +0300 Subject: [PATCH 107/737] cm256cc: fix path in pkg-config file --- pkgs/development/libraries/cm256cc/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix index 09b0ffba98ba..3a2538898cce 100644 --- a/pkgs/development/libraries/cm256cc/default.nix +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; + # https://github.com/f4exb/cm256cc/issues/16 + postPatch = '' + substituteInPlace libcm256cc.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++"; homepage = "https://github.com/f4exb/cm256cc"; From 23fa3f2fde63f77e83c79cfffc1b5b48e5a4a7fc Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 15:36:32 +0300 Subject: [PATCH 108/737] cog: fix path in pkg-config file --- pkgs/development/web/cog/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index a08687e70fd8..c350149f32e2 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -53,6 +53,12 @@ stdenv.mkDerivation rec { "-DCOG_USE_WEBKITGTK=ON" ]; + # https://github.com/Igalia/cog/issues/438 + postPatch = '' + substituteInPlace core/cogcore.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + # not ideal, see https://github.com/WebPlatformForEmbedded/libwpe/issues/59 preFixup = '' wrapProgram $out/bin/cog \ From 4f047072ffdf1eb45ffafcd99dcbb461908f48ee Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 15:41:07 +0300 Subject: [PATCH 109/737] cxxopts: fix path in pkg-config file --- pkgs/development/libraries/cxxopts/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix index 5d12b3c19ee3..cf36a88a35be 100644 --- a/pkgs/development/libraries/cxxopts/default.nix +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { # Conflict on case-insensitive filesystems. dontUseCmakeBuildDir = true; + # https://github.com/jarro2783/cxxopts/issues/332 + postPatch = '' + substituteInPlace packaging/pkgconfig.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/jarro2783/cxxopts"; description = "Lightweight C++ GNU-style option parser library"; From 44acd93456aa7365f492ca32c1a4fe45fb5a49cb Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 15:55:20 +0300 Subject: [PATCH 110/737] plasma5Packages.drumstick: fix paths in pkg-config files --- pkgs/development/libraries/drumstick/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 6d11d8bfc8a3..36a4c56bbaf7 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace library/rt/backendmanager.cpp --subst-var out + + # https://sourceforge.net/p/drumstick/bugs/39/ + substituteInPlace drumstick-alsa.pc.in drumstick-file.pc.in drumstick-rt.pc.in drumstick-widgets.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; outputs = [ "out" "dev" "man" ]; From 092a1ea9ac519b0ac73d864561d84e20cecfb7fc Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 20:12:04 +0300 Subject: [PATCH 111/737] eccodes: fix paths in pkg-config files --- pkgs/development/libraries/eccodes/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index b6d4cd29f7e1..54df7be6f1ba 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -24,6 +24,17 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir} + + # https://github.com/ecmwf/ecbuild/issues/40 + substituteInPlace cmake/ecbuild_config.h.in \ + --replace @CMAKE_INSTALL_PREFIX@/@INSTALL_LIB_DIR@ @eccodes_FULL_INSTALL_LIB_DIR@ \ + --replace @CMAKE_INSTALL_PREFIX@/@INSTALL_BIN_DIR@ @eccodes_FULL_INSTALL_BIN_DIR@ + substituteInPlace cmake/pkg-config.pc.in \ + --replace '$'{prefix}/@INSTALL_LIB_DIR@ @eccodes_FULL_INSTALL_LIB_DIR@ \ + --replace '$'{prefix}/@INSTALL_INCLUDE_DIR@ @eccodes_FULL_INSTALL_INCLUDE_DIR@ \ + --replace '$'{prefix}/@INSTALL_BIN_DIR@ @eccodes_FULL_INSTALL_BIN_DIR@ + substituteInPlace cmake/ecbuild_install_project.cmake \ + --replace '$'{CMAKE_INSTALL_PREFIX}/'$'{INSTALL_INCLUDE_DIR} '$'{'$'{PROJECT_NAME}_FULL_INSTALL_INCLUDE_DIR} ''; nativeBuildInputs = [ cmake gfortran perl ]; From 1c09946985d1d496edb6d0652c7bcd3ce29be8f0 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 20:15:53 +0300 Subject: [PATCH 112/737] entt: fix path in pkg-config file --- pkgs/development/libraries/entt/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 7c87580aea11..01d4b88246a8 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/skypjack/entt/issues/890 + postPatch = '' + substituteInPlace cmake/in/entt.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/skypjack/entt"; description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++"; From 499b90f3190f3cbaeb52ed487648a2c986882d8e Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 20:24:44 +0300 Subject: [PATCH 113/737] gbenchmark: fix paths in pkg-config file --- pkgs/development/libraries/gbenchmark/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index fc356d6f0034..ff7aa2fbdda8 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { postPatch = '' cp -r ${gtest.src} googletest chmod -R u+w googletest + + # https://github.com/google/benchmark/issues/1396 + substituteInPlace cmake/benchmark.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; doCheck = true; From 0035e659fba980c695259743022fbd03fc58af28 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 16 May 2022 20:48:01 +0300 Subject: [PATCH 114/737] getdns: fix paths in pkg-config file --- pkgs/development/libraries/getdns/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 1ad8f1027c19..3691dc164077 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -29,6 +29,13 @@ in rec { buildInputs = [ libidn2 openssl unbound ]; + # https://github.com/getdnsapi/getdns/issues/517 + postPatch = '' + substituteInPlace getdns.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + postInstall = "rm -r $out/share/doc"; meta = with lib; From f2e74c1616f6269d917626d20ba8a40ab270ad24 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 12:56:23 +0300 Subject: [PATCH 115/737] google-cloud-cpp: fix paths in pkg-config files --- pkgs/development/libraries/google-cloud-cpp/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 2c5cade6b69c..18acca3f6915 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -42,6 +42,14 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ --replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" + + # https://github.com/googleapis/google-cloud-cpp/issues/8992 + for file in external/googleapis/config.pc.in google/cloud/{,*/}config.pc.in; do + substituteInPlace "$file" \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ + done ''; nativeBuildInputs = [ From 7b77d68bcf38fbb0eeb2b6651fb4c5eddbba4fe5 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 14:01:46 +0300 Subject: [PATCH 116/737] libbaseencode: fix paths in pkg-config file --- pkgs/development/libraries/libbaseencode/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/development/libraries/libbaseencode/default.nix index fdd5dbd1cb33..3abe41f5b5dd 100644 --- a/pkgs/development/libraries/libbaseencode/default.nix +++ b/pkgs/development/libraries/libbaseencode/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/paolostivanin/libbaseencode/issues/25 + postPatch = '' + substituteInPlace baseencode.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "Library written in C for encoding and decoding data using base32 or base64 (RFC-4648)"; homepage = "https://github.com/paolostivanin/libbaseencode"; From e1adfee035b40429567d40b94165008264112e68 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 14:04:35 +0300 Subject: [PATCH 117/737] libbtbb: fix paths in pkg-config file --- pkgs/development/libraries/libbtbb/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libbtbb/default.nix b/pkgs/development/libraries/libbtbb/default.nix index 2e2b95c2d8c7..e0e70005e25f 100644 --- a/pkgs/development/libraries/libbtbb/default.nix +++ b/pkgs/development/libraries/libbtbb/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + # https://github.com/greatscottgadgets/libbtbb/issues/63 + postPatch = '' + substituteInPlace lib/libbtbb.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "Bluetooth baseband decoding library"; homepage = "https://github.com/greatscottgadgets/libbtbb"; From d1f14fab9be24b6170d129d2ea61482a0deba7de Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 14:15:23 +0300 Subject: [PATCH 118/737] libcork: fix paths in pkg-config file --- pkgs/development/libraries/libcork/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libcork/default.nix b/pkgs/development/libraries/libcork/default.nix index 3875ff91185a..305ba24e280e 100644 --- a/pkgs/development/libraries/libcork/default.nix +++ b/pkgs/development/libraries/libcork/default.nix @@ -16,14 +16,20 @@ stdenv.mkDerivation rec { sha256 = "152gqnmr6wfmflf5l6447am4clmg3p69pvy3iw7yhaawjqa797sk"; }; - # N.B. We need to create this file, otherwise it tries to use git to - # determine the package version, which we do not want. - # - # N.B. We disable tests by force, since their build is broken. postPatch = '' + # N.B. We need to create this file, otherwise it tries to use git to + # determine the package version, which we do not want. echo "${version}" > .version-stamp echo "${version}" > .commit-stamp + + # N.B. We disable tests by force, since their build is broken. sed -i '/add_subdirectory(tests)/d' ./CMakeLists.txt + + # https://github.com/dcreager/libcork/issues/173 + substituteInPlace cmake/FindCTargets.cmake \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ + --replace '\$'{datarootdir}/'$'{base_docdir} '$'{CMAKE_INSTALL_FULL_DOCDIR} ''; nativeBuildInputs = [ cmake pkg-config ]; From 3bbc6d7842fcfeb8c575f9581e00e185229c2069 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 14:17:42 +0300 Subject: [PATCH 119/737] libcotp: fix paths in pkg-config file --- pkgs/development/libraries/libcotp/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 6fb7b3879c20..9d1b51a03ddc 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -14,6 +14,13 @@ stdenv.mkDerivation rec { buildInputs = [ libbaseencode libgcrypt ]; nativeBuildInputs = [ cmake pkg-config ]; + # https://github.com/paolostivanin/libcotp/issues/32 + postPatch = '' + substituteInPlace cotp.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "C library that generates TOTP and HOTP"; homepage = "https://github.com/paolostivanin/libcotp"; From 722cacf9ecec02c2aa3de9ba3b886f3be42ceedf Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 14:24:27 +0300 Subject: [PATCH 120/737] libdnf: fix path in pkg-config file --- pkgs/tools/package-management/libdnf/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 1cfccdd098f3..136b888f009a 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -41,11 +41,15 @@ stdenv.mkDerivation rec { cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/ ''; - # See https://github.com/NixOS/nixpkgs/issues/107428 postPatch = '' + # See https://github.com/NixOS/nixpkgs/issues/107428 substituteInPlace CMakeLists.txt \ --replace "enable_testing()" "" \ --replace "add_subdirectory(tests)" "" + + # https://github.com/rpm-software-management/libdnf/issues/1518 + substituteInPlace libdnf/libdnf.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; cmakeFlags = [ From ad67699dfbed5af771efc31c437188f198acfe1a Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 14:31:27 +0300 Subject: [PATCH 121/737] libkeyfinder: fix paths in pkg-config file --- .../libraries/audio/libkeyfinder/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/development/libraries/audio/libkeyfinder/default.nix index 65e4d0fb15ee..0a48dc479045 100644 --- a/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fftw, catch2 }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2 }: stdenv.mkDerivation rec { pname = "libkeyfinder"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg="; }; + # in main post 2.2.6, see https://github.com/mixxxdj/libkeyfinder/issues/21 + patches = [ + (fetchpatch { + name = "fix-pkg-config"; + url = "https://github.com/mixxxdj/libkeyfinder/commit/4e1a5022d4c91e3ecfe9be5c3ac7cc488093bd2e.patch"; + sha256 = "08llmgp6r11bq5s820j3fs9bgriaibkhq8r3v2av064w66mwp48x"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ fftw ]; From 3481609210ef2b0acedd16ba70bfd3effbc6c5a5 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 15:22:23 +0300 Subject: [PATCH 122/737] lxqt.lxqt-build-tools: fix paths in generated pkg-config files --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index f72394a09825..d543cf11c359 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , mkDerivation +, fetchpatch , fetchFromGitHub , cmake , pkg-config @@ -22,6 +23,15 @@ mkDerivation rec { sha256 = "vzppKTDwADBG5pOaluT858cWCKFFRaSbHz2Qhe6799E="; }; + patches = [ + # in master post 0.11.0, see https://github.com/lxqt/lxqt-build-tools/pull/76 + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/lxqt/lxqt-build-tools/pull/76/commits/fa9672b671ede3f46b004f81580f9afb50fedf00.patch"; + sha256 = "0dl7n1afcc6ky9vd9lpc65p9grpszpql7lfjq2vlzlilixnv8xv1"; + }) + ]; + postPatch = '' # Nix clang on darwin identifies as 'Clang', not 'AppleClang' # Without this, dependants fail to link. From 0fb6766ccbaa1c030a562f782fcb0ff8f0133b5f Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 15:27:07 +0300 Subject: [PATCH 123/737] libmodule: fix paths in pkg-config file --- pkgs/development/libraries/libmodule/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix index d77d2bcbdcd7..dd98908f3111 100644 --- a/pkgs/development/libraries/libmodule/default.nix +++ b/pkgs/development/libraries/libmodule/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { pkg-config ]; + # https://github.com/FedeDP/libmodule/issues/7 + postPatch = '' + substituteInPlace Extra/libmodule.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "C simple and elegant implementation of an actor library"; homepage = "https://github.com/FedeDP/libmodule"; From 4c5e1c74aedd9aad74815fd292327c4b610b3bb1 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 15:31:33 +0300 Subject: [PATCH 124/737] libnats-c: fix path in pkg-config file --- pkgs/development/libraries/libnats-c/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 7c72b6774994..b39cb7be189a 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { separateDebugInfo = true; outputs = [ "out" "dev" ]; + # https://github.com/nats-io/nats.c/issues/542 + postPatch = '' + substituteInPlace src/libnats.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "C API for the NATS messaging system"; homepage = "https://github.com/nats-io/nats.c"; From 50cee473aeb5ffe959605fa5e492dcdf3675b42d Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 15:37:24 +0300 Subject: [PATCH 125/737] libquotient: fix paths in pkg-config file --- pkgs/development/libraries/libquotient/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index eea7eeb88fc7..0f75c8d1f4e5 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -20,6 +20,13 @@ mkDerivation rec { "-DQuotient_ENABLE_E2EE=OFF" ]; + # https://github.com/quotient-im/libQuotient/issues/551 + postPatch = '' + substituteInPlace Quotient.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "A Qt5 library to write cross-platform clients for Matrix"; homepage = "https://matrix.org/docs/projects/sdk/quotient"; From 91bbd9567bf01dd3d9901d8ae3e43b88f48723e2 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 17 May 2022 15:39:47 +0300 Subject: [PATCH 126/737] libsurvive: fix path in pkg-config file --- pkgs/development/libraries/libsurvive/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 02c4ddffd78a..429c4bb33d96 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { eigen ]; + # https://github.com/cntools/libsurvive/issues/272 + postPatch = '' + substituteInPlace survive.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; From e7b9363c99ad8f8fa0d9ae1e5adfc093340fd963 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 14:24:18 +0300 Subject: [PATCH 127/737] libtorrent-rasterbar: fix paths in pkg-config file --- .../libraries/libtorrent-rasterbar/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 412446f215f8..09788cfef71d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -25,6 +25,18 @@ in stdenv.mkDerivation { buildInputs = [ boostPython openssl zlib python ncurses ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + # https://github.com/arvidn/libtorrent/issues/6865 + postPatch = '' + substituteInPlace cmake/Modules/GeneratePkgConfig.cmake \ + --replace @CMAKE_INSTALL_PREFIX@/'$<'1: '$<'1: + substituteInPlace cmake/Modules/GeneratePkgConfig/target-compile-settings.cmake.in \ + --replace 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \ + 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@") + set(_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@")' + substituteInPlace cmake/Modules/GeneratePkgConfig/pkg-config.cmake.in \ + --replace '$'{prefix}/@_INSTALL_LIBDIR@ @_INSTALL_FULL_LIBDIR@ + ''; + postInstall = '' moveToOutput "include" "$dev" moveToOutput "lib/${python.libPrefix}" "$python" From c29cb15ac1310a880c460aad94addd730685734a Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 14:44:36 +0300 Subject: [PATCH 128/737] libtsm: fix paths in pkg-config file --- pkgs/development/libraries/libtsm/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 25214242b531..7c0868509f09 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; + # https://github.com/Aetf/libtsm/issues/20 + postPatch = '' + substituteInPlace etc/libtsm.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "Terminal-emulator State Machine"; homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; From 4523fb567e5b6ac115537411db4c82759f8f2cd6 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 14:47:10 +0300 Subject: [PATCH 129/737] libunarr: fix paths in pkg-config file --- pkgs/development/libraries/libunarr/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 523ce82ce22d..94269e85c66d 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/selmf/unarr/issues/23 + postPatch = '' + substituteInPlace pkg-config.pc.cmake \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/selmf/unarr"; description = "A lightweight decompression library with support for rar, tar and zip archives"; From 32e540e559b94443a90bec50c7c79be9cd0ed011 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 15:09:08 +0300 Subject: [PATCH 130/737] maliit-framework: fix paths in pkg-config files --- pkgs/applications/misc/maliit-framework/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 6a6e66f293bd..ca942ca72d47 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchFromGitHub +, fetchpatch , at-spi2-atk , at-spi2-core @@ -32,6 +33,15 @@ mkDerivation rec { sha256 = "138jyvw130kmrldksbk4l38gvvahh3x51zi4vyplad0z5nxmbazb"; }; + # in master post 2.2.1, see https://github.com/maliit/framework/issues/106 + patches = [ + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/maliit/framework/commit/1e20a4a5113f1c092295f5a5f04ab6e584f6fcff.patch"; + sha256 = "0h7jfqnqvjka626wx2z2g150rch4air7q3zbq59gcb12g7x6gfyn"; + }) + ]; + buildInputs = [ at-spi2-atk at-spi2-core From 3e6abe1c777ff92888478aa7d31c81f91fabca44 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 15:13:49 +0300 Subject: [PATCH 131/737] mysocketw: fix path in pkg-config file --- .../libraries/mysocketw/default.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 32987d649922..5ee10c854a55 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,10 +1,20 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch +, fetchurl , openssl , cmake }: +let + + joinpaths-src = fetchurl { + url = "https://github.com/AnotherFoxGuy/CMakeCM/raw/afe41f4536ae21f6f11f83e8c0b8b8c450ef1332/modules/JoinPaths.cmake"; + hash = "sha256-eUsNj6YqO3mMffEtUBFFgNGkeiNL+2tNgwkutkam7MQ="; + }; + +in stdenv.mkDerivation rec { pname = "mysocketw"; version = "3.11.0"; @@ -16,6 +26,15 @@ stdenv.mkDerivation rec { hash = "sha256-mpfhmKE2l59BllkOjmURIfl17lAakXpmGh2x9SFSaAo="; }; + patches = [ + # in master post 3.11.0, see https://github.com/RigsOfRods/socketw/issues/16 + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/RigsOfRods/socketw/commit/17cad062c3673bd0da74a2fecadb01dbf9813a07.patch"; + sha256 = "01b019gfm01g0r1548cizrf7mqigsda8jnrzhg8dhi9c49nfw1bp"; + }) + ]; + nativeBuildInputs = [ cmake ]; @@ -24,6 +43,12 @@ stdenv.mkDerivation rec { openssl ]; + postUnpack = ''( + mkdir -p source/build/_cmcm-modules/resolved && cd $_ + cp ${joinpaths-src} JoinPaths.cmake + printf %s 'https://AnotherFoxGuy.com/CMakeCM::modules/JoinPaths.cmake.1' > JoinPaths.cmake.whence + )''; + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile \ --replace -Wl,-soname, -Wl,-install_name,$out/lib/ From e3d63b734b8806b2e362429c04ba33c20efd9ec3 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 15:16:48 +0300 Subject: [PATCH 132/737] nanomsg: fix path in pkg-config file --- pkgs/development/libraries/nanomsg/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index e7290d54c0b8..d7b7409dad14 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/nanomsg/nanomsg/issues/1082 + postPatch = '' + substituteInPlace src/pkgconfig.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description= "Socket library that provides several common communication patterns"; homepage = "https://nanomsg.org/"; From b3d98587484570717ca3401eaf0523fc08eaff31 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 15:21:49 +0300 Subject: [PATCH 133/737] notcurses: fix paths in pkg-config files --- pkgs/development/libraries/notcurses/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index 21b10ad4ed15..a0a5ddfa9c2d 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -44,6 +44,22 @@ stdenv.mkDerivation rec { lib.optional (qrcodegenSupport) "-DUSE_QRCODEGEN=ON" ++ lib.optional (!multimediaSupport) "-DUSE_MULTIMEDIA=none"; + # https://github.com/dankamongmen/notcurses/issues/2661 + postPatch = '' + substituteInPlace tools/notcurses-core.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace tools/notcurses-ffi.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace tools/notcurses++.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace tools/notcurses.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/dankamongmen/notcurses"; description = "Blingful TUIs and character graphics"; From 96a487c3e650c59795cb7a7d960e930cb84f7bf1 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 15:29:09 +0300 Subject: [PATCH 134/737] obexftp: fix paths in pkg-config file --- pkgs/tools/bluetooth/obexftp/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 3d9eda383ddf..8fd031d331c0 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openobex ]; + # https://sourceforge.net/p/openobex/bugs/66/ + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + # There's no such thing like "bluetooth" library; possibly they meant "bluez" but it links correctly without this. postFixup = '' sed -i 's,^Requires: bluetooth,Requires:,' $out/lib/pkgconfig/obexftp.pc From c709dd4c56996fe6f1a56aa1d11b2055612fad24 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 16:23:40 +0300 Subject: [PATCH 135/737] olm: fix paths in pkg-config file --- pkgs/development/libraries/olm/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 47a265687122..8c205d73287f 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { doCheck = true; + postPatch = '' + substituteInPlace olm.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "Implements double cryptographic ratchet and Megolm ratchet"; homepage = "https://gitlab.matrix.org/matrix-org/olm"; From d6ad6c479343bdb50a06152861398ca2913101ea Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 17:19:56 +0300 Subject: [PATCH 136/737] opencolorio: fix path in pkg-config file --- pkgs/development/libraries/opencolorio/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 81ab688b6436..79f66a616b95 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -55,6 +55,13 @@ stdenv.mkDerivation rec { # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 # doCheck = true; + # https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1649 + postPatch = '' + substituteInPlace src/OpenColorIO/CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} + ''; + meta = with lib; { homepage = "https://opencolorio.org"; description = "A color management framework for visual effects and animation"; From 8b387ff166328edbbe8ca5759e79e8d74d94c68c Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 17:30:27 +0300 Subject: [PATCH 137/737] opendht: fix paths in pkg-config file --- pkgs/development/libraries/opendht/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 218059ab1afb..25b4289d5f24 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -59,6 +59,13 @@ stdenv.mkDerivation rec { "-DOPENDHT_PUSH_NOTIFICATIONS=ON" ]; + # https://github.com/savoirfairelinux/opendht/issues/612 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + outputs = [ "out" "lib" "dev" "man" ]; meta = with lib; { From cb3a81d16cfde6cddf3db3834440b7aee82a847d Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 17:41:59 +0300 Subject: [PATCH 138/737] openxr-loader: fix path in pkg-config file --- pkgs/development/libraries/openxr-loader/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 51f86ef38604..6731fb716fe7 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "layers" ]; + # https://github.com/KhronosGroup/OpenXR-SDK-Source/issues/305 + postPatch = '' + substituteInPlace src/loader/openxr.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + postInstall = '' mkdir -p "$layers/share" mv "$out/share/openxr" "$layers/share" From bf76af55353b160fab6c0af1f9cd424ddd36d977 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 17:48:26 +0300 Subject: [PATCH 139/737] orcania: fix paths in pkg-config file --- pkgs/development/libraries/orcania/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index abe45b63372f..338deafa763e 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, check, subunit }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; version = "2.3.0"; @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-QAq/6MGVj+iBHLElHuqokF1v3LU1TZ9hVVJE1s3y6f0="; }; + # in master post 2.2.2, see https://github.com/babelouest/orcania/issues/27 + patches = [ + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/babelouest/orcania/commit/4eac7d5ff76bb3bec8250fef300b723c8891552a.patch"; + sha256 = "01bsxay1ca8d08ac3ddcqyvjwgz5mgs68jz5y3gzq4qnzl3q1i54"; + }) + ]; + nativeBuildInputs = [ cmake ]; checkInputs = [ check subunit ]; From 5c4210793dde29b702a2c138f9567c89a0562e84 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 18:38:17 +0300 Subject: [PATCH 140/737] powercap: fix paths in pkg-config file --- pkgs/os-specific/linux/powercap/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/powercap/default.nix b/pkgs/os-specific/linux/powercap/default.nix index 96ec83852d9d..e705b6a34857 100644 --- a/pkgs/os-specific/linux/powercap/default.nix +++ b/pkgs/os-specific/linux/powercap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "powercap"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-l+IpFqBnCYUU825++sUPySD/Ku0TEIX2kt+S0Wml6iA="; }; + # in master post 0.6.0, see https://github.com/powercap/powercap/issues/8 + patches = [ + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/powercap/powercap/commit/278dceb51635686e343edfc357b6020533fff299.patch"; + sha256 = "0h62j63xdn0iqyx4xbia6hlmdjn45camb82z4vv6sb37x9sph7rg"; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ From ce8e657451cd39c37f0a68669b5be08dc6b46101 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 20:41:57 +0300 Subject: [PATCH 141/737] proj: fix paths in CMake and pkg-config files --- pkgs/development/libraries/proj/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 68b47e2a2eb3..c7a316778212 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -22,6 +22,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-zMP+WzC65BFz8g8mF5t7toqxmxCJePysd6WJuqpe8yg="; }; + # https://github.com/OSGeo/PROJ/issues/3206 + postPatch = '' + # NB will not apply once https://github.com/OSGeo/PROJ/pull/3150 is released + substituteInPlace cmake/ProjUtilities.cmake \ + --replace '$\{exec_prefix\}/$'{PROJ_LIB_SUBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '$\{prefix\}/$'{PROJ_INCLUDE_SUBDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ + --replace '$\{prefix\}/$'{CMAKE_INSTALL_DATAROOTDIR} '$'{CMAKE_INSTALL_FULL_DATAROOTDIR} + substituteInPlace cmake/project-config.cmake.in \ + --replace '$'{_ROOT}/@INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace '$'{_ROOT}/@LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{_ROOT}/@BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake pkg-config ]; From 00b52816d85420ac4f91ad639dd25cea63740c7e Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 21:15:03 +0300 Subject: [PATCH 142/737] rabbitmq-c: fix paths in pkg-config file --- pkgs/development/libraries/rabbitmq-c/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 3d8fa0f95d93..b5324abd6ced 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -14,6 +14,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openssl popt xmlto ]; + # https://github.com/alanxz/rabbitmq-c/issues/733 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { description = "RabbitMQ C AMQP client library"; homepage = "https://github.com/alanxz/rabbitmq-c"; From 73f88f1ddd5f058eeeb3234853989925fb9c2fa0 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 21:21:31 +0300 Subject: [PATCH 143/737] recastnavigation: fix paths in pkg-config file --- pkgs/development/libraries/recastnavigation/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/development/libraries/recastnavigation/default.nix index 7825983a455b..59f39986ffcd 100644 --- a/pkgs/development/libraries/recastnavigation/default.nix +++ b/pkgs/development/libraries/recastnavigation/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { postPatch = '' cp ${catch}/include/catch/catch.hpp Tests/catch.hpp + + # https://github.com/recastnavigation/recastnavigation/issues/524 + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} ''; doCheck = true; From e05942145d0374e5527bd40dc43a6d2b396dc4eb Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 21:25:32 +0300 Subject: [PATCH 144/737] reproc: fix paths in pkg-config files --- pkgs/development/libraries/reproc/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix index b8449b61d76d..2083a6a7af4d 100644 --- a/pkgs/development/libraries/reproc/default.nix +++ b/pkgs/development/libraries/reproc/default.nix @@ -22,6 +22,16 @@ stdenv.mkDerivation rec { "-DREPROC_TEST=ON" ]; + # https://github.com/DaanDeMeyer/reproc/issues/81 + postPatch = '' + substituteInPlace reproc++/reproc++.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace reproc/reproc.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/DaanDeMeyer/reproc"; description = "A cross-platform (C99/C++11) process library"; From 7a2593d3c9e3c0fa635ef5cc8ee6b44996a0477c Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 21:29:07 +0300 Subject: [PATCH 145/737] rinutils: fix path in pkg-config file --- pkgs/development/libraries/rinutils/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix index d80a5f79d6ad..efb2adf497f1 100644 --- a/pkgs/development/libraries/rinutils/default.nix +++ b/pkgs/development/libraries/rinutils/default.nix @@ -18,4 +18,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake perl ]; + + # https://github.com/shlomif/rinutils/issues/5 + # (variable was unused at time of writing) + postPatch = '' + substituteInPlace librinutils.pc.in \ + --replace '$'{exec_prefix}/@RINUTILS_INSTALL_MYLIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; } From d5f218a228a9406286dc34b4e522c987fa48be50 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 21:38:00 +0300 Subject: [PATCH 146/737] rnp: fix path in pkg-config file --- pkgs/tools/security/rnp/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/tools/security/rnp/default.nix index a18571c80404..63053a10095c 100644 --- a/pkgs/tools/security/rnp/default.nix +++ b/pkgs/tools/security/rnp/default.nix @@ -5,6 +5,7 @@ , bzip2 , cmake , fetchFromGitHub +, fetchpatch , gnupg , gtest , json_c @@ -24,6 +25,15 @@ stdenv.mkDerivation rec { sha256 = "u0etVslTBF9fBqnpVBofYsm0uC/eR6gO3lhwzqua5Qw="; }; + # in master post 0.16.0, see https://github.com/rnpgp/rnp/issues/1835 + patches = [ + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/rnpgp/rnp/commit/de9856c94ea829cad277800ee03ec52e30993d8e.patch"; + sha256 = "1vd83fva7lhmvqnvsrifqb2zdhfrbx84lf3l9i0hcph0k8h3ddx9"; + }) + ]; + buildInputs = [ zlib bzip2 json_c botan2 ]; cmakeFlags = [ From 2e07f8a7bf0d4e3d57bd4521850baa2f3b7c92e1 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 21:40:25 +0300 Subject: [PATCH 147/737] rocm-thunk: fix paths in pkg-config file --- pkgs/development/libraries/rocm-thunk/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 583d9b59900e..c2a67a6f1462 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm numactl ]; + # https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/issues/75 + postPatch = '' + substituteInPlace libhsakmt.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + postInstall = '' cp -r $src/include $out ''; From a6ef202baf4bd11a09980c5125f09644fbf510a1 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 21:44:27 +0300 Subject: [PATCH 148/737] seexpr: fix path in pkg-config file --- pkgs/development/compilers/seexpr/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index b07a91599332..210daae37459 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ]; + # https://github.com/wdas/SeExpr/issues/106 + postPatch = '' + substituteInPlace src/build/seexpr2.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Embeddable expression evaluation engine from Disney Animation"; homepage = "https://wdas.github.io/SeExpr/"; From 18c0a8b1c51c53c8c6dcffc62863f6909eb2d425 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 21:50:31 +0300 Subject: [PATCH 149/737] sentencepiece: fix paths in pkg-config file --- pkgs/development/libraries/sentencepiece/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index cc4dd1268e60..ea903ca58e0e 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; + # https://github.com/google/sentencepiece/issues/754 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { homepage = "https://github.com/google/sentencepiece"; description = "Unsupervised text tokenizer for Neural Network-based text generation"; From 02f6b12ab18206c17fa9e2e5f4d7f5d7068450f9 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 22:26:11 +0300 Subject: [PATCH 150/737] shadowsocks-libev: fix paths in pkg-config files --- .../networking/shadowsocks-libev/default.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 3ad9161c716b..6018e77e5e43 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -25,6 +25,26 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + postPatch = '' + # https://github.com/shadowsocks/shadowsocks-libev/issues/2901 + substituteInPlace CMakeLists.txt \ + --replace '# pkg-config' \ + '# pkg-config + include(GNUInstallDirs)' + substituteInPlace cmake/shadowsocks-libev.pc.cmake \ + --replace @prefix@ @CMAKE_INSTALL_PREFIX@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_FULL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_DATAROOTDIR@ @CMAKE_INSTALL_FULL_DATAROOTDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_MANDIR@ @CMAKE_INSTALL_FULL_MANDIR@ + + # https://github.com/dcreager/libcork/issues/173 but needs a different patch (yay vendoring) + substituteInPlace libcork/src/libcork.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + postInstall = '' cp lib/* $out/lib ''; From 9d05c944628c016a9f0accb74aa35b22f46b5683 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 22:31:38 +0300 Subject: [PATCH 151/737] soapysdr: fix paths in pkg-config file --- pkgs/applications/radio/soapysdr/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 422e665b9372..adf997773ecc 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -40,6 +40,13 @@ in stdenv.mkDerivation { "-DCMAKE_BUILD_TYPE=Release" ] ++ lib.optional usePython "-DUSE_PYTHON_CONFIG=ON"; + # https://github.com/pothosware/SoapySDR/issues/352 + postPatch = '' + substituteInPlace lib/SoapySDR.in.pc \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + postFixup = lib.optionalString (lib.length extraPackages != 0) '' # Join all plugins via symlinking for i in ${toString extraPackages}; do From 2d03092f09013563e0076a6b813456117e41d23e Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 11 Aug 2022 00:02:54 +0300 Subject: [PATCH 152/737] spdlog: fix path in pkg-config file --- pkgs/development/libraries/spdlog/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 9c61ef70624d..b77eb935d4e6 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 +{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch , staticBuild ? stdenv.hostPlatform.isStatic }: @@ -15,6 +15,13 @@ let inherit sha256; }; + # in master post 1.10.0, see https://github.com/gabime/spdlog/issues/2380 + patches = lib.optional (lib.versionAtLeast version "1.4.1") (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/gabime/spdlog/commit/afb69071d5346b84e38fbcb0c8c32eddfef02a55.patch"; + sha256 = "0cab2bbv8zyfhrhfvcyfwf5p2fddlq5hs2maampn5w18f6jhvk6q"; + }); + nativeBuildInputs = [ cmake ]; # spdlog <1.3 uses a bundled version of fmt propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; From ab2ace0b8c8410259bb2f48dab0c026440218a5a Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 22:47:55 +0300 Subject: [PATCH 153/737] spirv-headers: fix path in pkg-config file --- pkgs/development/libraries/spirv-headers/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index c634b8330428..d55f1d9d3b88 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/KhronosGroup/SPIRV-Headers/issues/282 + postPatch = '' + substituteInPlace SPIRV-Headers.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { inherit (src.meta) homepage; description = "Machine-readable components of the Khronos SPIR-V Registry"; From 960e3c40c64f36dca6742363c92caff9f21f3c5a Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 23:42:56 +0300 Subject: [PATCH 154/737] tdlib: fix paths in pkg-config files --- pkgs/development/libraries/tdlib/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 0196e62fb977..10982240d971 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -15,6 +15,16 @@ stdenv.mkDerivation rec { buildInputs = [ gperf openssl readline zlib ]; nativeBuildInputs = [ cmake ]; + # https://github.com/tdlib/td/issues/1974 + postPatch = '' + substituteInPlace CMake/GeneratePkgConfig.cmake \ + --replace 'function(generate_pkgconfig' \ + 'include(GNUInstallDirs) + function(generate_pkgconfig' \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { description = "Cross-platform library for building Telegram clients"; homepage = "https://core.telegram.org/tdlib/"; From 347b676aeb5fd563d51e646a2d145144099124fe Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Wed, 18 May 2022 23:58:14 +0300 Subject: [PATCH 155/737] tinyobjloader: fix paths in pkg-config file --- pkgs/development/libraries/tinyobjloader/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix index 113e5f5ae95a..d07a841c3c02 100644 --- a/pkgs/development/libraries/tinyobjloader/default.nix +++ b/pkgs/development/libraries/tinyobjloader/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/tinyobjloader/tinyobjloader/issues/336 + postPatch = '' + substituteInPlace tinyobjloader.pc.in \ + --replace '$'{prefix}/@TINYOBJLOADER_LIBRARY_DIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@TINYOBJLOADER_INCLUDE_DIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/tinyobjloader/tinyobjloader"; description = "Tiny but powerful single file wavefront obj loader"; From 89f5bb4d181cc55decbcb10be521de54b132fcc2 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 19 May 2022 15:59:42 +0300 Subject: [PATCH 156/737] libbaseencode: 1.0.12 -> 1.0.14 --- pkgs/development/libraries/libbaseencode/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/development/libraries/libbaseencode/default.nix index 3abe41f5b5dd..fdd5dbd1cb33 100644 --- a/pkgs/development/libraries/libbaseencode/default.nix +++ b/pkgs/development/libraries/libbaseencode/default.nix @@ -13,13 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - # https://github.com/paolostivanin/libbaseencode/issues/25 - postPatch = '' - substituteInPlace baseencode.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - meta = with lib; { description = "Library written in C for encoding and decoding data using base32 or base64 (RFC-4648)"; homepage = "https://github.com/paolostivanin/libbaseencode"; From 9b66b717b7514dc49e9c3fa3e1b7be28a9dbbc1d Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 19 May 2022 16:01:19 +0300 Subject: [PATCH 157/737] libcotp: 1.2.4 -> 1.2.6 --- pkgs/development/libraries/libcotp/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 9d1b51a03ddc..6fb7b3879c20 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -14,13 +14,6 @@ stdenv.mkDerivation rec { buildInputs = [ libbaseencode libgcrypt ]; nativeBuildInputs = [ cmake pkg-config ]; - # https://github.com/paolostivanin/libcotp/issues/32 - postPatch = '' - substituteInPlace cotp.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - meta = with lib; { description = "C library that generates TOTP and HOTP"; homepage = "https://github.com/paolostivanin/libcotp"; From 6a0a4f9456acda5819a35ae1bb0a1f39d00acf32 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 19 May 2022 16:48:12 +0300 Subject: [PATCH 158/737] xsimd: fix path in pkg-config file --- pkgs/development/libraries/xsimd/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index 79bfdf9712ad..7d0af99645ec 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { in "-${builtins.concatStringsSep ":" filteredTests}"; + # https://github.com/xtensor-stack/xsimd/issues/748 + postPatch = '' + substituteInPlace xsimd.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "C++ wrappers for SIMD intrinsics"; homepage = "https://github.com/xtensor-stack/xsimd"; From a2a8c38e1dcbb9cfc3ac693b8d839fa4c3f427c6 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 19 May 2022 17:17:04 +0300 Subject: [PATCH 159/737] xtensor: fix path in pkg-config file --- pkgs/development/libraries/xtensor/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index fe978998d637..3503c6894efe 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { checkInputs = [ gtest ]; checkTarget = "xtest"; + # https://github.com/xtensor-stack/xtensor/issues/2542 + postPatch = '' + substituteInPlace xtensor.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Multi-dimensional arrays with broadcasting and lazy computing."; homepage = "https://github.com/xtensor-stack/xtensor"; From 00c23f460b99e55563f05175397982eea39b3c92 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 26 May 2022 16:30:59 +0300 Subject: [PATCH 160/737] libzra: fix paths in pkg-config file --- pkgs/development/libraries/libzra/default.nix | 5 + .../libraries/libzra/fix-pkg-config.patch | 150 ++++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 pkgs/development/libraries/libzra/fix-pkg-config.patch diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix index 3ebfc21095d1..feb0f1840b4d 100644 --- a/pkgs/development/libraries/libzra/default.nix +++ b/pkgs/development/libraries/libzra/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # in submodule dev as of 1.4.7 + postPatch = '' + (cd submodule/zstd && patch -Np1 < ${./fix-pkg-config.patch}) + ''; + meta = with lib; { homepage = "https://github.com/zraorg/ZRA"; description = "Library for ZStandard random access"; diff --git a/pkgs/development/libraries/libzra/fix-pkg-config.patch b/pkgs/development/libraries/libzra/fix-pkg-config.patch new file mode 100644 index 000000000000..5b0d40a4233f --- /dev/null +++ b/pkgs/development/libraries/libzra/fix-pkg-config.patch @@ -0,0 +1,150 @@ +From 7be7e35d61d8d499599623502a35460d410de114 Mon Sep 17 00:00:00 2001 +From: Alexander Shpilkin +Date: Thu, 26 May 2022 16:03:27 +0300 +Subject: [PATCH] Squashed commit of the following: + +commit 9aacb9d5da65a64c3845937a6f9eede329d43989 +Author: W. Felix Handte +Date: Tue Dec 8 20:46:02 2020 -0500 + + Apply Same Strategy to CMake + + (cherry picked from commit a75f9ce3e924564ab358c2c1aa95b6268383ec42) + +commit e21b7ad0d98d1322ea92f99fcd1f85e2d6b6f6b7 +Author: W. Felix Handte +Date: Tue Dec 8 20:10:05 2020 -0500 + + Avoid Use of Regexes in Building Package-Config File + + (cherry picked from commit b521183c74795bd9bdd9bdebe74af01cae4d3d43) +--- + build/cmake/lib/CMakeLists.txt | 29 ++++++++++++++++++++++++---- + lib/Makefile | 35 ++++++++++++++++------------------ + lib/libzstd.pc.in | 6 +++--- + 3 files changed, 44 insertions(+), 26 deletions(-) + +diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt +index 32ae7525..466c2c7b 100644 +--- a/build/cmake/lib/CMakeLists.txt ++++ b/build/cmake/lib/CMakeLists.txt +@@ -137,12 +137,33 @@ endif () + if (UNIX) + # pkg-config + set(PREFIX "${CMAKE_INSTALL_PREFIX}") +- set(LIBDIR "${CMAKE_INSTALL_LIBDIR}") +- set(INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") ++ set(EXEC_PREFIX "\\$$\{prefix}") ++ set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++ set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(VERSION "${zstd_VERSION}") ++ ++ string(LENGTH "${PREFIX}" PREFIX_LENGTH) ++ string(SUBSTRING "${LIBDIR}" 0 ${PREFIX_LENGTH} LIBDIR_PREFIX) ++ string(SUBSTRING "${LIBDIR}" ${PREFIX_LENGTH} -1 LIBDIR_SUFFIX) ++ string(SUBSTRING "${INCLUDEDIR}" 0 ${PREFIX_LENGTH} INCLUDEDIR_PREFIX) ++ string(SUBSTRING "${INCLUDEDIR}" ${PREFIX_LENGTH} -1 INCLUDEDIR_SUFFIX) ++ ++ if ("${INCLUDEDIR_PREFIX}" STREQUAL "${PREFIX}") ++ set(INCLUDEDIR_PREFIX "\\$$\{prefix}") ++ endif() ++ if ("${LIBDIR_PREFIX}" STREQUAL "${PREFIX}") ++ set(LIBDIR_PREFIX "\\$$\{exec_prefix}") ++ endif() ++ + add_custom_target(libzstd.pc ALL +- ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc" +- -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}" ++ ${CMAKE_COMMAND} ++ -DIN="${LIBRARY_DIR}/libzstd.pc.in" ++ -DOUT="libzstd.pc" ++ -DPREFIX="${PREFIX}" ++ -DEXEC_PREFIX="${EXEC_PREFIX}" ++ -DINCLUDEDIR="${INCLUDEDIR_PREFIX}${INCLUDEDIR_SUFFIX}" ++ -DLIBDIR="${LIBDIR_PREFIX}${LIBDIR_SUFFIX}" ++ -DVERSION="${VERSION}" + -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake" + COMMENT "Creating pkg-config file") + +diff --git a/lib/Makefile b/lib/Makefile +index 4a9ab799..2893ec21 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -257,6 +257,8 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD Ne + + all: libzstd.pc + ++HAS_EXPLICIT_EXEC_PREFIX := $(if $(or $(EXEC_PREFIX),$(exec_prefix)),1,) ++ + DESTDIR ?= + # directory variables : GNU conventions prefer lowercase + # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html +@@ -270,24 +272,17 @@ LIBDIR ?= $(libdir) + includedir ?= $(PREFIX)/include + INCLUDEDIR ?= $(includedir) + +-PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n $(SED_ERE_OPT) -e "s@^$(EXEC_PREFIX)(/|$$)@@p") +-PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n $(SED_ERE_OPT) -e "s@^$(PREFIX)(/|$$)@@p") ++PCINCDIR := $(patsubst $(PREFIX)%,%,$(INCLUDEDIR)) ++PCLIBDIR := $(patsubst $(EXEC_PREFIX)%,%,$(LIBDIR)) + +-ifeq (,$(PCLIBDIR)) +-# Additional prefix check is required, since the empty string is technically a +-# valid PCLIBDIR +-ifeq (,$(shell echo "$(LIBDIR)" | sed -n $(SED_ERE_OPT) -e "\\@^$(EXEC_PREFIX)(/|$$)@ p")) +-$(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file) +-endif +-endif ++# If we successfully stripped off a prefix, we'll add a reference to the ++# relevant pc variable. ++PCINCPREFIX := $(if $(findstring $(INCLUDEDIR),$(PCINCDIR)),,$${prefix}) ++PCLIBPREFIX := $(if $(findstring $(LIBDIR),$(PCLIBDIR)),,$${exec_prefix}) + +-ifeq (,$(PCINCDIR)) +-# Additional prefix check is required, since the empty string is technically a +-# valid PCINCDIR +-ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n $(SED_ERE_OPT) -e "\\@^$(PREFIX)(/|$$)@ p")) +-$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file) +-endif +-endif ++# If no explicit EXEC_PREFIX was set by the caller, write it out as a reference ++# to PREFIX, rather than as a resolved value. ++PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix}) + + ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) + PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig +@@ -308,9 +303,11 @@ INSTALL_DATA ?= $(INSTALL) -m 644 + libzstd.pc: + libzstd.pc: libzstd.pc.in + @echo creating pkgconfig +- $(Q)@sed $(SED_ERE_OPT) -e 's|@PREFIX@|$(PREFIX)|' \ +- -e 's|@LIBDIR@|$(PCLIBDIR)|' \ +- -e 's|@INCLUDEDIR@|$(PCINCDIR)|' \ ++ $(Q)@sed $(SED_ERE_OPT) \ ++ -e 's|@PREFIX@|$(PREFIX)|' \ ++ -e 's|@EXEC_PREFIX@|$(PCEXEC_PREFIX)|' \ ++ -e 's|@INCLUDEDIR@|$(PCINCPREFIX)$(PCINCDIR)|' \ ++ -e 's|@LIBDIR@|$(PCLIBPREFIX)$(PCLIBDIR)|' \ + -e 's|@VERSION@|$(VERSION)|' \ + $< >$@ + +diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in +index 8ec0235a..8465c977 100644 +--- a/lib/libzstd.pc.in ++++ b/lib/libzstd.pc.in +@@ -3,9 +3,9 @@ + # BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + + prefix=@PREFIX@ +-exec_prefix=${prefix} +-includedir=${prefix}/@INCLUDEDIR@ +-libdir=${exec_prefix}/@LIBDIR@ ++exec_prefix=@EXEC_PREFIX@ ++includedir=@INCLUDEDIR@ ++libdir=@LIBDIR@ + + Name: zstd + Description: fast lossless compression algorithm library +-- +2.36.0 + From e4544335f5ae850dc2433c0906e20e3180e11dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 7 Sep 2022 22:38:26 +0200 Subject: [PATCH 161/737] jdupes: fix darwin build --- pkgs/tools/misc/jdupes/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index c3b47a514db9..71806dcb8d1b 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "jdupes"; @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { postFetch = "rm -r $out/testdir"; }; + patches = [ + (fetchpatch { + name = "darwin-stack-size.patch"; + url = "https://github.com/jbruchon/jdupes/commit/8f5b06109b44a9e4316f9445da3044590a6c63e2.patch"; + sha256 = "0saq92v0mm5g979chr062psvwp3i3z23mgqrcliq4m07lvwc7i3s"; + }) + ]; + dontConfigure = true; makeFlags = [ From 6b6a8fe7c0863e9b2c187e47c9d181010117bfe3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 00:24:32 +0200 Subject: [PATCH 162/737] python310: 3.10.6 -> 3.10.7 https://docs.python.org/3.10/whatsnew/changelog.html\#python-3-10-7-final https://pythoninsider.blogspot.com/2022/09/python-releases-3107-3914-3814-and-3714.html Fixes: CVE-2020-10735 --- 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 f0a07a855f8a..eff1c63dcba5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -140,10 +140,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "10"; - patch = "6"; + patch = "7"; suffix = ""; }; - sha256 = "sha256-95X/h9EdSwx8M7yIUbDChkjYpFg6ohAKmMIrQya20/M="; + sha256 = "sha256-bu2EFbdRb7LyYJBttdSN1MBqzAyySn1swVKWpgTc3Eg="; }; }; From 34182bc865ea34e2914e8c2817ce4c931a1936f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 00:32:19 +0200 Subject: [PATCH 163/737] python39: 3.9.13 -> 3.9.14 https://docs.python.org/3.9/whatsnew/changelog.html#python-3-9-14-final https://pythoninsider.blogspot.com/2022/09/python-releases-3107-3914-3814-and-3714.html Fixes: CVE-2020-10735 --- 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 eff1c63dcba5..73ff2699bc3f 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -131,10 +131,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "9"; - patch = "13"; + patch = "14"; suffix = ""; }; - sha256 = "sha256-ElsMWY8eFdKqZUBug/eS330XHN84wWgDsUmZQxajCA8="; + sha256 = "sha256-ZRME0hbIID/grfGoCvRy2OksOw4KeJIiKuTZ865N688="; }; python310 = { sourceVersion = { From 24e4500fcdf39a17c723f2352de6a439181e044d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 7 Sep 2022 23:08:37 +0200 Subject: [PATCH 164/737] libid3tag: fix cross compile --- pkgs/development/libraries/libid3tag/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 8cedd1bcb418..d2e5b1ff0710 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, zlib, gperf}: +{ lib, stdenv, fetchurl, zlib, gperf_3_0 }: stdenv.mkDerivation rec { pname = "libid3tag"; @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; setOutputFlags = false; - propagatedBuildInputs = [ zlib gperf ]; + strictDeps = true; + + nativeBuildInputs = [ gperf_3_0 ]; + + buildInputs = [ zlib ]; patches = [ ./debian-patches.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e50949aef8b8..d6ba2a6d7bbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19740,9 +19740,7 @@ with pkgs; # On non-GNU systems we need GNU Gettext for libintl. libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null; - libid3tag = callPackage ../development/libraries/libid3tag { - gperf = gperf_3_0; - }; + libid3tag = callPackage ../development/libraries/libid3tag { }; libidn = callPackage ../development/libraries/libidn { }; From 3a6d60dcafa96fc1ff7e0c5af1d20b1aa336e5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 7 Sep 2022 21:05:11 +0200 Subject: [PATCH 165/737] mpd: fix cross compile --- pkgs/servers/mpd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 9be43ee501de..82bdc7a31f8b 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages # Darwin inputs , AudioToolbox, AudioUnit # Inputs @@ -145,6 +145,8 @@ let ] ++ concatAttrVals features_ nativeFeatureDependencies; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ From a6c3003f34bba763dc3ace21e07bc0dcf9140319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Thu, 8 Sep 2022 01:33:38 +0200 Subject: [PATCH 166/737] coreutils: Skip another test that fails on btrfs --- pkgs/tools/misc/coreutils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 90fd78ed04c1..a89621e8fe5f 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems. sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh sed '2i echo Skipping du threshold test && exit 77' -i ./tests/du/threshold.sh + sed '2i echo Skipping cp reflink-auto test && exit 77' -i ./tests/cp/reflink-auto.sh sed '2i echo Skipping cp sparse test && exit 77' -i ./tests/cp/sparse.sh sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh From 36431022b19df245e8e3a37de2487902c1563c8a Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 2 Jun 2022 03:26:22 +0300 Subject: [PATCH 167/737] libiio: 0.21 -> 0.23 --- .../cmake-fix-libxml2-find-package.patch | 22 +++++++++---------- pkgs/development/libraries/libiio/default.nix | 8 +++++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch index 25345bef90c4..034f6d32c7d1 100644 --- a/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch +++ b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch @@ -1,13 +1,13 @@ diff --color -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-05-30 13:46:22.256040282 +0200 -+++ b/CMakeLists.txt 2021-05-30 14:15:42.530181216 +0200 -@@ -333,7 +333,7 @@ - # So, try first to find the CMake module provided by libxml2 package, then fallback - # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially - # in static build case). --find_package(LibXml2 QUIET NO_MODULE) -+find_package(LibXml2 QUIET MODULE) - if(DEFINED LIBXML2_VERSION_STRING) - set(LIBXML2_FOUND ON) - set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) +--- a/CMakeLists.txt 2022-06-02 02:57:01.503340155 +0300 ++++ b/CMakeLists.txt 2022-06-02 02:54:33.726941188 +0300 +@@ -378,7 +378,7 @@ + # So, try first to find the CMake module provided by libxml2 package, then fallback + # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially + # in static build case). +- find_package(LibXml2 QUIET NO_MODULE) ++ find_package(LibXml2 QUIET MODULE) + if(DEFINED LIBXML2_VERSION_STRING) + set(LIBXML2_FOUND ON) + set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) Seulement dans b: good.patch diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index e704076ab57a..400da08cab32 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -6,13 +6,15 @@ , libxml2 , python , libusb1 +, avahi +, libaio , runtimeShell , lib }: stdenv.mkDerivation rec { pname = "libiio"; - version = "0.21"; + version = "0.23"; outputs = [ "out" "lib" "dev" "python" ]; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { owner = "analogdevicesinc"; repo = "libiio"; rev = "v${version}"; - sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7"; + sha256 = "0awny9zb43dcnxa5jpxay2zxswydblnbn4x6vi5mlw1r48pzhjf8"; }; # Revert after https://github.com/NixOS/nixpkgs/issues/125008 is @@ -37,6 +39,8 @@ stdenv.mkDerivation rec { python libxml2 libusb1 + avahi + libaio ] ++ lib.optional python.isPy3k python.pkgs.setuptools; cmakeFlags = [ From 08796acf8062881607fa93c9afbb32d5315b795a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 7 Sep 2022 20:13:18 +0200 Subject: [PATCH 168/737] python310Packages.nose: cleanup --- pkgs/development/python-modules/nose/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 961de55f5dad..c4a52a0e114b 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k +, isPyPy , python , coverage +, buildPackages }: buildPythonPackage rec { @@ -23,20 +26,18 @@ buildPythonPackage rec { --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" ''; - preBuild = lib.optionalString - ((python.isPy3k or false) && (python.pname != "pypy3")) - '' + preBuild = lib.optionalString (isPy3k && (!isPyPy)) '' ${python.pythonForBuild}/bin/2to3 -wn nose functional_tests unit_tests ''; propagatedBuildInputs = [ coverage ]; - doCheck = false; # lot's of transient errors, too much hassle - checkPhase = if python.is_py3k or false then '' - ${python}/bin/${python.executable} setup.py build_tests + doCheck = false; # lot's of transient errors, too much hassle + checkPhase = if isPy3k then '' + ${python.pythonForBuild.interpreter} setup.py build_tests '' else "" + '' rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 - ${python}/bin/${python.executable} selftest.py + ${python.pythonForBuild.interpreter} selftest.py ''; meta = with lib; { From b1149dc3031fc7d0994ae990f495a27a490725d8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 17 Jul 2022 21:54:01 +0300 Subject: [PATCH 169/737] cmake: add check-pc-files hook to check broken pc files see nixpkgs pr 172150 --- .../cmake/check-pc-files-hook.sh | 18 ++++++++++++++++++ .../tools/build-managers/cmake/default.nix | 8 +++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh diff --git a/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh b/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh new file mode 100644 index 000000000000..94d1b7b53556 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh @@ -0,0 +1,18 @@ +cmakePcfileCheckPhase() { + while IFS= read -rd $'\0' file; do + grepout=$(grep --line-number '}//nix/store' "$file" || true) + if [ -n "$grepout" ]; then + { + echo "Broken paths found in a .pc file! $file" + echo "The following lines have issues (specifically '//' in paths)." + echo "$grepout" + echo "It is very likely that paths are being joined improperly." + echo 'ex: "${prefix}/@CMAKE_INSTALL_LIBDIR@" should be "@CMAKE_INSTALL_FULL_LIBDIR@"' + echo "Please see https://github.com/NixOS/nixpkgs/issues/144170 for more details." + exit 1 + } 1>&2 + fi + done < <(find "${!outputDev}" -iname "*.pc" -print0) +} + +postFixupHooks+=(cmakePcfileCheckPhase) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7badaccf8ab1..722c8b63034b 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -61,13 +61,15 @@ stdenv.mkDerivation rec { outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; setOutputFlags = false; - setupHook = ./setup-hook.sh; + setupHooks = [ + ./setup-hook.sh + ./check-pc-files-hook.sh + ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ + nativeBuildInputs = setupHooks ++ [ pkg-config - setupHook ] ++ lib.optionals buildDocs [ texinfo ] ++ lib.optionals qt5UI [ wrapQtAppsHook ]; From c9b34f760175584e0e77cd84fa2b97e0f060b57d Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 8 Sep 2022 18:28:06 +0300 Subject: [PATCH 170/737] treewide: remove unnecessary cmake pkg-config patchs --- pkgs/development/libraries/arrow-cpp/default.nix | 9 --------- pkgs/development/libraries/openal-soft/default.nix | 7 +------ pkgs/development/libraries/orcania/default.nix | 11 +---------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 1402fc6ed946..d3b736fbe0f0 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , fetchFromGitHub , fixDarwinDylibNames , abseil-cpp @@ -113,14 +112,6 @@ stdenv.mkDerivation rec { patches = [ # patch to fix python-test ./darwin.patch - # in master post 8.0.0, see https://github.com/apache/arrow/pull/13182 - (fetchpatch { - name = "fix-pkg-config.patch"; - stripLen = 1; - excludes = [ "src/arrow/engine/arrow-substrait.pc.in" ]; # for < 8.0.0 - url = "https://github.com/apache/arrow/commit/a242eb17362c0352fc3291213542c48abfe18669.patch"; - sha256 = "15gz13f8q75l7d4z5blyvxd805hwfcvrbrxs2kbfal9vcbnirycx"; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 434918c0c87b..b9471d681937 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , alsaSupport ? !stdenv.isDarwin, alsa-lib , dbusSupport ? !stdenv.isDarwin, dbus , pipewireSupport ? !stdenv.isDarwin, pipewire @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { # this will make it find its own data files (e.g. HRTF profiles) # without any other configuration ./search-out.patch - # merged after 1.22.0 in https://github.com/kcat/openal-soft/pull/696 - (fetchpatch { - url = "https://github.com/kcat/openal-soft/commit/0bf2abae9b2121c3bc5a56dab30eca308136bc29.patch"; - sha256 = "1fhjjy7nrhrj3a0wlmsqpf8h3ss6s487vz5jrhamyv04nbcahn20"; - }) ]; postPatch = '' substituteInPlace core/helpers.cpp \ diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 338deafa763e..abe45b63372f 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, check, subunit }: +{ lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; version = "2.3.0"; @@ -10,15 +10,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-QAq/6MGVj+iBHLElHuqokF1v3LU1TZ9hVVJE1s3y6f0="; }; - # in master post 2.2.2, see https://github.com/babelouest/orcania/issues/27 - patches = [ - (fetchpatch { - name = "fix-pkg-config.patch"; - url = "https://github.com/babelouest/orcania/commit/4eac7d5ff76bb3bec8250fef300b723c8891552a.patch"; - sha256 = "01bsxay1ca8d08ac3ddcqyvjwgz5mgs68jz5y3gzq4qnzl3q1i54"; - }) - ]; - nativeBuildInputs = [ cmake ]; checkInputs = [ check subunit ]; From 68310af1075f4b8f00736a49839032847987506f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 18:34:36 +0000 Subject: [PATCH 171/737] numactl: 2.0.14 -> 2.0.15 --- pkgs/os-specific/linux/numactl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 2f8a4feb0301..ac17a18273a7 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numactl"; - version = "2.0.14"; + version = "2.0.15"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0hahpdp5xqy9cbg251bdxqkml341djn2h856g435h4ngz63sr9fs"; + sha256 = "sha256-mowDqCkAHDEV9AWCgAEWL0//sNMUk/K8w3eO7Wg+AwQ="; }; nativeBuildInputs = [ autoreconfHook ]; From 27d08a0bd35aa7124f548fb144a7442421e50088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Sep 2022 16:49:11 +0200 Subject: [PATCH 172/737] python310Packages.jsonschema: 4.15.0 -> 4.16.0 --- pkgs/development/python-modules/jsonschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 49d23be4eadc..9bf0175025c5 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.15.0"; + version = "4.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IfSXk5G9zrBE5QL9jnnnOMDN+9yHc/mkm1dpRh6C/h4="; + sha256 = "sha256-FlBZ8Hbv9pcbrlt0L8App7TvP5vPBMFOR3anYF3hSyM="; }; patches = [ From b51b1f1e9dc499485d47281b8b36a85f0c196076 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 9 Sep 2022 19:25:49 +0200 Subject: [PATCH 173/737] bundler: 2.3.21 -> 2.3.22 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 8daf80400209..4961173658ed 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.3.21"; - source.sha256 = "sha256-+u3H/8Fno8U7ZMRj2me1DVvkOAR2HeWmjdo0TCG/0d4="; + version = "2.3.22"; + source.sha256 = "sha256-vOfZB6poOsiYPULaGhUXD9aSxlBGeK2ghF70ouz0IJ4="; dontPatchShebangs = true; passthru.updateScript = writeScript "gem-update-script" '' From 520042472c5b150838adceff26be93076f214552 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 9 Sep 2022 21:27:09 +0100 Subject: [PATCH 174/737] python3Packages.Mako: 1.2.1 -> 1.2.2 --- 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 694f3138c928..9118f5a6fcf3 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8FSl/0dDSS8aqezEcXLLM7QrnZk8/8wUbJ3hfnF7Awc="; + sha256 = "sha256-NySGmzY7pjCicqX4n2jAcDUhN7j9F1dlABe34G/aFj8="; }; propagatedBuildInputs = [ From a2448e354a9ff91b1c501fd1b8e2984ca7d36aef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Sep 2022 04:45:06 +0200 Subject: [PATCH 175/737] python3Packages.sqlalchemy: 1.4.40 -> 1.4.41 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_41 --- .../python-modules/sqlalchemy/default.nix | 118 ++++++++++++++++-- 1 file changed, 107 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 25e5b0006619..4b13f996e954 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,39 +1,134 @@ { stdenv , lib +, isPyPy +, pythonOlder , fetchPypi , buildPythonPackage -, isPy3k -, pythonOlder + +# build +, cython + +# propagates , greenlet , importlib-metadata +, typing-extensions + +# optionals +, aiosqlite +, asyncmy +, asyncpg +, cx_oracle +, mariadb +, mypy +, mysql-connector +, mysqlclient +# TODO: oracledb +, pg8000 +, psycopg +, psycopg2 +, psycopg2cffi +# TODO: pymssql +, pymysql +, pyodbc +# TODO: sqlcipher3 + +# tests , mock -, pysqlite ? null , pytestCheckHook }: buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.40"; + version = "1.4.41"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RKZgUGCAzJdeHfpXdv5fYxXdxiane1C/Du4YsDieomU="; + hash = "sha256-ApL3DReX48VOhi5vMK5HQBRki8nHI+FKL9pzCtsKl5E="; }; + nativeBuildInputs = lib.optionals (!isPyPy) [ + cython + ]; + propagatedBuildInputs = [ greenlet + typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + passthru.optional-dependencies = rec { + asyncio = [ + greenlet + ]; + mypy = [ + #mypy + ]; + mssql = [ + pyodbc + ]; + mssql_pymysql = [ + # TODO: pymssql + ]; + mssql_pyodbc = [ + pyodbc + ]; + mysql = [ + mysqlclient + ]; + mysql_connector = [ + mysql-connector + ]; + mariadb_connector = [ + mariadb + ]; + oracle = [ + cx_oracle + ]; + oracle_oracledb = [ + # TODO: oracledb + ]; + postgresql = [ + psycopg2 + ]; + postgresql_pg8000 = [ + pg8000 + ]; + postgresql_asyncpg = [ + asyncpg + ] ++ asyncio; + postgresql_psycopg2binary = [ + psycopg2 + ]; + postgresql_psycopg2cffi = [ + psycopg2cffi + ]; + postgresql_psycopg = [ + psycopg + ]; + pymysql = [ + pymysql + ]; + aiomysql = [ + aiomysql + ] ++ asyncio; + asyncmy = [ + asyncmy + ] ++ asyncio; + aiosqlite = [ + aiosqlite + typing-extensions + ] ++ asyncio; + sqlcipher = [ + # TODO: sqlcipher3 + ]; + }; + checkInputs = [ pytestCheckHook mock - ] ++ lib.optional (!isPy3k) pysqlite; - - postInstall = '' - sed -e 's:--max-worker-restart=5::g' -i setup.cfg - ''; + ]; # disable mem-usage tests on mac, has trouble serializing pickle files disabledTests = lib.optionals stdenv.isDarwin [ @@ -42,8 +137,9 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_${builtins.replaceStrings [ "." ] [ "_" ] version}"; + description = "The Python SQL toolkit and Object Relational Mapper"; homepage = "http://www.sqlalchemy.org/"; - description = "A Python SQL toolkit and Object Relational Mapper"; license = licenses.mit; }; } From 9aed7b7cbb3097961c92a7bb818c5b63a629485f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 10 Sep 2022 00:10:56 +0100 Subject: [PATCH 176/737] python3Packages.oauthlib: 3.2.0 -> 3.2.1 --- pkgs/development/python-modules/oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 3a2f5cb1bddc..078e4a383445 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oauthlib"; - version = "3.2.0"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-41JFURG8G8BjlAlNu2+lbj84XR/trAk1U5OPYxPq+5M="; + hash = "sha256-9Du0REnN7AkvMmejXsWc7Uy+YF8MYeLK+QnYHbrPhPA="; }; propagatedBuildInputs = [ From c74221839b5e20a1260a77a9823ab7d3d9d1a5fa Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 3 Oct 2021 20:45:43 +0900 Subject: [PATCH 177/737] temurin-bin, semeru-bin: init at 17.0.3, adoptopenjdk-bin: remove 13, 14, 17 AdoptOpenJDK Hotspot is now Eclipse Temurin and AdoptOpenJDK OpenJ9 is now IBM Semeru Runtime. Adds `temurin-bin` and `semeru-bin` packages. AdoptOpenJDK 13, 14, and 15 is no longer supported. AdoptOpenJDK 13 and 14 are removed. AdoptOpenJDK 15 is left only for some packages depending it. --- .../adoptopenjdk-bin/generate-sources.py | 5 +- .../adoptopenjdk-bin/jdk17-darwin.nix | 8 - .../adoptopenjdk-bin/jdk17-linux.nix | 8 - .../compilers/adoptopenjdk-bin/sources.json | 54 ---- .../compilers/semeru-bin/generate-sources.py | 85 +++++ .../compilers/semeru-bin/jdk-darwin-base.nix | 5 + .../compilers/semeru-bin/jdk-darwin.nix | 16 + .../compilers/semeru-bin/jdk-linux-base.nix | 5 + .../compilers/semeru-bin/jdk-linux.nix | 16 + .../compilers/semeru-bin/sources.json | 248 ++++++++++++++ .../compilers/temurin-bin/generate-sources.py | 71 ++++ .../compilers/temurin-bin/jdk-darwin-base.nix | 74 +++++ .../compilers/temurin-bin/jdk-darwin.nix | 15 + .../compilers/temurin-bin/jdk-linux-base.nix | 129 ++++++++ .../compilers/temurin-bin/jdk-linux.nix | 15 + .../compilers/temurin-bin/sources.json | 306 ++++++++++++++++++ pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 142 ++------ pkgs/top-level/java-packages.nix | 12 + 19 files changed, 1037 insertions(+), 179 deletions(-) delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix create mode 100755 pkgs/development/compilers/semeru-bin/generate-sources.py create mode 100644 pkgs/development/compilers/semeru-bin/jdk-darwin-base.nix create mode 100644 pkgs/development/compilers/semeru-bin/jdk-darwin.nix create mode 100644 pkgs/development/compilers/semeru-bin/jdk-linux-base.nix create mode 100644 pkgs/development/compilers/semeru-bin/jdk-linux.nix create mode 100644 pkgs/development/compilers/semeru-bin/sources.json create mode 100755 pkgs/development/compilers/temurin-bin/generate-sources.py create mode 100644 pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix create mode 100644 pkgs/development/compilers/temurin-bin/jdk-darwin.nix create mode 100644 pkgs/development/compilers/temurin-bin/jdk-linux-base.nix create mode 100644 pkgs/development/compilers/temurin-bin/jdk-linux.nix create mode 100644 pkgs/development/compilers/temurin-bin/sources.json diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 6c60fc5c490d..a4ad5932ae0b 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,7 +6,8 @@ import re import requests import sys -releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17") +# openjdk15 is only for bootstrapping openjdk +releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16") oses = ("mac", "linux") types = ("jre", "jdk") impls = ("hotspot", "openj9") @@ -21,7 +22,7 @@ arch_to_nixos = { def get_sha256(url): resp = requests.get(url) if resp.status_code != 200: - print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr) + print("error: could not fetch checksum from url {}: code {}".format(url, resp.status_code), file=sys.stderr) sys.exit(1) return resp.text.strip().split(" ")[0] diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix deleted file mode 100644 index 7f211ac1f1e1..000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib }: - -let - sources = lib.importJSON ./sources.json; -in -{ - jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix deleted file mode 100644 index f1bd072bc929..000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib }: - -let - sources = lib.importJSON ./sources.json; -in -{ - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jdk.hotspot; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 3b93a26c158d..80b3d1709cde 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -793,60 +793,6 @@ } } }, - "openjdk17": { - "linux": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "12", - "sha256": "f23d482b2b4ada08166201d1a0e299e3e371fdca5cd7288dcbd81ae82f3a75e3", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - }, - "armv6l": { - "build": "12", - "sha256": "f5945a39929384235e7cb1c57df071b8c7e49274632e2a54e54b2bad05de21a5", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - }, - "armv7l": { - "build": "12", - "sha256": "f5945a39929384235e7cb1c57df071b8c7e49274632e2a54e54b2bad05de21a5", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "6ea18c276dcbb8522feeebcfc3a4b5cb7c7e7368ba8590d3326c6c3efc5448b6", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - } - } - } - }, - "mac": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "12", - "sha256": "02073590da24421e119ddebe6b061bf132fa68694c60706f092d32d963822554", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "98a759944a256dbdd4d1113459c7638501f4599a73d06549ac309e1982e2fa70", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz", - "version": "17.0.1" - } - } - } - } - }, "openjdk8": { "linux": { "jdk": { diff --git a/pkgs/development/compilers/semeru-bin/generate-sources.py b/pkgs/development/compilers/semeru-bin/generate-sources.py new file mode 100755 index 000000000000..da23559955d9 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/generate-sources.py @@ -0,0 +1,85 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" + +import json +import re +import requests +import sys + +feature_versions = (8, 11, 16, 17) +oses = ("mac", "linux") +types = ("jre", "jdk") +impls = ("openj9") + +arch_to_nixos = { + "x64": ("x86_64",), + "aarch64": ("aarch64",), + "arm": ("armv6l", "armv7l"), +} + +def get_sha256(url): + resp = requests.get(url) + if resp.status_code != 200: + print("error: could not fetch checksum from url {}: code {}".format(url, resp.status_code), file=sys.stderr) + sys.exit(1) + return resp.text.strip().split(" ")[0] + +def generate_sources(releases, feature_version, out): + latest_version = None + for release in releases: + if release["prerelease"]: continue + if not re.search("_openj9-", release["name"]): continue + + for asset in release["assets"]: + match = re.match("ibm-semeru-open-(?P[a-z]*)_(?P[a-z0-9]*)_(?P[a-z]*)_(?:(?P[0-9]*)u(?P[0-9]*)b(?P[0-9]*)|(?P[0-9]*)\\.(?P[0-9]*)\\.(?P[0-9]*)_(?P[0-9]*))_(?P[a-z0-9]*)-[0-9]*\\.[0-9]*\\.[0-9]\\.tar\\.gz$", asset["name"]) + + if not match: continue + if match["os"] not in oses: continue + if match["image_type"] not in types: continue + if match["jvm_impl"] not in impls: continue + if match["architecture"] not in arch_to_nixos: continue + + version = ".".join([ + match["major1"] or match["major2"], + match["minor2"] or "0", + match["security1"] or match["security2"] + ]) + build = match["build1"] or match["build2"] + + if latest_version and latest_version != (version, build): continue + latest_version = (version, build) + + arch_map = ( + out + .setdefault(match["jvm_impl"], {}) + .setdefault(match["os"], {}) + .setdefault(match["image_type"], {}) + .setdefault(feature_version, { + "packageType": match["image_type"], + "vmType": match["jvm_impl"], + }) + ) + + for nixos_arch in arch_to_nixos[match["architecture"]]: + arch_map[nixos_arch] = { + "url": asset["browser_download_url"], + "sha256": get_sha256(asset["browser_download_url"] + ".sha256.txt"), + "version": version, + "build": build, + } + + return out + + +out = {} +for feature_version in feature_versions: + resp = requests.get(f"https://api.github.com/repos/ibmruntimes/semeru{feature_version}-binaries/releases") + + if resp.status_code != 200: + print("error: could not fetch data for release {} (code {}) {}".format(feature_version, resp.status_code, resp.content), file=sys.stderr) + sys.exit(1) + generate_sources(resp.json(), f"openjdk{feature_version}", out) + +with open("sources.json", "w") as f: + json.dump(out, f, indent=2, sort_keys=True) + f.write('\n') diff --git a/pkgs/development/compilers/semeru-bin/jdk-darwin-base.nix b/pkgs/development/compilers/semeru-bin/jdk-darwin-base.nix new file mode 100644 index 000000000000..ccbc7d871e8a --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/jdk-darwin-base.nix @@ -0,0 +1,5 @@ +args: +import ../temurin-bin/jdk-darwin-base.nix ({ + name-prefix = "semeru"; + brand-name = "IBM Semeru Runtime"; +} // args) diff --git a/pkgs/development/compilers/semeru-bin/jdk-darwin.nix b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix new file mode 100644 index 000000000000..f58fec3a84c0 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix @@ -0,0 +1,16 @@ +{ lib, callPackage }: + +let + sources = (lib.importJSON ./sources.json).openj9.mac; + common = opts: callPackage (import ./jdk-darwin-base.nix opts) {}; +in +{ + jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; + jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; + jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jre-16 = common { sourcePerArch = sources.jre.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; + jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; +} diff --git a/pkgs/development/compilers/semeru-bin/jdk-linux-base.nix b/pkgs/development/compilers/semeru-bin/jdk-linux-base.nix new file mode 100644 index 000000000000..41879ea88681 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/jdk-linux-base.nix @@ -0,0 +1,5 @@ +args: +import ../temurin-bin/jdk-linux-base.nix ({ + name-prefix = "semeru"; + brand-name = "IBM Semeru Runtime"; +} // args) diff --git a/pkgs/development/compilers/semeru-bin/jdk-linux.nix b/pkgs/development/compilers/semeru-bin/jdk-linux.nix new file mode 100644 index 000000000000..c80dd991bf04 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/jdk-linux.nix @@ -0,0 +1,16 @@ +{ lib, callPackage }: + +let + sources = (lib.importJSON ./sources.json).openj9.linux; + common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; +in +{ + jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; + jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; + jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jre-16 = common { sourcePerArch = sources.jre.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; + jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; +} diff --git a/pkgs/development/compilers/semeru-bin/sources.json b/pkgs/development/compilers/semeru-bin/sources.json new file mode 100644 index 000000000000..5e04fa90af74 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/sources.json @@ -0,0 +1,248 @@ +{ + "openj9": { + "linux": { + "jdk": { + "openjdk11": { + "aarch64": { + "build": "8", + "sha256": "488739171f84e3949df6ccb1c40eaf1b73541748b123d88780329648d6b383d0", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "eeca01d4e245a001d01663c5c20a8d50ef3d572b47a9b3689a5154f2a37bf005", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "aarch64": { + "build": "7", + "sha256": "022cda1210331488c3db3d0d1282ea74467397fdabc34cb482cdfe81c45f6a15", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jdk_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "7", + "sha256": "1349eb9a1d9af491a1984d66a80126730357c4a5c4fcbe7112a2c832f6c0886e", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jdk_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "18d291411ee4a956018b4dcefe436971e73694128782617f1b44beca991956c5", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "78ae15d9e01fce3a473f4d6a90c331fb766211b950931088c2a85590f178ad39", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "aarch64": { + "build": "01", + "sha256": "6b89e648899709459b7c7dbe0a5b1ea480a88da84c6163f01255d638dbdd051b", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "01", + "sha256": "82c8232a5cb420246457d65a5014602feb8b288079cdae896e22a2eb6e390b58", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "openjdk11": { + "aarch64": { + "build": "8", + "sha256": "49dc05a3e9f3f99c5f8fa466261aa3e33a753694c67cabfa7d3f682e5a2e3685", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "ba09711193b8b8664478f3f949b5320232f65c1bdf61f32a885d84de73c02767", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "aarch64": { + "build": "7", + "sha256": "575dc3827077fc661fd1103effaa13ccd0f1606d01a33643956ed2eb1ece9763", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jre_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "7", + "sha256": "b077cd0b35d3ed1927c22e5b498264ecff67297992809056187b42662edfc536", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jre_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "6c40c1e0d7ee0509c44465e9f26dd970904137a95fd751e6447b1d6a9ef5092a", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "b2c176f8aa8cc7138d4c22ce9298d8f49597e1d8e3fdd33125898e5ee0182c93", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "aarch64": { + "build": "01", + "sha256": "03caff41622e84a6e7fa66a225414a9b6eefb38dd215f830cae0bc4bbfc55b5c", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "01", + "sha256": "0d4fe62716b9da2ccce324b5b46d57e8d47e5dfb5d128f87e16135ee9bc36cdc", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + } + } + } + }, + "mac": { + "jdk": { + "openjdk11": { + "aarch64": { + "build": "8", + "sha256": "9881b292142a129f6f5c6b21608b090f8f94625052b4f7d0ce5bd982c054ca2e", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_mac_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "8638735d2cae3efff212f898728685380355bb0a298076e9e46244d0bf3d4a64", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "7", + "sha256": "89e807261145243a358a2a626f64340944c03622f34eaa35429053e2085d7aef", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jdk_x64_mac_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "bf22628b54115dff9939b94751531544ab735b7cbbc8d6ddfe83d1b04df3a532", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_mac_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "a935f20564e347a9292955c04eb57e51efdb1853ae7f0b4fe759b22c9fe248be", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "01", + "sha256": "c69086950c006b17484a70ef7bc85e92d121be15e69e282e1446fd238d42b6b4", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "openjdk11": { + "aarch64": { + "build": "8", + "sha256": "39802020896476342dc11486e3cbdf10f6311c172abeb4a1e2931b472da4417e", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_mac_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "92f87a3c2fb5fe60d3d51020ff95b9c234b2ae2677b79aebbe749dda717c9cdd", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "7", + "sha256": "2cb8007de405d0c8f160549309bcfc1adc82e304eb372e86ce0e0a214239438f", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jre_x64_mac_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "4057c94cd46b814cc5a4d683d5f0b95dbd0b9e13e8c2e11155561ad0d8bec85b", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_mac_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "8e957d2eb47eaca64516ac669272c6e5186155ed8ee4d6a77e0d4b7811cd7bb6", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "01", + "sha256": "019e08dea8fbd54517dacbeac791d85717902800dd8bba77fbca1dfc6b0abd9e", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + } + } + } + } + } +} diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py new file mode 100755 index 000000000000..ae3c06d1dfe4 --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -0,0 +1,71 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" + +import json +import re +import requests +import sys + +feature_versions = (8, 11, 16, 17) +oses = ("mac", "linux") +types = ("jre", "jdk") +impls = ("hotspot") + +arch_to_nixos = { + "x64": ("x86_64",), + "aarch64": ("aarch64",), + "arm": ("armv6l", "armv7l"), +} + +def generate_sources(assets, feature_version, out): + for asset in assets: + binary = asset["binary"] + if binary["os"] not in oses: continue + if binary["image_type"] not in types: continue + if binary["jvm_impl"] not in impls: continue + if binary["heap_size"] != "normal": continue + if binary["architecture"] not in arch_to_nixos: continue + + version = ".".join(str(v) for v in [ + asset["version"]["major"], + asset["version"]["minor"], + asset["version"]["security"] + ]) + build = str(asset["version"]["build"]) + + arch_map = ( + out + .setdefault(binary["jvm_impl"], {}) + .setdefault(binary["os"], {}) + .setdefault(binary["image_type"], {}) + .setdefault(feature_version, { + "packageType": binary["image_type"], + "vmType": binary["jvm_impl"], + }) + ) + + for nixos_arch in arch_to_nixos[binary["architecture"]]: + arch_map[nixos_arch] = { + "url": binary["package"]["link"], + "sha256": binary["package"]["checksum"], + "version": version, + "build": build, + } + + return out + + +out = {} +for feature_version in feature_versions: + # Default user-agenet is blocked by Azure WAF. + headers = {'user-agent': 'nixpkgs-temurin-generate-sources/1.0.0'} + resp = requests.get(f"https://api.adoptium.net/v3/assets/latest/{feature_version}/hotspot", headers=headers) + + if resp.status_code != 200: + print("error: could not fetch data for release {} (code {}) {}".format(feature_version, resp.status_code, resp.content), file=sys.stderr) + sys.exit(1) + generate_sources(resp.json(), f"openjdk{feature_version}", out) + +with open("sources.json", "w") as f: + json.dump(out, f, indent=2, sort_keys=True) + f.write('\n') diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix new file mode 100644 index 000000000000..eff9eda73ed3 --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix @@ -0,0 +1,74 @@ +{ name-prefix ? "temurin" +, brand-name ? "Eclipse Temurin" +, sourcePerArch +, knownVulnerabilities ? [] +}: + +{ swingSupport ? true # not used for now +, lib, stdenv +, fetchurl +, setJavaClassPath +}: + +let + cpuName = stdenv.hostPlatform.parsed.cpu.name; + validCpuTypes = builtins.attrNames lib.systems.parse.cpuTypes; + providedCpuTypes = builtins.filter + (arch: builtins.elem arch validCpuTypes) + (builtins.attrNames sourcePerArch); + result = stdenv.mkDerivation { + pname = if sourcePerArch.packageType == "jdk" + then "${name-prefix}-bin" + else "${name-prefix}-${sourcePerArch.packageType}-bin"; + version = + sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); + + src = fetchurl { + inherit (sourcePerArch.${cpuName}) url sha256; + }; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + mv $sourceRoot $out + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/Contents/Home/include/darwin/*_md.h $out/Contents/Home/include/ + + # Remove some broken manpages. + # Only for 11 and earlier. + [ -e "$out/Contents/Home/man/ja" ] && rm -r $out/Contents/Home/man/ja + + ln -s $out/Contents/Home/* $out/ + + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # FIXME: use multiple outputs or return actual JRE package + passthru = { + jre = result; + home = result; + }; + + meta = with lib; { + license = licenses.gpl2Classpath; + description = "${brand-name}, prebuilt OpenJDK binary"; + platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms + maintainers = with maintainers; [ taku0 ]; + inherit knownVulnerabilities; + mainProgram = "java"; + }; + }; +in result diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix new file mode 100644 index 000000000000..75bd52dcc9fd --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -0,0 +1,15 @@ +{ lib, callPackage }: + +let + sources = (lib.importJSON ./sources.json).hotspot.mac; + common = opts: callPackage (import ./jdk-darwin-base.nix opts) {}; +in +{ + jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; + jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; + jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; + jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; +} diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix new file mode 100644 index 000000000000..a7ed81ca8acb --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -0,0 +1,129 @@ +{ name-prefix ? "temurin" +, brand-name ? "Eclipse Temurin" +, sourcePerArch +, knownVulnerabilities ? [] +}: + +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, makeWrapper +, setJavaClassPath +# minimum dependencies +, alsa-lib +, fontconfig +, freetype +, libffi +, xorg +, zlib +# runtime dependencies +, cups +# runtime dependencies for GTK+ Look and Feel +, gtkSupport ? true +, cairo +, glib +, gtk3 +}: + +let + cpuName = stdenv.hostPlatform.parsed.cpu.name; + runtimeDependencies = [ + cups + ] ++ lib.optionals gtkSupport [ + cairo glib gtk3 + ]; + runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; + validCpuTypes = builtins.attrNames lib.systems.parse.cpuTypes; + providedCpuTypes = builtins.filter + (arch: builtins.elem arch validCpuTypes) + (builtins.attrNames sourcePerArch); + result = stdenv.mkDerivation rec { + pname = if sourcePerArch.packageType == "jdk" + then "${name-prefix}-bin" + else "${name-prefix}-${sourcePerArch.packageType}-bin"; + + version = + sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); + + src = fetchurl { + inherit (sourcePerArch.${cpuName}) url sha256; + }; + + buildInputs = [ + alsa-lib # libasound.so wanted by lib/libjsound.so + fontconfig + freetype + stdenv.cc.cc.lib # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + zlib + ] ++ lib.optional stdenv.isAarch32 libffi; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + mv $sourceRoot $out + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove some broken manpages. + # Only for 11 and earlier. + [ -e "$out/man/ja" ] && rm -r $out/man/ja* + + # Remove embedded freetype to avoid problems like + # https://github.com/NixOS/nixpkgs/issues/57733 + find "$out" -name 'libfreetype.so*' -delete + + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <> "$out/nix-support/setup-hook" + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + + # We cannot use -exec since wrapProgram is a function but not a command. + # + # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it + # breaks building OpenJDK (#114495). + for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do + if patchelf --print-interpreter "$bin" &> /dev/null; then + wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" + fi + done + ''; + + preFixup = '' + find "$out" -name libfontmanager.so -exec \ + patchelf --add-needed libfontconfig.so {} \; + ''; + + # FIXME: use multiple outputs or return actual JRE package + passthru = { + jre = result; + home = result; + }; + + meta = with lib; { + license = licenses.gpl2Classpath; + description = "${brand-name}, prebuilt OpenJDK binary"; + platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms + maintainers = with maintainers; [ taku0 ]; + inherit knownVulnerabilities; + mainProgram = "java"; + }; + }; +in result diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix new file mode 100644 index 000000000000..4c0306d5aba4 --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -0,0 +1,15 @@ +{ lib, callPackage }: + +let + sources = (lib.importJSON ./sources.json).hotspot.linux; + common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; +in +{ + jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; + jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; + jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; + jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; +} diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json new file mode 100644 index 000000000000..ee8231738212 --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -0,0 +1,306 @@ +{ + "hotspot": { + "linux": { + "jdk": { + "openjdk11": { + "aarch64": { + "build": "1", + "sha256": "2b89cabf0ce1c2cedadd92b798d6e9056bc27c71a06f5ba24ede5dc9c316e3e8", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "armv6l": { + "build": "1", + "sha256": "a703acfd04ece4a4aac4cb9bda26b7d225874008bba324237bd6f53792edb778", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "armv7l": { + "build": "1", + "sha256": "a703acfd04ece4a4aac4cb9bda26b7d225874008bba324237bd6f53792edb778", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "5f6b513757d386352cf91514ed5859d1ab59364b4453e1f1c57152ba2039b8e2", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "aarch64": { + "build": "7", + "sha256": "cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + }, + "armv6l": { + "build": "7", + "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + }, + "armv7l": { + "build": "7", + "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "7", + "sha256": "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "1", + "sha256": "3c7460de77421284b38b4e57cb1bd584a6cef55c34fc51a12270620544de2b8a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "armv6l": { + "build": "1", + "sha256": "efba97cd38af8f43b61f09cb5041f81d92ecd005dcd51c81678fbcf4f24d8461", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "armv7l": { + "build": "1", + "sha256": "efba97cd38af8f43b61f09cb5041f81d92ecd005dcd51c81678fbcf4f24d8461", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "5fbf8b62c44f10be2efab97c5f5dbf15b74fae31e451ec10abbc74e54a04ff44", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "aarch64": { + "build": "1", + "sha256": "c1965fb24dded7d7944e2da36cd902adf3b7b1d327aaa21ea507cff00a5a0090", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_aarch64_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "armv6l": { + "build": "1", + "sha256": "af4ecd311df32b405142d5756f966418d0200fbf6cb9009c20a44dc691e8da6f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "armv7l": { + "build": "1", + "sha256": "af4ecd311df32b405142d5756f966418d0200fbf6cb9009c20a44dc691e8da6f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "ed6c9db3719895584fb1fd69fc79c29240977675f26631911c5a1dbce07b7d58", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "openjdk11": { + "aarch64": { + "build": "1", + "sha256": "b6607f28fa2906d612d517f0babe4f0f895aa1c3f901edcddb493e33c1e27364", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "armv6l": { + "build": "1", + "sha256": "2ee7fe636a6a57e4718dfe597e8097b93ef8d976e4b05384433777c9f0526f5a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "armv7l": { + "build": "1", + "sha256": "2ee7fe636a6a57e4718dfe597e8097b93ef8d976e4b05384433777c9f0526f5a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "1ffe1a682e8179e35238bf3f93aba0cb185850e202c676f41d38cb0561883eda", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk17": { + "aarch64": { + "build": "1", + "sha256": "2e4137529319cd7935f74e1289025b7b4c794c0fb47a3d138adffbd1bbc0ea58", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "armv6l": { + "build": "1", + "sha256": "b63f532cb8b30e4d0bd18d52f08c1933e3cf66aeb373180d002274b6d94b4a25", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "armv7l": { + "build": "1", + "sha256": "b63f532cb8b30e4d0bd18d52f08c1933e3cf66aeb373180d002274b6d94b4a25", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "e96814ee145a599397d91e16831d2dddc3c6b8e8517a8527e28e727649aaa2d1", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "aarch64": { + "build": "1", + "sha256": "65b8bd74382d6514d2458ff4375468651791a55a186a5bffe0803204801e9c94", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_aarch64_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "armv6l": { + "build": "1", + "sha256": "a9dd1ea4280a85158191101688bbf1920c4676a3849e22dc7783fb61f60d6199", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_arm_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "armv7l": { + "build": "1", + "sha256": "a9dd1ea4280a85158191101688bbf1920c4676a3849e22dc7783fb61f60d6199", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_arm_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "2422a8831fe414b9dba4c443ee3562431dfcde27577124f0db58ec903afc262a", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + } + }, + "mac": { + "jdk": { + "openjdk11": { + "aarch64": { + "build": "1", + "sha256": "1953f06702d45eb54bae3ccf453b57c33de827015f5623a2dfc16e1c83e6b0a1", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "723548e36e0b3e0a5a2f36a38b22ea825d3004e26054a0e254854adc57045352", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "7", + "sha256": "27975d9e695cfbb93861540926f9f7bcac973a254ceecbee549706a99cbbdf95", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "1", + "sha256": "3a976943a9e6a635e68e2b06bd093fc096aad9f5894acda673d3bea0cb3a6f38", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "ac21a5a87f7cfa00212ab7c41f7eb80ca33640d83b63ad850be811c24095d61a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_mac_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "3eeba0e76101b9f5e8eb9eb14ad991293cf0cc064df35f6a89882b603630f0c8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_mac_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "openjdk11": { + "aarch64": { + "build": "1", + "sha256": "c84f38a7d87d50649ffc1f625facb4398fa54885371336a2cbf6ae2b435cbd10", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "10be61a8dd3766f7c12e2e823a6eca48cc6361d97e1b76310c752bd39770c7fe", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_mac_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk17": { + "aarch64": { + "build": "1", + "sha256": "63a32fe611f2666856e84b79305eb80609de229bbce4f13991b961797aa88bf8", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "9c59e45a9a6cbc1b8d671c4a88bb8d9b8929fae067df0d0a73b1ca71781a0996", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_mac_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "6161240769bd784e5ad55105fab9782d787ad34b7b8efd1f730a05f2659455d2", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_mac_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + } + } + } +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a9c0377ba5bc..1fc9d3b90c1f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -56,6 +56,8 @@ mapAliases ({ accounts-qt = throw "'accounts-qt' has been renamed to/replaced by 'libsForQt5.accounts-qt'"; # Converted to throw 2022-02-22 adobeReader = throw "'adobeReader' has been renamed to/replaced by 'adobe-reader'"; # Converted to throw 2022-02-22 adobe_flex_sdk = throw "'adobe_flex_sdk' has been renamed to/replaced by 'apache-flex-sdk'"; # Converted to throw 2022-02-22 + adoptopenjdk-hotspot-bin-17 = throw "AdoptOpenJDK is now Temurin. Use temurin-bin-17"; # added 2022-07-02 + adoptopenjdk-jre-hotspot-bin-17 = throw "AdoptOpenJDK is now Temurin and JRE is no longer provided. Use temurin-bin-17"; # added 2022-07-02 aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 ag = throw "'ag' has been renamed to/replaced by 'silver-searcher'"; # Converted to throw 2022-02-22 aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bccca1c9ba5..f5a4826e7da2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12388,120 +12388,48 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit lib; }; - adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; + temurin-bin-17 = javaPackages.compiler.temurin-bin.jdk-17; + temurin-jre-bin-17 = javaPackages.compiler.temurin-bin.jre-17; + temurin-bin-16 = javaPackages.compiler.temurin-bin.jdk-16; + temurin-bin-11 = javaPackages.compiler.temurin-bin.jdk-11; + temurin-jre-bin-11 = javaPackages.compiler.temurin-bin.jre-11; + temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8; + temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8; - adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-17-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-17-packages-darwin.jdk-hotspot {}; + temurin-bin = temurin-bin-17; + temurin-jre-bin = temurin-jre-bin-17; - adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; }; - adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; }; + semeru-bin-17 = javaPackages.compiler.semeru-bin.jdk-17; + semeru-jre-bin-17 = javaPackages.compiler.semeru-bin.jre-17; + semeru-bin-16 = javaPackages.compiler.semeru-bin.jdk-16; + semeru-jre-bin-16 = javaPackages.compiler.semeru-bin.jre-16; + semeru-bin-11 = javaPackages.compiler.semeru-bin.jdk-11; + semeru-jre-bin-11 = javaPackages.compiler.semeru-bin.jre-11; + semeru-bin-8 = javaPackages.compiler.semeru-bin.jdk-8; + semeru-jre-bin-8 = javaPackages.compiler.semeru-bin.jre-8; - adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-16 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-16-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-16-packages-darwin.jre-hotspot {}; + semeru-bin = semeru-bin-17; + semeru-jre-bin = semeru-jre-bin-17; - adoptopenjdk-openj9-bin-16 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-16-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-openj9 {}; + adoptopenjdk-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-hotspot; + adoptopenjdk-jre-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-hotspot; + adoptopenjdk-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-openj9; + adoptopenjdk-jre-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-openj9; - adoptopenjdk-jre-openj9-bin-16 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {}; + adoptopenjdk-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-hotspot; + adoptopenjdk-jre-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-hotspot; + adoptopenjdk-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-openj9; + adoptopenjdk-jre-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-openj9; - adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix { inherit lib; }; - adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix { inherit lib; }; + adoptopenjdk-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-hotspot; + adoptopenjdk-jre-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-hotspot; + adoptopenjdk-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-openj9; + adoptopenjdk-jre-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-openj9; - adoptopenjdk-hotspot-bin-15 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-15-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-15 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-15-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-15-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-15 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-15-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-15 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-15-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-15-packages-darwin.jre-openj9 {}; - - adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix { inherit lib; }; - adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix { inherit lib; }; - - adoptopenjdk-hotspot-bin-14 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-14-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-14 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-14-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-14-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-14 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-14-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-14 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-14-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-14-packages-darwin.jre-openj9 {}; - - adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix { inherit lib; }; - adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix { inherit lib; }; - - adoptopenjdk-hotspot-bin-13 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-13-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-13 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-13-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-13-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-13 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-13-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-13 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-13-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-13-packages-darwin.jre-openj9 {}; - - adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix { inherit lib; }; - adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix { inherit lib; }; - - adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-11 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-11 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; - - adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix { inherit lib; }; - adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix { inherit lib; }; - - adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-8 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-8-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-8-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-8 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-8-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-8 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-8-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-8-packages-darwin.jre-openj9 {}; + adoptopenjdk-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-hotspot; + adoptopenjdk-jre-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-hotspot; + adoptopenjdk-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-openj9; + adoptopenjdk-jre-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-openj9; adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 160f51cf43c5..6c3fd8062ded 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -175,6 +175,18 @@ in { inherit openjdk17-bootstrap; openjfx = openjfx17; }; + + temurin-bin = recurseIntoAttrs (callPackage ( + if stdenv.isLinux + then ../development/compilers/temurin-bin/jdk-linux.nix + else ../development/compilers/temurin-bin/jdk-darwin.nix + ) {}); + + semeru-bin = recurseIntoAttrs (callPackage ( + if stdenv.isLinux + then ../development/compilers/semeru-bin/jdk-linux.nix + else ../development/compilers/semeru-bin/jdk-darwin.nix + ) {}); }; mavenPlugins = recurseIntoAttrs (callPackage ../development/java-modules/mavenPlugins.nix { }); From 58c0decef2cfd4c8040fa8ec2559d27fffbb9b7b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 12 Sep 2022 09:41:15 +0100 Subject: [PATCH 178/737] libbfd: add CC_FOR_BUILD into depends Without the change cross-compiling libbfd fails as: GEN doc/bfdver.texi CCLD doc/chew.stamp ...-bash-5.1-p16/bin/bash: line 1: gcc: command not found Tested on `pkgsCross.riscv64.libbfd`. --- pkgs/development/tools/misc/binutils/libbfd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/binutils/libbfd.nix b/pkgs/development/tools/misc/binutils/libbfd.nix index ff5e2f1a1815..16737a7b5ee8 100644 --- a/pkgs/development/tools/misc/binutils/libbfd.nix +++ b/pkgs/development/tools/misc/binutils/libbfd.nix @@ -1,4 +1,5 @@ { lib, stdenv +, buildPackages , gnu-config, autoreconfHook, bison, binutils-unwrapped, texinfo , libiberty, libintl, zlib }: @@ -29,6 +30,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoreconfHook bison texinfo ]; buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; configurePlatforms = [ "build" "host" ]; configureFlags = [ From f878b256329b12b894e799f43f40e7e19e405408 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Sep 2022 21:12:25 +0200 Subject: [PATCH 179/737] nspr: 4.34.1 -> 4.35 NSPR 4.35 contains the following changes: - fixes for building with clang - use the number of online processors for the PR_GetNumberOfProcessors() API on some platforms - fix build on mips+musl libc - Add support for the LoongArch 64-bit architecture For details, please refer to the list of related bugs: https://bugzilla.mozilla.org/buglist.cgi?resolution=FIXED&query_format=advanced&product=NSPR&target_milestone=4.35 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 44d172dba859..7aa0b485bed0 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "nspr"; - version = "4.34.1"; + version = "4.35"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - hash = "sha256-xbg1TEi2Mrj0wZcGKBRsDgwMqPMscxXX1XNsAC4Dd08="; + hash = "sha256-fqMpfqWWm10lpd2NR/JEPNqI6e50YwH24eFCb4pqvI8="; }; patches = [ From adbc59c9d3b6be2cdb1c29b84afa8b30d9cc7593 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 9 Sep 2022 13:36:31 +0200 Subject: [PATCH 180/737] buildPython*: store dist (wheel/sdist) in dist output Store the intermediate artifacts. In time, we should build, install and test in separate derivations as that reduces circular dependencies, avoids rebuilds when fixing tests, and makes it possible to use the wheels for creating say virtualenv's. --- .../development/interpreters/python/hooks/default.nix | 5 +++++ .../python/hooks/python-output-dist-hook.sh | 10 ++++++++++ .../interpreters/python/mk-python-derivation.nix | 11 ++++++++++- pkgs/top-level/python-packages.nix | 1 + 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 5d605b240ad8..9d4b61c1a0fa 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -115,6 +115,11 @@ in rec { }; } ./python-namespaces-hook.sh) {}; + pythonOutputDistHook = callPackage ({ }: + makeSetupHook { + name = "python-output-dist-hook"; + } ./python-output-dist-hook.sh ) {}; + pythonRecompileBytecodeHook = callPackage ({ }: makeSetupHook { name = "python-recompile-bytecode-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh new file mode 100644 index 000000000000..e73e45cd597a --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh @@ -0,0 +1,10 @@ +# Setup hook for storing dist folder (wheels/sdists) in a separate output +echo "Sourcing python-catch-conflicts-hook.sh" + +pythonOutputDistPhase() { + echo "Executing pythonOutputDistPhase" + mv "dist" "$dist" + echo "Finished executing pythonOutputDistPhase" +} + +preFixupPhases+=" pythonOutputDistPhase" diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index f37ad592cb49..f82611554a2e 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -17,6 +17,7 @@ , pythonCatchConflictsHook , pythonImportsCheckHook , pythonNamespacesHook +, pythonOutputDistHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , setuptoolsBuildHook @@ -49,6 +50,8 @@ # Enabled to detect some (native)BuildInputs mistakes , strictDeps ? true +, outputs ? [ "out" ] + # used to disable derivation, useful for specific python versions , disabled ? false @@ -106,11 +109,13 @@ else let inherit (python) stdenv; + withDistOutput = lib.elem format ["pyproject" "setuptools" "flit"]; + name_ = name; self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" - "disabledTestPaths" + "disabledTestPaths" "outputs" ]) // { name = namePrefix + name_; @@ -144,6 +149,8 @@ let ] ++ lib.optionals (python.pythonAtLeast "3.3") [ # Optionally enforce PEP420 for python3 pythonNamespacesHook + ] ++ lib.optionals withDistOutput [ + pythonOutputDistHook ] ++ nativeBuildInputs; buildInputs = buildInputs ++ pythonPath; @@ -177,6 +184,8 @@ let # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + outputs = outputs ++ lib.optional withDistOutput "dist"; + meta = { # default to python's platforms platforms = python.meta.platforms; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e8e4aec9425..fd9a0c583da8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -119,6 +119,7 @@ in { pythonCatchConflictsHook pythonImportsCheckHook pythonNamespacesHook + pythonOutputDistHook pythonRecompileBytecodeHook pythonRelaxDepsHook pythonRemoveBinBytecodeHook From 5f9e6b829c51bc09b4b3bbe44b9ffc4f2d1cb03b Mon Sep 17 00:00:00 2001 From: Yuka Date: Tue, 13 Sep 2022 01:15:20 +0200 Subject: [PATCH 181/737] pkgsMusl.iproute2: fix build (#190957) --- pkgs/os-specific/linux/iproute/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 0cc8ee3cf3f0..09c3ac16071e 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=a3272b93725a406bc98b67373da67a4bdf6fcdb0"; sha256 = "0hyagh2lf6rrfss4z7ca8q3ydya6gg7vfhh25slhpgcn6lnk0xbv"; }) + + # fix build on musl. applied anywhere to prevent patchrot. + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/iproute2/min.patch?id=4b78dbe29d18151402052c56af43cc12d04b1a69"; + sha256 = "sha256-0ROZQAN3mUPPgggictr23jyA4JDG7m9vmBUhgRp4ExY="; + }) ]; preConfigure = '' From 2444caed5af0e535220faf19929bc7b969cf35c1 Mon Sep 17 00:00:00 2001 From: Yuka Date: Tue, 13 Sep 2022 16:03:35 +0200 Subject: [PATCH 182/737] systemd: set withTpm2Tss and withUserDb to true on musl (#191030) When we initially applied the openembedded patchset to make systemd build with musl, these options had to be disabled for it to work. Now they seem to work fine, so re-enabling. --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a14883ff5f2b..2b80dead199d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -98,8 +98,8 @@ , withShellCompletions ? true , withTimedated ? true , withTimesyncd ? true -, withTpm2Tss ? !stdenv.hostPlatform.isMusl -, withUserDb ? !stdenv.hostPlatform.isMusl +, withTpm2Tss ? true +, withUserDb ? true , withUtmp ? !stdenv.hostPlatform.isMusl # tests assume too much system access for them to be feasible for us right now , withTests ? false From 13bb0f49f7afe8296452d70e7782ac1d67b064da Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 9 Aug 2022 18:48:56 +0200 Subject: [PATCH 183/737] buildPython*: wrap setuptools in hook for catching conflicts By default buildPython* runs a hook for detecting conflicting packages. This hook needs pkg_resources which is part of setuptools. Before this commit, setuptools was simply added to the build. This meant that when setuptools was forgotten to be added to the build, the build and installation would still succeed because of this package from the hook. During runtime (and cross-compilation) one would notice the missing package. --- pkgs/development/interpreters/python/hooks/default.nix | 3 +-- .../interpreters/python/hooks/python-catch-conflicts-hook.sh | 2 +- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 9d4b61c1a0fa..63e94b567035 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -92,9 +92,8 @@ in rec { pythonCatchConflictsHook = callPackage ({ setuptools }: makeSetupHook { name = "python-catch-conflicts-hook"; - deps = [ setuptools ]; substitutions = { - inherit pythonInterpreter; + inherit pythonInterpreter pythonSitePackages setuptools; catchConflicts=../catch_conflicts/catch_conflicts.py; }; } ./python-catch-conflicts-hook.sh) {}; diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh index 374a2eddb407..0abcad3c42f2 100644 --- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh @@ -2,7 +2,7 @@ echo "Sourcing python-catch-conflicts-hook.sh" pythonCatchConflictsPhase() { - @pythonInterpreter@ @catchConflicts@ + PYTHONPATH="@setuptools@/@pythonSitePackages@:$PYTHONPATH" @pythonInterpreter@ @catchConflicts@ } if [ -z "${dontUsePythonCatchConflicts-}" ]; then diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index f82611554a2e..abb1ceb7879e 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -126,7 +126,7 @@ let ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ - setuptools pythonCatchConflictsHook + pythonCatchConflictsHook ] ++ lib.optionals removeBinBytecode [ pythonRemoveBinBytecodeHook ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ From dd145a16d6382aacdc527d375b82c1bfe8927a71 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 4 Sep 2022 09:24:35 -0700 Subject: [PATCH 184/737] python310Packages.jsonschema: remove patch hatch-fancy-pypi-readme has been packaged and is now available. --- .../python-modules/jsonschema/default.nix | 6 ++-- .../jsonschema/remove-fancy-pypi-readme.patch | 33 ------------------- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 9bf0175025c5..536389fb3b10 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -2,6 +2,7 @@ , attrs , buildPythonPackage , fetchPypi +, hatch-fancy-pypi-readme , hatch-vcs , hatchling , importlib-metadata @@ -24,15 +25,12 @@ buildPythonPackage rec { sha256 = "sha256-FlBZ8Hbv9pcbrlt0L8App7TvP5vPBMFOR3anYF3hSyM="; }; - patches = [ - ./remove-fancy-pypi-readme.patch - ]; - postPatch = '' patchShebangs json/bin/jsonschema_suite ''; nativeBuildInputs = [ + hatch-fancy-pypi-readme hatch-vcs hatchling ]; diff --git a/pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch b/pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch deleted file mode 100644 index 7124e5a6263b..000000000000 --- a/pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/pyproject.toml 2022-08-21 05:04:18.443484836 +0200 -+++ b/pyproject.toml 2022-08-21 05:04:50.789353514 +0200 -@@ -76,30 +76,6 @@ - Changelog = "https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst" - Source = "https://github.com/python-jsonschema/jsonschema" - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = "text/x-rst" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "README.rst" --end-before = ".. start cut from PyPI" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "README.rst" --start-after = ".. end cut from PyPI\n\n\n" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --text = """ -- -- --Release Information --------------------- -- --""" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "CHANGELOG.rst" --pattern = "(^v.+?)\nv" -- - [tool.isort] - from_first = true - include_trailing_comma = true From 4c510f32feb018050c85868b176cac91a5363d65 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 15 Sep 2022 06:19:44 +1000 Subject: [PATCH 185/737] file: 5.42 -> 5.43 https://mailman.astron.com/pipermail/file/2022-September/000857.html --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index eb14a4a71424..f1e21e5920a9 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.42"; + version = "5.43"; src = fetchurl { urls = [ "https://astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-wHb7TQKcdAc/FcQzYe9XLPuGhAfTRxkLqDSvOxY5sOQ="; + sha256 = "sha256-jIAV6Rrg6NAyHZTHgjmJLvnbxwxK3gAIwOlYlKv7GZE="; }; strictDeps = true; From e04d1ff7a96a06e4e1c3d6d5ec29f34ca003da82 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 14 Sep 2022 21:51:43 +0100 Subject: [PATCH 186/737] python3Packages.pdm-pep517: add 'setuptools' test depend https://github.com/NixOS/nixpkgs/pull/185815 exposed missing `setuptools` test dependency in `staging`: ----------------------------- Captured stderr call ----------------------------- Traceback (most recent call last): File "/build/pdm-pep517-1.0.4/tests/fixtures/projects/demo-cextension-in-src/setup.py", line 3, in from setuptools import setup ModuleNotFoundError: No module named 'setuptools' =========================== short test summary info ============================ FAILED tests/test_api.py::test_build_with_cextension - pdm.pep517.exceptions.... FAILED tests/test_api.py::test_build_with_cextension_in_src - pdm.pep517.exce... The change adds `setuptools` as a check dependency. --- pkgs/development/python-modules/pdm-pep517/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 4c05afe0fbd2..4d16bcca780f 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -4,6 +4,7 @@ , fetchPypi , git , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { ''; checkInputs = [ + setuptools pytestCheckHook git ]; From 48bf1dd780a71096ef93ed2373e087ec6cba1351 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 15 Sep 2022 16:17:11 +0300 Subject: [PATCH 187/737] pipewire: 0.3.57 -> 0.3.58 --- pkgs/development/libraries/pipewire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7b007ed9a1c9..a02ecc1e9b74 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -70,7 +70,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.57"; + version = "0.3.58"; outputs = [ "out" @@ -88,7 +88,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-s38ob78XsPwQVUQ/8y8JOJTbGaceBHeL5v7oryAQhuY="; + sha256 = "sha256-r8sDXyXwtA2o2xqglOI8XflttSScrqJ57cj1//k2tZ8="; }; patches = [ From 4ddd0b379a0249ed0b017c01627636d7c10b5136 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Sep 2022 12:53:12 +0200 Subject: [PATCH 188/737] python3Packages.mypy: add setuptools as native build input because it is the build system used by mypy. In the past, the dependency was implictly fulfilled because setuptools was added by buildPythonPackage. --- pkgs/development/python-modules/mypy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index a517427d8033..e62a84ae91dd 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -13,6 +13,7 @@ , pytestCheckHook , python , pythonOlder +, setuptools , six , typed-ast , typing-extensions @@ -35,6 +36,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools types-typed-ast ]; From d0688973477c89dbfcce20f046d0318903abecaa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Sep 2022 12:54:51 +0200 Subject: [PATCH 189/737] python3Packages.pdm-pep517: add missing setuptools test dependency Before the dependency was present as it was added by buildPythonPackage. --- pkgs/development/python-modules/pdm-pep517/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 4d16bcca780f..156226536bcf 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { setuptools pytestCheckHook git + setuptools ]; meta = with lib; { From df6feb4c08a00a90a0dc37b3feba49c49bad4b27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Sep 2022 14:20:27 +0200 Subject: [PATCH 190/737] python3Packages.numpy: fix format and folder to run tests in --- 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 68add2cdc26c..86bf008adc97 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -47,7 +47,7 @@ in buildPythonPackage rec { # https://github.com/scipy/scipy/issues/15414 version = "1.23.1"; - format = "pyproject.toml"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { @@ -89,7 +89,7 @@ in buildPythonPackage rec { checkPhase = '' runHook preCheck - pushd dist + pushd "$out" ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' popd runHook postCheck From 3eed54349f1d6db1a7046088c3feb574f974e358 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Sep 2022 14:20:48 +0200 Subject: [PATCH 191/737] python2Packages.numpy: fix format and folder ests are run in --- pkgs/development/python2-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python2-modules/numpy/default.nix b/pkgs/development/python2-modules/numpy/default.nix index b1d71bd66f36..99b0242340a3 100644 --- a/pkgs/development/python2-modules/numpy/default.nix +++ b/pkgs/development/python2-modules/numpy/default.nix @@ -39,7 +39,7 @@ let in buildPythonPackage rec { pname = "numpy"; version = "1.16.6"; - format = "pyproject.toml"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -73,7 +73,7 @@ in buildPythonPackage rec { checkPhase = '' runHook preCheck - pushd dist + pushd "$out" ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' popd runHook postCheck From fdd87f1121e680cb68cf56d5d88c74fde3e9a5f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Sep 2022 14:21:04 +0200 Subject: [PATCH 192/737] python3Packages.scipy: fix folder tests are run in --- pkgs/development/python-modules/scipy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 4b6342691d43..e69506f6746e 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - pushd dist + pushd "$out" ${python.interpreter} -c "import scipy; scipy.test('fast', verbose=10, parallel=$NIX_BUILD_CORES)" popd runHook postCheck From 161f8174b0adedcea1fbf07f32275db97d4e6905 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Sep 2022 19:03:29 +0200 Subject: [PATCH 193/737] python2Packages.numpy: don't use setuptools hook because we use the pip build phase already with pyproject. --- pkgs/development/python2-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python2-modules/numpy/default.nix b/pkgs/development/python2-modules/numpy/default.nix index 99b0242340a3..0bb01ef6812a 100644 --- a/pkgs/development/python2-modules/numpy/default.nix +++ b/pkgs/development/python2-modules/numpy/default.nix @@ -9,7 +9,7 @@ , writeTextFile , isPyPy , cython -, setuptoolsBuildHook +, setuptools }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -47,7 +47,7 @@ in buildPythonPackage rec { sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff"; }; - nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; + nativeBuildInputs = [ gfortran pytest cython setuptools ]; buildInputs = [ blas lapack ]; patches = lib.optionals python.hasDistutilsCxxPatch [ From 53614025a90064e53346b36a4a235520eab6e8be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 01:41:43 +0200 Subject: [PATCH 194/737] python3Packages.semver: don't try to remove dist folder The dist folder contents have their own dist output now. --- pkgs/development/python-modules/semver/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index a86b51c005ba..00fd16f15642 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -28,11 +28,6 @@ buildPythonPackage rec { sed -i "/--no-cov-on-fail/d" setup.cfg ''; - preCheck = '' - # Confuses source vs dist imports in pytest - rm -r dist - ''; - disabledTestPaths = [ # Don't test the documentation "docs/*.rst" From 40d29622590938bac1fc66e698f29917f452a7ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 16 Sep 2022 10:33:03 +0200 Subject: [PATCH 195/737] python3Packages.archinfo: add missing setuptools dependency --- pkgs/development/python-modules/archinfo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 92a81589233f..263b99997149 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-K9EAyCvwgWhiZ+rkPKPGBr3lWYIIRCf0FAzPjIjrcU8="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; From 8b101bac4a86c501c40f323516985bab689f36f2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 16 Sep 2022 10:34:22 +0200 Subject: [PATCH 196/737] python3Packages.autopage: add missing setuptools dep --- pkgs/development/python-modules/autopage/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/autopage/default.nix b/pkgs/development/python-modules/autopage/default.nix index 4ebaa9f8c905..e7bdc0d240ae 100644 --- a/pkgs/development/python-modules/autopage/default.nix +++ b/pkgs/development/python-modules/autopage/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "autopage"; @@ -11,6 +11,10 @@ buildPythonPackage rec { sha256 = "sha256-Ab4+5hu3FOkJD8xcEPTPVGw5YzHGIMauUKIyGyjtMZk="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "autopage" ]; meta = with lib; { From 699eaf8646fca3eaa1a1c57c31b32931b1cef8b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 16 Sep 2022 10:36:01 +0200 Subject: [PATCH 197/737] python3Packages.bleak: add setuptools as dep --- pkgs/development/python-modules/bleak/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index cb897b31fc81..74b199d21e44 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , pythonOlder , typing-extensions +, setuptools }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-pUn0PjxdjeRkxytLkFU0w/R4F0bpgV7NUxtyVd4uGcc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ async-timeout dbus-next From 370cce6a3c65c026f80c4861c7c80ab60edc7f2a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 16 Sep 2022 10:38:44 +0200 Subject: [PATCH 198/737] python3Packages.cvise: fix build after moving dist folder --- pkgs/development/tools/misc/cvise/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index be4d646a5397..e85ddbaed742 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -17,6 +17,7 @@ buildPythonApplication rec { pname = "cvise"; version = "2.5.0"; + format = "other"; src = fetchFromGitHub { owner = "marxin"; @@ -69,10 +70,6 @@ buildPythonApplication rec { "test_simple_reduction" ]; - dontUsePipInstall = true; - dontUseSetuptoolsBuild = true; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://github.com/marxin/cvise"; description = "Super-parallel Python port of C-Reduce"; From fe4ffc0988d2a1468e90b60192dd5f9b0474d09c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 16 Sep 2022 10:39:04 +0200 Subject: [PATCH 199/737] python3Packages.build: uses setuptools instead of flit as build system --- pkgs/development/python-modules/build/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index e4a7d69f34f6..59f0e9f245d2 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , filelock -, flit-core +, setuptools , importlib-metadata , packaging , pep517 @@ -31,7 +31,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flit-core + setuptools ]; propagatedBuildInputs = [ From ceb78d53dc6dd9d49ce7c38fe445d9391dccb574 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 16 Sep 2022 10:42:07 +0200 Subject: [PATCH 200/737] python3Packages.claripy: fix build needing setuptools --- pkgs/development/python-modules/claripy/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index bc755166221b..00fd16ed8b00 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, setuptools , cachetools , decorator , fetchFromGitHub @@ -26,6 +27,10 @@ buildPythonPackage rec { hash = "sha256-3v5te+j3I4yzxoBO8kY8VGLCrWfb1iOz9GHzun1DT0I="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cachetools decorator From 029b261fb3531d9d1f63bc8b1d724acddf600691 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 16 Sep 2022 10:42:22 +0200 Subject: [PATCH 201/737] python3Packages.cwcwidth: fix build needing setuptools --- pkgs/development/python-modules/cwcwidth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index f6bab4ffc4bc..fc57df26230a 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, cython, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, cython, pytestCheckHook, setuptools }: buildPythonPackage rec { pname = "cwcwidth"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "sha256-wNZH4S46SxWogeHYT3lpN1FmSEieARJXI33CF51rGVE="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ cython setuptools ]; checkInputs = [ pytestCheckHook ]; preCheck = '' From f02c89bfd23b1403ae9245c78017e710f4f22e1f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 16 Sep 2022 10:54:20 +0200 Subject: [PATCH 202/737] python3Packages.poetry-core: add missing setuptools test dep --- pkgs/development/python-modules/poetry-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 5922d67fc8b7..ee9340ef9d5a 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -6,6 +6,7 @@ , pep517 , pytest-mock , pytestCheckHook +, setuptools , tomlkit , typing ? null , virtualenv @@ -46,6 +47,7 @@ buildPythonPackage rec { pep517 pytest-mock pytestCheckHook + setuptools tomlkit virtualenv ]; From d8d7fe93199126ca6a1e4d4e0f31059a96c51f26 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 17:43:19 +0200 Subject: [PATCH 203/737] python3Packages.exdown: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/exdown/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index d369b3645ab6..f7b4a38ee476 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -3,6 +3,7 @@ , isPy27 , fetchPypi , pythonOlder +, setuptools , importlib-metadata , pytestCheckHook }: @@ -19,6 +20,10 @@ buildPythonPackage rec { sha256 = "sha256-r0SCigkUpOiba4MDf80+dLjOjjruVNILh/raWfvjXA0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkInputs = [ From 4fb1130b71f8e728ea15a0cc55613d36c14a9d31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 01:46:12 +0200 Subject: [PATCH 204/737] python3Packages.http-parser: add setuptools to nativeBuildInputs --- .../python-modules/http-parser/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix index d98785576f48..d0fc242c9896 100644 --- a/pkgs/development/python-modules/http-parser/default.nix +++ b/pkgs/development/python-modules/http-parser/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest +, cython +, setuptools +, pytestCheckHook }: buildPythonPackage rec { @@ -12,15 +14,22 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "benoitc"; repo = pname; - rev = version; - sha256 = "05byv1079qi7ypvzm13yf5nc23ink6gr6c5wrhq7fwld4syscy2q"; + rev = "refs/tags/${version}"; + hash = "sha256-WHimvSaNcncwzLwwk5+ZNg7BbHF+hPr39SfidEDYfhU="; }; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + ]; - checkPhase = "pytest testing/"; - pythonImportsCheck = [ "http_parser" ]; + pythonImportsCheck = [ + "http_parser" + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "HTTP request/response parser for python in C"; From 1d20d67783f7eb4a73d0e311f819c64e528dbeac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 16 Sep 2022 19:36:05 +0200 Subject: [PATCH 205/737] python2Packages.pygtk: format should be other because it doesn't use any of the hooks for building. --- pkgs/development/python2-modules/pygtk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index 08e1520c4c85..20e9498ea30e 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pygtk"; outputs = [ "out" "dev" ]; version = "2.24.0"; + format = "other"; disabled = isPy3k; From 3e2f9a09b6dde94fb0221b3f1f945aa8dcfe15b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:42:21 +0200 Subject: [PATCH 206/737] python3Packages.goodwe: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/goodwe/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index d2d526ea60df..e10ae6927f63 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,20 +20,25 @@ buildPythonPackage rec { sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE="; }; - checkInputs = [ - pytestCheckHook - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "'marcelblijleven@gmail.com" "marcelblijleven@gmail.com" \ --replace "version: file: VERSION" "version = ${version}" ''; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "goodwe" ]; + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { description = "Python library for connecting to GoodWe inverter"; homepage = "https://github.com/marcelblijleven/goodwe"; From e6606bcb009fc218fd8fad4311d956b2494d4b51 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 19:22:23 +0200 Subject: [PATCH 207/737] python3Packages.mdformat: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/mdformat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 921ba4d33604..114685e2f46d 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -6,6 +6,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, setuptools , tomli , typing-extensions }: @@ -26,6 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ From 28040cdbe30a67ddcb4b43723b7a23da3ed1667b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 19:21:48 +0200 Subject: [PATCH 208/737] python3Packages.dunamai: add setuptools to checkInputs --- pkgs/development/python-modules/dunamai/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 118c2544314a..0d1b183e238e 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -6,6 +6,7 @@ , importlib-metadata , packaging , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -39,6 +40,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + setuptools ]; pythonImportsCheck = [ "dunamai" ]; From f6ddcc36b475d9fa4d5266354c26d3a2e947d6ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 19:08:26 +0200 Subject: [PATCH 209/737] python3Packages.pg8000: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/pg8000/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 4ae1daa17951..94da7af29643 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -5,6 +5,7 @@ , passlib , pythonOlder , scramp +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-gLT03ksCVIMreUhRHg3UY0LRwERszU/diStj0C5PvHs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ passlib scramp From e78b9c8116d7b87fbde83064c6aa770603db14d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 19:05:11 +0200 Subject: [PATCH 210/737] python3Packages.pypng: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/pypng/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pypng/default.nix b/pkgs/development/python-modules/pypng/default.nix index 968e9310318a..129300b08158 100644 --- a/pkgs/development/python-modules/pypng/default.nix +++ b/pkgs/development/python-modules/pypng/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -12,10 +13,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "drj11"; repo = "pypng"; - rev = "${pname}-${version}"; + rev = "refs/tags/${pname}-${version}"; sha256 = "sha256-JU1GCSTm2s6Kczn6aRcF5DizPJVpizNtnAMJxTBi9vo="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "png" ]; checkInputs = [ pytestCheckHook ]; From e07d2186dc4ef230f902bb767106d9118615414d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:55:13 +0200 Subject: [PATCH 211/737] python3Packages.teletype: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/teletype/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/teletype/default.nix b/pkgs/development/python-modules/teletype/default.nix index 999454edf83f..83cfb471e0d2 100644 --- a/pkgs/development/python-modules/teletype/default.nix +++ b/pkgs/development/python-modules/teletype/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-uBppM4w9GlMgYqKFGw1Rcjvq+mnU04K3E74jCgK9YYo="; }; + nativeBuildInputs = [ + setuptools + ]; + # no tests doCheck = false; From 9fa36b4ab21e87957af3c352da0e384f8673458e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:52:45 +0200 Subject: [PATCH 212/737] python3Packages.json-stream: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/json-stream/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index e6a8a68ddb9e..3c6a2d36d34c 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -4,6 +4,7 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-ebB8l8H6yPLoCXmVOy60IijdBI61SEzJInC30aMe9Bk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; From 58064e424c2c817227e69e3e226f839c81e254cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:52:31 +0200 Subject: [PATCH 213/737] python3Packages.aiomusiccast: propagate setuptools --- pkgs/development/python-modules/aiomusiccast/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 470e84eb6cce..186765377c4f 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , poetry-core , aiohttp +, setuptools }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + setuptools ]; # upstream has no tests From 20b9217e2f6726d98b476b91331be8758aef2938 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:48:02 +0200 Subject: [PATCH 214/737] python3Packages.aiosenz: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/aiosenz/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aiosenz/default.nix b/pkgs/development/python-modules/aiosenz/default.nix index beb561861470..3aab4e1451c2 100644 --- a/pkgs/development/python-modules/aiosenz/default.nix +++ b/pkgs/development/python-modules/aiosenz/default.nix @@ -5,6 +5,7 @@ , httpx , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ httpx authlib From 33c34beac0d67761f058796941c3a95e0bc169d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:47:43 +0200 Subject: [PATCH 215/737] python3Packages.pyrituals: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/pyrituals/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyrituals/default.nix b/pkgs/development/python-modules/pyrituals/default.nix index e7674fd3ea77..b73ca1862735 100644 --- a/pkgs/development/python-modules/pyrituals/default.nix +++ b/pkgs/development/python-modules/pyrituals/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -18,6 +19,10 @@ buildPythonPackage rec { sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g"; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; # Project has no tests From 5ad59cbaa32416d55e3dbc0b2b15c3133b381e73 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:46:26 +0200 Subject: [PATCH 216/737] python3Packages.peco: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/peco/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/peco/default.nix b/pkgs/development/python-modules/peco/default.nix index 72450237a542..961b0c623d92 100644 --- a/pkgs/development/python-modules/peco/default.nix +++ b/pkgs/development/python-modules/peco/default.nix @@ -4,6 +4,7 @@ , fetchPypi , pydantic , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-zL0tBTwm+l5eyxlWr2xoE+nLpMfUKri1/yD+WgTUqHQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp pydantic From b0e6efd39d498ff53031c036ff864001ad205fd3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:44:19 +0200 Subject: [PATCH 217/737] python3Packages.pylutron-caseta: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/pylutron-caseta/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 1bbbcf308900..5ddee7d86db8 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -7,6 +7,7 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-D1P4roUZ+byU031RtdwIOR/ncxY9wl9UqCKVb/XPGVk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography ]; From 6c931b258b97ceae5569b7d85f984c377be11147 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:44:06 +0200 Subject: [PATCH 218/737] python3Packages.homeconnect: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/homeconnect/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index a3e5c2ddb1dc..edf600921f1a 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -4,6 +4,7 @@ , requests , requests-oauthlib , pythonOlder +, setuptools , six }: @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-wCx8Jh3NBTnYI+essH9toacjUaT4fS61SaAAZDCYZ4g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests requests-oauthlib From 9426aa38d096990e5518d1fba9f96a590a215bcf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:41:36 +0200 Subject: [PATCH 219/737] python3Packages.py-canary: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/py-canary/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 68a33ae11173..e849e147e42d 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -6,6 +6,7 @@ , pythonOlder , requests , requests-mock +, setuptools }: buildPythonPackage rec { @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-873XAf0jOX5pjrNRELEcTWCauk80FUYxTu7G7jc3MHE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; From 8b2674fab167d659a3b7c89cde6138dfb0a1a354 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:40:52 +0200 Subject: [PATCH 220/737] python3Packages.aurorapy: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/aurorapy/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index 00eb71e3d7da..8bbce350ad8d 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -5,6 +5,7 @@ , pyserial , pytestCheckHook , pythonOlder +, setuptools , six }: @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ future pyserial From 157f5a4d75ff310a563264c647839d013b0b58da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:37:22 +0200 Subject: [PATCH 221/737] python3Packages.python-vagrant: add setuptools to nativeBuildInputs --- .../python-modules/python-vagrant/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix index 9984931e3a98..b8ae4eba788c 100644 --- a/pkgs/development/python-modules/python-vagrant/default.nix +++ b/pkgs/development/python-modules/python-vagrant/default.nix @@ -1,4 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: buildPythonPackage rec { version = "1.0.0"; @@ -10,6 +14,10 @@ buildPythonPackage rec { sha256 = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU="; }; + nativeBuildInputs = [ + setuptools + ]; + # The tests try to connect to qemu doCheck = false; From cbcd8e2cc40cab35f69da348a01ea3b260f72953 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:13:11 +0200 Subject: [PATCH 222/737] python3Packages.toposort: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/toposort/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index 603afe3ad59c..a9722b053bfb 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { @@ -13,6 +14,10 @@ buildPythonPackage rec { sha256 = "sha256-3cIYLEKRKkQFEb1/9dPmocq8Osy8Z0oyWMjEHL+7ISU="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "toposort" ]; From f58ad05a042fd75f5542740a73f607bf87ecb3a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:12:32 +0200 Subject: [PATCH 223/737] python3Packages.simpleeval: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/simpleeval/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index a296a721a8e0..ddc4b56654e6 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "0khgl729q5133fgc00d550f4r77707rkkn7r56az4v8bvx0q8xp4"; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; From 617ed4733ba5a6923637cbabbe60115eb21b9c0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:07:08 +0200 Subject: [PATCH 224/737] python3Packages.desktop-notifier: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/desktop-notifier/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 6a2d3bacb12e..a60d4ae45a4e 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -4,6 +4,7 @@ , pythonOlder , stdenv , packaging +, setuptools , importlib-resources , dbus-next }: @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-lOXoiWY6gyWBL4RLrvslqcMmwtjMTOaHJZzsDO+C/F4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.9") [ From f1b5f555561f80d26218004c9bd26425adce7d58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:05:36 +0200 Subject: [PATCH 225/737] python3Packages.scmrepo: add setuptools to nativeBuildInputs and relax pathspec constraint. --- .../python-modules/scmrepo/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index e61ac1e5b9b5..2be7686985c4 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -10,6 +10,7 @@ , pygit2 , pygtrie , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -26,6 +27,16 @@ buildPythonPackage rec { hash = "sha256-269vJNclTBWEqM9AJbF96R1I6Ru3q8YBd5A8Rmw7Jjo="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" \ + --replace "pathspec>=0.9.0,<0.10.0" "pathspec" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ asyncssh dulwich @@ -37,11 +48,6 @@ buildPythonPackage rec { pygtrie ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" - ''; - # Requires a running Docker instance doCheck = false; From e54e365857e1671ca144ba420b0b5244f4c28e5a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 17:59:53 +0200 Subject: [PATCH 226/737] python3Packages.rpi-bad-power: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/rpi-bad-power/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/rpi-bad-power/default.nix b/pkgs/development/python-modules/rpi-bad-power/default.nix index 205cefad6143..8c0dbd61c3a5 100644 --- a/pkgs/development/python-modules/rpi-bad-power/default.nix +++ b/pkgs/development/python-modules/rpi-bad-power/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -19,6 +20,10 @@ buildPythonPackage { hash = "sha256:1yvfz28blq4fdnn614n985vbs5hcw1gm3i9am53k410sfs7ilvkk"; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "rpi_bad_power" ]; From a30bb4c64a63f093a6cc3db11b773f62523de17f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 17:59:01 +0200 Subject: [PATCH 227/737] python3Packages.aioaseko: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/aioaseko/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix index 1c31dac5f596..d6d69c6ee466 100644 --- a/pkgs/development/python-modules/aioaseko/default.nix +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; From 074c316654327ce8434ed5dbb6fcc18a51c7a4b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 17:41:01 +0200 Subject: [PATCH 228/737] python3Packages.bitlist: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/bitlist/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index 1e7f24144645..5d5a84da8bfb 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , nose , parts , pytestCheckHook @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-rpXQKkV2RUuYza+gfpGEH3kFJ+hjuNGKV2i46eXQUUI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ parts ]; From 7e1912c9b0ff8c0799557b2be0e9abff136195e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 17:39:46 +0200 Subject: [PATCH 229/737] python3Packages.pyeapi: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/pyeapi/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index aa9e0983b7e3..c5d7f822d202 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, setuptools , mock , netaddr , pytestCheckHook @@ -22,6 +23,10 @@ buildPythonPackage rec { sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ netaddr ]; From 86e73676233f6eae23b5115a6752a77cf6da5fdf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 17:38:35 +0200 Subject: [PATCH 230/737] python3Packages.python-pam: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/python-pam/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix index 16883ee9426e..b19d2c623d0c 100644 --- a/pkgs/development/python-modules/python-pam/default.nix +++ b/pkgs/development/python-modules/python-pam/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pam , six , toml @@ -24,6 +25,10 @@ buildPythonPackage rec { --replace 'find_library("pam_misc")' '"${pam}/lib/libpam_misc.so"' ''; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pam ]; From 9d8964ac4fa02be5f8a2c3caabf8c86ce7fe9068 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 17:37:02 +0200 Subject: [PATCH 231/737] python3Packages.matrix-common: add setuptools to nativeBuildInputs Fix package name, enable tests. --- .../python-modules/matrix-common/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index 0637ad549e92..4abec9e31548 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -2,20 +2,34 @@ , lib , buildPythonPackage , fetchPypi +, setuptools , attrs +, unittestCheckHook }: buildPythonPackage rec { - pname = "matrix_common"; + pname = "matrix-common"; version = "1.3.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "matrix_common"; + inherit version; sha256 = "sha256-YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E="; }; - propagatedBuildInputs = [ attrs ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + attrs + ]; + + checkInputs = [ + unittestCheckHook + ]; + pythonImportsCheck = [ "matrix_common" ]; meta = with lib; { From 6cebc6e11684ded7a63d25f7e2868c4a870f9f7a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 16:46:43 +0200 Subject: [PATCH 232/737] python3Packages.av: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/av/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index a6aa50b2de0c..088965d7dfd2 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -6,6 +6,7 @@ # build , cython , pkg-config +, setuptools # runtime , ffmpeg @@ -33,6 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython pkg-config + setuptools ]; buildInputs = [ From faf6ac661d546b539e6805fe5be7ef9ebe61281b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 16:16:18 +0200 Subject: [PATCH 233/737] python3Packages.pyvex: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/pyvex/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 704d4440ff78..e1ce42205057 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -8,6 +8,7 @@ , future , pycparser , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-Yik1RTz4SQBFJxgPzp7LnPHV4EMbxGEhD2fBVcKJC7c="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ archinfo bitstring From a7854ae9327b0dfda04668b4ef1fd0e7b51c53b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 15:33:06 +0200 Subject: [PATCH 234/737] python3Packages.falcon: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/falcon/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 8051fbb55bfb..89d047e968aa 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -6,6 +6,7 @@ # build , cython +, setuptools # tests , aiofiles @@ -38,7 +39,9 @@ buildPythonPackage rec { hash = "sha256-Y6bD0GCXhqpvMV+/i1v59p2qWZ91f2ey7sPQrVALY54="; }; - nativeBuildInputs = lib.optionals (!isPyPy) [ + nativeBuildInputs = [ + setuptools + ] ++ lib.optionals (!isPyPy) [ cython ]; From f0327dffbe601e0268136fe0722e8872bee6c797 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 15:22:03 +0200 Subject: [PATCH 235/737] python3Packages.pytest-test-utils: add setuptools to nativeBuildInputs --- .../development/python-modules/pytest-test-utils/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest-test-utils/default.nix b/pkgs/development/python-modules/pytest-test-utils/default.nix index 51e9972cbad3..fd5022dac4f8 100644 --- a/pkgs/development/python-modules/pytest-test-utils/default.nix +++ b/pkgs/development/python-modules/pytest-test-utils/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , pytest , pythonOlder @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-5gB+hnJR2+NQd/n7RGrX1bzfKt8Np7IbWw61SZgNVJY="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pytest ]; From 3302f623d60485e7612d57e720a0d94542436a33 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 01:30:37 +0200 Subject: [PATCH 236/737] python3Packages.shellingham: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/shellingham/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 1d1a1fc46bdd..a072f16b23d3 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytest-mock , pytestCheckHook , pythonOlder @@ -19,6 +20,10 @@ buildPythonPackage rec { sha256 = "0f686ym3ywjffis5jfqkhsshjgii64060hajysczflhffrjn9jcp"; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytest-mock pytestCheckHook From 7ea64155e74faab815f865ca5f8eb14cc6b33588 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 23:41:41 +0200 Subject: [PATCH 237/737] python3Packages.fasteners: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/fasteners/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index ef8a62bc8e8e..7072e4b3378c 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , diskcache , more-itertools , pytestCheckHook @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-FVhHp8BZ/wQQyr5AcuDo94LlflixhjZ0SnheSdHuDVQ="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ diskcache more-itertools From 46445f00a9c09166cb4a2b6f79ec10c766375fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 15 Sep 2022 23:09:32 +0200 Subject: [PATCH 238/737] python310Packages.parts: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/parts/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index ba54ce2e70a6..48fdcaa0d1bf 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-gOPDqXF05bQcG0Kv0+akBrikRr/CfHB9/tM/TJDPHdM="; }; + nativeBuildInputs = [ + setuptools + ]; + # Project has no tests doCheck = false; From 68380d60446c06c6c0e2328dc6ee05fa4438ba2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 23:08:59 +0200 Subject: [PATCH 239/737] python3Packages.portpicker: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/portpicker/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index b88bccfc534b..f9b8f7993ffd 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , psutil , pythonOlder }: @@ -17,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-xVaDrXJfXACkG8fbAiUiPovgJLH6Vk0DntM5Dk/Uj7M="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ psutil ]; From f75bb52d8e82eac47f715d431ce55f19da1b637e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 22:49:36 +0200 Subject: [PATCH 240/737] python3Packages.tensorboard-plugin-profile: add setuptools to nativeBuildInputs --- .../tensorboard-plugin-profile/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index a32be33a37a8..2cb1629ffe67 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib +, fetchPypi +, buildPythonPackage +, setuptools , gviz-api , protobuf , werkzeug @@ -17,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-2LzXSdPrzS5G63ONvchdEL4aJD75eU9dF1pMqLcfbto="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ gviz-api protobuf From 32a0abe40cc19a170299f7802f1e4592f37dee50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 15 Sep 2022 22:49:13 +0200 Subject: [PATCH 241/737] python310Packages.mistune: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/mistune/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 16a5e22ac6a4..883bbb513501 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808"; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; From 014bb5cb7da61c92ec094171e0e1cace46d219cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 22:35:10 +0200 Subject: [PATCH 242/737] python3Packages.mdit-py-plugins: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/mdit-py-plugins/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 03a64588f85b..4174c18d10bf 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , markdown-it-py , pytest-regressions , pytestCheckHook @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-3zFSTjqwjUV6+fU6falYbIzj/Hp7E/9EXKZIi00tkg4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ markdown-it-py ]; From b73038be33e2f1b8bcfbf135d4f993149e45075e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 22:34:32 +0200 Subject: [PATCH 243/737] python3Packages.python-gnupg: add setuptools to nativeBuildInputs and reformat and enable tests. --- .../python-modules/python-gnupg/default.nix | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index e5728dabeffc..d1ae7b80bf23 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, gnupg }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, gnupg +, pytestCheckHook +}: buildPythonPackage rec { pname = "python-gnupg"; @@ -18,6 +24,19 @@ buildPythonPackage rec { --replace "os.environ.get('GPGBINARY', 'gpg')" "os.environ.get('GPGBINARY', '${gnupg}/bin/gpg')" ''; + nativeBuildInputs = [ + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # network access + "test_search_keys" + ]; + pythonImportsCheck = [ "gnupg" ]; meta = with lib; { From d9522aa4c57999f0034ef9ce699e80c5e32b48c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 15:42:33 +0200 Subject: [PATCH 244/737] python3Packages.gevent: add setuptools to nativeBuildInputs It is the build system used by gevent and was previously provided through the buildPythonPackage builder. --- pkgs/development/python-modules/gevent/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index e2b1e11278b7..28a089296481 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -5,6 +5,7 @@ , python , libev , greenlet +, setuptools , zope_event , zope_interface , pythonOlder @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ libev ]; From 6a851472f226f63eb8b886cbe5f214428b6bd282 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 15:57:33 +0200 Subject: [PATCH 245/737] python3Packages.astor: disabled failing test and prune the list of tests from working ones. --- .../python-modules/astor/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index ab68c91d5d6b..fec7e2aa3b7e 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,8 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "astor"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -10,14 +15,15 @@ buildPythonPackage rec { }; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + disabledTests = [ - "check_expressions" - "check_astunparse" - "convert_stdlib" - "codegen_as_submodule" - "positional_only_arguments" - "codegen_from_root" + # https://github.com/berkerpeksag/astor/issues/196 + "test_convert_stdlib" + # https://github.com/berkerpeksag/astor/issues/212 + "test_huge_int" ]; meta = with lib; { From c221631cee8e8a19bfbc631c4c180aa0158c71e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Sep 2022 09:11:38 +0200 Subject: [PATCH 246/737] python3Packages.pyqt5: add setuptools --- pkgs/development/python-modules/pyqt/5.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index cc8f4bac2f04..b78f16233ea5 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, setuptools , isPy27 , fetchPypi , pkg-config @@ -61,6 +62,7 @@ buildPythonPackage rec { nativeBuildInputs = with libsForQt5; [ pkg-config qmake + setuptools lndir sip qtbase From a1bad74390af6504969b0e40f4dba1a2d2ecb1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 17 Sep 2022 13:35:19 +0200 Subject: [PATCH 247/737] glslang: fixup paths in .pc files These errors would now fail the build, as stricter checks were introduced recently. --- pkgs/development/compilers/glslang/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 72d895449111..17ff68e892a2 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { mkdir $out/include/External ''; + # Fix the paths in .pc, even though it's unclear if these .pc are really useful. + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/SPIRV-Tools{,-shared}.pc \ + --replace '=''${prefix}//' '=' + ''; + meta = with lib; { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL"; From b00a475d624a1d80289245e7922c5b6607e79f89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 03:04:53 +0200 Subject: [PATCH 248/737] ubidump: use format other and propagate setuptools --- pkgs/tools/filesystems/ubidump/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index bf141c8d94d7..5e325591e6ee 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -4,6 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "ubidump"; version = "unstable-2019-09-11"; + format = "other"; src = fetchFromGitHub { owner = "nlitsme"; @@ -12,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1hiivlgni4r3nd5n2rzl5qzw6y2wpjpmyls5lybrc8imd6rmj3w2"; }; - propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ]; + propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo setuptools ]; dontBuild = true; From 88373b3900b890ea00b8bd38dd4007112eaa2b9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 02:50:32 +0200 Subject: [PATCH 249/737] steck: add setuptools to nativeBuildInputs and relax termcolor constraint --- pkgs/servers/pinnwand/steck.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index de6f28f30907..ed54c3d20c3d 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -14,10 +14,16 @@ python3Packages.buildPythonApplication rec { }; postPatch = '' + cat setup.py substituteInPlace setup.py \ - --replace 'click>=7.0,<8.0' 'click' + --replace 'click>=7.0,<8.0' 'click' \ + --replace 'termcolor>=1.1.0,<2.0.0' 'termcolor' ''; + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + propagatedBuildInputs = with python3Packages; [ pkgs.git appdirs From 872a77c58e51174c4cc289043516fcd0a6308f8f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 02:49:40 +0200 Subject: [PATCH 250/737] python3Packages.widgetsnbextension: add setuptools to nativeBuildInputs and migrate checkPhase to pytestCheckHook --- .../python-modules/send2trash/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 8a35d3ed71a6..1741c76b3d4f 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -1,7 +1,8 @@ { lib, stdenv , buildPythonPackage , fetchFromGitHub -, pytest +, setuptools +, pytestCheckHook }: buildPythonPackage rec { @@ -12,13 +13,23 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hsoft"; repo = "send2trash"; - rev = version; - sha256 = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q="; + rev = "refs/tags/${version}"; + hash = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q="; }; + nativeBuildInputs = [ + setuptools + ]; + doCheck = !stdenv.isDarwin; - checkPhase = "HOME=$TMPDIR pytest"; - checkInputs = [ pytest ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Send file to trash natively under macOS, Windows and Linux"; From 544383852c5de6da03b09672507cb8cc8d3ad260 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:59:47 +0200 Subject: [PATCH 251/737] python3Packages.pandoc-xnos: add setuptools to nativeBuildInputs --- .../python-modules/pandoc-xnos/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix index ce365708b35d..dcc1e4709003 100644 --- a/pkgs/development/python-modules/pandoc-xnos/default.nix +++ b/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -3,6 +3,7 @@ , lib , pandocfilters , psutil +, setuptools }: buildPythonPackage rec { @@ -17,9 +18,21 @@ buildPythonPackage rec { sha256 = "sha256-beiGvN0DS6s8wFjcDKozDuwAM2OApX3lTRaUDRUqLeU="; }; - propagatedBuildInputs = [ pandocfilters psutil ]; + nativeBuildInputs = [ + setuptools + ]; - pythonImportsCheck = [ "pandocxnos" ]; + propagatedBuildInputs = [ + pandocfilters + psutil + ]; + + pythonImportsCheck = [ + "pandocxnos" + ]; + + # tests need some patching + doCheck = false; meta = with lib; { description = "Pandoc filter suite providing facilities for cross-referencing in markdown documents"; From 9bb71c7136d5ad2d2bac0eddf3f505b373f5a13f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:44:23 +0200 Subject: [PATCH 252/737] python3Packages.py-tree-sitter: add setuptools to nativeBuildInputs --- .../python-modules/py-tree-sitter/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/py-tree-sitter/default.nix b/pkgs/development/python-modules/py-tree-sitter/default.nix index 9d7b82986976..f087bac5c10e 100644 --- a/pkgs/development/python-modules/py-tree-sitter/default.nix +++ b/pkgs/development/python-modules/py-tree-sitter/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, setuptools +}: buildPythonPackage rec { pname = "py-tree-sitter"; @@ -13,6 +18,10 @@ buildPythonPackage rec { fetchSubmodules = true; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "tree_sitter" ]; meta = with lib; { From 81eb7083e799d39572a85a4c10c6b036d98a3421 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:30:13 +0200 Subject: [PATCH 253/737] python3Packages.labmath: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/labmath/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/labmath/default.nix b/pkgs/development/python-modules/labmath/default.nix index 5eaeeba9a06d..602cc060128d 100644 --- a/pkgs/development/python-modules/labmath/default.nix +++ b/pkgs/development/python-modules/labmath/default.nix @@ -1,4 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: buildPythonPackage rec { pname = "labmath"; @@ -10,6 +14,10 @@ buildPythonPackage rec { sha256 = "sha256-dzJ4szPxnck0Cgc5IEp5FBmHvIyAC0rqKRVrkt20ntQ="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "labmath" ]; meta = with lib; { From ef24b1fc55d0f995bb6a463905c7bb3c73108ee0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:28:55 +0200 Subject: [PATCH 254/737] python3Packages.http-sfv: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/http-sfv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/http-sfv/default.nix b/pkgs/development/python-modules/http-sfv/default.nix index abee83637215..55b318ff40de 100644 --- a/pkgs/development/python-modules/http-sfv/default.nix +++ b/pkgs/development/python-modules/http-sfv/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , typing-extensions }: @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-zl0Rk4QbzCVmYZ6TnVq+C+oe27Imz5fEQY9Fco5lo5s="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ typing-extensions ]; From 00ae36410a6209f34055e4eca97940eafaab2600 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:28:08 +0200 Subject: [PATCH 255/737] python3Packages.headerparser: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/headerparser/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix index 6a07f1f07ca7..3c1fd4fff9d3 100644 --- a/pkgs/development/python-modules/headerparser/default.nix +++ b/pkgs/development/python-modules/headerparser/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytest-mock , pytestCheckHook , pythonOlder @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-KJJt85iC/4oBoIelB2zUJVyHSppFem/22v6F30P5nYM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six ]; From 1751da9129b941e51abc5ead9c365fb6da68ec05 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 00:33:23 +0200 Subject: [PATCH 256/737] asciinema: add setuptools to nativeBuildInputs --- pkgs/tools/misc/asciinema/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 11ad6b8b36af..e025b0ffc58e 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-ioSNd0Fjk2Fp05lk3HeokIjNYGU0jQEaIDfcFB18mV0="; }; + nativeBuildInputs = [ + python3Packages.setuptools + ]; + postPatch = '' substituteInPlace tests/pty_test.py \ --replace "python3" "${python3Packages.python}/bin/python" From 00c4064a792ddee3201cf1f89ecacd1949bbd707 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 19:31:56 +0200 Subject: [PATCH 257/737] python3Packages.pytesseract: add setuptools to nativeBuildInputs --- .../python-modules/pytesseract/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index a2fa23834a6e..e38af1f89309 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -1,5 +1,12 @@ -{ buildPythonPackage, fetchFromGitHub, lib, packaging, pillow, tesseract, substituteAll +{ buildPythonPackage +, fetchFromGitHub +, lib +, packaging +, pillow +, tesseract +, substituteAll , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -21,6 +28,10 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ tesseract ]; From 52277c1e0af1822d279ec0f2306da8ba51526e0d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 17 Sep 2022 20:53:07 +0100 Subject: [PATCH 258/737] kcov: pull upstream port to binutils-2.39 --- .../development/tools/analysis/kcov/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 922524ac4d5b..6a0fb74af51f 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , zlib @@ -8,9 +9,7 @@ , elfutils , python3 , libiberty -# TODO: switch back to latest versions when upstream ports -# to binutils-2.39: https://github.com/SimonKagstrom/kcov/issues/381 -, libopcodes_2_38 +, libopcodes , runCommand , gcc , rustc @@ -29,10 +28,20 @@ let sha256 = "sha256-6LoIo2/yMUz8qIpwJVcA3qZjjF+8KEM1MyHuyHsQD38="; }; + patches = [ + # Pull upstream patch for binutils-2/39 support: + # https://github.com/SimonKagstrom/kcov/pull/383 + (fetchpatch { + name = "binutils-2.39.patch"; + url = "https://github.com/SimonKagstrom/kcov/commit/fd1a4fd2f02cee49afd74e427e38c61b89154582.patch"; + hash = "sha256-licQkC8qDg2i6No3j0yKEU6i+Owi4lhrnfGvETkzz7w="; + }) + ]; + preConfigure = "patchShebangs src/bin-to-c-source.py"; nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ curl zlib elfutils libiberty libopcodes_2_38 ]; + buildInputs = [ curl zlib elfutils libiberty libopcodes ]; strictDeps = true; From 1aba4df60dda9cd5041bdc4831e88bef399c2d7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 15:59:46 +0200 Subject: [PATCH 259/737] python3Packages.tzdata: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/tzdata/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index ee8166abb946..089446b8ffea 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -5,6 +5,7 @@ , pytest-subtests , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -17,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-i1NqjsY9wHUTQrOYQZOjEY+Pyir+JXUrubf//TmFUtM="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook pytest-subtests From cc47efce231f4e9131b81b1fe705d58e138d5613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Sep 2022 15:50:08 +0200 Subject: [PATCH 260/737] darwin.xattr: add setuptools --- pkgs/os-specific/darwin/xattr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/xattr/default.nix b/pkgs/os-specific/darwin/xattr/default.nix index 1aa8b49e88aa..a1e3c4914879 100644 --- a/pkgs/os-specific/darwin/xattr/default.nix +++ b/pkgs/os-specific/darwin/xattr/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ ed unifdef + python.pkgs.setuptools ]; makeFlags = [ From f2374557b1c9f13b99ba06ee1f78a019ada8d591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Sep 2022 15:54:57 +0200 Subject: [PATCH 261/737] python3Packages.isort: add setuptools --- pkgs/development/python-modules/isort/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index d21f79b6ba9b..466d51266216 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -2,6 +2,7 @@ , colorama , hypothesis , poetry-core +, setuptools , pylama , pytestCheckHook }: @@ -20,6 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; checkInputs = [ From e7ff7d64032aa147eac92a6b6ffdbd5238c1f6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Sep 2022 19:59:17 +0200 Subject: [PATCH 262/737] fixup! glslang: fixup paths in .pc files I really should have inspected the resulting files. --- pkgs/development/compilers/glslang/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 17ff68e892a2..1dd303170936 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # Fix the paths in .pc, even though it's unclear if these .pc are really useful. postFixup = '' substituteInPlace "$out"/lib/pkgconfig/SPIRV-Tools{,-shared}.pc \ - --replace '=''${prefix}//' '=' + --replace '=''${prefix}//' '=/' ''; meta = with lib; { From 038edcf9a5c71a7639c0cac45ee4d4f7e86a50f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Sep 2022 19:56:05 +0200 Subject: [PATCH 263/737] shaderc: fixup paths in .pc files --- pkgs/development/compilers/shaderc/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index ae9d0f8810e6..082c480d6e77 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -50,6 +50,13 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; + # Fix the paths in .pc, even though it's unclear if all these .pc are really useful. + postFixup = '' + substituteInPlace "$dev"/lib/pkgconfig/*.pc \ + --replace '=''${prefix}//' '=/' \ + --replace "$dev/$dev/" "$dev/" + ''; + meta = with lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation"; From b97580ffa2409a11a9a51027d0906b283f0402ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 04:28:50 +0200 Subject: [PATCH 264/737] gixy: fix overriden pyparsing by passing setuptools --- pkgs/tools/admin/gixy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 03571ac7cf75..bd216050b200 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -11,6 +11,9 @@ let rev = "pyparsing_${version}"; sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; }; + nativeBuildInputs = [ + super.setuptools + ]; }); }; }; From 3acd57825e2f4f887318d3e20a7759e7c571065a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Sep 2022 14:19:00 -0700 Subject: [PATCH 265/737] python3Packages.javaproperties: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/javaproperties/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index e3eee7d72e9b..6b2bac8ad65f 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub +, setuptools , six , pytest , python-dateutil @@ -16,6 +17,7 @@ buildPythonPackage rec { sha256 = "16rcdw5gd4a21v2xb1j166lc9z2dqcv68gqvk5mvpnm0x6nwadgp"; }; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ six ]; checkInputs = [ python-dateutil pytest ]; From dcd21563ad39bfce978b00546f8fb5fa8a67b7dd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Sep 2022 14:31:31 -0700 Subject: [PATCH 266/737] python3Packages.pytz-deprecation-shim: add setuptools to nativeBuildInputs --- .../python-modules/pytz-deprecation-shim/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix index eccf8399ee29..e438936f7e49 100644 --- a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix +++ b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix @@ -5,6 +5,7 @@ , pythonOlder , backports-zoneinfo , python-dateutil +, setuptools , tzdata , hypothesis , pytestCheckHook @@ -23,6 +24,8 @@ buildPythonPackage rec { sha256 = "af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b87445a59d"; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = (lib.optionals (pythonAtLeast "3.6" && pythonOlder "3.9") [ backports-zoneinfo ]) ++ (lib.optionals (pythonOlder "3.6") [ From f3b298708e2f18dd06daf4ff6567dd7df6ed15f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 11 Sep 2022 23:16:25 +0200 Subject: [PATCH 267/737] python3Packages.setuptools: 63.2.0 -> 65.3.0 --- .../python-modules/setuptools/default.nix | 16 +++------- .../setuptools/setuptools-distutils-C++.patch | 30 +++++++++---------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 2d3c06d602f1..9fab8747b67f 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , python , bootstrapped-pip , lib @@ -11,7 +10,7 @@ let pname = "setuptools"; - version = "63.2.0"; + version = "65.3.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -20,22 +19,14 @@ let src = fetchFromGitHub { owner = "pypa"; repo = pname; - rev = "v${version}"; - hash = "sha256-GyQjc0XulUxl3Btpj7Q6KHTpd1FDZnXCYviYjjgK7tY="; + rev = "refs/tags/v${version}"; + hash = "sha256-LPguGVWvwEMZpJFuXWLVFzIlzw+/QSMjVi2oYh0cI0s="; name = "${pname}-${version}-source"; }; patches = [ ./tag-date.patch ./setuptools-distutils-C++.patch - # Fix cross compilation of extension modules - # https://github.com/pypa/distutils/pull/173 - (fetchpatch { - url = "https://github.com/pypa/distutils/commit/22b9bcf2e2d2a66f7dc96661312972e2f6bd9e01.patch"; - hash = "sha256-IVb1LLgLIHO6HPn2911uksrLB1jG0MyQetdxkq5wcG4="; - stripLen = 2; - extraPrefix = "setuptools/_distutils/"; - }) ]; buildPhase = '' @@ -86,5 +77,6 @@ in buildPythonPackage rec { license = with licenses; [ psfl zpl20 ]; platforms = python.meta.platforms; priority = 10; + maintainers = teams.python.members; }; } diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch index ae844ecd2d3f..1dfaf8c6d5f7 100644 --- a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch +++ b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch @@ -1,8 +1,8 @@ diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py -index 445e2e51..2fdbdcca 100644 +index 2c4da5b5..e2cd8803 100644 --- a/setuptools/_distutils/cygwinccompiler.py +++ b/setuptools/_distutils/cygwinccompiler.py -@@ -131,14 +131,19 @@ class CygwinCCompiler(UnixCCompiler): +@@ -97,14 +97,19 @@ class CygwinCCompiler(UnixCCompiler): self.cxx = os.environ.get('CXX', 'g++') self.linker_dll = self.cc @@ -15,14 +15,14 @@ index 445e2e51..2fdbdcca 100644 compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, + compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx, linker_exe='%s -mcygwin' % self.cc, - linker_so=('%s -mcygwin %s' % (self.linker_dll, shared_option)), + linker_so=('{} -mcygwin {}'.format(self.linker_dll, shared_option)), + linker_exe_cxx='%s -mcygwin' % self.cxx, + linker_so_cxx=('%s -mcygwin %s' % + (self.linker_dll_cxx, shared_option)), ) # Include the appropriate MSVC runtime library if Python was built -@@ -170,9 +175,12 @@ class CygwinCCompiler(UnixCCompiler): +@@ -136,9 +141,12 @@ class CygwinCCompiler(UnixCCompiler): raise CompileError(msg) else: # for other files use the C-compiler try: @@ -38,24 +38,24 @@ index 445e2e51..2fdbdcca 100644 except DistutilsExecError as msg: raise CompileError(msg) -@@ -323,9 +331,12 @@ class Mingw32CCompiler(CygwinCCompiler): +@@ -275,9 +283,12 @@ class Mingw32CCompiler(CygwinCCompiler): self.set_executables( compiler='%s -O -Wall' % self.cc, compiler_so='%s -mdll -O -Wall' % self.cc, + compiler_so_cxx='%s -mdll -O -Wall' % self.cxx, compiler_cxx='%s -O -Wall' % self.cxx, linker_exe='%s' % self.cc, - linker_so='%s %s' % (self.linker_dll, shared_option), + linker_so='{} {}'.format(self.linker_dll, shared_option), + linker_exe_cxx='%s' % self.cxx, + linker_so_cxx='%s %s' % (self.linker_dll_cxx, shared_option) ) # Maybe we should also append -mthreads, but then the finished diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py -index e41d51ee..f7ded14b 100644 +index 3dd8185f..cb374a94 100644 --- a/setuptools/_distutils/sysconfig.py +++ b/setuptools/_distutils/sysconfig.py -@@ -280,6 +280,7 @@ def customize_compiler(compiler): +@@ -289,6 +289,7 @@ def customize_compiler(compiler): # noqa: C901 cflags, ccshared, ldshared, @@ -63,7 +63,7 @@ index e41d51ee..f7ded14b 100644 shlib_suffix, ar, ar_flags, -@@ -289,11 +290,14 @@ def customize_compiler(compiler): +@@ -298,11 +299,14 @@ def customize_compiler(compiler): # noqa: C901 'CFLAGS', 'CCSHARED', 'LDSHARED', @@ -78,7 +78,7 @@ index e41d51ee..f7ded14b 100644 if 'CC' in os.environ: newcc = os.environ['CC'] if 'LDSHARED' not in os.environ and ldshared.startswith(cc): -@@ -305,19 +309,27 @@ def customize_compiler(compiler): +@@ -314,19 +318,27 @@ def customize_compiler(compiler): # noqa: C901 cxx = os.environ['CXX'] if 'LDSHARED' in os.environ: ldshared = os.environ['LDSHARED'] @@ -107,7 +107,7 @@ index e41d51ee..f7ded14b 100644 if 'AR' in os.environ: ar = os.environ['AR'] if 'ARFLAGS' in os.environ: -@@ -326,13 +338,17 @@ def customize_compiler(compiler): +@@ -335,13 +347,17 @@ def customize_compiler(compiler): # noqa: C901 archiver = ar + ' ' + ar_flags cc_cmd = cc + ' ' + cflags @@ -127,10 +127,10 @@ index e41d51ee..f7ded14b 100644 ) diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py -index 4be74fdf..66f95aef 100644 +index 4ab771a4..17abac83 100644 --- a/setuptools/_distutils/unixccompiler.py +++ b/setuptools/_distutils/unixccompiler.py -@@ -112,9 +112,12 @@ class UnixCCompiler(CCompiler): +@@ -116,9 +116,12 @@ class UnixCCompiler(CCompiler): 'preprocessor': None, 'compiler': ["cc"], 'compiler_so': ["cc"], @@ -144,7 +144,7 @@ index 4be74fdf..66f95aef 100644 'archiver': ["ar", "-cr"], 'ranlib': None, } -@@ -174,8 +177,13 @@ class UnixCCompiler(CCompiler): +@@ -182,8 +185,13 @@ class UnixCCompiler(CCompiler): def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs) @@ -159,7 +159,7 @@ index 4be74fdf..66f95aef 100644 except DistutilsExecError as msg: raise CompileError(msg) -@@ -243,7 +251,8 @@ class UnixCCompiler(CCompiler): +@@ -251,7 +259,8 @@ class UnixCCompiler(CCompiler): # building an executable or linker_so (with shared options) # when building a shared library. building_exe = target_desc == CCompiler.EXECUTABLE From 2686f7782e78c5d22cfea56fbe9f9be7d392f45a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Sep 2022 03:01:25 +0200 Subject: [PATCH 268/737] python3Packages.pip: 22.1.2 -> 22.2.2 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 9956b6038d14..1287ec7017e3 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "22.1.2"; + version = "22.2.2"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-Id/oz0e59WWpafR1cIYIogvOgxKGKVqrwNON32BU9zU="; + sha256 = "sha256-SLjmxFUFmvgy8E8kxfc6lxxCRo+GN4L77pqkWkRR8aE="; name = "${pname}-${version}-source"; }; From a89d7bfe17b5c39f62c6304e6256f9b8a48c9159 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Sep 2022 03:37:03 +0200 Subject: [PATCH 269/737] python3Packages.poetry-core: 1.0.8 -> 1.1.0 --- .../python-modules/poetry-core/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index ee9340ef9d5a..9c61c527c98a 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -1,27 +1,30 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, build , git , importlib-metadata , intreehooks -, pathlib2 , pep517 , pytest-mock , pytestCheckHook , setuptools , tomlkit -, typing ? null , virtualenv }: buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.8"; + version = "1.1.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "sha256-cs9SMGD9RdW8Wx/IAMq6gkOUBsney5r19hyGva98grk="; + sha256 = "sha256-WUgBrO9h1E7N2SVFD47UPv39DMx1yQviV5tcNPmR+/g="; }; postPatch = lib.optionalString (pythonOlder "3.8") '' @@ -37,12 +40,10 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata - ] ++ lib.optionals isPy27 [ - pathlib2 - typing ]; checkInputs = [ + build git pep517 pytest-mock From 0fcb93d85a12fe5ba86a47ee44e0f7dafe7ac0e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Sep 2022 02:58:52 +0200 Subject: [PATCH 270/737] python3Packages.pytest: 7.1.2 -> 7.1.3 https://github.com/pytest-dev/pytest/releases/tag/7.1.3 --- pkgs/development/python-modules/pytest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 1523326de0bf..7690b84fd3fa 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.1.2"; + version = "7.1.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oGoEJUU4ZKJwvEXnH3gzMKdCje+0Iw+15qcx/eBuzUU="; + sha256 = "sha256-TzZf7C3/nBFi+DTZ8YrxuhMGLbDHCL97lG+KXHYYDDk="; }; outputs = [ @@ -69,7 +69,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/7.1.2/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.1.3/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" From 66c6242371a9fdfe686ebb32b566fd57fa76d5b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Sep 2022 03:33:43 +0200 Subject: [PATCH 271/737] python3Packages.hypothesis: 6.50.1 -> 6.54.5 --- 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 1e8afe9e543a..59c758b25aa6 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.50.1"; + version = "6.54.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-G7OXlYaCPBfdXtmX/f/6i2LRCZZk5yvzhLc6sissuRo="; + hash = "sha256-mr8ctmAzRgWNVpW+PZlOhaQ0l28P0U8PxvjoVjfHX78="; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From c6d042ea3692f184f81b10e6d743adc343e03d52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Sep 2022 03:36:45 +0200 Subject: [PATCH 272/737] python3Packages.exceptiongroup: 1.0.0rc8 -> 1.0.0rc9 --- pkgs/development/python-modules/exceptiongroup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 5fe9e716ddb6..1475b44e0016 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.0.0rc8"; + version = "1.0.0rc9"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aZDCTwa40zyAZc/kPl6KS/o4TgNYvgNq+cxgtjIb0Ro="; + hash = "sha256-kIakoh75sxxyGBx3wECgdLoIie5Wp7KJ/wr7DZdlX5Y="; }; nativeBuildInputs = [ From d7977ef9e9f3c66e9c025af48db8d680e3bab62a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Sep 2022 13:19:17 +0200 Subject: [PATCH 273/737] python3Packages.numpy: 1.23.1 -> 1.23.3 https://github.com/numpy/numpy/releases/tag/v1.23.2 https://github.com/numpy/numpy/releases/tag/v1.23.3 --- 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 86bf008adc97..7b4c5178d66b 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -45,7 +45,7 @@ in buildPythonPackage rec { # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so # build both to verify they don't break. # https://github.com/scipy/scipy/issues/15414 - version = "1.23.1"; + version = "1.23.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -53,7 +53,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-10jvNJv+8uEZS1naN+1aKcGeqNfmNCAZkhuiuk/YtiQ="; + hash = "sha256-Ub9JwM0dUr4KJAqmbzRYr8S5XYmT0tBPDZH6YMEK9s0="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From 7f310b505ccd7a41f2549bf40a746357a8f5a972 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Sep 2022 13:28:15 +0200 Subject: [PATCH 274/737] python3Packages.orjson: 3.7.12 -> 3.8.0 https://github.com/ijl/orjson/releases/tag/3.8.0 --- pkgs/development/python-modules/orjson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 599efa2f50a2..d649d6ccbbac 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,20 +16,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.7.12"; + version = "3.8.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - hash = "sha256-ImFISSn4FZqUgxQhVbyyTsC1xNpBoJhb/+BvvQkv5gE="; + hash = "sha256-P1n0r5181Wt4tml2SKMI7pDNh2YakCp1I+cvQM6RRWg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-uQJtATSCYSdVBeQocmiGapeAIYL+iYBGLgL8YjUn/3U="; + hash = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc="; }; format = "pyproject"; From eed7179cd728f3380081925b87fa5236c22a09a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Sep 2022 13:32:36 +0200 Subject: [PATCH 275/737] python3Packages.cryptography: 37.0.4 -> 38.0.1 https://cryptography.io/en/latest/changelog/#v38-0-1 --- pkgs/development/python-modules/cryptography/default.nix | 6 +++--- pkgs/development/python-modules/cryptography/vectors.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 873d1b99356a..c80e9a119941 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -27,19 +27,19 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "37.0.4"; # Also update the hash in vectors.nix + version = "38.0.1"; # Also update the hash in vectors.nix disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Y/nBfA4kdMy+vJMCzi8HtVs7P8shHe0YpC1XZPXBCoI="; + hash = "sha256-HbPYB6FJMfoxf5ZDVpXZ7Dhr57hLYYzGHPpdCLCuM9c="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-f8r6QclTwkgK20CNe9i65ZOqvSUeDc4Emv6BFBhh1hI="; + hash = "sha256-o8l13fnfEUvUdDasq3LxSPArozRHKVsZfQg9DNR6M6Q="; }; cargoRoot = "src/rust"; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 3059d01a4091..7f33c6cb84f3 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-WmFABRDiiTelZUtAxupOPlk8Wq8MIIHFuRLw58+IPqg="; + hash = "sha256-BDH9EHwfutA3dwSnBRlFs7ORFp/dxPb6C9TtxrbiNd0="; }; # No tests included From 3038f1715dbfa21b5b786ccc0083bec9fd3acec0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 03:44:01 +0200 Subject: [PATCH 276/737] python3Packages.poetry-plugin-export: init at 1.0.6 --- .../poetry-plugin-export/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/poetry-plugin-export/default.nix diff --git a/pkgs/development/python-modules/poetry-plugin-export/default.nix b/pkgs/development/python-modules/poetry-plugin-export/default.nix new file mode 100644 index 000000000000..bd953fb61278 --- /dev/null +++ b/pkgs/development/python-modules/poetry-plugin-export/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +}: + +buildPythonPackage rec { + pname = "poetry-plugin-export"; + version = "1.0.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-wZbXIAGKTvbcYN1Sx9MCPVIiHxHzdpbLOVShHBEWUVU="; + }; + + postPatch = '' + sed -i '/poetry =/d' pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + # infinite recursion with poetry + doCheck = false; + pythonImportsCheck = []; + + meta = with lib; { + description = "Poetry plugin to export the dependencies to various formats"; + license = licenses.mit; + homepage = "https://github.com/python-poetry/poetry-plugin-export"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9071957820bd..dd6534158ec3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7108,6 +7108,8 @@ in { poetry-dynamic-versioning = callPackage ../development/python-modules/poetry-dynamic-versioning { }; + poetry-plugin-export = callPackage ../development/python-modules/poetry-plugin-export { }; + poetry-semver = callPackage ../development/python-modules/poetry-semver { }; poetry2conda = callPackage ../development/python-modules/poetry2conda { }; From abebdcdd59f0d18104ed15f7397625835994e1d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 04:10:54 +0200 Subject: [PATCH 277/737] python3Packages.cleo: 0.8.1 -> 1.0.0a5 --- .../python-modules/cleo/default.nix | 53 ++++++++++++++----- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index e79983b1bb29..e81ff175d533 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -1,26 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi -, clikit }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, crashtest +, poetry-core +, pylev +, pytest-mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "cleo"; - version = "0.8.1"; + version = "1.0.0a5"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f"; + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-FtGGIRF/tA2OWEjkCFwa1HHg6VY+5E5mAiJC/zjUC1g="; }; - propagatedBuildInputs = [ - clikit + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'crashtest = "^0.3.1"' 'crashtest = "*"' + ''; + + nativeBuildInputs = [ + poetry-core ]; - # The Pypi tarball doesn't include tests, and the GitHub source isn't - # buildable until we bootstrap poetry, see - # https://github.com/NixOS/nixpkgs/pull/53599#discussion_r245855665 - doCheck = false; + propagatedBuildInputs = [ + crashtest + pylev + ]; + + pythonImportsCheck = [ + "cleo" + "cleo.application" + "cleo.commands.command" + "cleo.helpers" + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; meta = with lib; { - homepage = "https://github.com/sdispater/cleo"; + homepage = "https://github.com/python-poetry/cleo"; description = "Allows you to create beautiful and testable command-line interfaces"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; From eeaaa4536ebb9347d9cca4ab53c542fd89060a9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 04:12:47 +0200 Subject: [PATCH 278/737] python3Packages.shellingham: 1.4.0 -> 1.5.0 https://github.com/sarugaku/shellingham/releases/tag/1.5.0 --- pkgs/development/python-modules/shellingham/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index a072f16b23d3..341d3f3c32e3 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.4.0"; + version = "1.5.0"; format = "pyproject"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sarugaku"; repo = pname; - rev = version; - sha256 = "0f686ym3ywjffis5jfqkhsshjgii64060hajysczflhffrjn9jcp"; + rev = "refs/tags/${version}"; + hash = "sha256-CIO5mBFph+5cO7U4NRjMRtQCTbopJDEGlAGBkxjieFw="; }; nativeBuildInputs = [ From b465fcfef3fdbace3f6e3d5a27a4b5833a71b7fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 04:31:28 +0200 Subject: [PATCH 279/737] python3Packages.cython: 0.29.30 -> 0.29.32 --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 15ddfbe9f7a5..4a6c14b5709b 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -24,12 +24,12 @@ let in buildPythonPackage rec { pname = "cython"; - version = "0.29.30"; + version = "0.29.32"; src = fetchPypi { pname = "Cython"; inherit version; - sha256 = "sha256-IjW2Laj+b6i5lCLI5YPy+5XhQ4Z9M3tcdeS5oahl+eM="; + hash = "sha256-hzPPR1i3kwTypOOev6xekjQbzke8zrJsElQ5iy+MGvc="; }; nativeBuildInputs = [ From f1ebf7751e2ab62dfea5cdb7f51fc9fe06111c06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 13:51:32 +0200 Subject: [PATCH 280/737] python3Packages.pandas: 1.4.3 -> 1.4.4 https://github.com/pandas-dev/pandas/releases/tag/v1.4.4 --- pkgs/development/python-modules/pandas/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2c4f20478339..9125b96a014c 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , python +, pythonOlder , cython , numpy , python-dateutil @@ -27,12 +28,13 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.4.3"; + version = "1.4.4"; format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L/d4hGjnWRdXTwgM1GgbJ+GnvzZGH+lotJqHtaVNAHw="; + hash = "sha256-q2wNc4YXtnUYPl8o2zK1FItpStm7oKQMPqJtlrQx22c="; }; nativeBuildInputs = [ cython ]; From f63960a83ef4acf8ab01785bd04bd7372cca5998 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 14:32:13 +0200 Subject: [PATCH 281/737] python3Packages.clevercsv: 0.7.1 -> 0.7.4 https://github.com/alan-turing-institute/CleverCSV/blob/v0.7.4/CHANGELOG.md\#version-074 --- .../python-modules/clevercsv/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index 5384fb01c5cb..a144a51e2ca7 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -9,19 +9,19 @@ , regex , tabview , python -, unittestCheckHook +, pytestCheckHook }: buildPythonPackage rec { pname = "clevercsv"; - version = "0.7.1"; + version = "0.7.4"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "v${version}"; - sha256 = "sha256-ynS3G2ZcEqVlC2d6n5ZQ1Em5lh/dWESj9jEO8C4WzZQ="; + sha256 = "sha256-2OLvVJbqV/wR+Quq0cAlR/vCUe1/Km/nALwfoHD9B+U="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { tabview ]; - checkInputs = [ unittestCheckHook ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "clevercsv" @@ -48,7 +48,14 @@ buildPythonPackage rec { ''; # their ci only runs unit tests, there are also integration and fuzzing tests - unittestFlagsArray = [ "-v" "-f" "-s" "./tests/test_unit" ]; + pytestFlagsArray = [ + "./tests/test_unit" + ]; + + disabledTestPaths = [ + # ModuleNotFoundError: No module named 'wilderness' + "tests/test_unit/test_console.py" + ]; meta = with lib; { description = "CleverCSV is a Python package for handling messy CSV files"; From bb1864a88a72058773449d909a5738c4b77901c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 14:32:59 +0200 Subject: [PATCH 282/737] python3Packages.dulwich: 0.20.45 -> 0.20.46 - Move from implicit testing to pytestCheckHook. - Inherit gnupg instead of passing pkgs around - Disable three failing tests - Disable test paths where test inputs are missing from the package --- .../python-modules/dulwich/default.nix | 24 +++++++++++++++---- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index d95fef43fad0..412009cc637a 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -8,16 +8,17 @@ , geventhttpclient , git , glibcLocales +, gnupg , gpgme , mock -, pkgs , urllib3 , paramiko +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { - version = "0.20.45"; + version = "0.20.46"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-cHEN2coqRCGQx+UGiS2wdMMYrHYuIh91KbjONIAgQbc="; + hash = "sha256-Tw6I//9dsVI9k9kvFSX+X6FhMY/7qtUCwbmzvnoGcXI="; }; LC_ALL = "en_US.UTF-8"; @@ -42,13 +43,28 @@ buildPythonPackage rec { git glibcLocales gpgme - pkgs.gnupg + gnupg mock paramiko + pytestCheckHook ]; doCheck = !stdenv.isDarwin; + disabledTests = [ + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpsqwlbpd1/\xc0' + "test_no_decode_encode" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpwmtfyvo2/refs.git/refs/heads/\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01' + "test_cyrillic" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0' + "test_commit_no_encode_decode" + ]; + + disabledTestPaths = [ + # missing test inputs + "dulwich/contrib/test_swift_smoke.py" + ]; + pythonImportsCheck = [ "dulwich" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd6534158ec3..3e732e442297 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2816,7 +2816,9 @@ in { dugong = callPackage ../development/python-modules/dugong { }; - dulwich = callPackage ../development/python-modules/dulwich { }; + dulwich = callPackage ../development/python-modules/dulwich { + inherit (pkgs) gnupg; + }; dunamai = callPackage ../development/python-modules/dunamai { }; From f2a71e956b04db5cd94fff527c4bb780ee8dde8a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 15:21:50 +0200 Subject: [PATCH 283/737] python3Packages.poetry: 1.1.14 -> 1.2.0 https://github.com/python-poetry/poetry/releases/tag/1.2.0 --- .../python-modules/poetry/default.nix | 73 +++++++++---------- 1 file changed, 34 insertions(+), 39 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 22de7d71bcc8..07dcb96f4074 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -1,99 +1,104 @@ { lib +, backports-cached-property , buildPythonPackage , cachecontrol , cachy , cleo -, clikit , crashtest , dataclasses -, entrypoints +, deepdiff +, dulwich , fetchFromGitHub -, fetchpatch +, flatdict , html5lib , httpretty , importlib-metadata +, installShellFiles , intreehooks +, jsonschema , keyring , lockfile , packaging , pexpect , pkginfo +, platformdirs , poetry-core +, poetry-plugin-export , pytest-mock +, pytest-xdist , pytestCheckHook , pythonAtLeast , pythonOlder , requests , requests-toolbelt , shellingham +, stdenv , tomlkit +, urllib3 , virtualenv +, xattr }: buildPythonPackage rec { pname = "poetry"; - version = "1.1.14"; + version = "1.2.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; - rev = version; - sha256 = "sha256-n/GZOUoIMxWlULDqOe59Gt7Hz/+Mc4QcZT+1+HtQovs="; + rev = "refs/tags/${version}"; + hash = "sha256-+Nsg7oPh9tAHEKt1R9C+nY9UPy+9vbf/+A6vQWgTi+4="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'importlib-metadata = {version = "^1.6.0", python = "<3.8"}' \ - 'importlib-metadata = {version = ">=1.6", python = "<3.8"}' \ - --replace 'version = "^21.2.0"' 'version = ">=21.2"' \ - --replace 'packaging = "^20.4"' 'packaging = "*"' - ''; - nativeBuildInputs = [ - intreehooks + installShellFiles ]; propagatedBuildInputs = [ cachecontrol cachy cleo - clikit crashtest - entrypoints + dulwich html5lib + jsonschema keyring - lockfile packaging pexpect pkginfo + platformdirs poetry-core + poetry-plugin-export requests requests-toolbelt shellingham tomlkit virtualenv - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (stdenv.isDarwin) [ + xattr + ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + backports-cached-property + ] ++ cachecontrol.optional-dependencies.filecache; postInstall = '' - mkdir -p "$out/share/bash-completion/completions" - "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry" - mkdir -p "$out/share/zsh/vendor-completions" - "$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry" - mkdir -p "$out/share/fish/vendor_completions.d" - "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" + installShellCompletion --cmd poetry \ + --bash <($out/bin/poetry completions bash) \ + --fish <($out/bin/poetry completions fish) \ + --zsh <($out/bin/poetry completions zsh) \ ''; checkInputs = [ + deepdiff + flatdict pytestCheckHook httpretty pytest-mock + pytest-xdist ]; preCheck = '' @@ -119,16 +124,6 @@ buildPythonPackage rec { "test_info_setup_complex_pep517_error" ]; - patches = [ - # The following patch addresses a minor incompatibility with - # pytest-mock. This is addressed upstream in - # https://github.com/python-poetry/poetry/pull/3457 - (fetchpatch { - url = "https://github.com/python-poetry/poetry/commit/8ddceb7c52b3b1f35412479707fa790e5d60e691.diff"; - sha256 = "yHjFb9xJBLFOqkOZaJolKviTdtST9PMFwH9n8ud2Y+U="; - }) - ]; - # Allow for package to use pep420's native namespaces pythonNamespaces = [ "poetry" From 3b269688f14f4b6f154fc53cbb2a5daff9a40f6a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 15:25:05 +0200 Subject: [PATCH 284/737] python3Packages.cython_3: 3.0.0a10 -> 3.0.0a11 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e732e442297..38401379a6cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2197,10 +2197,10 @@ in { cython = callPackage ../development/python-modules/Cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.0a10"; + version = "3.0.0a11"; src = old.src.override { inherit version; - sha256 = "342e95121a3d1a67cbcf7b340391eb40cc5ce3d2a79d7873e005e8783353d89d"; + hash = "sha256-5GckkfsxVGuau2Nnf2OOc4CF3JMhOYFwlW72+/wOFyY="; }; patches = [ ]; }); From d4c5945064970dd51601bd73c74b7b3be811d4f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 18:29:39 +0200 Subject: [PATCH 285/737] python3Packages.sphinxcontrib-asyncio: init at 0.3.0 --- .../sphinxcontrib-asyncio/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix new file mode 100644 index 000000000000..2da9c2d92f6a --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-asyncio"; + version = "0.3.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-mf0m4P5+34ckSnGpnDFv0Mm1CFbCUZrMqSfr50EAci4="; + }; + + propagatedBuildInputs = [ + sphinx + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "sphinxcontrib.asyncio" + ]; + + meta = with lib; { + description = "Sphinx extension to add asyncio-specific markups"; + homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38401379a6cc..341ddd2d5dfc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10371,6 +10371,8 @@ in { sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; + sphinxcontrib-asyncio = callPackage ../development/python-modules/sphinxcontrib-asyncio { }; + sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; sphinxcontrib-bayesnet = callPackage ../development/python-modules/sphinxcontrib-bayesnet { }; From 22217650964394fa87c36d2845386a34c989de39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 21:20:59 +0200 Subject: [PATCH 286/737] python3Packages.dbus-fast: init at 1.4.0 --- .../python-modules/dbus-fast/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/dbus-fast/default.nix diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix new file mode 100644 index 000000000000..58cde9e14e05 --- /dev/null +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dbus-fast"; + version = "1.4.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-vbsigiUSGeetY+1MEeQ/cO3Oj8Ah0Yg9BUPo2Gc06KU="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=dbus_fast --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ + "dbus_fast" + "dbus_fast.aio" + "dbus_fast.service" + "dbus_fast.message" + ]; + + # requires a running dbus daemon + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v${version}"; + description = "A faster version of dbus-next"; + homepage = "https://github.com/Bluetooth-Devices/dbus-fast"; + license = licenses.mit; + maintainers = lib.teams.home-assistant.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 341ddd2d5dfc..47d42b98953a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2301,6 +2301,8 @@ in { dbus-client-gen = callPackage ../development/python-modules/dbus-client-gen { }; + dbus-fast = callPackage ../development/python-modules/dbus-fast { }; + dbus-next = callPackage ../development/python-modules/dbus-next { }; dbus-python = callPackage ../development/python-modules/dbus { From ee0ba2e1d8f20658af21ba79358da0955efbd580 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 21:43:27 +0200 Subject: [PATCH 287/737] python3Packages.bleak: 0.16.0 -> 0.17.0 https://github.com/hbldh/bleak/releases/tag/v0.17.0 --- .../python-modules/bleak/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 74b199d21e44..283cc88ab965 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -2,33 +2,35 @@ , async-timeout , bluez , buildPythonPackage -, dbus-next -, fetchPypi +, dbus-fast +, fetchFromGitHub +, poetry-core , pytestCheckHook , pythonOlder , typing-extensions -, setuptools }: buildPythonPackage rec { pname = "bleak"; - version = "0.16.0"; + version = "0.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pUn0PjxdjeRkxytLkFU0w/R4F0bpgV7NUxtyVd4uGcc="; + src = fetchFromGitHub { + owner = "hbldh"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-AnH23AWrLw2jq6gSbx9VoGD8QXeCH5dN7FSVVdj4b3w="; }; nativeBuildInputs = [ - setuptools + poetry-core ]; propagatedBuildInputs = [ async-timeout - dbus-next + dbus-fast typing-extensions ]; From 7e7a2ddd218b0c30e1a767a70520489b996122b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 21:52:12 +0200 Subject: [PATCH 288/737] python3Packages.bleak-retry-connector: 1.11.0 -> 1.16.0 Apparently we skipped a few releases here and there. https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.11.1 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.12.0 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.12.1 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.12.2 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.12.3 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.13.0 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.13.1 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.13.2 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.14.0 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.15.0 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.15.1 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v1.16.0 --- .../bleak-retry-connector/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index d62167fa1051..6a0ee020e6d4 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -1,6 +1,7 @@ { lib , async-timeout , bleak +, dbus-fast , buildPythonPackage , fetchFromGitHub , poetry-core @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "1.11.0"; + version = "1.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,10 +20,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-I9nXLzy+OmfaQJBTeBSL/yhhrdNnldd42d5QwRDK9Q4="; + rev = "refs/tags/v${version}"; + hash = "sha256-IDfamUZB9WJH+ybZ0ULBSEd1koMHTZ1/DaFTf6oviM8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=bleak_retry_connector --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -30,6 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout bleak + dbus-fast ]; checkInputs = [ @@ -37,10 +44,12 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bleak_retry_connector --cov-report=term-missing:skip-covered" "" - ''; + disabledTests = [ + # broken mocking + "test_establish_connection_can_cache_services_services_missing" + "test_establish_connection_with_dangerous_use_cached_services" + "test_establish_connection_without_dangerous_use_cached_services" + ]; pythonImportsCheck = [ "bleak_retry_connector" From 91f513601decbbc26d307dc3aacfaf50f4cd3165 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 21:57:53 +0200 Subject: [PATCH 289/737] python3Packages.pyswitchbot: 0.18.27 -> 0.19.8 --- pkgs/development/python-modules/pyswitchbot/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 24f7c6bde6d9..497b516a6636 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.18.27"; + version = "0.19.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-80GzOKZRsjWHLEGhNrYIWdUMiel5ztcobwRhrlyjzpY="; + hash = "sha256-1vzHd6ouWZrc951a5s0OsjeMbEluP/kS7LDiZ3YOUqk="; }; propagatedBuildInputs = [ @@ -30,6 +30,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # mismatch in expected data structure + "test_parse_advertisement_data_curtain" + ]; + pythonImportsCheck = [ "switchbot" ]; From ea569071ad80a9ab679d995621e9e1a6273ce7fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 22:55:54 +0200 Subject: [PATCH 290/737] python3Packages.scipy: 1.8.1 -> 1.9.1 https://github.com/scipy/scipy/releases/tag/v1.9.1 https://github.com/scipy/scipy/releases/tag/v1.9.0 --- 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 e69506f6746e..c1d13ca73501 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.8.1"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nj+xsOiW8UqFqpoo1fdV2q7rVMiXt0bfelXMsCs0DzM="; + sha256 = "sha256-JtKMRokA5tX9s30oEqtG2wzNIsY7qglQV4cfqjpJi8k="; }; nativeBuildInputs = [ cython gfortran pythran ]; From a26911d0cba282214e57177afad9c6efe6c6a047 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:29:34 +0200 Subject: [PATCH 291/737] python3Packages.uvloop: 0.16.0 -> 0.17.0 https://github.com/MagicStack/uvloop/releases/tag/v0.17.0 --- .../python-modules/uvloop/default.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index da17c78a5eb9..c7b1d8103dd2 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -3,10 +3,12 @@ , buildPythonPackage , pythonOlder , fetchPypi +, cython , libuv , CoreServices , ApplicationServices - # Check Inputs + +# Check Inputs , aiohttp , psutil , pyopenssl @@ -15,14 +17,19 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.16.0"; + version = "0.17.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"; + hash = "sha256-Dd9rr5zxGhoixxSH858Vss9461vefltF+7meip2RueE="; }; + nativeBuildInputs = [ + cython + ]; + buildInputs = [ libuv ] ++ lib.optionals stdenv.isDarwin [ @@ -32,9 +39,10 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; checkInputs = [ - aiohttp pytestCheckHook psutil + ] ++ lib.optionals (pythonOlder "3.11") [ + aiohttp ]; LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; @@ -46,16 +54,21 @@ buildPythonPackage rec { "--strict" "--tb=native" # Depend on pyopenssl - "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" - "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" + "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" + "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" # test gets stuck in epoll_pwait on hydras aarch64 builders # https://github.com/MagicStack/uvloop/issues/412 - "--deselect tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" + "--deselect=tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" + # Tries to import cythonized file for which the .pyx file is not shipped via PyPi + "--deselect=tests/test_libuv_api.py::Test_UV_libuv::test_libuv_get_loop_t_ptr" + # Tries to run "env", but fails to find it + "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2" + "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Flaky test: https://github.com/MagicStack/uvloop/issues/412 - "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" + "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 - "--deselect tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" + "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" ]; disabledTestPaths = [ From 9623e1d07a64c5ee2bbca7c1ef8ef6283ed05262 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:00 +0200 Subject: [PATCH 292/737] python3Packages.absl-py: 1.1.0 -> 1.2.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 402fab32f55a..e2facc919347 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 = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OqOfiYMpwhVv9SXfppznCeQtd6qxi/SRdxnW8mCqagg="; + sha256 = "sha256-9WiAmTjEmrvaiYJiI8mStjCv0jxjgWCteEDP40dxDZc="; }; propagatedBuildInputs = [ From 665b17847a0dba1c9d2fd4ea9aeec46fc7ccbd1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:00 +0200 Subject: [PATCH 293/737] python3Packages.aeppl: 0.0.33 -> 0.0.35 --- pkgs/development/python-modules/aeppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index 73c2da783d58..2edf88c4cf4a 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aeppl"; - version = "0.0.33"; + version = "0.0.35"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-P4QgEt/QfIeCx/wpaCncXtjrDM2uiOIuObxPlTtn1CY="; + hash = "sha256-HUcLa/9fTUBJYszo1SiG08t7DQiNSd8EsINkJpAeLsY="; }; propagatedBuildInputs = [ From feeeab92637e96e15ab0091709fa5462ff89051b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:00 +0200 Subject: [PATCH 294/737] python3Packages.aesara: 2.7.9 -> 2.8.4 --- pkgs/development/python-modules/aesara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 5d91bc4de885..d4f3c1160517 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.7.9"; + version = "2.8.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-s7qqFSY4teL2uiGg6CkpPtr7lNNAj61nCn83Zr7/JaQ="; + hash = "sha256-Mt1IweQkPqxv+ynezdFHTJXU/oTOwhPkY49GzFJpPaM="; }; nativeBuildInputs = [ From 246216e599eefe157169d2deaec801206fd735d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:00 +0200 Subject: [PATCH 295/737] python3Packages.afdko: 3.9.0 -> 3.9.1 --- pkgs/development/python-modules/afdko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 29593503252a..9eb1f35c4315 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.9.0"; + version = "3.9.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1fjsaz6bp028fbmry6fzfcih78mdzycqmky1wsz5y0bg4kfk4shh"; + sha256 = "sha256-AtRNaZzn9BoNIjvKhS7rsYVfHw26JKKUFqO/6TcBIkw="; }; format = "pyproject"; From d4579920f807231bdc73201c8838ffc1d28eb325 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:00 +0200 Subject: [PATCH 296/737] python3Packages.aiobotocore: 2.3.4 -> 2.4.0 --- pkgs/development/python-modules/aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 81977915fd52..6bc62a3854d3 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.3.4"; + version = "2.4.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZVTr6ldk9m9L5USk/KoJU+6A5gDde9gYukiT1yvxK/s="; + sha256 = "sha256-+f4GmMxJeGG9tUzRYWHIBAMfdYralIDDVUDyDAwHg4U="; }; # relax version constraints: aiobotocore works with newer botocore versions From 53c0dcf2d38b51ff2ddb29b25cae533f7b9f828d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:01 +0200 Subject: [PATCH 297/737] python3Packages.aioserial: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/aioserial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioserial/default.nix b/pkgs/development/python-modules/aioserial/default.nix index c8c521edbe65..2d15e2794da8 100644 --- a/pkgs/development/python-modules/aioserial/default.nix +++ b/pkgs/development/python-modules/aioserial/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioserial"; - version = "1.3.0"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "080j3ws3j2arj2f16mzqn1qliy0bzmb0gzk5jvm5ldkhsf1s061h"; + sha256 = "sha256-cCvwOw64S47y2NrFy5JeHmhdzpj3exJVabxv0rO1gig="; }; propagatedBuildInputs = [ From 73ddd6270127e65a509c05649d80be29e2cc5f3f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:01 +0200 Subject: [PATCH 298/737] python3Packages.aliyun-python-sdk-cdn: 3.7.2 -> 3.7.4 --- .../python-modules/aliyun-python-sdk-cdn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index 9303f985022a..f8b1751f290e 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.7.2"; + version = "3.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wbVkoNu9ffMpuivUGg+PAya099xMbU0Ehvl0++ud+WE="; + hash = "sha256-7ZDhsu5XDE7hDVaG4RdEWcKfVrC2tPwLPdGB+uDXRpA="; }; propagatedBuildInputs = [ From d8472b9205d2353236024f395a0564ddd081c0bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:01 +0200 Subject: [PATCH 299/737] python3Packages.aliyun-python-sdk-iot: 8.42.0 -> 8.43.0 --- .../python-modules/aliyun-python-sdk-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 6dde44e4ba5a..d4cce9bb5f70 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.42.0"; + version = "8.43.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pp1objaT0Galxz91V1OoMfogYQyZ1lZC6XGFd4wSTq8="; + hash = "sha256-KYmxcm5523MeHhMD5tdlowezhgXSolywHUBOlVkjsp0="; }; propagatedBuildInputs = [ From ca8e47fba0ddc327b15f54afb26421f03156ee2d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:01 +0200 Subject: [PATCH 300/737] python3Packages.ansible: 6.2.0 -> 6.3.0 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index d2f7dba38669..f90085431718 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.2.0"; + version = "6.3.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-va8rL9km/xifveL+/nI0cz8yw2/EEwM/pdk5RfvcBqY="; + sha256 = "sha256-1fqfwVqNRcjVJHqWRbC0j5ldc1sSxNplVmbUhQYnNSY="; }; postPatch = '' From bc6e37cbf4adb493c46b87b761d2d40fca1bf51b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:01 +0200 Subject: [PATCH 301/737] python3Packages.ansible-lint: 6.4.0 -> 6.5.2 --- pkgs/development/python-modules/ansible-lint/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 90da98520120..d8a3e2e674dc 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -4,7 +4,9 @@ , setuptools-scm , ansible-compat , ansible-core +, black , enrich +, filelock , flaky , jsonschema , pythonOlder @@ -20,13 +22,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.4.0"; + version = "6.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xadjBsrpBqJgz3KGyofE0DukSSsu17/qIa0R/fPH6NE="; + sha256 = "sha256-9EMsdMDyiyhwoYi0mZWS9jOAQvMNDG9O4RsyRAyp/+Q="; }; postPatch = '' @@ -42,7 +44,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ ansible-compat ansible-core + black enrich + filelock jsonschema pytest # yes, this is an actual runtime dependency pyyaml From b13af2a001ffd6f90d16ad88610e93032607fa94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:01 +0200 Subject: [PATCH 302/737] python3Packages.arrow: 1.2.2 -> 1.2.3 --- 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 c09610c3be1f..ff626a5b4813 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.2"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bcrx/T2aEaETWytvCYh0IRU7lFWOXvTQkLVntHFzrCs="; + sha256 = "sha256-OTSzDKG58pI3bZ2xWxlEYIjRLsWGKbw/DaKP1V+2M6E="; }; postPatch = '' From f2816124016cc043ffc0e7684ca31816c71d2426 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:01 +0200 Subject: [PATCH 303/737] python3Packages.asttokens: 2.0.5 -> 2.0.8 --- pkgs/development/python-modules/asttokens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 3d78ae7690b3..4a07d2ac96ec 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "asttokens"; - version = "2.0.5"; + version = "2.0.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mlTBFPAsepSA1WVQkyVGo/H+cdigLxvHzNDuPuNc9NU="; + sha256 = "sha256-xh4WJG7Pss3ilYQGtMjrwEPJ5tc6qoPJQWc7NeXTp2s="; }; nativeBuildInputs = [ From a3b847e55241d32224dbd5439b1b518d92fe9ef2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:01 +0200 Subject: [PATCH 304/737] python3Packages.atpublic: 3.0.1 -> 3.1.1 --- pkgs/development/python-modules/atpublic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 16f0f0ddffd9..286b79bcb675 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "atpublic"; - version = "3.0.1"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bb072b50e6484490404e5cb4034e782aaa339fdd6ac36434e53c10791aef18bf"; + sha256 = "sha256-MJjuEtAQfMUAnWH06A5e3PrEzaK9qgRkSvdYJ8sSGxg="; }; nativeBuildInputs = [ From fbf427f1de47d90a91316b4b97561dc2e6b7fcc2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:01 +0200 Subject: [PATCH 305/737] python3Packages.autobahn: 22.6.1 -> 22.7.1 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 57e09385f8a6..a6e6de722744 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "autobahn"; - version = "22.6.1"; + version = "22.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+2PpRtXC3Q32gIUehOZWJKSUzofJmfKklE5PLYG/RJg="; + sha256 = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k="; }; postPatch = '' From 9595c927ab1dca1e0fb6d596e0cea1654655fd3c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 306/737] python3Packages.autopep8: 1.6.0 -> 1.7.0 --- .../python-modules/autopep8/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 80c57ef732c2..59dfac756b5d 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,31 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales +{ lib +, fetchPypi +, buildPythonPackage +, pycodestyle +, glibcLocales , toml +, pytestCheckHook }: buildPythonPackage rec { pname = "autopep8"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "44f0932855039d2c15c4510d6df665e4730f2b8582704fa48f9c55bd3e17d979"; + sha256 = "sha256-ypsag+U6f61l1zHceiotUKpI9DhQQHxZ9qGjBsQgEUI="; }; propagatedBuildInputs = [ pycodestyle toml ]; - # One test fails: - # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) -# doCheck = false; + checkInputs = [ + glibcLocales + pytestCheckHook + ]; - checkInputs = [ glibcLocales ]; + disabledTests = [ + # missing tox.ini file from pypi package + "test_e101_skip_innocuous" + ]; LC_ALL = "en_US.UTF-8"; meta = with lib; { description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; - homepage = "https://pypi.python.org/pypi/autopep8/"; + homepage = "https://pypi.org/project/autopep8/"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; }; } From 82e553aeba701a06160cca89ae2fb505ba7f76c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 307/737] python3Packages.azure-core: 1.24.2 -> 1.25.1 --- pkgs/development/python-modules/azure-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 352fd019cf94..2db4ac2208fb 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -18,14 +18,14 @@ , typing-extensions }: buildPythonPackage rec { - version = "1.24.2"; + version = "1.25.1"; pname = "azure-core"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Dzog0kVlm/gfs2cAcKVBDI1KQymNWpgeYtzjkwAKkIQ="; + sha256 = "sha256-PBzzaGUOduwAnAfNEXSpXNy0cbJHu3LRgkX31WwYCbI="; }; propagatedBuildInputs = [ From 7bcb7289c137a0302bff319846384b297a92a50b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 308/737] python3Packages.azure-eventhub: 5.10.0 -> 5.10.1 --- pkgs/development/python-modules/azure-eventhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index a177f824fa2e..e6d36a87c982 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.10.0"; + version = "5.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8c83fbe96a420813599a9a3c66adc315b7208f56d5a50a20aa04a8aa7062b074"; + sha256 = "sha256-LV+o7dMVCFIQfq9d2wYY34LghIP5FN06zDpUPtkELFQ="; }; propagatedBuildInputs = [ From 5d12551cd29ead0b68d95c2f19406ac0e74acd64 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 309/737] python3Packages.azure-mgmt-appconfiguration: 2.1.0 -> 2.2.0 --- .../python-modules/azure-mgmt-appconfiguration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 650b54c9dd15..51f5985e84d0 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-6s3KfWOlzkoq7uxuDbFMYmW22rOYHtgQgYQ6RMFQiQ8="; + sha256 = "sha256-R2COS22pCtFp3oV98LLn/X2LkPOVUCasEONhFIhEdBQ="; extension = "zip"; }; From 479a8b2f834b9e983b4ef647ee090640c53bdd55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 310/737] python3Packages.azure-mgmt-containerinstance: 9.2.0 -> 10.0.0 --- .../python-modules/azure-mgmt-containerinstance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 83e1163df467..b2e9c6e3adf5 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "9.2.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-3rElVUvbGqF99ppZanUUrwFGtCAXak2zhMVOd6n9bkY="; + sha256 = "sha256-TDGrC7YO05Ywa8uEINqqw4Wxag65aklIUwS+2aVMHwA="; }; propagatedBuildInputs = [ From 03c546433ac8ffe5f3fdc643112e8c1cf916b31f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 311/737] python3Packages.azure-mgmt-containerservice: 20.2.0 -> 20.3.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index de3bca44c5cf..77c1ece09b29 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "20.2.0"; + version = "20.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-+XNJbI4LTxx8kcNr6dDlcaGujrqriKaEPb0deo6YbkM="; + sha256 = "sha256-p2q1fzpPrwYKUAilPTGzRDlkT9OKqnjZVN2jslY/WSw="; }; propagatedBuildInputs = [ From 25b4b57233369fe44100384794e96fe17f33a6de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 312/737] python3Packages.azure-mgmt-core: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/azure-mgmt-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index 2a4b00432f19..c250246af26a 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.2"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-yJ6/GMInvJih7sypVGC4p+IwWQ1FbI+pwtWs3GcPeAg="; + sha256 = "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE="; }; propagatedBuildInputs = [ From 9d7379f3e04b03449df1be8547347ad9fd3c3b36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 313/737] python3Packages.azure-mgmt-cosmosdb: 7.0.0 -> 8.0.0 --- .../python-modules/azure-mgmt-cosmosdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index d1a717802432..db6df3583b68 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "7.0.0"; + version = "8.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-NMwcqgvxwma+aXUhL8OQm+tpH+MCCjHMALf0Ii8bQlo="; + hash = "sha256-/6ySVfCjr1YiiZIZJElrd1EfirV+TJvE/FvKs7UhoKo="; }; propagatedBuildInputs = [ From 220579518ab8f4e576627a6b63166e75f0578d2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 314/737] python3Packages.azure-mgmt-datafactory: 2.7.0 -> 2.8.0 --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index c6907efc9977..915b2bf96330 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-g7av5MFy4QNg+81PqDGznHXUZsHhnaauaJV/B6GMy4A="; + hash = "sha256-LH2YdWuRC5mzImF6ImkOixHBcgc7Yoi0Rai5m64/aiU="; }; propagatedBuildInputs = [ From 26c3674b89d5e5677b2a02594c50c6657b57f202 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:02 +0200 Subject: [PATCH 315/737] python3Packages.azure-mgmt-iothub: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/azure-mgmt-iothub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index ea5fbd1c1020..feefdabc1e79 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM="; + sha256 = "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A="; }; propagatedBuildInputs = [ From bfb4df79393dd578f18669c0c1ff7ba488c0e870 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:03 +0200 Subject: [PATCH 316/737] python3Packages.azure-mgmt-media: 10.0.0 -> 10.1.0 --- pkgs/development/python-modules/azure-mgmt-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index 57ccffcf997f..9d0f2a216873 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "10.0.0"; + version = "10.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-KKUeibEAUqKsjjjqpzYBFaQUGniY3rbe+lfCnL0+lpY="; + hash = "sha256-lm3rL9x+R4FCqrIyZG7jc3Yro6xUcDs1wRNNo1XQJIk="; }; propagatedBuildInputs = [ From 3eb5885907416b39ec149530072ac39356b172ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:03 +0200 Subject: [PATCH 317/737] python3Packages.azure-mgmt-redis: 13.1.0 -> 14.0.0 --- pkgs/development/python-modules/azure-mgmt-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index c7890b55b04c..9d476dfc8074 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "13.1.0"; + version = "14.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ece913e5fc7f157e945809e557443f79ff7691cabca4bbc5ecb266352f843179"; + sha256 = "sha256-WErNQiinmxBNyaOAqbHWGk2OLxtM9o63wDEQGf+iL6Q="; }; propagatedBuildInputs = [ From de95e5952b212d10d11e199143e3a0a9baa3fa21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:03 +0200 Subject: [PATCH 318/737] python3Packages.azure-mgmt-subscription: 3.0.0 -> 3.1.1 --- .../python-modules/azure-mgmt-subscription/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index 71257c46c4f2..5094dc3ec6a8 100644 --- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-subscription"; - version = "3.0.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "157bd9123a5814473a9cd131832ea614c478548722ec01f47b35d778dc307d55"; + sha256 = "sha256-TiVbTOm5JDV7uMUAmzyIogFNMgOySV4iVvoCe/hOgA4="; }; propagatedBuildInputs = [ From fb34aec664a3e4055e36f15c457ed2abf0755f37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:03 +0200 Subject: [PATCH 319/737] python3Packages.azure-storage-blob: 12.13.0 -> 12.13.1 --- .../development/python-modules/azure-storage-blob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 6a3caa03e649..3b3499a780f0 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.13.0"; + version = "12.13.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-U/DUzTKXCsn/m5dT+D3S+z+aww4dAecWOMQ2xQm/2IQ="; + sha256 = "sha256-iZxLjiZxgS0s948QdVaifbsSjKqiuwYJTnKj1YNnQK8="; }; propagatedBuildInputs = [ From ee39677406f7bbdc19ae333d3ec8c7d736cea680 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:03 +0200 Subject: [PATCH 320/737] python3Packages.bcrypt: 3.2.2 -> 4.0.0 --- .../python-modules/bcrypt/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 592b5b22d47d..46771906d7cc 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,32 +1,45 @@ { lib , buildPythonPackage +, rustPlatform , setuptools +, setuptools-rust , isPyPy , fetchPypi , pythonOlder , cffi , pytestCheckHook -, six }: buildPythonPackage rec { pname = "bcrypt"; - version = "3.2.2"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QzxBDCF3BXcF2iqfLNAd0VdJOyp6wUyFk6FrPatra/s="; + hash = "sha256-xZwXD8kiX6rQTd4bph2FtBOUbozi5fX1/zDf1nKD8xk="; + }; + + cargoRoot = "src/_bcrypt"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${pname}-${version}/${cargoRoot}"; + name = "${pname}-${version}"; + hash = "sha256-HvfRLyUhlXVuvxWrtSDKx3rMKJbjvuiMcDY6g+pYFS0="; }; nativeBuildInputs = [ setuptools - ]; + setuptools-rust + rustPlatform.cargoSetupHook + ] ++ (with rustPlatform; [ + rust.cargo + rust.rustc + ]); propagatedBuildInputs = [ - six cffi ]; From 102116aa42a3f301c0a107365d9d3abf83113bfe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:03 +0200 Subject: [PATCH 321/737] python3Packages.biliass: 1.3.4 -> 1.3.5 --- pkgs/development/python-modules/biliass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index fe2cd731a1ce..617b87bc12f1 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "biliass"; - version = "1.3.4"; + version = "1.3.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kktK+6rLwYhkG7LiTBlgBbiIN8apweg4l8pJSTjKQU4="; + sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU="; }; propagatedBuildInputs = [ protobuf ]; From e21f3eacf34a220d192ace9a5002da2af624e839 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:03 +0200 Subject: [PATCH 322/737] python3Packages.billiard: 4.0.0 -> 4.0.2 --- pkgs/development/python-modules/billiard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 303d334936c6..919c5daba2f4 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "billiard"; - version = "4.0.0"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NE2aHX063fFx6yxZbJ6Y0e/4Gw4D8fk5iTmjUYyiY6k="; + sha256 = "sha256-jUFd+FrDG5dXlxJaxIZJL+TF5OJx07DfdWHrI0YsmwM="; }; checkInputs = [ From dfb3c87ef930dca0a6cdfefbebfec3bd6e97b884 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:03 +0200 Subject: [PATCH 323/737] python3Packages.bincopy: 17.10.3 -> 17.11.0 --- pkgs/development/python-modules/bincopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index df6f31450d6f..7af89c7aed87 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bincopy"; - version = "17.10.3"; + version = "17.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HDSqwrCXf2U0uzfa4Vb9Euu9ZSm6eFD9bcMf6eieicY="; + sha256 = "sha256-rk7jYr9jUz7TUckoYkv74rr5D9fJLD3h7UFBH0XeleE="; }; propagatedBuildInputs = [ From e07985cd7cdb019fb38dfca390f9837bb58def0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:03 +0200 Subject: [PATCH 324/737] python3Packages.bitarray: 2.5.1 -> 2.6.0 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 7ee76f2f2fe8..f49c4c9de47d 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jTj2B1EAgJmmWdWs+zXvQVAYPv/Vsr+mwQGZJw3fTJw="; + hash = "sha256-VtPxbdgHscVnMqJEzgccE17pc9PtyZKUGMGyTFQ5oP0="; }; checkPhase = '' From 16370b1e7a903e2e044fb59ece5295c4464c2ce9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:04 +0200 Subject: [PATCH 325/737] python3Packages.bitbox02: 6.0.0 -> 6.1.1 --- pkgs/development/python-modules/bitbox02/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index 358a4d163f3e..d11db2c8457d 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "6.0.0"; + version = "6.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wTateh3dJycFNozLaQbAzXF0avr2ofBdjlqqcOBLr/0="; + sha256 = "sha256-mVA0CdbGGJn44R6xHnophmsnVMsCwDrPNM3vmXVa7dg="; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; From 31bed7b63576358bab27da28802bb5c793f9af96 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:04 +0200 Subject: [PATCH 326/737] python3Packages.bitcoin-utils-fork-minimal: 0.4.11.4 -> 0.4.11.6 --- .../python-modules/bitcoin-utils-fork-minimal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix index 868641641fc9..c548ce0bbf32 100644 --- a/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix +++ b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "bitcoin-utils-fork-minimal"; - version = "0.4.11.4"; + version = "0.4.11.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-n3tEQkl6KBAno4LY67lZme3TIvsm35VA2yyfWYuIE1c="; + hash = "sha256-DzibvC8qr/5ync59cfFB7tBmZWkPs/hKh+e5OC4lcEw="; }; propagatedBuildInputs = [ From 4421425e6f0ea4a1fb42540001fa57a628a6294f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:04 +0200 Subject: [PATCH 327/737] python3Packages.blis: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/blis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 290e1928414f..c935c3728b01 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aZ4coUlnFjcLS5tSfFjYQr+JKGPY2UTNoy+HIO08tCk="; + sha256 = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8="; }; nativeBuildInputs = [ From 534d5f169d8bc40ebb2291949f657051b41bd812 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:04 +0200 Subject: [PATCH 328/737] python3Packages.block-io: 2.0.5 -> 2.0.6 --- pkgs/development/python-modules/block-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 64ffc5ff4b3e..5ac33d77cf14 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "block-io"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "af70c3be444f2f2d07c0603cef547b51bbd9f4fbd4aadebd8f1e8ee73ccbc5e5"; + sha256 = "sha256-M7czfpagXqoWWSu4enB3Z2hc2GtAaskI6cnJzJdpC8I="; }; propagatedBuildInputs = [ From 5ed928e0d7181efe8d0044ecefc2819a982b7887 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:04 +0200 Subject: [PATCH 329/737] python3Packages.boto3: 1.24.42 -> 1.24.75 --- 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 834df14102f0..698f252909ef 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.24.42"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.24.75"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-3z1u8CMEvXw3EQkJNsCS1dtzXdoQneysHiNsPvf9t68="; + sha256 = "sha256-e/oiQt+bH6c+F/TX959rIlYPVdXaLifleOWF725LFKc="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From f4335622ae47d59e1ef5f75cabf39a34e174f547 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:04 +0200 Subject: [PATCH 330/737] python3Packages.botocore: 1.27.42 -> 1.27.75 --- 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 d7e525897604..c6905d2de667 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.27.42"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.27.75"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-OKGApmZsWpsGmnXsPPN0/ypkw+kMnySpFoWLzesERW0="; + sha256 = "sha256-+LHaK0HojFjbUdsMbv9spWQliUjOSlrH6WrDWkabDU8="; }; propagatedBuildInputs = [ From c43cb4306a3128a1c8998c786c9c500475e053ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:04 +0200 Subject: [PATCH 331/737] python3Packages.bottle: 0.12.21 -> 0.12.23 --- pkgs/development/python-modules/bottle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 6532312ab71b..ebcf03652605 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.21"; + version = "0.12.23"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "787c61b6cc02b9c229bf2663011fac53dd8fc197f7f8ad2eeede29d888d7887e"; + sha256 = "sha256-aD3jqjmfsm6HsnTbz3CxplE4XUWRMXFjh6vcN5LgQWc="; }; checkInputs = [ From 3c50c3b69f899a6665a24f5e04c2647575b44b11 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:04 +0200 Subject: [PATCH 332/737] python3Packages.boxx: 0.10.5 -> 0.10.6 --- pkgs/development/python-modules/boxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 469f2af96f72..37cb627b1288 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.5"; + version = "0.10.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6qO/aPegHk+1PAu8qzIkC3fULh2WjgJcqNui+XEaLQw="; + hash = "sha256-npPwYhDTujBpTnPyhvZbA+EK4jU8nnHSBgSw9xlTcJM="; }; propagatedBuildInputs = [ From ef1cb88551c1744c88f7423191c86fa2f94df1d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:04 +0200 Subject: [PATCH 333/737] python3Packages.bpython: 0.22.1 -> 0.23 --- 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 b66f81d032e2..f919d5cabe29 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.22.1"; + version = "0.23"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-H7HgpSMyV5/E49z3XiF5avZ6rivkYBeez8zpUwpJogA="; + hash = "sha256-nwB4q8iHxIrwiGkeL2R5fWyplKwPS8A8ONBvZX18BSo="; }; propagatedBuildInputs = [ From 5a7c3d2322e79dbcb5fddecc302ce22c08398ee5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:05 +0200 Subject: [PATCH 334/737] python3Packages.cartopy: 0.20.3 -> 0.21.0 --- pkgs/development/python-modules/cartopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 7a2407950576..5d635d5a52b2 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.20.3"; + version = "0.21.0"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "sha256-DWD6Li+9d8TR9rH507WIlmFH8HwbF50tNFcKweG0kAY="; + sha256 = "sha256-zh06KKEy6UyJrDN2mlD4H2VjSrK9QFVjF+Fb1srRzkI="; }; postPatch = '' From 01b6f56f4c13ffaa4533bcccb641a5bf8474f8e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:05 +0200 Subject: [PATCH 335/737] python3Packages.cherrypy: 18.7.0 -> 18.8.0 --- pkgs/development/python-modules/cherrypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index bf963ce16aa1..d18d75bd3720 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cherrypy"; - version = "18.7.0"; + version = "18.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "CherryPy"; inherit version; - hash = "sha256-cpRS95jKdWOQBG7zGAQ8roZKRoFN6vPmvTTclZrxmN4="; + hash = "sha256-m0jPuoovFtW2QZzGV+bVHbAFujXF44JORyi7A7vH75s="; }; postPatch = '' From 06619ade5f30e1b76cd65dfe37e07699c63115d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:05 +0200 Subject: [PATCH 336/737] python3Packages.cliff: 3.10.1 -> 4.0.0 --- pkgs/development/python-modules/cliff/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 39c5a497c8d8..d8ff545c848e 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -3,6 +3,7 @@ , fetchPypi , autopage , cmd2 +, importlib-metadata , installShellFiles , openstackdocstheme , pbr @@ -16,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.10.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BFruPzxkRxll161QfOhHSk4vIIFfu1QFp3D4WWoqAKA="; + sha256 = "sha256-Ow0w56z1DjwhSjnuPmaqLytZV+Kh3jc+F7uo6Yx1AaU="; }; postPatch = '' @@ -38,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ autopage cmd2 + importlib-metadata pbr prettytable pyparsing From faac1657275298e1e4737c9e44c27a808748ea0a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:05 +0200 Subject: [PATCH 337/737] python3Packages.cloudpickle: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/cloudpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index d33f4dbee358..13f99462da53 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uyM+h2pYSR2VkKZ2+Tx6VHOgj3R9Wrnff5zlZLPnk44="; + hash = "sha256-P0IZRpxVRTz+RzflZLZ8KhSRCdq/fyQkeJSLiV9hEG8="; }; checkInputs = [ From 0c5026f18b92ff4481efcf589c970445c931b795 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:05 +0200 Subject: [PATCH 338/737] python3Packages.cloudsmith-api: 1.61.3 -> 1.120.3 --- pkgs/development/python-modules/cloudsmith-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 1d5a2047a7c3..9e7ecae4450b 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.61.3"; + version = "1.120.3"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-Y8CnbX9rhtk8sebJKo5kyqFwCkJgBjz3dgm58VHRPhY="; + sha256 = "sha256-rtOpA0yTEiSvzUgG1IuaIXlLrdqVT85vnR5yOdi44c0="; }; propagatedBuildInputs = [ From bbd66905e5dccaccab3d5393010f15b909f7ee59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:05 +0200 Subject: [PATCH 339/737] python3Packages.cocotb: 1.6.2 -> 1.7.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 83ed76ac8669..104fe1de99df 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.6.2"; + version = "1.7.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 = "sha256-SY+1727DbWMg6CnmHw8k/VP0dwBRYszn+YyyvZXgvUs="; + sha256 = "sha256-CF/ZXkEQDDPwTN2+ngyUKy55XwShR6/Fr5az/aYcY/Q="; }; nativeBuildInputs = [ setuptools-scm ]; From 7f92259b8553da0030cc4a44dd3ab3dc68f3f7c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:05 +0200 Subject: [PATCH 340/737] python3Packages.colorlog: 6.6.0 -> 6.7.0 --- pkgs/development/python-modules/colorlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 690a54813f41..9c1be8c68333 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "6.6.0"; + version = "6.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NE9zIEAJ5Mg8W2vrALPEXccPza48gNuRngpBcdAG/eg="; + sha256 = "sha256-vZS9IcHhP6x70xU/S8On3A6wl0uLwv3xqYnkdPblguU="; }; checkInputs = [ pytestCheckHook ]; From 5db734c002ca251e2f070bdf002b74d2f08d9d0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:05 +0200 Subject: [PATCH 341/737] python3Packages.commoncode: 30.2.0 -> 31.0.0 --- .../python-modules/commoncode/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 42bf9d15a675..6b1d873069a8 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "commoncode"; - version = "30.2.0"; + version = "31.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7kcDWfw4M7boe0ABO4ob1d+XO1YxS924mtGETvHoNf0="; + sha256 = "sha256-iX7HjsbW9rUgG35XalqfXh2+89vEiwish90FGOpkzRo="; }; postPatch = '' @@ -57,7 +57,15 @@ buildPythonPackage rec { pytest-xdist ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # chinese character translates different into latin + "test_safe_path_posix_style_chinese_char" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character + "test_os_walk_can_walk_non_utf8_path_from_unicode_path" + "test_resource_iter_can_walk_non_utf8_path_from_unicode_path" + "test_walk_can_walk_non_utf8_path_from_unicode_path" + "test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs" + ] ++ lib.optionals stdenv.isDarwin [ # expected result is tailored towards the quirks of upstream's # CI environment on darwin "test_searchable_paths" From 41c50f2587671a9bd5059012c5f34646be829885 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:06 +0200 Subject: [PATCH 342/737] python3Packages.configparser: 5.2.0 -> 5.3.0 --- .../python-modules/configparser/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 9467003e9dd9..3c130acdc2fc 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,26 +1,27 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, setuptools-scm }: buildPythonPackage rec { pname = "configparser"; - version = "5.2.0"; + version = "5.3.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1b35798fdf1713f1c3139016cfcbc461f09edbf099d1fb658d4b7479fcaa3daa"; + sha256 = "sha256-i+JngktUHAmwjbEkkX9Iq1JabD6DcBHzEweBoiTFcJA="; }; - # No tests available - doCheck = false; - nativeBuildInputs = [ setuptools-scm ]; + checkInputs = [ pytestCheckHook ]; + preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; - license = licenses.mit; homepage = "https://github.com/jaraco/configparser"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 6e04511d8b2858b7eb3b5a35ea7153823429f5b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:06 +0200 Subject: [PATCH 343/737] python3Packages.coverage: 6.4.2 -> 6.4.4 --- pkgs/development/python-modules/coverage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 6893458d5cc7..b96929640806 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "6.4.2"; + version = "6.4.4"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bDzP6Jw28+W5g3ue5QdHIxAWTzUsn+MyEgt2TJ1grb4="; + sha256 = "sha256-4WxFtyast4Dh5viLKG08ELORSrA0OPMhF8SqUtfzDVg="; }; # No tests in archive From f30f2148a4ec0964d14589a5aea0d37469152058 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:06 +0200 Subject: [PATCH 344/737] python3Packages.crashtest: 0.3.1 -> 0.4.0 --- pkgs/development/python-modules/crashtest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix index 5b084cdd8c84..da01d77cd072 100644 --- a/pkgs/development/python-modules/crashtest/default.nix +++ b/pkgs/development/python-modules/crashtest/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "crashtest"; - version = "0.3.1"; + version = "0.4.0"; disabled = !(pythonAtLeast "3.6"); src = fetchPypi { inherit pname version; - sha256 = "42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd"; + sha256 = "sha256-1imwDx1OecMWkJ9Ot2O7yym1ENZfveE2Whzrk6t/pMg="; }; # has tests, but only on GitHub, however the pyproject build fails for me From 773c11ad12a9b4789afe651e5ff8ed8a4d434f13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:06 +0200 Subject: [PATCH 345/737] python3Packages.cupy: 10.6.0 -> 11.1.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index ffe017698df1..aba974e02704 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -9,12 +9,12 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "10.6.0"; + version = "11.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-9jWpfd4l4LSptJewdQaaurm/huHcKv48+XOZDCLTJV8="; + sha256 = "sha256-4TtvmQrd172HCQWvQp+tUQhNCFf4YA3TIGod9aRoTt0="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both From 5b94561d92ff22811f4ceecba9d470cfa8ae16c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:06 +0200 Subject: [PATCH 346/737] python3Packages.curtsies: 0.3.10 -> 0.4.0 --- .../python-modules/curtsies/default.nix | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index b05cb770a4bd..80b80e32b75b 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,21 +1,35 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, blessings, mock, nose, pyte, cwcwidth, typing ? null}: +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, blessed +, backports-cached-property +, pyte +, pytestCheckHook +, cwcwidth +}: buildPythonPackage rec { pname = "curtsies"; - version = "0.3.10"; + version = "0.4.0"; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "11efbb153d9cb22223dd9a44041ea0c313b8411e246e7f684aa843f6aa9c1600"; + hash = "sha256-yynvzjP+85WinvpWjyf1kTF4Rp+zqrEUCA1spiZBQv4="; }; - propagatedBuildInputs = [ blessings cwcwidth ] - ++ lib.optionals (pythonOlder "3.5") [ typing ]; + propagatedBuildInputs = [ + backports-cached-property + blessed + cwcwidth + ]; - checkInputs = [ mock pyte nose ]; - - checkPhase = '' - nosetests tests - ''; + checkInputs = [ + pyte + pytestCheckHook + ]; meta = with lib; { broken = stdenv.isDarwin; From 17978a97530a178842cffd05dadcb0442e865923 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:06 +0200 Subject: [PATCH 347/737] python3Packages.dask-jobqueue: 0.7.4 -> 0.8.0 --- pkgs/development/python-modules/dask-jobqueue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index cc56413eea39..0eaebec17784 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dask-jobqueue"; - version = "0.7.4"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XoQwazgJuFvhoEezhhGu2YvIp+VFAe7dhGIEVnuQ5kM="; + hash = "sha256-VCD6Oos9aSkbrzymQnqm2RV5uFzTj05VgPuhJ5PpyAk="; }; propagatedBuildInputs = [ From bf3375dd6c3d6baba42ef4376c461f1ef1f45037 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:06 +0200 Subject: [PATCH 348/737] python3Packages.databricks-connect: 10.4.6 -> 10.4.12 --- .../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 7a494e55d8c6..92bbb9f54db2 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "10.4.6"; + version = "10.4.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Dezqn6rZysRhDQFUuTgXdoJL9dn21Bx2QlryBG9MtR0="; + sha256 = "sha256-T5KGJQryiE2+x9u+AcvTm6dLpU3kh20sCu0CTwpeJao="; }; sourceRoot = "."; From 341a7c890054d9499956190acf721e750955515e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:06 +0200 Subject: [PATCH 349/737] python3Packages.devpi-common: 3.6.0 -> 3.7.0 --- pkgs/development/python-modules/devpi-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 7e2a315b413e..bb1aae2e8e50 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "fc14aa6b74d4d9e27dc2e9cbff000ed9be5cd723d3ac9672e66e4e8fce797227"; + sha256 = "sha256-O015TOlvFcN7hxwV4SgGmo6vanMuWb+i9KZOYhYZLJM="; }; propagatedBuildInputs = [ From c876b71f61a87186d13e15fd92027798ea6de8a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:06 +0200 Subject: [PATCH 350/737] python3Packages.distributed: 2022.7.0 -> 2022.9.0 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 646899d36cf8..a1a3449d8ac5 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.7.0"; + version = "2022.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5oq6i+PiDl0RIKvKyEGQn/GAIXCKhBKvpY/xU8T6sKw="; + hash = "sha256-uRXwWgWbVVW8B96gzwVwWfdR6eTn+1XFR3Y4PKDjYb8="; }; postPatch = '' From d469728bf891ae0a78774c9c26f9e311a901b3d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH 351/737] python3Packages.dj-database-url: 0.5.0 -> 1.0.0 --- .../python-modules/dj-database-url/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index 698e2a0c3052..a28c9dd05a58 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -1,14 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, django +}: buildPythonPackage rec { pname = "dj-database-url"; - version = "0.5.0"; + version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163"; + hash = "sha256-zPPocY913dFHoeIS/KiO7NqnIXWe5I44tIVIHHe8o9w="; }; + propagatedBuildInputs = [ + django + ]; + # Tests access a DB via network doCheck = false; From e7cc94a20a6e59f561defac1a7d7b4653138248a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH 352/737] python3Packages.docformatter: 1.4 -> 1.5.0 --- .../python-modules/docformatter/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 7c659c4173f7..0523678bb074 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -1,22 +1,25 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub , untokenize +, mock , pytestCheckHook }: buildPythonPackage rec { pname = "docformatter"; - version = "1.4"; + version = "1.5.0"; disabled = pythonOlder "3.6"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "064e6d81f04ac96bc0d176cbaae953a0332482b22d3ad70d47c8a7f2732eef6f"; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-GSfsM6sPSLOIH0YJYFVTB3SigI62/ps51mA2iZ7GOEg="; }; propagatedBuildInputs = [ @@ -24,6 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ + mock pytestCheckHook ]; From 20d4ce6981af1ad90d4ea4aa4ff84d8aab12c814 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH 353/737] python3Packages.docker: 5.0.3 -> 6.0.0 --- .../python-modules/docker/default.nix | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index f70fcebb26f3..48f454a69b4f 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -2,39 +2,49 @@ , stdenv , buildPythonPackage , fetchPypi -, isPy27 -, backports_ssl_match_hostname -, mock +, pythonOlder +, packaging , paramiko , pytestCheckHook , requests -, six +, setuptools_scm +, urllib3 , websocket-client }: buildPythonPackage rec { pname = "docker"; - version = "5.0.3"; + version = "6.0.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d916a26b62970e7c2f554110ed6af04c7ccff8e9f81ad17d0d40c75637e227fb"; + sha256 = "sha256-GeMwRwr0AWfSk7A1JXjB+iLXSzTT7fXU/5DrwgO7svE="; }; - nativeBuildInputs = lib.optional isPy27 mock; + nativeBuildInputs = [ + setuptools_scm + ]; propagatedBuildInputs = [ - paramiko + packaging requests - six + urllib3 websocket-client - ] ++ lib.optional isPy27 backports_ssl_match_hostname; + ]; + + passthru.optional-dependencies.ssh = [ + paramiko + ]; checkInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ "tests/unit" ]; + pytestFlagsArray = [ + "tests/unit" + ]; # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket disabledTests = lib.optionals stdenv.isDarwin [ "api_test" "stream_response" "socket_file" ]; From 4edab54f8028e0a5dd48b95c3c55425a2436dfa7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH 354/737] python3Packages.dpkt: 1.9.7.2 -> 1.9.8 --- pkgs/development/python-modules/dpkt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index a1036e099ea8..f59b7ba73662 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.7.2"; + version = "1.9.8"; src = fetchPypi { inherit pname version; - sha256 = "80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b"; + sha256 = "sha256-Q/hobkVdpQUoNf0e2iaJ1R3jZwqsl5mxsAz9IDkn7kU="; }; # Project has no tests From ad07650f7c93a3dc01b468d7fc1e5a4bf95b2cb9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH 355/737] python3Packages.etils: 0.7.1 -> 0.8.0 --- pkgs/development/python-modules/etils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index a428edc9e887..4d97ae3ff447 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "0.7.1"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IHwJfdQYDV5asce37ni3v5Rx4SU03qziOx05LevSkvM="; + hash = "sha256-0dWve9nHhKJzxOHsz6qP6speBIGghxe1MT+iMdoiqQM="; }; nativeBuildInputs = [ From f8461e03ba626a1b636a049fbbd1e9fc14ddc4b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH 356/737] python3Packages.evdev: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/evdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 86149cbd865a..354b10749938 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WzOxdPfIRXbn3WBx5Di/WtIn2pXv1DVqOf5Mg1VBL+Y="; + sha256 = "sha256-7PoBtchPfoxs7TNnrJUoj0PNhO+/1919DNv8DRjIemo="; }; buildInputs = [ linuxHeaders ]; From e8fd120ee4617b9e8ddaf58feef608f1b4cfb7b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH 357/737] python3Packages.faker: 13.15.0 -> 14.2.0 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index a464d0372b51..9b8e6f7574a1 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "13.15.0"; + version = "14.2.0"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-oSb6ZvVOZaZ/kT3MaYydAj3vcneIJTa94paPyscBv9U="; + hash = "sha256-bbVuLEOit0JQ0cMy7yX+99wH3LbF+rUynde0RnuO17k="; }; propagatedBuildInputs = [ From 389875c8285fc2a4ce39bf64cd26f6c0ced374cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH 358/737] python3Packages.filelock: 3.7.1 -> 3.8.0 --- pkgs/development/python-modules/filelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 5fdbd8c441fe..7afb72545147 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.7.1"; + version = "3.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Og/YUWatnbq1TJrslnN7dEEG3F8VwLCaZ0SkRSmfzwQ="; + hash = "sha256-VUR8qmZvIZjFtrE6JtIITSb6WxFcANBlZkshJGgMTtw="; }; nativeBuildInputs = [ From 00a317107e1e735f18b49641c3396575cd7e4d9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:07 +0200 Subject: [PATCH 359/737] python3Packages.flask-security-too: 4.1.5 -> 5.0.1 --- .../development/python-modules/flask-security-too/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 7af6ea692cae..e2094568b658 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -44,12 +44,12 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "4.1.5"; + version = "5.0.1"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM="; + sha256 = "sha256-Q247oFmE8BDid0EFXGm8EsxFVmlG5NgFmQomKMNlZZQ="; }; propagatedBuildInputs = [ From cf9ae52369a813401d39e8f916da191aa46c0f85 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 360/737] python3Packages.fontParts: 0.10.7 -> 0.10.8 --- pkgs/development/python-modules/fontparts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 28972b62b977..6a595e29079e 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.7"; + version = "0.10.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-u0hKI2LLWAUGIVRECk6b5y7UKgJHUx2I8R5Q+qkKxcg="; + sha256 = "sha256-LwEhvLqx3Vu1omc/QrGCptQD25Tbv9Ok5eTURL3hvEQ="; extension = "zip"; }; From f75b8276afdda77d36663dba96911dc2fba4e384 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 361/737] python3Packages.freezegun: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/freezegun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 171d2b0556ab..b1300b4e1146 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -10,21 +10,21 @@ buildPythonPackage rec { pname = "freezegun"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tMZO+ydea8aNxudxsX/+D/D5C4GipRiQQ1ULZRmSa6Q="; + hash = "sha256-zSLRugaUE4RBDNln2KmdWuJEL1ffr+/y/aXejcXAVEY="; }; patches = lib.optionals (pythonAtLeast "3.10") [ # Staticmethods in 3.10+ are now callable, prevent freezegun to attempt to decorate them (fetchpatch { url = "https://github.com/spulec/freezegun/pull/397/commits/e63874ce75a74a1159390914045fe8e7955b24c4.patch"; - sha256 = "sha256-FNABqVN5DFqVUR88lYzwbfsZj3xcB9/MvQtm+I2VjnI="; + hash = "sha256-FNABqVN5DFqVUR88lYzwbfsZj3xcB9/MvQtm+I2VjnI="; }) ]; From eb22d2c184e8dcad5c7e3a164697aadba17bdf19 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 362/737] python3Packages.glean-parser: 6.1.2 -> 6.2.0 --- pkgs/development/python-modules/glean-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 97ff89852d3b..8164d6099a45 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "6.1.2"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-EqD+ztwRRNd/pXHgQi/z/qTbrcOB1jG+qACmsvWPT38="; + hash = "sha256-PKUc1PYfM4MxDFErV4zYyHl/mkPQNvIcjNaDekenHc8="; }; postPatch = '' From e2c42ac0ccb4e1f7643378794269b6e5e7bae5a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 363/737] python3Packages.google-api-core: 2.8.2 -> 2.10.1 --- 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 50b58e5a3f15..89139485ca37 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.8.2"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BvckTGQDIrUIsSWQO7VwG+urzogy+Fq6kzXsALPQLtw="; + sha256 = "sha256-4WwVoReJvFo0V6+ygYo1QKA/NB5ucQ1/m79s3i70p8g="; }; propagatedBuildInputs = [ From 5a43c9529d373c847056f063b02f0c65ba370867 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 364/737] python3Packages.google-api-python-client: 2.57.0 -> 2.61.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 845bb25638f5..73f8310cc0d8 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.57.0"; + version = "2.61.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7EQSVFsMWXioM7sDmTpGEhrSxwDzKvDLoj+EObP1+wI="; + sha256 = "sha256-3goMt7sY6/9c99x4K0ikiKFL12hLU4eZ8xvtq33iuD8="; }; propagatedBuildInputs = [ From 49551a49476a04bba37846cffe548787a2360ff4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 365/737] python3Packages.google-cloud-asset: 3.13.0 -> 3.13.1 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 2ab2ce584277..769648273770 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.13.0"; + version = "3.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UWy6dC1a9712pxT43JNP2CAbtXUFi2olvEm1eLw+z0g="; + hash = "sha256-FEgsqN1rgkryreNNotwzfErYAdwAjiJ9M7TfVJtQXUc="; }; propagatedBuildInputs = [ From e8672b4ccecb0724c7711d244b1db0198f8afa57 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 366/737] python3Packages.google-cloud-compute: 1.5.1 -> 1.5.2 --- .../python-modules/google-cloud-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 6e4e2d283f6f..f51cac5d8a5c 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.5.1"; + version = "1.5.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1crkhcf56U6DAx9xVG2e9hCxQ04OjQq2QgLs434cCv0="; + sha256 = "sha256-D0pIR1vQEt/7aIxMo0uDlxvt+fwS2DxCurU/lxMHAjo="; }; propagatedBuildInputs = [ From dbbf80b20fbbb29a43a31ba1748bfda7c36e15a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 367/737] python3Packages.google-cloud-spanner: 3.19.0 -> 3.20.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index fb35e7688e68..f37fade9c790 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.19.0"; + version = "3.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QGigxsIrIF/ey1hL5wTdo1Z6VqRQQX4vpgen1HgzaiQ="; + sha256 = "sha256-3KnpesMoqjjXgHjHihLN8cnYjtO07sbjHL1G4ZyInZ8="; }; propagatedBuildInputs = [ From 5763e070e8e7fd6c9f400b6f70d3714db37d47c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 368/737] python3Packages.gradient: 2.0.5 -> 2.0.6 --- 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 b78373294326..a9aadb85210b 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "gradient"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-D0JX6tk6SY5seH9m21hwMZ2TnaAG6OrHo+ucJEredd0="; + hash = "sha256-pqyyNzx2YPP3qmWQbzGd3q2HzCkrWlIVSJZeFrGm9dk="; }; postPatch = '' From c4f9177d3609df1dbd757a4d2a5a597f8d12b9b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:08 +0200 Subject: [PATCH 369/737] python3Packages.greenlet: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/greenlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 4264a8252610..12f3044f0680 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "1.1.2"; + version = "1.1.3"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a"; + sha256 = "sha256-vLbG3R1r5tONbbKDdH0H/aCJ/4xVmoNSNlYKRBA0BFU="; }; checkInputs = [ unittestCheckHook ]; From ec348571a416f2ed626a907729eb10168e14f9e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:09 +0200 Subject: [PATCH 370/737] python3Packages.hatch-fancy-pypi-readme: 22.3.0 -> 22.7.0 --- .../python-modules/hatch-fancy-pypi-readme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 0092f4b657a4..4e1a32236f0d 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "hatch-fancy-pypi-readme"; - version = "22.3.0"; + version = "22.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_fancy_pypi_readme"; inherit version; - hash = "sha256-fUZR+PB4JZMckoc8tRE3IUqTi623p1m4XB2Vv3T4bvo="; + hash = "sha256-3t8roLgaKXWrsd7ukxCy64XSI4D9oNUoaedgtUNapZY="; }; nativeBuildInputs = [ From c5c0c3f9ddf540c42d6be8cd489d939164deedd9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:09 +0200 Subject: [PATCH 371/737] python3Packages.hatchling: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/hatchling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 636d46dfdd7f..6006c30219e1 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -20,7 +20,7 @@ let pname = "hatchling"; - version = "1.8.0"; + version = "1.9.0"; in buildPythonPackage { inherit pname version; @@ -28,7 +28,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-pPmC/coHF9jEa/57UBMC+QqvKlMChF1VC0nIc5aB/rI="; + sha256 = "sha256-tXxzYvQ3uUJuS5QiiiHSrFgE+7KrywGt3iVEo1uzA80="; }; # listed in backend/src/hatchling/ouroboros.py From 3de48e8c32ef4f0e3104a4f7c61808962bd0620e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:09 +0200 Subject: [PATCH 372/737] python3Packages.idna: 3.3 -> 3.4 --- pkgs/development/python-modules/idna/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index dd0112860105..bf321edb38be 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -1,19 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytestCheckHook }: buildPythonPackage rec { pname = "idna"; - version = "3.3"; + version = "3.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"; + sha256 = "sha256-gU9Sjo3q19MpgzuRxfqofWC/cYJM0Sp1MLVSYGPQLLQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + flit-core + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = { homepage = "https://github.com/kjd/idna/"; From c4f68dcaf2c3d9344eb03c4ebb0115198883f8cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:09 +0200 Subject: [PATCH 373/737] python3Packages.imageio: 2.19.3 -> 2.21.3 --- 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 f657f73a7e41..5a0226f0d3d7 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.19.3"; + version = "2.21.3"; disabled = isPy27; src = fetchPypi { - sha256 = "sha256-DJ34DkLy7mi+qSAB5/z2EqoUmRDv4EDrdX9c4yMlCuE="; + sha256 = "sha256-sQpYPIMcky9K++qehAMILSp2sdMNdVW3d863BEGJCzw="; inherit pname version; }; From bab313a9e7555ed6f5f5d9d1e68ea479cddf28a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:09 +0200 Subject: [PATCH 374/737] python3Packages.importlib-resources: 5.8.0 -> 5.9.0 --- .../python-modules/importlib-resources/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 89537a8dfa2b..7e5d7e1448ac 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.8.0"; + version = "5.9.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "sha256-VoyfFssgT53syNbSSlcu7qJ9rLtM7p5rA6gCVzZ2l1E="; + sha256 = "sha256-VIHpf7Ra+Nzy95iVJiVZHFj+WZ0HNdhrEPVN4IamFoE="; }; nativeBuildInputs = [ From 48b797097751d4b88883e006b8d1f7be44019fbc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:09 +0200 Subject: [PATCH 375/737] python3Packages.inflect: 5.6.2 -> 6.0.0 --- pkgs/development/python-modules/inflect/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index bb98c5bd679f..6e64c946b980 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -3,22 +3,25 @@ , fetchPypi , isPy27 , setuptools-scm +, pydantic , pytestCheckHook }: buildPythonPackage rec { pname = "inflect"; - version = "5.6.2"; + version = "6.0.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qtx+1zko9eAUEpeUu6wDBYzKNdCpc6X8TrRcf6JgBfk="; + sha256 = "sha256-C8FRbsJyXi2CIXB6YSJFCTy28c6iCc/Yy9T8Xpb6Y2U="; }; nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ pydantic ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "inflect" ]; From e32ce4b6f600c1e0d9d782536a7849840dca64e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:09 +0200 Subject: [PATCH 376/737] python3Packages.ipykernel: 6.15.1 -> 6.15.3 --- 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 e3f981964b65..36bd9961903c 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.15.1"; + version = "6.15.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N6zDJUyqig2vzd3cjchjpgrRtGSHtoruNh2aFb2pgRI="; + sha256 = "sha256-uB1XsOFxZwhEvynNwRVisQENPahxFcRRPg7mYKg2h2U="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 From d2ab35f5e02e8de117b76bdf399b551a58d9200a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:09 +0200 Subject: [PATCH 377/737] python3Packages.ipyvuetify: 1.8.2 -> 1.8.4 --- pkgs/development/python-modules/ipyvuetify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index 567c033e243f..1fbf03cfa797 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.8.2"; + version = "1.8.4"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "sha256-uFjS7lv8kDRultRqqu2++1eieLs67dLolVurTXWls8A="; + sha256 = "sha256-viBWeFLGuKQKs9wXO3EULTNorrW25P2DFX1t5OmUcW0="; }; propagatedBuildInputs = [ ipyvue ]; From eeb99118277e52e5584d58b17519a896f853a847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 19 Sep 2022 07:17:36 +0200 Subject: [PATCH 378/737] python3Packages.openapi-spec-validator: add setuptools --- .../python-modules/openapi-spec-validator/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 2edd46419654..654d751509c5 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, setuptools # propagates , jsonschema @@ -36,6 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ From 43bc08486cf41c61b165c2dd5f40ae0adec62d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 19 Sep 2022 07:45:53 +0200 Subject: [PATCH 379/737] python3Packages.pyroute2: add setuptools --- pkgs/development/python-modules/pyroute2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index f5c4d936aebd..55ad79777e06 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -4,6 +4,7 @@ , importlib-metadata , mitogen , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-hahWY7BIO8c6DmCgG+feZdNikbYWycFCl0E6P1uEQ/M="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ mitogen ] ++ lib.optionals (pythonOlder "3.8") [ From 0a4898c21a04336bf9919da3ec95050890e77e5b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 19 Sep 2022 10:00:42 +0200 Subject: [PATCH 380/737] Revert "buildPython*: store dist (wheel/sdist) in dist output" Revert for now and fix on python-unstable branch. This reverts commit adbc59c9d3b6be2cdb1c29b84afa8b30d9cc7593. --- .../development/interpreters/python/hooks/default.nix | 5 ----- .../python/hooks/python-output-dist-hook.sh | 10 ---------- .../interpreters/python/mk-python-derivation.nix | 11 +---------- pkgs/top-level/python-packages.nix | 1 - 4 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 63e94b567035..903ad0215cdf 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -114,11 +114,6 @@ in rec { }; } ./python-namespaces-hook.sh) {}; - pythonOutputDistHook = callPackage ({ }: - makeSetupHook { - name = "python-output-dist-hook"; - } ./python-output-dist-hook.sh ) {}; - pythonRecompileBytecodeHook = callPackage ({ }: makeSetupHook { name = "python-recompile-bytecode-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh deleted file mode 100644 index e73e45cd597a..000000000000 --- a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh +++ /dev/null @@ -1,10 +0,0 @@ -# Setup hook for storing dist folder (wheels/sdists) in a separate output -echo "Sourcing python-catch-conflicts-hook.sh" - -pythonOutputDistPhase() { - echo "Executing pythonOutputDistPhase" - mv "dist" "$dist" - echo "Finished executing pythonOutputDistPhase" -} - -preFixupPhases+=" pythonOutputDistPhase" diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index abb1ceb7879e..a032c08d2a82 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -17,7 +17,6 @@ , pythonCatchConflictsHook , pythonImportsCheckHook , pythonNamespacesHook -, pythonOutputDistHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , setuptoolsBuildHook @@ -50,8 +49,6 @@ # Enabled to detect some (native)BuildInputs mistakes , strictDeps ? true -, outputs ? [ "out" ] - # used to disable derivation, useful for specific python versions , disabled ? false @@ -109,13 +106,11 @@ else let inherit (python) stdenv; - withDistOutput = lib.elem format ["pyproject" "setuptools" "flit"]; - name_ = name; self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" - "disabledTestPaths" "outputs" + "disabledTestPaths" ]) // { name = namePrefix + name_; @@ -149,8 +144,6 @@ let ] ++ lib.optionals (python.pythonAtLeast "3.3") [ # Optionally enforce PEP420 for python3 pythonNamespacesHook - ] ++ lib.optionals withDistOutput [ - pythonOutputDistHook ] ++ nativeBuildInputs; buildInputs = buildInputs ++ pythonPath; @@ -184,8 +177,6 @@ let # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; - outputs = outputs ++ lib.optional withDistOutput "dist"; - meta = { # default to python's platforms platforms = python.meta.platforms; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63d2022fac62..6be0b1807bc5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -119,7 +119,6 @@ in { pythonCatchConflictsHook pythonImportsCheckHook pythonNamespacesHook - pythonOutputDistHook pythonRecompileBytecodeHook pythonRelaxDepsHook pythonRemoveBinBytecodeHook From 3ff2d9362ce18cab4bebd6ebf17892e431df34e2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 19 Sep 2022 10:01:25 +0200 Subject: [PATCH 381/737] Revert "buildPython*: wrap setuptools in hook for catching conflicts" Revert for now and fix on python-unstable branch. This reverts commit 13bb0f49f7afe8296452d70e7782ac1d67b064da. --- pkgs/development/interpreters/python/hooks/default.nix | 3 ++- .../interpreters/python/hooks/python-catch-conflicts-hook.sh | 2 +- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 903ad0215cdf..5d605b240ad8 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -92,8 +92,9 @@ in rec { pythonCatchConflictsHook = callPackage ({ setuptools }: makeSetupHook { name = "python-catch-conflicts-hook"; + deps = [ setuptools ]; substitutions = { - inherit pythonInterpreter pythonSitePackages setuptools; + inherit pythonInterpreter; catchConflicts=../catch_conflicts/catch_conflicts.py; }; } ./python-catch-conflicts-hook.sh) {}; diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh index 0abcad3c42f2..374a2eddb407 100644 --- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh @@ -2,7 +2,7 @@ echo "Sourcing python-catch-conflicts-hook.sh" pythonCatchConflictsPhase() { - PYTHONPATH="@setuptools@/@pythonSitePackages@:$PYTHONPATH" @pythonInterpreter@ @catchConflicts@ + @pythonInterpreter@ @catchConflicts@ } if [ -z "${dontUsePythonCatchConflicts-}" ]; then diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index a032c08d2a82..f37ad592cb49 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -121,7 +121,7 @@ let ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ - pythonCatchConflictsHook + setuptools pythonCatchConflictsHook ] ++ lib.optionals removeBinBytecode [ pythonRemoveBinBytecodeHook ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ From 172f9cf80723482ab506365902a21025963bf4da Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 19 Sep 2022 18:13:01 +1000 Subject: [PATCH 382/737] boehmgc: disabled tests on x86_64-darwin --- pkgs/development/libraries/boehm-gc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 2e1c0010f512..513ae50298e2 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableMmap "--enable-mmap" ++ lib.optional enableLargeConfig "--enable-large-config"; - doCheck = true; + # `gctest` fails under emulation on aarch64-darwin + doCheck = !(stdenv.isDarwin && stdenv.isx86_64); enableParallelBuilding = true; From cfe3eabb1be28f3120b3be2148b18154c67b8054 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:09 +0200 Subject: [PATCH 383/737] python3Packages.ipywidgets: 7.7.1 -> 8.0.2 --- pkgs/development/python-modules/ipywidgets/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 62737e74785a..b4689b207756 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -6,18 +6,19 @@ , lib , nbformat , pytestCheckHook +, pytz , traitlets , widgetsnbextension }: buildPythonPackage rec { pname = "ipywidgets"; - version = "7.7.1"; + version = "8.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Xy+ht6+uGvMsiAiMmCitl43pPd2jk9ftQU5VP+6T3Ks="; + hash = "sha256-CMt1xuCpaDYUfL/cVVgK4E0T4F0m/7w3e04caLqiix8="; }; propagatedBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { jupyterlab-widgets traitlets nbformat + pytz widgetsnbextension ]; From 33b94889fd4f52ee58108c98257cd0f0b36ef205 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:10 +0200 Subject: [PATCH 384/737] python3Packages.jaraco.logging: 3.1.0 -> 3.1.2 --- .../python-modules/jaraco_logging/default.nix | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index d8ff10d95b62..1fa4e6dfed9f 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,20 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm -, tempora, six +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, tempora +, six }: buildPythonPackage rec { - pname = "jaraco.logging"; - version = "3.1.0"; + pname = "jaraco-logging"; + version = "3.1.2"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "150dc8701207b28bc65a16f0e91c07250a8d1b9da324ce674c0e375774944f13"; + pname = "jaraco.logging"; + inherit version; + sha256 = "sha256-k6cLizdnd5rWx7Vu6YV5ztd7afFqu8rnSfYsLFnmeTE="; }; pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ tempora six ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + tempora + six + ]; # test no longer packaged with pypi doCheck = false; @@ -25,5 +39,6 @@ buildPythonPackage rec { description = "Support for Python logging facility"; homepage = "https://github.com/jaraco/jaraco.logging"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From dfd910af8ddb64396ca06868005b29a40b4f7c70 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:10 +0200 Subject: [PATCH 385/737] python3Packages.jaraco.text: 3.8.1 -> 3.9.1 --- .../python-modules/jaraco_text/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 2bdf376ffe23..341c744a4293 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -2,22 +2,26 @@ , buildPythonPackage , fetchPypi , pythonOlder +, autocommand , importlib-resources , jaraco_functools , jaraco-context +, inflect +, pathlib2 +, pytestCheckHook , setuptools-scm }: buildPythonPackage rec { pname = "jaraco.text"; - version = "3.8.1"; + version = "3.9.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RQlXw/j7mlU9nT5gc4czqxxcwns2pGM0KtuTfppwqz4="; + sha256 = "sha256-1XzURIpYgCAxhCXgQZTol/lvwjuSuC/5MIok1cvys/s="; }; pythonNamespaces = [ @@ -29,14 +33,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + autocommand jaraco-context jaraco_functools + inflect ] ++ lib.optional (pythonOlder "3.9") [ importlib-resources ]; - # no tests in pypi package - doCheck = false; + checkInputs = [ + pytestCheckHook + ] ++ lib.optional (pythonOlder "3.10") [ + pathlib2 + ]; pythonImportsCheck = [ "jaraco.text" From 241d8b744adc4840ac91bdfaf2af00039214fae1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:10 +0200 Subject: [PATCH 386/737] python3Packages.jupyter-book: 0.13.0 -> 0.13.1 --- pkgs/development/python-modules/jupyter-book/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index a03910f6ce0b..7753f201a928 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.13.0"; + version = "0.13.1"; format = "flit"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0a956677e7bbee630dd66641c09a84091277887d6dcdd381a676f00fa9de2074"; + sha256 = "sha256-RgpC/H4J3kbdZsKuwYu7EOKCqcgM2v4uUsm6PVFknQE="; }; postPatch = '' From c2f5f2381a87c6a18c8fa8d45027d0dfba4c4b7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:10 +0200 Subject: [PATCH 387/737] python3Packages.jupyter_client: 7.3.4 -> 7.3.5 --- 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 6df956de5208..598cef9a8e58 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.3.4"; + version = "7.3.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qppsMgVLKQN0+V9zuwyukUVcWN+4T2XIWRkSuPZebVY="; + sha256 = "sha256-PFhGahuNVdugvzzgg05PW3dguvmNHXPbCt1vGd6ezR0="; }; nativeBuildInputs = [ From ea128f1aeee2a1d167c6ab26eabf1d77b9ab4f55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:10 +0200 Subject: [PATCH 388/737] python3Packages.jupyterlab: 3.4.6 -> 3.4.7 --- 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 b300d14b25c5..0053c50ef0c0 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.4.6"; + version = "3.4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-41mci8dM7gZBFfluOIzSeipyUbHcAvStG/in/1Jw8Xk="; + sha256 = "sha256-TcSKsJgOOvLpId/ybgAT3QOxBLG2fw2FtnRI4W4lMR4="; }; nativeBuildInputs = [ From 2462c67625d95b7cc9597e57a011b2eccd470832 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:10 +0200 Subject: [PATCH 389/737] python3Packages.jupyterlab-git: 0.39.0 -> 0.39.2 --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 3052167d1d31..b8914a2a45a0 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.39.0"; + version = "0.39.2"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "sha256-2BMSbZ5ICISavg1JON7fiKd4e4vAyWW+geSgxbMowis="; + sha256 = "sha256-+wzKAK5jdrlPjtVDgp7QqOyXaBDzzkRJI+6hcbOcnpo="; }; nativeBuildInputs = [ From 8495fb43efdaef13485cf9dc6774236f60af2f31 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:10 +0200 Subject: [PATCH 390/737] python3Packages.jupyterlab-widgets: 2.0.0b1 -> 3.0.3 --- .../development/python-modules/jupyterlab-widgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 26794fbc77b5..7077d39cb742 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "2.0.0b1"; + version = "3.0.3"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - sha256 = "1xinfk3bhqmfp9ygfpi8b87h4ky8dv3sdr96035psx1jjgyyw8bi"; + sha256 = "sha256-x2cYE5m0yotke+/i2ROxJg9Rv52O+behRjLUwae1Nr0="; }; nativeBuildInputs = [ From f0424a78f7d58a118b2babb1dcdbcfc6afbea40a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:10 +0200 Subject: [PATCH 391/737] python3Packages.jupyter-packaging: 0.12.2 -> 0.12.3 --- .../python-modules/jupyter-packaging/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index ae700d9a8068..1ee870bfd573 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -7,26 +7,32 @@ , packaging , pytestCheckHook , pytest-timeout +, setuptools , tomlkit }: buildPythonPackage rec { pname = "jupyter-packaging"; - version = "0.12.2"; + version = "0.12.3"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { pname = "jupyter_packaging"; inherit version; - sha256 = "sha256-C5nq7PVrnR2Z57y2Yy2RSo6laY2kCyOLqJIno0FX3jI="; + sha256 = "sha256-nZsrY7l//WeovFORwypCG8QVsmSjLJnk2NjdMdqunPQ="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ deprecation packaging tomlkit ]; + propagatedBuildInputs = [ + deprecation + packaging + setuptools + tomlkit + ]; checkInputs = [ pytestCheckHook From 2f55dfbc268f8428ee7a87895b2863d82d9d524d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:11 +0200 Subject: [PATCH 392/737] python3Packages.keras: 2.9.0 -> 2.10.0 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index edb928e682b7..32f4ad3a5995 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "2.9.0"; + version = "2.10.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - sha256 = "sha256-VZESVvic/JNDyfvkth7EWi0z2Jcpy+GrncrPiwe4tqs="; + sha256 = "sha256-JqbiwlIudGjd6iJxCpmzKQSTdo/AijnnXRFzoONFL98="; }; checkInputs = [ From d809e53667aaf900fac7844674f8f650da2bea65 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:11 +0200 Subject: [PATCH 393/737] python3Packages.keyring: 23.7.0 -> 23.9.1 --- pkgs/development/python-modules/keyring/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 743220e89ee7..cd1f4d6816aa 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -6,6 +6,7 @@ , setuptools-scm , importlib-metadata , dbus-python +, jaraco_classes , jeepney , secretstorage , pytestCheckHook @@ -13,14 +14,13 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.7.0"; - disabled = pythonOlder "3.7"; - + version = "23.9.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eC4c0RMukb9Fn80kO88lsyYBXBrAsZjkQI+R+meRBis="; + hash = "sha256-OeT2VyI40mFagvyqSF5gi4S1A88IDckkxDu7rLEcHBg="; }; nativeBuildInputs = [ @@ -30,9 +30,10 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ importlib-metadata ] ++ lib.optionals stdenv.isLinux [ + dbus-python + jaraco_classes jeepney secretstorage - dbus-python ]; pythonImportsCheck = [ From 4240a4ba5d60e1cc89773fabd3a77ce2cd2fc580 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:11 +0200 Subject: [PATCH 394/737] python3Packages.keyrings.alt: 4.1.1 -> 4.2.0 --- pkgs/development/python-modules/keyrings-alt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 45a85f0fd8fd..7b46634d9f4a 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "keyrings.alt"; - version = "4.1.1"; + version = "4.2.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-6HFSuVYvqCK1Ew7jECVRK02m5tsNrzjIcFZtCLhK3tY="; + sha256 = "sha256-K6PVZEG6Bjf1+cCWBo9nAQrART+dC2Jt4qowGTU7ZDE="; }; nativeBuildInputs = [ From 0b47da7a13bf8b812b50bce53ea0a9ad79d0ac3c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:11 +0200 Subject: [PATCH 395/737] python3Packages.llvmlite: 0.38.1 -> 0.39.1 --- pkgs/development/python-modules/llvmlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index b928fe59c1cd..d53d40ca3079 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.38.1"; + version = "0.39.1"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-BiKoYwH8+BzFDX7VtL6+mSwDBYDUE6hEOzKO1PTYJWE="; + sha256 = "sha256-tDq9fILoBSYcQl1QM1vppsT4QmTjTW1uR1IHMAAF1XI="; }; nativeBuildInputs = [ llvm ]; From 2dd3d11c7424279a75e2ac7d899a6d40f4edc765 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:11 +0200 Subject: [PATCH 396/737] python3Packages.localstack-ext: 1.0.4 -> 1.1.0 --- pkgs/development/python-modules/localstack-ext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 6ccef341fadf..607ac5a00d74 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "1.0.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YNj4V/mv8gn+TEPBejgyMIuSXYmIXNjk5xruyVbf1qA="; + sha256 = "sha256-EpFkam2xqRSiIhLkcBFSFKr9j0P5oRP4CIUVcjKT5gM="; }; postPatch = '' From dbe80f4b2c007120eb8244883de8e3ea3140b7f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:11 +0200 Subject: [PATCH 397/737] python3Packages.matplotlib: 3.5.2 -> 3.5.3 --- pkgs/development/python-modules/matplotlib/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 933fd3865d6b..ad32c3db7eb6 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.2"; + version = "3.5.3"; pname = "matplotlib"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "18h78s5ld1i6mz00w258hy29909nfr3ddq6ry9kq18agw468bks8"; + sha256 = "sha256-M5ysSLgN28i/0F2q4KOnNBRlGoWWkEwqiBz9Httl8mw="; }; XDG_RUNTIME_DIR = "/tmp"; @@ -112,6 +112,9 @@ buildPythonPackage rec { echo "[libs] system_freetype=true system_qhull=true" > mplsetup.cfg + + substituteInPlace setup.py \ + --replace "setuptools_scm>=4,<7" "setuptools_scm>=4" ''; # Matplotlib needs to be built against a specific version of freetype in From a486245526a3d9593e61d1a1be33364035aef178 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:11 +0200 Subject: [PATCH 398/737] python3Packages.matplotlib-inline: 0.1.3 -> 0.1.6 --- .../python-modules/matplotlib-inline/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix index d863239430dc..deb2a68f2504 100644 --- a/pkgs/development/python-modules/matplotlib-inline/default.nix +++ b/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "matplotlib-inline"; - version = "0.1.3"; + version = "0.1.6"; src = fetchPypi { inherit pname version; - sha256 = "a04bfba22e0d1395479f866853ec1ee28eea1485c1d69a6faf00dc3e24ff34ee"; + sha256 = "sha256-+Ifl8Qupjo0rFQ3c9HAsHl+LOiAAXrD3S/29Ng7m8wQ="; }; propagatedBuildInputs = [ @@ -20,7 +20,12 @@ buildPythonPackage rec { # wants to import ipython, which creates a circular dependency doCheck = false; - pythonImportsCheck = [ "matplotlib_inline" ]; + + # + pythonImportsCheck = [ + # tries to import matplotlib, which can't work with doCheck disabled + #"matplotlib_inline" + ]; passthru.tests = { inherit ipython; }; From 17aab92d816d4335cb538fb9f8eccfe843741d88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:12 +0200 Subject: [PATCH 399/737] python3Packages.metakernel: 0.29.0 -> 0.29.2 --- 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 417b4d914e63..5cc40f4a6ca6 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.29.0"; + version = "0.29.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+B8ywp7q42g8H+BPFK+D1VyLfyqgnrYIN3ai/mdcwcA="; + sha256 = "sha256-A++uLR4hhOQYmA6o9wBTejFju3CpbK0hwIs7XFscddQ="; }; propagatedBuildInputs = [ ipykernel ]; From 135ebd6c82313b81c882517e3f272549cfccd56e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:12 +0200 Subject: [PATCH 400/737] python3Packages.mocket: 3.10.6 -> 3.10.8 --- pkgs/development/python-modules/mocket/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 1e9203f4abe0..b79673e2b240 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -10,7 +10,9 @@ , pytestCheckHook , pytest-mock , aiohttp +, fastapi , gevent +, httpx , redis , requests , sure @@ -19,12 +21,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.6"; + version = "3.10.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-pD6WiK3OgDD2Xy9r59KOB9TT/LNiQa/DWRXA+w76oe8="; + sha256 = "sha256-aiofKFE9CPLMVJm+IT6VmtJSsVuH7ucpv5Kp1w7d2FE="; }; propagatedBuildInputs = [ @@ -38,7 +40,9 @@ buildPythonPackage rec { pytestCheckHook pytest-mock aiohttp + fastapi gevent + httpx redis requests sure From cd931da1393893a35d1015d216b09fa3b3661a1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:12 +0200 Subject: [PATCH 401/737] python3Packages.more-itertools: 8.13.0 -> 8.14.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 9f3ce69394fa..1735148c58ec 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.13.0"; + version = "8.14.0"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pCkBoKWxadkl9vIXzVoZDjLvVDYJBbnDnufbUxO/7A8="; + sha256 = "sha256-wJRDzT1UOLja/M2GemvBywiUOJ6Qy1PSJ0VrCwvMt1A="; }; nativeBuildInouts = [ From c0d116921b0738801721b1dfa3d4d80d2884b09e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:12 +0200 Subject: [PATCH 402/737] python3Packages.moto: 3.1.16 -> 4.0.3 --- pkgs/development/python-modules/moto/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 355ad0766c62..220c3aa3caa1 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -36,16 +36,21 @@ buildPythonPackage rec { pname = "moto"; - version = "3.1.16"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-y+itipSfUZdx5dJbZwc4YEdX+2fNR0110UwgZ3WC6B8="; + sha256 = "sha256-iutWdX5oavPkpj+Qr7yXPLIxrarYfFzonmiTbBCbC+k="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "werkzeug>=0.5,<2.2.0" "werkzeug>=0.5" + ''; + propagatedBuildInputs = [ aws-xray-sdk boto3 @@ -96,6 +101,7 @@ buildPythonPackage rec { "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" + "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" # Disalbe test that require docker daemon "--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda" From f0ac1bb51eb90ed08664f3eecffa39899ecb5197 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:12 +0200 Subject: [PATCH 403/737] python3Packages.msldap: 0.3.40 -> 0.4.1 --- pkgs/development/python-modules/msldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 0c0eecbac12f..ffe20cb4f549 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.40"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4sIqbjlrTX1l1zhj7URhISDo4lcP+JW1Qh3fajUAhbs="; + hash = "sha256-+zfFCWtqIrK0tQNJ+noilvvXO6y1umWoNQ2TvhDosls="; }; propagatedBuildInputs = [ From c44b32597986d3014b53620a960d4dc27999e3e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:12 +0200 Subject: [PATCH 404/737] python3Packages.murmurhash: 1.0.7 -> 1.0.8 --- pkgs/development/python-modules/murmurhash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index 23587889f6a3..6e2b5bd49d89 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "murmurhash"; - version = "1.0.7"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ywo5br0xykTYm07KNvp06oquckrfCvqi3naAw1Cyk28="; + sha256 = "sha256-i7A6rYQoN6ZLDB0u0itQ66hfn6UUdsi8CnfDZql58fM="; }; postPatch = '' From bde09a920dc6128772fafcaad09cfb9f5322c938 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:12 +0200 Subject: [PATCH 405/737] python3Packages.myfitnesspal: 1.17.0 -> 2.0.0 --- pkgs/development/python-modules/myfitnesspal/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 791cb708be5c..433f06a0c50b 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , blessed +, browser-cookie3 , keyring , keyrings-alt , lxml @@ -18,18 +19,19 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.17.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UXFvKQtC44EvscYWXK7KI/do3U0wTWI3zKwvsRdzKrs="; + sha256 = "sha256-xkO4rzjQTf1H4ZtJlzx6dT6BnfSg3VZU8pXdJFraTAI="; }; propagatedBuildInputs = [ blessed + browser-cookie3 keyring keyrings-alt lxml From 3adc90e49ccf50bf2df95774dee74e5f7cf38f0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:12 +0200 Subject: [PATCH 406/737] python3Packages.mypy-protobuf: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/mypy-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index f1c7d83a6bae..007fd2fd015f 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "3.2.0"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cwqhUzfDjwRG++CPbGwjcO4B05USU2nUtw4IseLuMO4="; + sha256 = "sha256-JPOwrssGZW6YP1jgfHMqkFd7nXrz4QZvwrZju/A3Akg="; }; propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ]; From 113ebb039c5fc84d0892567540779b552ba04cc7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 407/737] python3Packages.natsort: 8.1.0 -> 8.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 3b3682b335e9..065367e36dd6 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 = "8.1.0"; + version = "8.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-x8Hz8nw3Vxmk38qzU5Cf458mwgMqBiqMgMyETqrKBEU="; + hash = "sha256-V/hbcsaIsJ4FPNrDAt1bW1PfX3OuILSHT8v/2L94PRE="; }; propagatedBuildInputs = [ From eb91570c7a496e1125ff2964dbdf02345746da08 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 408/737] python3Packages.nbformat: 5.4.0 -> 5.5.0 --- .../python-modules/nbformat/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index e5185aa37f66..fabee5f10a2b 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fastjsonschema +, flit-core , pytestCheckHook , glibcLocales , ipython_genutils @@ -9,21 +10,36 @@ , testpath , jsonschema , jupyter_core +, pep440 }: buildPythonPackage rec { pname = "nbformat"; - version = "5.4.0"; + version = "5.5.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RLpcpqy4DF1aUA8eW4Pt6MvjZNWklcTIz2Cq8bplZQE="; + sha256 = "sha256-nr4w5sOz5bR9Of8KOJehrPUj0r+vy04tBM23D4pmxQc="; }; + nativeBuildInputs = [ + flit-core + ]; + LC_ALL="en_US.utf8"; + propagatedBuildInputs = [ + fastjsonschema + ipython_genutils + jsonschema + jupyter_core + pep440 + testpath + traitlets + ]; + checkInputs = [ pytestCheckHook glibcLocales ]; - propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core fastjsonschema ]; preCheck = '' mkdir tmp From 8fe0a13463c65661f5d5e2aba1ccaebafe396bf4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 409/737] python3Packages.neo: 0.10.2 -> 0.11.0 --- pkgs/development/python-modules/neo/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index d6be449eb1b1..2c3873981e88 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -3,24 +3,26 @@ , fetchPypi , nose , numpy +, packaging , quantities , pythonOlder }: buildPythonPackage rec { pname = "neo"; - version = "0.10.2"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LUIYsIJtruqIDhVSJwYAKew4oAI4zrXwlxONlGfGOZs="; + sha256 = "sha256-zfjhMko/u9Hv1WGNzTfPxJexmXkjvXELWYRywdhGZ0o="; }; propagatedBuildInputs = [ numpy + packaging quantities ]; From 3fd41495a503eac662dec88b7dfd164b6d154298 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 410/737] python3Packages.networkx: 2.8.4 -> 2.8.6 --- pkgs/development/python-modules/networkx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 3acf8cdf6385..7c026be5cd26 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.8.4"; + version = "2.8.6"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XlPwJ8DVZ88fiE27KDIk31JWROQ6/RFF1kydiKNYR2I="; + sha256 = "sha256-vSt3MDAIYMvS2v6OWvif9cmmXDl1s1J5nYemI4tDAaY="; }; propagatedBuildInputs = [ decorator setuptools ]; From 3259ef3795f69b2b0d54f798394b2783e5e1183c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 411/737] python3Packages.nilearn: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 85df64f20933..576724c9c256 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3YIbT/KzuH9eSwNOoPlfzkN1rOWG3o7Rfmpme94ZJdc="; + sha256 = "sha256-jajTg12SzXuKbMkkVaSJ1+f1mUz2T8cbzmU+NidzueQ="; }; checkInputs = [ pytestCheckHook ]; From 9c161fa66255b34a85fdaf0ae7f329671fdd9bf9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 412/737] python3Packages.nipype: 1.8.3 -> 1.8.4 --- 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 42d05d24775b..fc221085f98e 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.8.3"; + version = "1.8.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-Z/qa0NotxWFzweFHRm/MbJImivV8AZl68yiQ1jNvcAQ="; + sha256 = "sha256-yoG6iLfF7ugBL4eNC9OLINIzBj1YgF4TVngFKb77qak="; }; postPatch = '' From 5028050a62612c0da85afdaa6886476dd85a35b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 413/737] python3Packages.num2words: 0.5.11 -> 0.5.12 --- pkgs/development/python-modules/num2words/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index 8679da592cb6..9e8c0961680e 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.5.11"; + version = "0.5.12"; pname = "num2words"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bGhOIiDYrbNhLSyAepdyzDJplj+81395ebaJp39gQ9Q="; + sha256 = "sha256-fnwLDwgEBao6HdnTKxypCzvwO6sXuOVNsF4beDAaCYg="; }; propagatedBuildInputs = [ docopt ]; From 79849def01e5345b05ee12e5dc8c150f5ee83741 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 414/737] python3Packages.numba: 0.55.2 -> 0.56.2 --- pkgs/development/python-modules/numba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 9953ddec3690..d5404954683a 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -22,13 +22,13 @@ let inherit (cudaPackages) cudatoolkit; in buildPythonPackage rec { - version = "0.55.2"; + version = "0.56.2"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-5CjZ4R2bpZKEnMyfegCQA+t9MGEgB+Nlr+dDznEYxvQ="; + hash = "sha256-NJLwpdCeJX/FIfU3emxrkH7sGSDRRznwskWLnSmUalo="; }; postPatch = '' From d414351266009fa586cb4b623a144c72d7149435 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 415/737] python3Packages.numcodecs: 0.10.0 -> 0.10.2 --- pkgs/development/python-modules/numcodecs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 438a54127a07..3137fa7acd37 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -4,6 +4,7 @@ , isPy27 , setuptools-scm , cython +, entrypoints , numpy , msgpack , pytestCheckHook @@ -13,12 +14,12 @@ buildPythonPackage rec { pname = "numcodecs"; - version = "0.10.0"; + version = "0.10.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-LdQlZOd3KpOFkjsCo2Pjzt8FPOkwlKkGRIXn9ppvHJI="; + sha256 = "sha256-IoOMaz/Zhr2cckA5uIhwBX95DiKyDm4cu6oN4ULdWcQ="; }; nativeBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + entrypoints numpy msgpack ]; From 422ce1815d4fb46c13bd53e8f71b3c8c4604214d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:13 +0200 Subject: [PATCH 416/737] python3Packages.oauthenticator: 15.0.1 -> 15.1.0 --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 08a34aed2155..4e1b032de0ec 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "15.0.1"; + version = "15.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LjC/Ly3wQL55gjCyoWZikvK6ByiS1CEsZXK0/lmzmGA="; + hash = "sha256-0dmHPJtm4a+XMpGWi5Vz0lN4vYxkfzDXO42PsnsaC4U="; }; propagatedBuildInputs = [ From 37bead230547d22d0d3a07bde1e5f2dbfdfed8a2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:14 +0200 Subject: [PATCH 417/737] python3Packages.openstackdocstheme: 2.4.0 -> 3.0.0 --- .../development/python-modules/openstackdocstheme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 0a04006704c1..b2d1a028b955 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "openstackdocstheme"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dFrZTObRDKB8aw1/i6febpttymbY3cPzA3ckNuhVt4c="; + sha256 = "sha256-csbU+am2OXp4xJ60P4Cp2i7TCz+PnRg3BCcc9+PyPM8="; }; postPatch = '' From f4cc27e7b639016c360a0cb18bd7a553a7421164 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:14 +0200 Subject: [PATCH 418/737] python3Packages.oslo-concurrency: 5.0.0 -> 5.0.1 --- pkgs/development/python-modules/oslo-concurrency/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 3706a4577bf5..f809bfc5f2ac 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.0.0"; + version = "5.0.1"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - sha256 = "sha256-n0aUbp+KcqBvFP49xBiaTT3TmGKDFSU5OjEZvbvniX4="; + sha256 = "sha256-DfvzYJX0Y3/7tl5cJB9MJYUavTtyjd2tnwc5YwKnJUQ="; }; postPatch = '' From 3a2fd43ad016f05ce91531e8f87b55cd9d3cb1cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:14 +0200 Subject: [PATCH 419/737] python3Packages.oslo-utils: 6.0.0 -> 6.0.1 --- pkgs/development/python-modules/oslo-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 45e400856ba7..fe207cbd5c46 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "6.0.0"; + version = "6.0.1"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-CpLiTESWht7CgAlXZr4+uOV/EyXNpMbyEpVBVk5ei6g="; + sha256 = "sha256-mwRU+ZQV0MqsXIYFNxbXRtGY7Oxm5nLY5eY4a2+6orY="; }; postPatch = '' From 7a498f272c1a69cdb03b7ff673ef78fa1f5f01be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:14 +0200 Subject: [PATCH 420/737] python3Packages.OWSLib: 0.26.0 -> 0.27.2 --- pkgs/development/python-modules/owslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 10e7580af616..c2783642b514 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.26.0"; + version = "0.27.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jEywYzjrZAXCrs7QttCFaCqmHw8uUo8ceI1o3FDflBs="; + sha256 = "sha256-4QKqJETf4MhDmrHhd2zA+kfOoowJuKKCEsiTxgF8F5s="; }; # as now upstream https://github.com/geopython/OWSLib/pull/824 From 4c2aaa2f08f4527008b5648304bde2f6a961c032 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:14 +0200 Subject: [PATCH 421/737] python3Packages.parsimonious: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/parsimonious/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index d517e9433e41..f22b1b605e34 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "parsimonious"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sq0a5jovZb149eCorFEKmPNgekPx2yqNRmNqXZ5KMME="; + hash = "sha256-goFgDaGA7IrjVCekq097gr/sHj0eUvgMtg6oK5USUBw="; }; propagatedBuildInputs = [ From 25d75f0c97d72cc16ca651d20b6c5b4abb09c4d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:14 +0200 Subject: [PATCH 422/737] python3Packages.partd: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/partd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 9b5a94fa9107..7f6fa7b510f7 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "partd"; - version = "1.2.0"; + version = "1.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "aa67897b84d522dcbc86a98b942afab8c6aa2f7f677d904a616b74ef5ddbc3eb"; + sha256 = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU="; }; checkInputs = [ pytest ]; From dfdb6f4e7b280bf2f9c8e9cf144ba142b75d9da5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:14 +0200 Subject: [PATCH 423/737] python3Packages.pathspec: 0.9.0 -> 0.10.1 --- pkgs/development/python-modules/pathspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 6a0281b756ec..d3485003dc97 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.9.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"; + sha256 = "sha256-es5hYbYh0x55AutrWuFI0Sz9I/SiSbn/trn+4SCEMj0="; }; meta = { From 15aaccd1b3c8ad5d6e073c3952f39893420969b8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:14 +0200 Subject: [PATCH 424/737] python3Packages.pbr: 5.9.0 -> 5.10.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 7fb0574f75a0..0fe9ac5a7367 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.9.0"; + version = "5.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6Nyi9LQ1YO3vWIE5afUqVs7wIxRsu4kxYm24DmwcQwg="; + sha256 = "sha256-z8xP+OaYJW/BfqP/eWR4sFCFJYWqW6557NBbKrezm5o="; }; # importlib-metadata could be added here if it wouldn't cause an infinite recursion From 9792a8bad4a71c6329f899f4ffbeaaf5ac3f6ede Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:15 +0200 Subject: [PATCH 425/737] python3Packages.pep517: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/pep517/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index ad58cdb72d4d..9848e2780173 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.12.0"; + version = "0.13.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0"; + sha256 = "sha256-rmmSfFwXK+Gt2SA3JtS4TPPrrR7c1fcfzcdG5m6Cn1k="; }; nativeBuildInputs = [ From e1df56d2ced5e77eef6967d011893b730c16f406 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:15 +0200 Subject: [PATCH 426/737] python3Packages.phonenumbers: 8.12.51 -> 8.12.55 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index f0538c25d376..c1827559fbf5 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.51"; + version = "8.12.55"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-nUqUYBJ//SiK4HHdH3lC4jKdpbXF1X2Kq+cQNCfKfL8="; + hash = "sha256-G+PHNT6TJd3qqQmrF5NkI8YpWNVwDWjl2lvpUDxG0Ic="; }; checkInputs = [ From 2dc2124dcf55f4100cd353edc4a6d9b83d20f51f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:15 +0200 Subject: [PATCH 427/737] python3Packages.piep: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/piep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index c99f408db62f..8db4f09a9249 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.9.2"; + version = "0.10.0"; pname = "piep"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0b5anpsq16xkiisws95jif5s5mplkl1kdnhy0w0i6m0zcy50jnxq"; + sha256 = "sha256-aM7KQJZr1P0Hs2ReyRj2ItGUo+fRJ+TU3lLAU2Mu8KA="; }; propagatedBuildInputs = [ pygments ]; From 0b8c1f48094459fc446fbc09810637cfaad12546 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:15 +0200 Subject: [PATCH 428/737] python3Packages.plotly: 5.9.0 -> 5.10.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 79c7784e23bb..f150945a37cb 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.9.0"; + version = "5.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sFNucrvAs88WmsH9AHWdd6rnuxKuN4zcdcXcNi9d5XY="; + sha256 = "sha256-TTbZhZt6FTsnNWLe7tjCklh6Ry6x/VfNQVjsidne+ts="; }; propagatedBuildInputs = [ From 5512fe12f7a3a536fae9a7105934a9018b347dcf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:15 +0200 Subject: [PATCH 429/737] python3Packages.plugincode: 30.0.0 -> 31.0.0 --- pkgs/development/python-modules/plugincode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugincode/default.nix b/pkgs/development/python-modules/plugincode/default.nix index 2e54d5604e19..e3265ec5b34d 100644 --- a/pkgs/development/python-modules/plugincode/default.nix +++ b/pkgs/development/python-modules/plugincode/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "plugincode"; - version = "30.0.0"; + version = "31.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QjcQCvhlaBzcbBB8MIhbsx4cRy7XkdvUcmG7rM48Sos="; + hash = "sha256-0BfdHQn/Kgct4ZT34KhMgMC3nS0unE3iL7DiWDhXDSk="; }; dontConfigure = true; From c40e78aa785476dd79a389ed3ac50c8d18a2c0c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:15 +0200 Subject: [PATCH 430/737] python3Packages.prettytable: 3.3.0 -> 3.4.1 --- 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 21e7a455da88..922f85990db7 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 = "3.3.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EY61T9J5QEm4EIk2U7IJUjSd9tO8F2Tn+s2KGAZPqbA="; + sha256 = "sha256-fX3YTQsgby2qxEcacvKZ1pB/NFFgZP6yg44zOk4lZ70="; }; nativeBuildInputs = [ setuptools-scm ]; From bb049833aef30ed8fe3b6e66191c3afda5a8a76f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:15 +0200 Subject: [PATCH 431/737] python3Packages.prompt-toolkit: 3.0.30 -> 3.0.31 --- pkgs/development/python-modules/prompt-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index f87558e5194c..038575794bd3 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.30"; + version = "3.0.31"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "sha256-hZsoPFC95F9fl4Kfd6RnTRwfzYhTk2Txsoo3gFz9icA="; + sha256 = "sha256-mtqVLJ0Xh/Uv9tXzSE0LTfiVJ4fAh+32offCyx6ogUg="; }; propagatedBuildInputs = [ From c8381b01494cbbd33c6f6eb98d822987c01ea29f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:15 +0200 Subject: [PATCH 432/737] python3Packages.proto-plus: 1.22.0 -> 1.22.1 --- 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 266294325c17..3d3646d5c839 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.22.0"; + version = "1.22.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-wuZpP99oxAWmQoImkVqGJdIdBRN5NZiuMoehIQR42Ow="; + sha256 = "sha256-bH39Ei3++AGf9lR0a+T1sdnIC7p4f+lhG1CN2Ivjovo="; }; propagatedBuildInputs = [ protobuf ]; From 3370ff051c7af2a99b8e334c23a8ccfb328161ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:15 +0200 Subject: [PATCH 433/737] python3Packages.psutil: 5.9.1 -> 5.9.2 --- pkgs/development/python-modules/psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 197da3c76ce6..3815a64eec60 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.9.1"; + version = "5.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-V/GBm12elc37DIgailt9VC7Qt8Ui1XVwaoC+3ISMiVQ="; + sha256 = "sha256-/rhhoQtsO7AHAQY7N+Svx1T4IX8PCcQigFhr1qxxK1w="; }; # We have many test failures on various parts of the package: From 683050486861fef92a4033b764f3102c82b2cda4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 434/737] python3Packages.py4j: 0.10.9.5 -> 0.10.9.7 --- 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 dac1ecb9ec1f..3f7a7e188232 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.5"; + version = "0.10.9.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J2pKPFohVN8YYO8zA6knRg4C6XsEfcCkfBw/uMzjTbY="; + sha256 = "sha256-C25TFbs62lz2KsZR0Qe7LrwC3vPe6dlUjjuqxkTqjbs="; }; # No tests in archive From 1de81696086943f1a370da6e4cc4839e86d9b844 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 435/737] python3Packages.pybids: 0.15.1 -> 0.15.3 --- 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 bddb9fb52200..18717f40f4fe 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.15.1"; + version = "0.15.3"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AlNQegTb/qQ+sfdaH3GqsEviEHa/6WwASIgAC4AuOPI="; + sha256 = "sha256-TZnJebxLwgnP9woC0downJv4xrAzjioLZuvqd8fzxGE="; }; propagatedBuildInputs = [ From 6ce3d81ba3530a09ca18a1a55988b8157003b4a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 436/737] python3Packages.pycares: 4.2.1 -> 4.2.2 --- pkgs/development/python-modules/pycares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index c8e8fdb7b3d9..74dc59aefbe8 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycares"; - version = "4.2.1"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c1tPdf0PWVxOkYTaGM2Hc39GvIGmTqQfTtzitraNRtI="; + sha256 = "sha256-4fV6gAQ3AIBpS9b7lpof/JFxpZxoJNVPeRwbLk0pg4U="; }; buildInputs = [ From ab1c0dc6048f653f291a5a5cd3edd7d5a67ae7d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 437/737] python3Packages.pydispatcher: 2.0.5 -> 2.0.6 --- .../python-modules/pydispatcher/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index d949b16d1057..902f39e6b970 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -1,23 +1,22 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook }: buildPythonPackage rec { - version = "2.0.5"; + version = "2.0.6"; pname = "pydispatcher"; src = fetchPypi { - inherit pname version; - sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m"; + pname = "PyDispatcher"; + inherit version; + hash = "sha256-PX5PQ8cAAKHcox+SaU6Z0BAZNPpuq11UVadYhY2G35U="; }; - checkInputs = [ pytest ]; - - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "http://pydispatcher.sourceforge.net/"; From b226724c859759656b0befb0990e84cc3bb8df1a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 438/737] python3Packages.pyfakefs: 4.6.2 -> 4.6.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 9f9dbe7fd7bf..bac9202a2b22 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.6.2"; + version = "4.6.3"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jdnIAgvNCB8llleoadXq+cynuzZzx/A7+uiyi751mbY="; + sha256 = "sha256-bfEqfPZXY3obA2vCAFlyfGQvkpkOkP7i+wA9qjzabKE="; }; postPatch = '' From 7466b96d590797eaeaaa88fe4e397a4d372231e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 439/737] python3Packages.pygit2: 1.9.2 -> 1.10.1 --- pkgs/development/python-modules/pygit2/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 9e293e65a09b..565cd6d67ec9 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -4,7 +4,6 @@ , cacert , cached-property , cffi -, fetchpatch , fetchPypi , isPyPy , libgit2 @@ -15,25 +14,16 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.9.2"; + version = "1.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk="; + hash = "sha256-NUZRvwYsAtHwgEHW+/GptL96k6/OZZeb3Ai9xlZTqi4="; }; - patches = [ - # libgit 2 fix - (fetchpatch { - url = "https://github.com/libgit2/pygit2/commit/14b1df84060ea4ab085202382e80672ec1a104e3.patch"; - includes = [ "src/types.h" ]; - sha256 = "sha256-2krkyAT30l/olSEl2ugWCsylvGuT7VvkuSFVshIXktA="; - }) - ]; - preConfigure = lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; From 10508d54516dd983173f5bfa2b2dd2b3ee7f7443 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 440/737] python3Packages.pygraphviz: 1.9 -> 1.10 --- pkgs/development/python-modules/pygraphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 3780122f19f7..15f57612ac66 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.9"; + version = "1.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-+hj3xs6ig0Gk5GbtDPBWgrCmgoiv6N18lCZ4L3wa4Bw="; + hash = "sha256-RX4JOoiBKJAyUaJmqMwWtLqT8/YzSz6/7ZLHRxp02Gc="; extension = "zip"; }; From e2870d550b34124f419a27efd913d387d1b9af40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 441/737] python3Packages.PyHamcrest: 2.0.3 -> 2.0.4 --- .../python-modules/pyhamcrest/default.nix | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index a4c04ce79ee6..ffe11cc140b3 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -1,20 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi -, mock, pytest -, six +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, hatch-vcs +, numpy +, pythonOlder +, pytest-xdist +, pytestCheckHook }: -buildPythonPackage rec { - pname = "PyHamcrest"; - version = "2.0.3"; - src = fetchPypi { - inherit pname version; - sha256 = "dfb19cf6d71743e086fbb761ed7faea5aacbc8ec10c17a08b93ecde39192a3db"; +buildPythonPackage rec { + pname = "pyhamcrest"; + version = "2.0.4"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hamcrest"; + repo = "PyHamcrest"; + rev = "refs/tags/V${version}"; + hash = "sha256-CIkttiijbJCR0zdmwM5JvFogQKYuHUXHJhdyWonHcGk="; }; - checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ six ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - doCheck = false; # pypi tarball does not include tests + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + checkInputs = [ + numpy + pytest-xdist + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/hamcrest/PyHamcrest"; From 6d6e7b49b12f9f2d56d02c3a78bdb2c2e080e24c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 442/737] python3Packages.pyjnius: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/pyjnius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyjnius/default.nix b/pkgs/development/python-modules/pyjnius/default.nix index b53dd83205f3..84f7a337a661 100644 --- a/pkgs/development/python-modules/pyjnius/default.nix +++ b/pkgs/development/python-modules/pyjnius/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyjnius"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "8bc1a1b06fb11df8dd8b8d56f5ecceab614d4ba70cf559c64ae2f146423d53ce"; + sha256 = "sha256-/AY3zaSuEo7EqWrDJ9NS6H6oZnZLAdliZyhwvlOana4="; }; propagatedBuildInputs = [ six From eeba93090ada85c9942923a60d507187cbcec145 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:16 +0200 Subject: [PATCH 443/737] python3Packages.pymongo: 4.1.1 -> 4.2.0 --- 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 9ebe37f4b8da..285a729eb894 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 = "4.1.1"; + version = "4.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-17jyXJsAQ8uvd7i4lYFOM+ejyAeglzd8B+G9SZRgMNU="; + sha256 = "sha256-cvM49qq9N9NDvZ0f3T3pIRBNOVdmvMXNxAOeTC3Zd2Y="; }; # Tests call a running mongodb instance From 9edf5e8b4e883667fdc9f7fb0a8eb07510e2f6f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:17 +0200 Subject: [PATCH 444/737] python3Packages.pynisher: 0.6.4 -> 1.0.0 --- pkgs/development/python-modules/pynisher/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 942192c57dc5..8dc5d1eaa9f6 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -1,26 +1,26 @@ { lib , buildPythonPackage -, docutils , fetchPypi , psutil , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "pynisher"; - version = "0.6.4"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ER2RqtRxN1wFCakSQV/5AFPvkJEA+s9BJRE4OvEHwSQ="; + hash = "sha256-5FJQCN+yO1gh7HK47MRR/SAr8Qzix3bfrjyzsakBQXA="; }; propagatedBuildInputs = [ psutil - docutils + typing-extensions ]; # No tests in the Pypi archive From 7ac45016ece4452aff6b70e8e87d841df87c4e5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:17 +0200 Subject: [PATCH 445/737] python3Packages.pyotp: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/pyotp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index 16916666a0d5..8b64a713d9f4 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.6.0"; + version = "2.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d28ddfd40e0c1b6a6b9da961c7d47a10261fb58f378cb00f05ce88b26df9c432"; + sha256 = "sha256-zpifq6Dfd9wDK0XlHGzKQrzyCJbI09HnzXWaU9x9bLU="; }; pythonImportsCheck = [ "pyotp" ]; From 7f859cf9d7555a8fc6cbe7e10a8d2a10061ccfb4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:17 +0200 Subject: [PATCH 446/737] python3Packages.pypugjs: 5.9.11 -> 5.9.12 --- .../python-modules/pypugjs/default.nix | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index cfc7fbf2ded3..b983bedc4098 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -1,21 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, six, chardet, nose -, django, jinja2, tornado, pyramid, pyramid_mako, Mako }: +{ lib +, buildPythonPackage +, charset-normalizer +, django +, fetchFromGitHub +, jinja2 +, Mako +, nose +, pyramid +, pyramid_mako +, pytestCheckHook +, six +, tornado +}: buildPythonPackage rec { pname = "pypugjs"; - version = "5.9.11"; + version = "5.9.12"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kStaT1S8cPJF+iDFk/jLGKi3JVOMmtf7PzeYDKCdD0E="; + src = fetchFromGitHub { + owner = "kakulukia"; + repo = "pypugjs"; + rev = "v${version}"; + sha256 = "sha256-6tIhKCa8wg01gNFygCS6GdUHfbWBu7wOZeMkCExRR34="; }; - propagatedBuildInputs = [ six chardet ]; - checkInputs = [ nose django jinja2 tornado pyramid pyramid_mako Mako ]; + propagatedBuildInputs = [ six charset-normalizer ]; - checkPhase = '' - nosetests pypugjs - ''; + checkInputs = [ + django + jinja2 + Mako + nose + tornado + pyramid + pyramid_mako + pytestCheckHook + ]; + + pytestCheckFlags = [ + "pypugjs/testsuite" + ]; meta = with lib; { description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates"; From 8c53219d0882aa164483d230b2c656e38f7e1d9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:17 +0200 Subject: [PATCH 447/737] python3Packages.pypykatz: 0.5.7 -> 0.6.1 --- pkgs/development/python-modules/pypykatz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index 72fdb6d3c5b4..5a3137063afa 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.5.7"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G+dbP+xtRH8dIU70HbimRJV+e/yYlo2ds5OAIzUcydY="; + hash = "sha256-GbIWxYCVmNXUwn6W4a/cl1XOTbWkpBemKcmjOvnXER4="; }; propagatedBuildInputs = [ From 9dfae070d390f26d7b87d927e0ad28383f97ccde Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:17 +0200 Subject: [PATCH 448/737] python3Packages.pyro-ppl: 1.8.1 -> 1.8.2 --- pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index b14119c32807..b0cc9c7f91cd 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY="; + hash = "sha256-4Afl0ROCpY78+4+61xxy6vEGbIZsaNxURXDEGMGCiks="; }; propagatedBuildInputs = [ From 26e6aa8b9ec267f9e3b7acdfc8551776e401be4d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:17 +0200 Subject: [PATCH 449/737] python3Packages.pyroute2: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/pyroute2/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index f5c4d936aebd..2d9efdf39e2d 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -4,20 +4,25 @@ , importlib-metadata , mitogen , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.2"; + version = "0.7.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hahWY7BIO8c6DmCgG+feZdNikbYWycFCl0E6P1uEQ/M="; + hash = "sha256-cEEEDbHC0Yf7zNFRSFsSRMQddYvoIXhYR5RjcOtrtwY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ mitogen ] ++ lib.optionals (pythonOlder "3.8") [ @@ -38,7 +43,6 @@ buildPythonPackage rec { "pr2modules.nftables" "pr2modules.nslink" "pr2modules.protocols" - "pr2modules.proxy" ]; meta = with lib; { From 2d4a1be4824239812afdf189b7eca184ac7a39c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:17 +0200 Subject: [PATCH 450/737] python3Packages.PySDL2: 0.9.11 -> 0.9.14 --- pkgs/development/python-modules/pysdl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 1f1d97f19fa5..f5d76eda9b94 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.11"; + version = "0.9.14"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "93e51057d39fd583b80001d42b21d5a3f71e30d489d85924d944b2c7350e2da6"; + sha256 = "sha256-JAkfjZ5DdkZZHH921bru49OqbNiuSSpRxwJuUzifGHo="; }; # Deliberately not in propagated build inputs; users can decide From d8ed07f85e4d21673a630cca052170d646e3193d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:17 +0200 Subject: [PATCH 451/737] python3Packages.pysqlcipher3: 1.0.4 -> 1.1.0 --- pkgs/development/python-modules/pysqlcipher3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix index 9c98664af1ca..acb71deab0b1 100644 --- a/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pysqlcipher3"; - version = "1.0.4"; + version = "1.1.0"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "75d6b9d023d7ab76c841f97fd9d108d87516e281268e61518411d08cb7062663"; + sha256 = "sha256-Lo75+2y2jZJrQZj9xrJvVRGWmOo8fI5iXzEURn00Y3E="; }; buildInputs = [ sqlcipher ]; From 23efe5abe719c455daa9704dd4ed789fe960e4d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:18 +0200 Subject: [PATCH 452/737] python3Packages.pyTelegramBotAPI: 4.6.0 -> 4.7.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 0474ed4e67cf..5fb31f9fdde2 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.6.0"; + version = "4.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sa6kw8hnWGt++qgNVNs7cQ9LJK64CVv871aP8n08pRA="; + hash = "sha256-sVu518B+PDSpW6MhYtNWkPpwuT471VfGuDDtpL7Mo/U="; }; propagatedBuildInputs = [ From 091852837e8c100e1c97e7eeba4a816e1d6176c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:18 +0200 Subject: [PATCH 453/737] python3Packages.pytest-check: 1.0.5 -> 1.0.9 --- .../python-modules/pytest-check/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index c690e01778b6..a9973da9c142 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,17 +7,21 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.0.5"; + version = "1.0.9"; format = "flit"; src = fetchPypi { - pname = "pytest_check"; - inherit version; - sha256 = "sha256-ucjbax3uPB5mFivQebgcCDKWy3Ex6YQVGcKKQIGKSHU="; + inherit pname version; + hash = "sha256-zVMQTzpPw2RPcCi1XiOHZvbWWhKiB9MbzUyLoA2yP9k="; }; - buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook ]; + buildInputs = [ + pytest + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "pytest plugin allowing multiple failures per test"; From c5b06fd1f46d1ce663b25c3c0b297ce705704bad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:18 +0200 Subject: [PATCH 454/737] python3Packages.pytest-localserver: 0.6.0 -> 0.7.0 --- .../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 b64f3365dd6f..cde2bf81a6e3 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3cR5q6lqfaDnocx9OjA+UFgtbVBYA+j2e4JyGPn+D2U="; + sha256 = "sha256-8ZtJDHyh7QW/5LxrSQgRgFph5ycfBCTTwPpNQ4k6Xc0="; }; propagatedBuildInputs = [ From 0be873c4dd4a4d8326f54590f8e5642377dd151f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:18 +0200 Subject: [PATCH 455/737] python3Packages.pytest-xprocess: 0.19.0 -> 0.20.0 --- pkgs/development/python-modules/pytest-xprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 1b45c06969d3..c6262b7f1e0e 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.19.0"; + version = "0.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GCDFSdZx7bLInCX/HjjHDs2g/v4oDxPEWiyMbWbXtQ4="; + sha256 = "sha256-AhZ1IsTcdZ+RxKsZhUY5zR6fbgq/ynXhGWgrVB0b1j8="; }; nativeBuildInputs = [ setuptools-scm ]; From 000bf335745ae7af84e17ff6be401867e9180a5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:18 +0200 Subject: [PATCH 456/737] python3Packages.python-dotenv: 0.20.0 -> 0.21.0 --- 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 a805c3e6c623..85e5034d6ebc 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.20.0"; + version = "0.21.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-t+OwSllpPELDb5qxzCrMRvpd+MeOF4/DOo1M0FyNSY8="; + sha256 = "sha256-t30IJ0Y549NBRd+mxwCOZt8PBLe+enX9DVKSwZHXkEU="; }; propagatedBuildInputs = [ click ]; From 0ae3aa1a157da19d425b5f41969a1da532b276ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:18 +0200 Subject: [PATCH 457/737] python3Packages.python-telegram-bot: 13.13 -> 13.14 --- .../python-modules/python-telegram-bot/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 8b3a6ba091cc..677322fc50d1 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.13"; + version = "13.14"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QpbYGji35e8fl5VlESjlj7NUZ4uNxNuTyhZsloKMV7I="; + hash = "sha256-6TkdQ+sRI94md6nSTqh4qdUyfWWyQZr7plP0dtJq7MM="; }; propagatedBuildInputs = [ @@ -39,7 +39,8 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace "APScheduler==3.6.3" "APScheduler" \ - --replace "cachetools==4.2.2" "cachetools" + --replace "cachetools==4.2.2" "cachetools" \ + --replace "tornado==6.1" "tornado" ''; setupPyGlobalFlags = "--with-upstream-urllib3"; From 7e971dd676eb2d38fb43a4beb65c144038f7bec6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:18 +0200 Subject: [PATCH 458/737] python3Packages.pytz: 2022.1 -> 2022.2.1 --- pkgs/development/python-modules/pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 58ac098c17cc..718ee964588e 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2022.1"; + version = "2022.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HnYOL+aoFjvAs9mhnE+ENCr6Cir/6/qoSwG5eKAuyqc="; + sha256 = "sha256-zqIhQXIE8tGiqgPdrj6GeSGXHQ128U2Hq7RBRBW73PU="; }; checkInputs = [ unittestCheckHook ]; From e9e0f1a2ce3e412d38bd44b1fb53584f3e2a35fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:18 +0200 Subject: [PATCH 459/737] python3Packages.pyudev: 0.23.2 -> 0.24.0 --- pkgs/development/python-modules/pyudev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 24784afc842d..aa54e5169697 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.23.2"; + version = "0.24.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Mq41hbMgpRvCg+CgQAD9iiVZnttEVB4vUDT2r+5dFcw="; + sha256 = "sha256-sqOv4cmep1H4KWZSVX6sVZh02iobHsBiUXhwbsWjRfM="; }; postPatch = '' From 74b0bda46d14f035f136bb0ba5df66e97b5dfb60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:18 +0200 Subject: [PATCH 460/737] python3Packages.pyvex: 9.2.15 -> 9.2.18 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index e1ce42205057..08989d65147e 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.15"; + version = "9.2.18"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Yik1RTz4SQBFJxgPzp7LnPHV4EMbxGEhD2fBVcKJC7c="; + hash = "sha256-bwQveWnXsYmoJkyVZkzrXEbg2MdU6lj7Z56iu9t7XxE="; }; nativeBuildInputs = [ From 998108e52517e39d235d938da96811962a018cd5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:19 +0200 Subject: [PATCH 461/737] python3Packages.pyzmq: 23.2.0 -> 23.2.1 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index ea61a50560da..480247d01bb0 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "23.2.0"; + version = "23.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pR8SqHGarZ3PtV1FYCLxa5CryN3n08qTzjEgtA4/oWk="; + hash = "sha256-KzgaqGfs59CoLzCgx/PUOHt88uBpfjPvqlvtbFeEq80="; }; buildInputs = [ From f988d4ba186079768f280e7a2b573f2cf315c1e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:19 +0200 Subject: [PATCH 462/737] python3Packages.qtconsole: 5.3.1 -> 5.3.2 --- 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 a1483518f92b..aae38c944958 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.3.1"; + version = "5.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tzcj+sQ5OLaE3LI3qIUQ3HchxDpybOqK3heaKSfAovM="; + sha256 = "sha256-jq3wEug6sBgpWAPCR8arfqzT1aseHYig83/c/auSlaM="; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From da8654ae543822b96bad882e9f3397e1eab54c20 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:19 +0200 Subject: [PATCH 463/737] python3Packages.QtPy: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/qtpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 31c05ce48f4e..97d2111677f3 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yozUIXF1GGNEKZ7kwPfnrc82LHCFK6NbJVpTQHcCXAY="; + sha256 = "sha256-2F8bEh8kpBrSbFXERuZqvbfFKIOfjE8R8VbsRUGQORQ="; }; propagatedBuildInputs = [ From c2335e7e45d455f1990d2e0896ce6158f757d491 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:19 +0200 Subject: [PATCH 464/737] python3Packages.readme-renderer: 37.0 -> 37.1 --- pkgs/development/python-modules/readme_renderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index b3ffc2aa34a4..43ac95db9277 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "readme-renderer"; - version = "37.0"; + version = "37.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "readme_renderer"; inherit version; - sha256 = "sha256-B7fqI04D5Y93zCIuIG5qu49MBDW+zOUQR5TuWR+TAcU="; + sha256 = "sha256-lnaMBpcp9pF29RRHflfy+M1UP7ss17rTcpdiSfpQmgw="; }; propagatedBuildInputs = [ From e6e6559b1d784aac03527de349953bce7944ad17 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:19 +0200 Subject: [PATCH 465/737] python3Packages.regex: 2022.3.2 -> 2022.9.13 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 512a7162f0e3..1bd2d8b5d871 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.3.2"; + version = "2022.9.13"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-eeWvH/JYvA/gvdb2m8SuM5NaiY48vvu8zyLoiif6BTs="; + hash = "sha256-8HNztuVqbzoN89dbZRonjKe9NXp5YHiiapWOoc4FiP0="; }; checkPhase = '' From d45461d56c634dd88e3f90995bebf4a4affee788 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:19 +0200 Subject: [PATCH 466/737] python3Packages.reproject: 0.8 -> 0.9 --- pkgs/development/python-modules/reproject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 02a6b149eb0b..1f75683a5b1d 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.8"; + version = "0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z54sY3R6GViTvMLHrJclrAZ1dH4/9bzIrgqDd9nFbJY="; + hash = "sha256-zhjI4MjlCV9zR0nNcss+C36CZXY/imGsalfKMGacfi0="; }; nativeBuildInputs = [ From 2ce96f4e54ec017305a80b14456e00a1594cca71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:19 +0200 Subject: [PATCH 467/737] python3Packages.requests-mock: 1.9.3 -> 1.10.0 --- pkgs/development/python-modules/requests-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 85d7c47baae3..85b9d9fe35fb 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "requests-mock"; - version = "1.9.3"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "8d72abe54546c1fc9696fa1516672f1031d72a55a1d66c85184f972a24ba0eba"; + sha256 = "sha256-WcnDJBmp+xroPsJC2Y6InEW9fXpl1IN1zCQ+wIRBZYs="; }; patchPhase = '' From 61db326624ddbc8c369deb3bd004f42d2fef1d9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:19 +0200 Subject: [PATCH 468/737] python3Packages.rlax: 0.1.2 -> 0.1.4 --- pkgs/development/python-modules/rlax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index adff2f0ac5d3..c23f7d9cce3a 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "rlax"; - version = "0.1.2"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hAG0idz5VkGVvxaJWoxlVZ8myeHF6ndDxB0SyJm7qV8="; + sha256 = "sha256-a4qyJ5W9fs4TSTQQZS/NptlcSr2Nhw0pvnk+sGEsbyY="; }; buildInputs = [ From d59ac78dbd039c754182d105c80e979e71cd3911 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:19 +0200 Subject: [PATCH 469/737] python3Packages.rsa: 4.8 -> 4.9 --- 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 ccfd237862d7..0a70f8d8b088 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.8"; + version = "4.9"; src = fetchPypi { inherit pname version; - sha256 = "5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17"; + sha256 = "sha256-44RkpJxshdfxNRsBJmYUh6fgoUpQ8WdexQ6zTU8g7yE="; }; checkInputs = [ unittest2 mock ]; From 73bc196072d39a797e8bb1d9c502672da8b6dafd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 470/737] python3Packages.s3fs: 2022.5.0 -> 2022.8.2 --- 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 bb4d5828284f..343d637db0ab 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.5.0"; + version = "2022.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tAo8v6+Ay6uvDjMjMRF8ysaSkO/aw0cYT7OrYAP3BGU="; + hash = "sha256-PKBwGomp4SWijekIKdGflvQd2x2LQ3kHbCntgsSvhs0="; }; buildInputs = [ From 8d2da476d03aa92155fc6f3b0a6ac9ea268ca8c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 471/737] python3Packages.sagemaker: 2.103.0 -> 2.109.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 77d4cc5aa280..b35eb7118d57 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.103.0"; + version = "2.109.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0iXIUWvoL6+kT+KaJq7yzdEzYA0orKBbQkGAVUYcSKk="; + hash = "sha256-hs71bIoByh5S1ncsku+y4X2i0yU65FknJE05lEmnru4="; }; propagatedBuildInputs = [ From 0bea38db498b1b02c43ebf41779b1291f040885c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 472/737] python3Packages.scancode-toolkit: 31.0.0b4 -> 31.1.1 --- pkgs/development/python-modules/scancode-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 40c52962e51d..40e391347702 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -60,13 +60,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.0.0b4"; + version = "31.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sPFHaIbbWw/wk3Q1PBDj5O4il9ntigoyanecg938a9A="; + hash = "sha256-/QLW+rxkDbrv/78xiXOuSNaQvY+0oYZQV0/m60CEZLk="; }; dontConfigure = true; From bbb37e5e8cf55f463fe507088f9ebefbf7a20c0a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 473/737] python3Packages.schema-salad: 8.3.20220626185350 -> 8.3.20220913105718 --- 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 e35c1bb69109..d986c4ed69b5 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.3.20220626185350"; + version = "8.3.20220913105718"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-g8h3dAdN+tbdLRO3ctmsW+ZLiyhU0zPd1XR+XvEBpwo="; + hash = "sha256-18/xLIq1+yM8iQBIeXvRIO4A5GqZS/3qOKXmi439+sQ="; }; propagatedBuildInputs = [ From 56ae32a3d0539129a0bb8403587f9a44150a7cbe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 474/737] python3Packages.scikit-learn: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/scikit-learn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 6a97bcd46846..3512f1ddd06f 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Pne3Ho5kT4bItb5/HChe9ZfeTDhJYTie4+nKNsRFslY="; + sha256 = "sha256-fCLRMFsW8I1XdRpOo2Bx4iFe+0wJy3kYP6pOjoKj2/g="; }; buildInputs = [ From 81e4fdbdfa4440a8d38f8396df27357781fc4961 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 475/737] python3Packages.scikits.odes: 2.6.4 -> 2.6.5 --- pkgs/development/python-modules/scikits-odes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 21baa7bfa37e..e419cb8b63e5 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "scikits.odes"; - version = "2.6.4"; + version = "2.6.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-fS9E0kO+ZEcGjiWQPAQHa52zOz9RafNSBPNKypm0GhA="; + sha256 = "sha256-MP1pNkr0fAyWWVHJVHiaVEn1UsbVsjU9MZHHAQYtPYI="; }; nativeBuildInputs = [ From 358a6ead53e0581c7b4fe4c9e8daddcae6be0d9d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 476/737] python3Packages.screeninfo: 0.8 -> 0.8.1 --- .../python-modules/screeninfo/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index dc794513fc4c..f67d68b0dddd 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -2,25 +2,33 @@ , lib , buildPythonApplication , dataclasses -, fetchPypi +, fetchFromGitHub , libX11 , libXinerama , libXrandr +, poetry-core , pytestCheckHook , pythonOlder }: buildPythonApplication rec { pname = "screeninfo"; - version = "0.8"; + version = "0.8.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "9501bf8b8458c7d1be4cb0ac9abddddfa80b932fb3f65bfcb54f5586434b1dc5"; + src = fetchFromGitHub { + owner = "rr-"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-TEy4wff0eRRkX98yK9054d33Tm6G6qWrd9Iv+ITcFmA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ dataclasses ]; @@ -40,7 +48,7 @@ buildPythonApplication rec { disabledTestPaths = [ # We don't have a screen - "screeninfo/test_screeninfo.py" + "tests/test_screeninfo.py" ]; pythonImportsCheck = [ "screeninfo" ]; From ff383555f59c07c3d0962a28524aa447c77b6745 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 477/737] python3Packages.seaborn: 0.11.2 -> 0.12.0 --- pkgs/development/python-modules/seaborn/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 8d94264721b7..2fc7a6a7a87f 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, flit-core , matplotlib , pytestCheckHook , numpy @@ -12,16 +13,20 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.11.2"; - format = "setuptools"; + version = "0.12.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cf45e9286d40826864be0e3c066f98536982baf701a7caa386511792d61ff4f6"; + sha256 = "sha256-iT8XKS2LrKYWwVeN21jrJcctYi9U/F7jKcggfcm1eyM="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ matplotlib numpy From 246c1e8473e70e384c65836ba74500f87b98ad5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 478/737] python3Packages.secretstorage: 3.3.2 -> 3.3.3 --- pkgs/development/python-modules/secretstorage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index a9f336d18df9..59584ee9170f 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "secretstorage"; - version = "3.3.2"; + version = "3.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SecretStorage"; inherit version; - hash = "sha256-Co65ZFsyCIHCIugnwm9M/PVTY+izdKAhmB74hmV6kS8="; + hash = "sha256-JANTPvNp7KbSuoFxhXbF4PVk1cyhtY9zqLI+fU7uvXc="; }; propagatedBuildInputs = [ From 1cfab2fe763b44e6283c069c6c580b11c7c0d6a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:20 +0200 Subject: [PATCH 479/737] python3Packages.setproctitle: 1.2.3 -> 1.3.2 --- pkgs/development/python-modules/setproctitle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index c48b7b9e1b3c..cfcd221c5abb 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "setproctitle"; - version = "1.2.3"; + version = "1.3.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7PKLHAenmddvQyblCBV7ca7aB7hLkDaOpFHAcQ29MsA="; + sha256 = "sha256-ufuXkHyDDSYPoGWO1Yr9SKhrK4iqxSETXDUv9/00d/0="; }; checkInputs = [ pytestCheckHook ]; From e2a293d4740b984406ae558a06a55e9690ab93b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:21 +0200 Subject: [PATCH 480/737] python3Packages.sharkiq: 0.0.1 -> 1.0.2 --- pkgs/development/python-modules/sharkiq/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix index e41205fba737..0b99c15564fd 100644 --- a/pkgs/development/python-modules/sharkiq/default.nix +++ b/pkgs/development/python-modules/sharkiq/default.nix @@ -1,17 +1,20 @@ { lib , aiohttp , buildPythonPackage -, fetchPypi +, fetchFromGitHub , requests }: buildPythonPackage rec { pname = "sharkiq"; - version = "0.0.1"; + version = "1.0.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "e5efb0ad13a66cf6a097da5c128347ef7bd0b2abe53a8ca65cbc847ec1190c8b"; + src = fetchFromGitHub { + owner = "JeffResc"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-UG460uEv1U/KTuVEcXMZlVbK/7REFpotkUk4U7z7KpA="; }; propagatedBuildInputs = [ From 8e2993b0a4f530e04c5277713398fe6722ebfba3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:21 +0200 Subject: [PATCH 481/737] python3Packages.sh: 1.14.2 -> 1.14.3 --- pkgs/development/python-modules/sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index a08920a39e2b..d6334251bff4 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sh"; - version = "1.14.2"; + version = "1.14.3"; src = fetchPypi { inherit pname version; - sha256 = "9d7bd0334d494b2a4609fe521b2107438cdb21c0e469ffeeb191489883d6fe0d"; + sha256 = "sha256-5ARbbHMtnOddVxx59awiNO3Zrk9fqdWbCXBQgr3KGMc="; }; patches = [ From 2d0d88eb4140da6351662530962e1ed87768bd01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:21 +0200 Subject: [PATCH 482/737] python3Packages.skein: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 8dc3391e9e97..493528be4976 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -14,10 +14,10 @@ buildPythonPackage rec { pname = "skein"; - version = "0.8.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "04208b4be9df2dc68ac5b3e3ae51fd9b589add95ea1b67222a8de754d17b1efa"; + sha256 = "sha256-nXTqsJNX/LwAglPcPZkmdYPfF+vDLN+nNdZaDFTrHzE="; }; # Update this hash if bumping versions jarHash = "sha256-UGiEoTZ17IhLG72FZ18Zb+Ej4T8z9rMIMDUxzSZGZyY="; From 6ca607f2ac1875e9aae5dba96f2d92df3371d256 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:21 +0200 Subject: [PATCH 483/737] python3Packages.sniffio: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/sniffio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index 5b91bade0098..86e37168c899 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "sniffio"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"; + sha256 = "sha256-5gMFxeXTFPU4klm38iqqM9j33uSXYxGSNK83VcVbkQE="; }; disabled = !isPy3k; From b863e9018992b3c1a0097013d87d9f7aa9cc0e88 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:21 +0200 Subject: [PATCH 484/737] python3Packages.snowflake-connector-python: 2.7.9 -> 2.7.12 --- .../python-modules/snowflake-connector-python/default.nix | 8 ++++++-- 1 file changed, 6 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 500a392b1162..8e957b0ee373 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -5,6 +5,7 @@ , cffi , charset-normalizer , fetchPypi +, filelock , idna , oscrypto , pycryptodomex @@ -14,18 +15,19 @@ , pytz , requests , setuptools +, typing-extensions }: buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.7.9"; + version = "2.7.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HQ/d7luqdG1BriuP8QXzZk5JZwwLJH1JQIN3BtEDpM4="; + hash = "sha256-M50YI6aB7fSVRLeAqxLKtsxJIC1oWLcb9Mvah9/C/zU="; }; propagatedBuildInputs = [ @@ -33,6 +35,7 @@ buildPythonPackage rec { certifi cffi charset-normalizer + filelock idna oscrypto pycryptodomex @@ -41,6 +44,7 @@ buildPythonPackage rec { pytz requests setuptools + typing-extensions ]; postPatch = '' From 55f12e1cd9fbec21c1d2508d2160b6b211e1b040 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:21 +0200 Subject: [PATCH 485/737] python3Packages.spacy: 3.4.0 -> 3.4.1 --- 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 e4f5868d8457..cc1c01adf288 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.4.0"; + version = "3.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-PM0an1Z1nl8Pnv31cRmgZwKtWcBF3eCzgwtUclk+Ce8="; + hash = "sha256-WcXPXTSKbA5kpZrFz+bNhdCOhmM3hwyV0exhYdUx5GM="; }; propagatedBuildInputs = [ From 327ce1654131d7f5187d310efd3bbbdfdb5b8cc8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:21 +0200 Subject: [PATCH 486/737] python3Packages.spacy-transformers: 1.1.7 -> 1.1.8 --- .../development/python-modules/spacy-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index d21f5d17cd27..f6985a613380 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.7"; + version = "1.1.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lrC1JEQu3/YX4o5azs4UDTsrtfim3IJyD6plCbx5G3E="; + hash = "sha256-e7YuBEq2yggW5G2pJ0Rjw9z3c1jqgRKCifYSfnzblVs="; }; propagatedBuildInputs = [ From e43c1c8856911c0948b7896970ea28d865219278 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:21 +0200 Subject: [PATCH 487/737] python3Packages.spglib: 1.16.5 -> 2.0.1 --- pkgs/development/python-modules/spglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index d317f11dea42..c9023285568b 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.16.5"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Lqzv1TzGRLqakMRoH9bJNLa92BjBE9fzGZBOB41dq5M="; + sha256 = "sha256-9fHKuDWuwbjXjL9CmJxUWWoomkqDP93J8MX1XKwbwsE="; }; propagatedBuildInputs = [ numpy ]; From 152f922444aa3c06121921746526c27cce1ea05f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:22 +0200 Subject: [PATCH 488/737] python3Packages.spyder: 5.3.2 -> 5.3.3 --- 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 edcee3fe9323..85fe9ed37e72 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -46,13 +46,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.3.2"; + version = "5.3.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KJkamNMXr4Mi9Y6B7aKExoiqWKoExCFlELChCrQL6mQ="; + sha256 = "sha256-vWhwn07zgHX7/7uAz0ekNwnAiKLECCBzBq47TtTaHfE="; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; From a4be3f72f45f7eeaed4923a6d7b79a742e6edd56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:22 +0200 Subject: [PATCH 489/737] python3Packages.spyder-kernels: 2.3.2 -> 2.3.3 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 3742d15b356a..743be37b5130 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-urI7Ak25NZzsUYLiR+cIdfcd3ECoJx/RNT3gj0QPJtw="; + sha256 = "sha256-7luJo7S/n88jDJRhJx1WuF5jhmeRHrrdxinbBbXuRxc="; }; propagatedBuildInputs = [ From da041cebc6eaf2fb370f5e2bb69e09c17281e39e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:22 +0200 Subject: [PATCH 490/737] python3Packages.stestr: 3.2.1 -> 4.0.0 --- pkgs/development/python-modules/stestr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix index 2071d20a75f8..bb6dc7e54b20 100644 --- a/pkgs/development/python-modules/stestr/default.nix +++ b/pkgs/development/python-modules/stestr/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "stestr"; - version = "3.2.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wj7nq0QSKNiDZZBKIk+4RC2gwCifkBz0qUIukpt76c0="; + sha256 = "sha256-A2Y+q62KcxaoRJFo78WCVmpdOvnHf8QALX3IPnf28q0="; }; postPatch = '' From 26d22f6c4f660d16c018445a0fb8894327a1415f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:22 +0200 Subject: [PATCH 491/737] python3Packages.sunpy: 4.0.4 -> 4.0.5 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index aad3afda8adf..88dca4a51d4a 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.0.4"; + version = "4.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-O4VjxcuJVgUjjz3VWyczCjJxvJvAL94MBnGsRn54Ld4="; + hash = "sha256-7I23WtSeZPtHULJ7sNAbOdwAuzjiPE6WW2ukKUCMODs="; }; nativeBuildInputs = [ From 81ab49a99caf4f521b03745181d4645d71bd27ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:22 +0200 Subject: [PATCH 492/737] python3Packages.sympy: 1.10.1 -> 1.11.1 --- pkgs/development/python-modules/sympy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 17765a375298..c00230e501d2 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.10.1"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WTnu/9+eFSFyYBRjYmwCKiwn51z2J43o1AHVDJ1YeHs="; + sha256 = "sha256-4yOA3OY8t8AQjtUlVwCS/UUWi9ri+qF+UoIh73Lohlg="; }; checkInputs = [ glibcLocales ]; From f256380dc2d3ad45f2d7bee8ca7cfc4fa89df675 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:22 +0200 Subject: [PATCH 493/737] python3Packages.tensorboard: 2.9.1 -> 2.10.0 --- pkgs/development/python-modules/tensorboard/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 4e7087deb326..d3cc30cdad68 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.9.1"; + version = "2.10.0"; format = "wheel"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-uqcn95F3b55YQdNHEncgzu1LvVnDa0BgS5X7KuYCknY="; + hash = "sha256-dskaXolZzSIIzDLLF6DLACutq7ZqBqwq8Cp4EPSaWeM="; }; postPatch = '' @@ -41,8 +41,8 @@ buildPythonPackage rec { pushd unpacked/tensorboard-${version} substituteInPlace tensorboard-${version}.dist-info/METADATA \ - --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" \ - --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)" + --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)" \ + --replace "protobuf (<3.20,>=3.9.2)" "protobuf (>=3.9.2)" popd wheel pack ./unpacked/tensorboard-${version} From ded5f2354d3512055bc58cedc297e40dcca0cff2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:22 +0200 Subject: [PATCH 494/737] python3Packages.tensorflow-estimator: 2.9.0 -> 2.10.0 --- .../python-modules/tensorflow-estimator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index b52a96a3ea5b..24fb681f3b6f 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.9.0"; + version = "2.10.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-6XYrswL1G8HrLzXRnwGQpqLYCddU1d73iMQyj+N0Z0Q="; + hash = "sha256-8yTqF81X8W4zvxiHEdUHfmsuX1oSwyjW4BoHsjiI7c0="; }; propagatedBuildInputs = [ mock numpy absl-py ]; From 3bd6f99b3e2c83209a9492cfc7aacbd866cf3b45 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:22 +0200 Subject: [PATCH 495/737] python3Packages.termcolor: 1.1.0 -> 2.0.1 --- .../python-modules/termcolor/default.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index e440dab114fa..b1cfc0dc0461 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -1,17 +1,34 @@ { lib , buildPythonPackage , fetchPypi +, hatch-vcs +, hatchling +, pytestCheckHook }: buildPythonPackage rec { pname = "termcolor"; - version = "1.1.0"; + version = "2.0.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"; + sha256 = "sha256-ayz3aekzZKJnbh3lanwM/yz1vQfzfpzICw3WMg6/44g="; }; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + pythonImportsCheck = [ + "termcolor" + ]; + + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Termcolor"; homepage = "https://pypi.python.org/pypi/termcolor"; From db8a2534560618752d3cb2a8c90d7e9afc244c93 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:23 +0200 Subject: [PATCH 496/737] python3Packages.thinc: 8.1.0 -> 8.1.1 --- pkgs/development/python-modules/thinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 79faa769ddf3..51ee2803f3cf 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.0"; + version = "8.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6q6pHcVsBBUWqCnEYEI6iu9TVwAWEMjWOVvOldglSgs="; + sha256 = "sha256-m5AoKYTzy6rJjgNn3xsa+eSDYjG8Bj361yQqnQ3VK80="; }; postPatch = '' From 88ae5fb717a0b4579adfc9dd22d197ef03f6739a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:23 +0200 Subject: [PATCH 497/737] python3Packages.tifffile: 2022.5.4 -> 2022.8.12 --- 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 2452c6bb4453..ea20059f5620 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2022.5.4"; + version = "2022.8.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sDFHoVhit8HZDUdDUZfxSb73pSwlrWfPH5tGX6pxuNI="; + hash = "sha256-PnTg/UiDhHfrz0Dgm3eAvQle5ZILIjj0heLGhGOj3LQ="; }; propagatedBuildInputs = [ From 038d0b9e1711e2ef50249ef8307d9a352cc9ac89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:23 +0200 Subject: [PATCH 498/737] python3Packages.tomlkit: 0.11.1 -> 0.11.4 --- pkgs/development/python-modules/tomlkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 6430bef1aa88..6bd461db75a2 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.11.1"; + version = "0.11.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YZAfgf9AF5URGc0NHtm3rzHIIdaEXIxHdYe73NXlhU4="; + sha256 = "sha256-MjWpAQ+uVDI+cnw6wG+3IHUv5mNbNCbjedrsYPvUSoM="; }; propagatedBuildInputs = From 01170b7b66ecc2bd749a96ce29b494050ca37951 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:23 +0200 Subject: [PATCH 499/737] python3Packages.tox: 3.25.1 -> 3.26.0 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index cc9a96a1cba7..ea14b92abf5c 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.25.1"; + version = "3.26.0"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wTgyeBX1O8baT+VrrsXyXwBiKuae8/5OHjhXIOIkhvk="; + sha256 = "sha256-RPPDR8aMLGh5nX1E8YCPnTlvyKGlAMvGJCUzdceuEH4="; }; meta = with lib; { From d7056eb74fe5ad233961ff34c77b76abf2e43e08 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:23 +0200 Subject: [PATCH 500/737] python3Packages.tqdm: 4.64.0 -> 4.64.1 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 81e447457c5a..6da72cde5ea5 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.64.0"; + version = "4.64.1"; src = fetchPypi { inherit pname version; - sha256 = "13a0spki37rdbx54nspcni3bpsp4d7p5ln570yipf1r01v9mbgj0"; + sha256 = "sha256-X09oKgBJUcG0ULx1PHEOkoDFdGzm/+3uJT3by/VM8eQ="; }; nativeBuildInputs = [ From 718534a72902bb1a5a49d3d3dd81c08f0d9b6a09 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:23 +0200 Subject: [PATCH 501/737] python3Packages.traitlets: 5.3.0 -> 5.4.0 --- 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 0a32f931d132..30bff404032e 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.3.0"; + version = "5.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C7nx+fAXqo7Bh9ixsqemYmoqHYdxFrq6UqEpv6Ek+OI="; + sha256 = "sha256-PyxOQ14nFZL+Q5DxdG6laDbjoID4Tngz8PgB2WE/7Dk="; }; nativeBuildInputs = [ hatchling ]; From e65663f0dc9f774e147d07551d21c06d3a7af67d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:23 +0200 Subject: [PATCH 502/737] python3Packages.traits: 6.3.2 -> 6.4.1 --- pkgs/development/python-modules/traits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 9e6b1a5056da..ebe3c858543e 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "traits"; - version = "6.3.2"; + version = "6.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4520ef4a675181f38be4a5bab1b1d5472691597fe2cfe4faf91023e89407e2c6"; + sha256 = "sha256-eLssyv1gr/YGUVqsRt5kZooKgctcVMZQuYd6hBqp6BI="; }; # Circular dependency From 963f8317b8c0b50f4cb6ac30c8ad4568ba43db17 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:23 +0200 Subject: [PATCH 503/737] python3Packages.transitions: 0.8.11 -> 0.9.0 --- pkgs/development/python-modules/transitions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index e50dec28ef50..24bfa14b8c4b 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.8.11"; + version = "0.9.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eyDTKQbqTWDub2wfXcnJ8XiAJCXFsVUhPrDyXCd/BOQ="; + sha256 = "sha256-L1TRG9siV3nX5ykBHpOp+3F2aM49xl+NT1pde6L0jhA="; }; propagatedBuildInputs = [ From 31d9dddcc01b972cb2bb2dd6e6b7aa4669e4669c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:23 +0200 Subject: [PATCH 504/737] python3Packages.trytond: 6.4.4 -> 6.4.5 --- 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 f681d2b369f0..ce39ed5d1a05 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.4.4"; + version = "6.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eTYm3anMKhgoaB8t5jald5XRD3PIVijJP4vmh0pA9lE="; + sha256 = "sha256-AF8LG68K+CvHpFOIoGbxD+lF7IVwBDk8K06I4uTNguI="; }; propagatedBuildInputs = [ From f8edd6531cf858ed59e8bb2bbf7849c644ed789b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:24 +0200 Subject: [PATCH 505/737] python3Packages.twisted: 22.4.0 -> 22.8.0 --- pkgs/development/python-modules/twisted/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 6689a2ce80d3..ac09730526b3 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "twisted"; - version = "22.4.0"; + version = "22.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "Twisted"; inherit version; extension = "tar.gz"; - sha256 = "sha256-oEeZD1ffrh4L0rffJSbU8W3NyEN3TcEIt4xS8qXxNoA="; + sha256 = "sha256-5bYN458tHaFT++GHTYhf4/y9sh/MRG+nWaU+j8NRO+0="; }; __darwinAllowLocalNetworking = true; @@ -76,9 +76,6 @@ buildPythonPackage rec { echo 'ListingTests.test_oldFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_oldSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py - echo 'PTYProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py - echo 'PTYProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py - echo 'UNIXTestsBuilder_AsyncioSelectorReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py echo 'UNIXTestsBuilder_SelectReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py @@ -91,8 +88,6 @@ buildPythonPackage rec { echo 'MulticastTests.test_multicast.skip = "Reactor was unclean"'>> src/twisted/test/test_udp.py echo 'MulticastTests.test_multiListen.skip = "No such device"'>> src/twisted/test/test_udp.py - echo 'DomishExpatStreamTests.test_namespaceWithWhitespace.skip = "syntax error: line 1, column 0"'>> src/twisted/words/test/test_domish.py - # not packaged substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" From 93acf0d4ff6bbd3eeea5b87136fa005292b538f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:24 +0200 Subject: [PATCH 506/737] python3Packages.twitter: 1.19.4 -> 1.19.6 --- pkgs/development/python-modules/twitter/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix index e9676c0fa707..64ca41f60c2f 100644 --- a/pkgs/development/python-modules/twitter/default.nix +++ b/pkgs/development/python-modules/twitter/default.nix @@ -2,25 +2,30 @@ , buildPythonPackage , fetchPypi , setuptools-scm +, certifi , pythonOlder }: buildPythonPackage rec { pname = "twitter"; - version = "1.19.4"; + version = "1.19.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-g7jSSEpsdEihGuHG9MJTNVFe6NyB272vEsvAocRo72U="; + hash = "sha256-gN3WmuLuuIMT/u3uoxvxGf1ueVQe5bN6u5xD0jMZThA="; }; nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ + certifi + ]; + doCheck = false; pythonImportsCheck = [ From f6c1f88a653b35a99bafdb0193913c41b7c8f64d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:24 +0200 Subject: [PATCH 507/737] python3Packages.types-typed-ast: 1.5.6 -> 1.5.8 --- pkgs/development/python-modules/types-typed-ast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix index ca45ec7039ba..485c6b0d5af1 100644 --- a/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/pkgs/development/python-modules/types-typed-ast/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.6"; + version = "1.5.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UzmUeAz3KbdAwUdQZsRAdi8pqZvalRHU+mhdXuOoQ4k="; + hash = "sha256-FW+6ypA+hXH+cLsLVi/7qSp8vbe6yacTNRyifYgYO6c="; }; # Module doesn't have tests From 28b57575555e8672555a191c7b2768256dfdffb0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:24 +0200 Subject: [PATCH 508/737] python3Packages.typing-inspect: 0.7.1 -> 0.8.0 --- pkgs/development/python-modules/typing-inspect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index d54016049364..e79eb6823efa 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "typing-inspect"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit version; pname = "typing_inspect"; - sha256 = "1al2lyi3r189r5xgw90shbxvd88ic4si9w7n3d9lczxiv6bl0z84"; + sha256 = "sha256-ix/wxACUO2FF34EZxBwkTKggfx8QycBXru0VYOSAbj0="; }; propagatedBuildInputs = [ From 5638e62876a385032796ea233e9c93563db08c52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:24 +0200 Subject: [PATCH 509/737] python3Packages.tzdata: 2022.1 -> 2022.2 --- pkgs/development/python-modules/tzdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 089446b8ffea..c701d3683cdb 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2022.1"; + version = "2022.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-i1NqjsY9wHUTQrOYQZOjEY+Pyir+JXUrubf//TmFUtM="; + hash = "sha256-IfTw1yQVcu+n96T9q7BS5htV3EgnTmhCaXzN9SU+VFE="; }; nativeBuildInputs = [ From 743833b5a3f54e613cad95e282d8edde38fbcd2b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:24 +0200 Subject: [PATCH 510/737] python3Packages.uamqp: 1.5.3 -> 1.6.0 --- pkgs/development/python-modules/uamqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 1a087c10d8f1..6fb474aefc2b 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.5.3"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-guhfOMvddC4E+oOmvpeG8GsXEfqLcSHVdtj3w8fF2Vs="; + sha256 = "sha256-LDG3ShCFbszyWNc8TQjlysTWBgo0uYNIkL/UK8sTg1A="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ From b0186bd37f87914321eeec4c77de61c7774d1327 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:24 +0200 Subject: [PATCH 511/737] python3Packages.urllib3: 1.26.11 -> 1.26.12 --- pkgs/development/python-modules/urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 3cdbdd3a111b..ec63f5f21ed9 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.11"; + version = "1.26.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6m6PshCxnZUPq5O2DJAJImxjoogIvIOG4FMB4liDrAo="; + hash = "sha256-P6ls9CPmmHmX/DJq6N85bbKot8ZndH1H3djsupH0p04="; }; # FIXME: remove backwards compatbility hack From 34fa7f145bd0d02a0cb396e2dc6724d23cc78f30 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:24 +0200 Subject: [PATCH 512/737] python3Packages.vcrpy: 4.2.0 -> 4.2.1 --- pkgs/development/python-modules/vcrpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 8dbc7b50546e..9abd727e725c 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "4.2.0"; + version = "4.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-lFILhvt2WSWtyMd/+TToml4VbCjnSjFDICF+8bRUr+A="; + sha256 = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM="; }; checkInputs = [ From 94b9a0dff184b2d7e8468b6e9a2e25c7ff8c000d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:25 +0200 Subject: [PATCH 513/737] python3Packages.virtualenv: 20.15.1 -> 20.16.5 --- 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 3fba7cdb50c5..f0b365761f6c 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.15.1"; + version = "20.16.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KIFxE0ov87+xovVPEZ53zRuBwp/BJlojVvPo0Ux9WMQ="; + sha256 = "sha256-In6huZlP3F6jGXe6M4PvKW10cuqFvp1nMuQqkcBOgNo="; }; nativeBuildInputs = [ From d4f6da468b881e0b1ee6efb26b04661452804d02 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:25 +0200 Subject: [PATCH 514/737] python3Packages.w3lib: 1.22.0 -> 2.0.1 --- pkgs/development/python-modules/w3lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index d7074269e6a9..9c98f4d0926c 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "w3lib"; - version = "1.22.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha"; + sha256 = "sha256-E98V+MF7Fj3g/V+qiSwa0UPhkN/L25hTS7l16zfGx9Y="; }; propagatedBuildInputs = [ six ]; From eeab55c2af145b6c72065bc140f8f18059b28f80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:25 +0200 Subject: [PATCH 515/737] python3Packages.wasabi: 0.9.1 -> 0.10.1 --- pkgs/development/python-modules/wasabi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 16c89ae63a0d..2f751e8105e4 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rabxPptw7ya/lfrQ/r396+IAXimgitWPS7rjg6lymM8="; + sha256 = "sha256-yONyeBvhknKUI4KxTZkxTRdVGNeCIFfLepcBDEJZ0kk="; }; checkInputs = [ From 2108742af389b5c1cdcf29fc0e5d7ba76205994b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:25 +0200 Subject: [PATCH 516/737] python3Packages.websocket-client: 1.3.3 -> 1.4.1 --- pkgs/development/python-modules/websocket-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index a73703f12a11..1e1823095b0b 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.3.3"; + version = "1.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1YxfKE1qm/g3natCMln+j4W3DV+l0pFtV5GoRZSxIrE="; + sha256 = "sha256-+WEetlyCQaZ/s3O+8ECzz4rTd6n2VGoStiC2UR6Oqe8="; }; propagatedBuildInputs = [ From 5ec9725c23704d56cbabb0228de3e08d42c45453 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:25 +0200 Subject: [PATCH 517/737] python3Packages.widgetsnbextension: 3.6.1 -> 4.0.3 --- .../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 7609eb376f1c..800851a87a34 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.6.1"; + version = "4.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-nISuZMKJPHy+Lqr8dQUiGnlcJ9aJOEVANKxIcxmnWxA="; + hash = "sha256-NIJIZMBisLMDCteCENta5qOWDfth1bJ1YtZjF3TeAoY="; }; # setup.py claims to require notebook, but the source doesn't have any imports From 95603510ba67dc6bebb12b65559c62ae1130c3c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:25 +0200 Subject: [PATCH 518/737] python3Packages.wsproto: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/wsproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index bcc9428b460b..ce9f0c0d7a37 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wsproto"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ouVr/Vx82DwTadg7X+zNbTd5i3SHKGbmJhbg7PERvag="; + sha256 = "sha256-rVZfJuy5JYij5DvD2WFk3oTNmQJIKxMNDduqlmSoUGU="; }; propagatedBuildInputs = [ h11 ]; From 4a9c64e15161c6371115fdd2cb2ffee3a655e3c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:25 +0200 Subject: [PATCH 519/737] python3Packages.xarray: 2022.3.0 -> 2022.6.0 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 5d0ac813e498..2d10f0ddb572 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2022.3.0"; + version = "2022.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OYNEv30XBHeqzv9wIQ4R69aa9rFW/hOXgFTSXEhylEA="; + sha256 = "sha256-ECjRmEk/ZrsVvTXc/dEd79gxy+469lif/xb0G93WfoQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; From 41544b24810fc4949ce4534d78a5e3fb6aa63a43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:25 +0200 Subject: [PATCH 520/737] python3Packages.xlsx2csv: 0.7.8 -> 0.8.0 --- pkgs/development/python-modules/xlsx2csv/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index e22c0d965919..21a40f0c35f3 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -1,17 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.7.8"; + version = "0.8.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "c3aaf0c5febd9c5e48488026e7a58af37a67bf3da5e221cc57d371328b3b7dd3"; + sha256 = "sha256-LCaOUJt3ZspKJPLzYwLpGHBcXq0vzeP0vV8cphUvfiw="; }; + nativeBuildInputs = [ + setuptools + ]; + meta = with lib; { homepage = "https://github.com/dilshod/xlsx2csv"; description = "Convert xlsx to csv"; From 3ddc82f3902218ed483438698fc957cde80c6d87 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:26 +0200 Subject: [PATCH 521/737] python3Packages.xmlsec: 1.3.12 -> 1.3.13 --- .../python-modules/xmlsec/default.nix | 9 ++------ .../xmlsec/reset-lxml-in-tests.patch | 22 ------------------- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 0224c03ab3e8..1aec0cc114ec 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -15,19 +15,14 @@ buildPythonPackage rec { pname = "xmlsec"; - version = "1.3.12"; + version = "1.3.13"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "2c86ac6ce570c9e04f04da0cd5e7d3db346e4b5b1d006311606368f17c756ef9"; + sha256 = "sha256-kW9deOgEH2zZORq7plnajJSk/vcZbRJtQK8f9Bfyz4Y="; }; - # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116 - patches = [ - ./reset-lxml-in-tests.patch - ]; - nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ]; buildInputs = [ xmlsec libxslt libxml2 libtool ]; diff --git a/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch b/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch deleted file mode 100644 index 0968583faa63..000000000000 --- a/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tests/base.py b/tests/base.py -index b05de1d..5ec356f 100644 ---- a/tests/base.py -+++ b/tests/base.py -@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase): - - def load_xml(self, name, xpath=None): - """returns xml.etree""" -+ etree.set_default_parser(parser=etree.XMLParser()) - root = etree.parse(self.path(name)).getroot() - if xpath is None: - return root -diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py -index 2fc490f..53d2377 100644 ---- a/tests/test_doc_examples.py -+++ b/tests/test_doc_examples.py -@@ -42,3 +42,5 @@ def test_doc_example(example): - """ - with cd(example.parent): - runpy.run_path(str(example)) -+ from lxml import etree -+ etree.set_default_parser(parser=etree.XMLParser()) From 076139da3a7930c3a1836cb0781d2fd5245baab8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:26 +0200 Subject: [PATCH 522/737] python3Packages.yamllint: 1.27.1 -> 1.28.0 --- pkgs/development/python-modules/yamllint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b82e87016159..58d47d1fff9c 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.27.1"; + version = "1.28.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5ogyS1hWCraKGjz/LApHTj/tNx3+jaXRuYF7ffVQOc4="; + sha256 = "sha256-nj2N3RbQWDIUxf3/6AbJNECGch8QdDX2i62ZDlqIgms="; }; propagatedBuildInputs = [ From ee802c7dfb867f290d32a2494c908565300de12b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:26 +0200 Subject: [PATCH 523/737] python3Packages.yangson: 1.4.13 -> 1.4.14 --- pkgs/development/python-modules/yangson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index a82bf972546d..42caebb92e8b 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.13"; + version = "1.4.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SuKpSwIjZioyqmxlcKJ+UXP+ADfJwUwCCttmMAiEkZ4="; + sha256 = "sha256-OMqtZ/kPj7ge235nuyrfCzawG6AOAqfJPzQHF8cW4Ok="; }; nativeBuildInputs = [ From 22ef7ade00791276e8e5765c715b094cc724eb4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:26 +0200 Subject: [PATCH 524/737] python3Packages.yarl: 1.7.2 -> 1.8.1 --- pkgs/development/python-modules/yarl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 08866ac39074..249bf974322e 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.7.2"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RTmbRtYMJTMnpGDpmFZ1IAn87l9dPICy98DK4cONVt0="; + sha256 = "sha256-r4h4RbjC4GDrVgX/crby3SqrenYTeTc/2J0xT0dSq78="; }; postPatch = '' From c5e5fe9754a3a67bd07eff5845437e8bd0dfd14f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:26 +0200 Subject: [PATCH 525/737] python3Packages.zope-cachedescriptors: 4.3.1 -> 4.4 --- .../python-modules/zope-cachedescriptors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 4cbf9386b6cb..7696e078343e 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zope-cachedescriptors"; - version = "4.3.1"; + version = "4.4"; format = "setuptools"; src = fetchPypi { pname = "zope.cachedescriptors"; inherit version; - sha256 = "1f4d1a702f2ea3d177a1ffb404235551bb85560100ec88e6c98691734b1d194a"; + sha256 = "sha256-1FxIdIb334HymS8aAJEmJL93JZ2DxdmKp2tnhxbj0Ro="; }; propagatedBuildInputs = [ From cef001745909ce1ca314e4c72d63a2ecf6fd8fc6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:26 +0200 Subject: [PATCH 526/737] python3Packages.zope-hookable: 5.1.0 -> 5.2 --- pkgs/development/python-modules/zope-hookable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 993568f6ffd9..f1bc3bf72f74 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "zope-hookable"; - version = "5.1.0"; + version = "5.2"; src = fetchPypi { pname = "zope.hookable"; inherit version; - sha256 = "8fc3e6cd0486c6af48e3317c299def719b57538332a194e0b3bc6a772f4faa0e"; + sha256 = "sha256-TDAYvPKznPXMz0CCb3mbS4wUAFbbeA+WywyjMqJDvSk="; }; checkInputs = [ zope_testing ]; From 8a9c57ac80d47636c2a5587e187f73bb5d31cd42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:26 +0200 Subject: [PATCH 527/737] python3Packages.zope.size: 4.3 -> 4.4 --- pkgs/development/python-modules/zope_size/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 6945dddceaa3..bf7a44f8a026 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.size"; - version = "4.3"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "6f3eb687c9181e3b7400c5cd4d4209a2f676475b7b85c99ee11de2404b3493ec"; + sha256 = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk="; }; propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; From b749db3ab5176914224e928466655117b7f4e54b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:26 +0200 Subject: [PATCH 528/737] python3Packages.zope.testrunner: 5.5 -> 5.5.1 --- 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 273326baeb2a..1b838354c4cf 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.5"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/LhQZWGIoM380kmjt9Mw1JsVv7+DoQ8YW//cD6uQE+U="; + sha256 = "sha256-ahDTg1RZ7tO8hDHyGq9gS8dU/4OSopeXzSDlqUHBQ74="; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; From abcab7e08c449d9493daf698047edef323faf603 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Sep 2022 23:36:26 +0200 Subject: [PATCH 529/737] python3Packages.zstd: 1.5.2.5 -> 1.5.2.6 --- pkgs/development/python-modules/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 8599c7495ad9..db33c7f36772 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.5.2.5"; + version = "1.5.2.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PEKbFmo7MksJg7/1OuCSi5dkxpOgF/Yv+2sg5hNeM48="; + sha256 = "sha256-9ECFjRmIkOX/UX3/MtFejDG7c1BqiW+br20BTv5i9/w="; }; postPatch = '' From c87bfc061e1f8e471d3d4db3761d7d182fd38b8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 01:09:19 +0200 Subject: [PATCH 530/737] python3Packages.distlib: 0.3.4 -> 0.3.6 --- .../python-modules/distlib/default.nix | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index ec4e8ecdc6f5..ae14cc008c8d 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -1,15 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: buildPythonPackage rec { pname = "distlib"; - version = "0.3.4"; + version = "0.3.6"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"; - extension = "zip"; + hash = "sha256-FLrS2bBNOjYSesl/MLEqGSaPIRBj2PjuT0cQiJbhG0Y="; }; + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "distlib" + "distlib.database" + "distlib.locators" + "distlib.index" + "distlib.markers" + "distlib.metadata" + "distlib.util" + "distlib.resources" + ]; + # Tests use pypi.org. doCheck = false; From 6a34633c0e626b58079cac1ffb9a77126b25a8ac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 02:03:53 +0200 Subject: [PATCH 531/737] python3Packages.paramiko: propagate six, reenable tests --- .../python-modules/paramiko/default.nix | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 9a0046940035..225bf8b6f12f 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -11,6 +11,7 @@ , pynacl , pytest-relaxed , pytestCheckHook +, six }: buildPythonPackage rec { @@ -33,26 +34,27 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + bcrypt cryptography pyasn1 + six ] ++ passthru.optional-dependencies.ed25519; # remove on 3.0 update - checkInputs = [ - invoke - mock - pytest-relaxed - pytestCheckHook - ]; + passthru.optional-dependencies = { + gssapi = [ pyasn1 gssapi ]; + ed25519 = [ pynacl bcrypt ]; + invoke = [ invoke ]; + }; - # with python 3.9.6+, the deprecation warnings will fail the test suite - # see: https://github.com/pyinvoke/invoke/issues/829 - # pytest-relaxed does not work with pytest 6 - # see: https://github.com/bitprophet/pytest-relaxed/issues/12 - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTestPaths = [ - "tests/test_sftp.py" - "tests/test_config.py" + # disable tests that require pytest-relaxed, which is broken + "tests/test_client.py" + "tests/test_ssh_gss.py" ]; pythonImportsCheck = [ @@ -61,12 +63,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - passthru.optional-dependencies = { - gssapi = [ pyasn1 gssapi ]; - ed25519 = [ pynacl bcrypt ]; - invoke = [ invoke ]; - }; - meta = with lib; { homepage = "https://github.com/paramiko/paramiko/"; description = "Native Python SSHv2 protocol library"; From e26a2367f67b524079085ff40e0597cda91eb75b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 04:23:44 +0200 Subject: [PATCH 532/737] python3Packages.hass-nabucasa: relax cryptography constraint further --- pkgs/development/python-modules/hass-nabucasa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index ce2f12804bd8..e23aa5b9fa7c 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "acme==" "acme>=" \ - --replace "cryptography>=2.8,<37.0" "cryptography" \ + --replace "cryptography>=2.8,<38.0" "cryptography" \ --replace "pycognito==" "pycognito>=" \ --replace "snitun==" "snitun>=" \ ''; From e345248f8cde5156c6b0f9ff74c6e1e9642d8b33 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 05:18:02 +0200 Subject: [PATCH 533/737] home-assistant: relax yarl constraint --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 599211c398d5..0cd59c21ad18 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -363,6 +363,7 @@ in python.pkgs.buildPythonApplication rec { "orjson" "PyJWT" "requests" + "yarl" ]; in '' sed -r -i \ From bfe66ab0da1e4e6632983af56adaa6dd3acb6361 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 16:15:16 +0200 Subject: [PATCH 534/737] python3Packages.django_4: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/django/4.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 4d4e9265defa..96ee036d1259 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -5,6 +5,9 @@ , pythonOlder , substituteAll +# build +, setuptools + # patched in , fetchpatch , geos @@ -64,6 +67,10 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ asgiref sqlparse From f98d8fc610696e10e8b19c1e579ce3b9a2ea1ce8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 16:25:00 +0200 Subject: [PATCH 535/737] python3Packages.build: migrate to setuptools build-system --- pkgs/development/python-modules/build/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 59f0e9f245d2..1ef401b8c0a2 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchFromGitHub , filelock -, setuptools , importlib-metadata , packaging , pep517 @@ -12,6 +11,7 @@ , pytest-xdist , pytestCheckHook , pythonOlder +, setuptools , toml , tomli }: From 40b6a2232f1a1ef8c9ba53d938e928b9450aa8cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 16:29:21 +0200 Subject: [PATCH 536/737] python3Packages.poetry-core: add setuptools to checkInputs Was previously provided through buildPythonPackage, not anymore. Also remove the intreehooks builder, because poetry-core relies on backend-path to use itself to build itself. --- .../python-modules/poetry-core/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 9c61c527c98a..737985ece249 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -5,7 +5,6 @@ , build , git , importlib-metadata -, intreehooks , pep517 , pytest-mock , pytestCheckHook @@ -27,17 +26,6 @@ buildPythonPackage rec { sha256 = "sha256-WUgBrO9h1E7N2SVFD47UPv39DMx1yQviV5tcNPmR+/g="; }; - postPatch = lib.optionalString (pythonOlder "3.8") '' - # remove >1.0.3 - substituteInPlace pyproject.toml \ - --replace 'importlib-metadata = {version = "^1.7.0", python = "~2.7 || >=3.5, <3.8"}' \ - 'importlib-metadata = {version = ">=1.7.0", python = "~2.7 || >=3.5, <3.8"}' - ''; - - nativeBuildInputs = [ - intreehooks - ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; From 44ae9b6090fa093d169d96294498fb2558cf896f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Jul 2022 16:17:36 +0200 Subject: [PATCH 537/737] python3.pkgs.scipy: switch to using meson --- pkgs/development/python-modules/scipy/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index c1d13ca73501..aa578d21d257 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -5,7 +5,10 @@ , buildPythonPackage , cython , gfortran +, meson-python +, pkg-config , pythran +, wheel , nose , pytest , pytest-xdist @@ -16,13 +19,14 @@ buildPythonPackage rec { pname = "scipy"; version = "1.9.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "sha256-JtKMRokA5tX9s30oEqtG2wzNIsY7qglQV4cfqjpJi8k="; }; - nativeBuildInputs = [ cython gfortran pythran ]; + nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; buildInputs = [ numpy.blas pybind11 ]; @@ -30,11 +34,6 @@ buildPythonPackage rec { checkInputs = [ nose pytest pytest-xdist ]; - # Remove tests because of broken wrapper - prePatch = '' - rm scipy/linalg/tests/test_lapack.py - ''; - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); preConfigure = '' @@ -42,10 +41,6 @@ buildPythonPackage rec { export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES ''; - preBuild = '' - ln -s ${numpy.cfg} site.cfg - ''; - # disable stackprotector on aarch64-darwin for now # # build error: From c2e54388d5be215169de0761fee7337aa96c15db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Jul 2022 16:17:54 +0200 Subject: [PATCH 538/737] python3.pkgs.meson-python: init at 0.6.0 --- .../python-modules/meson-python/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/meson-python/default.nix diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix new file mode 100644 index 000000000000..46482c4d5a67 --- /dev/null +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, colorama +, meson +, ninja +, pyproject-metadata +, tomli +}: + +buildPythonPackage rec { + pname = "meson-python"; + version = "0.6.0"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "meson_python"; + hash = "sha256-/bX7s6ttdTav/+qPt9CYREb4t5vHCz+8mA5DvV81bfM="; + }; + + nativeBuildInputs = [ + meson + ninja + pyproject-metadata + tomli + ]; + + propagatedBuildInputs = [ + colorama + meson + ninja + pyproject-metadata + tomli + ]; + + # Ugly work-around. Drop ninja dependency. + # We already have ninja, but it comes without METADATA. + # Building ninja-python-distributions is the way to go. + postPatch = '' + substituteInPlace pyproject.toml --replace "'ninja'," "" + ''; + + meta = { + description = "Meson Python build backend (PEP 517)"; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers.fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47d42b98953a..21488b7edb11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5658,6 +5658,8 @@ in { mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; + meson-python = callPackage ../development/python-modules/meson-python { }; + messagebird = callPackage ../development/python-modules/messagebird { }; metakernel = callPackage ../development/python-modules/metakernel { }; From 941663db0bdca4bae25817812150063af8de4ee9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Jul 2022 16:18:12 +0200 Subject: [PATCH 539/737] python3.pkgs.pyproject-metadata: init at 0.5.0 --- .../pyproject-metadata/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pyproject-metadata/default.nix diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix new file mode 100644 index 000000000000..5cd5b92073bc --- /dev/null +++ b/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, packaging +, pytestCheckHook +, tomli +}: + +buildPythonPackage rec { + pname = "pyproject-metadata"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchPypi rec { + inherit pname version; + hash = "sha256-6YN9I3V8XJ//+19/N8+be8LZc30OlZt/XV8YmVFulww="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + packaging + ]; + + checkInputs = [ + pytestCheckHook + tomli + ]; + + # Many broken tests, and missing test files + doCheck = false; + + meta = with lib; { + description = "PEP 621 metadata parsing"; + homepage = "https://github.com/FFY00/python-pyproject-metadata"; + license = licenses.mit; + maintainers = with maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 21488b7edb11..30f0eb0d3796 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8250,6 +8250,8 @@ in { pyproj = callPackage ../development/python-modules/pyproj { }; + pyproject-metadata = callPackage ../development/python-modules/pyproject-metadata { }; + pyprosegur = callPackage ../development/python-modules/pyprosegur { }; pyptlib = callPackage ../development/python-modules/pyptlib { }; From 9b4a97f4f1636d6e447393ac2541cbb5d9f630d8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Sep 2022 19:04:03 +0200 Subject: [PATCH 540/737] python3Packages.meson-python: 0.6.0 -> 0.8.1 --- pkgs/development/python-modules/meson-python/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 46482c4d5a67..18c00a95e856 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.6.0"; + version = "0.8.1"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-/bX7s6ttdTav/+qPt9CYREb4t5vHCz+8mA5DvV81bfM="; + hash = "sha256-RC8fpM9dtQ7qYRcKYFnBD6/XCXf12980QcEGzSOwXkw="; }; nativeBuildInputs = [ @@ -28,7 +28,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - colorama meson ninja pyproject-metadata @@ -44,7 +43,8 @@ buildPythonPackage rec { meta = { description = "Meson Python build backend (PEP 517)"; + homepage = "https://github.com/FFY00/meson-python"; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} From b462aefc7f608e2ee040d351462ae7c442cf3b03 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 15 Sep 2022 19:05:14 +0200 Subject: [PATCH 541/737] python3Packages.numpy: revert to setuptools Somehow the pyproject configuration fails. --- pkgs/development/python-modules/numpy/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 7b4c5178d66b..6f13a90e2ec3 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -11,7 +11,6 @@ , lapack , writeTextFile , cython -, setuptoolsBuildHook , pythonOlder }: @@ -41,13 +40,8 @@ let }; in buildPythonPackage rec { pname = "numpy"; - - # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so - # build both to verify they don't break. - # https://github.com/scipy/scipy/issues/15414 version = "1.23.3"; - - format = "pyproject"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { @@ -63,7 +57,7 @@ in buildPythonPackage rec { ./numpy-distutils-C++.patch ]; - nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ]; + nativeBuildInputs = [ gfortran cython ]; buildInputs = [ blas lapack ]; # we default openblas to build with 64 threads From d4d5601d998ffc5cc26396aaacd84b83cf6e05be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 21:40:30 +0200 Subject: [PATCH 542/737] python3Packages.openapi-schema-validator: 0.3.0 -> 0.3.4 --- .../python-modules/openapi-schema-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 2471df794fc0..2060b2cf4787 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.3.0"; + version = "0.3.4"; format = "pyproject"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Ms00nR3dpJ0hGtHvVa5B29dasYtBP8igxrgMm0NiArc="; + sha256 = "sha256-0nKAeqZCfzYFsV18BDsSws/54FmRoy7lQSHguI6m3Sc="; }; nativeBuildInputs = [ From cf758ae35572d27f3431a5e836855d4c90f97c7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 21:52:22 +0200 Subject: [PATCH 543/737] python3Packages.jsonschema-spec: init at 0.1.2 --- .../jsonschema-spec/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/jsonschema-spec/default.nix diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix new file mode 100644 index 000000000000..4e11bd4a27e2 --- /dev/null +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, jsonschema +, pathable +, pyyaml +, typing-extensions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jsonschema-spec"; + version = "0.1.2"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "p1c2u"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-RfkD2fVH9OUTe0XNpHO6brQ4+8zbMpae6AgdeFpYXa8="; + }; + + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + jsonschema + pathable + pyyaml + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/p1c2u/jsonschema-spec/releases/tag/${version}"; + description = "JSONSchema Spec with object-oriented paths"; + homepage = "https://github.com/p1c2u/jsonschema-spec"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30f0eb0d3796..69122a2b0f77 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4832,6 +4832,8 @@ in { jsonschema = callPackage ../development/python-modules/jsonschema { }; + jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; + jsonstreams = callPackage ../development/python-modules/jsonstreams { }; json-tricks = callPackage ../development/python-modules/json-tricks { }; From 504d0e24f32372533f858be7ac0145549de14f85 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 21:53:29 +0200 Subject: [PATCH 544/737] python3Packages.openapi-spec-validator: 0.4.0 -> 0.5.1 https://github.com/p1c2u/openapi-spec-validator/releases/tag/0.5.1 https://github.com/p1c2u/openapi-spec-validator/releases/tag/0.5.0 --- .../openapi-spec-validator/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 2edd46419654..6ee3de6cc37e 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -4,7 +4,10 @@ , poetry-core # propagates +, importlib-resources , jsonschema +, jsonschema-spec +, lazy-object-proxy , openapi-schema-validator , pyyaml @@ -18,7 +21,7 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.4.0"; + version = "0.5.1"; format = "pyproject"; # no tests via pypi sdist @@ -26,20 +29,18 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; rev = version; - hash = "sha256-mGgHlDZTUo72RNZ/448gkGdza4EntYU9YoBpSKDUCeA="; + hash = "sha256-8VhD57dNG0XrPUdcq39GEfHUAgdDwJ8nv+Lp57OpTLg="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'openapi-schema-validator = "^0.2.0"' 'openapi-schema-validator = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + importlib-resources jsonschema + jsonschema-spec + lazy-object-proxy openapi-schema-validator pyyaml ]; @@ -69,8 +70,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/p1c2u/openapi-spec-validator"; + changelog = "https://github.com/p1c2u/openapi-spec-validator/releases/tag/${version}"; description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification"; + homepage = "https://github.com/p1c2u/openapi-spec-validator"; license = licenses.asl20; maintainers = with maintainers; [ rvl ]; }; From fc7fafcbf0ace64b3016ea65241a6855532bbf2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 22:13:47 +0200 Subject: [PATCH 545/737] python3Packages.dateparser: fix regex compatibility Patch by thmo (THomas Moschny) taken from https://github.com/scrapinghub/dateparser/issues/1045#issuecomment-1129846022. Also relaxes the regex version constraint. --- .../development/python-modules/dateparser/default.nix | 8 ++++++++ .../python-modules/dateparser/regex-compat.patch | 11 +++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/python-modules/dateparser/regex-compat.patch diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 6d113b178c5a..5c151d518bb9 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -29,7 +29,15 @@ buildPythonPackage rec { sha256 = "sha256-bDup3q93Zq+pvwsy/lQy2byOMjG6C/+7813hWQMbZRU="; }; + patches = [ + ./regex-compat.patch + ]; + postPatch = '' + substituteInPlace setup.py --replace \ + 'regex !=2019.02.19,!=2021.8.27,<2022.3.15' \ + 'regex' + # https://github.com/scrapinghub/dateparser/issues/1053 substituteInPlace tests/test_search.py --replace \ "('June 2020', datetime.datetime(2020, 6, datetime.datetime.utcnow().day, 0, 0))," \ diff --git a/pkgs/development/python-modules/dateparser/regex-compat.patch b/pkgs/development/python-modules/dateparser/regex-compat.patch new file mode 100644 index 000000000000..4c69d14f1023 --- /dev/null +++ b/pkgs/development/python-modules/dateparser/regex-compat.patch @@ -0,0 +1,11 @@ +--- a/dateparser/languages/locale.py ++++ b/dateparser/languages/locale.py +@@ -169,7 +169,7 @@ class Locale: + if normalize: + value = list(map(normalize_unicode, value)) + pattern = '|'.join(sorted(value, key=len, reverse=True)) +- pattern = DIGIT_GROUP_PATTERN.sub(r'?P\d+', pattern) ++ pattern = pattern.replace(r'\d+', r'?P\d+') + pattern = re.compile(r'^(?:{})$'.format(pattern), re.UNICODE | re.IGNORECASE) + relative_dictionary[pattern] = key + return relative_dictionary From fe1ecd204f70632ca1aaaeb11b4cf73219098b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 15 Sep 2022 22:30:20 +0200 Subject: [PATCH 546/737] python3Packages.radicale_infcloud: 2017-07-27 -> unstable-2022-04-18 --- .../radicale_infcloud/default.nix | 18 +++++++++++------- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 5d3540e01956..580ab59e630b 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -1,23 +1,27 @@ -{ lib, fetchFromGitHub, buildPythonPackage }: +{ lib, fetchFromGitHub, buildPythonPackage, radicale }: buildPythonPackage { pname = "radicale_infcloud"; - version = "2017-07-27"; + version = "unstable-2022-04-18"; src = fetchFromGitHub { owner = "Unrud"; repo = "RadicaleInfCloud"; - rev = "972757bf4c6be8b966ee063e3741ced29ba8169f"; - sha256 = "1c9ql9nv8kwi791akwzd19dcqzd916i7yxzbnrismzw4f5bhgzsk"; + rev = "53d3a95af5b58cfa3242cef645f8d40c731a7d95"; + sha256 = "sha256-xzBWIx2OOkCtBjlff1Z0VqgMhxWtgiOKutXUadT3tIo="; }; - doCheck = false; # Tries to import radicale, circular dependency + propagatedBuildInputs = [ radicale ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "radicale" ]; meta = with lib; { homepage = "https://github.com/Unrud/RadicaleInfCloud/"; description = "Integrate InfCloud into Radicale's web interface"; license = with licenses; [ agpl3 gpl3 ]; - platforms = platforms.all; - maintainers = with maintainers; [ aneeshusa ]; + maintainers = with maintainers; [ aneeshusa erictapen ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69122a2b0f77..a61cc235d967 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9414,7 +9414,9 @@ in { rachiopy = callPackage ../development/python-modules/rachiopy { }; - radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { }; + radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { + radicale = pkgs.radicale.override { python3 = python; }; + }; radio_beam = callPackage ../development/python-modules/radio_beam { }; From d79ea2dde35c671d5b93443569efe15fb7fb067e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 15 Sep 2022 22:30:40 +0200 Subject: [PATCH 547/737] python310Packages.autocommand: init at 2.2.1 --- .../python-modules/autocommand/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/autocommand/default.nix diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix new file mode 100644 index 000000000000..0c8dfc54036c --- /dev/null +++ b/pkgs/development/python-modules/autocommand/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "autocommand"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "Lucretiel"; + repo = "autocommand"; + rev = version; + sha256 = "sha256-bjoVGfP57qhvPuHHcMP8JQddAaW4/fEyatElk1UEPZo="; + }; + + # fails with: SyntaxError: invalid syntax + doCheck = false; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "autocommand" ]; + + meta = with lib; { + description = " Autocommand turns a python function into a CLI program "; + homepage = "https://github.com/Lucretiel/autocommand"; + license = licenses.lgpl3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a61cc235d967..93037a89b537 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -885,6 +885,8 @@ in { autobahn = callPackage ../development/python-modules/autobahn { }; + autocommand = callPackage ../development/python-modules/autocommand { }; + autograd = callPackage ../development/python-modules/autograd { }; autoit-ripper = callPackage ../development/python-modules/autoit-ripper { }; From ac4af6c1f88b0ac41c080b8034f724dac93d5490 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 23:22:50 +0200 Subject: [PATCH 548/737] python3Packages.numba: relax setuptools constraint --- .../python-modules/numba/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index d5404954683a..2ca0e08ba5b1 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -5,10 +5,11 @@ , fetchPypi , python , buildPythonPackage +, setuptools , numpy , llvmlite -, setuptools , libcxx +, importlib-metadata , substituteAll # CUDA-only dependencies: @@ -24,6 +25,7 @@ let in buildPythonPackage rec { version = "0.56.2"; pname = "numba"; + format = "setuptools"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { @@ -32,29 +34,27 @@ in buildPythonPackage rec { }; postPatch = '' - # numpy substituteInPlace setup.py \ - --replace "1.23" "2" - - substituteInPlace numba/__init__.py \ - --replace "(1, 22)" "(2, 0)" + --replace "setuptools<60" "setuptools" ''; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + nativeBuildInputs = lib.optional cudaSupport [ + addOpenGLRunpath + ]; + propagatedBuildInputs = [ numpy llvmlite setuptools + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-metadata ] ++ lib.optionals cudaSupport [ cudatoolkit cudatoolkit.lib ]; - nativeBuildInputs = lib.optional cudaSupport [ - addOpenGLRunpath - ]; - patches = lib.optionals cudaSupport [ (substituteAll { src = ./cuda_path.patch; From 05cdb1e95e3105c867dacc7a1274f2a6eb92902a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 15 Sep 2022 23:23:37 +0200 Subject: [PATCH 549/737] python310Packages.pyspark: make postPatch generic --- pkgs/development/python-modules/pyspark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index dfce66ee52df..a596a2226c5e 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i "s/'pypandoc'//" setup.py substituteInPlace setup.py \ - --replace py4j==0.10.9.3 'py4j>=0.10.9,<0.11' + --replace py4j== 'py4j>=' ''; propagatedBuildInputs = [ From 4a1bbf8de5d4dd14330875dedd6f0d313a82a717 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 23:45:47 +0200 Subject: [PATCH 550/737] python3Packages.selenium: 4.3.0 -> 4.4.2 --- pkgs/development/python-modules/selenium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 101135794385..4c7eedf281d3 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.3.0"; + version = "4.4.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; - rev = "refs/tags/selenium-${version}"; # check if there is a newer tag with -python suffix - sha256 = "sha256-tD2sJGVBwqB0uOM3zwdNn71+ILYEHPAvWHvoJN24w6E="; + rev = "refs/tags/selenium-${version}-python"; # check if there is a newer tag with -python suffix + hash = "sha256-sJJ3i4mnGp5fDgo64p6B2vRCqp/Wm99VoyRLyy4nBH8="; }; postPatch = '' From 3e6c255b329cb1438436d54113fc46d8907a9488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 15 Sep 2022 23:52:59 +0200 Subject: [PATCH 551/737] python310Packages.eth-abi: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/eth-abi/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 7bf0f9b49710..dc9b2f7895cd 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "eth-abi"; - version = "3.0.0"; + version = "3.0.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-abi"; rev = "v${version}"; - sha256 = "sha256-qiuyGVOy+n8l3jSqwMGnBXcDrOxIiJ0lNP4lq/EQEhU="; + sha256 = "sha256-xrZpT/9zwDtjSwSPDDse+Aq8plPm26OR/cIrliZUpLY="; }; postPatch = '' @@ -33,6 +33,9 @@ buildPythonPackage rec { parsimonious ]; + # lots of: TypeError: isinstance() arg 2 must be a type or tuple of types + doCheck = false; + checkInputs = [ hypothesis pytestCheckHook From fa380853c34fa96bfb8c5278a81844e8f7a4365d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Sep 2022 00:17:14 +0200 Subject: [PATCH 552/737] python310Packages.eth-keys: disable broken tests --- pkgs/development/python-modules/eth-keys/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index efdde22b8b90..47e43efef681 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -41,6 +41,14 @@ buildPythonPackage rec { ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; + disabledTests = [ + # tests are broken + "test_compress_decompress_inversion" + "test_public_key_generation_is_equal" + "test_signing_is_equal" + "test_native_to_coincurve_recover" + ]; + pythonImportsCheck = [ "eth_keys" ]; passthru.optional-dependencies = { From 227920fe6b77ff7e0c0032d075dbbacc6d8f32ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Sep 2022 00:17:24 +0200 Subject: [PATCH 553/737] python310Packages.py-eth-sig-utils: disable tests --- pkgs/development/python-modules/py-eth-sig-utils/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix index 1dfc8904fe00..3ef63cd1926e 100644 --- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -26,6 +26,9 @@ buildPythonPackage rec { rlp ]; + # lots of: isinstance() arg 2 must be a type or tuple of types + doCheck = false; + checkPhase = '' ${python.interpreter} -m unittest ''; From 72b05490748832db812be179cb0dc774fd23c0f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 01:23:23 +0200 Subject: [PATCH 554/737] python3Packages.pylama: propagate setuptools for pkg_resources import --- pkgs/development/python-modules/pylama/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 41e2b86202d7..5875112c99fd 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -10,6 +10,7 @@ , pydocstyle , pyflakes , vulture +, setuptools , isort , pylint , pytestCheckHook @@ -43,6 +44,7 @@ let pylama = buildPythonPackage rec { pycodestyle pydocstyle pyflakes + setuptools vulture ]; From e118a8d81f72dc6712640a127b530ac053a01b26 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 01:39:11 +0200 Subject: [PATCH 555/737] python3Packages.clikit: relax crashtest constraint, enable tests --- .../python-modules/clikit/default.nix | 67 ++++++++++++++----- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 1f6be754be19..af366cdbec06 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,26 +1,63 @@ -{ lib, buildPythonPackage, fetchPypi -, isPy27, pythonAtLeast -, pylev, pastel, typing ? null, enum34 ? null, crashtest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pythonAtLeast +, poetry-core + +# propagates +, pylev +, pastel + +# python36+ +, crashtest + +# python2 +, typing +, enum34 + +# tests +, pytest-mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "clikit"; version = "0.6.2"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "0ngdkmb73gkp5y00q7r9k1cdlfn0wyzws2wrqlshc4hlkbdyabj4"; + src = fetchFromGitHub { + owner = "sdispater"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-xAsUNhVQBjtSFHyjjnicAKRC3+Tdn3AdGDUYhmOOIdA="; }; - propagatedBuildInputs = [ - pylev pastel - ] - ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ] - ++ lib.optionals isPy27 [ typing enum34 ]; + postPatch = '' + substituteInPlace pyproject.toml --replace \ + 'crashtest = { version = "^0.3.0", python = "^3.6" }' \ + 'crashtest = { version = "*", python = "^3.6" }' + ''; - # The Pypi tarball doesn't include tests, and the GitHub source isn't - # buildable until we bootstrap poetry, see - # https://github.com/NixOS/nixpkgs/pull/53599#discussion_r245855665 - doCheck = false; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pylev + pastel + ] + ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ] + ++ lib.optionals isPy27 [ typing enum34 ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "clikit" + ]; meta = with lib; { homepage = "https://github.com/sdispater/clikit"; From b60e4d71d6cb9cdf4b53948d64bb5edb6ac4902f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 01:54:14 +0200 Subject: [PATCH 556/737] python3Packages.python-ldap: rename from ldap --- pkgs/applications/finance/odoo/default.nix | 2 +- .../networking/powerdns-admin/default.nix | 2 +- .../django-auth-ldap/default.nix | 4 +- .../python-modules/ldappool/default.nix | 4 +- .../{ldap => python-ldap}/default.nix | 39 ++++++++++++------- .../python-modules/suseapi/default.nix | 4 +- pkgs/os-specific/linux/sssd/default.nix | 4 +- pkgs/servers/ldap/389/default.nix | 2 +- pkgs/tools/security/adenum/default.nix | 2 +- pkgs/tools/security/ldapmonitor/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 8 ++-- 12 files changed, 44 insertions(+), 30 deletions(-) rename pkgs/development/python-modules/{ldap => python-ldap}/default.nix (54%) diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index c755b0fb6678..9ae2d97a3d28 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -120,7 +120,7 @@ in python.pkgs.buildPythonApplication rec { pypdf2 pyserial python-dateutil - ldap + python-ldap python-stdnum pytz pyusb diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index cc31f25390a7..d8b4a6b2f329 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -32,7 +32,7 @@ let pythonDeps = with python.pkgs; [ flask flask_assets flask_login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify mysqlclient psycopg2 sqlalchemy - cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython + cffi configobj cryptography bcrypt requests python-ldap pyotp qrcode dnspython gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core lima pytimeparse pyyaml jinja2 itsdangerous werkzeug ]; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index b3596e1e4444..e1ca5f418afb 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,8 +7,8 @@ , setuptools-scm # runtime -, ldap , django +, python-ldap # tests , python @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django - ldap + python-ldap ]; # ValueError: SCHEMADIR is None, ldap schemas are missing. diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index a3cb21c10972..4697c80680af 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pbr, ldap, prettytable, fixtures, testresources, testtools }: +, pbr, python-ldap, prettytable, fixtures, testresources, testtools }: buildPythonPackage rec { pname = "ldappool"; @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ ldap prettytable ]; + propagatedBuildInputs = [ python-ldap prettytable ]; checkInputs = [ fixtures testresources testtools ]; diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix similarity index 54% rename from pkgs/development/python-modules/ldap/default.nix rename to pkgs/development/python-modules/python-ldap/default.nix index ceaf4f6bf83a..ea9e8ca852d7 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -1,21 +1,39 @@ -{ buildPythonPackage, fetchPypi -, pyasn1, pyasn1-modules -, pythonAtLeast, pytestCheckHook -, openldap, cyrus_sasl, lib, stdenv }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pyasn1 +, pyasn1-modules +, pythonAtLeast +, pythonOlder +, pytestCheckHook +, openldap +, cyrus_sasl +}: buildPythonPackage rec { pname = "python-ldap"; version = "3.4.2"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc="; + hash = "sha256-sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc="; }; - propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; + buildInputs = [ + openldap + cyrus_sasl + ]; - checkInputs = [ pytestCheckHook ]; - buildInputs = [ openldap cyrus_sasl ]; + propagatedBuildInputs = [ + pyasn1 + pyasn1-modules + ]; + + checkInputs = [ + pytestCheckHook + ]; preCheck = '' # Needed by tests to setup a mockup ldap server. @@ -25,11 +43,6 @@ buildPythonPackage rec { export SCHEMA="${openldap}/etc/schema" ''; - disabledTests = lib.optionals (pythonAtLeast "3.9") [ - # See https://github.com/python-ldap/python-ldap/issues/407 - "test_simple_bind_noarg" - ]; - doCheck = !stdenv.isDarwin; meta = with lib; { diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix index bcf35d1f5f70..83925dd64d93 100644 --- a/pkgs/development/python-modules/suseapi/default.nix +++ b/pkgs/development/python-modules/suseapi/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , django , suds-jurko -, ldap +, python-ldap , mechanize , beautifulsoup4 , pyxdg @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django suds-jurko ldap mechanize beautifulsoup4 pyxdg python-dateutil requests + django suds-jurko python-ldap mechanize beautifulsoup4 pyxdg python-dateutil requests ]; buildInputs = [ httpretty ]; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index ba655e75be54..462151ff64f7 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preConfigure = '' export SGML_CATALOG_FILES="${docbookFiles}" - export PYTHONPATH=$(find ${python3.pkgs.ldap} -type d -name site-packages) + export PYTHONPATH=$(find ${python3.pkgs.python-ldap} -type d -name site-packages) export PATH=$PATH:${openldap}/libexec configureFlagsArray=( @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { samba nfs-utils p11-kit python3 popt talloc tdb tevent ldb pam openldap pcre2 libkrb5 cifs-utils glib keyutils dbus fakeroot libxslt libxml2 - libuuid python3.pkgs.ldap systemd nspr check cmocka uid_wrapper + libuuid python3.pkgs.python-ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson jose ]; makeFlags = [ diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index aa46426142bd..438d7d0e630f 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { # lib389 (python3.withPackages (ps: with ps; [ setuptools - ldap + python-ldap six pyasn1 pyasn1-modules diff --git a/pkgs/tools/security/adenum/default.nix b/pkgs/tools/security/adenum/default.nix index 8bcac264d95d..24d318968ad8 100644 --- a/pkgs/tools/security/adenum/default.nix +++ b/pkgs/tools/security/adenum/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ impacket pwntools - ldap + python-ldap ] ++ [ john ]; diff --git a/pkgs/tools/security/ldapmonitor/default.nix b/pkgs/tools/security/ldapmonitor/default.nix index 83035de4d20c..410aa4ca87ed 100644 --- a/pkgs/tools/security/ldapmonitor/default.nix +++ b/pkgs/tools/security/ldapmonitor/default.nix @@ -19,8 +19,8 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ impacket - ldap ldap3 + python-ldap ]; installPhase = '' diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6f9f6accd927..e6c9434a1198 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -95,6 +95,7 @@ mapAliases ({ influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 + ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93037a89b537..b3bca6b0d3ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5071,10 +5071,6 @@ in { lc7001 = callPackage ../development/python-modules/lc7001 { }; - ldap = callPackage ../development/python-modules/ldap { - inherit (pkgs) openldap cyrus_sasl; - }; - ldap3 = callPackage ../development/python-modules/ldap3 { }; ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; @@ -8935,6 +8931,10 @@ in { python_keyczar = callPackage ../development/python-modules/python_keyczar { }; + python-ldap = callPackage ../development/python-modules/python-ldap { + inherit (pkgs) openldap cyrus_sasl; + }; + python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; From 3bc2615c681d9c25b5eba75cbd2b050133813ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Sep 2022 12:21:20 +0200 Subject: [PATCH 557/737] python310Packages.ujson: 5.4.0 -> 5.5.0 --- pkgs/development/python-modules/ujson/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index ee2fede8e9f8..15e71e9544d9 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy , pytestCheckHook , pythonOlder , setuptools-scm @@ -9,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.4.0"; - disabled = isPyPy || pythonOlder "3.7"; + version = "5.5.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-a5U+CUQeMHUEEwdV5b1rFYUBeNWR9mKSu6RgjE9/mwA="; + sha256 = "sha256-slB3qXHH2ke9aEapEqdH9pY3dtkHIMiGA7G1XYF5B4A="; }; nativeBuildInputs = [ From 606d511ef6e4081ab5baaa4d7d98eaa19b9e26b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 14:00:08 +0200 Subject: [PATCH 558/737] python3Packages.pytest-logdog: propagate setuptools Uses pkg_resources, but does not declare a dependency on it. --- pkgs/development/python-modules/pytest-logdog/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix index c626a1cfac9e..bba0f092fd3f 100644 --- a/pkgs/development/python-modules/pytest-logdog/default.nix +++ b/pkgs/development/python-modules/pytest-logdog/default.nix @@ -4,6 +4,7 @@ , pytest , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm }: @@ -31,6 +32,9 @@ buildPythonPackage rec { pytest ]; + propagatedBuildInputs = [ + setuptools + ]; checkInputs = [ pytestCheckHook From 39feebbf61cb937eafa23cbb486acc0244cca416 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 14:01:21 +0200 Subject: [PATCH 559/737] python3Packages.amqtt: relax transitions constraint --- pkgs/development/python-modules/amqtt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index 71c07c07cc9b..5e42a6ea1f5b 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { hash = "sha256-8T1XhBSOiArlUQbQ41LsUogDgOurLhf+M8mjIrrAC4s="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'transitions = "^0.8.0"' 'transitions = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; From e7cf8da2d06a6e8f78e364d3eb42d02df578c13a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 14:01:36 +0200 Subject: [PATCH 560/737] python3Packages.pluggy: use pyproject format --- pkgs/development/python-modules/pluggy/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 8d1fcbed3a7f..46aebb519500 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -9,25 +9,22 @@ buildPythonPackage rec { pname = "pluggy"; version = "1.0.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"; }; - checkPhase = '' - py.test - ''; - - # To prevent infinite recursion with pytest - doCheck = false; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + # To prevent infinite recursion with pytest + doCheck = false; + meta = { description = "Plugin and hook calling mechanisms for Python"; homepage = "https://github.com/pytest-dev/pluggy"; From 6aa094d7535caee5d6726b3da29799d307e40604 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 16:07:05 +0200 Subject: [PATCH 561/737] protobuf: update to 3.21.x Required for the latest python google-api-core version. --- 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 c418b06b7e1e..78c8b3cb65d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21155,7 +21155,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf3_19; + protobuf = protobuf3_21; protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; From b0312b879412c581372b704ddc76f9a0e4744f9c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 16:12:39 +0200 Subject: [PATCH 562/737] python3Packages.archinfo: 9.2.15 -> 9.2.18 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 263b99997149..fa91ebe356fa 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.15"; + version = "9.2.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-K9EAyCvwgWhiZ+rkPKPGBr3lWYIIRCf0FAzPjIjrcU8="; + hash = "sha256-atLc02FoW2cmlvA/jzRsOeXEY9cyrSeLSl3+pO5nNKA="; }; nativeBuildInputs = [ From 266ce4914f64ec96fce44a75c1a65ad419b329ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 16:32:26 +0200 Subject: [PATCH 563/737] python3Packages.requirements-parser: propagate setuptools --- pkgs/development/python-modules/requirements-parser/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix index 3d51f4741af6..3e26c91014a4 100644 --- a/pkgs/development/python-modules/requirements-parser/default.nix +++ b/pkgs/development/python-modules/requirements-parser/default.nix @@ -4,6 +4,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, setuptools , types-setuptools }: @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + setuptools types-setuptools ]; From 173569088a94c7e7beb3f770aebfdfe3aec5519e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 17:55:12 +0200 Subject: [PATCH 564/737] python3Packages.javaproperties: add setuptools to nativeBuildInputs and migrate checkphase to the pytest hook. --- .../python-modules/javaproperties/default.nix | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index 6b2bac8ad65f..3132c873246f 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -1,7 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , setuptools , six -, pytest +, pytestCheckHook , python-dateutil }: @@ -17,14 +19,26 @@ buildPythonPackage rec { sha256 = "16rcdw5gd4a21v2xb1j166lc9z2dqcv68gqvk5mvpnm0x6nwadgp"; }; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ six ]; + nativeBuildInputs = [ + setuptools + ]; - checkInputs = [ python-dateutil pytest ]; - checkPhase = '' - rm tox.ini - pytest -k 'not dumps and not time' --ignore=test/test_propclass.py - ''; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + python-dateutil + pytestCheckHook + ]; + + disabledTests = [ + "time" + ]; + + disabledTestPaths = [ + "test/test_propclass.py" + ]; meta = with lib; { description = "Microsoft Azure API Management Client Library for Python"; From 12589b39b7a1fcb2e20a74cd92b454bdaa2988e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:10:52 +0200 Subject: [PATCH 565/737] python3Packages.aioresponses: propagate setuptools --- pkgs/development/python-modules/aioresponses/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index a23b1eca77ca..3c2a0e48d329 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -7,6 +7,7 @@ , pbr , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + setuptools ]; checkInputs = [ From 62bc7297006e980d0ed4d1d979064ec7cd6254bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:34:20 +0200 Subject: [PATCH 566/737] python3Packages.schema-salad: mark as broken Depends on an outdated version of mistune (pins <0.9, current is 2.0.4). --- .../python-modules/schema-salad/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index d986c4ed69b5..ae1627f888f3 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -2,6 +2,7 @@ , black , buildPythonPackage , fetchPypi +, setuptools-scm , cachecontrol , lockfile , mistune @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-18/xLIq1+yM8iQBIeXvRIO4A5GqZS/3qOKXmi439+sQ="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ cachecontrol lockfile @@ -35,6 +40,10 @@ buildPythonPackage rec { pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen; + preCheck = '' + rm tox.ini + ''; + disabledTests = [ # Setup for these tests requires network access "test_secondaryFiles" @@ -52,6 +61,7 @@ buildPythonPackage rec { }; meta = with lib; { + broken = true; # disables on outdated version of mistune description = "Semantic Annotations for Linked Avro Data"; homepage = "https://github.com/common-workflow-language/schema_salad"; license = with licenses; [ asl20 ]; From 09b2bf488f3a54df8a05fc8ee6b7786eb27b6011 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:39:37 +0200 Subject: [PATCH 567/737] platformio: relax wsproto constraint --- pkgs/development/embedded/platformio/core.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 9bb197c0bd40..fcb4e7d5fda3 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -21,7 +21,8 @@ with python3.pkgs; buildPythonApplication rec { --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ - --replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' + --replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' \ + --replace 'wsproto==' 'wsproto>=' ''; propagatedBuildInputs = [ From 6182f82dbe01d1c6b4988c11864744543aca131d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:46:11 +0200 Subject: [PATCH 568/737] python3Packages.phone-mode: relax aioserial constraint --- pkgs/development/python-modules/phone-modem/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/phone-modem/default.nix b/pkgs/development/python-modules/phone-modem/default.nix index 3d5a9d783727..0202e2c411b4 100644 --- a/pkgs/development/python-modules/phone-modem/default.nix +++ b/pkgs/development/python-modules/phone-modem/default.nix @@ -17,6 +17,11 @@ buildPythonPackage rec { sha256 = "sha256-7NahK9l67MdT/dDVXsq+y0Z4cZxZ/WUW2kPpE4Wz6j0="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "aioserial==1.3.0" "aioserial" + ''; + propagatedBuildInputs = [ aioserial ]; From ccb6cb09e606f426d16781a04053828905e37702 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 18:51:02 +0200 Subject: [PATCH 569/737] python3Packages.ttls: propagate setuptools --- pkgs/development/python-modules/ttls/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index 9f5917749e67..ea1d3b789152 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , poetry-core , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp colour + setuptools ]; # Module has no tests From ccdc6e1f4cdd5f390bb674bf5761292e89c0e486 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 19:03:25 +0200 Subject: [PATCH 570/737] python3Packages.certbot: ignore DeprecationWarnings during test --- pkgs/development/python-modules/certbot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 53c7c397f981..8bef6cf2148e 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # See https://github.com/certbot/certbot/issues/8746 "-W ignore::ResourceWarning" + "-W ignore::DeprecationWarning" ]; doCheck = true; From e944d4fe3dea48360f3efa2ac9301438da0a3927 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 19:12:53 +0200 Subject: [PATCH 571/737] python3Packages.gql: 3.1.0 -> 3.4.0 --- pkgs/development/python-modules/gql/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 0c8b2bd9378a..2adcf894dcca 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -1,6 +1,7 @@ { lib , aiofiles , aiohttp +, backoff , botocore , buildPythonPackage , fetchFromGitHub @@ -8,6 +9,7 @@ , mock , parse , pytest-asyncio +, pytest-console-scripts , pytestCheckHook , pythonOlder , requests @@ -34,6 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + backoff botocore graphql-core requests @@ -48,10 +51,19 @@ buildPythonPackage rec { mock parse pytest-asyncio + pytest-console-scripts pytestCheckHook vcrpy ]; + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTests = [ # Tests requires network access "test_execute_result_error" From 0c45c1a09b5782ba4dfefa69eac4e0698e22fb9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 19:18:13 +0200 Subject: [PATCH 572/737] python3Packages.pipdeptree: 2.2.1 -> 2.3.1 --- .../python-modules/pipdeptree/default.nix | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index b6dbfe53d8d9..945093dffd0b 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -2,31 +2,51 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, tox +, diff-cover +, graphviz +, hatchling +, hatch-vcs +, pytest-mock +, pytestCheckHook , pip +, virtualenv }: buildPythonPackage rec { pname = "pipdeptree"; - version = "2.2.1"; + version = "2.3.1"; format = "pyproject"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "naiquevin"; repo = "pipdeptree"; - rev = "${version}"; - sha256 = "sha256-CL0li/79qptOtOGLwder5s0+6zv7+PUnl+bD6p+XBtA="; + rev = "refs/tags/${version}"; + hash = "sha256-X3SVQzBg+QjBSewRsfiyLqIea0duhe1nUf8ancWLvcI="; }; - propagatedBuildInputs = [ + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInput = [ pip ]; + passthru.optional-dependencies = { + graphviz = [ graphviz ]; + }; + checkInputs = [ - tox - ]; + diff-cover + pytest-mock + pytestCheckHook + virtualenv + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "pipdeptree" From 73fed7827ceb2f652a3f592c4d537ba083f20518 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Sep 2022 19:19:45 +0200 Subject: [PATCH 573/737] python3Packages.backoff: use pyproject format --- .../python-modules/backoff/default.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index 9671b7b5a267..e62533f491cb 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, poetry, pytest-asyncio, responses }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pytest-asyncio +, responses +}: buildPythonPackage rec { pname = "backoff"; version = "2.1.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "litl"; @@ -11,11 +19,19 @@ buildPythonPackage rec { sha256 = "sha256-eKd1g3UxXlpSlNlik80RKXRaw4mZyvAWl3i2GNuZ3hI="; }; - format = "pyproject"; + nativeBuildInputs = [ + poetry-core + ]; - nativeBuildInputs = [ poetry ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + responses + ]; - checkInputs = [ pytestCheckHook pytest-asyncio responses ]; + pythonImportsCheck = [ + "backoff" + ]; meta = with lib; { description = "Function decoration for backoff and retry"; From c2f03aa6f15746e69a7d884982224a8dee3a0388 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 00:36:08 +0200 Subject: [PATCH 574/737] easycrypt-runtest: use other format --- pkgs/applications/science/logic/easycrypt/runtest.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/logic/easycrypt/runtest.nix b/pkgs/applications/science/logic/easycrypt/runtest.nix index 79a034b93693..c0d72d96e1d1 100644 --- a/pkgs/applications/science/logic/easycrypt/runtest.nix +++ b/pkgs/applications/science/logic/easycrypt/runtest.nix @@ -2,6 +2,7 @@ python3Packages.buildPythonApplication rec { inherit (easycrypt) src version; + format = "other"; pname = "easycrypt-runtest"; From 99e2cf4e9486607c9f392c0fd9b3e9110cf713dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 00:37:19 +0200 Subject: [PATCH 575/737] headphones: use other format --- pkgs/servers/headphones/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index f39390f5ea92..9ebf04b80bdd 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -3,6 +3,7 @@ python3.pkgs.buildPythonApplication rec { pname = "headphones"; version = "0.6.0-beta.5"; + format = "other"; src = fetchFromGitHub { owner = "rembo10"; From 557e932a6408f5dfcaf803cc498237cbead9aae1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 00:39:44 +0200 Subject: [PATCH 576/737] python3Packages.atenpdu: propagate async-timeout --- pkgs/development/python-modules/atenpdu/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index d2f4cc0af8ce..e14b68c35507 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, async-timeout , pysnmp }: @@ -13,7 +14,10 @@ buildPythonPackage rec { sha256 = "sha256-vvq8InmJUgvm/PpvZutpsBR3Fj1gR+xrkgfEGlw04Ek="; }; - propagatedBuildInputs = [ pysnmp ]; + propagatedBuildInputs = [ + async-timeout + pysnmp + ]; # Project has no test doCheck = false; From 14fbd3df87c31f0f1a261a57e6a7f45195427e08 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:06:17 +0200 Subject: [PATCH 577/737] python3Packages.clize: add setuptools to nativeBuildInputs relax attrs constraints and use pyproject format. --- pkgs/development/python-modules/clize/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 1b0caeaaf266..f1e5b16320b6 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchPypi +# build +, setuptools + # propagtes , sigtools , six @@ -21,6 +24,7 @@ buildPythonPackage rec { pname = "clize"; version = "4.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -29,9 +33,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "docutils ~= 0.17.0" "docutils" + --replace "docutils ~= 0.17.0" "docutils" \ + --replace "attrs>=19.1.0,<22" "attrs>=19.1.0" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs docutils From 1d0965044eb635b41f6b2523c3c1c43a18af28d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:24:11 +0200 Subject: [PATCH 578/737] python3Packages.cx_Freeze: relax setuptools constraint --- pkgs/development/python-modules/cx_freeze/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 454e2e8f2ccf..cb4f7e074ffa 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: buildPythonPackage rec { - pname = "cx_Freeze"; + pname = "cx-freeze"; version = "6.11.1"; src = fetchPypi { - inherit pname version; + pname = "cx_Freeze"; + inherit version; sha256 = "sha256-jzowyeM5TykGVeNG07RgkQZWswrGNHqHSZu1rTZcbnw="; }; @@ -17,8 +18,11 @@ buildPythonPackage rec { ]; # timestamp need to come after 1980 for zipfiles and nix store is set to epoch - prePatch = '' + postPatch = '' substituteInPlace cx_Freeze/freezer.py --replace "os.stat(module.file).st_mtime" "time.time()" + + substituteInPlace setup.cfg \ + --replace "setuptools>=59.0.1,<=60.10.0" "setuptools>=59.0.1" ''; # fails to find Console even though it exists on python 3.x From b461a549c9d810516d260f4662d011a09038ae14 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:32:46 +0200 Subject: [PATCH 579/737] python3Packages.nats-python: propagate setuptools --- pkgs/development/python-modules/nats-python/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/nats-python/default.nix b/pkgs/development/python-modules/nats-python/default.nix index 5bf5b2a6d21c..9662dddd5ddb 100644 --- a/pkgs/development/python-modules/nats-python/default.nix +++ b/pkgs/development/python-modules/nats-python/default.nix @@ -4,6 +4,7 @@ , fetchpatch , poetry-core , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -32,6 +33,10 @@ buildPythonPackage rec { }) ]; + propagatedBuildInputs = [ + setuptools + ]; + # Tests require a running NATS server doCheck = false; From 221754c5ca1b4a6734d91a73da6f9b3ecc2364d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:34:56 +0200 Subject: [PATCH 580/737] python3Packages.nunavut: relax pydsdl constraint --- pkgs/development/python-modules/nunavut/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 117d5cfdd14f..5b8fb246641a 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -10,14 +10,20 @@ buildPythonPackage rec { pname = "nunavut"; version = "1.8.3"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "sha256-JI+0IpQWikE6vXfpZHWsVjx3JPaVJ/f4oAjTSNs1Wuk="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pydsdl ~= 1.16" "pydsdl" + ''; + propagatedBuildInputs = [ importlib-resources pydsdl From 6e51c3ee475a06106eddf5431b38b073c5080a54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 01:50:55 +0200 Subject: [PATCH 581/737] python3Packages.widgetsnbextension: add jupyter-packaging to nativeBuildInputs --- .../python-modules/widgetsnbextension/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 800851a87a34..7b077d14c58e 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, jupyter-packaging , notebook , ipywidgets }: @@ -15,20 +16,16 @@ buildPythonPackage rec { hash = "sha256-NIJIZMBisLMDCteCENta5qOWDfth1bJ1YtZjF3TeAoY="; }; - # setup.py claims to require notebook, but the source doesn't have any imports - # in it. - postPatch = '' - substituteInPlace setup.py --replace "'notebook>=4.4.1'," "" - ''; - - propagatedBuildInputs = [ ]; + nativeBuildInputs = [ + jupyter-packaging + ]; # No tests in archive doCheck = false; meta = { description = "IPython HTML widgets for Jupyter"; - homepage = "http://ipython.org/"; + homepage = "https://github.com/jupyter-widgets/ipywidgets/tree/master/python/widgetsnbextension"; license = ipywidgets.meta.license; # Build from same repo maintainers = with lib.maintainers; [ fridh ]; }; From 9ec63fb7a72bbdbb3444a4682257367f1273df7e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 03:06:09 +0200 Subject: [PATCH 582/737] zpool-iostat-viz: build using format other --- pkgs/tools/filesystems/zpool-iostat-viz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix index f5eb7c7f02ef..a9e4dfe8ab74 100644 --- a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix +++ b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix @@ -7,6 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "zpool-iostat-viz"; version = "unstable-2021-11-13"; + format = "other"; src = fetchFromGitHub { owner = "chadmiller"; From 0ebde8969685fa1fef6e35f0e2d1f30f3f99db8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:08:56 +0200 Subject: [PATCH 583/737] home-assistant-component-tests: build with format other --- pkgs/servers/home-assistant/tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 7703bc6b2832..196da7e63953 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -70,6 +70,7 @@ let in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { pname = "homeassistant-test-${component}"; + format = "other"; dontBuild = true; dontInstall = true; From ad824e40c57f5b1d67e7c304d3915ba1cdd8c246 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:29:27 +0200 Subject: [PATCH 584/737] python3Packages.aioesphomeapi: relax protobuf constraint --- pkgs/development/python-modules/aioesphomeapi/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 67decf5ced07..8e8ca60af7e8 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { sha256 = "sha256-ZaNrSkRH9pFhzZncCs37k1M0w5svPfrY0WxePUnUlms="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "protobuf>=3.12.2,<4.0" "protobuf>=3.12.2" + ''; + propagatedBuildInputs = [ noiseprotocol protobuf From 1b1125a703aab37ee89a8df803f767232347391f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:29:38 +0200 Subject: [PATCH 585/737] python3Packages.hangups: relax protobuf constraint --- pkgs/development/python-modules/hangups/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix index 18dd31f8af56..9782a89114a9 100644 --- a/pkgs/development/python-modules/hangups/default.nix +++ b/pkgs/development/python-modules/hangups/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "protobuf>=3.1.0,<3.20" "protobuf" \ + --replace "protobuf>=3.1.0,<4" "protobuf" \ --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" ''; From bea969ab40690ee997638f432a76208402ade228 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:34:54 +0200 Subject: [PATCH 586/737] home-assistant: drop pydantic override --- pkgs/servers/home-assistant/default.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0cd59c21ad18..01dc882c156a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -177,19 +177,6 @@ let }); }) - # pyunifiprotect excludes pydantic==1.9.1 - (self: super: { - pydantic = super.pydantic.overridePythonAttrs (oldAttrs: rec { - version = "1.9.0"; - src = fetchFromGitHub { - owner = "samuelcolvin"; - repo = "pydantic"; - rev = "refs/tags/v${version}"; - hash = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM="; - }; - }); - }) - (self: super: { pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { doCheck = false; # requires pytest-aiohttp>=1.0.0 From ad67fa694727de2aad5cca8343420ea27095615d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:35:13 +0200 Subject: [PATCH 587/737] python3Packages.pyunifiprotect: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/pyunifiprotect/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 03070e5a3374..11d325750913 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -20,6 +20,7 @@ , python-dotenv , pythonOlder , pytz +, setuptools , termcolor , typer , ffmpeg @@ -46,6 +47,10 @@ buildPythonPackage rec { --replace "pydantic!=1.9.1" "pydantic" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp From 1fbc586713727bdc5f8efd8ed85f2a2c0d64b44e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:35:29 +0200 Subject: [PATCH 588/737] python3Packages.pychromecast: relax protobuf constraint --- pkgs/development/python-modules/pychromecast/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 9dce1cfa7938..727a46375bed 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { sha256 = "sha256-nlfcmFpKBdtb3NXaIZy/bO0lVIygk/jXS8EHs8VU7AA="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "protobuf>=3.19.1,<4" "protobuf>=3.19.1" + ''; + propagatedBuildInputs = [ casttube protobuf From 2428c85be99b628be0b9b6bd41cb50de9083d8ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:38:06 +0200 Subject: [PATCH 589/737] python3Packages.meteofrance-api: switch to poetry-core --- .../python-modules/meteofrance-api/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index 5e738adb62bf..4e8d96c3301b 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry +, fetchpatch +, poetry-core , pytestCheckHook , pythonOlder , pytz @@ -25,9 +26,16 @@ buildPythonPackage rec { hash = "sha256-X8f0z9ZPXH7Wc3GqHmPptxpNxbHeezdOzw4gZCprumU="; }; + patches = [ + (fetchpatch { + # Switch to poetry-core + url = "https://github.com/hacf-fr/meteofrance-api/commit/7536993fe38dfe3d0833da3fd750be9277aeffa6.patch"; + hash = "sha256-/4VgzoJxhaXoj1N1GNLJNvkQvv6IW9OcBJV6vg6kthM="; + }) + ]; + nativeBuildInputs = [ - # Doesn't work with poetry-core at the moment - poetry + poetry-core ]; propagatedBuildInputs = [ From ec82b18808889036d3e3fcff00912d71763a321c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:42:56 +0200 Subject: [PATCH 590/737] python3Packages.pycountry: propagate setuptools --- pkgs/development/python-modules/pycountry/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 3583826f69a3..a0048e7e75c9 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook }: @@ -13,6 +14,10 @@ buildPythonPackage rec { sha256 = "sha256-shY6JGxYWJTYCPGHg+GRN8twoMGPs2dI3AH8bxCcFkY="; }; + propagatedBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; From 7084f8c779aaadfb17d4928857c6894116faec29 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:43:14 +0200 Subject: [PATCH 591/737] python3Packages.poetry: relax crashtest constraint --- pkgs/development/python-modules/poetry/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 07dcb96f4074..3105187c98a7 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -53,6 +53,11 @@ buildPythonPackage rec { hash = "sha256-+Nsg7oPh9tAHEKt1R9C+nY9UPy+9vbf/+A6vQWgTi+4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'crashtest = "^0.3.0"' 'crashtest = "*"' + ''; + nativeBuildInputs = [ installShellFiles ]; From 7851a32a7fecc7bc8898413ce59aa494299fa2bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:44:45 +0200 Subject: [PATCH 592/737] python3Packages.amqtt: propagate setuptools --- pkgs/development/python-modules/amqtt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index 5e42a6ea1f5b..ecf326a9a21a 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -11,6 +11,7 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools , transitions , websockets }: @@ -42,6 +43,7 @@ buildPythonPackage rec { docopt passlib pyyaml + setuptools transitions websockets ]; From cdd4d3e16552f29e10f2d53e332f02aa9d97ec4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Sep 2022 15:45:40 +0200 Subject: [PATCH 593/737] python3Packages.bsblan: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/bsblan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix index e371079b3605..760d300f905a 100644 --- a/pkgs/development/python-modules/bsblan/default.nix +++ b/pkgs/development/python-modules/bsblan/default.nix @@ -11,6 +11,7 @@ , pytest-mock , pytestCheckHook , pythonOlder +, setuptools , yarl }: @@ -30,6 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ From 699bdb6c10abeb73b29b053b0a8c079b8ce1716c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 18 Sep 2022 00:23:13 +0200 Subject: [PATCH 594/737] python310Packages.pytest-console-scripts: propagate setuptools --- .../python-modules/pytest-console-scripts/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 32ccd22c9692..b01d2d2b7d0a 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -1,11 +1,12 @@ { lib , buildPythonPackage +, mock , fetchPypi , pytestCheckHook , python -, mock -, setuptools-scm , pythonOlder +, setuptools-scm +, setuptools }: buildPythonPackage rec { @@ -26,6 +27,10 @@ buildPythonPackage rec { setuptools-scm ]; + propagatedBuildInputs = [ + setuptools + ]; + checkInputs = [ mock pytestCheckHook From 590889055030a13c6b77371c881cdcee44a2d925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 18 Sep 2022 01:58:31 +0200 Subject: [PATCH 595/737] python310Packages.smart-open: 6.0.0 -> 6.2.0 --- pkgs/development/python-modules/smart-open/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index b124a7c887e9..668cdb1643da 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -9,12 +9,13 @@ , google-cloud-storage , requests , moto +, paramiko , pytestCheckHook }: buildPythonPackage rec { pname = "smart-open"; - version = "6.0.0"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "v${version}"; - sha256 = "sha256-FEIJ1DBW0mz7n+J03C1Lg8uAs2ZxI0giM7+mvuNPyGg="; + sha256 = "sha256-AtFIluoI2QeHUX2dclEmOxsv/cEtusWq7GyViRBhL5g="; }; propagatedBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { checkInputs = [ moto + paramiko pytestCheckHook ]; From 5b1dd911171380aa74b9a53a55eecec7937201ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 02:15:04 +0200 Subject: [PATCH 596/737] protobufc: 1.3.3 -> 1.4.1 --- pkgs/development/libraries/protobufc/1.3.nix | 11 ----------- .../protobufc/{generic.nix => default.nix} | 16 +++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 12 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/protobufc/1.3.nix rename pkgs/development/libraries/protobufc/{generic.nix => default.nix} (55%) diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix deleted file mode 100644 index 82126727282c..000000000000 --- a/pkgs/development/libraries/protobufc/1.3.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage, fetchFromGitHub, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.3.3"; - src = fetchFromGitHub { - owner = "protobuf-c"; - repo = "protobuf-c"; - rev = "v${version}"; - sha256 = "13948amsjj9xpa4yl6amlyk3ksr96bbd4ngshh2yzflwcslhg6gv"; - }; -}) diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/default.nix similarity index 55% rename from pkgs/development/libraries/protobufc/generic.nix rename to pkgs/development/libraries/protobufc/default.nix index b64d75076baf..28c15f0ef45e 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/default.nix @@ -1,15 +1,20 @@ -{ lib, stdenv, src, version +{ lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, protobuf, zlib -, ... }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "protobuf-c"; - inherit version; + version = "1.4.1"; - inherit src; + src = fetchFromGitHub { + owner = "protobuf-c"; + repo = "protobuf-c"; + rev = "refs/tags/v${version}"; + hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM="; + }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ protobuf zlib ]; meta = with lib; { @@ -17,5 +22,6 @@ stdenv.mkDerivation { description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c8b3cb65d2..7b51a1a1858a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21165,7 +21165,7 @@ with pkgs; protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { }; protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; - protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; + protobufc = callPackage ../development/libraries/protobufc { }; protolock = callPackage ../development/libraries/protolock { }; From d77eab14fe6522364f98b0fdb3b8a619586b0519 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 02:18:59 +0200 Subject: [PATCH 597/737] python3Packages.python-ldap: 3.4.2 -> 3.4.3 The newer version has not been published to PyPi in two days, so Git seems to be the more reliable channel to pull this package from. --- .../python-modules/python-ldap/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index ea9e8ca852d7..7b3c2bdbc0ba 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pyasn1 , pyasn1-modules , pythonAtLeast @@ -13,12 +13,14 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "3.4.2"; + version = "3.4.3"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "refs/tags/python-ldap-${version}"; + hash = "sha256-/ehvSs2qjuTPhaaOP0agPbWyyRugBpUlPq/Ny9t2C58="; }; buildInputs = [ From 809cf4639c5812f3f88e7bc46899b83dc1e92c7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 02:32:41 +0200 Subject: [PATCH 598/737] python3Packages.dask: 2022.7.0 -> 2022.9.1 --- pkgs/development/python-modules/dask/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 8453b3e0ec9c..8502c01956ec 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2022.7.0"; + version = "2022.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-O5/TNeta0V0v9WTpPmF/kJMJ40ANo6rcRtzurr5/SwA="; + hash = "sha256-4Tok9eYhi2FF+8bpKnwKT3KIRGHIMtxczTkZ6qD8x7g="; }; propagatedBuildInputs = [ @@ -97,9 +97,8 @@ buildPythonPackage rec { "--reruns 3" # Don't run tests that require network access "-m 'not network'" - # Ignore warning about pyarrow 5.0.0 feautres - "-W" - "ignore::FutureWarning" + # DeprecationWarning: The 'sym_pos' keyword is deprecated and should be replaced by using 'assume_a = "pos"'. 'sym_pos' will be removed in SciPy 1.11.0. + "-W" "ignore::DeprecationWarning" ]; disabledTests = lib.optionals stdenv.isDarwin [ From e07eca17af37aac51777fa24bbed6eedfe32d171 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 02:37:13 +0200 Subject: [PATCH 599/737] python3Packages.fountains: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/fountains/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index 1d65c4e643c8..2b95431ac4e0 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , bitlist , pythonOlder }: @@ -17,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-9ASOgqkE1vwCKGAZXEJaHoABMXomIWTGv3jAsNssdsU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bitlist ]; From cd9776aa25d617e49adb06cbc21d0f1ce66dac2b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:11:06 +0200 Subject: [PATCH 600/737] python3Packages.ansi: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/ansi/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 5847e3ad0f9e..e2e4e7c93fb9 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-2gu2Dba3LOjMhbCCZrBqzlOor5KqDYThhe8OP8J3O2M="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; From 54aea04762c996144a5ec1caee04f5d3dcfa80fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:14:16 +0200 Subject: [PATCH 601/737] python3Packages.rangehttpserver: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/rangehttpserver/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/rangehttpserver/default.nix b/pkgs/development/python-modules/rangehttpserver/default.nix index 217bffb174b8..006dc747fe6f 100644 --- a/pkgs/development/python-modules/rangehttpserver/default.nix +++ b/pkgs/development/python-modules/rangehttpserver/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , nose , requests }: @@ -17,6 +18,10 @@ buildPythonPackage rec { sha256 = "1sy9j6y8kp5jiwv2vd652v94kspp1yd4dwxrfqfn6zwnfyv2mzv5"; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ nose requests From b79055e58275902dc5319fce007700dacbc2d463 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:20:21 +0200 Subject: [PATCH 602/737] python3Packages.aiogithubapi: relax backoff constraint, use legacy asyncio-mode for tests --- .../python-modules/aiogithubapi/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 38bd95989f6a..f4b8c306c1ab 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -25,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-5gKANZtDhIoyfyLdS15JDWTxHBFkaHDUlbVVhRs7MSE="; }; + postPatch = '' + # Upstream is releasing with the help of a CI to PyPI, GitHub releases + # are not in their focus + substituteInPlace pyproject.toml \ + --replace 'version = "0"' 'version = "${version}"' \ + --replace 'backoff = "^1.10.0"' 'backoff = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,12 +49,9 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream is releasing with the help of a CI to PyPI, GitHub releases - # are not in their focus - substituteInPlace pyproject.toml \ - --replace 'version = "0"' 'version = "${version}"' - ''; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; pythonImportsCheck = [ "aiogithubapi" From 558bf96f8bad658591558e2f918422d2d8cb5ab1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:25:19 +0200 Subject: [PATCH 603/737] python3Packages.timetagger: propagate bcrypt --- pkgs/development/python-modules/timetagger/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 6ecacbca809d..b9454f9ad097 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , asgineer +, bcrypt , itemdb , jinja2 , markdown @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asgineer + bcrypt itemdb jinja2 markdown From 6bce590ab4455ef5cb6706fd8825eb9bbafaee29 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:26:15 +0200 Subject: [PATCH 604/737] python3Packages.rich-rst: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/rich-rst/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix index 4c543febb813..f15e565bd043 100644 --- a/pkgs/development/python-modules/rich-rst/default.nix +++ b/pkgs/development/python-modules/rich-rst/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , docutils , rich }: @@ -17,6 +18,10 @@ buildPythonPackage rec { sha256 = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ docutils rich ]; # Module has no tests From 7bdade5cde3ce35f3295f6f20c691079ba8e6622 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:27:57 +0200 Subject: [PATCH 605/737] python3Packages.multimethod: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/multimethod/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix index fe2bb2ef45c1..ef8004d20829 100644 --- a/pkgs/development/python-modules/multimethod/default.nix +++ b/pkgs/development/python-modules/multimethod/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "09vrxzv8q0lqsbh6d83wjdd29ja66rj31y7wmyha14jk603fd9k0"; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; From fc8447f1bfe5f0fa7e327e56593b7a0331b65d1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:28:26 +0200 Subject: [PATCH 606/737] python3Packages.wheel-filename: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/wheel-filename/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix index 3140870289d8..d4dd51ab2c89 100644 --- a/pkgs/development/python-modules/wheel-filename/default.nix +++ b/pkgs/development/python-modules/wheel-filename/default.nix @@ -1,9 +1,9 @@ { lib -, attrs , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -20,8 +20,8 @@ buildPythonPackage rec { hash = "sha256-M3XGHG733X5qKuMS6mvFSFHYOwWPaBMXw+w0eYo6ByE="; }; - buildInputs = [ - attrs + nativeBuildInputs = [ + setuptools ]; checkInputs = [ From 8b2278eaf3314ad89eff3c719c6791cf9d8b90b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:33:53 +0200 Subject: [PATCH 607/737] python3Packages.wsgidav: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/wsgidav/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index 882f4091040f..4c61b476486e 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -10,6 +10,7 @@ , python-pam , pyyaml , requests +, setuptools , webtest }: @@ -27,6 +28,10 @@ buildPythonPackage rec { hash = "sha256-LQdS9d2DB4PXqRSzmtZCSyCQI47ncLCG+RSB+goZYoA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ defusedxml jinja2 From 5166c6f28580c309ce0f47f963dea071db4fbacf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:37:39 +0200 Subject: [PATCH 608/737] python3Packages.cle: 9.2.15 -> 9.2.18 --- pkgs/development/python-modules/cle/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index e2cf9dac779f..b0fad5cd155b 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -10,12 +10,13 @@ , pythonOlder , pyvex , pyxbe +, setuptools , sortedcontainers }: let # The binaries are following the argr projects release cycle - version = "9.2.15"; + version = "9.2.18"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,9 +38,13 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-vGIthytW0gZy0X2OXuFwdBnPuvcWkV47FeaXZY8FCVc="; + hash = "sha256-hg6G07rSPRFGBaJdJduDqb7BVGt/sZtCA4I0Hhl4wfw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cffi minidump From bfb51b91f1c30a755ad6286357086ea8d35c2a58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:49:16 +0200 Subject: [PATCH 609/737] python3Packages.amazon-ion: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/amazon-ion/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 0e97eda4701f..365e4cc14a64 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "ion-python"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-BLlKxm63KsmMFajS4uJne/LPNXboOfy4uVm8HqO9Wfo="; + hash = "sha256-FLwzHcge+vLcRY4gOzrxS3kWlprCkRXX5KeGOoTJDSw="; }; postPatch = '' @@ -37,6 +37,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # ValueError: Exceeds the limit (4300) for integer string conversion + "test_roundtrips" + ]; + pythonImportsCheck = [ "amazon.ion" ]; From e67db7f066f510415d80b4ae390fe836aad09d52 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 16:15:54 +0200 Subject: [PATCH 610/737] python3Packages.tensorflow: 2.10.0-rc0 -> 2.10.0 --- pkgs/development/python-modules/tensorflow/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 338affcbf156..31fff4832052 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -76,7 +76,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.10.0-rc0"; + version = "2.10.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -190,7 +190,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - hash = "sha256-zN8I0wxKrxWcI0RuOqDz6srdW0Q+kgaZhJdXM46N1e8="; + hash = "sha256-Y6cujiMoQXKQlsLBr7d0T278ltdd00IfsTRycJbRVN4="; }; # On update, it can be useful to steal the changes from gentoo @@ -445,7 +445,8 @@ in buildPythonPackage { -e "s/'gast[^']*',/'gast',/" \ -e "/'libclang[^']*',/d" \ -e "/'keras[^']*')\?,/d" \ - -e "/'tensorflow-io-gcs-filesystem[^']*',/d" + -e "/'tensorflow-io-gcs-filesystem[^']*',/d" \ + -e "s/'protobuf[^']*',/'protobuf',/" \ ''; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow From f29b39a6b4012712f7cf9fae05611b788901665d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 16:43:48 +0200 Subject: [PATCH 611/737] python3Packages.nested-lookup: 0.2.23 -> 0.2.25 --- .../python-modules/nested-lookup/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nested-lookup/default.nix b/pkgs/development/python-modules/nested-lookup/default.nix index 7e56158ff145..dc186606f41c 100644 --- a/pkgs/development/python-modules/nested-lookup/default.nix +++ b/pkgs/development/python-modules/nested-lookup/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, fetchFromGitHub +, fetchPypi , lib , pytestCheckHook , six @@ -7,14 +7,11 @@ buildPythonPackage rec { pname = "nested-lookup"; - version = "0.2.23"; + version = "0.2.25"; - src = fetchFromGitHub { - owner = "russellballestrini"; - repo = "nested-lookup"; - # https://github.com/russellballestrini/nested-lookup/issues/47 - rev = "c1b0421479efa378545bc71efa3b72882e8fec17"; - sha256 = "sha256-jgfYLSsFLQSsOH4NzbDPKFIG+tWWZ1zTWcZEaX2lthg="; + src = fetchPypi { + inherit pname version; + hash = "sha256-b6gydIyQOB8ikdhQgJ4ySSUZ7l8lPWpay8Kdk37KAug="; }; propagatedBuildInputs = [ From f92156e12156e47cf59fdadd4a722470aba39f3d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 16:47:52 +0200 Subject: [PATCH 612/737] python3Packages.ansible-doctor: 1.4.1 -> 1.4.4 --- .../development/python-modules/ansible-doctor/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix index 67dc34f19b84..c07a1e5d5f3e 100644 --- a/pkgs/development/python-modules/ansible-doctor/default.nix +++ b/pkgs/development/python-modules/ansible-doctor/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ansible-doctor"; - version = "1.4.1"; + version = "1.4.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = "ansible-doctor"; rev = "refs/tags/v${version}"; - hash = "sha256-kfBEV3PXU+C7FD9xiBMvdamb3b2KXp+Qi23/xUnoXHM="; + hash = "sha256-blCBlSCp7W6tlCa5381ex7yq37iY9v6u7ITHmJEUxl0="; }; nativeBuildInputs = [ @@ -56,9 +56,9 @@ buildPythonPackage rec { --replace 'Jinja2 = "3.1.2"' 'Jinja2 = "*"' \ --replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \ --replace 'environs = "9.5.0"' 'environs = "*"' \ - --replace 'jsonschema = "4.6.0"' 'jsonschema = "*"' \ + --replace 'jsonschema = "4.15.0"' 'jsonschema = "*"' \ --replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' \ - --replace 'python-json-logger = "2.0.2"' 'python-json-logger = "*"' + --replace 'python-json-logger = "2.0.4"' 'python-json-logger = "*"' ''; # Module has no tests From a975e15be11c270570e8986576e812aefe84252a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 16:48:55 +0200 Subject: [PATCH 613/737] python3Packages.ansible-later: 2.0.16 -> 2.0.20 --- pkgs/development/python-modules/ansible-later/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 9e0af254b3f9..c989dba4d16c 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.16"; + version = "2.0.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AlLy8rqqNrJtoI01OHq8W1Oi8iN8RiBdtq2sZ7zlTyM="; + hash = "sha256-LoJ02PGOo/qrwH4PJYI0CFZ/cMxhjNj1JiUPnK2FIlA="; }; postPatch = '' From 7275d316f84221b1628584da924990a9b8a2777f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 16:56:11 +0200 Subject: [PATCH 614/737] awscli: 1.25.42 -> 1.25.76 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index df3953b030fd..dbf990807e98 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,11 +35,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.25.42"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.25.76"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-5DH3Ik0DHmHfZ+XfFjmC2CL5WRoA9ENgzDeYfCgwtTI="; + hash = "sha256-PSr0zZEGXFxcFSN7QQ5Ux0Z4aCwwm9na+2hIv/gR6+s="; }; # https://github.com/aws/aws-cli/issues/4837 From d47e9bf0cd9237c353432c4edec37ab5d6b61205 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Mon, 19 Sep 2022 06:09:14 +1000 Subject: [PATCH 615/737] awsebcli: fixup botocore, pathspec, termcolor dependencies --- pkgs/tools/virtualization/awsebcli/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index f3ebb7cc5dfc..d1c4d1035f3f 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -50,8 +50,9 @@ with localPython.pkgs; buildPythonApplication rec { substituteInPlace setup.py \ --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ --replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \ - --replace "jmespath>=0.7.1,<1.0.0" "jmespath==1.0.1" \ - --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.49" + --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.76" \ + --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \ + --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.1.0" ''; buildInputs = [ From 795ca663c06c229c0d8ff6b38d66c0aaf3aec767 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 01:11:09 +0200 Subject: [PATCH 616/737] python3Packages.eth-keys: disable failing tests --- pkgs/development/python-modules/eth-keys/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index 47e43efef681..903d9bf95018 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -47,6 +47,8 @@ buildPythonPackage rec { "test_public_key_generation_is_equal" "test_signing_is_equal" "test_native_to_coincurve_recover" + "test_public_key_compression_is_equal" + "test_public_key_decompression_is_equal" ]; pythonImportsCheck = [ "eth_keys" ]; From 4fff5ba5b6d3de7bcb346cc5e8810edb2c0fbf7a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 01:56:38 +0200 Subject: [PATCH 617/737] python3Packages.tifffile: disable failing tests --- pkgs/development/python-modules/tifffile/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index ea20059f5620..8e4bacad9aac 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -40,6 +40,8 @@ buildPythonPackage rec { "test_write_ome" # Test file is missing "test_write_predictor" + "test_issue_imagej_hyperstack_arg" + "test_issue_description_overwrite" # AssertionError "test_write_bigtiff" "test_write_imagej_raw" From 059b20eca1cb5dc0712aac570858f3393d8bb23c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 02:15:46 +0200 Subject: [PATCH 618/737] python3Packages.distributed: 2022.9.0 -> 2022.9.1 --- 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 a1a3449d8ac5..0b9236feeb00 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.9.0"; + version = "2022.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uRXwWgWbVVW8B96gzwVwWfdR6eTn+1XFR3Y4PKDjYb8="; + hash = "sha256-upj1TipRhhvulyuhX4bfbQSWar9m7Xu3mIsi48G+ewE="; }; postPatch = '' From 3a5173ef18108adae59f9dfd4d4be444ca74e07d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 02:48:44 +0200 Subject: [PATCH 619/737] python3Packages.ailment: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/ailment/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index f90cc4683203..bf27864d8908 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonOlder , pyvex +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-CXJ9UVTrJzXumDJ6wghDbxVfZo9ZC67qBpz8B5D0DLo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyvex ]; From c7c9be22739f32467a8849e66054141d2ab360c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:06:05 +0200 Subject: [PATCH 620/737] python3Packages.glean-sdk: 51.1.0 -> 51.2.0 --- pkgs/development/python-modules/glean-sdk/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 8ede9275db89..68d50c435fc2 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -11,24 +11,25 @@ , pythonOlder , rustc , rustPlatform +, semver , setuptools-rust }: buildPythonPackage rec { pname = "glean-sdk"; - version = "51.1.0"; + version = "51.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Rt+N/sqX7IyoXbytzF9UkyXsx0vQXbGs+XJkaMhevE0="; + hash = "sha256-4EXCYthMabdmxWYltcnO0UTNeAYXwXQeRfwxt1WD3Ug="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-oY94YVs6I+/klogyajBoCrYexp9oUSrQ6znWVbigf2E="; + hash = "sha256-qOGoonutuIY+0UVaVSVVt0NbqEICdNs3qHWG0Epmkl0="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ buildPythonPackage rec { cffi glean-parser iso8601 + semver ]; checkInputs = [ From 73e44107a8574724e1bcf81f86fc961f3779f00f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:14:30 +0200 Subject: [PATCH 621/737] paperless-ngx: disable eth-keys tests Some other override in this package set makes them fail. --- pkgs/applications/office/paperless-ngx/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index e85f13b892f7..cfd1b0b596b3 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -46,6 +46,10 @@ let sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; }; }); + + eth-keys = super.eth-keys.overridePythonAttrs (_: { + doCheck = false; + }); }; }; From 69591251b2ed7883bd53ccdd61de9eb744c71489 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:41:31 +0200 Subject: [PATCH 622/737] check-esxi-hardware: build with format other --- pkgs/servers/monitoring/plugins/esxi.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 1ca9e702e7ad..ccd77548c0c0 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -6,6 +6,7 @@ let in python3Packages.buildPythonApplication rec { pname = lib.replaceStrings [ "_" ] [ "-" ] bName; version = "20200710"; + format = "other"; src = fetchFromGitHub { owner = "Napsty"; From 82e9e32436d5886102f1e5f7c17aed8475504991 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:43:58 +0200 Subject: [PATCH 623/737] check-jsonschema: 0.16.2 -> 0.18.3 --- pkgs/development/tools/check-jsonschema/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index 068bc752d32c..dd49074300af 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.16.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = version; - sha256 = "sha256-rPjXua5kITr+I+jqeAO2iGUFVhjkLnQkXlUzRvkXduA="; + sha256 = "sha256-9Ejcxr/22rJu8JoC7WspLfzF08elz4TaGagDeV0zIXk="; }; propagatedBuildInputs = [ @@ -27,6 +27,11 @@ buildPythonApplication rec { responses ]; + pytestFlagsArray = [ + # DeprecationWarning: Accessing jsonschema.draft3_format_checker is deprecated and will be removed in a future release. Instead, use the FORMAT_CHECKER attribute on the corresponding Validator. + "-W" "ignore::DeprecationWarning" + ]; + preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; From 7715dd69e3839f2f2c288d7f19b2ead7adf00a34 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:46:02 +0200 Subject: [PATCH 624/737] i3-wk-switch: build with format other --- pkgs/applications/window-managers/i3/wk-switch.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index d0055ef63653..e077254b70f4 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -3,6 +3,7 @@ python3Packages.buildPythonApplication rec { pname = "i3-wk-switch"; version = "2020-03-18"; + format = "other"; src = fetchFromGitHub { owner = "tmfink"; From 8ab844d2787fb4dbc438509e6efbd21443b8269f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:46:15 +0200 Subject: [PATCH 625/737] buildbot-full: build with format other --- pkgs/development/python-modules/buildbot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index ffef4a471d61..c5e8f8caf3dc 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -11,6 +11,7 @@ let withPlugins = plugins: buildPythonPackage { pname = "${package.pname}-with-plugins"; inherit (package) version; + format = "other"; dontUnpack = true; dontBuild = true; From 76c0169c6e5a7d0253606e2657b352ac39a927f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:48:13 +0200 Subject: [PATCH 626/737] ioccheck: relax termcolor constraint --- pkgs/tools/security/ioccheck/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix index 439567ecb038..fb5c887a8bf9 100644 --- a/pkgs/tools/security/ioccheck/default.nix +++ b/pkgs/tools/security/ioccheck/default.nix @@ -75,7 +75,8 @@ buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace '"hurry.filesize" = "^0.9"' "" \ --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' \ - --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"' + --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"' \ + --replace 'termcolor = "^1.1.0"' 'termcolor = "*"' ''; pythonImportsCheck = [ From f5473de83273c1b50dba04caec4ac64c9a1279ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:50:20 +0200 Subject: [PATCH 627/737] liquidctl: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/liquidctl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 37347331b587..699d2b0e5b20 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonOlder , installShellFiles +, setuptools , docopt , hidapi , pyusb @@ -25,7 +26,10 @@ buildPythonPackage rec { sha256 = "sha256-2mXWih3LchJ/YsjuwHwWse7SNJYx1vxtovl8vasKV4w="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + setuptools + ]; propagatedBuildInputs = [ docopt From a1b34543380c06ba45b648e05e8137d339eff2b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:51:23 +0200 Subject: [PATCH 628/737] markdown-anki-decks: relax typer constraint further --- pkgs/tools/misc/markdown-anki-decks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix index 62c8ca86e6f0..375966da36b9 100644 --- a/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' \ --replace 'genanki = "^0.10.1"' 'genanki = "*"' \ - --replace 'typer = "^0.3.2"' 'typer = "^0.4.0"' + --replace 'typer = "^0.3.2"' 'typer = "*"' ''; # No tests available on Pypi and there is only a failing version assertion test in the repo. From a65038de68e965a0aeddd233d5d670c2250162f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:53:24 +0200 Subject: [PATCH 629/737] magic-wormhole: disable failing test --- pkgs/development/python-modules/magic-wormhole/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 2fa85598fb15..12374ed1938b 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -53,6 +53,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Expected: (,) Got: Failure instance: Traceback (failure with no frames): : + "test_welcome" + ]; + postPatch = lib.optionalString stdenv.isLinux '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; From 8f8a5815f09a8f5ec355db517439631586ed7393 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:55:57 +0200 Subject: [PATCH 630/737] mloader: relax protobuf constraint --- pkgs/tools/misc/mloader/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix index 8e8854a5e6f2..a943547f17e9 100644 --- a/pkgs/tools/misc/mloader/default.nix +++ b/pkgs/tools/misc/mloader/default.nix @@ -3,12 +3,18 @@ python3Packages.buildPythonApplication rec { pname = "mloader"; version = "1.1.9"; + format = "setuptools"; src = python3Packages.fetchPypi { inherit pname version; sha256 = "81e4dc7117999d502e3345f8e32df8b16cca226b8b508976dde2de81a4cc2b19"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "protobuf~=3.6" "protobuf" + ''; + propagatedBuildInputs = with python3Packages; [ click protobuf From 79e7f221541e31c82185beeb04cb9ebb5c7994c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:56:41 +0200 Subject: [PATCH 631/737] mitmproxy: disable failign test --- pkgs/development/python-modules/mitmproxy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 1b89d73864b0..4b4cf1315b5f 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -117,6 +117,8 @@ buildPythonPackage rec { "test_integration" "test_contentview_flowview" "test_flowview" + # ValueError: Exceeds the limit (4300) for integer string conversion + "test_roundtrip_big_integer" ]; dontUsePytestXdist = true; From 55ae38c05aa3549fc4cf073a2c771b66f4cfb8c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:58:24 +0200 Subject: [PATCH 632/737] pandoc-eqnos: add setuptools to nativeBuildInputs --- pkgs/tools/misc/pandoc-eqnos/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/tools/misc/pandoc-eqnos/default.nix index 310826c35b06..d808060fc23a 100644 --- a/pkgs/tools/misc/pandoc-eqnos/default.nix +++ b/pkgs/tools/misc/pandoc-eqnos/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pandoc-xnos +, setuptools }: buildPythonApplication rec { @@ -16,6 +17,10 @@ buildPythonApplication rec { sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandoc-xnos ]; # Different pandoc executables are not available From b6d6d89311f11afe5ab187f1bbf411b1cf646512 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:58:54 +0200 Subject: [PATCH 633/737] pandoc-fignos: add setuptools to nativeBuildInputs --- pkgs/tools/misc/pandoc-fignos/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/tools/misc/pandoc-fignos/default.nix index 846d1abe8d7f..7ed7a8e710a7 100644 --- a/pkgs/tools/misc/pandoc-fignos/default.nix +++ b/pkgs/tools/misc/pandoc-fignos/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pandoc-xnos +, setuptools }: buildPythonApplication rec { @@ -16,6 +17,10 @@ buildPythonApplication rec { sha256 = "sha256-eDwAW0nLB4YqrWT3Ajt9bmX1A43wl+tOPm2St5VpCLk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandoc-xnos ]; # Different pandoc executables are not available From f83bc3746db5cd5c9fea94efcb38c629caa78788 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:59:21 +0200 Subject: [PATCH 634/737] pandoc-include: add setuptools to nativeBuildInputs --- pkgs/tools/misc/pandoc-include/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/pandoc-include/default.nix b/pkgs/tools/misc/pandoc-include/default.nix index a0ce0f96b437..684af986b017 100644 --- a/pkgs/tools/misc/pandoc-include/default.nix +++ b/pkgs/tools/misc/pandoc-include/default.nix @@ -3,6 +3,7 @@ , lib , natsort , panflute +, setuptools }: buildPythonApplication rec { @@ -17,6 +18,10 @@ buildPythonApplication rec { sha256 = "sha256-kuxud7m+sWcNqE8A+Fwb8ATgiUwxQvHeYBTyw1UzX4U="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ natsort panflute ]; pythonImportsCheck = [ "pandoc_include.main" ]; From 6c52138903bb51a91fb571799452ad9bed060947 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 03:59:54 +0200 Subject: [PATCH 635/737] pandoc-secnos: add setuptools to nativeBuildInputs --- pkgs/tools/misc/pandoc-secnos/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/tools/misc/pandoc-secnos/default.nix index 95c67dde0ec0..507d7df400e3 100644 --- a/pkgs/tools/misc/pandoc-secnos/default.nix +++ b/pkgs/tools/misc/pandoc-secnos/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pandoc-xnos +, setuptools }: buildPythonApplication rec { @@ -16,6 +17,10 @@ buildPythonApplication rec { sha256 = "sha256-J9KLZvioYM3Pl2UXjrEgd4PuLTwCLYy9SsJIzgw5/jU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandoc-xnos ]; patches = [ From 689dc2633115105bc63b670ac000d6a10f0b1468 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:00:25 +0200 Subject: [PATCH 636/737] pandoc-tablenos: add setuptools to nativeBuildInputs --- pkgs/tools/misc/pandoc-tablenos/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/tools/misc/pandoc-tablenos/default.nix index f3d67826a454..e1fb785a7a9f 100644 --- a/pkgs/tools/misc/pandoc-tablenos/default.nix +++ b/pkgs/tools/misc/pandoc-tablenos/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pandoc-xnos +, setuptools }: buildPythonApplication rec { @@ -16,6 +17,10 @@ buildPythonApplication rec { sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandoc-xnos ]; # Different pandoc executables are not available From 532dc1474383cdd99ab52b8c25d7ef86ee0fb6e9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:01:18 +0200 Subject: [PATCH 637/737] pass2csv: add setuptools to nativeBuildInputs --- pkgs/tools/security/pass2csv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/pass2csv/default.nix b/pkgs/tools/security/pass2csv/default.nix index 1817d63f1ee6..2e48f541ca84 100644 --- a/pkgs/tools/security/pass2csv/default.nix +++ b/pkgs/tools/security/pass2csv/default.nix @@ -2,6 +2,7 @@ , fetchPypi , lib , python-gnupg +, setuptools }: buildPythonApplication rec { @@ -14,6 +15,10 @@ buildPythonApplication rec { sha256 = "03a11bd0b0905737f4adb21d87aa1653d84cc1d9b5dcfdfb8a29092245d65db8"; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-gnupg ]; From caf662452d34816e6d09225f37aa4ba2e1282d13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:01:48 +0200 Subject: [PATCH 638/737] persistent-evdev: build with format other --- pkgs/servers/persistent-evdev/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/persistent-evdev/default.nix b/pkgs/servers/persistent-evdev/default.nix index c666e9c8d799..97f0ea01219c 100644 --- a/pkgs/servers/persistent-evdev/default.nix +++ b/pkgs/servers/persistent-evdev/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "persistent-evdev"; version = "unstable-2022-05-07"; + format = "other"; src = fetchFromGitHub { owner = "aiberia"; From 16497eb9da9f840dbf008abb4e87a7a02b1ba02f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:03:03 +0200 Subject: [PATCH 639/737] pferd: add setuptools to nativeBuildInputs --- pkgs/tools/misc/pferd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index 8bd95b6fc651..d715e35e580f 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -15,6 +15,10 @@ python3Packages.buildPythonApplication rec { sha256 = "05f9b7wzld0jcalc7n5h2a6nqjr1w0fxwkd4cih6gkjc9117skii"; }; + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + propagatedBuildInputs = with python3Packages; [ aiohttp beautifulsoup4 From bf17d03665e1d1019fbd4211760b08da82fd2e63 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:03:12 +0200 Subject: [PATCH 640/737] photon: build with format other --- pkgs/tools/networking/photon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index d3f153e44aed..543d9f1a5b96 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -3,6 +3,7 @@ python3Packages.buildPythonApplication rec { pname = "photon"; version = "1.3.0"; + format = "other"; src = fetchFromGitHub { owner = "s0md3v"; From ee2427b69e3b19341a656b6647062fd3e3bcb3db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:05:12 +0200 Subject: [PATCH 641/737] pygmentex: build with format other --- pkgs/tools/typesetting/tex/texlive/bin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c99face8d7d8..8da3df2773f0 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -336,6 +336,7 @@ latexindent = perlPackages.buildPerlPackage rec { pygmentex = python3Packages.buildPythonApplication rec { pname = "pygmentex"; inherit (src) version; + format = "other"; src = lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); From 5b5df09987cc53932b3fc85481d649ac42dfde6b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:06:11 +0200 Subject: [PATCH 642/737] waydroid: build with format other --- pkgs/os-specific/linux/waydroid/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index c9298ecec4e2..74f32cd85991 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -17,6 +17,7 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; version = "1.3.0"; + format = "other"; src = fetchFromGitHub { owner = pname; From c604153913752f61558568cf78b008680d794756 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:07:15 +0200 Subject: [PATCH 643/737] tremc: build with format other --- pkgs/applications/networking/p2p/tremc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 6ff10989b1d3..a4b78e250d5c 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -13,6 +13,7 @@ in python3Packages.buildPythonApplication rec { pname = "tremc"; version = "0.9.2"; + format = "other"; src = fetchFromGitHub { owner = "tremc"; From 6350a2649656f7a49f2463be7adccebee1615212 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:08:49 +0200 Subject: [PATCH 644/737] stgit: add setuptools to nativeBuildInputs --- .../version-management/git-and-tools/stgit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 1ed773bd65b4..b5bdecd85ad1 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-TsJr2Riygz/DZrn6UZMPvq1tTfvl3dFEZZNq2wVj1Nw="; }; - nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ]; + nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 python3Packages.setuptools ]; format = "other"; From 2138aa977ed2313acbd10285dce6551f5628ecf6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:12:23 +0200 Subject: [PATCH 645/737] rofimoji: add setuptools to nativeBuildInputs --- pkgs/applications/misc/rofimoji/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 45b12bab89e3..371da82e2b07 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -1,6 +1,7 @@ { buildPythonApplication , fetchFromGitHub , lib +, python3 , waylandSupport ? true , x11Support ? true @@ -25,6 +26,10 @@ buildPythonApplication rec { sha256 = "sha256-6W/59DjxrgejHSkNxpruDAws812Vjyf+GePDPbXzVbc="; }; + nativeBuildInputs = [ + python3.pkgs.setuptools + ]; + # `rofi` and the `waylandSupport` and `x11Support` dependencies # contain binaries needed at runtime. propagatedBuildInputs = with lib; [ configargparse rofi ] From 5fe10e573a3303b22f9ff02937c290a84fcc2bef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:13:16 +0200 Subject: [PATCH 646/737] rofi-rbw: add setuptools to nativeBuildInputs --- pkgs/applications/misc/rofi-rbw/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index a02d486ca9e5..28602cf0240e 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, configargparse }: +{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools }: buildPythonApplication rec { pname = "rofi-rbw"; @@ -12,6 +12,10 @@ buildPythonApplication rec { hash = "sha256-YDL0pMl3BX59kzjuykn0lQHu2RMvPhsBrlSiqdcZAXs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ configargparse ]; pythonImportsCheck = [ "rofi_rbw" ]; From fc407047017fcaf1170f4212c3fc64f77d86dd36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:15:19 +0200 Subject: [PATCH 647/737] python3Packages.tiler: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/tiler/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/tiler/default.nix b/pkgs/development/python-modules/tiler/default.nix index 0c1e44f1400d..de4517ff3278 100644 --- a/pkgs/development/python-modules/tiler/default.nix +++ b/pkgs/development/python-modules/tiler/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , numpy , tqdm , pytestCheckHook @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy tqdm From 213cee6c1ab78c21f51952581921135f23b7934d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:16:03 +0200 Subject: [PATCH 648/737] python3Packages.termplotlib: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/termplotlib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index fde1080491e0..89fd114ad739 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -6,6 +6,7 @@ , exdown , numpy , gnuplot +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { sha256 = "1qfrv2w7vb2bbjvd5lqfq57c23iqkry0pwmif1ha3asmz330rja1"; }; + nativeBuildInputs = [ + setuptools + ]; + format = "pyproject"; checkInputs = [ pytestCheckHook From 2676a42a5be9e283139dc6d87c39b017019603cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:17:37 +0200 Subject: [PATCH 649/737] python3Packages.tensorflow-metadata: relax protobuf constraint --- .../python-modules/tensorflow-metadata/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 5204e2158dc7..994d821d9a25 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { ./build.patch ]; + postPatch = '' + substituteInPlace setup.py \ + --replace 'protobuf>=3.13,<4' 'protobuf>=3.13' + ''; + # Default build pulls in Bazel + extra deps, given the actual build # is literally three lines (see below) - replace it with custom build. preBuild = '' From a47595b39c4f1b4d1d6fc77ca854d269a9b0b540 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:29:27 +0200 Subject: [PATCH 650/737] python3Packages.pyweatherflowrest: add setuptools to nativeBuildInputs --- .../python-modules/pyweatherflowrest/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index a36f3a2ccfc2..b1384496325b 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,11 @@ buildPythonPackage rec { sha256 = "1swyqdnvhwaigqhjn5a22gi8if4bl8alfrigln4qa0jl9z03kg09"; }; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ aiohttp ]; From 6059df1b3b23f674bfd5e0ab8c2abdc92978822e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:33:10 +0200 Subject: [PATCH 651/737] python3Packages.pythonfinder: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/pythonfinder/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 64879d01969f..6d005a22292a 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -9,6 +9,7 @@ , packaging , pytest-cov , pytest-timeout +, setuptools }: buildPythonPackage rec { @@ -23,6 +24,10 @@ buildPythonPackage rec { sha256 = "sha256-N/q9zi2SX38ivSpnjrx+bEzdR9cS2ivSgy42SR8cl+Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs cached-property From 72769f5839f019a6f66a4ed12964677b125d76fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:34:26 +0200 Subject: [PATCH 652/737] python3Packages.python-rabbitair: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/python-rabbitair/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix index 7ebc98426d99..6578a0777525 100644 --- a/pkgs/development/python-modules/python-rabbitair/default.nix +++ b/pkgs/development/python-modules/python-rabbitair/default.nix @@ -5,6 +5,7 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , typing-extensions , zeroconf }: @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-CGr7NvnGRNTiKq5BpB/zmfgyd/2ggTbO0nj+Q+MavTs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography zeroconf From 1f28f9f5d43baeb968edbae4a7f6502c9d333668 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:34:58 +0200 Subject: [PATCH 653/737] rdkit: build with format other --- pkgs/development/python-modules/rdkit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index ad3bac33e24e..b42523dc8bf5 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -41,6 +41,7 @@ in buildPythonPackage rec { pname = "rdkit"; version = "2022.03.5"; + format = "other"; src = let From b7713d0bf6dbbfa25392971739a5dd458d9fe005 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:36:05 +0200 Subject: [PATCH 654/737] python3Packages.python-pushover: mark as broken --- pkgs/development/python-modules/pushover/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix index bc8509b450bc..0f8a5f2779c1 100644 --- a/pkgs/development/python-modules/pushover/default.nix +++ b/pkgs/development/python-modules/pushover/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = true; # Relies on 2to3 via setuptools description = "Bindings and command line utility for the Pushover notification service"; homepage = "https://github.com/Thibauth/python-pushover"; license = licenses.gpl3; From 0a30b80a80cea114c6739d56953a24cd7b08f7db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:38:24 +0200 Subject: [PATCH 655/737] python3Packages.pyfma: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/pyfma/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 2e26cee84da4..103446dbe68f 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -6,11 +6,13 @@ , pybind11 , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyfma"; version = "0.1.6"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -19,7 +21,10 @@ buildPythonPackage rec { rev = version; sha256 = "12i68jj9n1qj9phjnj6f0kmfhlsd3fqjlk9p6d4gs008azw5m8yn"; }; - format = "pyproject"; + + nativeBuildInputs = [ + setuptools + ]; buildInputs = [ pybind11 From a21cb9dbffbc3aa7efd66e205c2c3c71c0b8c1db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:45:01 +0200 Subject: [PATCH 656/737] python3Packages.preprocess-cancellation: add setuptools to nativeBuildInputs --- .../python-modules/preprocess-cancellation/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix index 44a54810e443..5d2b722e6434 100644 --- a/pkgs/development/python-modules/preprocess-cancellation/default.nix +++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , poetry-core +, setuptools , shapely , pytestCheckHook }: @@ -40,6 +41,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ From 7d80dcc18f53fe422ed57ad4465aafe6fde19912 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:45:19 +0200 Subject: [PATCH 657/737] python3Packages.poppler-qt5: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/poppler-qt5/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index a2dfaf8e4837..c2bbeab96daa 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -9,6 +9,7 @@ , pyqt-builder , poppler , pkg-config +, setuptools , fetchpatch }: @@ -32,7 +33,7 @@ buildPythonPackage rec { ]; buildInputs = [ qtbase.dev poppler pyqt-builder ]; - nativeBuildInputs = [ pkg-config qmake sip ]; + nativeBuildInputs = [ pkg-config qmake sip setuptools ]; propagatedBuildInputs = [ pyqt5.dev ]; format = "pyproject"; From 94a2d5e4e52f2fb3c8727b9816899930bfaf5da2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:49:32 +0200 Subject: [PATCH 658/737] python3Packages.pip-tools: disable network test --- pkgs/development/python-modules/pip-tools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 84521397a707..2486a77dd771 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { "network" "test_direct_reference_with_extras" "test_local_duplicate_subdependency_combined" + "test_bad_setup_file" ]; pythonImportsCheck = [ From a741608ac991b617155a6f10c4cd2a918a69e17c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:57:07 +0200 Subject: [PATCH 659/737] python3Packages.mesonpep517: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/mesonpep517/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix index 5e33ae9c1033..b896076e2dc8 100644 --- a/pkgs/development/python-modules/mesonpep517/default.nix +++ b/pkgs/development/python-modules/mesonpep517/default.nix @@ -3,6 +3,7 @@ , fetchPypi , meson , ninja +, setuptools , toml }: @@ -18,6 +19,10 @@ buildPythonPackage rec { sha256 = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ toml ]; # postPatch = '' From 9a367d16337b51a74274a4cff591b40d82abbd7e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:58:10 +0200 Subject: [PATCH 660/737] python3Packages.meshio: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/meshio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 1df5a7f47807..2e8d4044ce3b 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -7,6 +7,7 @@ , exdown , pytestCheckHook , rich +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { sha256 = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy netcdf4 From bd440ac0d056d77d12ebb3b13cff6d5fba36c059 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:58:18 +0200 Subject: [PATCH 661/737] python3Packages.lc7001: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/lc7001/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/lc7001/default.nix b/pkgs/development/python-modules/lc7001/default.nix index 0683794eda50..5e78d42471ce 100644 --- a/pkgs/development/python-modules/lc7001/default.nix +++ b/pkgs/development/python-modules/lc7001/default.nix @@ -4,6 +4,7 @@ , fetchPypi , pythonOlder , poetry-core +, setuptools }: buildPythonPackage rec { @@ -20,6 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ From 8b416a1eba4ecd429a639ca49048af08e0e182b8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 04:59:38 +0200 Subject: [PATCH 662/737] python3Packages.language-data: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/language-data/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix index 98d4885b1e94..803df3abaea5 100644 --- a/pkgs/development/python-modules/language-data/default.nix +++ b/pkgs/development/python-modules/language-data/default.nix @@ -4,6 +4,7 @@ , marisa-trie , poetry-core , pythonOlder +, setuptools }: buildPythonApplication rec { @@ -22,6 +23,7 @@ buildPythonApplication rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ From c0c5bc4eec368399b4f2adc89c23081888b760ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 05:03:55 +0200 Subject: [PATCH 663/737] mypaint: build with format other and add setuptools --- pkgs/applications/graphics/mypaint/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index b93b4794db81..7f1ba67acce6 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -23,6 +23,7 @@ let in buildPythonApplication rec { pname = "mypaint"; version = "2.0.1"; + format = "other"; src = fetchFromGitHub { owner = "mypaint"; @@ -48,6 +49,7 @@ in buildPythonApplication rec { wrapGAppsHook gobject-introspection # for setup hook hicolor-icon-theme # fór setup hook + python3.pkgs.setuptools ]; buildInputs = [ From 915faea21c372d746167a247138cc1b4b6610338 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 05:07:14 +0200 Subject: [PATCH 664/737] python3Packages.django-cryptography: add setuptools to nativeBuildInputs --- .../python-modules/django-cryptography/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix index 6443e74aa378..0aa6df4f2d2c 100644 --- a/pkgs/development/python-modules/django-cryptography/default.nix +++ b/pkgs/development/python-modules/django-cryptography/default.nix @@ -5,7 +5,9 @@ , fetchFromGitHub , lib , python -, pythonOlder }: +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "django-cryptography"; @@ -20,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-C3E2iT9JdLvF+1g+xhZ8dPDjjh25JUxLAtTMnalIxPk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography django From 59fc00babd4937d15fee47a76768bc63ab468297 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 05:08:12 +0200 Subject: [PATCH 665/737] python3Packages.dvclive: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/dvclive/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 23755f10652b..1507156112d1 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , tabulate }: @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dvc-render tabulate # will be available as dvc-render.optional-dependencies.table From e669ed15bb4ffaa82f23fd1e46c5bcc465c58195 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 05:09:15 +0200 Subject: [PATCH 666/737] python3Packages.dufte: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/dufte/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index 92081e08067c..dac0eddf751b 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -6,11 +6,13 @@ , matplotlib , numpy , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "dufte"; version = "0.2.29"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -19,7 +21,10 @@ buildPythonPackage rec { rev = "v${version}"; hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; }; - format = "pyproject"; + + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ matplotlib From a624a8ea482c3447c12a12ab7c1f3c8ad49d0c66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 05:11:01 +0200 Subject: [PATCH 667/737] python3Packages.entry-points-txt: add setuptools to nativeBuildInputs --- pkgs/development/python-modules/entry-points-txt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix index 0e73f9768115..f6ec759b0a0a 100644 --- a/pkgs/development/python-modules/entry-points-txt/default.nix +++ b/pkgs/development/python-modules/entry-points-txt/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-klFSt3Od7xYgenpMP4DBFoZeQanGrmtJxDm5qeZ1Psc="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; From 5f4562e5d7c190f95fad5b72b07f4895ecfd5bd1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 10:24:18 +0200 Subject: [PATCH 668/737] python3Packages.in-place: add setuptoos to nativeBuildInputs --- pkgs/development/python-modules/in-place/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/in-place/default.nix b/pkgs/development/python-modules/in-place/default.nix index 6490aea35983..7114fae94e98 100644 --- a/pkgs/development/python-modules/in-place/default.nix +++ b/pkgs/development/python-modules/in-place/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -20,6 +21,10 @@ buildPythonPackage rec { substituteInPlace tox.ini --replace "--cov=in_place --no-cov-on-fail" "" ''; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "in_place" ]; From ce6b75ad8ba3c53d9e635914e2f5f475a6db48e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 10:27:16 +0200 Subject: [PATCH 669/737] python3Packages.fe25519: add setuptoos to nativeBuildInputs --- pkgs/development/python-modules/fe25519/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 4c2d10278e0c..9e32640b8476 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -6,6 +6,7 @@ , parts , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-/grXAiWERDeTCWgFnNC1Ok8D5I9MBlwd1501TW0yK5c="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bitlist fountains From f6f01d932abfaea0096a01aba628559f2b7af7a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 10:28:38 +0200 Subject: [PATCH 670/737] python3Packages.finitude: add setuptoos to nativeBuildInputs --- pkgs/development/python-modules/finitude/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/finitude/default.nix b/pkgs/development/python-modules/finitude/default.nix index eb4115914e10..aa6687a30862 100644 --- a/pkgs/development/python-modules/finitude/default.nix +++ b/pkgs/development/python-modules/finitude/default.nix @@ -5,6 +5,7 @@ , pyserial , pythonOlder , pyyaml +, setuptools }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-yCI5UCRDhw+dJoTKyjmHbAGBm3by2AyxHKlqCywnLcs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyserial prometheus-client From 20af712f02f47ea50f69edda2fa40fbb2a34d371 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 10:34:59 +0200 Subject: [PATCH 671/737] python3Packages.etebase: 0.31.2 -> 0.31.5 Pin openssl_1_1, doesn't support openssl_3 yet. --- pkgs/development/python-modules/etebase/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index 7b6a1a696fe4..bc99c09b402b 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "etebase"; - version = "0.31.2"; + version = "0.31.5"; src = fetchFromGitHub { owner = "etesync"; repo = "etebase-py"; rev = "v${version}"; - hash = "sha256-enGmfXW8eV6FgdHfJqXr1orAsGbxDz9xUY6T706sf5U="; + hash = "sha256-87t3toMaApnOSPBKfTGGLo2VRLqU8irFac9lg3kA1eE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-4eJvFf6aY+DYkrYgam5Ok9941PX4uQOmtRznEY0+1TE="; + hash = "sha256-Qg0aJ6CZaPxGneIs4o402A+fhI/nlJ9X/XdMFqkD/YY="; }; format = "pyproject"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3bca6b0d3ab..021c63ee8e4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3019,6 +3019,7 @@ in { etebase = callPackage ../development/python-modules/etebase { inherit (pkgs.darwin.apple_sdk.frameworks) Security; + openssl = pkgs.openssl_1_1; }; etebase-server = callPackage ../servers/etebase { }; From 1fdfb1fb97c0f527a589a966a901092d7dfe8191 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 19 Sep 2022 10:36:30 +0200 Subject: [PATCH 672/737] python3Packages.hahomematic: add setuptoos to nativeBuildInputs --- pkgs/development/python-modules/hahomematic/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 9e03183e2eb7..6ec939ff3f2f 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , python-slugify , pythonOlder +, setuptools , voluptuous , websocket-client , xmltodict @@ -26,6 +27,10 @@ buildPythonPackage rec { sha256 = "sha256-LFgbZIEtHAnLPb5JPU//tAXKsvSidqT/JsVIr5uoKNs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp python-slugify From c41353b28d88da96d140006c534d0d6e88682583 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 18 Sep 2022 17:47:20 +0000 Subject: [PATCH 673/737] file: disable tests on musl Fixes: 4c510f32feb ("file: 5.42 -> 5.43") --- pkgs/tools/misc/file/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index f1e21e5920a9..980502a269a4 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; - doCheck = true; + # https://bugs.astron.com/view.php?id=382 + doCheck = !stdenv.hostPlatform.isMusl; makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; From 8895944c571bb37800e7c4641f2495dc21d0ed68 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 20 Sep 2022 09:49:27 +0200 Subject: [PATCH 674/737] Revert "Revert "buildPython*: wrap setuptools in hook for catching conflicts"" Most packages were fixed up on python-unstable branch. This reverts commit 3ff2d9362ce18cab4bebd6ebf17892e431df34e2. --- pkgs/development/interpreters/python/hooks/default.nix | 3 +-- .../interpreters/python/hooks/python-catch-conflicts-hook.sh | 2 +- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 5d605b240ad8..903ad0215cdf 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -92,9 +92,8 @@ in rec { pythonCatchConflictsHook = callPackage ({ setuptools }: makeSetupHook { name = "python-catch-conflicts-hook"; - deps = [ setuptools ]; substitutions = { - inherit pythonInterpreter; + inherit pythonInterpreter pythonSitePackages setuptools; catchConflicts=../catch_conflicts/catch_conflicts.py; }; } ./python-catch-conflicts-hook.sh) {}; diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh index 374a2eddb407..0abcad3c42f2 100644 --- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh @@ -2,7 +2,7 @@ echo "Sourcing python-catch-conflicts-hook.sh" pythonCatchConflictsPhase() { - @pythonInterpreter@ @catchConflicts@ + PYTHONPATH="@setuptools@/@pythonSitePackages@:$PYTHONPATH" @pythonInterpreter@ @catchConflicts@ } if [ -z "${dontUsePythonCatchConflicts-}" ]; then diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index f37ad592cb49..a032c08d2a82 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -121,7 +121,7 @@ let ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ - setuptools pythonCatchConflictsHook + pythonCatchConflictsHook ] ++ lib.optionals removeBinBytecode [ pythonRemoveBinBytecodeHook ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ From 86ab83260fa002c3a0bab81d5965b6edff376759 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 20 Sep 2022 09:49:55 +0200 Subject: [PATCH 675/737] Revert "Revert "buildPython*: store dist (wheel/sdist) in dist output"" Most packages were fixed on python-unstable. This reverts commit 0a4898c21a04336bf9919da3ec95050890e77e5b. --- .../development/interpreters/python/hooks/default.nix | 5 +++++ .../python/hooks/python-output-dist-hook.sh | 10 ++++++++++ .../interpreters/python/mk-python-derivation.nix | 11 ++++++++++- pkgs/top-level/python-packages.nix | 1 + 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 903ad0215cdf..63e94b567035 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -114,6 +114,11 @@ in rec { }; } ./python-namespaces-hook.sh) {}; + pythonOutputDistHook = callPackage ({ }: + makeSetupHook { + name = "python-output-dist-hook"; + } ./python-output-dist-hook.sh ) {}; + pythonRecompileBytecodeHook = callPackage ({ }: makeSetupHook { name = "python-recompile-bytecode-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh new file mode 100644 index 000000000000..e73e45cd597a --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh @@ -0,0 +1,10 @@ +# Setup hook for storing dist folder (wheels/sdists) in a separate output +echo "Sourcing python-catch-conflicts-hook.sh" + +pythonOutputDistPhase() { + echo "Executing pythonOutputDistPhase" + mv "dist" "$dist" + echo "Finished executing pythonOutputDistPhase" +} + +preFixupPhases+=" pythonOutputDistPhase" diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index a032c08d2a82..abb1ceb7879e 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -17,6 +17,7 @@ , pythonCatchConflictsHook , pythonImportsCheckHook , pythonNamespacesHook +, pythonOutputDistHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , setuptoolsBuildHook @@ -49,6 +50,8 @@ # Enabled to detect some (native)BuildInputs mistakes , strictDeps ? true +, outputs ? [ "out" ] + # used to disable derivation, useful for specific python versions , disabled ? false @@ -106,11 +109,13 @@ else let inherit (python) stdenv; + withDistOutput = lib.elem format ["pyproject" "setuptools" "flit"]; + name_ = name; self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" - "disabledTestPaths" + "disabledTestPaths" "outputs" ]) // { name = namePrefix + name_; @@ -144,6 +149,8 @@ let ] ++ lib.optionals (python.pythonAtLeast "3.3") [ # Optionally enforce PEP420 for python3 pythonNamespacesHook + ] ++ lib.optionals withDistOutput [ + pythonOutputDistHook ] ++ nativeBuildInputs; buildInputs = buildInputs ++ pythonPath; @@ -177,6 +184,8 @@ let # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + outputs = outputs ++ lib.optional withDistOutput "dist"; + meta = { # default to python's platforms platforms = python.meta.platforms; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 392d6a57c3d5..ec4353e1985c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -119,6 +119,7 @@ in { pythonCatchConflictsHook pythonImportsCheckHook pythonNamespacesHook + pythonOutputDistHook pythonRecompileBytecodeHook pythonRelaxDepsHook pythonRemoveBinBytecodeHook From 5ddd9721065ebc476f811306c79070a7377b920a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 20 Sep 2022 11:42:54 +0200 Subject: [PATCH 676/737] opencv: fix build by reverting to older protobuf --- pkgs/development/libraries/opencv/4.x.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index ce7f98223357..f40eac3f66d8 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -10,7 +10,7 @@ , hdf5 , boost , gflags -, protobuf +, protobuf3_19 , config , ocl-icd , buildPackages @@ -76,6 +76,10 @@ }: let + # https://github.com/opencv/opencv/issues/22449#issuecomment-1252100475 + protobuf = protobuf3_19; + protoc = lib.getExe buildPackages.protobuf3_19; + version = "4.5.4"; src = fetchFromGitHub { @@ -295,7 +299,7 @@ stdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf}" + "-DProtobuf_PROTOC_EXECUTABLE=${protoc}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=OFF" From c5ff1bb9258e4b5a3b5caa54caea225f2b2fb233 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 20 Sep 2022 10:32:02 +0200 Subject: [PATCH 677/737] libcamera: unstable-2022-09-03 -> unstable-2022-09-15 --- pkgs/development/libraries/libcamera/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index 7e6185308412..ab2095be8fcd 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation { pname = "libcamera"; - version = "unstable-2022-09-03"; + version = "unstable-2022-09-15"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; - rev = "f1776100f55e70320a8938586bc8bf2f242addd4"; - hash = "sha256-96AMemH+mSyPE26eiucwqUGYbK5uWNDNDgwAyeIAg6g="; + rev = "74ab3f778c848b20cbf8fe299170756ff6ebab1a"; + hash = "sha256-w0I4L6xXTBUdqj30LpVW/KZW6bdoUeoW9lnMOW0OLJY="; }; postPatch = '' From 584c43419c9ddf4d3948c9ad46db15494da7e816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 20 Sep 2022 12:50:22 +0200 Subject: [PATCH 678/737] protobuf*: add .meta.mainProgram In particular, this fixes `lib.getExe protobuf` in opencv. --- pkgs/development/libraries/protobuf/generic-v3-cmake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 0b6967a67385..07e84a2ae066 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -101,6 +101,7 @@ let platforms = lib.platforms.unix; homepage = "https://developers.google.com/protocol-buffers/"; maintainers = with lib.maintainers; [ jonringer ]; + mainProgram = "protoc"; }; }; in From 934a243c870c60a06284759417a9f1a6e9434b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 20 Sep 2022 12:51:27 +0200 Subject: [PATCH 679/737] Revert "opencv: fix build by reverting to older protobuf" This reverts commit 5ddd9721065ebc476f811306c79070a7377b920a. Pinning seems not needed now, after the parent commit. --- pkgs/development/libraries/opencv/4.x.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index f40eac3f66d8..ce7f98223357 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -10,7 +10,7 @@ , hdf5 , boost , gflags -, protobuf3_19 +, protobuf , config , ocl-icd , buildPackages @@ -76,10 +76,6 @@ }: let - # https://github.com/opencv/opencv/issues/22449#issuecomment-1252100475 - protobuf = protobuf3_19; - protoc = lib.getExe buildPackages.protobuf3_19; - version = "4.5.4"; src = fetchFromGitHub { @@ -299,7 +295,7 @@ stdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${protoc}" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=OFF" From 57355953698ea886dcc1627bfd8034843554da14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 4 Sep 2022 13:06:55 +0200 Subject: [PATCH 680/737] python310Packages.bcrypt: add some packages to passthru.tests --- pkgs/development/python-modules/bcrypt/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 46771906d7cc..46569d5dedf5 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -8,6 +8,12 @@ , pythonOlder , cffi , pytestCheckHook + # for passthru.tests +, asyncssh +, django_4 +, fastapi +, paramiko +, twisted }: buildPythonPackage rec { @@ -55,6 +61,10 @@ buildPythonPackage rec { "bcrypt" ]; + passthru.tests = { + inherit asyncssh django_4 fastapi paramiko twisted; + }; + meta = with lib; { description = "Modern password hashing for your software and your servers"; homepage = "https://github.com/pyca/bcrypt/"; From 46b20adecf1fc8b21e2034dae80c33be91843043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 4 Sep 2022 14:32:23 +0200 Subject: [PATCH 681/737] python310Packages.passlib: disable timing sensitive test --- pkgs/development/python-modules/passlib/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 3a39f7ac7d58..0ced7c057545 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -28,9 +28,15 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.bcrypt ++ passthru.optional-dependencies.totp; + disabledTests = [ + # timming sensitive + "test_dummy_verify" + ]; + meta = with lib; { description = "A password hashing library for Python"; homepage = "https://foss.heptapod.net/python-libs/passlib"; license = licenses.bsdOriginal; + maintainers = with maintainers; [ ]; }; } From 889ee4dc5b88c5b6f341f36a0e417f19b24ceef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Sep 2022 16:38:12 +0200 Subject: [PATCH 682/737] python310Packages.bcrypt: cleanup --- pkgs/development/python-modules/bcrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 46569d5dedf5..051879c2ac1f 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -39,8 +39,8 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-rust - rustPlatform.cargoSetupHook ] ++ (with rustPlatform; [ + cargoSetupHook rust.cargo rust.rustc ]); From 9a448bdf92cf40df4de1762664006fcd94f832a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 21 Sep 2022 11:33:20 +0200 Subject: [PATCH 683/737] autorandr: fix build dist issue The build uses a custom build and install phase and should therefore not use the hooks that are provided by default. --- pkgs/tools/misc/autorandr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 7a9a30756ffc..eb1ce13f3108 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -9,6 +9,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autorandr"; version = "1.12.1"; + format = "other"; nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = [ python3Packages.packaging ]; From b3c86ef755cd315391af4a54492a8c9ab319551c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:42:53 +0200 Subject: [PATCH 684/737] firefox-esr-91-unwrapped: drop The 91 series has reached its end of life. --- nixos/tests/all-tests.nix | 1 - .../networking/browsers/firefox/packages.nix | 27 ------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 30 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e0121fe6b6b8..7e7a02c732f7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -160,7 +160,6 @@ in { ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job - firefox-esr-91 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-91; }; firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; }; firejail = handleTest ./firejail.nix {}; firewall = handleTest ./firewall.nix {}; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 3b2a6782accb..0aae085b83a5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -52,31 +52,4 @@ rec { versionSuffix = "esr"; }; }; - - firefox-esr-91 = buildMozillaMach rec { - pname = "firefox-esr-91"; - version = "91.13.0esr"; - applicationName = "Mozilla Firefox ESR"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516"; - }; - - meta = { - description = "A web browser built from Firefox Extended Support Release source tree"; - homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ hexa ]; - platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; - broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - license = lib.licenses.mpl20; - }; - tests = [ nixosTests.firefox-esr-91 ]; - updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-91-unwrapped"; - versionPrefix = "91"; - versionSuffix = "esr"; - }; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72f0e3b817e8..3cafe8192088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27894,14 +27894,12 @@ with pkgs; firefox-unwrapped = firefoxPackages.firefox; firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102; - firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; firefox-esr-unwrapped = firefoxPackages.firefox-esr-102; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr = firefox-esr-102; - firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; firefox-esr-wayland = wrapFirefox firefox-esr-102-unwrapped { forceWayland = true; }; From 18e3293550022e60027f3cd1698494bc45e3d73e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:46:41 +0200 Subject: [PATCH 685/737] buildMozillaMach: Prune control flow for versions <102 --- .../networking/browsers/firefox/common.nix | 4 ---- .../firefox/no-buildconfig-ffx90.patch | 22 ------------------- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index f0fe6e1551bf..65ed80695bd8 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -228,7 +228,6 @@ buildStdenv.mkDerivation ({ }) ] ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch - ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ extraPatches; @@ -294,9 +293,6 @@ buildStdenv.mkDerivation ({ '' + lib.optionalString (lib.versionAtLeast version "100.0") '' # Use our own python export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system - '' + lib.optionalString (lib.versionOlder version "100.0") '' - # Use our own python - export MACH_USE_SYSTEM_PYTHON=1 '' + lib.optionalString (lib.versionAtLeast version "95.0") '' # RBox WASM Sandboxing diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch deleted file mode 100644 index c8d2028f30b2..000000000000 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/docshell/base/nsAboutRedirector.cpp -+++ b/docshell/base/nsAboutRedirector.cpp -@@ -66,8 +66,6 @@ static const RedirEntry kRedirMap[] = { - {"about", "chrome://global/content/aboutAbout.html", 0}, - {"addons", "chrome://mozapps/content/extensions/aboutaddons.html", - nsIAboutModule::ALLOW_SCRIPT}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, ---- a/toolkit/content/jar.mn -+++ b/toolkit/content/jar.mn -@@ -39,8 +39,6 @@ toolkit.jar: - content/global/plugins.html - content/global/plugins.css - content/global/plugins.js --* content/global/buildconfig.html -- content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml - #ifndef MOZ_FENNEC From 766a59d215217fb4f4980922f67e533a51c051aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 18 Sep 2022 03:47:39 +0200 Subject: [PATCH 686/737] buildMozillaMach: Build 102esr using nss_esr --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 65ed80695bd8..d144db172868 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -430,7 +430,7 @@ buildStdenv.mkDerivation ({ zip zlib ] - ++ [ (if (lib.versionAtLeast version "92") then nss_latest else nss_esr) ] + ++ [ (if (lib.versionAtLeast version "103") then nss_latest else nss_esr) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed From 6a51acb5524c95623bfa3ad93660afafa53fe1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Sep 2022 14:58:58 +0200 Subject: [PATCH 687/737] thunderbird-91*: drop At this point it wouldn't even build anymore, as we pruned the builder shared with Firefoxes. --- .../thunderbird-bin/91_sources.nix | 655 ------------------ .../mailreaders/thunderbird/packages.nix | 34 - pkgs/top-level/all-packages.nix | 14 - 3 files changed, 703 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix deleted file mode 100644 index 30ea4090ac90..000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix +++ /dev/null @@ -1,655 +0,0 @@ -{ - version = "91.11.0"; - sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/af/thunderbird-91.11.0.tar.bz2"; - locale = "af"; - arch = "linux-x86_64"; - sha256 = "6636029a5493af2bdc3bd4b66ab2ec6bdf3386784378c6e3663e0dacabf61341"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ar/thunderbird-91.11.0.tar.bz2"; - locale = "ar"; - arch = "linux-x86_64"; - sha256 = "4cbde6508c12b4f17268ecb76fac4724fd03be17637debd5e3b0f4ae9664cb38"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ast/thunderbird-91.11.0.tar.bz2"; - locale = "ast"; - arch = "linux-x86_64"; - sha256 = "501d71124a124168dda01442a94858ac8d1aada8dd7949d1e73f3c89464798ee"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/be/thunderbird-91.11.0.tar.bz2"; - locale = "be"; - arch = "linux-x86_64"; - sha256 = "34337ba1e8b7209b7b7e7ac9924e6f8745916f87df30a2b8af9dcd201a40c7a9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/bg/thunderbird-91.11.0.tar.bz2"; - locale = "bg"; - arch = "linux-x86_64"; - sha256 = "3a13287699e97b160adf8008101f64f3f5078cb51f65cba7b076d5c62e8dc583"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/br/thunderbird-91.11.0.tar.bz2"; - locale = "br"; - arch = "linux-x86_64"; - sha256 = "6f67a0fc18d23e0ad0e3776d4039c218af0afac1d7e744215d0225763a33007f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ca/thunderbird-91.11.0.tar.bz2"; - locale = "ca"; - arch = "linux-x86_64"; - sha256 = "25f7848814c4f49d82f4fb305edc52068e0738fc02009f68f2a7822a4307e39a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/cak/thunderbird-91.11.0.tar.bz2"; - locale = "cak"; - arch = "linux-x86_64"; - sha256 = "1e341a101e42b88ee2ab763694066598203a834d85ef3a5c4572a0950dec868a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/cs/thunderbird-91.11.0.tar.bz2"; - locale = "cs"; - arch = "linux-x86_64"; - sha256 = "b36b25191dd6f70e03aee3a5238428e8cdad16192f173ca094356a9404b2a6a0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/cy/thunderbird-91.11.0.tar.bz2"; - locale = "cy"; - arch = "linux-x86_64"; - sha256 = "604e262c8efb59e6250d26d964aba3e7c3fc9a3743137d67dda6011ad31a0331"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/da/thunderbird-91.11.0.tar.bz2"; - locale = "da"; - arch = "linux-x86_64"; - sha256 = "d9b1b3067ebbd2685c53a1787d3b6a496b54e0102e3c15e99539110765787ca0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/de/thunderbird-91.11.0.tar.bz2"; - locale = "de"; - arch = "linux-x86_64"; - sha256 = "03bb508c63f6e9d4ec0846d288113cee0c99ba81cfb82ed3ad96b60a4a04aae8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/dsb/thunderbird-91.11.0.tar.bz2"; - locale = "dsb"; - arch = "linux-x86_64"; - sha256 = "cd09f6ad9323c893284d752afe97e92800f4db579a78eb8d04e2ff0b60321cca"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/el/thunderbird-91.11.0.tar.bz2"; - locale = "el"; - arch = "linux-x86_64"; - sha256 = "1db218644eb596bb47c45405f8e1c6c0ff6d3b0f227fca34ceac7bcb35d19a25"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/en-CA/thunderbird-91.11.0.tar.bz2"; - locale = "en-CA"; - arch = "linux-x86_64"; - sha256 = "5833bf8ba7c5ece94abb082937937c531632831fe6eb6cb059f9f567663b4073"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/en-GB/thunderbird-91.11.0.tar.bz2"; - locale = "en-GB"; - arch = "linux-x86_64"; - sha256 = "fd779ea56324f157cf16587f29f46a8e102a42f951532d20d0d522f16b71de83"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/en-US/thunderbird-91.11.0.tar.bz2"; - locale = "en-US"; - arch = "linux-x86_64"; - sha256 = "5df888beee833cdc3316f82d22d4b87c67021b5433009a11d170c3d204a54752"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/es-AR/thunderbird-91.11.0.tar.bz2"; - locale = "es-AR"; - arch = "linux-x86_64"; - sha256 = "aa0235f0d9864aeba031589ec0983300cf1f3681ec724baf7c4e8325a678b093"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/es-ES/thunderbird-91.11.0.tar.bz2"; - locale = "es-ES"; - arch = "linux-x86_64"; - sha256 = "59fe5b24a8671b7d533099441f2154cbb2ae878421db861bdf63449d0ddea33a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/et/thunderbird-91.11.0.tar.bz2"; - locale = "et"; - arch = "linux-x86_64"; - sha256 = "5dfde219d3121da4bac10cd4bb0ebb7f01e0e268d6e0a5495617cbe8f101205e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/eu/thunderbird-91.11.0.tar.bz2"; - locale = "eu"; - arch = "linux-x86_64"; - sha256 = "0ef3e6dc4d906b59cc41814a01f2f9795cb0f68cedb2d42b3a6ae6f941e57866"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/fi/thunderbird-91.11.0.tar.bz2"; - locale = "fi"; - arch = "linux-x86_64"; - sha256 = "41133551838ab598ca8ff8b414b5e59b100d90fd0d76d86efdbe0932f55ae183"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/fr/thunderbird-91.11.0.tar.bz2"; - locale = "fr"; - arch = "linux-x86_64"; - sha256 = "2f9524eba48ce5584db51bdc70a6d2db9fe855b95bc0ea4886211cd9571fef1e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/fy-NL/thunderbird-91.11.0.tar.bz2"; - locale = "fy-NL"; - arch = "linux-x86_64"; - sha256 = "90c205af710dc61817b385b937eb8f19785d26b7c706454d5e5eb2caa98a6f2f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ga-IE/thunderbird-91.11.0.tar.bz2"; - locale = "ga-IE"; - arch = "linux-x86_64"; - sha256 = "c58024054af2557b41cab9f6ffbcd35e23aeaef082c992a326d442a2d88f7d36"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/gd/thunderbird-91.11.0.tar.bz2"; - locale = "gd"; - arch = "linux-x86_64"; - sha256 = "3c5b3345a8ecb9a929ad4f257545ae21b7d7312d838303f2f45fb82801e3fe7d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/gl/thunderbird-91.11.0.tar.bz2"; - locale = "gl"; - arch = "linux-x86_64"; - sha256 = "9ab74394aa219e005347bb480da18d0640df11184fdf8bccaace8ae4fdfd2e61"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/he/thunderbird-91.11.0.tar.bz2"; - locale = "he"; - arch = "linux-x86_64"; - sha256 = "5b4997c947aeba88b4b67baa9ed70fdc8c5ab5dd4c2ba8faeb858bb572ef7262"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hr/thunderbird-91.11.0.tar.bz2"; - locale = "hr"; - arch = "linux-x86_64"; - sha256 = "028a0ac856f5eb24db1fbd6064554d39e097e681d2acd366eb500ae2a9f44d3e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hsb/thunderbird-91.11.0.tar.bz2"; - locale = "hsb"; - arch = "linux-x86_64"; - sha256 = "c7cf4a82322a80ef5c7587bc7ff1a68c89116ff3575a82d4fa0057484108b726"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hu/thunderbird-91.11.0.tar.bz2"; - locale = "hu"; - arch = "linux-x86_64"; - sha256 = "58e6060e7f104b9096ac521542b55d92cf88d409cb96f9a72705ac9e77b55cfa"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hy-AM/thunderbird-91.11.0.tar.bz2"; - locale = "hy-AM"; - arch = "linux-x86_64"; - sha256 = "0f4254ac57ce8c4db9c336c38c5d35b6260cf32a85b7bd72935f216d0a54851e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/id/thunderbird-91.11.0.tar.bz2"; - locale = "id"; - arch = "linux-x86_64"; - sha256 = "4476719d376d6dfa2b6a984b8c9dd1024a813da848acb7b4c76df5ba903a87a2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/is/thunderbird-91.11.0.tar.bz2"; - locale = "is"; - arch = "linux-x86_64"; - sha256 = "104420cb76394b8a4d243643e087b04be802152758cff256b09dbd1fd7c4bcf2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/it/thunderbird-91.11.0.tar.bz2"; - locale = "it"; - arch = "linux-x86_64"; - sha256 = "8dee7d28dfe512b5bde06cb8ff826c22c46b238b828c1f9f2df75728195cc6d9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ja/thunderbird-91.11.0.tar.bz2"; - locale = "ja"; - arch = "linux-x86_64"; - sha256 = "bd9a73ce7f363d530d23304036d17be5ba92c14ed809b15aeed021fdf940e060"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ka/thunderbird-91.11.0.tar.bz2"; - locale = "ka"; - arch = "linux-x86_64"; - sha256 = "b94f942fc2e0605b38c3fc89b2dfe07faaa812db1035563feb11fa2a20dff0d9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/kab/thunderbird-91.11.0.tar.bz2"; - locale = "kab"; - arch = "linux-x86_64"; - sha256 = "c9201067ae0cd3bb3fc013798b2f7b33daad96707f70d6dfea1e6ab010c6ad25"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/kk/thunderbird-91.11.0.tar.bz2"; - locale = "kk"; - arch = "linux-x86_64"; - sha256 = "1eca6541d09608cdc481f0f1031d6a6d0fc41b53b09e0f6e48bb4694d3be4b45"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ko/thunderbird-91.11.0.tar.bz2"; - locale = "ko"; - arch = "linux-x86_64"; - sha256 = "10b1a259373bba55b9de98d87949c13ded07d9c913d8491c2b9e07700b10420d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/lt/thunderbird-91.11.0.tar.bz2"; - locale = "lt"; - arch = "linux-x86_64"; - sha256 = "72a8496237b15de47a689d5546513cd0da77efa8ae365d538e4a89d4adf37d0a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/lv/thunderbird-91.11.0.tar.bz2"; - locale = "lv"; - arch = "linux-x86_64"; - sha256 = "7b537e57c6244cde41e6c1a3516124293eef9cf42cfcf26d733f69fc6ea8b446"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ms/thunderbird-91.11.0.tar.bz2"; - locale = "ms"; - arch = "linux-x86_64"; - sha256 = "f7382386f24d6f0c5134b60a7c4fc81956bbaeb716697cae9030bdbf3a8a7bc9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/nb-NO/thunderbird-91.11.0.tar.bz2"; - locale = "nb-NO"; - arch = "linux-x86_64"; - sha256 = "cd5bbe73d36900ea4b964b5362e93ca631198eef1f5b790ac8e5fbd3ba2fd851"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/nl/thunderbird-91.11.0.tar.bz2"; - locale = "nl"; - arch = "linux-x86_64"; - sha256 = "6202949156d0471da39f636d53954b2c3a3955f91da906444db8d17dc6b7d346"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/nn-NO/thunderbird-91.11.0.tar.bz2"; - locale = "nn-NO"; - arch = "linux-x86_64"; - sha256 = "43d47e9766780a32ba5bfbe3006cba454189405bf8b019fcbb8a91d8eaa5734b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pa-IN/thunderbird-91.11.0.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha256 = "49211576fb1637f285399c2b7e9c867633da8b53d5f862c9f46f587ab50ac960"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pl/thunderbird-91.11.0.tar.bz2"; - locale = "pl"; - arch = "linux-x86_64"; - sha256 = "54f7ec4a13681b0173909e28ce6d44ef642ccb208ff96ce53472e63a7d9500e0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pt-BR/thunderbird-91.11.0.tar.bz2"; - locale = "pt-BR"; - arch = "linux-x86_64"; - sha256 = "974781b88c324ef8d795ba602ebef9f3e34737ab7b17d753c9b9e81ac543895c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pt-PT/thunderbird-91.11.0.tar.bz2"; - locale = "pt-PT"; - arch = "linux-x86_64"; - sha256 = "b7fdf05204afcbedd5562f9f15a1d6b2179c67dd84c150aa36690b6c709c6237"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/rm/thunderbird-91.11.0.tar.bz2"; - locale = "rm"; - arch = "linux-x86_64"; - sha256 = "04994c9de996a609bdd3a17a75c82e3738c4bb4e7cec1cafb2f5284be665ffb4"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ro/thunderbird-91.11.0.tar.bz2"; - locale = "ro"; - arch = "linux-x86_64"; - sha256 = "9373a55e1602f50af98c1949d43c4700e34f8ff43b5c1ddd9e7bad6651a6f8cb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ru/thunderbird-91.11.0.tar.bz2"; - locale = "ru"; - arch = "linux-x86_64"; - sha256 = "3e386ac2034b623eeb7cbc99ec9fcb543f7ee47cea9bd732c6fe62aa01cbeed8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sk/thunderbird-91.11.0.tar.bz2"; - locale = "sk"; - arch = "linux-x86_64"; - sha256 = "0aa6eb1ba0f714eec99151eb99ab08d862de57d3f3c6cd8086418cadcdea6447"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sl/thunderbird-91.11.0.tar.bz2"; - locale = "sl"; - arch = "linux-x86_64"; - sha256 = "5fbadaa8562c13478ccb4eec4707b683058a52a6a3edcdd60e94408e370c0a59"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sq/thunderbird-91.11.0.tar.bz2"; - locale = "sq"; - arch = "linux-x86_64"; - sha256 = "505158fd5eb28ff2eaa98e7be104551bda552ab6983191e1d86d39e33bb2108d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sr/thunderbird-91.11.0.tar.bz2"; - locale = "sr"; - arch = "linux-x86_64"; - sha256 = "607f65c325201d5751248c4877dcbea28a3d3f99905cbf0f8fbc2ece38bab819"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sv-SE/thunderbird-91.11.0.tar.bz2"; - locale = "sv-SE"; - arch = "linux-x86_64"; - sha256 = "d490bfac8742f29052a14f4973dbec326740610da348498f6ca0417035061c4d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/th/thunderbird-91.11.0.tar.bz2"; - locale = "th"; - arch = "linux-x86_64"; - sha256 = "e218e77576af8c552cd5fa06e6323970bf32681166206ddf42ee0ddbbefbeda5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/tr/thunderbird-91.11.0.tar.bz2"; - locale = "tr"; - arch = "linux-x86_64"; - sha256 = "14b0a4dddd9185896475e840e5953b6543ee0ccb3f8ee0b0a4a448e524726cbc"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/uk/thunderbird-91.11.0.tar.bz2"; - locale = "uk"; - arch = "linux-x86_64"; - sha256 = "a194835b5361faf5b0dd05c26a747d36b761de676e19f54dc3fd5354f4fae12c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/uz/thunderbird-91.11.0.tar.bz2"; - locale = "uz"; - arch = "linux-x86_64"; - sha256 = "457f3040bc017c7cf525b44c5a503385561fe072e8fcc6cc7877c6e070fdd937"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/vi/thunderbird-91.11.0.tar.bz2"; - locale = "vi"; - arch = "linux-x86_64"; - sha256 = "64b81087215b52b8a5780c9955fa9b0e94dbfeb005bf39feea85d838dec01b51"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/zh-CN/thunderbird-91.11.0.tar.bz2"; - locale = "zh-CN"; - arch = "linux-x86_64"; - sha256 = "5187404d29307a0e931663a3f1c8f85b9198869468b9541043988d7ab692bb09"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/zh-TW/thunderbird-91.11.0.tar.bz2"; - locale = "zh-TW"; - arch = "linux-x86_64"; - sha256 = "69e52c2281548034169063b1e9b3c77354aa81c616ba407135d148d04f3c39b1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/af/thunderbird-91.11.0.tar.bz2"; - locale = "af"; - arch = "linux-i686"; - sha256 = "fab1aaabdf672e2e30c11f7b6c884ea84da0e2d4dd1f6e7ea73561f45758972a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ar/thunderbird-91.11.0.tar.bz2"; - locale = "ar"; - arch = "linux-i686"; - sha256 = "7e3e89f1f7fd59e11323397cea81a01da5a2025f8a4eb5bd5e22a8ae7558ad16"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ast/thunderbird-91.11.0.tar.bz2"; - locale = "ast"; - arch = "linux-i686"; - sha256 = "e25ef39a6b91c414d2f748fbe94552be106c0be37ac3ba1bb69ec79731d7c8b1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/be/thunderbird-91.11.0.tar.bz2"; - locale = "be"; - arch = "linux-i686"; - sha256 = "2cdf39bf05d2f090a120b6285e74cf77199849b0b22dcaef10506ee94dfb6949"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/bg/thunderbird-91.11.0.tar.bz2"; - locale = "bg"; - arch = "linux-i686"; - sha256 = "524766c780d086fd4335bdbf09e3b006176ae514cc5940e08b8729462b69cf21"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/br/thunderbird-91.11.0.tar.bz2"; - locale = "br"; - arch = "linux-i686"; - sha256 = "88967dfc29888cb310d667a786605c60b99836c4d96c9d80bbe0d3e1ffc4fc4d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ca/thunderbird-91.11.0.tar.bz2"; - locale = "ca"; - arch = "linux-i686"; - sha256 = "bcc7fec068db74291c4e7fae965ed0d59c690011c0b102ae52fc35355a37c2d3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/cak/thunderbird-91.11.0.tar.bz2"; - locale = "cak"; - arch = "linux-i686"; - sha256 = "92557a0bfce5c70a7112cce28059cb7e5f36ea6de25837cc9e84f29dd4f437d3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/cs/thunderbird-91.11.0.tar.bz2"; - locale = "cs"; - arch = "linux-i686"; - sha256 = "85df534c707dfdf1029c653b8402e0ff8fbb5a76bd6881a03e49422576c50a7b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/cy/thunderbird-91.11.0.tar.bz2"; - locale = "cy"; - arch = "linux-i686"; - sha256 = "6acc4efd7a7eaa9cb1630a1830d8e13a59da59f7cb9c6430c42a6ab0947cb924"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/da/thunderbird-91.11.0.tar.bz2"; - locale = "da"; - arch = "linux-i686"; - sha256 = "b6a9bd2852f7076466bf369b793a480023ef2b025a83765a80b5e996f213ca02"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/de/thunderbird-91.11.0.tar.bz2"; - locale = "de"; - arch = "linux-i686"; - sha256 = "b6524641f5dd509467fcc0fe3eb2ee44df177d07da8ea77aa706714efa6e34dd"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/dsb/thunderbird-91.11.0.tar.bz2"; - locale = "dsb"; - arch = "linux-i686"; - sha256 = "7d9aedca49c87841e2535aa0d7e89b893c6b91042c8c54b3d8a123c36cd21508"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/el/thunderbird-91.11.0.tar.bz2"; - locale = "el"; - arch = "linux-i686"; - sha256 = "840ede568df0cf197039f4ccb4d0ac86b617bdb705bf0bfc13d5ea46f327f43a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/en-CA/thunderbird-91.11.0.tar.bz2"; - locale = "en-CA"; - arch = "linux-i686"; - sha256 = "9410f138179876e844042b7386d3b1bf857ac65ebc45039bb97d4d199983151f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/en-GB/thunderbird-91.11.0.tar.bz2"; - locale = "en-GB"; - arch = "linux-i686"; - sha256 = "7e5a91a64f72c7a01028833ced6cd7b997630d54967e0e2938875645d0868f27"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/en-US/thunderbird-91.11.0.tar.bz2"; - locale = "en-US"; - arch = "linux-i686"; - sha256 = "0afacc2ccee154819e6289992c9daaa9f6dc977ecffc59cd548d5facf7bc118b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/es-AR/thunderbird-91.11.0.tar.bz2"; - locale = "es-AR"; - arch = "linux-i686"; - sha256 = "f8488581fd4dc90e036e58436bb82838d6ae5f386fa73e40b3706d8137d63feb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/es-ES/thunderbird-91.11.0.tar.bz2"; - locale = "es-ES"; - arch = "linux-i686"; - sha256 = "8bb3607d710e25c3c981bfada12be85a9b32dff38bb5d5fe3b045c63494789a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/et/thunderbird-91.11.0.tar.bz2"; - locale = "et"; - arch = "linux-i686"; - sha256 = "a204822cf3af0d14412bc585ddbcd794f0bff40233f3022709978fa79a3544b3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/eu/thunderbird-91.11.0.tar.bz2"; - locale = "eu"; - arch = "linux-i686"; - sha256 = "b7e71ce61437008e4006712dc08d72fb3355c5114ddce4841c6bfac4420d13a8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/fi/thunderbird-91.11.0.tar.bz2"; - locale = "fi"; - arch = "linux-i686"; - sha256 = "aa1a2c83786985e5b5afb9ae62de7644880675c401313ad2ebd8cff6759b1652"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/fr/thunderbird-91.11.0.tar.bz2"; - locale = "fr"; - arch = "linux-i686"; - sha256 = "49e02176f56e9bcbe2ae22a2f26ee1c4e1c18abc0e5622ac3cd3e1cf36feef35"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/fy-NL/thunderbird-91.11.0.tar.bz2"; - locale = "fy-NL"; - arch = "linux-i686"; - sha256 = "41417c3d07809919e639f8124ac1f3a12e150ec9f2a48e4ff5461b11a49fff79"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ga-IE/thunderbird-91.11.0.tar.bz2"; - locale = "ga-IE"; - arch = "linux-i686"; - sha256 = "3bda30e7d860fdc0fa92f56451d36e96cf7444aa186b936c8a8b75cab10c1256"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/gd/thunderbird-91.11.0.tar.bz2"; - locale = "gd"; - arch = "linux-i686"; - sha256 = "89f0ab5eb0df82611fe5abbaf9f626c00a47e80b49f9b3bfacbe49588a5d15a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/gl/thunderbird-91.11.0.tar.bz2"; - locale = "gl"; - arch = "linux-i686"; - sha256 = "d1da56e2ed418a30c225857cee00c6feac62e02ac64279d340265602faea30d9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/he/thunderbird-91.11.0.tar.bz2"; - locale = "he"; - arch = "linux-i686"; - sha256 = "644508c044d0b9de9c226005c9a6a9a88eb179da56fccb4abe012e905bbfaaaa"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hr/thunderbird-91.11.0.tar.bz2"; - locale = "hr"; - arch = "linux-i686"; - sha256 = "ceb9ef728f0413525c93949c4960e97e4b887965cfd94211b1ec349165368864"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hsb/thunderbird-91.11.0.tar.bz2"; - locale = "hsb"; - arch = "linux-i686"; - sha256 = "81fadd0d89c48bf2a3df279ba24e48490bdbe8913ceb5fb53738f32c1cc61211"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hu/thunderbird-91.11.0.tar.bz2"; - locale = "hu"; - arch = "linux-i686"; - sha256 = "57c6223d5dbd0221742b51df296a8ea74739ec601ba0cbbc8de9c27dc3a09226"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hy-AM/thunderbird-91.11.0.tar.bz2"; - locale = "hy-AM"; - arch = "linux-i686"; - sha256 = "b33ad866c009c85793a2e2ee8e837de49bebbbc98c069e8e6735aa2041208642"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/id/thunderbird-91.11.0.tar.bz2"; - locale = "id"; - arch = "linux-i686"; - sha256 = "6c9da73ca1706a35496a5e298f3c1308a0a0e56a03826c41bd84e7ef0a54341b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/is/thunderbird-91.11.0.tar.bz2"; - locale = "is"; - arch = "linux-i686"; - sha256 = "bc2dedfe32f7f82ee485c39bd21919bad3ab706c82fe04ab6b13198628f03b43"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/it/thunderbird-91.11.0.tar.bz2"; - locale = "it"; - arch = "linux-i686"; - sha256 = "15a69c14973def0f7ad062a8a3a9f5c72b8358f46ed89fba0dce0bb614164cbb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ja/thunderbird-91.11.0.tar.bz2"; - locale = "ja"; - arch = "linux-i686"; - sha256 = "49f9b81962a2bc38d1c465a347a871b377cfe5110fe44761fba88779e1cf6c16"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ka/thunderbird-91.11.0.tar.bz2"; - locale = "ka"; - arch = "linux-i686"; - sha256 = "3d57cd918664d17208bb877561807c1c6c7fd0b3d72b77592fd1eba1e36e3c0e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/kab/thunderbird-91.11.0.tar.bz2"; - locale = "kab"; - arch = "linux-i686"; - sha256 = "cfa2dcd465a6e877253e029733d32f2040f6145d5bd34dbaf6ce2cbfe4d83df2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/kk/thunderbird-91.11.0.tar.bz2"; - locale = "kk"; - arch = "linux-i686"; - sha256 = "cd60db4921fefaf47dbfe2e681a0f5c4c1054cc6fe9ca4ea36abf3b2ff8d89a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ko/thunderbird-91.11.0.tar.bz2"; - locale = "ko"; - arch = "linux-i686"; - sha256 = "48ff8d98abd69d377f3964d8d278e79554e3ec31973ff4baf7773236fc635fa7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/lt/thunderbird-91.11.0.tar.bz2"; - locale = "lt"; - arch = "linux-i686"; - sha256 = "cde6ca3288571470ae836fc3b1584ef2e5413548e2180a58b5e8755e6ece3912"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/lv/thunderbird-91.11.0.tar.bz2"; - locale = "lv"; - arch = "linux-i686"; - sha256 = "e54b05e69f07c191658b5fe86aefef21f8dd2ea28c4fd5518876ca00dadc7ee1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ms/thunderbird-91.11.0.tar.bz2"; - locale = "ms"; - arch = "linux-i686"; - sha256 = "481c849a5347befe0204e090e457617278a598a20411f07379bcebf997752089"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/nb-NO/thunderbird-91.11.0.tar.bz2"; - locale = "nb-NO"; - arch = "linux-i686"; - sha256 = "d239864212742c86b2a83246acb22523be4097f438ebb1fdaa3776cb7274d68e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/nl/thunderbird-91.11.0.tar.bz2"; - locale = "nl"; - arch = "linux-i686"; - sha256 = "6d50d645030e2672cda90d56b795c5de2813e82101839f821ef5345c0bac3e1d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/nn-NO/thunderbird-91.11.0.tar.bz2"; - locale = "nn-NO"; - arch = "linux-i686"; - sha256 = "87f5d8da66fc1bc224777a1db400d73f792ecec257ebe4ca7b857a29eb1b46f2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pa-IN/thunderbird-91.11.0.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha256 = "1b9315e847a7b40f8f984facd3bb24d5291199ba974e0391f1088c8623e2ac10"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pl/thunderbird-91.11.0.tar.bz2"; - locale = "pl"; - arch = "linux-i686"; - sha256 = "22c0be8d666e5a7e7fc2ef0e44558e0a7fad299a5946f55850652d25ff1f3e24"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pt-BR/thunderbird-91.11.0.tar.bz2"; - locale = "pt-BR"; - arch = "linux-i686"; - sha256 = "e9ff705ff4d1513060f3142590bdbff2e66c84875bf683fd5196c464ce45d23a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pt-PT/thunderbird-91.11.0.tar.bz2"; - locale = "pt-PT"; - arch = "linux-i686"; - sha256 = "a446fab64e1b49d5463e5966a0a3399314bf893cf9e2687d9c88dc810e3c50d6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/rm/thunderbird-91.11.0.tar.bz2"; - locale = "rm"; - arch = "linux-i686"; - sha256 = "a533be1dbc69a4821039b969050253b40c5c96926e61f79b186a7a61452f01be"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ro/thunderbird-91.11.0.tar.bz2"; - locale = "ro"; - arch = "linux-i686"; - sha256 = "1cfd9675f82e3a6262946a0fd40fae143abc0bd896f74a1afa1bb5fce72c8a31"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ru/thunderbird-91.11.0.tar.bz2"; - locale = "ru"; - arch = "linux-i686"; - sha256 = "177641bee951eb96f56b4f2551014e648be8e62766258a7e25ff6e3d6aef465f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sk/thunderbird-91.11.0.tar.bz2"; - locale = "sk"; - arch = "linux-i686"; - sha256 = "f30a2a1afc23f790908efb04e5a90552ecd33b0a61eac0f8e51c66e2745befb3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sl/thunderbird-91.11.0.tar.bz2"; - locale = "sl"; - arch = "linux-i686"; - sha256 = "deb684209fd7a773e5679daea7b20d62c9a2ad885a33f9bafb2596aa44465d8d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sq/thunderbird-91.11.0.tar.bz2"; - locale = "sq"; - arch = "linux-i686"; - sha256 = "efd8462f8886c0396d71e89adbcefdec0c7d8bd60d319df833b3cff3aae7e5ea"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sr/thunderbird-91.11.0.tar.bz2"; - locale = "sr"; - arch = "linux-i686"; - sha256 = "c120fd6dcf72da105190c46781fffb8d5ba310a3bf9febd8d9090024953ab2eb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sv-SE/thunderbird-91.11.0.tar.bz2"; - locale = "sv-SE"; - arch = "linux-i686"; - sha256 = "09f2bf230701dd26c6b72a1b053c743bd6fe79fafd43fed18154dcd20d466ed6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/th/thunderbird-91.11.0.tar.bz2"; - locale = "th"; - arch = "linux-i686"; - sha256 = "121cceee1a3eb123a2e23c7c440beacda0deaffd651153d176b2a9b4678146c6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/tr/thunderbird-91.11.0.tar.bz2"; - locale = "tr"; - arch = "linux-i686"; - sha256 = "41626b2bb506dca9929ce3a5f44b6d1f1a763ab34caa1dbbf1b4d25f49573b88"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/uk/thunderbird-91.11.0.tar.bz2"; - locale = "uk"; - arch = "linux-i686"; - sha256 = "05373f8f2e23c0551b025b89a2ab116635e49ffdf469dfaaaeddff96db77a1db"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/uz/thunderbird-91.11.0.tar.bz2"; - locale = "uz"; - arch = "linux-i686"; - sha256 = "ef50609a5a0382aed53c0af6bd4de6143db508442b104eba10832967ad540018"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/vi/thunderbird-91.11.0.tar.bz2"; - locale = "vi"; - arch = "linux-i686"; - sha256 = "dabf2c94a148504308b281de70b2dc37aa7b12fe67a83bae1b6df4be7e864a3d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/zh-CN/thunderbird-91.11.0.tar.bz2"; - locale = "zh-CN"; - arch = "linux-i686"; - sha256 = "adce5e780010b7f81e53e727627df3db6a2fbc50ee7789dc980b06af93b1e1fe"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/zh-TW/thunderbird-91.11.0.tar.bz2"; - locale = "zh-TW"; - arch = "linux-i686"; - sha256 = "d08f81345272c130c2050b6a89605f4e714b9320ca7242fba95e320d4f69097a"; - } - ]; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 0c34c2b17469..8feb5b0ed382 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -2,41 +2,7 @@ rec { thunderbird = thunderbird-102; - thunderbird-91 = (buildMozillaMach rec { - pname = "thunderbird"; - version = "91.13.0"; - application = "comm/mail"; - applicationName = "Mozilla Thunderbird"; - binaryName = pname; - src = fetchurl { - url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "e73d3db4333ad659ec1ab249bd261e8c28301c125d0c39b473c83f8fccace6d4916a2bfef14fc20c065055ff6bbd3ca618b5aab178241b53509543640dcd541a"; - }; - extraPatches = [ - # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. - ./no-buildconfig.patch - ]; - meta = with lib; { - description = "A full-featured e-mail client"; - homepage = "https://thunderbird.net/"; - maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; - platforms = platforms.unix; - badPlatforms = platforms.darwin; - broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - license = licenses.mpl20; - }; - updateScript = callPackage ./update.nix { - attrPath = "thunderbird-91-unwrapped"; - versionPrefix = "91"; - }; - }).override { - geolocationSupport = false; - webrtcSupport = false; - - pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - }; thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; version = "102.2.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cafe8192088..e58d6b825717 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31500,10 +31500,6 @@ with pkgs; thunderbird = wrapThunderbird thunderbird-unwrapped { }; thunderbird-wayland = wrapThunderbird thunderbird-unwrapped { forceWayland = true; }; - thunderbird-91-unwrapped = thunderbirdPackages.thunderbird-91; - thunderbird-91 = wrapThunderbird thunderbird-91-unwrapped { }; - thunderbird-91-wayland = wrapThunderbird thunderbird-91-unwrapped { forceWayland = true; }; - thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped { applicationName = "thunderbird"; pname = "thunderbird-bin"; @@ -31514,16 +31510,6 @@ with pkgs; generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix; }; - thunderbird-bin-91 = wrapThunderbird thunderbird-bin-91-unwrapped { - applicationName = "thunderbird"; - pname = "thunderbird-bin"; - desktopName = "Thunderbird"; - }; - thunderbird-bin-91-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin { - inherit (gnome) adwaita-icon-theme; - generated = import ../applications/networking/mailreaders/thunderbird-bin/91_sources.nix; - }; - thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; ticpp = callPackage ../development/libraries/ticpp { }; From feec896b13508d320eddf81c324e4ba1383ddc45 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 21 Sep 2022 22:00:18 +0800 Subject: [PATCH 688/737] python3Packages.atenpdu: remove duplicate async-timeout from args --- pkgs/development/python-modules/atenpdu/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index e7669f8bf005..185f64d58f6e 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -1,5 +1,4 @@ { lib -, async-timeout , buildPythonPackage , fetchPypi , async-timeout From ecacff35a6803be8ec93a261cf9836ccd26012aa Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 22 Sep 2022 08:14:21 +0200 Subject: [PATCH 689/737] nixos/paperless: add required syscall `unpaper` requires syscall 238 (`set_mempolicy`). Add this by un-blocking the systemd syscall filter set `@resources` which is safe in the context of paperless. --- nixos/modules/services/misc/paperless.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index e11158f8a12b..6a98d5cb686d 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -80,7 +80,7 @@ let RestrictSUIDSGID = true; SupplementaryGroups = optional enableRedis redisServer.user; SystemCallArchitectures = "native"; - SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ]; + SystemCallFilter = [ "@system-service" "~@privileged @setuid @keyring" ]; # Does not work well with the temporary root #UMask = "0066"; }; From 539762709bb014f93f71dd825dc60003862c776f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 22 Sep 2022 09:24:15 +1000 Subject: [PATCH 690/737] Revert "rustc: build with jemalloc" This reverts commit 2a699029f43a2d467b07fc42bea8fd975ffa766f. hopefully this fixes building x86_64-darwin under emulation on aarch64-darwin --- pkgs/development/compilers/rust/rustc.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 5fd374160746..bb5bc1bb1d73 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -107,9 +107,6 @@ in stdenv.mkDerivation rec { "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.isMusl [ "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" - ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # https://github.com/rust-lang/rust/issues/92173 - "--set rust.jemalloc" ]; # The bootstrap.py will generated a Makefile that then executes the build. From ea8ba8605beeab7ff9cc35f7a35162cc54c90f95 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Sep 2022 02:58:49 +0200 Subject: [PATCH 691/737] python3Packages.keyring: 23.9.1 -> 23.9.3 --- pkgs/development/python-modules/keyring/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index cd1f4d6816aa..3d6c49859372 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -14,28 +14,29 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.9.1"; + version = "23.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OeT2VyI40mFagvyqSF5gi4S1A88IDckkxDu7rLEcHBg="; + hash = "sha256-abAd2DxC9ZAlD+eh9QP8IpsU3oOFcxSxkzo92/WVxKU="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ - importlib-metadata - ] ++ lib.optionals stdenv.isLinux [ - dbus-python + propagatedBuildInputs = [ jaraco_classes + ] ++ lib.optionals stdenv.isLinux [ jeepney secretstorage + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; + pythonImportsCheck = [ "keyring" "keyring.backend" From e7b138744afc860385f1a0614bae998f27688f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 23 Sep 2022 09:43:31 +0200 Subject: [PATCH 692/737] rocksdb: fixup paths in .pc files --- pkgs/development/libraries/rocksdb/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index adc1d99bde79..50a864c8555b 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -58,6 +58,11 @@ stdenv.mkDerivation rec { # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format"; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/rocksdb.pc \ + --replace '="''${prefix}//' '="/' + ''; + meta = with lib; { homepage = "https://rocksdb.org"; description = "A library that provides an embeddable, persistent key-value store for fast storage"; From 283707a3ef9423f31789dea9ea4e744f1191b850 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 22 Sep 2022 18:52:28 +0200 Subject: [PATCH 693/737] python3Packages.flask-mailman: init at 0.3.0 Signed-off-by: Florian Brandes Co-authored-by: Sandro --- .../python-modules/flask-mailman/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/flask-mailman/default.nix diff --git a/pkgs/development/python-modules/flask-mailman/default.nix b/pkgs/development/python-modules/flask-mailman/default.nix new file mode 100644 index 000000000000..aa8ffae24370 --- /dev/null +++ b/pkgs/development/python-modules/flask-mailman/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, mkdocs-material-extensions +, flask +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "flask-mailman"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "waynerv"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cfLtif+48M6fqOkBbi4PJRFpf9FRXCPesktFQky34eU="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + flask + mkdocs-material-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "flask_mailman" ]; + + meta = with lib; { + homepage = "https://github.com/waynerv/flask-mailman"; + description = "Flask extension providing simple email sending capabilities."; + license = licenses.bsd3; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c25db1beea00..8f93db3af9e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3360,6 +3360,8 @@ in { flask_mail = callPackage ../development/python-modules/flask-mail { }; + flask-mailman = callPackage ../development/python-modules/flask-mailman { }; + flask_marshmallow = callPackage ../development/python-modules/flask-marshmallow { }; flask_migrate = callPackage ../development/python-modules/flask-migrate { }; From cc2dcc162f9977475b2a9443f6fead6f312804cc Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 22 Sep 2022 18:52:59 +0200 Subject: [PATCH 694/737] python3Packages.flask-security-too: fix build failure Signed-off-by: Florian Brandes --- .../python-modules/flask-security-too/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index e2094568b658..4c1b46fc86bb 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -9,7 +9,8 @@ # extras: common , bcrypt , bleach -, flask_mail +, flask-mailman +, qrcode # extras: fsqla , flask-sqlalchemy @@ -19,7 +20,6 @@ # extras: mfa , cryptography , phonenumbers -, pyqrcode # propagates , blinker @@ -39,6 +39,7 @@ , peewee , pony , pytestCheckHook +, python-dateutil , zxcvbn }: @@ -71,7 +72,8 @@ buildPythonPackage rec { common = [ bcrypt bleach - flask_mail + flask-mailman + qrcode ]; fsqla = [ flask-sqlalchemy @@ -81,7 +83,6 @@ buildPythonPackage rec { mfa = [ cryptography phonenumbers - pyqrcode ]; }; @@ -93,6 +94,7 @@ buildPythonPackage rec { peewee pony pytestCheckHook + python-dateutil zxcvbn ] ++ passthru.optional-dependencies.babel From a3c646c4e219350142d00338bd2611fb4472653b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 23 Sep 2022 10:22:43 +0200 Subject: [PATCH 695/737] protobuf: default to 3.20 on 32-bit platforms 3.21 won't build, and the upstream fix won't apply. --- 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 3d7db44c042d..3a34cc06bd6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21231,7 +21231,9 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf3_21; + # https://github.com/protocolbuffers/protobuf/issues/10418 + protobuf = if stdenv.hostPlatform.is32bit then protobuf3_20 else + protobuf3_21; protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; From 74cb4ab8e0115aee66efb43f797e5e1366fe88de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 23 Sep 2022 10:35:38 +0200 Subject: [PATCH 696/737] python3Packages.pyqtwebengine: add setuptools --- pkgs/development/python-modules/pyqtwebengine/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 12021e52271b..c86fe165d4fc 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -32,6 +32,7 @@ in buildPythonPackage rec { qtsvg qtwebengine pyqt-builder + pythonPackages.setuptools ]; buildInputs = [ From a0290a89990f815b2e0e43a7a5bcd492afa31441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 23 Sep 2022 11:21:36 +0200 Subject: [PATCH 697/737] python3Packages.jaxlib-build: switch to protobuf 3.20 https://hydra.nixos.org/build/191829110 --- pkgs/development/python-modules/jaxlib/default.nix | 10 +++++----- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 456c9108593e..12ba67b71244 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -35,6 +35,7 @@ , giflib , grpc , libjpeg_turbo +, protobuf , python , snappy , zlib @@ -49,7 +50,6 @@ }: let - inherit (cudaPackages) cudatoolkit cudnn nccl; pname = "jaxlib"; @@ -120,7 +120,7 @@ let numpy openssl pkgs.flatbuffers - pkgs.protobuf + protobuf pybind11 scipy six @@ -158,7 +158,7 @@ let build --action_env=PYENV_ROOT build --python_path="${python}/bin/python" build --distinct_host_configuration=false - build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" + build --define PROTOBUF_INCLUDE_PATH="${protobuf}/include" '' + lib.optionalString cudaSupport '' build --action_env CUDA_TOOLKIT_PATH="${cudatoolkit_joined}" build --action_env CUDNN_INSTALL_PATH="${cudnn}" @@ -268,8 +268,8 @@ let sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD '' else if stdenv.cc.isClang then '' - sed -i 's@-lprotobuf@${pkgs.protobuf}/lib/libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@${pkgs.protobuf}/lib/libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD + sed -i 's@-lprotobuf@${protobuf}/lib/libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD + sed -i 's@-lprotoc@${protobuf}/lib/libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD '' else throw "Unsupported stdenv.cc: ${stdenv.cc}"); installPhase = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c25db1beea00..6a4869c10d3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4699,6 +4699,7 @@ in { # pin to `cudaPackages_11_6` instead. cudaPackages = pkgs.cudaPackages_11_6; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; + protobuf = pkgs.protobuf3_20; # jaxlib-build 0.3.15 won't build with protobuf 3.21 }; jaxlib = self.jaxlib-build; From fd4242a7ebfa1b7ff016b784f33c25294b9d9c1b Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 23 Sep 2022 19:44:03 -0700 Subject: [PATCH 698/737] python310Packages.bcrypt: add libiconv on darwin --- pkgs/development/python-modules/bcrypt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 051879c2ac1f..a4848c676a94 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -8,6 +8,8 @@ , pythonOlder , cffi , pytestCheckHook +, libiconv +, stdenv # for passthru.tests , asyncssh , django_4 @@ -45,6 +47,9 @@ buildPythonPackage rec { rust.rustc ]); + # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands. + buildInputs = lib.optional stdenv.isDarwin libiconv; + propagatedBuildInputs = [ cffi ]; From b403dee461931b23453f60a175dd8824e9921769 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 23 Sep 2022 20:12:42 -0700 Subject: [PATCH 699/737] python310Packages.paramiko: nit: use hash property --- 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 225bf8b6f12f..c4538aaae657 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AD5r7nwDTCH7sFG/g9wKnuQQYgTdPFMFTHFFLMTsOTg="; + hash = "sha256-AD5r7nwDTCH7sFG/g9wKnuQQYgTdPFMFTHFFLMTsOTg="; }; patches = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { # https://github.com/paramiko/paramiko/pull/1606/ (fetchpatch { url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; - sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; + hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; }) ]; From e3e05cc731e887a2311d6070186d958328b22f06 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 23 Sep 2022 20:13:03 -0700 Subject: [PATCH 700/737] python310Packages.paramiko: fix failing tests After tests were reenabled for paramiko, two SFTP tests fail without applying patch from upstream. --- pkgs/development/python-modules/paramiko/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index c4538aaae657..616dad5e8cb6 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; }) + (fetchpatch { + name = "fix-sftp-tests.patch"; + url = "https://github.com/paramiko/paramiko/commit/47cfed55575c21ac558e6d00a4ab1814406be651.patch"; + hash = "sha256-H3nKT8+4CTEDoiqnlhFfuKnc/65GGfwwAm9H2lwrlK8="; + }) ]; propagatedBuildInputs = [ From eb0fa0cd731282f4b48bbe021091d5162c02a16a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Sep 2022 14:12:17 +0100 Subject: [PATCH 701/737] Revert "python3Packages.afdko: 3.9.0 -> 3.9.1" This reverts commit 246216e599eefe157169d2deaec801206fd735d8. 3.9.1 does not compile due to patch collision: > applying patch /nix/store/sickncxw0s730j6gfrnlsi5ndgysi6la-libxml2-cmake-find-package.patch > patching file CMakeLists.txt > Hunk #1 FAILED at 42. Fixing it is not trivial as upstream started bundling libxml2: https://github.com/NixOS/nixpkgs/pull/182941#issuecomment-1195308936 Let's revert the update for now. --- pkgs/development/python-modules/afdko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 9eb1f35c4315..29593503252a 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.9.1"; + version = "3.9.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AtRNaZzn9BoNIjvKhS7rsYVfHw26JKKUFqO/6TcBIkw="; + sha256 = "1fjsaz6bp028fbmry6fzfcih78mdzycqmky1wsz5y0bg4kfk4shh"; }; format = "pyproject"; From 405619ee0dbaef2428140e0df583f0ca0f0ea654 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 24 Sep 2022 14:40:15 -0700 Subject: [PATCH 702/737] python310Packages.twisted: fix test_openFileDescriptors (#192825) --- pkgs/development/python-modules/twisted/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index ac09730526b3..fa6c4726222c 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , python , appdirs , attrs @@ -53,9 +54,17 @@ buildPythonPackage rec { pname = "Twisted"; inherit version; extension = "tar.gz"; - sha256 = "sha256-5bYN458tHaFT++GHTYhf4/y9sh/MRG+nWaU+j8NRO+0="; + hash = "sha256-5bYN458tHaFT++GHTYhf4/y9sh/MRG+nWaU+j8NRO+0="; }; + patches = [ + (fetchpatch { + name = "fix-test_openFileDescriptors.patch"; + url = "https://github.com/twisted/twisted/commit/47f47634940141466177261b20bb43c300531e38.patch"; + hash = "sha256-wacnF166PnZHXJEqTlPZUdDILJIVHOcnC2a34SQumvs="; + }) + ]; + __darwinAllowLocalNetworking = true; propagatedBuildInputs = [ From 4ab37278c5f14ac951193bb0541b49c9b22f3c70 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Thu, 22 Sep 2022 15:59:02 -0300 Subject: [PATCH 703/737] sage: update test expectations (sympy and ipywidgets upgrades) --- 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 27d0ffc6fec5..4fd18969a941 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -115,6 +115,22 @@ stdenv.mkDerivation rec { # adapted from https://trac.sagemath.org/ticket/23712#comment:22 ./patches/tachyon-renamed-focallength.patch + + # https://trac.sagemath.org/ticket/34118 + (fetchSageDiff { + name = "sympy-1.11-upgrade.patch"; + base = "9.7"; + rev = "52815744bde2b682245b6f985a112f7cb8666056"; + sha256 = "sha256-gv6z6JkQ6S6oCJQNkVgcPVvzlplyvR1nC7pWmcUiSc0="; + }) + + # https://trac.sagemath.org/ticket/34460 + (fetchSageDiff { + name = "ipywidgets-8-upgrade.patch"; + base = "9.7"; + rev = "2816dbacb342398a23bb3099e20c92c8020ab0fa"; + sha256 = "sha256-tCOsMxXwPkRg3FJGVvTqDzlWdra78UfDY6nci0Nr9GI="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; From b81cbeceef3b17fb4e8cad8fb2fb0bbee8718f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 25 Sep 2022 09:11:32 +0200 Subject: [PATCH 704/737] python3Packages.pyhanko-certvalidator: drop an expired test --- .../python-modules/pyhanko-certvalidator/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 4675e48a5646..5763a4c4bed6 100644 --- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -58,6 +58,8 @@ buildPythonPackage rec { "test_revocation_mode_hard_aiohttp_autofetch" # The path could not be validated because no revocation information could be found for intermediate certificate 1 "test_revocation_mode_hard" + # certificate expired 2022-09-17 + "test_revocation_mode_soft" ]; pythonImportsCheck = [ From ab0af63337d61c777591a599ff85f2195d5aa693 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 15 Sep 2022 19:23:51 +0300 Subject: [PATCH 705/737] plasma-wayland-protocols: 1.7.0 -> 1.8.0 --- .../libraries/plasma-wayland-protocols/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 7db287e5a44f..3f0980046d59 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CE4mhcqmHZTG/obc4AayJHTXu0s0xMuWvXY7l+MF+tY="; + sha256 = "sha256-XQ+gyaC0SAAeCEJSQfI1/PuiW7xizkPAUK0dgI1X3Xo="; }; nativeBuildInputs = [ extra-cmake-modules ]; From 7c5f76a5e1221037072fd172f26b106fde5adb5b Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 25 Sep 2022 21:38:13 +0300 Subject: [PATCH 706/737] python310Packages.docker: don't use a alias --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 48f454a69b4f..0a01d5e4792e 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -7,7 +7,7 @@ , paramiko , pytestCheckHook , requests -, setuptools_scm +, setuptools-scm , urllib3 , websocket-client }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ From ea539db9e54d408d1bfb869523dd8f0439142a89 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 11 Sep 2022 13:34:48 -0700 Subject: [PATCH 707/737] python310Packages.pathspec: set pyproject format This requires adding setuptools to nativeBuildInputs. Plus a few other minor derivation improvements based on feedback. --- pkgs/development/python-modules/pathspec/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index d3485003dc97..121f83df2898 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -1,17 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools }: buildPythonPackage rec { - pname = "pathspec"; + pname = "pathspec"; version = "0.10.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-es5hYbYh0x55AutrWuFI0Sz9I/SiSbn/trn+4SCEMj0="; + hash = "sha256-es5hYbYh0x55AutrWuFI0Sz9I/SiSbn/trn+4SCEMj0="; }; + nativeBuildInputs = [ + setuptools + ]; + meta = { description = "Utility library for gitignore-style pattern matching of file paths"; homepage = "https://github.com/cpburnz/python-path-specification"; From 2372c80a1edb3e1cacff161512eb09cf02be0f95 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Sep 2022 22:00:28 +0200 Subject: [PATCH 708/737] onnxruntime: pin protobuf at 3.19 --- 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 4c7400e4d92e..aeb2395195ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4499,7 +4499,9 @@ with pkgs; online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; - onnxruntime = callPackage ../development/libraries/onnxruntime { }; + onnxruntime = callPackage ../development/libraries/onnxruntime { + protobuf = protobuf3_19; + }; xkbd = callPackage ../applications/misc/xkbd { }; From e98771bc7e67db82451c70970d9b109e5d7d9349 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Sep 2022 23:11:24 +0200 Subject: [PATCH 709/737] luaPackages.fennel: fix installShellFiles reference --- pkgs/development/lua-modules/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 32492cbd0f3f..e5d5e1118553 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -114,7 +114,7 @@ with prev; fennel = prev.fennel.overrideAttrs(oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ - pkgs.installShellFiles + installShellFiles ]; postInstall = '' installManPage fennel.1 From d2713c3294f1bfdd76fe96d30b8e9cb0b016d29c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Sep 2022 23:49:37 +0200 Subject: [PATCH 710/737] anki: build with format other --- pkgs/games/anki/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index a25111bddfe9..3796741f96ca 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -74,6 +74,7 @@ in buildPythonApplication rec { pname = "anki"; inherit version; + format = "other"; src = fetchurl { urls = [ From 636447bb8a1b977f019c02f4803c2d7ed0ce70bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Sep 2022 13:00:16 +0200 Subject: [PATCH 711/737] pdm: 2.1.2 -> 2.1.4 --- pkgs/tools/package-management/pdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 29a39cf96614..54c83f0094f5 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,13 +24,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.1.2"; + version = "2.1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-U8aXskq3PdIVXNhUTZ7TVRza4dexZoheHO1GO0aGneo="; + hash = "sha256-nKCdthPgheBR4bySQww0I5eI8K5IzLhxiTCCYnQRknI="; }; propagatedBuildInputs = [ From a7946aa3592abe66a840efae28c39b80483a61a9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 26 Sep 2022 17:57:24 +0300 Subject: [PATCH 712/737] silenthound: dont use a alias --- pkgs/tools/security/silenthound/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/silenthound/default.nix b/pkgs/tools/security/silenthound/default.nix index d1a86adf0189..92b651bc9a83 100644 --- a/pkgs/tools/security/silenthound/default.nix +++ b/pkgs/tools/security/silenthound/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ colorama - ldap + python-ldap ]; dontBuild = true; From ffb4467bbc342df370253a0db28deb7d42fe4654 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 26 Sep 2022 20:19:40 -0700 Subject: [PATCH 713/737] python310Packages.pgpy: cryptography 38 fix Pull patch from upstream that fixes pgpy after the update to cryptography 38. --- .../python-modules/pgpy/default.nix | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index a53711a4de62..336d077f2aad 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -1,6 +1,14 @@ -{ lib, pythonOlder, fetchFromGitHub, buildPythonPackage -, six, enum34, pyasn1, cryptography -, pytestCheckHook }: +{ lib +, pythonOlder +, fetchFromGitHub +, fetchpatch +, buildPythonPackage +, six +, enum34 +, pyasn1 +, cryptography +, pytestCheckHook +}: buildPythonPackage rec { pname = "pgpy"; @@ -10,9 +18,19 @@ buildPythonPackage rec { owner = "SecurityInnovation"; repo = "PGPy"; rev = "v${version}"; - sha256 = "03pch39y3hi4ici6y6lvz0j0zram8dw2wvnmq1zyjy3vyvm1ms4a"; + hash = "sha256-iuga6vZ7eOl/wNVuLnhDVeUPJPibGm8iiyTC4dOA7A4="; }; + patches = [ + # Fixes the issue in https://github.com/SecurityInnovation/PGPy/issues/402. + # by pulling in https://github.com/SecurityInnovation/PGPy/pull/403. + (fetchpatch { + name = "crytography-38-support.patch"; + url = "https://github.com/SecurityInnovation/PGPy/commit/d84597eb8417a482433ff51dc6b13060d4b2e686.patch"; + hash = "sha256-dviXCSGtPguROHVZ1bt/eEfpATjehm8jZ5BeVjxdb8U="; + }) + ]; + propagatedBuildInputs = [ six pyasn1 From 31b9ecf449812a77d7a0f708d25cd2b8c1993f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 27 Sep 2022 18:13:47 +0200 Subject: [PATCH 714/737] libsForQt5.mlt: fixup path in .pc file --- pkgs/development/libraries/mlt/qt-5.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 9c2c21384612..b050c8d0caf3 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -70,6 +70,11 @@ mkDerivation rec { "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" ]; + postFixup = '' + substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \ + --replace '=''${prefix}//' '=/' + ''; + passthru = { inherit ffmpeg; }; From 6f691051994ec6430b811582ff1a5fe4174928cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 27 Sep 2022 18:19:42 +0200 Subject: [PATCH 715/737] libmt32emu: fixup path in .pc file --- pkgs/applications/audio/munt/libmt32emu.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index fdd9e6fac89d..d8b2ae1510cc 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { "-Dmunt_WITH_MT32EMU_QT=OFF" ]; + postFixup = '' + substituteInPlace "$dev"/lib/pkgconfig/mt32emu.pc \ + --replace '=''${exec_prefix}//' '=/' \ + --replace "$dev/$dev/" "$dev/" + ''; + meta = with lib; { homepage = "http://munt.sourceforge.net/"; description = "A library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; From 28458d3988585cbfa6af44fa0ddb67b9c13d988a Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 27 Sep 2022 19:37:35 -0700 Subject: [PATCH 716/737] python310Packages.prance: update openapi-spec-validator --- .../python-modules/prance/default.nix | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index cefa13610081..1065781cde18 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , chardet , requests , ruamel-yaml @@ -21,9 +22,29 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; + hash = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; }; + patches = [ + # Fix for openapi-spec-validator 0.5.0+: + # https://github.com/RonnyPfannschmidt/prance/pull/132 + (fetchpatch { + name = "1-openapi-spec-validator-upgrade.patch"; + url = "https://github.com/RonnyPfannschmidt/prance/commit/55503c9b12b685863c932ededac996369e7d288a.patch"; + hash = "sha256-7SOgFsk2aaaaAYS8WJ9axqQFyEprurn6Zn12NcdQ9Bg="; + }) + (fetchpatch { + name = "2-openapi-spec-validator-upgrade.patch"; + url = "https://github.com/RonnyPfannschmidt/prance/commit/7e59cc69c6c62fd04875105773d9d220bb58fea6.patch"; + hash = "sha256-j6vmY3NqDswp7v9682H+/MxMGtFObMxUeL9Wbiv9hYw="; + }) + (fetchpatch { + name = "3-openapi-spec-validator-upgrade.patch"; + url = "https://github.com/RonnyPfannschmidt/prance/commit/7e575781d83845d7ea0c2eff57644df9b465c7af.patch"; + hash = "sha256-rexKoQ+TH3QmP20c3bA+7BLMLc+fkVhn7xsq+gle1Aw="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" \ From 7ddee326c2b49e0da7d96801fa703fe884455871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 16:48:34 +0200 Subject: [PATCH 717/737] gromacs*: fixup paths in .pc files --- .../science/molecular-dynamics/gromacs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bababa50c59e..125283589aef 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -63,6 +63,12 @@ in stdenv.mkDerivation rec { ] ) ++ lib.optional enableCuda "-DGMX_GPU=CUDA"; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/*.pc \ + --replace '=''${prefix}//' '=/' \ + --replace "$out/$out/" "$out/" + ''; + meta = with lib; { homepage = "http://www.gromacs.org"; license = licenses.gpl2; From d713eced068d054d15af6764ace1884d1d56556d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 17:13:57 +0200 Subject: [PATCH 718/737] rocksdb: fix .pc handling in all three versions I didn't realize the same nix expression is used for different rocksdb versions. --- pkgs/development/libraries/rocksdb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 75ff462eed32..742ebe05ab73 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -58,9 +58,12 @@ stdenv.mkDerivation rec { # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format"; + # Old version doesn't ship the .pc file, new version puts wrong paths in there. postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/rocksdb.pc \ - --replace '="''${prefix}//' '="/' + if [ -f "$out"/lib/pkgconfig/rocksdb.pc ]; then + substituteInPlace "$out"/lib/pkgconfig/rocksdb.pc \ + --replace '="''${prefix}//' '="/' + fi ''; meta = with lib; { From c644ed710802dcc5318af38e43858493332a8a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 17:19:23 +0200 Subject: [PATCH 719/737] cg3: fixup paths in .pc file --- pkgs/development/interpreters/cg3/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/cg3/default.nix b/pkgs/development/interpreters/cg3/default.nix index 27db9bebcd0c..7f7a38185f9e 100644 --- a/pkgs/development/interpreters/cg3/default.nix +++ b/pkgs/development/interpreters/cg3/default.nix @@ -30,6 +30,11 @@ let cg3 = stdenv.mkDerivation rec { doCheck = true; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/cg3.pc \ + --replace '=''${prefix}//' '=/' + ''; + passthru.tests.minimal = runCommand "${pname}-test" { buildInputs = [ cg3 From 64c44b3798f25b346146bb191409eaa06437227b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 17:22:04 +0200 Subject: [PATCH 720/737] codecserver: fixup paths in .pc file --- pkgs/applications/audio/codecserver/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/applications/audio/codecserver/default.nix index 8a5c3d842d4d..d1bcf82115ef 100644 --- a/pkgs/applications/audio/codecserver/default.nix +++ b/pkgs/applications/audio/codecserver/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ protobuf ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/codecserver.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { homepage = "https://github.com/jketterl/codecserver"; description = "Modular audio codec server"; From 5179c42f14902381e5e89b5ad95bdb4b290114d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 17:24:05 +0200 Subject: [PATCH 721/737] csdr: fixup paths in .pc file --- pkgs/applications/radio/csdr/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index db4efe4b1ef8..5fc3f900da66 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { libsamplerate ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/csdr.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { broken = stdenv.isDarwin; homepage = "https://github.com/jketterl/csdr"; From a2a2ffbd50e825f40e089dda217860e2c146029d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 17:40:10 +0200 Subject: [PATCH 722/737] dsdcc: fixup paths in .pc file --- pkgs/development/libraries/dsdcc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/development/libraries/dsdcc/default.nix index 5eb4c8dc4640..a992eac27cb0 100644 --- a/pkgs/development/libraries/dsdcc/default.nix +++ b/pkgs/development/libraries/dsdcc/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { "-DUSE_MBELIB=ON" ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/libdsdcc.pc \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { description = "Digital Speech Decoder (DSD) rewritten as a C++ library"; homepage = "https://github.com/f4exb/dsdcc"; From 23b3d4fb8ef995d956989e3ec13dfb5def1a88ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 17:48:17 +0200 Subject: [PATCH 723/737] folly: fix paths in .pc file --- pkgs/development/libraries/folly/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 0f866eeb9ec9..116d3c9ce40d 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -59,6 +59,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/libfolly.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + # folly-config.cmake, will `find_package` these, thus there should be # a way to ensure abi compatibility. passthru = { From 9e8bf24e48a0364d16660c485f2e33d01f6c6eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 17:48:27 +0200 Subject: [PATCH 724/737] rtrlib: fix paths in .pc file --- pkgs/development/libraries/rtrlib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/rtrlib/default.nix b/pkgs/development/libraries/rtrlib/default.nix index bb0aec308ae8..05429a72fb66 100644 --- a/pkgs/development/libraries/rtrlib/default.nix +++ b/pkgs/development/libraries/rtrlib/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libssh openssl ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/rtrlib.pc \ + --replace '=''${prefix}//' '=/' + ''; + meta = with lib; { description = "An open-source C implementation of the RPKI/Router Protocol client"; homepage = "https://github.com/rtrlib/rtrlib"; From ad0a72fe94af4585b763462d630099fd1765b73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 17:53:42 +0200 Subject: [PATCH 725/737] the-foundation: fixup paths in .pc file --- pkgs/development/libraries/the-foundation/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index 012d13964c4b..95c8653a4663 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { buildInputs = [ curl libunistring openssl pcre zlib ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/the_Foundation.pc \ + --replace '="''${prefix}//' '="/' + ''; + meta = with lib; { description = "Opinionated C11 library for low-level functionality"; homepage = "https://git.skyjake.fi/skyjake/the_Foundation"; From 9db13aa27d5400300f6194d7f545c03866113b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 18:03:44 +0200 Subject: [PATCH 726/737] libsurvive: fixup paths in more .pc files --- pkgs/development/libraries/libsurvive/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 429c4bb33d96..dc282886b963 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { # https://github.com/cntools/libsurvive/issues/272 postPatch = '' substituteInPlace survive.pc.in \ + libs/cnkalman/cnkalman.pc.in libs/cnkalman/libs/cnmatrix/cnmatrix.pc.in \ --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; From 7e40546eb69814ebbba47cc51c047c9834d55e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 18:08:11 +0200 Subject: [PATCH 727/737] miniz: fixup paths in .pc file --- pkgs/development/libraries/miniz/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/development/libraries/miniz/default.nix index d390a019a52a..8592dc5f1224 100644 --- a/pkgs/development/libraries/miniz/default.nix +++ b/pkgs/development/libraries/miniz/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + postFixup = '' + substituteInPlace "$out"/share/pkgconfig/miniz.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { description = "Single C source file zlib-replacement library"; homepage = "https://github.com/richgel999/miniz"; From ccce3fcb58e000354835dda97fb0183585e2a213 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Sep 2022 18:13:22 +0200 Subject: [PATCH 728/737] python3Packages.grpcio-tools: relax protobuf constraint --- pkgs/development/python-modules/grpcio-tools/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 9fdcdce48927..d386deb44221 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "1178f2ea531f80cc2027ec64728df6ffc8e98cf1df61652a496eafd612127183"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'protobuf>=3.12.0, < 4.0dev' 'protobuf' + ''; + outputs = [ "out" "dev" ]; enableParallelBuilding = true; From 07de498c7770ae499466fffc935e9fe1588fd715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 18:24:32 +0200 Subject: [PATCH 729/737] Revert "rnp: fix path in pkg-config file" This reverts commit d5f218a228a9406286dc34b4e522c987fa48be50. The patch was included, probably since update in commit 74f8cdc5552a. --- pkgs/tools/security/rnp/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/tools/security/rnp/default.nix index 9336db040bee..7d96c4f60e26 100644 --- a/pkgs/tools/security/rnp/default.nix +++ b/pkgs/tools/security/rnp/default.nix @@ -5,7 +5,6 @@ , bzip2 , cmake , fetchFromGitHub -, fetchpatch , gnupg , gtest , json_c @@ -25,15 +24,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-KHItrpuKXaLGF1mcpju/RJFnm2yPZyYq4eIoRGqf5Y8="; }; - # in master post 0.16.0, see https://github.com/rnpgp/rnp/issues/1835 - patches = [ - (fetchpatch { - name = "fix-pkg-config.patch"; - url = "https://github.com/rnpgp/rnp/commit/de9856c94ea829cad277800ee03ec52e30993d8e.patch"; - sha256 = "1vd83fva7lhmvqnvsrifqb2zdhfrbx84lf3l9i0hcph0k8h3ddx9"; - }) - ]; - buildInputs = [ zlib bzip2 json_c botan2 ]; cmakeFlags = [ From c45e994e4a94f87079beaa21ac0a4e090f96027e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 18:26:30 +0200 Subject: [PATCH 730/737] osl: fixup paths in .pc files --- pkgs/development/compilers/osl/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 3accbf63abe3..0fbb0eff2382 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -67,6 +67,11 @@ in stdenv.mkDerivation rec { zlib ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/*.pc \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Advanced shading language for production GI renderers"; From dbe80452b1ecfbae0bf08e72f5990d8f4df01aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 18:39:05 +0200 Subject: [PATCH 731/737] python3Packages.qscintilla: add setuptools --- pkgs/development/python-modules/qscintilla-qt5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 3e43b0d069ca..46622bc3e991 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -17,7 +17,7 @@ in buildPythonPackage rec { disabled = !isPy3k; - nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ]; + nativeBuildInputs = [ sip qmake pyqt-builder qscintilla pythonPackages.setuptools ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; From 5b8ead57a35b560af57b984d48d770d7c1dd94af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Sep 2022 18:44:38 +0200 Subject: [PATCH 732/737] valhalla: fixup paths in .pc file --- pkgs/development/libraries/valhalla/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix index dded351d3105..1052277f6f37 100644 --- a/pkgs/development/libraries/valhalla/default.nix +++ b/pkgs/development/libraries/valhalla/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { "-DENABLE_BENCHMARKS=OFF" ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/libvalhalla.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { description = "Open Source Routing Engine for OpenStreetMap"; homepage = "https://valhalla.readthedocs.io/"; From c9b98fe8b18d90d37b2316712ae61099a6bf3707 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Sep 2022 18:53:34 +0200 Subject: [PATCH 733/737] protobuf3_19: 3.19.4 -> 3.19.5 https://github.com/protocolbuffers/protobuf/security/advisories/GHSA-8gq9-2x98-w8hf Fixes: CVE-2022-1941 --- pkgs/development/libraries/protobuf/3.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix index e47bb62e736a..8e8674f15041 100644 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ b/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.19.4"; - sha256 = "sha256-mxQ8XonVgctfaNAyd3vqQHMLHVnkjBa9EObk47vxH24="; + version = "3.19.5"; + sha256 = "sha256-C5ZfPXHtUtNjPGS4tbswCwVH1gjd6A64KtIR16DgHzQ="; } From b399ddeab59bb7c2b8605af944e840f25bf3c7b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Sep 2022 18:54:15 +0200 Subject: [PATCH 734/737] protobuf3_20: 3.20.1 -> 3.20.2 https://github.com/protocolbuffers/protobuf/security/advisories/GHSA-8gq9-2x98-w8hf Fixes: CVE-2022-1941 --- pkgs/development/libraries/protobuf/3.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix index 93d180159b87..d518e7298e9f 100644 --- a/pkgs/development/libraries/protobuf/3.20.nix +++ b/pkgs/development/libraries/protobuf/3.20.nix @@ -1,6 +1,6 @@ { callPackage, abseil-cpp, ... }: callPackage ./generic-v3.nix { - version = "3.20.1"; - sha256 = "sha256-pAMacD0UQetqysZHszu5slPqp0iREtDmHFv1cgcUBJA="; + version = "3.20.2"; + sha256 = "sha256-7hLTIujvYIGRqBQgPHrCq0XOh0GJrePBszXJnBFaXVM="; } From d9550c1681d7eb4824e623473039b5645ae2264c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Sep 2022 18:58:10 +0200 Subject: [PATCH 735/737] protobuf3_21: 3.21.2 -> 3.21.6 https://github.com/protocolbuffers/protobuf/security/advisories/GHSA-8gq9-2x98-w8hf Fixes: CVE-2022-1941 --- pkgs/development/libraries/protobuf/3.21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix index 70c6095ae7b6..c23afb9138f5 100644 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ b/pkgs/development/libraries/protobuf/3.21.nix @@ -1,6 +1,6 @@ { callPackage, abseil-cpp, ... }: callPackage ./generic-v3-cmake.nix { - version = "3.21.2"; - sha256 = "sha256-DUv07pWiZV7jNeSA2ClDOz9DY0x/hiJynxkbSTeJOSs="; + version = "3.21.6"; + sha256 = "sha256-6Omd2O/eIZIgod3YV+zIIv+GqT+trith6+eepFEJIWM="; } From 9b5f227a9395a86571e60fa8777db9371413680c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Sep 2022 19:36:48 +0200 Subject: [PATCH 736/737] protobuf3_11: remove No consumers and does not receive updates anymore and therefore probably vulnerable to CVE-2022-1941 and others. --- pkgs/development/libraries/protobuf/3.11.nix | 6 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 pkgs/development/libraries/protobuf/3.11.nix diff --git a/pkgs/development/libraries/protobuf/3.11.nix b/pkgs/development/libraries/protobuf/3.11.nix deleted file mode 100644 index c5d8b21b1ac4..000000000000 --- a/pkgs/development/libraries/protobuf/3.11.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.11.4"; - sha256 = "00g61f1yd8z5l0z0svmr3hms38ph35lcx2y7hivw6fahslw0l8yw"; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 59eae3c73470..83b5e9449f2a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -938,6 +938,7 @@ mapAliases ({ prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 + protobuf3_11 = throw "protobuf3_11 does not receive updates anymore and has been removed"; # Added 2022-09-28 proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15 pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4e36332fdf8..6523716351ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21309,7 +21309,6 @@ with pkgs; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { }; protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; - protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { }; protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; From 5a18fc74cfb4fac3083efd8d7a18d000334a890f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 29 Sep 2022 10:05:16 +0300 Subject: [PATCH 737/737] Revert "python3Packages.billiard: 4.0.0 -> 4.0.2" Breaks tests for Celery. This reverts commit e21f3eacf34a220d192ace9a5002da2af624e839. --- pkgs/development/python-modules/billiard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 919c5daba2f4..303d334936c6 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "billiard"; - version = "4.0.2"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jUFd+FrDG5dXlxJaxIZJL+TF5OJx07DfdWHrI0YsmwM="; + sha256 = "sha256-NE2aHX063fFx6yxZbJ6Y0e/4Gw4D8fk5iTmjUYyiY6k="; }; checkInputs = [