diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index 61e9fe5096b..0b3815d0cc6 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/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; diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index 66b1bb0f97f..7f312479144 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -47,7 +47,7 @@ buildPythonApplication rec { makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ]; propagatedBuildInputs = [ - Babel + babel chardet decorator docutils diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 8f4bf10b100..5a8055b0815 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/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; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index c188e5f7853..4a063eb8edd 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -25,7 +25,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - Babel + babel psutil xlib pygobject3 diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index ff6760d3daa..9b5b27e7ca4 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/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 diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 5833e5e4adf..c702c02c147 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/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 diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 4377b255fd9..f854054b3b6 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - Babel + babel pycairo pygobject3 ]; diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index d9180e9001d..1483660d1ec 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/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 diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 3ae837ac46b..b0ba8508fc3 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/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"; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 502a981596e..7493eac59dc 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -181,12 +181,22 @@ let exclude+='\)' buildGoDir() { - local d; local cmd; - cmd="$1" - d="$2" + local cmd="$1" dir="$2" + . $TMPDIR/buildFlagsArray + + declare -a flags + flags+=($buildFlags "''${buildFlagsArray[@]}") + flags+=(''${tags:+-tags=${lib.concatStringsSep "," tags}}) + flags+=(''${ldflags:+-ldflags="$ldflags"}) + flags+=("-v" "-p" "$NIX_BUILD_CORES") + + if [ "$cmd" = "test" ]; then + flags+=($checkFlags) + fi + local OUT - if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then + if ! OUT="$(go $cmd "''${flags[@]}" $dir 2>&1)"; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then echo "$OUT" >&2 return 1 @@ -244,7 +254,7 @@ let runHook preCheck for pkg in $(getGoDirs test); do - buildGoDir test $checkFlags "$pkg" + buildGoDir test "$pkg" done runHook postCheck diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 0559f7f07a7..643c1955d2b 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -160,12 +160,22 @@ let exclude+='\)' buildGoDir() { - local d; local cmd; - cmd="$1" - d="$2" + local cmd="$1" dir="$2" + . $TMPDIR/buildFlagsArray + + declare -a flags + flags+=($buildFlags "''${buildFlagsArray[@]}") + flags+=(''${tags:+-tags=${lib.concatStringsSep "," tags}}) + flags+=(''${ldflags:+-ldflags="$ldflags"}) + flags+=("-v" "-p" "$NIX_BUILD_CORES") + + if [ "$cmd" = "test" ]; then + flags+=($checkFlags) + fi + local OUT - if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then + if ! OUT="$(go $cmd "''${flags[@]}" $dir 2>&1)"; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then echo "$OUT" >&2 return 1 @@ -225,7 +235,7 @@ let runHook preCheck for pkg in $(getGoDirs test); do - buildGoDir test $checkFlags "$pkg" + buildGoDir test "$pkg" done runHook postCheck diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 1ce2b1525f0..0112748695e 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/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; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 08e6e5b0e41..ce3352b5751 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,36 +1,49 @@ -{ 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 +stdenv.mkDerivation rec { pname = "atk"; - version = "2.36.0"; -in + version = "2.38.0"; -stdenv.mkDerivation rec { - name = "${pname}-${version}"; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY="; }; - outputs = [ "out" "dev" ]; + patches = [ + # meson builds an incorrect .pc file + # glib should be Requires not Requires.private + ./fix_pc.patch + ]; - nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gobject-introspection + glib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; propagatedBuildInputs = [ # Required by atk.pc glib ]; - patches = [ - # meson builds an incorrect .pc file - # glib should be Requires not Requires.private - ./fix_pc.patch - ]; - 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; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 6e3a6ed5b30..e7852949249 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/dbus/docs-reproducible-ids.patch b/pkgs/development/libraries/dbus/docs-reproducible-ids.patch deleted file mode 100644 index 2356b64d95c..00000000000 --- a/pkgs/development/libraries/dbus/docs-reproducible-ids.patch +++ /dev/null @@ -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 $< diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 3549368fecb..3dae39b3c38 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/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 = '' diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 22acc73c49c..a1270af259c 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/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 diff --git a/pkgs/development/libraries/glibc/2.34-master.patch.gz b/pkgs/development/libraries/glibc/2.34-master.patch.gz index 8fb02ca6d72..b7aa7518c37 100644 Binary files a/pkgs/development/libraries/glibc/2.34-master.patch.gz and b/pkgs/development/libraries/glibc/2.34-master.patch.gz differ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index bf77f6abaa3..91c3d55926a 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/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. diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index a6942445fc5..599e6586ea0 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/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" diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index dcb4fcaef93..c5f836f26a4 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/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" diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index e1251b0e942..bbb11522dee 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/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" ]; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 8c8e47b98a4..b8f6aac0b38 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/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" ]; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index c634892944c..3f6e12291a3 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 77c595c9184..02c02b607e5 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/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" ]; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index de3f2141c2e..5cf79781a7d 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index f3d3587c14f..dbf494374cb 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { pname = "libpcap"; version = "1.10.1"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz"; sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ="; @@ -27,6 +29,8 @@ stdenv.mkDerivation rec { if [ "$dontDisableStatic" -ne "1" ]; then rm -f $out/lib/libpcap.a fi + + moveToOutput "bin/pcap-config" "$dev" ''; meta = { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ee79d537059..13dd24b5482 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/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; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 726ccff02bb..7677406874a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/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" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index d112515c8e9..b804fcbfd65 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.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 ]; diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix deleted file mode 100644 index 3143a800768..00000000000 --- a/pkgs/development/python-modules/Babel/default.nix +++ /dev/null @@ -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; [ ]; - }; -} diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index d7b350b9f96..5eca80d98a5 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/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 ]; }; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index c95283acda5..b15f07bfcae 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix deleted file mode 100644 index af125e1f40e..00000000000 --- a/pkgs/development/python-modules/Pygments/default.nix +++ /dev/null @@ -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; [ ]; - }; -} diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 04266bc3d88..29f58063648 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 5bccffea292..cf532aedd24 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix new file mode 100644 index 00000000000..14633062f36 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index b1516d1abdb..bd6baccbde4 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index d074183e79d..bee126fbf16 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index a75f563862a..81bcf03130e 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/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") [ diff --git a/pkgs/development/python-modules/delorean/default.nix b/pkgs/development/python-modules/delorean/default.nix index 3435b461d09..847a5c6e5ad 100644 --- a/pkgs/development/python-modules/delorean/default.nix +++ b/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" ]; diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 602564d1626..a538327650b 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/flask-babelex/default.nix b/pkgs/development/python-modules/flask-babelex/default.nix index cdcb400983b..4a7294540e1 100644 --- a/pkgs/development/python-modules/flask-babelex/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index c3d98e405f3..2732ae23465 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 997a28de1e9..e4ded57576e 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix index d15950bba9a..a0e42e60c2e 100644 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ b/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"; diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix new file mode 100644 index 00000000000..f20f5dde8b4 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index 5078c6fdb39..ccaf7b6f038 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 5092175b50c..459ebe5ad51 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 29b08df8e0f..8f9113c98de 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index dd2a47f1bcb..202e047dd8e 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/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 ]; }; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index e612cfaeab0..3fde727d148 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 6dd55a4876f..76289816a2a 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/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; { diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 600304f48a1..4688b7394cc 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 35331c14b08..fd148382617 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/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 ]; }; } diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 2c91e46d13d..7207edb5815 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/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"; diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 13604bc975a..2345ca93f94 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix new file mode 100644 index 00000000000..5e4412dcf85 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 105beaccb9b..6721390d7ab 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/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" ]; diff --git a/pkgs/development/python-modules/pkgconfig/executable.patch b/pkgs/development/python-modules/pkgconfig/executable.patch deleted file mode 100644 index 79fca7a44f1..00000000000 --- a/pkgs/development/python-modules/pkgconfig/executable.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit d8e0bac0c0d831510683939ec7a7b5bd72192423 -Author: Frederik Rietdijk -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 - diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 584d9361fb7..e04b40bc1e4 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index 87e0e6613b1..0134b0dc36a 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/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; [ ]; }; } diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix new file mode 100644 index 00000000000..c8759a2fe05 --- /dev/null +++ b/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 diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index dec84b4eccf..447d49a9442 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index fb5abc5c352..3d10fca06c0 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index d78682a8c66..dc1694b83e8 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 09dc46ba955..76527971834 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 4def2f46317..765ef5ba7d5 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 020cf5c143a..4639cf43d31 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index b6e800a7ed3..0bed203007c 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.35"; + version = "1.4.36"; src = fetchPypi { inherit pname version; - hash = "sha256-L/yBOwHcZHOZD15XXyEMpawvVGWs45CLeP/W0gBYqrU="; + hash = "sha256-ZGeKwyHWSkWQHvLiRyXsXng/H0pYgwXhlkMUR+es4kM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index eb9879a4bf0..7f319333cac 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/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" ]; diff --git a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix new file mode 100644 index 00000000000..c7b7e9bc9e8 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 4d0373105cc..094dcb3bfbd 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index f961d0359db..aaaecc6098f 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/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 ]; }; } diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 3c9529c2644..a681b523a32 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 48764d509fe..95f9d2df65c 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 0f64df2a56a..253962910ac 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/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 diff --git a/pkgs/development/python2-modules/sphinx/default.nix b/pkgs/development/python2-modules/sphinx/default.nix index 0424b9b4c39..80dec053108 100644 --- a/pkgs/development/python2-modules/sphinx/default.nix +++ b/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 diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index 76e523170ca..9b6d9361726 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/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 ]; diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 9bbe6164852..e0f9a726945 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/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 diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 4ff990ca0ed..8fba52aa1fd 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/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; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index ac342086f6c..63302c8ed94 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/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 diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index fa867c26316..a3b093c3827 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/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"; diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix new file mode 100644 index 00000000000..8f700761d16 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index a04e2d65385..cf23225baa5 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -2379,7 +2379,7 @@ lib.composeManyExtensions [ }); wtforms = super.wtforms.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.Babel ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.babel ]; }); } diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index 17ea9ffee6e..68996e4e457 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/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 = [ diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 86c91e9b55c..6f8124dbac4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/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 diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt index 09b0ab41045..cdca44c7292 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt +++ b/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 diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 6d14a3293fc..bda8d8ab30c 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/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, diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 1d93174ec65..3805f99e0a5 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/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; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9e914132ef2..14d5e29c372 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/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 diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index afcded31116..5327b48d51e 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -31,7 +31,7 @@ toPythonModule (buildPythonApplication rec { ''; propagatedBuildInputs = [ - Babel + babel certifi python-dateutil flask diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix index 3bd41a53844..095347a3ca9 100644 --- a/pkgs/shells/any-nix-shell/default.nix +++ b/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 diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index a30c9a4a507..7cd7fb6905c 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/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 '' diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 6571d572a42..75ded461ea6 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1b0iz7da1sgifx1a5wdyx1kxbzys53v0kyk8nhxfipllmm5qka3k"; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook ]; # tests are super flaky unfortunately, and regularily break. diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index 089e5dfc702..c4282ab0f64 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc"; }; + strictDeps = true; # To enable lazy loading via. bash-completion we need a symlink to the script # from every command name. installPhase = '' diff --git a/pkgs/shells/bash/undistract-me/default.nix b/pkgs/shells/bash/undistract-me/default.nix index 9ed5544713d..b15903e779e 100644 --- a/pkgs/shells/bash/undistract-me/default.nix +++ b/pkgs/shells/bash/undistract-me/default.nix @@ -43,6 +43,8 @@ stdenvNoCC.mkDerivation rec { }) ]; + strictDeps = true; + # Patch in dependencies. Can't use makeWrapper because the bash # functions will be sourced and invoked in a different environment # for each command invocation. diff --git a/pkgs/shells/bash/yarn-completion/default.nix b/pkgs/shells/bash/yarn-completion/default.nix index fabfc0a1ce2..48d1f42b5ce 100644 --- a/pkgs/shells/bash/yarn-completion/default.nix +++ b/pkgs/shells/bash/yarn-completion/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0xflbrbwskjqv3knvc8jqygpvfxh5ak66q7w22d1ng8gwrfqzcng"; }; + strictDeps = true; nativeBuildInputs = [ installShellFiles ]; installPhase = '' diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index a1f789dc3a3..f33fd5520f8 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { }) ]; + strictDeps = true; # configure.ac patched; remove on next release nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix index 7a6ae67c3ae..2c98938b46d 100644 --- a/pkgs/shells/dgsh/default.nix +++ b/pkgs/shells/dgsh/default.nix @@ -41,5 +41,8 @@ stdenv.mkDerivation { license = with licenses; asl20; maintainers = with maintainers; [ vrthra ]; platforms = with platforms; all; + # lib/freadseek.c:68:3: error: #error "Please port gnulib freadseek.c to your platform! Look at the definition of getc, getc_unlocked on your > + # 68 | #error "Please port gnulib freadseek.c to your platform! Look at the definition of getc, getc_unlocked on your system, then report > + broken = true; # marked 2022-05-06 }; } diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index fc61efc3006..f0c5611e3b3 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -17,6 +17,7 @@ buildGoModule rec { vendorSha256 = "sha256-iuklI7XEQUgZ2ObYRROxyiccZ1JkajK5OJA7hIcpRZQ="; + strictDeps = true; doCheck = false; doInstallCheck = true; diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 8cc49bd39eb..308a684e6f6 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sourceRoot=. ''; - buildInputs = [ readline bison ]; + strictDeps = true; + nativeBuildInputs = [ bison ]; + buildInputs = [ readline ]; configureFlags = [ "--with-readline" ]; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 4c45fd3a75f..e9555c7f21f 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -186,6 +186,7 @@ let rm tests/pexpects/exit_handlers.py ''; + strictDeps = true; nativeBuildInputs = [ cmake gettext diff --git a/pkgs/shells/fish/oh-my-fish/default.nix b/pkgs/shells/fish/oh-my-fish/default.nix index 3ec4e3b12d7..252e9350eaf 100644 --- a/pkgs/shells/fish/oh-my-fish/default.nix +++ b/pkgs/shells/fish/oh-my-fish/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , fish +, bash , runtimeShell , writeShellScript }: @@ -17,8 +18,10 @@ stdenv.mkDerivation rec { hash = "sha256-lwMo4+PcYR9kYJPWK+ALiMfBdxFSgB2vjtSn8QrmmEA="; }; + strictDeps = true; buildInputs = [ fish + bash ]; dontConfigure = true; diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix index 12cd6c935c0..a09024608bb 100644 --- a/pkgs/shells/jush/default.nix +++ b/pkgs/shells/jush/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1azvghrh31gawd798a254ml4id642qvbva64zzg30pjszh1087n8"; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ editline ]; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 8575f6439b9..4f06225e94f 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ntCfXJUOQqL63HWoG+WJr9a+qB16AaL5zf58039t7GU="; }; + strictDeps = true; installPhase = '' install -D -m 0444 liquidprompt $out/bin/liquidprompt install -D -m 0444 liquidpromptrc-dist $out/share/doc/liquidprompt/liquidpromptrc-dist diff --git a/pkgs/shells/loksh/default.nix b/pkgs/shells/loksh/default.nix index b9f7d5ef7e7..5b304e45c5b 100644 --- a/pkgs/shells/loksh/default.nix +++ b/pkgs/shells/loksh/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q5RiY9/xEFCk+oHlxgNwDOB+TNjRWHKzU2kQH2LjCWY="; }; + strictDeps = true; nativeBuildInputs = [ meson ninja @@ -47,4 +48,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 360380e19b3..25aec71900b 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY="; }; + strictDeps = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index be87b97ebd7..2b9bc4e3e22 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vvdwzw3fq74lwgmy6xxkk01sd68fzhsw84c750lm1dma22xhjci"; }; + strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ readline ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 2b82d488278..f99c285a4f0 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; + strictDeps = true; buildInputs = lib.optional withReadline readline; configureFlags = lib.optional withReadline "--with-readline"; diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index 418a453d9e9..c56bd179c74 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-076nD0aPps6n5qkR3LQJ6Kn2g3mkov+/M0qSvxNLZ6o="; }; + strictDeps = true; + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace configure --replace "./conftest" "echo" ''; diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 431091bf8d1..c9150fda18a 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -11,6 +11,7 @@ buildDotnetPackage { sha256 = "0c4wa8qi1zs01p9ck171jkw0n1rsymsrhpsb42gl7warwhpmv59f"; }; + strictDeps = true; preConfigure = "rm -rvf $src/Source/PashConsole/bin/*"; outputFiles = [ "Source/PashConsole/bin/Release/*" ]; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 9f3dcbe1812..445dca9f4a4 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { stripRoot = false; }; + strictDeps = true; buildInputs = [ less ] ++ libraries; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isLinux autoPatchelfHook; diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index 804919665ec..b0caea99875 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0744ars6y9zzsjr9xazms91qy6bi7msg2gg87526waziahfh4s4z"; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook ]; # acinclude.m4 wants headers for tgetent(). diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index d840c3b77a5..c9560c86f24 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv }: +{ fetchurl, lib, stdenv, bash, perl }: stdenv.mkDerivation rec { pname = "rush"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ld5TdpF7siprQCbhE4oxYhH40x3QZ5NCQlD3zRaNmM0="; }; + strictDeps = true; + buildInputs = [ bash ]; + + postInstall = '' + substituteInPlace $out/bin/rush-po \ + --replace "exec perl" "exec ${lib.getExe perl}" + ''; + doCheck = true; meta = { diff --git a/pkgs/shells/scponly/default.nix b/pkgs/shells/scponly/default.nix index c0c39d8e316..f15f04cfe22 100644 --- a/pkgs/shells/scponly/default.nix +++ b/pkgs/shells/scponly/default.nix @@ -13,14 +13,15 @@ stdenv.mkDerivation { patches = [ ./scponly-fix-make.patch ]; - buildInputs = [ openssh ]; - - # Add path to sftp-server so configure finds it - preConfigure = "export PATH=$PATH:${openssh}/libexec"; + strictDeps = true; # chroot doesn't seem to work, so not enabling # rsync could also be optionally enabled - configureFlags = [ "--enable-winscp-compat" ]; + configureFlags = [ + "--enable-winscp-compat" + "scponly_PROG_SFTP_SERVER=${lib.getBin openssh}/libexec/sftp-server" + "scponly_PROG_SCP=${lib.getBin openssh}/bin/scp" + ]; postInstall = lib.optionalString (debugLevel > 0) '' mkdir -p $out/etc/scponly && echo ${ diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 4357ca605b1..4fac6eb13d6 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { hash = "sha256-YL4sUEvY8fpuQksZVkldfnztUqKslNtf0n9La/yPdPA="; }; + strictDeps = true; buildInputs = [ ncurses ]; diff --git a/pkgs/shells/yash/default.nix b/pkgs/shells/yash/default.nix index 44faf5c4e02..01340df5e9a 100644 --- a/pkgs/shells/yash/default.nix +++ b/pkgs/shells/yash/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256:1jdmj4cyzwxxyyqf20y1zi578h7md860ryffp02qi143zpppn4sm"; }; + strictDeps = true; buildInputs = [ gettext ncurses ]; meta = with lib; { diff --git a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix index 91d1bd3022b..5f9573b71aa 100644 --- a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix +++ b/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-TOfAWxw1uIV0hKV9o4EJjOlp+jmGWCONDex86ipegOY="; }; + strictDeps = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index 9a69f90dca3..ca5fbee6e36 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bmp3qf14509swpxin4j9f98n05pdilzapjm0jdzbv0dy3hn20ix"; }; + strictDeps = true; dontUnpack = true; installPhase = '' diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 5a2c0d050ce..f09a0672f19 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation { ./tz_completion.patch ]; - nativeBuildInputs = [ autoreconfHook perl groff texinfo ] + strictDeps = true; + nativeBuildInputs = [ autoreconfHook perl groff texinfo pcre] ++ lib.optionals stdenv.isLinux [ util-linux yodl ]; buildInputs = [ ncurses pcre ]; diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix index ac5cab94d4c..aa5af013e43 100644 --- a/pkgs/shells/zsh/fzf-zsh/default.nix +++ b/pkgs/shells/zsh/fzf-zsh/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1irjmxhcg1fm4g8p3psjqk7sz5qhj5kw73pyhv91njvpdhn9l26z"; }; + strictDeps = true; postPatch = '' substituteInPlace fzf-zsh.plugin.zsh \ --replace \ diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix index bf5969d1300..fa40db3603b 100644 --- a/pkgs/shells/zsh/gradle-completion/default.nix +++ b/pkgs/shells/zsh/gradle-completion/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "15b0692i3h8h7b95465b2aw9qf5qjmjag5n62347l8yl7zbhv3l2"; }; + strictDeps = true; + # we just move two files into $out, # this shouldn't bother Hydra. preferLocalBuild = true; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 538fbc0a522..feb55d9ccde 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-GEuBYN6HVAjiAbusVuEA7zBG9fIVZHLV628Jt6Cv5cM="; }; - buildInputs = [ zsh coreutils txt2tags procps ] + strictDeps = true; + nativeBuildInputs = [ txt2tags ]; + buildInputs = [ zsh coreutils procps ] ++ optional stdenv.isLinux inetutils; buildPhase = '' diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index e8d00d73d1a..eae5f77904b 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { sha256 = "0fvxnvgbcvwii7ghvpj5l43frllq71wwjvfg7cqfmic727z001dh"; }; + strictDeps = true; installPhase = '' install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme ''; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 472cc47459c..dab73419ab5 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1n9whlys95k4wc57cnz3n07p7zpkv796qkmn68a50ygkx6h3afqf"; }; + strictDeps = true; installPhase = '' mkdir -p $out/share/zsh/{site-functions,plugins/nix} cp _* $out/share/zsh/site-functions diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 447dc5da78a..84c3a1abf28 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -2,7 +2,7 @@ # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git { lib, stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts -, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: +, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { version = "2022-04-24"; @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { sha256 = "yxuvVDjNCH7r/g6ZoF8kEzwirBB0s+CRQizBwRR4Sp4="; }; + strictDeps = true; + buildInputs = [ bash ]; + installPhase = '' runHook preInstall diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 09be79d6fbc..994f223b58d 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-iuLi0o++e0PqK81AKWfIbCV0CTIxq2Oki6U2oEYsr68="; }; + strictDeps = true; installPhase = '' OUTDIR="$out/share/zsh/site-functions" mkdir -p "$OUTDIR" diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 5bdcb21f8dd..7dfbb14eec6 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-4G1+K6ENLwChtivR7Ura0vl6Ph9Wae3SOXCW1pNbgHI="; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix index 9946d7d0c3a..ca8b7ea2e46 100644 --- a/pkgs/shells/zsh/zinit/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { }; # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git dontBuild = true; + strictDeps = true; nativeBuildInputs = [ installShellFiles ]; installPhase = '' outdir="$out/share/$pname" diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/shells/zsh/zplug/default.nix index 0660bbe7e7b..c6c80ba6a13 100644 --- a/pkgs/shells/zsh/zplug/default.nix +++ b/pkgs/shells/zsh/zplug/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hci1pbs3k5icwfyfw5pzcgigbh9vavprxxvakg1xm19n8zb61b3"; }; + strictDeps = true; dontConfigure = true; dontBuild = true; dontPatch = true; diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/shells/zsh/zsh-autocomplete/default.nix index 14ea0ec8f63..a5683c43227 100644 --- a/pkgs/shells/zsh/zsh-autocomplete/default.nix +++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-+UziTYsjgpiumSulrLojuqHtDrgvuG91+XNiaMD7wIs="; }; + strictDeps = true; installPhase = '' install -D zsh-autocomplete.plugin.zsh $out/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh cp -R scripts $out/share/zsh-autocomplete/scripts diff --git a/pkgs/shells/zsh/zsh-autopair/default.nix b/pkgs/shells/zsh/zsh-autopair/default.nix index 0cc1535e53a..73b70c00405 100644 --- a/pkgs/shells/zsh/zsh-autopair/default.nix +++ b/pkgs/shells/zsh/zsh-autopair/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1h0vm2dgrmb8i2pvsgis3lshc5b0ad846836m62y8h3rdb3zmpy1"; }; + strictDeps = true; + installPhase = '' install -D autopair.zsh $out/share/zsh/${pname}/autopair.zsh ''; diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index e261cdedc74..b1df50a9c68 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1g3pij5qn2j7v7jjac2a63lxd97mcsgw6xq6k5p7835q9fjiid98"; }; + strictDeps = true; buildInputs = [ zsh ]; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/shells/zsh/zsh-bd/default.nix index f2c2dc90fb4..ebfa55ecd22 100644 --- a/pkgs/shells/zsh/zsh-bd/default.nix +++ b/pkgs/shells/zsh/zsh-bd/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "020f8nq86g96cps64hwrskppbh2dapfw2m9np1qbs5pgh16z4fcb"; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix b/pkgs/shells/zsh/zsh-better-npm-completion/default.nix index 372d49eaeb7..d9a813bbbfd 100644 --- a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix +++ b/pkgs/shells/zsh/zsh-better-npm-completion/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16z7k5n1rcl9i61lrm7i5dsqsmhvdp1y4y5ii6hv2xpp470addgy"; }; + strictDeps = true; installPhase = '' install -Dm 0644 zsh-better-npm-completion.plugin.zsh $out/share/zsh-better-npm-completion ''; diff --git a/pkgs/shells/zsh/zsh-clipboard/default.nix b/pkgs/shells/zsh/zsh-clipboard/default.nix index 114e0bfd7dc..eb395d74472 100644 --- a/pkgs/shells/zsh/zsh-clipboard/default.nix +++ b/pkgs/shells/zsh/zsh-clipboard/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { src = ./.; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index b92ced6be71..c10b67c2b3d 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq"; }; + strictDeps = true; dontUnpack = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 249826a2a25..937114e982e 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0vs14n29wvkai84fvz3dz2kqznwsq2i5fzbwpv8nsfk1126ql13i"; }; + strictDeps = true; installPhase= '' install -D --target-directory=$out/share/zsh/site-functions src/* ''; diff --git a/pkgs/shells/zsh/zsh-deer/default.nix b/pkgs/shells/zsh/zsh-deer/default.nix index ab544d7c314..0d3a6bc9ee6 100644 --- a/pkgs/shells/zsh/zsh-deer/default.nix +++ b/pkgs/shells/zsh/zsh-deer/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl"; }; + strictDeps = true; + prePatch = '' substituteInPlace deer \ --replace " perl " " ${perl}/bin/perl " diff --git a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix index 5b77978c022..68f09828b45 100644 --- a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "0h7f27gz586xxw7cc0wyiv3bx0x3qih2wwh05ad85bh2h834ar8d"; }; + strictDeps = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index be12ec147d5..5ce66fd8133 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -13,6 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-ixUnuNtxxmiigeVjzuV5uG6rIBPY/1vdBZF2/Qv0Trs="; }; + strictDeps = true; buildInputs = [ ncurses ]; postConfigure = '' diff --git a/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix b/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix index 09d2136ea26..30d26c96766 100644 --- a/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix +++ b/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "11r2mmy6bg3b6pf6qc0ml3idh333cj8yz754hrvd1sc4ipfkkqh7"; }; + strictDeps = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix index 9890993eed6..63e5fe8281e 100644 --- a/pkgs/shells/zsh/zsh-history-substring-search/default.nix +++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0y8va5kc2ram38hbk2cibkk64ffrabfv1sh4xm7pjspsba9n5p1y"; }; + strictDeps = true; installPhase = '' install -D zsh-history-substring-search.zsh \ "$out/share/zsh-history-substring-search/zsh-history-substring-search.zsh" diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/shells/zsh/zsh-nix-shell/default.nix index 8b463eda573..e46a5cf727c 100644 --- a/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgs }: +{ lib, stdenv, fetchFromGitHub, bash }: # To make use of this derivation, use # `programs.zsh.interactiveShellInit = "source ${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh";` @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-719lVo6p55G1tt3+6nMhZ904nyvlq0Q5exb0il36/Aw="; }; + strictDeps = true; + buildInputs = [ bash ]; installPhase = '' install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh-nix-shell install -D scripts/* --target-directory=$out/share/zsh-nix-shell/scripts diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 19d3e70c0a3..cdda7d81f41 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs }: +{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs, bash }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { sha256 = "0fkfh8j7rd8mkpgz6nsx4v7665d375266shl1aasdad8blgqmf0c"; }; + strictDeps = true; + buildInputs = [ bash ]; + patches = [ (substituteAll { src = ./gitstatusd.patch; diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index b681dc2d3a3..27e3a648e2b 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { sha256 = "0v1dqg9hvycdkcvklg2njff97xwr8rah0nyldv4xm39r77f4yfvq"; }; + strictDeps = true; installPhase= '' install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel9k install -D functions/* --target-directory=$out/share/zsh-powerlevel9k/functions diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index e4bbd7a8b64..6201e42c0c0 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unstableGitUpdater }: +{ lib, stdenv, fetchFromGitHub, unstableGitUpdater, bash }: stdenv.mkDerivation rec { pname = "zsh-prezto"; @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + strictDeps = true; + buildInputs = [ bash ]; + postPatch = '' # make zshrc aware of where zsh-prezto is installed sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/share/zsh-prezto/|g" runcoms/zshrc diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix index 09d6eb3cf96..ef76798ccf4 100644 --- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03r6hpb5fy4yaakqm3lbf4xcvd408r44jgpv4lnzl9asp4sb9qc0"; }; + strictDeps = true; buildInputs = [ zsh ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/pkgs/shells/zsh/zsh-system-clipboard/default.nix index b4d407a70bc..6e875b6ee08 100644 --- a/pkgs/shells/zsh/zsh-system-clipboard/default.nix +++ b/pkgs/shells/zsh/zsh-system-clipboard/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09lqav1mz5zajklr3xa0iaivhpykv3azkjb7yj9wyp0hq3vymp8i"; }; + strictDeps = true; installPhase = '' install -D zsh-system-clipboard.zsh $out/share/zsh/${pname}/zsh-system-clipboard.zsh ''; diff --git a/pkgs/shells/zsh/zsh-vi-mode/default.nix b/pkgs/shells/zsh/zsh-vi-mode/default.nix index 32f1e9c024a..73eae88b71d 100644 --- a/pkgs/shells/zsh/zsh-vi-mode/default.nix +++ b/pkgs/shells/zsh/zsh-vi-mode/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "EOYqHh0rcgoi26eopm6FTl81ehak5kXMmzNcnJDH8/E="; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix index 8019e75a859..95cdb3273c5 100644 --- a/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dz48rd66priqhxx7byndqhbmlwxi1nfw8ik25k0z5k7k754brgy"; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-z/default.nix b/pkgs/shells/zsh/zsh-z/default.nix index 9623ff6648c..a03b81cb6bf 100644 --- a/pkgs/shells/zsh/zsh-z/default.nix +++ b/pkgs/shells/zsh/zsh-z/default.nix @@ -11,6 +11,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-HnwUWqzwavh/Qox+siOe5lwTp7PBdiYx+9M0NMNFx00="; }; + strictDeps = true; dontBuild = true; installPhase = '' diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 17abb6503c9..7fa7b4e35c8 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -7,13 +7,14 @@ stdenv.mkDerivation rec { pname = "lzip"; - version = "1.22"; + version = "1.23"; + outputs = [ "out" "man" "info" ]; nativeBuildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; - sha256 = "sha256-wzQtQuZxOcFluLEo0DO1yWiToTrF8lkzGQMVIU6HqUg="; + sha256 = "sha256-R5LAR93xXvKdVbqOaKGiHgy3aS2H7N9yBEGYZFgvKA0="; }; configureFlags = [ diff --git a/pkgs/tools/misc/shellspec/default.nix b/pkgs/tools/misc/shellspec/default.nix index 27eead6e1c3..480ada8d571 100644 --- a/pkgs/tools/misc/shellspec/default.nix +++ b/pkgs/tools/misc/shellspec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, bash }: stdenv.mkDerivation rec { pname = "shellspec"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ib5qp29f2fmivwnv6hq35qhvdxz42xgjlkvy0i3qn758riyqf46"; }; + strictDeps = true; + buildInputs = [ bash ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; checkPhase = '' diff --git a/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch b/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch new file mode 100644 index 00000000000..c68f9f1d84d --- /dev/null +++ b/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch @@ -0,0 +1,51 @@ +diff --git a/lib/vquic/quiche.c b/lib/vquic/quiche.c +index bfdc966a85ea..e4bea4d677be 100644 +--- a/lib/vquic/quiche.c ++++ b/lib/vquic/quiche.c +@@ -201,23 +201,31 @@ static SSL_CTX *quic_ssl_ctx(struct Curl_easy *data) + + { + struct connectdata *conn = data->conn; +- const char * const ssl_cafile = conn->ssl_config.CAfile; +- const char * const ssl_capath = conn->ssl_config.CApath; +- + if(conn->ssl_config.verifypeer) { +- SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); +- /* tell OpenSSL where to find CA certificates that are used to verify +- the server's certificate. */ +- if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { +- /* Fail if we insist on successfully verifying the server. */ +- failf(data, "error setting certificate verify locations:" +- " CAfile: %s CApath: %s", +- ssl_cafile ? ssl_cafile : "none", +- ssl_capath ? ssl_capath : "none"); +- return NULL; ++ const char * const ssl_cafile = conn->ssl_config.CAfile; ++ const char * const ssl_capath = conn->ssl_config.CApath; ++ if(ssl_cafile || ssl_capath) { ++ SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); ++ /* tell OpenSSL where to find CA certificates that are used to verify ++ the server's certificate. */ ++ if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { ++ /* Fail if we insist on successfully verifying the server. */ ++ failf(data, "error setting certificate verify locations:" ++ " CAfile: %s CApath: %s", ++ ssl_cafile ? ssl_cafile : "none", ++ ssl_capath ? ssl_capath : "none"); ++ return NULL; ++ } ++ infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); ++ infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); + } +- infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); +- infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); ++#ifdef CURL_CA_FALLBACK ++ else { ++ /* verifying the peer without any CA certificates won't work so ++ use openssl's built-in default as fallback */ ++ SSL_CTX_set_default_verify_paths(ssl_ctx); ++ } ++#endif + } + } + return ssl_ctx; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 02ae74bd633..134ae716705 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -62,18 +62,21 @@ assert zstdSupport -> zstd != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.83.0"; + version = "7.83.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-JHx+x1IcQljmVjTlKScNIU/jKWmXHMy3KEXnqkaDH5Y="; + sha256 = "sha256-9Tmjb7RKgmDsXZd+Tg290u7intkPztqpvDyfeKETv/A="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch + # quiche: support ca-fallback + # https://github.com/curl/curl/commit/fdb5e21b4dd171a96cf7c002ee77bb08f8e58021 + ./7.83.1-quiche-support-ca-fallback.patch ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -141,15 +144,23 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. - # https://github.com/curl/curl/issues/8696 - fallback is not supported by HTTP3 - (if http3Support then "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" else "--without-ca-bundle") + "--without-ca-bundle" "--without-ca-path" ]; CXX = "${stdenv.cc.targetPrefix}c++"; CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; - doCheck = false; # expensive, fails + doCheck = true; + preCheck = '' + patchShebangs tests/ + '' + lib.optionalString stdenv.isDarwin '' + # bad interaction with sandbox if enabled? + rm tests/data/test1453 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # different resolving behaviour? + rm tests/data/test1592 + ''; postInstall = '' moveToOutput bin/curl-config "$dev" diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index d9c17f935ed..50148195754 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -44,16 +44,7 @@ stdenv.mkDerivation rec { gettext gtk-doc libxslt - # TODO: apply this to D-Bus so that other packages can benefit. - # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/202 - (dbus.overrideAttrs (attrs: { - postInstall = attrs.postInstall or "" + '' - ln -s ${fetchurl { - url = "https://gitlab.freedesktop.org/dbus/dbus/-/raw/b207135dbd8c09cf8da28f7e3b0a18bb11483663/doc/catalog.xml"; - sha256 = "1/43XwAIcmRXfM4OXOPephyQyUnW8DSveiZbiPvW72I="; - }} $out/share/xml/dbus-1/catalog.xml - ''; - })) + dbus docbook-xsl-nons docbook_xml_dtd_412 ]; diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index a94be8295ea..50a1ff98d14 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook gobject-introspection ] ++ (with python3.pkgs; [ - Babel + babel babelgladeextractor ]); diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index e82052d961b..e071f460b1a 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--ar=${stdenv.cc.targetPrefix}ar" + "--target=${stdenv.hostPlatform.config}" (lib.enableFeature enableStatic "static") (lib.enableFeature enableStatic "lib-static") ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1314ab45401..6f4b3d94d37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14489,6 +14489,8 @@ with pkgs; poetry2conda = python3Packages.callPackage ../development/python-modules/poetry2conda { }; + pip-audit = callPackage ../development/tools/pip-audit {}; + pipenv = callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a24a8e2c98f..07bc50fd84b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -37,6 +37,7 @@ mapAliases ({ ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 asyncio-nats-client = nats-py; # added 2022-02-08 + Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7439938b34..bdca43dd4f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1099,7 +1099,7 @@ in { b2sdk = callPackage ../development/python-modules/b2sdk { }; - Babel = callPackage ../development/python-modules/Babel { }; + babel = callPackage ../development/python-modules/babel { }; babelfish = callPackage ../development/python-modules/babelfish { }; @@ -3226,6 +3226,8 @@ in { ftputil = callPackage ../development/python-modules/ftputil { }; + func-timeout = callPackage ../development/python-modules/func-timeout { }; + funcparserlib = callPackage ../development/python-modules/funcparserlib { }; funcsigs = callPackage ../development/python-modules/funcsigs { }; @@ -6363,6 +6365,8 @@ in { pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; + pip-api = callPackage ../development/python-modules/pip-api { }; + pip-tools = callPackage ../development/python-modules/pip-tools { }; pip-requirements-parser = callPackage ../development/python-modules/pip-requirements-parser { }; @@ -7242,7 +7246,7 @@ in { pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; - pygments = callPackage ../development/python-modules/Pygments { }; + pygments = callPackage ../development/python-modules/pygments { }; pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; @@ -10912,6 +10916,8 @@ in { wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; + wcag-contrast-ratio = callPackage ../development/python-modules/wcag-contrast-ratio { }; + wcmatch = callPackage ../development/python-modules/wcmatch { }; wcwidth = callPackage ../development/python-modules/wcwidth { };