Merge #172729: staging-next 2022-05-12

nixos/modules/services/networking/wg-quick.nix

@@ -211,7 +211,7 @@ let
       postUp =
             optional (values.privateKeyFile != null) "wg set ${name} private-key <(cat ${values.privateKeyFile})" ++
             (concatMap (peer: optional (peer.presharedKeyFile != null) "wg set ${name} peer ${peer.publicKey} preshared-key <(cat ${peer.presharedKeyFile})") values.peers) ++
-            optional (values.postUp != null) values.postUp;
+            optional (values.postUp != "") values.postUp;
       postUpFile = if postUp != [] then writeScriptFile "postUp.sh" (concatMapStringsSep "\n" (line: line) postUp) else null;
       preDownFile = if values.preDown != "" then writeScriptFile "preDown.sh" values.preDown else null;
       postDownFile = if values.postDown != "" then writeScriptFile "postDown.sh" values.postDown else null;

pkgs/applications/finance/odoo/default.nix

@@ -93,7 +93,7 @@ in python.pkgs.buildPythonApplication rec {
   makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ];
 
   propagatedBuildInputs = with python.pkgs; [
-    Babel
+    babel
     chardet
     decorator
     docutils

pkgs/applications/misc/plover/default.nix

@@ -48,7 +48,7 @@
     postPatch = "sed -i /PyQt5/d setup.cfg";
 
     checkInputs           = [ pytest mock ];
-    propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ];
+    propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools ];
 
     dontWrapQtApps = true;
 

pkgs/applications/misc/safeeyes/default.nix

@@ -25,7 +25,7 @@ in buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python3Packages; [
-    Babel
+    babel
     psutil
     xlib
     pygobject3

pkgs/applications/networking/opsdroid/default.nix

@@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = with python3Packages; [
-    click Babel opsdroid_get_image_size slackclient webexteamssdk bleach
+    click babel opsdroid_get_image_size slackclient webexteamssdk bleach
     parse emoji puremagic yamale nbformat websockets pycron nbconvert
     aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex
     mattermostdriver setuptools voluptuous ibm-watson tailer multidict

pkgs/applications/office/fava/default.nix

@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
   nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
 
   propagatedBuildInputs = with python3.pkgs; [
-    Babel
+    babel
     beancount
     cheroot
     click

pkgs/applications/video/screenkey/default.nix

@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
-    Babel
+    babel
     pycairo
     pygobject3
   ];

pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, gnome
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, intltool, gnome
 , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
@@ -10,12 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "reduce-build-parallelism.patch";
+      url = "https://gitlab.gnome.org/vcunat/adwaita-icon-theme/-/commit/27edeca7927eb2247d7385fccb3f0fd7787471e6.patch";
+      sha256 = "vDWuvz5yRhtn9obTtHRp6J7gJpXDZz1cajyquPGw53I=";
+    })
+  ];
+
   # For convenience, we can specify adwaita-icon-theme only in packages
   propagatedBuildInputs = [ hicolor-icon-theme ];
 
   buildInputs = [ gdk-pixbuf librsvg ];
 
-  nativeBuildInputs = [ pkg-config intltool iconnamingutils gtk3 ];
+  nativeBuildInputs = [ pkg-config autoreconfHook intltool iconnamingutils gtk3 ];
 
   dontDropIconThemeCache = true;
 

pkgs/development/compilers/go/1.17.nix

@@ -54,11 +54,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.17.9";
+  version = "1.17.10";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "sha256-djrUuvuAqSBEWMX6K45zJ/qXGu5FQlLA42LBEjYVaBM=";
+    sha256 = "sha256-KZ5VrzDxVpGwFdjc+OyuckEkElaeWy7OIDYXU6RW8vk=";
   };
 
   # perl is used for testing go vet
@@ -167,7 +167,6 @@ stdenv.mkDerivation rec {
     ./remove-test-pie-1.15.patch
     ./creds-test.patch
     ./go-1.9-skip-flaky-19608.patch
-    ./go-1.9-skip-flaky-20072.patch
     ./skip-chown-tests-1.16.patch
     ./skip-external-network-tests-1.16.patch
     ./skip-nohup-tests.patch

pkgs/development/compilers/spirv-llvm-translator/default.nix

@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
 
   checkInputs = [ lit ];
 
-  makeFlags = [ "llvm-spirv" ];
-
   cmakeFlags = [
     "-DLLVM_INCLUDE_TESTS=ON"
     "-DLLVM_DIR=${llvm_11.dev}"
@@ -37,6 +35,12 @@ stdenv.mkDerivation rec {
   # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
   doCheck = false;
 
+  makeFlags = [ "all" "llvm-spirv" ];
+
+  postInstall = ''
+    install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv
+  '';
+
   meta = with lib; {
     homepage    = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator";
     description = "A tool and a library for bi-directional translation between SPIR-V and LLVM IR";

pkgs/development/libraries/SDL2/default.nix

@@ -22,6 +22,7 @@
 , waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
 , wayland
 , wayland-protocols
+, wayland-scanner
 , drmSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
 , libdrm
 , mesa
@@ -76,9 +77,18 @@ stdenv.mkDerivation rec {
     ./find-headers.patch
   ];
 
+  postPatch = ''
+    # Fix running wayland-scanner for the build platform when cross-compiling.
+    # See comment here: https://github.com/libsdl-org/SDL/issues/4860#issuecomment-1119003545
+    substituteInPlace configure \
+      --replace '$(WAYLAND_SCANNER)' 'wayland-scanner'
+  '';
+
+  strictDeps = true;
+
   depsBuildBuild = [ pkg-config ];
 
-  nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ];
+  nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland wayland-scanner ];
 
   propagatedBuildInputs = dlopenPropagatedBuildInputs;
 

pkgs/development/libraries/atk/default.nix

@@ -1,29 +1,26 @@
-{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
-, fixDarwinDylibNames, gobject-introspection, gnome
+{ stdenv
+, lib
+, fetchurl
+, meson
+, ninja
+, gettext
+, pkg-config
+, glib
+, fixDarwinDylibNames
+, gobject-introspection
+, gnome
 }:
 
-let
-  pname = "atk";
-  version = "2.36.0";
-in
-
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv";
-  };
+  pname = "atk";
+  version = "2.38.0";
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-
-  propagatedBuildInputs = [
-    # Required by atk.pc
-    glib
-  ];
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY=";
+  };
 
   patches = [
     # meson builds an incorrect .pc file
@@ -31,6 +28,22 @@ stdenv.mkDerivation rec {
     ./fix_pc.patch
   ];
 
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    gobject-introspection
+    glib
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
+
+  propagatedBuildInputs = [
+    # Required by atk.pc
+    glib
+  ];
+
   mesonFlags = [
     "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
   ];
@@ -55,7 +68,7 @@ stdenv.mkDerivation rec {
       control running applications.
     '';
 
-    homepage = "http://library.gnome.org/devel/atk/";
+    homepage = "https://gitlab.gnome.org/GNOME/atk";
 
     license = lib.licenses.lgpl2Plus;
 

pkgs/development/libraries/dbus/default.nix

@@ -8,42 +8,26 @@
 , systemd
 , audit
 , libapparmor
-, libX11 ? null
-, libICE ? null
-, libSM ? null
-, x11Support ? (stdenv.isLinux || stdenv.isDarwin)
 , dbus
 , docbook_xml_dtd_44
 , docbook-xsl-nons
 , xmlto
 , autoreconfHook
 , autoconf-archive
+, x11Support ? (stdenv.isLinux || stdenv.isDarwin)
+, xorg
 }:
 
 stdenv.mkDerivation rec {
   pname = "dbus";
-  version = "1.12.20";
+  version = "1.14.0";
 
   src = fetchurl {
-    url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
-    sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp";
+    url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz";
+    sha256 = "sha256-zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q=";
   };
 
   patches = [
-    # 'generate.consistent.ids=1' ensures reproducible docs, for further details see
-    # http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
-    # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189,
-    # expected in version 1.14
-    ./docs-reproducible-ids.patch
-    # AC_PATH_XTRA doesn't seem to find X11 libs even though libX11 seems
-    # to provide valid pkg-config files. This replace AC_PATH_XTRA with
-    # PKG_CHECK_MODULES.
-    # MR merged cf https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/212/diffs?commit_id=23880a181e82ee7f
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/6bfaea0707ba1a7788c4b6d30c18fb094f3a1dd4.patch";
-      sha256 = "1d8ay55n2ksw5faqx3hsdpfni3xl3gq9hnjl65073xcfnx67x8d2";
-    })
-
     # Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS.
     # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302
     (fetchpatch {
@@ -68,6 +52,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "lib" "doc" "man" ];
 
+  strictDeps = true;
   nativeBuildInputs = [
     autoreconfHook
     autoconf-archive
@@ -82,11 +67,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    lib.optionals x11Support [
+    lib.optionals x11Support (with xorg; [
       libX11
       libICE
       libSM
-    ] ++ lib.optional enableSystemd systemd
+    ]) ++ lib.optional enableSystemd systemd
     ++ lib.optionals stdenv.isLinux [ audit libapparmor ];
   # ToDo: optional selinux?
 
@@ -104,7 +89,8 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
     "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
   ] ++ lib.optional (!x11Support) "--without-x"
-  ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ];
+  ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ]
+  ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemd}/bin/systemctl" ];
 
   NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
 

pkgs/development/libraries/dbus/docs-reproducible-ids.patch

@@ -1,15 +0,0 @@
-diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in
---- dbus-1.12.20-original/doc/Makefile.in	2020-07-02 12:10:41.000000000 +0200
-+++ dbus-1.12.20-hacked2/doc/Makefile.in	2020-11-07 09:57:15.297694773 +0100
-@@ -870,8 +870,10 @@
- .PRECIOUS: Makefile
- 
- 
-+# 'generate.consistent.ids=1' ensures reproducible docs, for further details see
-+# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html
- @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
--@DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) html-nochunks $<
-+@DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $<
- 
- @DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml
- @DBUS_XML_DOCS_ENABLED_TRUE@	$(XMLTO) man $<

pkgs/development/libraries/fribidi/default.nix

@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "fribidi";
-  version = "1.0.11";
+  version = "1.0.12";
 
   outputs = [ "out" "devdoc" ];
 
   # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
   src = fetchurl {
     url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-MPk+nGPuYn0aLO3PWaw01FvzAkCYL5nkTG4BVGa05z0=";
+    sha256 = "sha256-DNIz+X/IxnuzrCfOhEDe9dP/rPUWdluRwsxlRJgpNJU=";
   };
 
   postPatch = ''

pkgs/development/libraries/gettext/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz }:
+{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -47,12 +47,14 @@ stdenv.mkDerivation rec {
     sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
   '';
 
+  strictDeps = true;
   nativeBuildInputs = [
     xz
     xz.bin
   ];
+  buildInputs = [ bash ]
   # HACK, see #10874 (and 14664)
-  buildInputs = lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
+    ++ lib.optionals (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) [ libiconv ];
 
   setupHooks = [
     ../../../build-support/setup-hooks/role.bash

pkgs/development/libraries/glibc/common.nix

@@ -44,7 +44,7 @@
 
 let
   version = "2.34";
-  patchSuffix = "-115";
+  patchSuffix = "-210";
   sha256 = "sha256-RNJqH+ILiFOkj0cOrQHkJ56GmsFJsZXdpORKGV2YGrI=";
 in
 
@@ -63,7 +63,7 @@ stdenv.mkDerivation ({
     [
       /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
           $ git fetch --all -p && git checkout origin/release/2.34/master && git describe
-          glibc-2.34-115-gd5d1c95aaf
+          glibc-2.34-210-ge123f08ad5
           $ git show --minimal --reverse glibc-2.34.. | gzip -9n --rsyncable - > 2.34-master.patch.gz
 
          To compare the archive contents zdiff can be used.

pkgs/development/libraries/gstreamer/base/default.nix

@@ -5,7 +5,6 @@
 , meson
 , ninja
 , gettext
-, gobject-introspection
 , python3
 , gstreamer
 , orc
@@ -37,6 +36,8 @@
 , enableCdparanoia ? (!stdenv.isDarwin)
 , cdparanoia
 , glib
+, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
+, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
@@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
     sha256 = "0162ly7pscymq6bsf1d5fva2k9s16zvfwyi1q6z4yfd97d0sdn4n";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [
     meson
     ninja
@@ -58,10 +60,11 @@ stdenv.mkDerivation rec {
     gettext
     orc
     glib
-    gobject-introspection
-
+    gstreamer
     # docs
     # TODO add hotdoc here
+  ] ++ lib.optionals withIntrospection [
+    gobject-introspection
   ] ++ lib.optional enableWayland wayland;
 
   buildInputs = [
@@ -88,6 +91,8 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals enableWayland [
     wayland
     wayland-protocols
+  ] ++ lib.optionals withIntrospection [
+    gobject-introspection
   ] ++ lib.optional enableCocoa Cocoa
     ++ lib.optional enableCdparanoia cdparanoia;
 
@@ -101,8 +106,8 @@ stdenv.mkDerivation rec {
     "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
     # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
     "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
+    "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
   ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    "-Dintrospection=disabled"
     "-Dtests=disabled"
   ]
   ++ lib.optional (!enableX11) "-Dx11=disabled"

pkgs/development/libraries/gstreamer/core/default.nix

@@ -4,7 +4,6 @@
 , ninja
 , pkg-config
 , gettext
-, gobject-introspection
 , bison
 , flex
 , python3
@@ -17,6 +16,8 @@
 , bash-completion
 , lib
 , CoreServices
+, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
+, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
     sha256 = "0cghi6n4nhdbajz3wqcgbh5xm94myvnqgsi9g2bz9n1s9904l2fy";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [
     meson
     ninja
@@ -47,11 +49,14 @@ stdenv.mkDerivation rec {
     python3
     makeWrapper
     glib
-    gobject-introspection
     bash-completion
 
     # documentation
     # TODO add hotdoc here
+  ] ++ lib.optionals stdenv.isLinux [
+    libcap # for setcap binary
+  ] ++ lib.optionals withIntrospection [
+    gobject-introspection
   ];
 
   buildInputs = [
@@ -60,6 +65,8 @@ stdenv.mkDerivation rec {
     libcap
     libunwind
     elfutils
+  ] ++ lib.optionals withIntrospection [
+    gobject-introspection
   ] ++ lib.optionals stdenv.isDarwin [
     CoreServices
   ];
@@ -72,8 +79,7 @@ stdenv.mkDerivation rec {
     "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
     "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
     "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
-  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    "-Dintrospection=disabled"
+    "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
   ] ++ lib.optionals stdenv.isDarwin [
     # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it.
     "-Dlibunwind=disabled"

pkgs/development/libraries/http-parser/default.nix

@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error";
   patches = [
     ./build-shared.patch
+  ] ++ lib.optionals stdenv.isAarch32 [
     # https://github.com/nodejs/http-parser/pull/510
     (fetchpatch {
       url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch";

pkgs/development/libraries/kerberos/krb5.nix

@@ -19,11 +19,11 @@ in
 with lib;
 stdenv.mkDerivation rec {
   pname = "${type}krb5";
-  version = "1.19.2";
+  version = "1.19.3";
 
   src = fetchurl {
     url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz";
-    sha256 = "0snz1jm2w4dkk65zcz953jmmv9mqa30fanch2bk8r3rs9vp3yi8h";
+    sha256 = "1l6wp58zav37g03n2ig5qr0pslz38gh5cxgigbmxkjfxrxilil2n";
   };
 
   outputs = [ "out" "dev" ];

pkgs/development/libraries/libbsd/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libbsd";
-  version = "0.11.5";
+  version = "0.11.6";
 
   src = fetchurl {
     url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "sha256-GpyVJSVjXBu2dwyyLpabk42Oap15EjYrmO6DcFmbDv0=";
+    sha256 = "sha256-GbOPMXLq9pPm4caHFGNhkMfkiFHkUiTXILO1vASZtd8=";
   };
 
   outputs = [ "out" "dev" "man" ];

pkgs/development/libraries/libclc/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages }:
+{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages, spirv-llvm-translator }:
 
 let
   llvm = llvmPackages.llvm;
@@ -7,13 +7,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libclc";
-  version = "11.0.1";
+  version = "12.0.1";
 
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "llvm-project";
     rev = "llvmorg-${version}";
-    sha256 = "0bxh43hp1vl4axl3s9n2nb2ii8x1cbq98xz9c996f8rl5jy84ags";
+    sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv";
   };
   sourceRoot = "source/libclc";
 
@@ -21,10 +21,12 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
-                'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )'
+                'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' \
+      --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \
+                'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
   '';
 
-  nativeBuildInputs = [ cmake ninja python3 ];
+  nativeBuildInputs = [ cmake ninja python3 spirv-llvm-translator ];
   buildInputs = [ llvm clang-unwrapped ];
   strictDeps = true;
   cmakeFlags = [

pkgs/development/libraries/libical/default.nix

@@ -13,7 +13,7 @@
 , python3
 , tzdata
 , fixDarwinDylibNames
-, introspectionSupport ? stdenv.buildPlatform == stdenv.hostPlatform
+, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform
 , gobject-introspection
 , vala
 }:
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-gZ6IBjG5pNKJ+hWcTzXMP7yxL4he4LTklZGoC9vXra8=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [
     cmake
     ninja
@@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # provides ical-glib-src-generator that runs during build
     libical
-  ] ++ lib.optionals introspectionSupport [
+  ] ++ lib.optionals withIntrospection [
     gobject-introspection
     vala
   ] ++ lib.optionals stdenv.isDarwin [
@@ -60,13 +61,14 @@ stdenv.mkDerivation rec {
     glib
     libxml2
     icu
+  ] ++ lib.optionals withIntrospection [
+    gobject-introspection
   ];
 
   cmakeFlags = [
     "-DENABLE_GTK_DOC=False"
-  ] ++ lib.optionals introspectionSupport [
-    "-DGOBJECT_INTROSPECTION=True"
-    "-DICAL_GLIB_VAPI=True"
+    "-DGOBJECT_INTROSPECTION=${if withIntrospection then "True" else "False"}"
+    "-DICAL_GLIB_VAPI=${if withIntrospection then "True" else "False"}"
   ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake"
   ];

pkgs/development/libraries/libnotify/default.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libnotify";
-  version = "0.7.11";
+  version = "0.7.12";
 
   outputs = [ "out" "man" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "3VaC7GgiAznhHFFZt+ASIEoxjdGzaDoJxILKQhqwc3U=";
+    sha256 = "dEsrN1CBNfgmG3Vanevm4JrdQhrcdb3pMPbhmLcKtG4=";
   };
 
   mesonFlags = [

pkgs/development/libraries/pango/default.nix

@@ -24,14 +24,14 @@
 
 stdenv.mkDerivation rec {
   pname = "pango";
-  version = "1.50.6";
+  version = "1.50.7";
 
   outputs = [ "bin" "out" "dev" ]
     ++ lib.optionals withDocs [ "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "qZi882iBw6wgSV1AvOswT06qkXW9KWfIVlZDTL2v6Go=";
+    sha256 = "BHfzaaPUxpXfcpmmmJ3ABHVqf03ifuysQFxnkLfjrTM=";
   };
 
   strictDeps = !withIntrospection;

pkgs/development/libraries/sqlite/default.nix

@@ -12,13 +12,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite${optionalString interactive "-interactive"}";
-  version = "3.38.3";
+  version = "3.38.5";
 
   # 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-YfLdk6LjjDNGi3EllnwyGL+fTdg2Xe9gJeMU+QXclC4=";
+    sha256 = "sha256-WvB96YK6ZY/ZGgMXDJRfmclx9pVbx53zJmVENz45hpw=";
   };
 
   outputs = [ "bin" "dev" "out" ];

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.38.3";
+    version = "3.38.5";
 
     # nixpkgs-update: no auto update
     src = assert version == sqlite.version; fetchurl {
       url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip";
-      sha256 = "sha256-oQTUk+CEAGvXT/H/esLrKzh8fAo7Y7pv6i+vtBGDE68=";
+      sha256 = "sha256-ZQO7WeOeyGYwg2lpQOyBjNVVUZbmylQ9QClEDMp7ANk=";
     };
 
     nativeBuildInputs = [ unzip ];

pkgs/development/python-modules/Babel/default.nix

@@ -1,24 +0,0 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytestCheckHook, freezegun }:
-
-buildPythonPackage rec {
-  pname = "Babel";
-  version = "2.9.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0";
-  };
-
-  propagatedBuildInputs = [ pytz ];
-
-  checkInputs = [ pytestCheckHook freezegun ];
-
-  doCheck = !stdenv.isDarwin;
-
-  meta = with lib; {
-    homepage = "http://babel.edgewall.org";
-    description = "A collection of tools for internationalizing Python applications";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
-  };
-}

pkgs/development/python-modules/Mako/default.nix

@@ -8,7 +8,7 @@
 , markupsafe
 
 # extras: Babel
-, Babel
+, babel
 
 # tests
 , mock
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   passthru.extras-require = {
     babel = [
-      Babel
+      babel
     ];
   };
 

pkgs/development/python-modules/Nikola/default.nix

@@ -1,6 +1,6 @@
 { lib
 , aiohttp
-, Babel
+, babel
 , blinker
 , buildPythonPackage
 , python-dateutil
@@ -51,7 +51,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     aiohttp
-    Babel
+    babel
     blinker
     python-dateutil
     docutils

pkgs/development/python-modules/Pygments/default.nix

@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, docutils
-}:
-
-buildPythonPackage rec {
-  pname = "Pygments";
-  version = "2.11.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a";
-  };
-
-  propagatedBuildInputs = [ docutils ];
-
-  # Circular dependency with sphinx
-  doCheck = false;
-  pythonImportsCheck = [ "pygments" ];
-
-  meta = {
-    homepage = "https://pygments.org/";
-    description = "A generic syntax highlighter";
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
-  };
-}

pkgs/development/python-modules/agate/default.nix

@@ -1,5 +1,5 @@
 { lib
-, Babel
+, babel
 , buildPythonPackage
 , cssselect
 , fetchFromGitHub
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    Babel
+    babel
     isodate
     leather
     parsedatetime

pkgs/development/python-modules/apache-airflow/default.nix

@@ -243,5 +243,7 @@ buildPythonPackage rec {
     homepage = "https://airflow.apache.org/";
     license = licenses.asl20;
     maintainers = with maintainers; [ bhipple costrouc ingenieroariel ];
+    # requires extremely outdated versions of multiple dependencies
+    broken = true;
   };
 }

pkgs/development/python-modules/apprise/default.nix

@@ -1,5 +1,5 @@
 { lib
-, Babel
+, babel
 , buildPythonPackage
 , click
 , cryptography
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    Babel
+    babel
     installShellFiles
   ];
 

pkgs/development/python-modules/azure-core/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27
+{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder
 , aiodns
 , aiohttp
 , flask
@@ -15,16 +15,26 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.23.1";
+  version = "1.24.0";
   pname = "azure-core";
-  disabled = isPy27;
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-KKAd+68KaBLE4qgtFkLqMJVqlznyW8d8myO5H06mjw8=";
+    sha256 = "sha256-NFsbBB+q19AgWyDVaX8dDfNEMC56qoUBkFWA/4e9C+U=";
   };
 
+  patches = [
+    # FIXME: fixes tests with new versions of flask/werkzeug
+    # upstream PR: https://github.com/Azure/azure-sdk-for-python/pull/24450
+    (fetchpatch {
+      url = "https://github.com/Azure/azure-sdk-for-python/commit/fb20b0b985f614bb7bcd84f3f5f6f3105de25fd9.patch";
+      stripLen = 3;
+      sha256 = "sha256-Gt5T/UkQT1yml8bqYbeUpimfOPlmzpN1KKKUnbU9xJw=";
+    })
+  ];
+
   propagatedBuildInputs = [
     requests
     six

pkgs/development/python-modules/babel/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytestCheckHook, freezegun }:
+
+buildPythonPackage rec {
+  pname = "babel";
+  version = "2.10.1";
+
+  src = fetchPypi {
+    pname = "Babel";
+    inherit version;
+    sha256 = "sha256-mK6soIYTPvs+HiqtA5aYdJDIQlkp3bz+BVAYT9xUzRM=";
+  };
+
+  propagatedBuildInputs = [ pytz ];
+
+  checkInputs = [ pytestCheckHook freezegun ];
+
+  doCheck = !stdenv.isDarwin;
+
+  meta = with lib; {
+    homepage = "https://babel.pocoo.org/";
+    description = "Collection of internationalizing tools";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}

pkgs/development/python-modules/babelgladeextractor/default.nix

@@ -2,7 +2,7 @@
 , isPy3k
 , buildPythonPackage
 , fetchPypi
-, Babel
+, babel
 }:
 
 buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    Babel
+    babel
   ];
 
   # SyntaxError: Non-ASCII character '\xc3' in file /build/BabelGladeExtractor-0.6.3/babelglade/tests/test_translate.py on line 20, but no encoding declared; see http://python.org/dev/peps/pep-0263/ for details

pkgs/development/python-modules/cachecontrol/default.nix

@@ -21,10 +21,11 @@ buildPythonPackage rec {
     owner = "ionrock";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-mgvL0q10UbPHY1H3tJprke5p8qNl3HNYoeLAERZTcTs=";
+    hash = "sha256-mgvL0q10UbPHY1H3tJprke5p8qNl3HNYoeLAERZTcTs=";
   };
 
   propagatedBuildInputs = [
+    lockfile
     msgpack
     requests
   ];
@@ -32,7 +33,6 @@ buildPythonPackage rec {
   checkInputs = [
     cherrypy
     mock
-    lockfile
     pytestCheckHook
   ];
 

pkgs/development/python-modules/click/default.nix

@@ -5,23 +5,21 @@
 , importlib-metadata
 , pytestCheckHook
 
-# large-rebuild downstream dependencies
+# large-rebuild downstream dependencies and applications
 , flask
 , black
-
-# applications
 , magic-wormhole
 , mitmproxy
 }:
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.1.2";
+  version = "8.1.3";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-R5cH/hTZ7JoHV2GLehAKCuTE4jb6xbf4DKaAKBQaGnI=";
+    sha256 = "sha256-doLcivswKXABZ0V16gDRgU2AjWo2r0Fagr1IHTe6e44=";
   };
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [

pkgs/development/python-modules/delorean/default.nix

@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, Babel
+, babel
 , humanize
 , python-dateutil
 , tzlocal
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "0d31ay7yq2w7xz7m3ssk5phjbm64b2k8hmgcif22719k29p7hrzy";
   };
 
-  propagatedBuildInputs = [ Babel humanize python-dateutil tzlocal ];
+  propagatedBuildInputs = [ babel humanize python-dateutil tzlocal ];
 
   pythonImportsCheck = [ "delorean" ];
 

pkgs/development/python-modules/djangorestframework/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, django, isPy27 }:
+{ lib, buildPythonPackage, fetchFromGitHub, django, pytz, isPy27 }:
 
 buildPythonPackage rec {
   version = "3.12.4";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   # Test settings are missing
   doCheck = false;
 
-  propagatedBuildInputs = [ django ];
+  propagatedBuildInputs = [ django pytz ];
 
   meta = with lib; {
     description = "Web APIs for Django, made easy";

pkgs/development/python-modules/flask-babel/default.nix

@@ -3,7 +3,7 @@
 , python
 , fetchPypi
 , flask
-, Babel
+, babel
 , jinja2
 , pytz
 , speaklater
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     flask
-    Babel
+    babel
     jinja2
     pytz
     speaklater

pkgs/development/python-modules/flask-babelex/default.nix

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , flask
-, Babel
+, babel
 , speaklater
 , jinja2
 , pytest
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     flask
-    Babel
+    babel
     speaklater
     jinja2
   ];

pkgs/development/python-modules/flask-security-too/default.nix

@@ -3,7 +3,7 @@
 , fetchPypi
 
 # extras: babel
-, Babel
+, babel
 , flask-babel
 
 # extras: common
@@ -65,7 +65,7 @@ buildPythonPackage rec {
 
   passthru.extras-require = {
     babel = [
-      Babel
+      babel
       flask-babel
     ];
     common = [

pkgs/development/python-modules/flask/default.nix

@@ -13,12 +13,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.1.1";
+  version = "2.1.2";
   pname = "Flask";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-qMm9PlWOyZZG0Xepc5xB3x3tBilIC0yNKXVBLzyVGcg=";
+    sha256 = "sha256-MV3tLd+KYoFWftsnOTAQ/jQGGIuvv+ZaMznVeH2J5Hc=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/flaskbabel/default.nix

@@ -4,7 +4,7 @@
 , flask
 , jinja2
 , speaklater
-, Babel
+, babel
 , pytz
 }:
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
   };
 
-  propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ];
+  propagatedBuildInputs = [ flask jinja2 speaklater babel pytz ];
 
   meta = with lib; {
     description = "Adds i18n/l10n support to Flask applications";

pkgs/development/python-modules/func-timeout/default.nix

@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "func-timeout";
+  version = "4.3.5";
+
+  src = fetchPypi {
+    pname = "func_timeout";
+    inherit version;
+    sha256 = "74cd3c428ec94f4edfba81f9b2f14904846d5ffccc27c92433b8b5939b5575dd";
+  };
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "func_timeout" ];
+
+  meta = with lib; {
+    description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads";
+    homepage = "https://github.com/kata198/func_timeout";
+    license = licenses.lgpl3Only;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}

pkgs/development/python-modules/gruut/default.nix

@@ -3,7 +3,7 @@
 , callPackage
 , pythonOlder
 , fetchFromGitHub
-, Babel
+, babel
 , gruut-ipa
 , dateparser
 , jsonlines
@@ -54,7 +54,7 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [
-    Babel
+    babel
     gruut-ipa
     jsonlines
     num2words

pkgs/development/python-modules/ihatemoney/default.nix

@@ -5,7 +5,7 @@
 , fetchPypi
 , alembic
 , aniso8601
-, Babel
+, babel
 , blinker
 , cachetools
 , click
@@ -54,7 +54,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     aniso8601
-    Babel
+    babel
     blinker
     cachetools
     click

pkgs/development/python-modules/jinja2/default.nix

@@ -3,24 +3,24 @@
 , buildPythonPackage
 , pythonOlder
 , fetchPypi
-, Babel
+, babel
 , markupsafe
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "Jinja2";
-  version = "3.1.1";
+  version = "3.1.2";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ZAvtS7UBy9FxlLPKzh3CEm9bYZzwaKcmuYGSoP3nSuk=";
+    sha256 = "sha256-MTUacCpAip51laj8YVD8P0O7a/fjGXcMvA2535Q36FI=";
   };
 
   propagatedBuildInputs = [
-    Babel
+    babel
     markupsafe
   ];
 

pkgs/development/python-modules/jsonschema/default.nix

@@ -4,9 +4,7 @@
 , fetchPypi
 , importlib-metadata
 , importlib-resources
-, pyperf
 , pyrsistent
-, pytestCheckHook
 , pythonOlder
 , setuptools-scm
 , twisted
@@ -15,16 +13,20 @@
 
 buildPythonPackage rec {
   pname = "jsonschema";
-  version = "4.4.0";
+  version = "4.5.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83";
+    sha256 = "sha256-fG2IJhk0DDNHob9zFeFH5tPa5DkDOuY4PWrLkIwQHfw=";
   };
 
+  postPatch = ''
+    patchShebangs json/bin/jsonschema_suite
+  '';
+
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [
@@ -42,18 +44,21 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pyperf
-    pytestCheckHook
     twisted
   ];
 
+  checkPhase = ''
+    export JSON_SCHEMA_TEST_SUITE=json
+    trial jsonschema
+  '';
+
   pythonImportsCheck = [
     "jsonschema"
   ];
 
   meta = with lib; {
     description = "An implementation of JSON Schema validation for Python";
-    homepage = "https://github.com/Julian/jsonschema";
+    homepage = "https://github.com/python-jsonschema/jsonschema";
     license = licenses.mit;
     maintainers = with maintainers; [ domenkozar ];
   };

pkgs/development/python-modules/jupyterlab_server/default.nix

@@ -6,7 +6,7 @@
 , requests
 , pytestCheckHook
 , pyjson5
-, Babel
+, babel
 , jupyter_server
 , openapi-core
 , pytest-tornasync
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     rm -r tests/translations/
   '';
 
-  propagatedBuildInputs = [ requests jsonschema pyjson5 Babel jupyter_server ];
+  propagatedBuildInputs = [ requests jsonschema pyjson5 babel jupyter_server ];
 
   checkInputs = [
     openapi-core

pkgs/development/python-modules/kajiki/default.nix

@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, Babel
+, babel
 , pytz
 , nine
 , pytestCheckHook
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "f0d6dfa27eb2b6c0d2a28ae21d69dceb5363cc0432f4045bcc98aac42a662ccb";
   };
 
-  propagatedBuildInputs = [ Babel pytz nine ];
+  propagatedBuildInputs = [ babel pytz nine ];
   checkInputs = [ pytestCheckHook ];
 
   meta = with lib; {

pkgs/development/python-modules/lektor/default.nix

@@ -1,5 +1,5 @@
 { lib
-, Babel
+, babel
 , buildPythonPackage
 , click
 , exifread
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    Babel
+    babel
     click
     exifread
     filetype

pkgs/development/python-modules/m2r/default.nix

@@ -1,5 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi,
-  mistune, docutils } :
+{ lib
+, buildPythonPackage
+, fetchPypi
+, docutils
+, mistune
+, pygments
+}:
+
 buildPythonPackage rec {
   pname = "m2r";
   version = "0.2.1";
@@ -9,16 +15,19 @@ buildPythonPackage rec {
     sha256 = "bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99";
   };
 
+  postPatch = ''
+    substituteInPlace tests/test_cli.py \
+      --replace "optional" "positional"
+  '';
+
   propagatedBuildInputs = [ mistune docutils ];
 
-  # Some tests interfeere with each other (test.md and test.rst are
-  # deleted by some tests and not properly regenerated)
-  doCheck = false;
+  checkInputs = [ pygments ];
 
   meta = with lib; {
     homepage = "https://github.com/miyakogi/m2r";
-    description = "converts a markdown file including reST markups to a valid reST format";
+    description = "Markdown to reStructuredText converter";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }

pkgs/development/python-modules/markdown/default.nix

@@ -9,14 +9,16 @@
 
 buildPythonPackage rec {
   pname = "markdown";
-  version = "3.3.6";
+  version = "3.3.7";
 
   disabled = pythonOlder "3.6";
 
+  format = "setuptools";
+
   src = fetchPypi {
     pname = "Markdown";
     inherit version;
-    sha256 = "sha256-dt+K4yKU7Dnc+JNAOCiC36Epdfh/RcPtHs2x6M78cAY=";
+    sha256 = "cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874";
   };
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
@@ -29,6 +31,8 @@ buildPythonPackage rec {
     ${python.interpreter} -m unittest discover
   '';
 
+  pythonImportsCheck = [ "markdown" ];
+
   meta = with lib; {
     description = "A Python implementation of John Gruber's Markdown with Extension support";
     homepage = "https://github.com/Python-Markdown/markdown";

pkgs/development/python-modules/mkdocs-material/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonApplication rec {
   pname = "mkdocs-material";
-  version = "8.2.11";
+  version = "8.2.15";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonApplication rec {
     owner = "squidfunk";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-YAXdIA36QWwdQxTux6Sy/F0j8lprSO+5/VezFcsGQYg=";
+    hash = "sha256-6x3ENFPGmtRDMV6YRGlTLCYusmX49LrGBDwicg8sDB0=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/mkdocs/default.nix

@@ -16,7 +16,7 @@
 , pyyaml-env-tag
 , watchdog
   # testing deps
-, Babel
+, babel
 , mock
 , pytestCheckHook
 }:
@@ -47,7 +47,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    Babel
+    babel
     mock
   ];
 

pkgs/development/python-modules/pip-api/default.nix

@@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pip
+, pretend
+, pytestCheckHook
+, pythonOlder
+, virtualenv
+}:
+
+buildPythonPackage rec {
+  pname = "pip-api";
+  version = "0.0.29";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-9wFYTrHD4BAhyEb4nWKauTc7ZiTwYmdXd0rVT8TClXE=";
+  };
+
+  propagatedBuildInputs = [
+    pip
+  ];
+
+  checkInputs = [
+    pretend
+    pytestCheckHook
+    virtualenv
+  ];
+
+  pythonImportsCheck = [
+    "pip_api"
+  ];
+
+  disabledTests = [
+    "test_hash"
+    "test_hash_default_algorithm_is_256"
+    "test_installed_distributions"
+    "test_invoke_install"
+    "test_invoke_uninstall"
+    "test_isolation"
+  ];
+
+  meta = with lib; {
+    description = "Importable pip API";
+    homepage = "https://github.com/di/pip-api";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/pkgconfig/default.nix

@@ -26,12 +26,9 @@ buildPythonPackage rec {
     sha256 = "sha256-uuLUGRNLCR3NS9g6OPCI+qG7tPWsLhI3OE5WmSI3vm8=";
   };
 
-  patches = [ ./executable.patch ];
-
   postPatch = ''
-    rm pkgconfig/pkgconfig.py.orig
     substituteInPlace pkgconfig/pkgconfig.py \
-      --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"'
+      --replace "pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config'" "pkg_config_exe = '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'"
 
     # those pc files are missing and pkg-config validates that they exist
     substituteInPlace data/fake-openssl.pc \
@@ -40,8 +37,6 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ poetry-core ];
 
-  propagatedNativeBuildInputs = [ pkg-config ];
-
   checkInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "pkgconfig" ];

pkgs/development/python-modules/pkgconfig/executable.patch

@@ -1,38 +0,0 @@
-commit d8e0bac0c0d831510683939ec7a7b5bd72192423
-Author: Frederik Rietdijk <fridh@fridh.nl>
-Date:   Sat Jan 5 11:38:28 2019 +0100
-
-    Have a top-level attribute for the executable
-
-diff --git a/pkgconfig/pkgconfig.py b/pkgconfig/pkgconfig.py
-index 3deb97f..e7c5561 100644
---- a/pkgconfig/pkgconfig.py
-+++ b/pkgconfig/pkgconfig.py
-@@ -30,6 +30,9 @@ from functools import wraps
- from subprocess import call, PIPE, Popen
- 
- 
-+PKG_CONFIG_EXE = "pkg-config"
-+
-+
- def _compare_versions(v1, v2):
-     """
-     Compare two version strings and return -1, 0 or 1 depending on the equality
-@@ -65,7 +68,7 @@ def _convert_error(func):
- 
- @_convert_error
- def _query(package, *options):
--    pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config'
-+    pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE
-     cmd = '{0} {1} {2}'.format(pkg_config_exe, ' '.join(options), package)
-     proc = Popen(shlex.split(cmd), stdout=PIPE, stderr=PIPE)
-     out, err = proc.communicate()
-@@ -84,7 +87,7 @@ def exists(package):
- 
-     If ``pkg-config`` not on path, raises ``EnvironmentError``.
-     """
--    pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config'
-+    pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE
-     cmd = '{0} --exists {1}'.format(pkg_config_exe, package).split()
-     return call(cmd) == 0
- 

pkgs/development/python-modules/platformdirs/default.nix

@@ -2,17 +2,17 @@
 , appdirs
 , buildPythonPackage
 , fetchFromGitHub
-, platformdirs
 , pytest-mock
 , pytestCheckHook
 , pythonOlder
-, setuptools-scm
+, hatchling
+, hatch-vcs
 }:
 
 buildPythonPackage rec {
   pname = "platformdirs";
-  version = "2.5.1";
-  format = "setuptools";
+  version = "2.5.2";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -20,13 +20,14 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-z6WIwTWLlc/chNRxt3dqqa/IxYj1BBTcQ6OcfliHrvA=";
+    sha256 = "sha256-c7gGgqOUVYA6wYU4+nQsYYw4Gn+DpMoIq2nP8nEdPcg=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [
-    setuptools-scm
+    hatchling
+    hatch-vcs
   ];
 
   checkInputs = [

pkgs/development/python-modules/pretend/default.nix

@@ -1,19 +1,36 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "pretend";
   version = "1.0.9";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "alex";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-OqMfeIMFNBBLq6ejR3uOCIHZ9aA4zew7iefVlAsy1JQ=";
   };
 
-  # No tests in archive
-  doCheck = false;
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pretend"
+  ];
 
   meta = with lib; {
+    description = "Module for stubbing";
     homepage = "https://github.com/alex/pretend";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/development/python-modules/pygments/default.nix

@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, docutils
+, lxml
+, pytestCheckHook
+, wcag-contrast-ratio
+}:
+
+let pygments = buildPythonPackage
+  rec {
+    pname = "pygments";
+    version = "2.12.0";
+
+    src = fetchPypi {
+      pname = "Pygments";
+      inherit version;
+      sha256 = "sha256-XrEWEY+WEv8e6JrJZDe7a0no8E2KE7UUuib2ICCOJus=";
+    };
+
+    propagatedBuildInputs = [
+      docutils
+    ];
+
+    # circular dependencies if enabled by default
+    doCheck = false;
+    checkInputs = [
+      lxml
+      pytestCheckHook
+      wcag-contrast-ratio
+    ];
+
+    disabledTestPaths = [
+      # 5 lines diff, including one nix store path in 20000+ lines
+      "tests/examplefiles/bash/ltmain.sh"
+    ];
+
+    pythonImportsCheck = [ "pygments" ];
+
+    passthru.tests = {
+      check = pygments.overridePythonAttrs (_: { doCheck = true; });
+    };
+
+    meta = with lib; {
+      homepage = "https://pygments.org/";
+      description = "A generic syntax highlighter";
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ SuperSandro2000 ];
+    };
+  };
+in pygments

pkgs/development/python-modules/pygobject/3.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pygobject";
-  version = "3.42.0";
+  version = "3.42.1";
 
   outputs = [ "out" "dev" ];
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "mxJhbjLPx5L53IQdnEcqQaNbhbpn06brQn4wem/kNns=";
+    sha256 = "HzS192JN415E61p+tCg1MoW9AwBNVRMaX39/qbkPPMk=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/pymdown-extensions/default.nix

@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
+, hatchling
 , pytestCheckHook
 , markdown
 , pyyaml
@@ -38,26 +38,17 @@ let
 in
 buildPythonPackage rec {
   pname = "pymdown-extensions";
-  version = "9.1";
+  version = "9.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "facelessuser";
     repo = "pymdown-extensions";
     rev = version;
-    sha256 = "sha256-II8Po8144h3wPFrzMbOB/qiCm2HseYrcZkyIZFGT+ek=";
+    sha256 = "sha256-9oYLDerz6ZcE4QyLO4mFPuHws8oZoXX8LcSV209MFec=";
   };
 
-  patches = [
-    # this patch is needed to allow tests to pass for later versions of the
-    # markdown dependency
-    #
-    # it can be removed after the next pymdown-extensions release
-    (fetchpatch {
-      url = "https://github.com/facelessuser/pymdown-extensions/commit/8ee5b5caec8f9373e025f50064585fb9d9b71f86.patch";
-      sha256 = "sha256-jTHNcsV0zL0EkSTSj8zCGXXtpUaLnNPldmL+krZj3Gk=";
-    })
-  ];
+  nativeBuildInputs = [ hatchling ];
 
   propagatedBuildInputs = [ markdown pygments ];
 

pkgs/development/python-modules/pyparsing/default.nix

@@ -1,9 +1,7 @@
 { buildPythonPackage
 , fetchFromGitHub
 , lib
-
-# since this is a dependency of pytest, we need to avoid
-# circular dependencies
+, flit-core
 , jinja2
 , pytestCheckHook
 , railroad-diagrams
@@ -12,16 +10,21 @@
 let
   pyparsing = buildPythonPackage rec {
     pname = "pyparsing";
-    version = "3.0.7";
+    version = "3.0.9";
+    format = "pyproject";
 
     src = fetchFromGitHub {
       owner = "pyparsing";
       repo = pname;
       rev = "pyparsing_${version}";
-      sha256 = "sha256-RyvTTbFshAZgyZPgzqcq31E504RlnMZuf16jJYGqDDI=";
+      sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE=";
     };
 
-    # circular dependencies if enabled by default
+    nativeBuildInputs = [
+      flit-core
+    ];
+
+    # circular dependencies with pytest if enabled by default
     doCheck = false;
     checkInputs = [
       jinja2
@@ -43,4 +46,4 @@ let
     };
   };
 in
-  pyparsing
+pyparsing

pkgs/development/python-modules/python-heatclient/default.nix

@@ -2,7 +2,7 @@
 , buildPythonApplication
 , fetchPypi
 , pbr
-, Babel
+, babel
 , cliff
 , iso8601
 , osc-lib
@@ -31,7 +31,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [
     pbr
-    Babel
+    babel
     cliff
     iso8601
     osc-lib

pkgs/development/python-modules/python-manilaclient/default.nix

@@ -13,7 +13,7 @@
 , simplejson
 , sphinx
 , sphinxcontrib-programoutput
-, Babel
+, babel
 , osc-lib
 , python-keystoneclient
 , debtcollector
@@ -45,7 +45,7 @@ buildPythonApplication rec {
     prettytable
     requests
     simplejson
-    Babel
+    babel
     osc-lib
     python-keystoneclient
     debtcollector

pkgs/development/python-modules/rich/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "rich";
-  version = "12.3.0";
+  version = "12.4.1";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "Textualize";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-/BPJcFjUldbTa/M3i9jGGU7apbrTcWbF+yrrFuLXcHY=";
+    sha256 = "sha256-6fr5mtZwXdZihoHEjF1jJxOLH3ajPX1tF2N/ZCV9g50=";
   };
 
   nativeBuildInputs = [ poetry-core ];

pkgs/development/python-modules/sphinx/default.nix

@@ -4,7 +4,7 @@
 , pythonOlder
 , fetchFromGitHub
 # propagatedBuildInputs
-, Babel
+, babel
 , alabaster
 , docutils
 , imagesize
@@ -51,10 +51,16 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace setup.py \
       --replace "docutils>=0.14,<0.18" "docutils>=0.14"
+
+    # remove impurity caused by date inclusion 
+    # https://github.com/sphinx-doc/sphinx/blob/master/setup.cfg#L4-L6
+    substituteInPlace setup.cfg \
+      --replace "tag_build = .dev" "" \
+      --replace "tag_date = true" ""
   '';
 
   propagatedBuildInputs = [
-    Babel
+    babel
     alabaster
     docutils
     imagesize

pkgs/development/python-modules/sqlalchemy/default.nix

@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "SQLAlchemy";
-  version = "1.4.35";
+  version = "1.4.36";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-L/yBOwHcZHOZD15XXyEMpawvVGWs45CLeP/W0gBYqrU=";
+    hash = "sha256-ZGeKwyHWSkWQHvLiRyXsXng/H0pYgwXhlkMUR+es4kM=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/stack-data/default.nix

@@ -49,8 +49,10 @@ buildPythonPackage rec {
 
   disabledTests = [
     # AssertionError
-    "test_variables"
     "test_example"
+    "test_executing_style_defs"
+    "test_pygments_example"
+    "test_variables"
   ];
 
   pythonImportsCheck = [ "stack_data" ];

pkgs/development/python-modules/wcag-contrast-ratio/default.nix

@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, hypothesis
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "wcag-contrast-ratio";
+  version = "0.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-aRkrjlwKfQ3F/xGH7rPjmBQWM6S95RxpyH9Y/oftNhw=";
+  };
+
+  checkInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "test.py"
+  ];
+
+  pythonImportsCheck = [ "wcag_contrast_ratio" ];
+
+  meta = with lib; {
+    description = "Library for computing contrast ratios, as required by WCAG 2.0";
+    homepage = "https://github.com/gsnedders/wcag-contrast-ratio";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}

pkgs/development/python-modules/weboob/default.nix

@@ -1,5 +1,5 @@
 { lib
-, Babel
+, babel
 , buildPythonPackage
 , cssselect
 , feedparser
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    Babel
+    babel
     cssselect
     python-dateutil
     feedparser

pkgs/development/python-modules/werkzeug/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "werkzeug";
-  version = "2.1.0";
+  version = "2.1.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Werkzeug";
     inherit version;
-    sha256 = "sha256-m1VGaj6Z4TsfBoamYRfTm9qFqZIWbgp5rt/PNYYyj3o=";
+    sha256 = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY=";
   };
 
   propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [
@@ -63,6 +63,6 @@ buildPythonPackage rec {
       utility libraries.
     '';
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }

pkgs/development/python-modules/woob/default.nix

@@ -1,5 +1,5 @@
 { lib
-, Babel
+, babel
 , buildPythonPackage
 , colorama
 , cssselect
@@ -45,7 +45,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    Babel
+    babel
     colorama
     cssselect
     python-dateutil

pkgs/development/python-modules/wtforms/default.nix

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , markupsafe
-, Babel
+, babel
 , pytestCheckHook
 , email_validator
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb";
   };
 
-  propagatedBuildInputs = [ markupsafe Babel ];
+  propagatedBuildInputs = [ markupsafe babel ];
 
 
   checkInputs = [

pkgs/development/python-modules/zipp/default.nix

@@ -1,12 +1,13 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, more-itertools
+, func-timeout
+, jaraco_itertools
 , pythonOlder
 , setuptools-scm
 }:
 
-buildPythonPackage rec {
+let zipp = buildPythonPackage rec {
   pname = "zipp";
   version = "3.7.0";
   format = "setuptools";
@@ -22,21 +23,26 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
-    more-itertools
-  ];
-
   # Prevent infinite recursion with pytest
   doCheck = false;
 
+  checkInputs = [
+    func-timeout
+    jaraco_itertools
+  ];
+
   pythonImportsCheck = [
     "zipp"
   ];
 
+  passthru.tests = {
+    check = zipp.overridePythonAttrs (_: { doCheck = true; });
+  };
+
   meta = with lib; {
     description = "Pathlib-compatible object wrapper for zip files";
     homepage = "https://github.com/jaraco/zipp";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-}
+}; in zipp

pkgs/development/python2-modules/sphinx/default.nix

@@ -13,7 +13,7 @@
 , jinja2
 , pygments
 , alabaster
-, Babel
+, babel
 , snowballstemmer
 , six
 , sqlalchemy
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     jinja2
     pygments
     alabaster
-    Babel
+    babel
     setuptools
     snowballstemmer
     six

pkgs/development/tools/bashate/default.nix

@@ -1,5 +1,5 @@
 { lib
-, Babel
+, babel
 , buildPythonApplication
 , fetchPypi
 , fixtures
@@ -21,7 +21,7 @@ buildPythonApplication rec {
   };
 
   propagatedBuildInputs = [
-    Babel
+    babel
     pbr
     setuptools
   ];

pkgs/development/tools/fdroidserver/default.nix

@@ -27,7 +27,7 @@ python.pkgs.buildPythonApplication rec {
     install -m 0755 gradlew-fdroid $out/bin
   '';
 
-  buildInputs = [ python.pkgs.Babel ];
+  buildInputs = [ python.pkgs.babel ];
 
   propagatedBuildInputs = with python.pkgs; [
     androguard

pkgs/development/tools/misc/autoconf/2.13.nix

@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh";
   };
 
-  buildInputs = [ m4 perl ];
+  nativeBuildInputs = [ m4 perl ];
+  strictDeps = true;
 
   doCheck = true;
 

pkgs/development/tools/misc/autoconf/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, m4, perl }:
+{ lib, stdenv, fetchurl, m4, perl, texinfo }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -8,6 +8,7 @@
 stdenv.mkDerivation rec {
   pname = "autoconf";
   version = "2.71";
+  outputs = [ "out" "doc" ];
 
   src = fetchurl {
     url = "mirror://gnu/autoconf/autoconf-${version}.tar.xz";
@@ -19,8 +20,15 @@ stdenv.mkDerivation rec {
     ./2.71-fix-race.patch
   ];
 
-  nativeBuildInputs = [ m4 perl ];
+  nativeBuildInputs = [ m4 perl texinfo ];
   buildInputs = [ m4 ];
+  postBuild = "
+    make html
+  ";
+
+  postInstall = "
+    make install-html
+  ";
 
   # Work around a known issue in Cygwin.  See
   # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for

pkgs/development/tools/misc/elfutils/default.nix

@@ -2,16 +2,17 @@
 , musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs
 , argp-standalone
 , enableDebuginfod ? false, sqlite, curl, libmicrohttpd_0_9_70, libarchive
+, gitUpdater
 }:
 
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   pname = "elfutils";
-  version = "0.186";
+  version = "0.187";
 
   src = fetchurl {
     url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-f2+5FJsWc9ONkXig0+D7ih7E9TqfTC/4lGlgmHlkEXc=";
+    sha256 = "sha256-5wsN++YQ+QxNH+DXGvFCpOJcPE7566uNLXK2UVnUVMg=";
   };
 
   patches = [
@@ -62,10 +63,6 @@ stdenv.mkDerivation rec {
 
   propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
 
-  NIX_CFLAGS_COMPILE = lib.optionals stdenv.hostPlatform.isMusl [
-    "-Wno-null-dereference"
-  ];
-
   configureFlags = [
     "--program-prefix=eu-" # prevent collisions with binutils
     "--enable-deterministic-archives"
@@ -81,6 +78,12 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.hostPlatform.isMusl;
   doInstallCheck = !stdenv.hostPlatform.isMusl;
 
+  passthru.updateScript = gitUpdater {
+    inherit pname version;
+    url = "https://sourceware.org/git/elfutils.git";
+    rev-prefix = "elfutils-";
+  };
+
   meta = with lib; {
     homepage = "https://sourceware.org/elfutils/";
     description = "A set of utilities to handle ELF objects";

pkgs/development/tools/pip-audit/default.nix

@@ -0,0 +1,83 @@
+{ lib
+, fetchFromGitHub
+, fetchpatch
+, python3
+}:
+
+let
+  py = python3.override {
+    packageOverrides = self: super: {
+
+      # ansible doesn't support resolvelib > 0.6.0 and can't have an override
+      resolvelib = super.resolvelib.overridePythonAttrs (oldAttrs: rec {
+        version = "0.8.1";
+        src = fetchFromGitHub {
+          owner = "sarugaku";
+          repo = "resolvelib";
+          rev = version;
+          sha256 = "1qpd0gg9yl0kbamlgjs9pkxd39kx511kbc92civ77v0ka5sw8ca0";
+        };
+      });
+    };
+  };
+in
+with py.pkgs;
+
+buildPythonApplication rec {
+  pname = "pip-audit";
+  version = "2.2.1";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "trailofbits";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-ji61783imVlvoBaDMTxQwbf1L1G4lJbOFZ1FjcNOT/8=";
+  };
+
+  propagatedBuildInputs = [
+    cachecontrol
+    cyclonedx-python-lib
+    html5lib
+    packaging
+    pip-api
+    progress
+    resolvelib
+  ];
+
+  checkInputs = [
+    pretend
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pip_audit"
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d);
+  '';
+
+  disabledTestPaths = [
+    # Tests require network access
+    "test/dependency_source/test_requirement.py"
+    "test/dependency_source/test_resolvelib.py"
+    "test/service/test_pypi.py"
+    "test/service/test_osv.py"
+  ];
+
+  disabledTests = [
+    # Tests requrire network access
+    "test_get_pip_cache"
+    "test_virtual_env"
+    "test_pyproject_source"
+    "test_pyproject_source_duplicate_deps"
+  ];
+
+  meta = with lib; {
+    description = "Tool for scanning Python environments for known vulnerabilities";
+    homepage = "https://github.com/trailofbits/pip-audit";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix

@@ -2346,7 +2346,7 @@ lib.composeManyExtensions [
       });
 
       wtforms = super.wtforms.overridePythonAttrs (old: {
-        buildInputs = (old.buildInputs or [ ]) ++ [ self.Babel ];
+        buildInputs = (old.buildInputs or [ ]) ++ [ self.babel ];
       });
 
     }

pkgs/misc/rich-cli/default.nix

@@ -1,15 +1,18 @@
 { lib
+, fetchFromGitHub
 , python3
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "rich-cli";
-  version = "1.7.0";
+  version = "1.8.0";
   format = "pyproject";
 
-  src = python3.pkgs.fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk=";
+  src = fetchFromGitHub {
+    owner = "Textualize";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -26,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'rich = "^12.3.0"' 'rich = "*"'
+      --replace 'rich = "^12.4.0"' 'rich = "*"'
   '';
 
   pythonImportsCheck = [

pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, buildPackages
-, appleDerivation', cpio, xnu, Libc, Libm, libdispatch, Libinfo
+, appleDerivation', xnu, Libc, Libm, libdispatch, Libinfo
 , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto
 , copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libplatform, libpthread
 , mDNSResponder, launchd, libutilHeaders, hfsHeaders, darling, darwin-stubs
@@ -11,15 +11,21 @@ appleDerivation' stdenv {
   dontBuild = true;
   dontFixup = true;
 
-  nativeBuildInputs = [ cpio ];
-
   installPhase = ''
     export NIX_ENFORCE_PURITY=
 
     mkdir -p $out/lib $out/include
 
+    function copyHierarchy () {
+      mkdir -p $1
+      while read f; do
+        mkdir -p $1/$(dirname $f)
+        cp --parents -pn $f $1
+      done
+    }
+
     # Set up our include directories
-    (cd ${xnu}/include && find . -name '*.h' -or -name '*.defs' | cpio -pdm $out/include)
+    (cd ${xnu}/include && find . -name '*.h' -or -name '*.defs' | copyHierarchy $out/include)
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h        $out/include
 
@@ -28,10 +34,10 @@ appleDerivation' stdenv {
                ${CommonCrypto} ${copyfile} ${removefile} ${libresolvHeaders} \
                ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} \
                ${libutilHeaders} ${libpthread} ${hfsHeaders}; do
-      (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
+      (cd $dep/include && find . -name '*.h' | copyHierarchy $out/include)
     done
 
-    (cd ${buildPackages.darwin.cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
+    (cd ${buildPackages.darwin.cctools.dev}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o)
 
     mkdir -p $out/include/os
 

pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt

@@ -71,6 +71,7 @@ architecture/i386/table.h
 architecture/i386/tss.h
 arpa/ftp.h
 arpa/inet.h
+arpa/nameser.h
 arpa/nameser_compat.h
 arpa/telnet.h
 arpa/tftp.h
@@ -956,6 +957,7 @@ mpool.h
 msgcat.h
 nameser.h
 nc_tparm.h
+ncurses.h
 ncurses_dll.h
 ndbm.h
 net/bpf.h

pkgs/os-specific/linux/audit/default.nix

@@ -2,7 +2,7 @@
   lib, stdenv, buildPackages, fetchurl, fetchpatch,
   runCommand,
   autoreconfHook,
-  autoconf, automake, libtool,
+  autoconf, automake, libtool, bash,
   # Enabling python support while cross compiling would be possible, but
   # the configure script tries executing python to gather info instead of
   # relying on python3-config exclusively
@@ -21,9 +21,11 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "man" ];
 
+  strictDeps = true;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = lib.optionals enablePython [ python3 swig ];
+  nativeBuildInputs = [ autoreconfHook ]
+    ++ lib.optionals enablePython [ python3 swig ];
+  buildInputs = [ bash ];
 
   configureFlags = [
     # z/OS plugin is not useful on Linux,

pkgs/os-specific/linux/bluez/default.nix

@@ -138,6 +138,7 @@ in stdenv.mkDerivation rec {
       filename=$(basename $files)
       install -Dm755 tools/$filename $out/bin/$filename
     done
+    install -Dm755 attrib/gatttool $out/bin/gatttool
   '';
 
   enableParallelBuilding = true;

pkgs/os-specific/linux/systemd/default.nix

@@ -178,6 +178,13 @@ stdenv.mkDerivation {
     # need (AFAICT).
     # See https://github.com/systemd/systemd/pull/20479 for upstream discussion.
     ./0019-core-handle-lookup-paths-being-symlinks.patch
+
+    # fixes reproducability of dbus xml files
+    # Should no longer be necessary with v251.
+    (fetchpatch {
+      url = "https://github.com/systemd/systemd/pull/22174.patch";
+      sha256 = "sha256-RVhxUEUiISgRlIP/AhU+w1VHfDQw2W16cFl2TXXyxno=";
+    })
   ] ++ lib.optional stdenv.hostPlatform.isMusl (
     let
       oe-core = fetchzip {
@@ -641,12 +648,6 @@ stdenv.mkDerivation {
   '';
 
   postInstall = ''
-    # sysinit.target: Don't depend on
-    # systemd-tmpfiles-setup.service. This interferes with NixOps's
-    # send-keys feature (since sshd.service depends indirectly on
-    # sysinit.target).
-    mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
-
     mkdir -p $out/example/systemd
     mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
     mv $out/lib/systemd/{system,user} $out/example/systemd

pkgs/servers/mail/mailman/hyperkitty.nix

@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 , pythonOlder
 
@@ -40,6 +41,15 @@ buildPythonPackage rec {
     sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y=";
   };
 
+  patches = [
+    # FIXME: backport Python 3.10 support fix, remove for next release
+    (fetchpatch {
+      url = "https://gitlab.com/mailman/hyperkitty/-/commit/551a44a76e46931fc5c1bcb341235d8f579820be.patch";
+      sha256 = "sha256-5XCrvyrDEqH3JryPMoOXSlVVDLQ+PdYBqwGYxkExdvk=";
+      includes = [ "hyperkitty/*" ];
+    })
+  ];
+
   postPatch = ''
     # isort is a development dependency
     sed -i '/isort/d' setup.py

pkgs/servers/web-apps/netbox/default.nix

@@ -9,36 +9,7 @@
 let
   py = python3.override {
     packageOverrides = self: super: {
-      django = super.django_3;
-      jsonschema = super.jsonschema.overridePythonAttrs (old: rec {
-        version = "3.2.0";
-        src = self.fetchPypi {
-          pname = old.pname;
-          inherit version;
-          sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a";
-        };
-      });
-      lxml = super.lxml.overridePythonAttrs (old: rec {
-        version = "4.6.5";
-        src = self.fetchPypi {
-          pname = old.pname;
-          inherit version;
-          sha256 = "6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca";
-        };
-      });
-      werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
-        version = "2.0.3";
-        src = self.fetchPypi {
-          pname = "Werkzeug";
-          inherit version;
-          sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
-        };
-      });
-      sentry-sdk = super.sentry-sdk.overridePythonAttrs (old: rec {
-        disabledTestPaths = old.disabledTestPaths ++ [
-          "tests/integrations/flask/test_flask.py"
-        ];
-      });
+      django = super.django_4;
     };
   };
 
@@ -64,7 +35,7 @@ py.pkgs.buildPythonApplication rec {
     ];
 
     propagatedBuildInputs = with py.pkgs; [
-      django_3
+      django_4
       django-cors-headers
       django-debug-toolbar
       django-filter

pkgs/servers/web-apps/searx/default.nix

@@ -31,7 +31,7 @@ toPythonModule (buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = [
-    Babel
+    babel
     certifi
     python-dateutil
     flask

pkgs/shells/any-nix-shell/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, bash }:
 
 stdenv.mkDerivation rec {
   pname = "any-nix-shell";
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "0q27rhjhh7k0qgcdcfm8ly5za6wm4rckh633d0sjz87faffkp90k";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ bash ];
   installPhase = ''
     mkdir -p $out/bin
     cp -r bin $out

pkgs/shells/bash/5.1.nix

@@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
     "--disable-nls"
   ];
 
+  strictDeps = true;
   # Note: Bison is needed because the patches above modify parse.y.
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ bison ]
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
     if interactive
     then ''
       substituteInPlace "$out/bin/bashbug" \
-        --replace '${stdenv.shell}' "$out/bin/bash"
+        --replace '#!/bin/sh' "#!$out/bin/bash"
     ''
     # most space is taken by locale data
     else ''