diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index e4e6643dd66a..76cf6e03c257 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -175,10 +175,11 @@ buildNpmPackage rec { hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM="; }; - patches = [ ./remove-prepack-script.patch ]; - npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw="; + # The prepack script runs the build script, which we'd rather do in the build phase. + npmPackFlags = [ "--ignore-scripts" ]; + NODE_OPTIONS = "--openssl-legacy-provider"; meta = with lib; { diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 1b5e9124d6a4..7d861860a723 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -994,6 +994,32 @@ Convenience function for `makeWrapper` that replaces `<\executable\>` with a wra If you will apply it multiple times, it will overwrite the wrapper file and you will end up with double wrapping, which should be avoided. +### `prependToVar` \ \ {#fun-prependToVar} + +Prepend elements to a variable. + +Example: + +```shellSession +$ configureFlags="--disable-static" +$ prependToVar configureFlags --disable-dependency-tracking --enable-foo +$ echo $configureFlags +--disable-dependency-tracking --enable-foo --disable-static +``` + +### `appendToVar` \ \ {#fun-appendToVar} + +Append elements to a variable. + +Example: + +```shellSession +$ configureFlags="--disable-static" +$ appendToVar configureFlags --disable-dependency-tracking --enable-foo +$ echo $configureFlags +--disable-static --disable-dependency-tracking --enable-foo +``` + ## Package setup hooks {#ssec-setup-hooks} Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6199f4b6ccf8..33a26278f8c6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11824,6 +11824,12 @@ githubId = 1973389; name = "Reuben D'Netto"; }; + realsnick = { + name = "Ido Samuelson"; + email = "ido.samuelson@gmail.com"; + github = "realsnick"; + githubId = 1440852; + }; redbaron = { email = "ivanov.maxim@gmail.com"; github = "redbaron"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 12023ce0797c..d6dea111b97b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -214,6 +214,17 @@ or configure your firewall. + + + llvmPackages_rocm.llvm will not contain + clang or compiler-rt. + llvmPackages_rocm.clang will not contain + llvm. + llvmPackages_rocm.clangNoCompilerRt has + been removed in favor of using + llvmPackages_rocm.clang-unwrapped. + + The Nginx module now validates the syntax of config files at @@ -271,6 +282,14 @@ that it configures the NixOS boot process, not the Nix daemon. + + + Deprecated xlibsWrapper transitional + package has been removed in favour of direct use of its + constitutents: xorg.libX11, + freetype and others. + +
@@ -475,6 +494,13 @@ system.stateVersion. + + + hip has been separated into + hip, hip-common and + hipcc. + + Resilio sync secret keys can now be provided using a secrets diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index c2ba8658d69c..beffe19c2ea7 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -59,6 +59,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall. +- `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. + - The Nginx module now validates the syntax of config files at build time. For more complex configurations (using `include` with out-of-store files notably) you may need to disable this check by setting [services.nginx.validateConfig](#opt-services.nginx.validateConfig) to `false`. - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. @@ -71,6 +73,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon. +- Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of its constitutents: `xorg.libX11`, `freetype` and others. + ## Other Notable Changes {#sec-release-23.05-notable-changes} @@ -127,6 +131,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Garage](https://garagehq.deuxfleurs.fr/) version is based on [system.stateVersion](options.html#opt-system.stateVersion), existing installations will keep using version 0.7. New installations will use version 0.8. In order to upgrade a Garage cluster, please follow [upstream instructions](https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/) and force [services.garage.package](options.html#opt-services.garage.package) or upgrade accordingly [system.stateVersion](options.html#opt-system.stateVersion). +- `hip` has been separated into `hip`, `hip-common` and `hipcc`. + - Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store. - The `firewall` and `nat` module now has a nftables based implementation. Enable `networking.nftables` to use it. diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 70e265a65a60..9c83a44d7b0e 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -33,12 +33,16 @@ with lib; ffmpeg_4 = super.ffmpeg_4-headless; ffmpeg_5 = super.ffmpeg_5-headless; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + gst_all_1 = super.gst_all_1 // { + gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableX11 = false; }; + }; gpsd = super.gpsd.override { guiSupport = false; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; - libextractor = super.libextractor.override { gstreamerSupport = false; gtkSupport = false; }; + libextractor = super.libextractor.override { gtkSupport = false; }; libva = super.libva-minimal; limesuite = super.limesuite.override { withGui = false; }; + mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; }; msmtp = super.msmtp.override { withKeyring = false; }; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix index 85e3215127fd..846ff6f3fb4f 100644 --- a/nixos/modules/hardware/printers.nix +++ b/nixos/modules/hardware/printers.nix @@ -110,21 +110,26 @@ in { }; config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) { - systemd.services.ensure-printers = let - cupsUnit = if config.services.printing.startWhenNeeded then "cups.socket" else "cups.service"; - in { + systemd.services.ensure-printers = { description = "Ensure NixOS-configured CUPS printers"; wantedBy = [ "multi-user.target" ]; - requires = [ cupsUnit ]; - after = [ cupsUnit ]; + wants = [ "cups.service" ]; + after = [ "cups.service" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; }; - script = concatMapStringsSep "\n" ensurePrinter cfg.ensurePrinters - + optionalString (cfg.ensureDefaultPrinter != null) (ensureDefaultPrinter cfg.ensureDefaultPrinter); + script = concatStringsSep "\n" [ + (concatMapStrings ensurePrinter cfg.ensurePrinters) + (optionalString (cfg.ensureDefaultPrinter != null) + (ensureDefaultPrinter cfg.ensureDefaultPrinter)) + # Note: if cupsd is "stateless" the service can't be stopped, + # otherwise the configuration will be wiped on the next start. + (optionalString (with config.services.printing; startWhenNeeded && !stateless) + "systemctl stop cups.service") + ]; }; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 75dabe772ea7..f0ee3fc93972 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1302,6 +1302,8 @@ ./system/boot/systemd/shutdown.nix ./system/boot/systemd/tmpfiles.nix ./system/boot/systemd/user.nix + ./system/boot/systemd/userdbd.nix + ./system/boot/systemd/homed.nix ./system/boot/timesyncd.nix ./system/boot/tmp.nix ./system/boot/uvesafb.nix diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 273bc796341c..4224722f8792 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -488,6 +488,9 @@ let account [success=ok ignore=ignore default=die] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so account [success=ok default=ignore] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so '' + + optionalString config.services.homed.enable '' + account sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + # The required pam_unix.so module has to come after all the sufficient modules # because otherwise, the account lookup will fail if the user does not exist # locally, for example with MySQL- or LDAP-auth. @@ -541,8 +544,10 @@ let # after it succeeds. Certain modules need to run after pam_unix # prompts the user for password so we run it once with 'optional' at an # earlier point and it will run again with 'sufficient' further down. - # We use try_first_pass the second time to avoid prompting password twice - (optionalString (cfg.unixAuth && + # We use try_first_pass the second time to avoid prompting password twice. + # + # The same principle applies to systemd-homed + (optionalString ((cfg.unixAuth || config.services.homed.enable) && (config.security.pam.enableEcryptfs || config.security.pam.enableFscrypt || cfg.pamMount @@ -553,7 +558,10 @@ let || cfg.failDelay.enable || cfg.duoSecurity.enable)) ( - '' + optionalString config.services.homed.enable '' + auth optional ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + + optionalString cfg.unixAuth '' auth optional pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth '' + optionalString config.security.pam.enableEcryptfs '' @@ -584,6 +592,9 @@ let auth required ${pkgs.duo-unix}/lib/security/pam_duo.so '' )) + + optionalString config.services.homed.enable '' + auth sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + optionalString cfg.unixAuth '' auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass '' + @@ -605,6 +616,10 @@ let auth required pam_deny.so # Password management. + '' + + optionalString config.services.homed.enable '' + password sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + '' password sufficient pam_unix.so nullok sha512 '' + optionalString config.security.pam.enableEcryptfs '' @@ -650,6 +665,9 @@ let ++ optional (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}" ++ optional (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}" )) + + optionalString config.services.homed.enable '' + session required ${config.systemd.package}/lib/security/pam_systemd_home.so + '' + optionalString cfg.makeHomeDir '' session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077 '' + @@ -1361,6 +1379,9 @@ in '' + optionalString config.virtualisation.lxc.lxcfs.enable '' mr ${pkgs.lxc}/lib/security/pam_cgfs.so + '' + + optionalString config.services.homed.enable '' + mr ${config.systemd.package}/lib/security/pam_systemd_home.so ''; }; diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh index 38312210df25..d9d2e4264dfd 100644 --- a/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup doSub() { diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ae59dcc226de..9ac89e057620 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -341,7 +341,7 @@ in systemd.sockets.cups = mkIf cfg.startWhenNeeded { wantedBy = [ "sockets.target" ]; - listenStreams = [ "/run/cups/cups.sock" ] + listenStreams = [ "" "/run/cups/cups.sock" ] ++ map (x: replaceStrings ["localhost"] ["127.0.0.1"] (removePrefix "*:" x)) cfg.listenAddresses; }; @@ -395,10 +395,7 @@ in ''} ''; - serviceConfig = { - PrivateTmp = true; - RuntimeDirectory = [ "cups" ]; - }; + serviceConfig.PrivateTmp = true; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh index 0e5af324c13f..ac573089cd5a 100644 --- a/nixos/modules/services/web-servers/jboss/builder.sh +++ b/nixos/modules/services/web-servers/jboss/builder.sh @@ -1,5 +1,6 @@ set -e +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup mkdir -p $out/bin diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index e37ed8531810..679a663362b6 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -450,7 +450,7 @@ in (mkAfter [ "systemd" ]) ]); group = (mkMerge [ - (mkAfter [ "systemd" ]) + (mkAfter [ "[success=merge] systemd" ]) # need merge so that NSS won't stop at file-based groups ]); }; diff --git a/nixos/modules/system/boot/systemd/homed.nix b/nixos/modules/system/boot/systemd/homed.nix new file mode 100644 index 000000000000..403d1690124d --- /dev/null +++ b/nixos/modules/system/boot/systemd/homed.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.homed; +in +{ + options.services.homed.enable = lib.mkEnableOption (lib.mdDoc '' + Enable systemd home area/user account manager + ''); + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = config.services.nscd.enable; + message = "systemd-homed requires the use of systemd nss module. services.nscd.enable must be set to true,"; + } + ]; + + systemd.additionalUpstreamSystemUnits = [ + "systemd-homed.service" + "systemd-homed-activate.service" + ]; + + # This is mentioned in homed's [Install] section. + # + # While homed appears to work without it, it's probably better + # to follow upstream recommendations. + services.userdbd.enable = lib.mkDefault true; + + systemd.services = { + systemd-homed = { + # These packages are required to manage encrypted volumes + path = config.system.fsPackages; + aliases = [ "dbus-org.freedesktop.home1.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + + systemd-homed-activate = { + wantedBy = [ "systemd-homed.service" ]; + }; + }; + }; +} diff --git a/nixos/modules/system/boot/systemd/userdbd.nix b/nixos/modules/system/boot/systemd/userdbd.nix new file mode 100644 index 000000000000..994aa3ca3b8c --- /dev/null +++ b/nixos/modules/system/boot/systemd/userdbd.nix @@ -0,0 +1,18 @@ +{ config, lib, ... }: + +let + cfg = config.services.userdbd; +in +{ + options.services.userdbd.enable = lib.mkEnableOption (lib.mdDoc '' + Enables the systemd JSON user/group record lookup service + ''); + config = lib.mkIf cfg.enable { + systemd.additionalUpstreamSystemUnits = [ + "systemd-userdbd.socket" + "systemd-userdbd.service" + ]; + + systemd.sockets.systemd-userdbd.wantedBy = [ "sockets.target" ]; + }; +} diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 337b5192776f..ed698b63ee63 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -146,7 +146,8 @@ in rec { (onFullSupported "nixos.tests.predictable-interface-names.predictable") (onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd") (onFullSupported "nixos.tests.predictable-interface-names.unpredictable") - (onFullSupported "nixos.tests.printing") + (onFullSupported "nixos.tests.printing-service") + (onFullSupported "nixos.tests.printing-socket") (onFullSupported "nixos.tests.proxy") (onFullSupported "nixos.tests.sddm.default") (onFullSupported "nixos.tests.shadow") diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d8d9a821ef9b..acc42acf37a6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -544,7 +544,8 @@ in { power-profiles-daemon = handleTest ./power-profiles-daemon.nix {}; pppd = handleTest ./pppd.nix {}; predictable-interface-names = handleTest ./predictable-interface-names.nix {}; - printing = handleTest ./printing.nix {}; + printing-socket = handleTest ./printing.nix { socket = true; }; + printing-service = handleTest ./printing.nix { socket = false; }; privacyidea = handleTest ./privacyidea.nix {}; privoxy = handleTest ./privoxy.nix {}; prometheus = handleTest ./prometheus.nix {}; @@ -655,6 +656,8 @@ in { systemd-shutdown = handleTest ./systemd-shutdown.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-misc = handleTest ./systemd-misc.nix {}; + systemd-userdbd = handleTest ./systemd-userdbd.nix {}; + systemd-homed = handleTest ./systemd-homed.nix {}; tandoor-recipes = handleTest ./tandoor-recipes.nix {}; taskserver = handleTest ./taskserver.nix {}; tayga = handleTest ./tayga.nix {}; diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index cfebe232d92a..7df042e72e90 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -1,19 +1,31 @@ # Test printing via CUPS. -import ./make-test-python.nix ({pkgs, ... }: -let - printingServer = startWhenNeeded: { - services.printing.enable = true; - services.printing.stateless = true; - services.printing.startWhenNeeded = startWhenNeeded; - services.printing.listenAddresses = [ "*:631" ]; - services.printing.defaultShared = true; - services.printing.extraConf = '' - - Order allow,deny - Allow from all - - ''; +import ./make-test-python.nix ( +{ pkgs +, socket ? true # whether to use socket activation +, ... +}: + +{ + name = "printing"; + meta = with pkgs.lib.maintainers; { + maintainers = [ domenkozar eelco matthewbauer ]; + }; + + nodes.server = { ... }: { + services.printing = { + enable = true; + stateless = true; + startWhenNeeded = socket; + listenAddresses = [ "*:631" ]; + defaultShared = true; + extraConf = '' + + Order allow,deny + Allow from all + + ''; + }; networking.firewall.allowedTCPPorts = [ 631 ]; # Add a HP Deskjet printer connected via USB to the server. hardware.printers.ensurePrinters = [{ @@ -22,32 +34,19 @@ let model = "drv:///sample.drv/deskjet.ppd"; }]; }; - printingClient = startWhenNeeded: { + + nodes.client = { ... }: { services.printing.enable = true; - services.printing.startWhenNeeded = startWhenNeeded; + services.printing.startWhenNeeded = socket; # Add printer to the client as well, via IPP. hardware.printers.ensurePrinters = [{ name = "DeskjetRemote"; - deviceUri = "ipp://${if startWhenNeeded then "socketActivatedServer" else "serviceServer"}/printers/DeskjetLocal"; + deviceUri = "ipp://server/printers/DeskjetLocal"; model = "drv:///sample.drv/deskjet.ppd"; }]; hardware.printers.ensureDefaultPrinter = "DeskjetRemote"; }; -in { - name = "printing"; - meta = with pkgs.lib.maintainers; { - maintainers = [ domenkozar eelco matthewbauer ]; - }; - - nodes = { - socketActivatedServer = { ... }: (printingServer true); - serviceServer = { ... }: (printingServer false); - - socketActivatedClient = { ... }: (printingClient true); - serviceClient = { ... }: (printingClient false); - }; - testScript = '' import os import re @@ -55,75 +54,69 @@ in { start_all() with subtest("Make sure that cups is up on both sides and printers are set up"): - serviceServer.wait_for_unit("cups.service") - serviceClient.wait_for_unit("cups.service") - socketActivatedClient.wait_for_unit("ensure-printers.service") + server.wait_for_unit("cups.${if socket then "socket" else "service"}") + client.wait_for_unit("cups.${if socket then "socket" else "service"}") + assert "scheduler is running" in client.succeed("lpstat -r") - def test_printing(client, server): - assert "scheduler is running" in client.succeed("lpstat -r") + with subtest("UNIX socket is used for connections"): + assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H") - with subtest("UNIX socket is used for connections"): - assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H") - with subtest("HTTP server is available too"): - client.succeed("curl --fail http://localhost:631/") - client.succeed(f"curl --fail http://{server.name}:631/") - server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/") + with subtest("HTTP server is available too"): + client.succeed("curl --fail http://localhost:631/") + client.succeed(f"curl --fail http://{server.name}:631/") + server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/") - with subtest("LP status checks"): - assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a") - assert "DeskjetLocal accepting requests" in client.succeed( - f"lpstat -h {server.name}:631 -a" - ) - client.succeed("cupsdisable DeskjetRemote") - out = client.succeed("lpq") - print(out) - assert re.search( - "DeskjetRemote is not ready.*no entries", - client.succeed("lpq"), - flags=re.DOTALL, - ) - client.succeed("cupsenable DeskjetRemote") - assert re.match( - "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL + with subtest("LP status checks"): + assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a") + assert "DeskjetLocal accepting requests" in client.succeed( + f"lpstat -h {server.name}:631 -a" + ) + client.succeed("cupsdisable DeskjetRemote") + out = client.succeed("lpq") + print(out) + assert re.search( + "DeskjetRemote is not ready.*no entries", + client.succeed("lpq"), + flags=re.DOTALL, + ) + client.succeed("cupsenable DeskjetRemote") + assert re.match( + "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL + ) + + # Test printing various file types. + for file in [ + "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", + "${pkgs.groff.doc}/share/doc/*/meref.ps", + "${pkgs.cups.out}/share/doc/cups/images/cups.png", + "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt", + ]: + file_name = os.path.basename(file) + with subtest(f"print {file_name}"): + # Print the file on the client. + print(client.succeed("lpq")) + client.succeed(f"lp {file}") + client.wait_until_succeeds( + f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'" ) - # Test printing various file types. - for file in [ - "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", - "${pkgs.groff.doc}/share/doc/*/meref.ps", - "${pkgs.cups.out}/share/doc/cups/images/cups.png", - "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt", - ]: - file_name = os.path.basename(file) - with subtest(f"print {file_name}"): - # Print the file on the client. - print(client.succeed("lpq")) - client.succeed(f"lp {file}") - client.wait_until_succeeds( - f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'" - ) + # Ensure that a raw PCL file appeared in the server's queue + # (showing that the right filters have been applied). Of + # course, since there is no actual USB printer attached, the + # file will stay in the queue forever. + server.wait_for_file("/var/spool/cups/d*-001") + server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'") - # Ensure that a raw PCL file appeared in the server's queue - # (showing that the right filters have been applied). Of - # course, since there is no actual USB printer attached, the - # file will stay in the queue forever. - server.wait_for_file("/var/spool/cups/d*-001") - server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'") + # Delete the job on the client. It should disappear on the + # server as well. + client.succeed("lprm") + client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'") - # Delete the job on the client. It should disappear on the - # server as well. - client.succeed("lprm") - client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'") + retry(lambda _: "no entries" in server.succeed("lpq -a")) - retry(lambda _: "no entries" in server.succeed("lpq -a")) - - # The queue is empty already, so this should be safe. - # Otherwise, pairs of "c*"-"d*-001" files might persist. - server.execute("rm /var/spool/cups/*") - - - test_printing(serviceClient, serviceServer) - test_printing(socketActivatedClient, socketActivatedServer) + # The queue is empty already, so this should be safe. + # Otherwise, pairs of "c*"-"d*-001" files might persist. + server.execute("rm /var/spool/cups/*") ''; }) diff --git a/nixos/tests/systemd-homed.nix b/nixos/tests/systemd-homed.nix new file mode 100644 index 000000000000..ecc92e98eddc --- /dev/null +++ b/nixos/tests/systemd-homed.nix @@ -0,0 +1,99 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + password = "foobar"; + newPass = "barfoo"; +in +{ + name = "systemd-homed"; + nodes.machine = { config, pkgs, ... }: { + services.homed.enable = true; + + users.users.test-normal-user = { + extraGroups = [ "wheel" ]; + isNormalUser = true; + initialPassword = password; + }; + }; + testScript = '' + def switchTTY(number): + machine.send_key(f"alt-f{number}") + machine.wait_until_succeeds(f"[ $(fgconsole) = {number} ]") + machine.wait_for_unit(f"getty@tty{number}.service") + machine.wait_until_succeeds(f"pgrep -f 'agetty.*tty{number}'") + + machine.wait_for_unit("multi-user.target") + + # Smoke test to make sure the pam changes didn't break regular users. + machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + with subtest("login as regular user"): + switchTTY(2) + machine.wait_until_tty_matches("2", "login: ") + machine.send_chars("test-normal-user\n") + machine.wait_until_tty_matches("2", "login: test-normal-user") + machine.wait_until_tty_matches("2", "Password: ") + machine.send_chars("${password}\n") + machine.wait_until_succeeds("pgrep -u test-normal-user bash") + machine.send_chars("whoami > /tmp/1\n") + machine.wait_for_file("/tmp/1") + assert "test-normal-user" in machine.succeed("cat /tmp/1") + + with subtest("create homed encrypted user"): + # TODO: Figure out how to pass password manually. + # + # This environment variable is used for homed internal testing + # and is not documented. + machine.succeed("NEWPASSWORD=${password} homectl create --shell=/run/current-system/sw/bin/bash --storage=luks -G wheel test-homed-user") + + with subtest("login as homed user"): + switchTTY(3) + machine.wait_until_tty_matches("3", "login: ") + machine.send_chars("test-homed-user\n") + machine.wait_until_tty_matches("3", "login: test-homed-user") + machine.wait_until_tty_matches("3", "Password: ") + machine.send_chars("${password}\n") + machine.wait_until_succeeds("pgrep -t tty3 -u test-homed-user bash") + machine.send_chars("whoami > /tmp/2\n") + machine.wait_for_file("/tmp/2") + assert "test-homed-user" in machine.succeed("cat /tmp/2") + + with subtest("change homed user password"): + switchTTY(4) + machine.wait_until_tty_matches("4", "login: ") + machine.send_chars("test-homed-user\n") + machine.wait_until_tty_matches("4", "login: test-homed-user") + machine.wait_until_tty_matches("4", "Password: ") + machine.send_chars("${password}\n") + machine.wait_until_succeeds("pgrep -t tty4 -u test-homed-user bash") + machine.send_chars("passwd\n") + # homed does it in a weird order, it asks for new passes, then it asks + # for the old one. + machine.sleep(2) + machine.send_chars("${newPass}\n") + machine.sleep(2) + machine.send_chars("${newPass}\n") + machine.sleep(4) + machine.send_chars("${password}\n") + machine.wait_until_fails("pgrep -t tty4 passwd") + + @polling_condition + def not_logged_in_tty5(): + machine.fail("pgrep -t tty5 bash") + + switchTTY(5) + with not_logged_in_tty5: # type: ignore[union-attr] + machine.wait_until_tty_matches("5", "login: ") + machine.send_chars("test-homed-user\n") + machine.wait_until_tty_matches("5", "login: test-homed-user") + machine.wait_until_tty_matches("5", "Password: ") + machine.send_chars("${password}\n") + machine.wait_until_tty_matches("5", "Password incorrect or not sufficient for authentication of user test-homed-user.") + machine.wait_until_tty_matches("5", "Sorry, try again: ") + machine.send_chars("${newPass}\n") + machine.send_chars("whoami > /tmp/4\n") + machine.wait_for_file("/tmp/4") + assert "test-homed-user" in machine.succeed("cat /tmp/4") + + with subtest("homed user should be in wheel according to NSS"): + machine.succeed("userdbctl group wheel -s io.systemd.NameServiceSwitch | grep test-homed-user") + ''; +}) diff --git a/nixos/tests/systemd-userdbd.nix b/nixos/tests/systemd-userdbd.nix new file mode 100644 index 000000000000..5d0233ffd9fb --- /dev/null +++ b/nixos/tests/systemd-userdbd.nix @@ -0,0 +1,32 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "systemd-userdbd"; + nodes.machine = { config, pkgs, ... }: { + services.userdbd.enable = true; + + users.users.test-user-nss = { + isNormalUser = true; + }; + + environment.etc."userdb/test-user-dropin.user".text = builtins.toJSON { + userName = "test-user-dropin"; + }; + + environment.systemPackages = with pkgs; [ libvarlink ]; + }; + testScript = '' + import json + from shlex import quote + + def getUserRecord(name): + Interface = "unix:/run/systemd/userdb/io.systemd.Multiplexer/io.systemd.UserDatabase" + payload = json.dumps({ + "service": "io.systemd.Multiplexer", + "userName": name + }) + return json.loads(machine.succeed(f"varlink call {Interface}.GetUserRecord {quote(payload)}")) + + machine.wait_for_unit("systemd-userdbd.socket") + getUserRecord("test-user-nss") + getUserRecord("test-user-dropin") + ''; +}) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 09abaa862f51..cbed4b36181e 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; - cmakeFlags = [ "-Denable-framework=off" ]; + cmakeFlags = [ + "-Denable-framework=off" + # set CMAKE_INSTALL_NAME_DIR to correct value on darwin + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; meta = with lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index a9329c34212d..2386708c552c 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { mpv peewee pygobject3 - python-Levenshtein + levenshtein python-dateutil requests semver diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 33ce321cb4c6..bae0fc7988d9 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,21 +6,16 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-TNaHPvN19fkRqkQHtqdeEDwhqbntcVhxXhY8TNIScEg="; + hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8="; }; - patches = [ - # chia tries to put lock files in the python modules directory - ./dont_lock_in_store.patch - ]; - postPatch = '' substituteInPlace setup.py \ --replace "==" ">=" @@ -59,6 +54,7 @@ let chia = python3Packages.buildPythonApplication rec { fasteners filelock keyrings-cryptfile + psutil pyyaml setproctitle setuptools # needs pkg_resources at runtime diff --git a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch b/pkgs/applications/blockchains/chia/dont_lock_in_store.patch deleted file mode 100644 index f923b11801a1..000000000000 --- a/pkgs/applications/blockchains/chia/dont_lock_in_store.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/chia/wallet/puzzles/load_clvm.py -+++ b/chia/wallet/puzzles/load_clvm.py -@@ -82,18 +82,6 @@ def load_serialized_clvm(clvm_filename, package_or_requirement=__name__) -> Seri - """ - hex_filename = f"{clvm_filename}.hex" - -- try: -- if pkg_resources.resource_exists(package_or_requirement, clvm_filename): -- # Establish whether the size is zero on entry -- full_path = pathlib.Path(pkg_resources.resource_filename(package_or_requirement, clvm_filename)) -- output = full_path.parent / hex_filename -- compile_clvm(full_path, output, search_paths=[full_path.parent]) -- -- except NotImplementedError: -- # pyinstaller doesn't support `pkg_resources.resource_exists` -- # so we just fall through to loading the hex clvm -- pass -- - clvm_hex = pkg_resources.resource_string(package_or_requirement, hex_filename).decode("utf8") - assert len(clvm_hex.strip()) != 0 - clvm_blob = bytes.fromhex(clvm_hex) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index fc6ddd93567c..674b27330802 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -7,7 +7,7 @@ let pythonEnv = pythonPackages.python.withPackages(p: with p; [ - regex setuptools python-Levenshtein pyenchant + regex setuptools levenshtein pyenchant pygobject3 pycairo pypandoc chardet ]); diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index c5265aa255c2..cb814ddbc95a 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -20,7 +20,7 @@ in rec { launcher = runCommand "octave-kernel-launcher" { inherit octave; - python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]); + python = python3.withPackages (ps: [ ps.traitlets ps.jupyter-core ps.ipykernel ps.metakernel kernel ]); nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index 41281385c990..6047c0826430 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup echo "unpacking $src..." diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index e0af54b1e4e6..17a94511e3fc 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -35,7 +35,5 @@ stdenv.mkDerivation rec { license = with licenses; [ publicDomain ]; maintainers = with maintainers; [ xaverdh irenes ]; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index c82bdcc6001e..a67ba0eff700 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { dbus-python pygobject3 pyinotify - python-Levenshtein + levenshtein pyxdg pycairo requests diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index 6329ff9ed11c..eb185f9743c1 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -45,7 +45,7 @@ let mv bin/nomad-autoscaler $bin/bin ln -s $bin/bin/nomad-autoscaler $out/bin/nomad-autoscaler - for d in $outputs; do + for d in $(getAllOutputNames); do mkdir -p ''${!d}/share done rmdir $bin/share diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh index c054e2c72cbe..31cab28fd82e 100644 --- a/pkgs/applications/office/libreoffice/download-list-builder.sh +++ b/pkgs/applications/office/libreoffice/download-list-builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup tar --extract --file=$src libreoffice-$version/download.lst -O > $out diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index feda51e4f665..309c5812e4ea 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -155,7 +155,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { python-dateutil python-dotenv python-gnupg - python-Levenshtein + levenshtein python-magic pytz pyyaml diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index b9e78246609b..814ae5e51f5f 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -7,7 +7,7 @@ , pycountry , whoosh , termcolor -, python-Levenshtein +, levenshtein , pygobject3 , pyocr , natsort @@ -55,7 +55,7 @@ buildPythonPackage rec { pygobject3 pyocr pypillowfight - python-Levenshtein + levenshtein poppler_gi scikit-learn termcolor diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index abcedf7ee7b9..bd92ae01ebb1 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mafo ]; license = "xearth"; platforms=platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index 31c1fc50ee3e..412642f523f2 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pyvcf - python-Levenshtein + levenshtein progressbar2 pysam pyfaidx diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 8f864d136928..143e5a2a22b3 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -49,7 +49,7 @@ , boost , singular , pip -, jupyter_core +, jupyter-core , sage-setup , libhomfly , libbraiding @@ -87,7 +87,7 @@ buildPythonPackage rec { nativeBuildInputs = [ iml perl - jupyter_core + jupyter-core pkg-config sage-setup pip # needed to query installed packages diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 7c5794eb8e83..92f64fbfb916 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -1,7 +1,7 @@ { lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, libpng, libtiff, libxcrypt, openscenegraph , proj, python3, - python37Packages, stdenv, swig, xercesc, xorg, zlib }: + python3Packages, stdenv, swig, xercesc, xorg, zlib }: stdenv.mkDerivation rec { pname = "sumo"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libxcrypt openscenegraph proj - python37Packages.setuptools + python3Packages.setuptools xercesc zlib python3 diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 7c0bd8b6410a..272b875cd7a8 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -60,6 +60,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw="; + auditable = true; # TODO: remove when this is the default + nativeBuildInputs = [ cmake installShellFiles diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index b2b459589b39..69b6c1bdcd16 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -7,6 +7,7 @@ , lib , packaging , poetry-core +, py , pytest-freezegun , pytest-mock , pytest-regressions @@ -18,17 +19,18 @@ , typing-extensions , argcomplete , nix-update-script +, pre-commit }: buildPythonApplication rec { pname = "commitizen"; - version = "2.37.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-wo1I6QDWLxByHISmkPdass+BcKh0oxR5hD31UN/5+WQ="; + hash = "sha256-W+k+hqH0TKQAXf1Em6A1/VdqzJkhYp99I3lbqH6iDDc="; deepClone = true; }; @@ -36,6 +38,11 @@ buildPythonApplication rec { nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' + ''; + propagatedBuildInputs = [ termcolor questionary @@ -52,6 +59,8 @@ buildPythonApplication rec { doCheck = true; checkInputs = [ + pre-commit + py pytestCheckHook pytest-freezegun pytest-mock @@ -79,6 +88,8 @@ buildPythonApplication rec { "test_bump_pre_commit_changelog" "test_bump_pre_commit_changelog_fails_always" "test_get_commits_with_signature" + # fatal: not a git repository (or any of the parent directories): .git + "test_commitizen_debug_excepthook" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 2d63ae403791..56f7e697ec87 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -12,7 +12,7 @@ , withManual ? true , pythonSupport ? true , withpcre2 ? true -, sendEmailSupport ? false +, sendEmailSupport ? perlSupport , Security, CoreServices , nixosTests , withLibsecret ? false @@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.38.1"; + version = "2.39.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-l9346liiueD7wlCOJFAoynWRG9ONFVFhaxSMGqV0Ctk="; + sha256 = "sha256-uhmbE/tamco97JF7C9c2vA61qd+Hc31DXt398Q1pJls="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 4a19121f34ad..7e1157fc4a67 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -13,7 +13,7 @@ let owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; + hash = "sha256-8pYbIkPsg16VelwqpYSzqfAJaCU37lun+XZ/crzCDZU="; }; }); @@ -29,7 +29,7 @@ let version = "9.2.0"; src = oldAttrs.src.override { inherit version; - sha256 = "02ig2wf2yyrnnl88r2n13s1naskwsifwgx3syifmcxygflsmjd3d"; + hash = "sha256-bTRZNXXPd1Zd9Hr0x13UfGplgx7BiowQtTZ7LxwXLwo="; }; }); }; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index bc7c8fbd46ac..6b9d6e905bf2 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -56,9 +56,9 @@ let bintoolsVersion = lib.getVersion bintools; bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools); - libc_bin = if libc == null then null else getBin libc; - libc_dev = if libc == null then null else getDev libc; - libc_lib = if libc == null then null else getLib libc; + libc_bin = if libc == null then "" else getBin libc; + libc_dev = if libc == null then "" else getDev libc; + libc_lib = if libc == null then "" else getLib libc; bintools_bin = if nativeTools then "" else getBin bintools; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; @@ -69,7 +69,7 @@ let # The dynamic linker has different names on different platforms. This is a # shell glob that ought to match it. dynamicLinker = - /**/ if sharedLibraryLoader == null then null + /**/ if sharedLibraryLoader == null then "" else if targetPlatform.libc == "musl" then "${sharedLibraryLoader}/lib/ld-musl-*" else if targetPlatform.libc == "uclibc" then "${sharedLibraryLoader}/lib/ld*-uClibc.so.1" else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker" @@ -88,7 +88,7 @@ let else if targetPlatform.isDarwin then "/usr/lib/dyld" else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" - else null; + else ""; expand-response-params = if buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" @@ -104,15 +104,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit bintools_bin libc_bin libc_dev libc_lib coreutils_bin; - shell = getBin shell + shell.shellPath or ""; - gnugrep_bin = if nativeTools then "" else gnugrep; - - inherit targetPrefix suffixSalt; - outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info"); passthru = { + inherit targetPrefix suffixSalt; inherit bintools libc nativeTools nativeLibc nativePrefix; emacsBufferSetup = pkgs: '' @@ -206,8 +201,6 @@ stdenv.mkDerivation { strictDeps = true; depsTargetTargetPropagated = extraPackages; - wrapperName = "BINTOOLS_WRAPPER"; - setupHooks = [ ../setup-hooks/role.bash ./setup-hook.sh @@ -379,10 +372,15 @@ stdenv.mkDerivation { ## + extraBuildCommands; - inherit dynamicLinker; - - # for substitution in utils.bash - expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + env = { + # for substitution in utils.bash + expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + shell = getBin shell + shell.shellPath or ""; + gnugrep_bin = if nativeTools then "" else gnugrep; + wrapperName = "BINTOOLS_WRAPPER"; + inherit dynamicLinker targetPrefix suffixSalt coreutils_bin; + inherit bintools_bin libc_bin libc_dev libc_lib; + }; meta = let bintools_ = if bintools != null then bintools else {}; in diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index e0dfeafcf00a..d1c57a77a58c 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -42,9 +42,9 @@ let ccVersion = lib.getVersion cc; ccName = lib.removePrefix targetPrefix (lib.getName cc); - libc_bin = if libc == null then null else getBin libc; - libc_dev = if libc == null then null else getDev libc; - libc_lib = if libc == null then null else getLib libc; + libc_bin = if libc == null then "" else getBin libc; + libc_dev = if libc == null then "" else getDev libc; + libc_lib = if libc == null then "" else getLib libc; cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; @@ -132,22 +132,16 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin; - shell = getBin shell + shell.shellPath or ""; - gnugrep_bin = if nativeTools then "" else gnugrep; - - inherit targetPrefix suffixSalt; - inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable; - outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; passthru = { + inherit targetPrefix suffixSalt; # "cc" is the generic name for a C compiler, but there is no one for package # providing the linker and related tools. The two we use now are GNU # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # unused middle-ground name that evokes both. inherit bintools; - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; + inherit cc libc nativeTools nativeLibc nativePrefix isGNU isClang; emacsBufferSetup = pkgs: '' ; We should handle propagation here too @@ -276,8 +270,6 @@ stdenv.mkDerivation { propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages; - wrapperName = "CC_WRAPPER"; - setupHooks = [ ../setup-hooks/role.bash ] ++ lib.optional (cc.langC or true) ./setup-hook.sh @@ -549,8 +541,16 @@ stdenv.mkDerivation { nixSupport); - # for substitution in utils.bash - expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + env = { + # for substitution in utils.bash + expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + shell = getBin shell + shell.shellPath or ""; + gnugrep_bin = if nativeTools then "" else gnugrep; + wrapperName = "CC_WRAPPER"; + inherit suffixSalt coreutils_bin bintools cc; + inherit libc_bin libc_dev libc_lib; + inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable; + }; meta = let cc_ = if cc != null then cc else {}; in diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index e424fd92d51e..163f6fc60eea 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source "$stdenv/setup" header "exporting \`$url' (revision $rev) into \`$out'" diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index fe1019aafc2f..90363275b973 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup (echo "#!$SHELL"; \ diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index 301deb98307f..018852770504 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup tagtext="" diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index 7443591e6569..e5a1a61b78d3 100644 --- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source "${stdenv}/setup" header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" mkdir -p "${out}" @@ -8,7 +9,7 @@ cat < "${out}/compositeImage.sh" # Create a tar archive of a docker image's layers, docker image config # json, manifest.json, and repositories json; this streams directly to # stdout and is intended to be used in concert with docker load, i.e: -# +# # ${out}/compositeImage.sh | docker load # The first character follow the 's' command for sed becomes the diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh index 5f08aca424fe..009b23c406d6 100644 --- a/pkgs/build-support/fetchfossil/builder.sh +++ b/pkgs/build-support/fetchfossil/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup header "Cloning Fossil $url [$rev] into $out" diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 66b6c168e41d..acb970639ab1 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -2,6 +2,8 @@ # - no revision specified and remote has a HEAD which is used # - revision specified and remote has a HEAD # - revision specified and remote without HEAD +# +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup header "exporting $url (rev $rev) into $out" diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index 847f18fa5975..cec0e441f229 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup header "getting $url${rev:+ ($rev)} into $out" diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh index 7a6a517566f5..ca77962b5384 100644 --- a/pkgs/build-support/fetchipfs/builder.sh +++ b/pkgs/build-support/fetchipfs/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup # Curl flags to handle redirects, not use EPSV, handle cookies for diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 73eff9c27252..7db66730dab8 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup set -x diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index ed3e65f07695..b58e5a88b3cd 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup header "exporting $url (r$rev) into $out" diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/pkgs/build-support/fetchsvnssh/builder.sh index d9c6dc7da31a..b0441299dd2c 100644 --- a/pkgs/build-support/fetchsvnssh/builder.sh +++ b/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup header "exporting $url (r$rev) into $out" diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 5ca09b6fc77d..dd987f41b446 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup source $mirrorsFile diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix index 8dd9704aa4b4..c2dfe27b2c60 100644 --- a/pkgs/build-support/nuke-references/default.nix +++ b/pkgs/build-support/nuke-references/default.nix @@ -32,8 +32,10 @@ stdenvNoCC.mkDerivation { ''; # FIXME: get rid of perl dependency. - inherit perl; - inherit (builtins) storeDir; - shell = lib.getBin shell + (shell.shellPath or ""); - signingUtils = if darwinCodeSign then signingUtils else null; + env = { + inherit perl; + inherit (builtins) storeDir; + shell = lib.getBin shell + (shell.shellPath or ""); + signingUtils = if darwinCodeSign then signingUtils else ""; + }; } diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 312d2fe02610..ca14a4495fed 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -36,13 +36,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; - - inherit targetPrefix suffixSalt baseBinName; - outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc"); passthru = { + inherit targetPrefix suffixSalt; inherit pkg-config; }; @@ -83,8 +80,6 @@ stdenv.mkDerivation { ln -s ${pkg-config}/share $out/share ''; - wrapperName = "PKG_CONFIG_WRAPPER"; - setupHooks = [ ../setup-hooks/role.bash ./setup-hook.sh @@ -120,6 +115,12 @@ stdenv.mkDerivation { ## + extraBuildCommands; + env = { + shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; + wrapperName = "PKG_CONFIG_WRAPPER"; + inherit targetPrefix suffixSalt baseBinName; + }; + meta = let pkg-config_ = if pkg-config != null then pkg-config else {}; in (if pkg-config_ ? meta then removeAttrs pkg-config.meta ["priority"] else {}) // diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index ac51b90e0163..5ed2b0752efc 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation ( echo "$system" > $out/nix-support/system if [ -z "${toString doingAnalysis}" ]; then - for i in $outputs; do + for i in $(getAllOutputNames); do if [ "$i" = out ]; then j=none; else j="$i"; fi mkdir -p ''${!i}/nix-support echo "nix-build $j ''${!i}" >> ''${!i}/nix-support/hydra-build-products diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 679e10a3442e..69ee4f56b98f 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -5,12 +5,14 @@ , stdenv , callPackage , cacert -, git , cargoBuildHook , cargoCheckHook , cargoInstallHook , cargoNextestHook , cargoSetupHook +, cargo +, cargo-auditable +, cargo-auditable-cargo-wrapper , rustc , libiconv , windows @@ -42,6 +44,8 @@ , buildFeatures ? [ ] , checkFeatures ? buildFeatures , useNextest ? false +, auditable ? false # TODO: change to true + , depsExtraArgs ? {} # Toggles whether a custom sysroot is created when the target is a .json file. @@ -115,9 +119,12 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg patchRegistryDeps = ./patch-registry-deps; - nativeBuildInputs = nativeBuildInputs ++ [ + nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [ + (cargo-auditable-cargo-wrapper.override { + inherit cargo cargo-auditable; + }) + ] ++ [ cacert - git cargoBuildHook (if useNextest then cargoNextestHook else cargoCheckHook) cargoInstallHook @@ -126,6 +133,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg ]; buildInputs = buildInputs + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ windows.pthreads ]; patches = cargoPatches ++ patches; diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh index aeddeef29d92..8146573e79db 100644 --- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -1,6 +1,8 @@ cargoSetupPostUnpackHook() { echo "Executing cargoSetupPostUnpackHook" + export NIX_LDFLAGS+=" @aarch64LinuxGccWorkaround@" + # Some cargo builds include build hooks that modify their own vendor # dependencies. This copies the vendor directory into the build tree and makes # it writable. If we're using a tarball, the unpackFile hook already handles diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 5c367b657500..13562acd5492 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -107,6 +107,9 @@ in { host-config = true target-applies-to-host = true ''; + + # https://github.com/NixOS/nixpkgs/issues/201254 + aarch64LinuxGccWorkaround = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; }; } ./cargo-setup-hook.sh) {}; diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh index c9dd32d1dd22..9c03bc2ee935 100644 --- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh +++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh @@ -16,7 +16,7 @@ auditTmpdir() { header "checking for references to $TMPDIR/ in $dir..." local i - while IFS= read -r -d $'\0' i; do + find "$dir" -type f -print0 | while IFS= read -r -d $'\0' i; do if [[ "$i" =~ .build-id ]]; then continue; fi if isELF "$i"; then @@ -35,7 +35,7 @@ auditTmpdir() { fi fi - done < <(find "$dir" -type f -print0) + done stopNest } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 7f5ff146e30b..55467b9ec7b8 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# shellcheck shell=bash declare -a autoPatchelfLibs declare -a extraAutoPatchelfLibs @@ -84,7 +84,7 @@ autoPatchelf() { # (Expressions don't expand in single quotes, use double quotes for that.) postFixupHooks+=(' if [ -z "${dontAutoPatchelf-}" ]; then - autoPatchelf -- $(for output in $outputs; do + autoPatchelf -- $(for output in $(getAllOutputNames); do [ -e "${!output}" ] || continue echo "${!output}" done) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 74c8f6d0b333..83ea7de3ee21 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# shellcheck shell=bash fixupOutputHooks+=('convertDesktopFiles $prefix') # Get a param out of a desktop file. First parameter is the file and the second diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh index 0608d3ca81c4..cd9c2eaa2d80 100644 --- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh +++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -1,4 +1,4 @@ -fixupOutputHooks+=(_makeSymlinksRelative) +postFixupHooks+=(_makeSymlinksRelative) # For every symlink in $output that refers to another file in $output # ensure that the symlink is relative. This removes references to the output diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh index e4460f98816d..3f961155d201 100644 --- a/pkgs/build-support/setup-hooks/move-docs.sh +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -1,14 +1,19 @@ -# This setup hook moves $out/{man,doc,info} to $out/share; moves -# $out/share/man to $man/share/man; and moves $out/share/doc to -# $man/share/doc. +# This setup hook moves $out/{man,doc,info} to $out/share. preFixupHooks+=(_moveToShare) _moveToShare() { - forceShare=${forceShare:=man doc info} + if [ -n "$__structuredAttrs" ]; then + if [ -z "${forceShare-}" ]; then + forceShare=( man doc info ) + fi + else + forceShare=( ${forceShare:-man doc info} ) + fi + if [[ -z "$out" ]]; then return; fi - for d in $forceShare; do + for d in "${forceShare[@]}"; do if [ -d "$out/$d" ]; then if [ -d "$out/share/$d" ]; then echo "both $d/ and share/$d/ exist!" @@ -20,4 +25,3 @@ _moveToShare() { fi done } - diff --git a/pkgs/build-support/setup-hooks/move-systemd-user-units.sh b/pkgs/build-support/setup-hooks/move-systemd-user-units.sh index 5963d87c7515..33e89898262f 100755 --- a/pkgs/build-support/setup-hooks/move-systemd-user-units.sh +++ b/pkgs/build-support/setup-hooks/move-systemd-user-units.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# shellcheck shell=bash # This setup hook, for each output, moves everything in # $output/lib/systemd/user to $output/share/systemd/user, and replaces diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 881cf6c90f48..8a2fc2f915e9 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -47,7 +47,7 @@ _overrideFirst outputInfo "info" "$outputBin" # Add standard flags to put files into the desired outputs. _multioutConfig() { - if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi; + if [ "$(getAllOutputNames)" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi; # try to detect share/doc/${shareDocName} # Note: sadly, $configureScript detection comes later in configurePhase, @@ -66,19 +66,17 @@ _multioutConfig() { fi fi - configureFlags="\ - --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ - --includedir=${!outputInclude}/include --oldincludedir=${!outputInclude}/include \ - --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ - --docdir=${!outputDoc}/share/doc/${shareDocName} \ - --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ - --localedir=${!outputLib}/share/locale \ - $configureFlags" + prependToVar configureFlags \ + --bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin \ + --includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include \ + --mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info \ + --docdir="${!outputDoc}"/share/doc/"${shareDocName}" \ + --libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec \ + --localedir="${!outputLib}"/share/locale - installFlags="\ - pkgconfigdir=${!outputDev}/lib/pkgconfig \ - m4datadir=${!outputDev}/share/aclocal aclocaldir=${!outputDev}/share/aclocal \ - $installFlags" + prependToVar installFlags \ + pkgconfigdir="${!outputDev}"/lib/pkgconfig \ + m4datadir="${!outputDev}"/share/aclocal aclocaldir="${!outputDev}"/share/aclocal } @@ -94,7 +92,7 @@ moveToOutput() { local patt="$1" local dstOut="$2" local output - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "${!output}" = "$dstOut" ]; then continue; fi local srcPath for srcPath in "${!output}"/$patt; do @@ -149,7 +147,7 @@ _multioutDocs() { # Move development-only stuff to the desired outputs. _multioutDevs() { - if [ "$outputs" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi; + if [ "$(getAllOutputNames)" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi; moveToOutput include "${!outputInclude}" # these files are sometimes provided even without using the corresponding tool moveToOutput lib/pkgconfig "${!outputDev}" @@ -166,10 +164,10 @@ _multioutDevs() { # Make the "dev" propagate other outputs needed for development. _multioutPropagateDev() { - if [ "$outputs" = "out" ]; then return; fi; + if [ "$(getAllOutputNames)" = "out" ]; then return; fi; local outputFirst - for outputFirst in $outputs; do + for outputFirst in $(getAllOutputNames); do break done local propagaterOutput="$outputDev" diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh b/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh index a450ecd7f963..77322b245b27 100644 --- a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh +++ b/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh @@ -70,7 +70,7 @@ patchPpdFileCommands () { # * outputs of current build before buildInputs # * `/lib/cups/filter' before `/bin` # * add HOST_PATH at end, so we don't miss anything - for path in $outputs; do + for path in $(getAllOutputNames); do addToSearchPath cupspath "${!path}/lib/cups/filter" addToSearchPath cupspath "${!path}/bin" done diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index 9bd7b24cab54..104b5515b3db 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -12,11 +12,20 @@ _doStrip() { local -ra stripCmds=(STRIP STRIP_FOR_TARGET) local -ra ranlibCmds=(RANLIB RANLIB_FOR_TARGET) + # TODO(structured-attrs): This doesn't work correctly if one of + # the items in strip*List or strip*Flags contains a space, + # even with structured attrs enabled. This is OK for now + # because very few packages set any of these, and it doesn't + # affect any of them. + # + # After __structuredAttrs = true is universal, come back and + # push arrays all the way through this logic. + # Strip only host paths by default. Leave targets as is. - stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} - stripDebugListTarget=${stripDebugListTarget:-} - stripAllList=${stripAllList:-} - stripAllListTarget=${stripAllListTarget:-} + stripDebugList=${stripDebugList[*]:-lib lib32 lib64 libexec bin sbin} + stripDebugListTarget=${stripDebugListTarget[*]:-} + stripAllList=${stripAllList[*]:-} + stripAllListTarget=${stripAllListTarget[*]:-} local i for i in ${!stripCmds[@]}; do @@ -30,8 +39,8 @@ _doStrip() { if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null then continue; fi - stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags:--S}" - stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags:--s}" + stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S}" + stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s}" done } diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh index 6130f32bef86..ca4cbb349b6c 100644 --- a/pkgs/build-support/setup-hooks/win-dll-link.sh +++ b/pkgs/build-support/setup-hooks/win-dll-link.sh @@ -15,7 +15,7 @@ _linkDLLs() { # prefix $PATH by currently-built outputs local DLLPATH="" local outName - for outName in $outputs; do + for outName in $(getAllOutputNames); do addToSearchPath DLLPATH "${!outName}/bin" done DLLPATH="$DLLPATH:$PATH" diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh index 0e1bbe9a678c..052ee8527176 100644 --- a/pkgs/build-support/testers/expect-failure.sh +++ b/pkgs/build-support/testers/expect-failure.sh @@ -35,7 +35,7 @@ echo "testBuildFailure: Original builder produced exit code: $r" # ----------------------------------------- # Write the build log to the default output -outs=( $outputs ) +outs=( $(getAllOutputNames) ) defOut=${outs[0]} defOutPath=${!defOut} diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken index 73308bf8b39a..7035bee18604 100755 --- a/pkgs/common-updater/scripts/mark-broken +++ b/pkgs/common-updater/scripts/mark-broken @@ -48,7 +48,6 @@ denyFileList=( # to be conditionally disabled denyAttrList=( python27Packages - python37Packages linuxPackages_ rubyPackages_ ) diff --git a/pkgs/data/icons/catppuccin-cursors/default.nix b/pkgs/data/icons/catppuccin-cursors/default.nix index d9eccc96a029..4559705c169b 100644 --- a/pkgs/data/icons/catppuccin-cursors/default.nix +++ b/pkgs/data/icons/catppuccin-cursors/default.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" != "out" ]; then local outputDir="''${!output}" local iconsDir="$outputDir"/share/icons diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/data/icons/comixcursors/default.nix index b63877b28209..1c4fdc195180 100644 --- a/pkgs/data/icons/comixcursors/default.nix +++ b/pkgs/data/icons/comixcursors/default.nix @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation rec { ''; installPhase = '' - for outputName in $outputs ; do + for outputName in $(getAllOutputNames) ; do if [ $outputName != out ]; then local outputDir=''${!outputName}; local iconsDir=$outputDir/share/icons diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index f1fbe7e49d30..a2265387e1ef 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { # We use rsync to merge the directories. rsync --archive "${DESTDIR}/etc" "$out" rm --recursive "${DESTDIR}/etc" - for o in $outputs; do + for o in $(getAllOutputNames); do if [[ "$o" = "debug" ]]; then continue; fi rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" rm --recursive "${DESTDIR}/''${!o}" diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh index 39bd77038281..e5c277e796af 100644 --- a/pkgs/desktops/gnustep/make/builder.sh +++ b/pkgs/desktops/gnustep/make/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup preConfigure() { diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh index 3b4393720042..7ea0a40d3748 100755 --- a/pkgs/development/compilers/aspectj/builder.sh +++ b/pkgs/development/compilers/aspectj/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup export JAVA_HOME=$jre diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index 204661063090..5f41a36263a9 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup header "exporting egg ${eggName} (version $version) into $out" diff --git a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh index d9adf510f22d..f02e01757787 100644 --- a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup header "exporting egg ${eggName} (version $version) into $out" diff --git a/pkgs/development/compilers/fpc/binary-builder-darwin.sh b/pkgs/development/compilers/fpc/binary-builder-darwin.sh index f9bdf18e7d68..39db0518281d 100755 --- a/pkgs/development/compilers/fpc/binary-builder-darwin.sh +++ b/pkgs/development/compilers/fpc/binary-builder-darwin.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup pkgdir=$(pwd)/pkg diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh index 4308c1ed211a..c471378c275f 100755 --- a/pkgs/development/compilers/fpc/binary-builder.sh +++ b/pkgs/development/compilers/fpc/binary-builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup tar xf $src diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index c73e9e0c1075..113bd83ea53f 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index d93f647f8462..f5f46ff9f4f7 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "1.3.231.0"; + version = "1.3.236.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = "sdk-${version}"; - hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk="; + hash = "sha256-iVcx1j7OMJEU4cPydNwQSFufTUiqq7GKp69Y6pEt7Wc="; }; # These get set at all-packages, keep onto them for child drvs @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 bison jq ]; patches = [ - # https://github.com/NixOS/nixpkgs/pull/201747 - (fetchpatch { - name = "Fix-locations-of-cmake-files-in-side-compat-shims.patch"; - url = "https://github.com/KhronosGroup/glslang/commit/88fd417b0bb7d91755961c70e846d274c182f2b0.patch"; - hash = "sha256-rjeaPX5Ieem6zkICNvPd2SjvvLzG5wBERZfDLZEJsAk="; - }) (fetchpatch { name = "Use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch"; url = "https://github.com/KhronosGroup/glslang/commit/7627bd89583c5aafb8b38c81c15494019271fabf.patch"; diff --git a/pkgs/development/compilers/hip-common/0000-fixup-paths.patch b/pkgs/development/compilers/hip-common/0000-fixup-paths.patch new file mode 100644 index 000000000000..f3fd73255520 --- /dev/null +++ b/pkgs/development/compilers/hip-common/0000-fixup-paths.patch @@ -0,0 +1,129 @@ +diff --git a/bin/hipcc.pl b/bin/hipcc.pl +index da9559b..7aaa540 100755 +--- a/bin/hipcc.pl ++++ b/bin/hipcc.pl +@@ -185,7 +185,7 @@ if ($HIP_PLATFORM eq "amd") { + chomp($HIP_CLANG_TARGET); + + if (! defined $HIP_CLANG_INCLUDE_PATH) { +- $HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include"); ++ $HIP_CLANG_INCLUDE_PATH = abs_path("@clang@/resource-root/include"); + } + if (! defined $HIP_INCLUDE_PATH) { + $HIP_INCLUDE_PATH = "$HIP_PATH/include"; +@@ -206,8 +206,8 @@ if ($HIP_PLATFORM eq "amd") { + print ("HIP_CLANG_TARGET=$HIP_CLANG_TARGET\n"); + } + +- $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; +- $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; ++ $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH\""; ++ $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH\""; + $HIPLDFLAGS .= " -L\"$HIP_LIB_PATH\""; + if ($isWindows) { + $HIPLDFLAGS .= " -lamdhip64"; +@@ -625,7 +625,7 @@ if($HIP_PLATFORM eq "amd"){ + $targetsStr = $ENV{HCC_AMDGPU_TARGET}; + } elsif (not $isWindows) { + # Else try using rocm_agent_enumerator +- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator"; ++ $ROCM_AGENT_ENUM = "@rocminfo@/bin/rocm_agent_enumerator"; + $targetsStr = `${ROCM_AGENT_ENUM} -t GPU`; + $targetsStr =~ s/\n/,/g; + } +@@ -724,16 +724,16 @@ if ($HIP_PLATFORM eq "amd") { + + if (not $isWindows and not $compileOnly) { + if ($linkType eq 0) { +- $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; ++ $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L@rocm_runtime@/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; + } else { + $toolArgs = ${toolArgs} . " -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 "; + } + # To support __fp16 and _Float16, explicitly link with compiler-rt +- $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; ++ $HIP_CLANG_BUILTIN_LIB="@clang@/resource-root/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; + if (-e $HIP_CLANG_BUILTIN_LIB) { +- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET -lclang_rt.builtins " ++ $toolArgs .= " -L@clang@/resource-root/lib/$HIP_CLANG_TARGET -lclang_rt.builtins " + } else { +- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/linux -lclang_rt.builtins-x86_64 " ++ $toolArgs .= " -L@clang@/resource-root/lib/linux -lclang_rt.builtins-x86_64 " + } + } + } +diff --git a/bin/hipconfig.pl b/bin/hipconfig.pl +index 5ddb8e9..6a76a2e 100755 +--- a/bin/hipconfig.pl ++++ b/bin/hipconfig.pl +@@ -77,7 +77,7 @@ if ($HIP_COMPILER eq "clang") { + $CPP_CONFIG = " -D__HIP_PLATFORM_HCC__= -D__HIP_PLATFORM_AMD__="; + + $HIP_PATH_INCLUDE = $HIP_PATH."/include"; +- $HIP_CLANG_INCLUDE = $HIP_CLANG_PATH."/../lib/clang/".$HIP_CLANG_VERSION; ++ $HIP_CLANG_INCLUDE = "@clang@/resource-root/include"; + if($isWindows) { + $CPP_CONFIG .= " -I\"$HIP_PATH_INCLUDE\" -I\"$HIP_CLANG_INCLUDE\""; + } else { +@@ -168,7 +168,7 @@ if (!$printed or $p_full) { + print ("HIP_CLANG_PATH : $HIP_CLANG_PATH\n"); + if ($isWindows) { + system("\"$HIP_CLANG_PATH/clang++\" --version"); +- system("\"$HIP_CLANG_PATH/llc\" --version"); ++ system("\"@llvm@/bin/llc\" --version"); + printf("hip-clang-cxxflags : "); + $win_output = `perl \"$HIP_PATH/bin/hipcc\" --cxxflags`; + printf("$win_output \n"); +@@ -177,7 +177,7 @@ if (!$printed or $p_full) { + printf("$win_output \n"); + } else { + system("$HIP_CLANG_PATH/clang++ --version"); +- system("$HIP_CLANG_PATH/llc --version"); ++ system("@llvm@/bin/llc --version"); + print ("hip-clang-cxxflags : "); + system("$HIP_PATH/bin/hipcc --cxxflags"); + printf("\n"); +@@ -219,8 +219,8 @@ if (!$printed or $p_full) { + system ("uname -a"); + } + +- if (-e "/usr/bin/lsb_release") { +- system ("/usr/bin/lsb_release -a"); ++ if (-e "@lsb_release@/bin/lsb_release") { ++ system ("@lsb_release@/bin/lsb_release -a"); + } + + print "\n" ; +diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in +index 9250a68..f6e27b7 100644 +--- a/hip-lang-config.cmake.in ++++ b/hip-lang-config.cmake.in +@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) + + + #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY +-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include") +-file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") ++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@clang@/resource-root/include") ++file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@clang@/resource-root/include") + find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h + HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} + ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} +@@ -89,7 +89,7 @@ find_path(HSA_HEADER hsa/hsa.h + PATHS + "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY + "${_IMPORT_PREFIX}/include" +- "${ROCM_PATH}/include" ++ "@rocm_runtime@/include" + ) + + if (NOT HSA_HEADER) +@@ -97,7 +97,7 @@ if (NOT HSA_HEADER) + endif() + + get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) +-file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*") ++file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@clang@/resource-root/lib/*") + find_library(CLANGRT_BUILTINS + NAMES + clang_rt.builtins diff --git a/pkgs/development/compilers/hip-common/default.nix b/pkgs/development/compilers/hip-common/default.nix new file mode 100644 index 000000000000..fc5e09a45982 --- /dev/null +++ b/pkgs/development/compilers/hip-common/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, substituteAll +, llvm +, rocm-runtime +, rocminfo +, lsb-release +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hip-common"; + version = "5.4.1"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "HIP"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-JpHWTsR2Z8pXp1gNjO29pDYvH/cJvd5Dlpeig33UD28="; + }; + + patches = [ + (substituteAll { + src = ./0000-fixup-paths.patch; + inherit llvm rocminfo; + clang = stdenv.cc; + rocm_runtime = rocm-runtime; + lsb_release = lsb-release; + }) + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv * $out + + runHook postInstall + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "C++ Heterogeneous-Compute Interface for Portability"; + homepage = "https://github.com/ROCm-Developer-Tools/HIP"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; + platforms = platforms.linux; + broken = finalAttrs.version != stdenv.cc.version; + }; +}) diff --git a/pkgs/development/compilers/hip/0000-fixup-paths.patch b/pkgs/development/compilers/hip/0000-fixup-paths.patch new file mode 100644 index 000000000000..423857218ee7 --- /dev/null +++ b/pkgs/development/compilers/hip/0000-fixup-paths.patch @@ -0,0 +1,62 @@ +diff --git a/hip-config.cmake.in b/hip-config.cmake.in +index 89d1224..dc9ba05 100755 +--- a/hip-config.cmake.in ++++ b/hip-config.cmake.in +@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang") + file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT) + endif() + else() +- set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm") ++ set(HIP_CLANG_ROOT "@clang@") + endif() + if(NOT HIP_CXX_COMPILER) + set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) +@@ -171,7 +171,7 @@ if(HIP_COMPILER STREQUAL "clang") + get_filename_component(_HIP_CLANG_BIN_PATH "${_HIP_CLANG_REAL_PATH}" DIRECTORY) + get_filename_component(HIP_CLANG_ROOT "${_HIP_CLANG_BIN_PATH}" DIRECTORY) + endif() +- file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS ${HIP_CLANG_ROOT}/lib/clang/*/include) ++ file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@clang@/resource-root/include") + find_path(HIP_CLANG_INCLUDE_PATH stddef.h + HINTS + ${HIP_CLANG_INCLUDE_SEARCH_PATHS} +@@ -209,7 +209,7 @@ if(NOT WIN32) + "${_IMPORT_PREFIX}/include" + #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility + "${_IMPORT_PREFIX}/../include" +- ${ROCM_PATH}/include ++ "@rocm_runtime@/include" + ) + + if (NOT HSA_HEADER) +@@ -291,7 +291,7 @@ if(HIP_COMPILER STREQUAL "clang") + endif() + endif() + +- file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_CLANG_ROOT}/lib/clang/*/lib/*") ++ file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@clang@/resource-root/lib/*") + find_library(CLANGRT_BUILTINS + NAMES + clang_rt.builtins +diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh +index 0a1572b..2feb19a 100755 +--- a/src/hip_embed_pch.sh ++++ b/src/hip_embed_pch.sh +@@ -149,7 +149,7 @@ EOF + + $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui && + +- $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && ++ @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && + + rm -rf $tmp + } +@@ -195,7 +195,7 @@ EOF + set -x + $LLVM_DIR/bin/clang -O3 --rocm-path=$HIP_INC_DIR/.. -std=c++14 -nogpulib --hip-version=4.4 -isystem $HIP_INC_DIR -isystem $HIP_BUILD_INC_DIR -isystem $HIP_AMD_INC_DIR --cuda-device-only -D__HIPCC_RTC__ -x hip $tmp/hipRTC_header.h -E -o $tmp/hiprtc && + cat $macroFile >> $tmp/hiprtc && +- $LLVM_DIR/bin/llvm-mc -o $tmp/hiprtc_header.o $tmp/hipRTC_header.mcin --filetype=obj && ++ @llvm@/bin/llvm-mc -o $tmp/hiprtc_header.o $tmp/hipRTC_header.mcin --filetype=obj && + $LLVM_DIR/bin/clang $tmp/hiprtc_header.o -o $rtc_shared_lib_out -shared && + $LLVM_DIR/bin/clang -O3 --rocm-path=$HIP_INC_DIR/.. -std=c++14 -nogpulib -nogpuinc -emit-llvm -c -o $tmp/tmp.bc --cuda-device-only -D__HIPCC_RTC__ --offload-arch=gfx906 -x hip-cpp-output $tmp/hiprtc && + rm -rf $tmp diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 066fd906984d..5b3d2c8e0273 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -1,113 +1,61 @@ -{ stdenv -, binutils-unwrapped -, clang -, cmake +{ lib +, stdenv , fetchFromGitHub , fetchpatch -, file -, lib -, libglvnd -, libX11 -, libxml2 -, llvm +, rocmUpdateScript +, substituteAll , makeWrapper -, numactl -, perl -, python3 -, python3Packages +, hip-common +, hipcc , rocclr +, roctracer +, cmake +, perl +, llvm +, rocminfo +, rocm-thunk , rocm-comgr , rocm-device-libs -, rocm-opencl-runtime , rocm-runtime -, rocm-thunk -, rocminfo -, substituteAll -, writeScript -, writeText +, rocm-opencl-runtime +, cudatoolkit +, numactl +, libxml2 +, libX11 +, libglvnd +, doxygen +, graphviz +, fontconfig +, python3Packages +, buildDocs ? true +, buildTests ? false +, useNVIDIA ? false }: let - hip = stdenv.mkDerivation (finalAttrs: { - pname = "hip"; - version = "5.4.0"; + hipPlatform = if useNVIDIA then "nvidia" else "amd"; - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "HIP"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-34SJM2n3jZWIS2uwpboWOXVFhaVWGK5ELPKD/cJc1zw="; - }; + wrapperArgs = [ + "--prefix PATH : $out/bin" + "--prefix LD_LIBRARY_PATH : ${rocm-runtime}" + "--set HIP_PLATFORM ${hipPlatform}" + "--set HIP_PATH $out" + "--set HIP_CLANG_PATH ${stdenv.cc}/bin" + "--set DEVICE_LIB_PATH ${rocm-device-libs}/amdgcn/bitcode" + "--set HSA_PATH ${rocm-runtime}" + "--set ROCM_PATH $out" + ] ++ lib.optionals useNVIDIA [ + "--set CUDA_PATH ${cudatoolkit}" + ]; +in stdenv.mkDerivation (finalAttrs: { + pname = "hip-${hipPlatform}"; + version = "5.4.1"; - patches = [ - (substituteAll { - src = ./hip-config-paths.patch; - inherit llvm; - rocm_runtime = rocm-runtime; - }) - ]; - - # - fix bash paths - # - fix path to rocm_agent_enumerator - # - fix hcc path - # - fix hcc version parsing - # - add linker flags for libhsa-runtime64 and hc_am since libhip_hcc - # refers to them. - prePatch = '' - for f in $(find bin -type f); do - sed -e 's,#!/usr/bin/perl,#!${perl}/bin/perl,' \ - -e 's,#!/bin/bash,#!${stdenv.shell},' \ - -i "$f" - done - - sed 's,#!/usr/bin/python,#!${python3.interpreter},' -i hip_prof_gen.py - - sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \ - -e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \ - -e 's,^\($HIP_COMPILER=\).*$,\1"clang";,' \ - -e 's,^\($HIP_RUNTIME=\).*$,\1"ROCclr";,' \ - -e 's,^\([[:space:]]*$HSA_PATH=\).*$,\1"${rocm-runtime}";,'g \ - -e 's,^\([[:space:]]*\)$HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include");,\1$HIP_CLANG_INCLUDE_PATH = "${llvm}/lib/clang/$HIP_CLANG_VERSION/include";,' \ - -e 's,^\([[:space:]]*$HIPCXXFLAGS .= " -isystem \\"$HIP_CLANG_INCLUDE_PATH/..\\"\)";,\1 -isystem ${rocm-runtime}/include";,' \ - -e 's,$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION,$HIP_CLANG_PATH/../resource-root,g' \ - -e 's,`file,`${file}/bin/file,g' \ - -e 's,`readelf,`${binutils-unwrapped}/bin/readelf,' \ - -e 's, ar , ${binutils-unwrapped}/bin/ar ,g' \ - -i bin/hipcc.pl - - sed -e 's,^\($HSA_PATH=\).*$,\1"${rocm-runtime}";,' \ - -e 's,^\($HIP_CLANG_PATH=\).*$,\1"${clang}/bin";,' \ - -e 's,^\($HIP_PLATFORM=\).*$,\1"amd";,' \ - -e 's,$HIP_CLANG_PATH/llc,${llvm}/bin/llc,' \ - -e 's, abs_path, Cwd::abs_path,' \ - -i bin/hipconfig.pl - - sed -e 's, abs_path, Cwd::abs_path,' -i bin/hipvars.pm - ''; - - buildPhase = ""; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r * $out/ - - runHook postInstall - ''; - - meta = with lib; { - description = "C++ Heterogeneous-Compute Interface for Portability"; - homepage = "https://github.com/ROCm-Developer-Tools/HIP"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - }; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "hip"; - version = "5.4.0"; + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ]; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; @@ -116,105 +64,115 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VL0vZVv099pZPX0J2pXPFvrhkVO/b6X+ZZDaD9B1hYI="; }; - nativeBuildInputs = [ cmake python3 makeWrapper perl ]; - buildInputs = [ libxml2 numactl libglvnd libX11 python3Packages.cppheaderparser ]; - propagatedBuildInputs = [ - clang - llvm - rocm-comgr - rocm-device-libs - rocm-runtime - rocm-thunk - rocminfo - ]; - patches = [ (substituteAll { - src = ./hipamd-config-paths.patch; - inherit clang llvm hip; + src = ./0000-fixup-paths.patch; + inherit llvm; + clang = stdenv.cc; rocm_runtime = rocm-runtime; }) + + # https://github.com/ROCm-Developer-Tools/hipamd/commit/be33ec55acc104a59d01df5912261d007c7f3ee9 + (fetchpatch { + url = "https://github.com/ROCm-Developer-Tools/hipamd/commit/be33ec55acc104a59d01df5912261d007c7f3ee9.patch"; + hash = "sha256-eTC4mUIN1FwRce1n38uDOlITFL/vpcOhvnaZTo5R7lo="; + }) ]; - prePatch = '' - sed -e 's,#!/bin/bash,#!${stdenv.shell},' \ - -i src/hip_embed_pch.sh - ''; + nativeBuildInputs = [ + makeWrapper + cmake + perl + python3Packages.python + python3Packages.cppheaderparser + ] ++ lib.optionals buildDocs [ + doxygen + graphviz + fontconfig + ]; - preConfigure = '' - export HIP_CLANG_PATH=${clang}/bin - export DEVICE_LIB_PATH=${rocm-device-libs}/lib - ''; + buildInputs = [ + numactl + libxml2 + libX11 + libglvnd + ]; + + propagatedBuildInputs = [ + stdenv.cc + llvm + rocminfo + rocm-thunk + rocm-comgr + rocm-device-libs + rocm-runtime + rocm-opencl-runtime + ] ++ lib.optionals useNVIDIA [ + cudatoolkit + ]; cmakeFlags = [ - "-DHIP_PLATFORM=amd" - "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}" - "-DHIP_COMMON_DIR=${hip}" + "-DROCM_PATH=${rocminfo}" + "-DHIP_PLATFORM=${hipPlatform}" + "-DHIP_COMMON_DIR=${hip-common}" + "-DHIPCC_BIN_DIR=${hipcc}/bin" + "-DHIP_LLVM_ROOT=${stdenv.cc}" "-DROCCLR_PATH=${rocclr}" - "-DHIP_VERSION_BUILD_ID=0" + "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}" + "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" # Temporarily set variables to work around upstream CMakeLists issue # Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" + ] ++ lib.optionals buildTests [ + "-DHIP_CATCH_TEST=1" ]; + postPatch = '' + export HIP_CLANG_PATH=${stdenv.cc}/bin + patchShebangs src + '' + lib.optionalString buildDocs '' + export HOME=$(mktemp -d) + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + ''; + + doCheck = buildTests; + checkTarget = "build_tests"; + + preCheck = lib.optionalString buildTests '' + export ROCM_PATH=$PWD + export DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode + patchShebangs bin + ''; + postInstall = '' patchShebangs $out/bin - wrapProgram $out/bin/hipcc --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin --prefix PATH : ${llvm}/bin --set ROCM_PATH $out - wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin + cp -a $out/bin/hipcc $out/bin/hipcc-pl + cp -a $out/bin/hipconfig $out/bin/hipconfig-pl + wrapProgram $out/bin/hipcc --set HIP_USE_PERL_SCRIPTS 0 + wrapProgram $out/bin/hipconfig --set HIP_USE_PERL_SCRIPTS 0 + wrapProgram $out/bin/hipcc.bin ${lib.concatStringsSep " " wrapperArgs} + wrapProgram $out/bin/hipconfig.bin ${lib.concatStringsSep " " wrapperArgs} + wrapProgram $out/bin/hipcc-pl --set HIP_USE_PERL_SCRIPTS 1 + wrapProgram $out/bin/hipconfig-pl --set HIP_USE_PERL_SCRIPTS 1 + wrapProgram $out/bin/hipcc.pl ${lib.concatStringsSep " " wrapperArgs} + wrapProgram $out/bin/hipconfig.pl ${lib.concatStringsSep " " wrapperArgs} ''; - # TODO: Separate HIP and hipamd into separate derivations - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github - version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - - IFS='.' read -a version_arr <<< "$version" - - if [ "''${#version_arr[*]}" == 2 ]; then - version="''${version}.0" - fi - - current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | head -n1 | cut -d'"' -f2)" - if [[ "$version" != "$current_version" ]]; then - tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools HIP --rev "rocm-$version")" - tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" - sed -i -z "pkgs/development/compilers/hip/default.nix" \ - -e 's,version = "[^'"'"'"]*",version = "'"$version"'",1' \ - -e 's,hash = "[^'"'"'"]*",hash = "sha256-'"$tarball_hash"'",1' - else - echo hip already up-to-date - fi - - version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - - IFS='.' read -a version_arr <<< "$version" - - if [ "''${#version_arr[*]}" == 2 ]; then - version="''${version}.0" - fi - - current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | tail -n1 | cut -d'"' -f2)" - if [[ "$version" != "$current_version" ]]; then - tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools hipamd --rev "rocm-$version")" - tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" - sed -i -z "pkgs/development/compilers/hip/default.nix" \ - -e 's,version = "[^'"'"'"]*",version = "'"$version"'",2' \ - -e 's,hash = "[^'"'"'"]*",hash = "sha256-'"$tarball_hash"'",2' - else - echo hipamd already up-to-date - fi - ''; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; meta = with lib; { - description = "C++ Heterogeneous-Compute Interface for Portability"; + description = "C++ Heterogeneous-Compute Interface for Portability specifically for AMD platform"; homepage = "https://github.com/ROCm-Developer-Tools/hipamd"; - license = licenses.mit; + license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + # Tests require GPU, also include issues + broken = finalAttrs.version != hip-common.version || finalAttrs.version != hipcc.version || buildTests; }; }) diff --git a/pkgs/development/compilers/hip/hip-config-paths.patch b/pkgs/development/compilers/hip/hip-config-paths.patch deleted file mode 100644 index 25fa3b8da95a..000000000000 --- a/pkgs/development/compilers/hip/hip-config-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in -index 1a72643a..7f35031f 100644 ---- a/hip-lang-config.cmake.in -+++ b/hip-lang-config.cmake.in -@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) - - - #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY --file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include") --file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") -+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@llvm@/lib/clang/*/include") -+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@llvm@/lib/clang/*/include") - find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h - HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} - ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} -@@ -87,9 +87,7 @@ endif() - #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH= - find_path(HSA_HEADER hsa/hsa.h - PATHS -- "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY -- "${_IMPORT_PREFIX}/include" -- "${ROCM_PATH}/include" -+ "@rocm_runtime@/include" - ) - - if (NOT HSA_HEADER) -@@ -97,7 +94,7 @@ if (HSA_HEADER-NOTFOUND) - endif() - - get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) --file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*") -+file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@llvm@/lib/clang/*/lib/*") - find_library(CLANGRT_BUILTINS - NAMES - clang_rt.builtins diff --git a/pkgs/development/compilers/hip/hipamd-config-paths.patch b/pkgs/development/compilers/hip/hipamd-config-paths.patch deleted file mode 100644 index 78838836e9aa..000000000000 --- a/pkgs/development/compilers/hip/hipamd-config-paths.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/hip-config.cmake.in b/hip-config.cmake.in -index 89d1224e..120b68c6 100755 ---- a/hip-config.cmake.in -+++ b/hip-config.cmake.in -@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang") - file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT) - endif() - else() -- set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm") -+ set(HIP_CLANG_ROOT "@clang@") - endif() - if(NOT HIP_CXX_COMPILER) - set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) -@@ -206,10 +206,7 @@ if(NOT WIN32) - #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH= - find_path(HSA_HEADER hsa/hsa.h - PATHS -- "${_IMPORT_PREFIX}/include" -- #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility -- "${_IMPORT_PREFIX}/../include" -- ${ROCM_PATH}/include -+ "@rocm_runtime@/include" - ) - - if (NOT HSA_HEADER) -@@ -224,8 +221,8 @@ set_target_properties(hip::host PROPERTIES - - if(HIP_RUNTIME MATCHES "rocclr") - set_target_properties(hip::amdhip64 PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}" -- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}" -+ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}" -+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}" - ) - - get_target_property(amdhip64_type hip::amdhip64 TYPE) -@@ -233,8 +230,8 @@ if(HIP_RUNTIME MATCHES "rocclr") - - if(NOT WIN32) - set_target_properties(hip::device PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" -- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" -+ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include" -+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include" - ) - endif() - endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 83866d83..4125d3aa 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -178,7 +178,7 @@ if(__HIP_ENABLE_PCH) - ${ROCM_PATH}/llvm) - # find_package(LLVM) returns the lib/cmake/llvm location. We require the root. - if(NOT DEFINED HIP_LLVM_ROOT) -- set(HIP_LLVM_ROOT "${LLVM_DIR}/../../..") -+ set(HIP_LLVM_ROOT "@clang@") - endif() - - execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/hip_embed_pch.sh ${HIP_COMMON_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC) -diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh -index 0a1572b2..aa855d63 100755 ---- a/src/hip_embed_pch.sh -+++ b/src/hip_embed_pch.sh -@@ -149,7 +149,7 @@ EOF - - $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui && - -- $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && -+ @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && - - rm -rf $tmp - } diff --git a/pkgs/development/compilers/hipcc/0000-fixup-paths.patch b/pkgs/development/compilers/hipcc/0000-fixup-paths.patch new file mode 100644 index 000000000000..4f52c1ad11aa --- /dev/null +++ b/pkgs/development/compilers/hipcc/0000-fixup-paths.patch @@ -0,0 +1,130 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c21f247..5bd3e45 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,6 +17,6 @@ if (NOT WIN32) # C++17 does not require the std lib linking + target_link_libraries(hipconfig.bin ${LINK_LIBS} ) # for hipconfig.bin + endif() + +-set(HIP_VERSION_MAJOR 4 PARENT_SCOPE) +-set(HIP_VERSION_MINOR 4 PARENT_SCOPE) +-set(HIP_VERSION_PATCH 4 PARENT_SCOPE) ++set(HIP_VERSION_MAJOR @version_major@) ++set(HIP_VERSION_MINOR @version_minor@) ++set(HIP_VERSION_PATCH @version_patch@) +diff --git a/src/hipBin_amd.h b/src/hipBin_amd.h +index f94e4a5..f0b1b83 100644 +--- a/src/hipBin_amd.h ++++ b/src/hipBin_amd.h +@@ -207,7 +207,7 @@ void HipBinAmd::initializeHipCXXFlags() { + hipClangIncludePath = getCompilerIncludePath(); + hipCXXFlags += " -isystem \"" + hipClangIncludePath; + fs::path hipCXXFlagsTempFs = hipCXXFlags; +- hipCXXFlagsTempFs /= "..\""; ++ hipCXXFlagsTempFs /= "\""; + hipCXXFlags = hipCXXFlagsTempFs.string(); + const EnvVariables& var = getEnvVariables(); + // Allow __fp16 as function parameter and return type. +@@ -266,7 +266,7 @@ void HipBinAmd::printCompilerInfo() const { + string cmd = hipClangPath + "/clang++ --version"; + system(cmd.c_str()); // hipclang version + cout << "llc-version :" << endl; +- cmd = hipClangPath + "/llc --version"; ++ cmd = "@llvm@/bin/llc --version"; + system(cmd.c_str()); // llc version + cout << "hip-clang-cxxflags :" << endl; + cmd = hipPath + "/bin/hipcc --cxxflags"; +@@ -278,7 +278,7 @@ void HipBinAmd::printCompilerInfo() const { + } else { + string cmd = hipClangPath + "/clang++ --version"; + system(cmd.c_str()); // hipclang version +- cmd = hipClangPath + "/llc --version"; ++ cmd = "@llvm@/bin/llc --version"; + system(cmd.c_str()); // llc version + cout << "hip-clang-cxxflags :" << endl; + cmd = hipPath + "/bin/hipcc --cxxflags"; +@@ -331,10 +331,7 @@ string HipBinAmd::getCppConfig() { + hipPathInclude /= "include"; + + const string& compilerPath = getCompilerPath(); +- hipClangInclude = compilerPath; +- hipClangInclude = hipClangInclude.parent_path(); +- hipClangInclude /= "lib/clang/"; +- hipClangInclude /= compilerVersion; ++ hipClangInclude = "@clang@/resource-root/include"; + string hipClangPath = hipClangInclude.string(); + + const OsType& osInfo = getOSInfo(); +@@ -442,17 +439,7 @@ string HipBinAmd::getHipCC() const { + + + string HipBinAmd::getCompilerIncludePath() { +- string hipClangVersion, includePath, compilerIncludePath; +- const string& hipClangPath = getCompilerPath(); +- hipClangVersion = getCompilerVersion(); +- fs::path includePathfs = hipClangPath; +- includePathfs = includePathfs.parent_path(); +- includePathfs /= "lib/clang/"; +- includePathfs /= hipClangVersion; +- includePathfs /= "include"; +- includePathfs = fs::absolute(includePathfs).string(); +- compilerIncludePath = includePathfs.string(); +- return compilerIncludePath; ++ return "@clang@/resource-root/include"; + } + + +@@ -506,8 +493,8 @@ void HipBinAmd::printFull() { + cout << endl << "== Envirnoment Variables" << endl; + printEnvironmentVariables(); + getSystemInfo(); +- if (fs::exists("/usr/bin/lsb_release")) +- system("/usr/bin/lsb_release -a"); ++ if (fs::exists("@lsb_release@/bin/lsb_release")) ++ system("@lsb_release@/bin/lsb_release -a"); + cout << endl; + } + +@@ -993,7 +980,7 @@ void HipBinAmd::executeHipCCCmd(vector argv) { + } else if (os != windows) { + // Else try using rocm_agent_enumerator + string ROCM_AGENT_ENUM; +- ROCM_AGENT_ENUM = roccmPath + "/bin/rocm_agent_enumerator"; ++ ROCM_AGENT_ENUM = "@rocminfo@/bin/rocm_agent_enumerator"; + targetsStr = ROCM_AGENT_ENUM +" -t GPU"; + SystemCmdOut sysOut = hipBinUtilPtr_->exec(targetsStr.c_str()); + regex toReplace("\n+"); +@@ -1097,7 +1084,7 @@ void HipBinAmd::executeHipCCCmd(vector argv) { + string hipClangVersion, toolArgTemp; + if (linkType == 0) { + toolArgTemp = " -L"+ hipLibPath + "-lamdhip64 -L" + +- roccmPath+ "/lib -lhsa-runtime64 -ldl -lnuma " + toolArgs; ++ "@rocm_runtime@/lib -lhsa-runtime64 -ldl -lnuma " + toolArgs; + toolArgs = toolArgTemp; + } else { + toolArgTemp = toolArgs + " -Wl,--enable-new-dtags -Wl,-rpath=" + hipLibPath + ":" +@@ -1107,8 +1094,7 @@ void HipBinAmd::executeHipCCCmd(vector argv) { + + hipClangVersion = getCompilerVersion(); + // To support __fp16 and _Float16, explicitly link with compiler-rt +- toolArgs += " -L" + hipClangPath + "/../lib/clang/" + +- hipClangVersion + "/lib/linux -lclang_rt.builtins-x86_64 "; ++ toolArgs += " -L@clang@/resource-root/lib/linux -lclang_rt.builtins-x86_64 "; + } + if (!var.hipccCompileFlagsAppendEnv_.empty()) { + HIPCXXFLAGS += " " + var.hipccCompileFlagsAppendEnv_ + " "; +diff --git a/src/hipBin_nvidia.h b/src/hipBin_nvidia.h +index 6feb315..b61739d 100644 +--- a/src/hipBin_nvidia.h ++++ b/src/hipBin_nvidia.h +@@ -157,8 +157,8 @@ void HipBinNvidia::printFull() { + cout << endl << "== Envirnoment Variables" << endl; + printEnvironmentVariables(); + getSystemInfo(); +- if (fs::exists("/usr/bin/lsb_release")) +- system("/usr/bin/lsb_release -a"); ++ if (fs::exists("@lsb_release@/bin/lsb_release")) ++ system("@lsb_release@/bin/lsb_release -a"); + } + + // returns hip include diff --git a/pkgs/development/compilers/hipcc/default.nix b/pkgs/development/compilers/hipcc/default.nix new file mode 100644 index 000000000000..8351e3a29123 --- /dev/null +++ b/pkgs/development/compilers/hipcc/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, substituteAll +, cmake +, llvm +, rocm-runtime +, rocminfo +, lsb-release +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hipcc"; + version = "5.4.1"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "HIPCC"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-PEwue4O43MiMkF8UmTeHsmlikBG2V3/nFQLKmtHrRWQ="; + }; + + patches = [ + (substituteAll { + src = ./0000-fixup-paths.patch; + inherit llvm rocminfo; + version_major = lib.versions.major finalAttrs.version; + version_minor = lib.versions.minor finalAttrs.version; + version_patch = lib.versions.patch finalAttrs.version; + clang = stdenv.cc; + rocm_runtime = rocm-runtime; + lsb_release = lsb-release; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv *.bin $out/bin + + runHook postInstall + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Compiler driver utility that calls clang or nvcc"; + homepage = "https://github.com/ROCm-Developer-Tools/HIPCC"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; + platforms = platforms.linux; + broken = finalAttrs.version != stdenv.cc.version; + }; +}) diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh index 68ba3ed3a920..47459664af0a 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh +++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh @@ -1,4 +1,5 @@ # -*- shell-script -*- +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup function extract diff --git a/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch b/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch new file mode 100644 index 000000000000..2811df7d29f7 --- /dev/null +++ b/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch @@ -0,0 +1,18 @@ +diff --git a/libomptarget/plugins/amdgpu/impl/impl.cpp b/libomptarget/plugins/amdgpu/impl/impl.cpp +index 80e024789..3a14e0889 100644 +--- a/libomptarget/plugins/amdgpu/impl/impl.cpp ++++ b/libomptarget/plugins/amdgpu/impl/impl.cpp +@@ -21,10 +21,11 @@ bool is_locked(void *ptr, hsa_status_t *err_p, void **agentBaseAddress) { + info.size = sizeof(hsa_amd_pointer_info_t); + err = hsa_amd_pointer_info(ptr, &info, nullptr, nullptr, nullptr); + +- if (err != HSA_STATUS_SUCCESS) ++ if (err != HSA_STATUS_SUCCESS) { + DP("Error when getting pointer info\n"); +- else ++ } else { + is_locked = (info.type == HSA_EXT_POINTER_TYPE_LOCKED); ++ } + + if (is_locked && agentBaseAddress != nullptr) { + // When user passes in a basePtr+offset we need to fix the diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index 7ff3c4bfa110..75314a4b4633 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,54 +1,600 @@ -{ stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: +{ lib +, stdenv +, callPackage +, overrideCC +, wrapCCWith +, wrapBintoolsWith +, runCommand +, lit +, glibc +, spirv-llvm-translator +, xz +, swig +, lua5_3 +, gtest +, hip +, rocm-comgr +, vulkan-loader +, vulkan-headers +, glslang +, shaderc +, perl +, rocm-device-libs +, rocm-runtime +, elfutils +, python3Packages +}: let - version = "5.4.0"; - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "llvm-project"; - rev = "rocm-${version}"; - hash = "sha256-rlVo77h344PLGj/mIzsw+/ndWywsBsiKDXsEDpWSUno="; + # Stage 1 + # Base + llvm = callPackage ./llvm.nix { }; + + # Projects + clang-unwrapped = callPackage ./llvm.nix rec { + targetName = "clang"; + targetDir = targetName; + extraBuildInputs = [ llvm ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" + "-DCLANG_INCLUDE_DOCS=ON" + "-DCLANG_INCLUDE_TESTS=ON" + ]; + + extraPostPatch = '' + # Looks like they forgot to add finding libedit to the standalone build + ln -s ../cmake/Modules/FindLibEdit.cmake cmake/modules + + substituteInPlace CMakeLists.txt \ + --replace "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)" + + # `No such file or directory: '/build/source/clang/tools/scan-build/bin/scan-build'` + rm test/Analysis/scan-build/*.test + rm test/Analysis/scan-build/rebuild_index/rebuild_index.test + + # `does not depend on a module exporting 'baz.h'` + rm test/Modules/header-attribs.cpp + + # `fatal error: 'stdio.h' file not found` + rm test/OpenMP/amdgcn_emit_llvm.c + ''; + + extraPostInstall = '' + mv bin/clang-tblgen $out/bin + ''; }; + + lld = callPackage ./llvm.nix rec { + buildMan = false; # No man pages to build + targetName = "lld"; + targetDir = targetName; + extraBuildInputs = [ llvm ]; + extraCMakeFlags = [ "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" ]; + checkTargets = [ "check-lld" ]; + }; + + # Runtimes + runtimes = callPackage ./llvm.nix { + buildDocs = false; + buildMan = false; + buildTests = false; + targetDir = "runtimes"; + + targetRuntimes = [ + # "libc" https://github.com/llvm/llvm-project/issues/57719 + "libunwind" + "libcxxabi" + "libcxx" + "compiler-rt" + ]; + + extraBuildInputs = [ llvm ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0114=NEW" + "-DLIBCXX_INCLUDE_BENCHMARKS=OFF" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; + + extraLicenses = [ lib.licenses.mit ]; + }; + + # Stage 2 + # Helpers + rStdenv = overrideCC stdenv (wrapCCWith rec { + inherit bintools; + libcxx = runtimes; + cc = clang-unwrapped; + + extraPackages = [ + llvm + lld + ]; + + nixSupport.cc-cflags = [ + "-resource-dir=$out/resource-root" + "-fuse-ld=lld" + "-rtlib=compiler-rt" + "-unwindlib=libunwind" + "-Wno-unused-command-line-argument" + ]; + + extraBuildCommands = '' + clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + mkdir -p $out/resource-root + ln -s ${cc}/lib/clang/$clang_version/include $out/resource-root + ln -s ${runtimes}/lib $out/resource-root + ''; + }); + + bintools = wrapBintoolsWith { bintools = bintools-unwrapped; }; + + bintools-unwrapped = runCommand "rocm-llvm-binutils-${llvm.version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/$(basename $prog) + done + + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/ar + ln -s ${llvm}/bin/llvm-as $out/bin/as + ln -s ${llvm}/bin/llvm-dwp $out/bin/dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/readelf + ln -s ${llvm}/bin/llvm-size $out/bin/size + ln -s ${llvm}/bin/llvm-strip $out/bin/strip + ln -s ${lld}/bin/lld $out/bin/ld + ''; in rec { + inherit + llvm + clang-unwrapped + lld + bintools + bintools-unwrapped; + + # Runtimes + libc = callPackage ./llvm.nix rec { + stdenv = rStdenv; + targetName = "libc"; + targetDir = "runtimes"; + targetRuntimes = [ targetName ]; + isBroken = true; # https://github.com/llvm/llvm-project/issues/57719 + }; + + libunwind = callPackage ./llvm.nix rec { + stdenv = rStdenv; + buildMan = false; # No man pages to build + targetName = "libunwind"; + targetDir = "runtimes"; + targetRuntimes = [ targetName ]; + + extraCMakeFlags = [ + "-DLIBUNWIND_INCLUDE_DOCS=ON" + "-DLIBUNWIND_INCLUDE_TESTS=ON" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + ]; + }; + + libcxxabi = callPackage ./llvm.nix rec { + stdenv = rStdenv; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + targetName = "libcxxabi"; + targetDir = "runtimes"; + + targetRuntimes = [ + "libunwind" + targetName + "libcxx" + ]; + + extraCMakeFlags = [ + "-DLIBCXXABI_INCLUDE_TESTS=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + + # Workaround having to build combined + "-DLIBUNWIND_INCLUDE_DOCS=OFF" + "-DLIBUNWIND_INCLUDE_TESTS=OFF" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + "-DLIBUNWIND_INSTALL_LIBRARY=OFF" + "-DLIBUNWIND_INSTALL_HEADERS=OFF" + "-DLIBCXX_INCLUDE_DOCS=OFF" + "-DLIBCXX_INCLUDE_TESTS=OFF" + "-DLIBCXX_USE_COMPILER_RT=ON" + "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_INSTALL_LIBRARY=OFF" + "-DLIBCXX_INSTALL_HEADERS=OFF" + ]; + }; + + libcxx = callPackage ./llvm.nix rec { + stdenv = rStdenv; + buildMan = false; # No man pages to build + targetName = "libcxx"; + targetDir = "runtimes"; + + targetRuntimes = [ + "libunwind" + "libcxxabi" + targetName + ]; + + extraCMakeFlags = [ + "-DLIBCXX_INCLUDE_DOCS=ON" + "-DLIBCXX_INCLUDE_TESTS=ON" + "-DLIBCXX_USE_COMPILER_RT=ON" + "-DLIBCXX_CXX_ABI=libcxxabi" + + # Workaround having to build combined + "-DLIBUNWIND_INCLUDE_DOCS=OFF" + "-DLIBUNWIND_INCLUDE_TESTS=OFF" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + "-DLIBUNWIND_INSTALL_LIBRARY=OFF" + "-DLIBUNWIND_INSTALL_HEADERS=OFF" + "-DLIBCXXABI_INCLUDE_TESTS=OFF" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + "-DLIBCXXABI_INSTALL_LIBRARY=OFF" + "-DLIBCXXABI_INSTALL_HEADERS=OFF" + ]; + + # Most of these can't find `bash` or `mkdir`, might just be hard-coded paths, or PATH is altered + extraPostPatch = '' + chmod +w -R ../libcxx/test/{libcxx,std} + rm -rf ../libcxx/test/libcxx/input.output/filesystems + rm ../libcxx/test/libcxx/selftest/remote-substitutions.sh.cpp + rm ../libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp + rm ../libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/pbackfail.pass.cpp + rm ../libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace_initializer_list.pass.cpp + rm ../libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp + rm -rf ../libcxx/test/std/utilities/optional/optional.object/optional.object.ctor + rm -rf ../libcxx/test/std/input.output/filesystems/{class.directory_entry,class.directory_iterator,class.rec.dir.itr,fs.op.funcs} + ''; + }; + + compiler-rt = callPackage ./llvm.nix rec { + stdenv = rStdenv; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + targetName = "compiler-rt"; + targetDir = "runtimes"; + + targetRuntimes = [ + "libunwind" + "libcxxabi" + "libcxx" + targetName + ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0114=NEW" + "-DCOMPILER_RT_INCLUDE_TESTS=ON" + "-DCOMPILER_RT_USE_LLVM_UNWINDER=ON" + "-DCOMPILER_RT_CXX_LIBRARY=libcxx" + "-DCOMPILER_RT_CAN_EXECUTE_TESTS=OFF" # We can't run most of these + + # Workaround having to build combined + "-DLIBUNWIND_INCLUDE_DOCS=OFF" + "-DLIBUNWIND_INCLUDE_TESTS=OFF" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + "-DLIBUNWIND_INSTALL_LIBRARY=OFF" + "-DLIBUNWIND_INSTALL_HEADERS=OFF" + "-DLIBCXXABI_INCLUDE_TESTS=OFF" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + "-DLIBCXXABI_INSTALL_LIBRARY=OFF" + "-DLIBCXXABI_INSTALL_HEADERS=OFF" + "-DLIBCXX_INCLUDE_DOCS=OFF" + "-DLIBCXX_INCLUDE_TESTS=OFF" + "-DLIBCXX_USE_COMPILER_RT=ON" + "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_INSTALL_LIBRARY=OFF" + "-DLIBCXX_INSTALL_HEADERS=OFF" + ]; + + extraPostPatch = '' + # `No such file or directory: 'ldd'` + substituteInPlace ../compiler-rt/test/lit.common.cfg.py \ + --replace "'ldd'," "'${glibc.bin}/bin/ldd'," + + # We can run these + substituteInPlace ../compiler-rt/test/CMakeLists.txt \ + --replace "endfunction()" "endfunction()''\nadd_subdirectory(builtins)''\nadd_subdirectory(shadowcallstack)" + ''; + + extraLicenses = [ lib.licenses.mit ]; + }; + + # Stage 3 + # Helpers + rocmClangStdenv = overrideCC stdenv clang; + clang = wrapCCWith rec { - cc = llvm; + # inherit libc libcxx bintools; + inherit libcxx bintools; + + # We do this to avoid HIP pathing problems, and mimic a monolithic install + cc = stdenv.mkDerivation (finalAttrs: { + inherit (clang-unwrapped) pname version; + dontUnpack = true; + + installPhase = '' + runHook preInstall + + clang_version=`${clang-unwrapped}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + mkdir -p $out/{bin,include/c++/v1,lib/{cmake,clang/$clang_version/{include,lib}},libexec,share} + + for path in ${llvm} ${clang-unwrapped} ${lld} ${libunwind} ${libcxxabi} ${libcxx} ${compiler-rt}; do + cp -as $path/* $out + chmod +w $out/{*,include/c++/v1,lib/{clang/$clang_version/include,cmake}} + rm -f $out/lib/libc++.so + done + + ln -s $out/lib/* $out/lib/clang/$clang_version/lib + ln -s $out/include/* $out/lib/clang/$clang_version/include + + runHook postInstall + ''; + + passthru.isClang = true; + }); + + extraPackages = [ + llvm + lld + libunwind + libcxxabi + compiler-rt + ]; + + nixSupport.cc-cflags = [ + "-resource-dir=$out/resource-root" + "-fuse-ld=lld" + "-rtlib=compiler-rt" + "-unwindlib=libunwind" + "-Wno-unused-command-line-argument" + ]; + extraBuildCommands = '' clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" - ln -s "${cc}/lib/clang/$clang_version/lib" "$rsrc/lib" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags + mkdir -p $out/resource-root + ln -s ${cc}/lib/clang/$clang_version/{include,lib} $out/resource-root + + # Not sure why, but hardening seems to make things break rm $out/nix-support/add-hardening.sh touch $out/nix-support/add-hardening.sh - # GPU compilation uses builtin lld - substituteInPlace $out/bin/clang \ - --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' - substituteInPlace $out/bin/clang++ \ - --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' + + # GPU compilation uses builtin `lld` + substituteInPlace $out/bin/{clang,clang++} \ + --replace "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;" ''; }; - clangNoCompilerRt = wrapCCWith rec { - cc = llvm; - extraBuildCommands = '' - clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags - rm $out/nix-support/add-hardening.sh - touch $out/nix-support/add-hardening.sh - # GPU compilation uses builtin lld - substituteInPlace $out/bin/clang \ - --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' - substituteInPlace $out/bin/clang++ \ - --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' + # Base + # Unfortunately, we cannot build `clang-tools-extra` separately. + clang-tools-extra = callPackage ./llvm.nix { + stdenv = rocmClangStdenv; + buildTests = false; # `invalid operands to binary expression ('std::basic_stringstream' and 'const llvm::StringRef')` + targetName = "clang-tools-extra"; + + targetProjects = [ + "clang" + "clang-tools-extra" + ]; + + extraBuildInputs = [ gtest ]; + + extraCMakeFlags = [ + "-DLLVM_INCLUDE_DOCS=OFF" + "-DLLVM_INCLUDE_TESTS=OFF" + "-DCLANG_INCLUDE_DOCS=OFF" + "-DCLANG_INCLUDE_TESTS=ON" + "-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON" + ]; + + extraPostInstall = '' + # Remove LLVM and Clang + for path in `find ${llvm} ${clang-unwrapped}`; do + if [ $path != ${llvm} ] && [ $path != ${clang-unwrapped} ]; then + rm -f $out''${path#${llvm}} $out''${path#${clang-unwrapped}} || true + fi + done + + # Cleanup empty directories + find $out -type d -empty -delete ''; }; - llvm = callPackage ./llvm.nix { - inherit src version; + # Projects + libclc = let + spirv = (spirv-llvm-translator.override { inherit llvm; }); + in callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + targetName = "libclc"; + targetDir = targetName; + extraBuildInputs = [ spirv ]; + + # `spirv-mesa3d` isn't compiling with LLVM 15.0.0, it does with LLVM 14.0.0 + # Try removing the `spirv-mesa3d` and `clspv` patches next update + # `clspv` tests fail, unresolved calls + extraPostPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ + "find_program( LLVM_CLANG clang PATHS \"${clang}/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}/bin\" NO_DEFAULT_PATH )" \ + --replace " spirv-mesa3d-" "" \ + --replace " spirv64-mesa3d-" "" \ + --replace "NOT \''${t} MATCHES" \ + "NOT \''${ARCH} STREQUAL \"clspv\" AND NOT \''${ARCH} STREQUAL \"clspv64\" AND NOT \''${t} MATCHES" + ''; + + checkTargets = [ ]; + }; + + lldb = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildTests = false; # ld.lld: error: unable to find library -lllvm_gtest_main + targetName = "lldb"; + targetDir = targetName; + extraNativeBuildInputs = [ python3Packages.sphinx-automodapi ]; + + extraBuildInputs = [ + xz + swig + lua5_3 + gtest + ]; + + extraCMakeFlags = [ + "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" + "-DLLDB_INCLUDE_TESTS=ON" + "-DLLDB_INCLUDE_UNITTESTS=ON" + ]; + }; + + mlir = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildDocs = false; # No decent way to hack this to work + buildMan = false; # No man pages to build + targetName = "mlir"; + targetDir = targetName; + extraNativeBuildInputs = [ hip ]; + + extraBuildInputs = [ + rocm-comgr + vulkan-headers + vulkan-loader + glslang + shaderc + ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" + "-DMLIR_INCLUDE_DOCS=ON" + "-DMLIR_INCLUDE_TESTS=ON" + "-DMLIR_ENABLE_ROCM_RUNNER=ON" + "-DMLIR_ENABLE_SPIRV_CPU_RUNNER=ON" + "-DMLIR_ENABLE_VULKAN_RUNNER=ON" + "-DROCM_TEST_CHIPSET=gfx000" # CPU runner + ]; + + extraPostPatch = '' + chmod +w ../llvm + mkdir -p ../llvm/build/bin + ln -s ${lit}/bin/lit ../llvm/build/bin/llvm-lit + + substituteInPlace test/CMakeLists.txt \ + --replace "FileCheck count not" "" \ + --replace "list(APPEND MLIR_TEST_DEPENDS mlir_rocm_runtime)" "" + + substituteInPlace lib/ExecutionEngine/CMakeLists.txt \ + --replace "return()" "" + + # Remove problematic tests + rm test/CAPI/execution_engine.c + rm test/Target/LLVMIR/llvmir-intrinsics.mlir + rm test/Target/LLVMIR/llvmir.mlir + rm test/Target/LLVMIR/openmp-llvm.mlir + rm test/mlir-cpu-runner/*.mlir + rm test/mlir-vulkan-runner/*.mlir + ''; + + extraPostInstall = '' + mkdir -p $out/bin + mv bin/mlir-tblgen $out/bin + ''; + + checkTargets = [ "check-${targetName}" ]; + }; + + polly = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + targetName = "polly"; + targetDir = targetName; + checkTargets = [ "check-${targetName}" ]; + }; + + flang = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildTests = false; # `Executable "flang1" doesn't exist!` + targetName = "flang"; + targetDir = targetName; + extraNativeBuildInputs = [ python3Packages.sphinx-markdown-tables ]; + extraBuildInputs = [ mlir ]; + + extraCMakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" + "-DCLANG_DIR=${clang-unwrapped}/lib/cmake/clang" + "-DFLANG_INCLUDE_TESTS=OFF" + "-DMLIR_TABLEGEN_EXE=${mlir}/bin/mlir-tblgen" + ]; + + extraPostPatch = '' + substituteInPlace test/CMakeLists.txt \ + --replace "FileCheck" "" \ + --replace "count" "" \ + --replace "not" "" + + substituteInPlace docs/CMakeLists.txt \ + --replace "CLANG_TABLEGEN_EXE clang-tblgen" "CLANG_TABLEGEN_EXE ${clang-unwrapped}/bin/clang-tblgen" + ''; + }; + + openmp = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildTests = false; # Too many failures, most pass + targetName = "openmp"; + targetDir = targetName; + extraPatches = [ ./0000-fix-openmp.patch ]; + extraNativeBuildInputs = [ perl ]; + + extraBuildInputs = [ + rocm-device-libs + rocm-runtime + elfutils + ]; + + extraCMakeFlags = [ + "-DCMAKE_MODULE_PATH=/build/source/llvm/cmake/modules" # For docs + "-DCLANG_TOOL=${clang}/bin/clang" + "-DCLANG_OFFLOAD_BUNDLER_TOOL=${clang-unwrapped}/bin/clang-offload-bundler" + "-DOPENMP_LLVM_TOOLS_DIR=${llvm}/bin" + "-DOPENMP_LLVM_LIT_EXECUTABLE=${lit}/bin/.lit-wrapped" + "-DDEVICELIBS_ROOT=${rocm-device-libs.src}" + ]; + + extraPostPatch = '' + # We can't build this target at the moment + substituteInPlace libomptarget/DeviceRTL/CMakeLists.txt \ + --replace "gfx1010" "" + ''; + + checkTargets = [ "check-${targetName}" ]; + extraLicenses = [ lib.licenses.mit ]; + }; + + # Runtimes + pstl = callPackage ./llvm.nix rec { + stdenv = rocmClangStdenv; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + buildTests = false; # Too many errors + targetName = "pstl"; + targetDir = "runtimes"; + targetRuntimes = [ targetName ]; + checkTargets = [ "check-${targetName}" ]; }; } diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index b148b936ca56..731c0557bf2e 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -1,22 +1,44 @@ -{ stdenv -, lib -, fetchgit +{ lib +, stdenv , fetchFromGitHub -, writeScript +, rocmUpdateScript +, pkg-config , cmake , ninja -, python3 +, git +, doxygen +, sphinx +, lit , libxml2 -, libffi -, libbfd , libxcrypt -, ncurses +, libedit +, libffi +, mpfr , zlib -, debugVersion ? false -, enableManpages ? false - -, version -, src +, ncurses +, python3Packages +, buildDocs ? true +, buildMan ? true +, buildTests ? true +, targetName ? "llvm" +, targetDir ? "llvm" +, targetProjects ? [ ] +, targetRuntimes ? [ ] +, extraPatches ? [ ] +, extraNativeBuildInputs ? [ ] +, extraBuildInputs ? [ ] +, extraCMakeFlags ? [ ] +, extraPostPatch ? "" +, checkTargets ? [( + lib.optionalString buildTests ( + if targetDir == "runtimes" + then "check-runtimes" + else "check-all" + ) +)] +, extraPostInstall ? "" +, extraLicenses ? [ ] +, isBroken ? false }: let @@ -25,73 +47,119 @@ let else if stdenv.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { - inherit src version; + pname = "rocm-llvm-${targetName}"; + version = "5.4.1"; - pname = "rocm-llvm"; - - sourceRoot = "${src.name}/llvm"; - - nativeBuildInputs = [ cmake ninja python3 ]; - - buildInputs = [ libxml2 libxcrypt ]; - - propagatedBuildInputs = [ ncurses zlib ]; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" - "-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt" - ] - ++ lib.optionals enableManpages [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildMan [ + "man" + "info" # Avoid `attribute 'info' missing` when using with wrapCC ]; - postPatch = '' + patches = extraPatches; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "llvm-project"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-rlVo77h344PLGj/mIzsw+/ndWywsBsiKDXsEDpWSUno="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ninja + git + python3Packages.python + ] ++ lib.optionals (buildDocs || buildMan) [ + doxygen + sphinx + python3Packages.recommonmark + ] ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [ + lit + ] ++ extraNativeBuildInputs; + + buildInputs = [ + libxml2 + libxcrypt + libedit + libffi + mpfr + ] ++ extraBuildInputs; + + propagatedBuildInputs = lib.optionals finalAttrs.passthru.isLLVM [ + zlib + ncurses + ]; + + sourceRoot = "${finalAttrs.src.name}/${targetDir}"; + + cmakeFlags = [ + "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" + ] ++ lib.optionals (finalAttrs.passthru.isLLVM && targetProjects != [ ]) [ + "-DLLVM_ENABLE_PROJECTS=${lib.concatStringsSep ";" targetProjects}" + ] ++ lib.optionals ((finalAttrs.passthru.isLLVM || targetDir == "runtimes") && targetRuntimes != [ ]) [ + "-DLLVM_ENABLE_RUNTIMES=${lib.concatStringsSep ";" targetRuntimes}" + ] ++ lib.optionals (finalAttrs.passthru.isLLVM || finalAttrs.passthru.isClang) [ + "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_ENABLE_EH=ON" + ] ++ lib.optionals (buildDocs || buildMan) [ + "-DLLVM_INCLUDE_DOCS=ON" + "-DLLVM_BUILD_DOCS=ON" + # "-DLLVM_ENABLE_DOXYGEN=ON" Way too slow, only uses one core + "-DLLVM_ENABLE_SPHINX=ON" + "-DLLVM_ENABLE_OCAMLDOC=OFF" + "-DSPHINX_OUTPUT_HTML=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals buildTests [ + "-DLLVM_INCLUDE_TESTS=ON" + "-DLLVM_BUILD_TESTS=ON" + ] ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [ + "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" + ] ++ extraCMakeFlags; + + postPatch = lib.optionalString finalAttrs.passthru.isLLVM '' patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh - substituteInPlace ../clang/cmake/modules/CMakeLists.txt \ - --replace 'FILES_MATCHING' 'NO_SOURCE_PERMISSIONS FILES_MATCHING' - ''; + '' + lib.optionalString (buildTests && finalAttrs.passthru.isLLVM) '' + # FileSystem permissions tests fail with various special bits + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + rm unittests/Support/Path.cpp + + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + '' + extraPostPatch; + + doCheck = buildTests; + checkTarget = lib.concatStringsSep " " checkTargets; + + postInstall = lib.optionalString finalAttrs.passthru.isLLVM '' + # `lit` expects these for some test suites + mv bin/{FileCheck,not,count,yaml2obj,obj2yaml} $out/bin + '' + lib.optionalString buildMan '' + mkdir -p $info + '' + extraPostInstall; passthru = { - isClang = true; + isLLVM = targetDir == "llvm"; + isClang = targetDir == "clang" || builtins.elem "clang" targetProjects; - updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github - - version="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - - IFS='.' read -a version_arr <<< "$version" - - if [ "''${#version_arr[*]}" == 2 ]; then - version="''${version}.0" - fi - - current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)" - if [[ "$version" != "$current_version" ]]; then - tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")" - tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" - sed -i "pkgs/development/compilers/llvm/rocm/default.nix" \ - -e 's,version = "\(.*\)",version = "'"$version"'",' \ - -e 's,hash = "\(.*\)",hash = "sha256-'"$tarball_hash"'",' - else - echo rocm-llvm already up-to-date - fi - ''; + updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; }; + }; meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; - license = with licenses; [ ncsa ]; + license = with licenses; [ ncsa ] ++ extraLicenses; maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + broken = isBroken; }; }) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index ce053e87130f..b9f0e856f65c 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nasm"; - version = "2.15.05"; + version = "2.16.01"; src = fetchurl { url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz"; - sha256 = "0gqand86b0r86k3h46dh560lykxmxqqywz5m55kgjfq7q4lngbrw"; + sha256 = "sha256-x3dF9IAjde/u4uxcCta38DfqnIfJKxSaljf/CZ8WJVg="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh index a1807682d867..88acc0654cf2 100644 --- a/pkgs/development/compilers/ocaml/builder.sh +++ b/pkgs/development/compilers/ocaml/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup configureFlags="-prefix $out $configureFlags" diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 820469ab8f15..72b25bff777b 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "15"; - build = "10"; + update = "17"; + build = "8"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; @@ -22,7 +22,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "le2JDxPJPSuga4JxLJNRZwCaodptSb2kh4TsJXumTXs="; + sha256 = "sha256-kvgLYqQZPqyuigVyzbDHc3TMff0clvzM8IdzYLYcxPU="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; @@ -131,12 +131,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index a8de9fe43ffc..bd3defbd6b98 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -135,12 +135,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 5b7e87b0ef3a..40dc753f7955 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -135,12 +135,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 1381b0995a76..047e1a390819 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -131,12 +131,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 6ea1d0b1dd31..c33e937f9f24 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -131,12 +131,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 0e1911bb1a70..461cd724144e 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -138,12 +138,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index bc92b1393fdb..6d8087d7e948 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -149,12 +149,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 600899677fed..37b51a1ee4ce 100644 --- a/pkgs/development/compilers/openjdk/18.nix +++ b/pkgs/development/compilers/openjdk/18.nix @@ -147,12 +147,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index fb4a273aed4f..717bfedcb635 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -149,12 +149,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index c232b1f01f16..c65a9fcc66b6 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -20,7 +20,7 @@ let powerpc64le-linux = "ppc64le"; }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); - update = "322"; + update = "352"; build = "ga"; openjdk8 = stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ let owner = "openjdk"; repo = "jdk8u"; rev = "jdk${version}"; - sha256 = "sha256-e39Yv+NDQG7z6fGmpKEnkKd5MoHZ50SXlq/Q7lzWcDA="; + sha256 = "sha256-xDiiALDjStD9IPhbBr997rm/v2Q/WdS10cILBCmdJIQ="; }; outputs = [ "out" "jre" ]; @@ -187,12 +187,12 @@ let postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="" - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do + for output in $(getAllOutputNames); do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 1bbb4e42dbc5..164677c3b8dc 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby +{ stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68 , openjdk11-bootstrap }: let major = "11"; - update = ".0.11"; + update = ".0.17"; build = "1"; repover = "${major}${update}+${build}"; - gradle_ = (gradle_4.override { + gradle_ = (gradle_7.override { java = openjdk11-bootstrap; }); @@ -24,12 +24,14 @@ let makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}-${build}"; - src = fetchurl { - url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; - sha256 = "sha256-mbEALUxuwbtlGeZ2Xsm3m3aNDdthLYWd6QHmdkAILxc="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx${major}u"; + rev = repover; + sha256 = "sha256-uKb6k+tIFdwy1BYiHWeGmKNz82X4CZjFlGYqLDpSFY0="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -44,8 +46,6 @@ let JDK_HOME = ${openjdk11-bootstrap.home} '' + args.gradleProperties or ""); - inherit NIX_CFLAGS_COMPILE; - buildPhase = '' runHook preBuild @@ -74,10 +74,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - # Downloaded AWT jars differ by platform. - outputHash = { - x86_64-linux = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa8="; - }.${stdenv.system} or (throw "Unsupported platform"); + outputHash = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa9="; }; in makePackage { @@ -85,7 +82,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = true - COMPILE_WEBKIT = true + COMPILE_WEBKIT = false ''; preBuild = '' @@ -99,8 +96,6 @@ in makePackage { cp -r build/modular-sdk $out ''; - inherit NIX_CFLAGS_COMPILE; - stripDebugList = [ "." ]; postFixup = '' diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index d2903c685a90..788baabde848 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5 +{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_6 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib , ffmpeg_4-headless, python3, ruby }: @@ -7,7 +7,7 @@ let update = ".0.1"; build = "+1"; repover = "${major}${update}${build}"; - gradle_ = (gradle_5.override { + gradle_ = (gradle_6.override { java = openjdk11_headless; }); @@ -69,10 +69,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - # Downloaded AWT jars differ by platform. - outputHash = { - x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw"; - }.${stdenv.system} or (throw "Unsupported platform"); + outputHash = "sha256-fGLTMM9s/Vn7eMzn6OQR3tL0cGbAYc7c4J4/aW3JvkI="; }; in makePackage { @@ -80,7 +77,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = true - COMPILE_WEBKIT = true + COMPILE_WEBKIT = false ''; preBuild = '' @@ -120,6 +117,9 @@ in makePackage { license = licenses.gpl2; description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; + knownVulnerabilities = [ + "This OpenJFX version has reached its end of life." + ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index 1c1fb89ce8e1..8d4d47df32e7 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -4,7 +4,7 @@ let major = "17"; - update = ".0.0.1"; + update = ".0.5"; build = "+1"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { @@ -16,9 +16,9 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx${major}u"; rev = repover; - sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw="; + sha256 = "sha256-jzLOlWuhkUS0/4+nXtjd1/IYbAHHnJrusFRTh7aPt8U="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 5ea72781e41f..771830d8b6ac 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,15 +1,28 @@ -{ lib, stdenv, fetchurl, meson, ninja -, gtk-doc ? null, file, docbook_xsl +{ lib +, stdenv +, fetchurl +, meson +, ninja +, file +, docbook_xsl +, gtk-doc ? null , buildDevDoc ? gtk-doc != null + +# for passthru.tests +, gnuradio +, gst_all_1 +, qt6 +, vips + }: let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "orc"; - version = "0.4.32"; + version = "0.4.33"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; - sha256 = "1w0qmyj3v9sb2g7ff39pp38b9850y9hyy0bag26ifrby5f7ksvm6"; + sha256 = "sha256-hE5tfbgIb3k/V2GNPUto0p2ZsWA05xQw3zwhz9PDVCo="; }; postPatch = lib.optionalString stdenv.isAarch32 '' @@ -35,6 +48,12 @@ in stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit (gst_all_1) gst-plugins-good gst-plugins-bad gst-plugins-ugly; + inherit gnuradio vips; + qt6-qtmultimedia = qt6.qtmultimedia; + }; + meta = with lib; { description = "The Oil Runtime Compiler"; homepage = "https://gstreamer.freedesktop.org/projects/orc.html"; diff --git a/pkgs/development/compilers/rust/1_65.nix b/pkgs/development/compilers/rust/1_66.nix similarity index 56% rename from pkgs/development/compilers/rust/1_65.nix rename to pkgs/development/compilers/rust/1_66.nix index 5b2397b5de48..6aee98bdba06 100644 --- a/pkgs/development/compilers/rust/1_65.nix +++ b/pkgs/development/compilers/rust/1_66.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.65.0"; - rustcSha256 = "sha256-WCi7Z/Z36r+MOEAgWCsM56+IThyEOJSE9/jQDdgsADg="; + rustcVersion = "1.66.1"; + rustcSha256 = "sha256-WzyTOpTHIYdwXU7ikxmLq/3QlEL1k3+9aF2zqB9JWbo="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; @@ -37,25 +37,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.64.0"; + bootstrapVersion = "1.65.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "177b4f95c8cdaa34bb29e69950cbfe236e123757078af4792779c43ee3818199"; - x86_64-unknown-linux-gnu = "a893977f238291370ab96726a74b6b9ae854dc75fbf5730954d901a93843bf9b"; - x86_64-unknown-linux-musl = "d5c4293a8fe1b34d857bec4124229c39711f8759aa2f6108c8b6c22a308f96bb"; - arm-unknown-linux-gnueabihf = "0d7c9c746f7b98f1f99e4cf720f9a32b2f5cdf22cb1d9f677b41c1dca62f14f8"; - armv7-unknown-linux-gnueabihf = "0be29740f565ca8835ba260691274585733a7f4130ec872bfa37654a08013828"; - aarch64-unknown-linux-gnu = "7d8860572431bd4ee1b9cd0cd77cf7ff29fdd5b91ed7c92a820f872de6ced558"; - aarch64-unknown-linux-musl = "9e7cfd960fb8ad3e1f51ef667c56032d3d4d9d9f573a06bbcf65a7c7a96ab430"; - x86_64-apple-darwin = "b6003d49fb857ff8dc105a3ccba98b851cd3e7d874005acb92284fd1113adc0d"; - aarch64-apple-darwin = "e1a37dc5991304716e260144311fd291d8fb514042e45c244c582b3454477038"; - powerpc64le-unknown-linux-gnu = "9d4591033eac22093d107991a68fffccea087b26bb54115d46cc544fbf5ef66c"; - riscv64gc-unknown-linux-gnu = "f63981d9c1057cb20cf30871757d42475a1cd0c187b3dcce5fabb0cce0f80c5b"; - mips64el-unknown-linux-gnuabi64 = "47488e4c53cca5c99b5837474a880f6c2368a7fe8368560dd8077bddb94959b5"; + i686-unknown-linux-gnu = "b29869f8e2c7029150a929b2c4e26843f363846ad99253a25be6abcfa8e84f46"; + x86_64-unknown-linux-gnu = "8f754fdd5af783fe9020978c64e414cb45f3ad0a6f44d045219bbf2210ca3cb9"; + x86_64-unknown-linux-musl = "716984def5509a844c2dde1c7be42bfadeb179f751d5c1a30c9c7198c8c089cd"; + arm-unknown-linux-gnueabihf = "e27f835c16bfcb66ad022a17d5c4602899e021e483a432ca4cc2cb4ecd39e938"; + armv7-unknown-linux-gnueabihf = "5376d467a29b32cacb771e0c76dc280bd623852709e7ffd92caabab076d5475f"; + aarch64-unknown-linux-gnu = "f406136010e6a1cdce3fb6573506f00d23858af49dd20a46723c3fa5257b7796"; + aarch64-unknown-linux-musl = "4b701dc3cbac04ebf0e336cff2f4ce5fc1a1984c183226863c9ed911eb00b07e"; + x86_64-apple-darwin = "139087a3937799415fd829e5a88162a69a32c23725a44457f9c96b98e4d64a7c"; + aarch64-apple-darwin = "7ddc335bd10fc32d3039ef36248a5d0c4865db2437c8aad20a2428a6cf41df09"; + powerpc64le-unknown-linux-gnu = "3f1d0d5bb13213348dc65e373f8c412fc0a12ee55abc1c864f7e0300932fc687"; + riscv64gc-unknown-linux-gnu = "aac7067348d218faa452b4bdc735778a51570a310ad645313ec767b5d7c88492"; + mips64el-unknown-linux-gnuabi64 = "d91ed3857c5256720da890f6533684b684e880bf9006dc4e4f4181213a5c4a09"; }; - selectRustPackage = pkgs: pkgs.rust_1_65; + selectRustPackage = pkgs: pkgs.rust_1_66; rustcPatches = [ ]; diff --git a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix new file mode 100644 index 000000000000..3afa59739a37 --- /dev/null +++ b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix @@ -0,0 +1,13 @@ +{ lib, writeShellApplication, cargo, cargo-auditable }: + +(writeShellApplication { + name = "cargo"; + runtimeInputs = [ cargo cargo-auditable ]; + text = '' + CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 cargo auditable "$@" + ''; +}) // { + meta = cargo-auditable.meta // { + mainProgram = "cargo"; + }; +} diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix new file mode 100644 index 000000000000..1c621276021a --- /dev/null +++ b/pkgs/development/compilers/rust/cargo-auditable.nix @@ -0,0 +1,40 @@ +{ lib, fetchFromGitHub, makeRustPlatform, rustc, cargo }: + +let + args = rec { + pname = "cargo-auditable"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "rust-secure-code"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mSiEC+9QtRjWmywJnGgUqp+q8fhY0qUYrgjrAVaY114="; + }; + + cargoSha256 = "sha256-Wz5My/QxPpZVsPBUe3KHT3ttD6CTU8NCY8rhFEC+UlA="; + + meta = with lib; { + description = "A tool to make production Rust binaries auditable"; + homepage = "https://github.com/rust-secure-code/cargo-auditable"; + changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; + }; + + rustPlatform = makeRustPlatform { + inherit rustc; + cargo = cargo.override { + auditable = false; + }; + }; + + bootstrap = rustPlatform.buildRustPackage (args // { + auditable = false; + }); +in + +rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } (args // { + auditable = true; # TODO: remove when this is the default +}) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2c9a3b1af472..9b10767e5bff 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,7 +1,8 @@ { lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, cacert, rustPlatform, rustc -, libiconv, CoreFoundation, Security +, CoreFoundation, Security +, auditable ? false # TODO: change to true when this is the default }: rustPlatform.buildRustPackage { @@ -12,6 +13,8 @@ rustPlatform.buildRustPackage { cargoVendorDir = "vendor"; buildAndTestSubdir = "src/tools/cargo"; + inherit auditable; + passthru = { rustc = rustc; inherit (rustc) tests; @@ -23,9 +26,10 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper (lib.getDev pkgsHostHost.curl) + zlib ]; buildInputs = [ cacert file curl python3 openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that # is not compatible with the current version in nixpkgs. diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7a100f7ec911..42ca74c7164d 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -81,6 +81,8 @@ in rustPlatform = bootRustPlatform; inherit CoreFoundation Security; }; + cargo-auditable = self.callPackage ./cargo-auditable.nix { }; + cargo-auditable-cargo-wrapper = self.callPackage ./cargo-auditable-cargo-wrapper.nix { }; clippy = self.callPackage ./clippy.nix { inherit Security; }; }); }; diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 7e98684ecff1..25a692565db3 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,6 +1,11 @@ { buildPackages, callPackage, stdenv, runCommand }@prev: -{ rustc, cargo, stdenv ? prev.stdenv, ... }: +{ rustc +, cargo +, cargo-auditable ? null +, stdenv ? prev.stdenv +, ... +}: rec { rust = { @@ -13,9 +18,8 @@ rec { }; buildRustPackage = callPackage ../../../build-support/rust/build-rust-package { - git = buildPackages.gitMinimal; inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook - fetchCargoTarball importCargoLock rustc; + fetchCargoTarball importCargoLock rustc cargo cargo-auditable; }; importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix { inherit cargo; }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 8288cd5c61e3..64254d502529 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -52,7 +52,9 @@ in stdenv.mkDerivation rec { # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" - ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"); + ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib" + # https://github.com/NixOS/nixpkgs/issues/201254 + ++ optional (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"); # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -163,11 +165,10 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl ] - ++ optionals stdenv.isDarwin [ Security ] + # TODO: remove libiconv once 1.66 is used to bootstrap + ++ optionals stdenv.isDarwin [ libiconv Security ] ++ optional (!withBundledLLVM) llvmShared; - depsTargetTargetPropagated = optionals stdenv.isDarwin [ libiconv ]; - outputs = [ "out" "man" "doc" ]; setOutputFlags = false; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 971b3e8399df..052df63aecb0 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -10,12 +10,14 @@ let llvmMajor = lib.versions.major llvm.version; + isROCm = lib.hasPrefix "rocm" llvm.pname; + # ROCm will always be at the latest version branch = - if llvmMajor == "15" then rec { + if llvmMajor == "15" || isROCm then rec { version = "15.0.0"; rev = "v${version}"; - hash = "sha256-111yL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; + hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; } else if llvmMajor == "14" then rec{ version = "14.0.0"; rev = "v${version}"; @@ -36,15 +38,17 @@ stdenv.mkDerivation { inherit (branch) rev hash; }; - nativeBuildInputs = [ pkg-config cmake llvm.dev spirv-tools ]; + nativeBuildInputs = [ pkg-config cmake spirv-tools ] + ++ (if isROCm then [ llvm ] else [ llvm.dev ]); - buildInputs = [ spirv-headers llvm ]; + buildInputs = [ spirv-headers ] + ++ lib.optionals (!isROCm) [ llvm ]; checkInputs = [ lit ]; cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" - "-DLLVM_DIR=${llvm.dev}" + "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}" "-DBUILD_SHARED_LIBS=YES" "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ diff --git a/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch b/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch deleted file mode 100644 index bb3d992612d3..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/fix-hardcoded-path-checking-for-rpmbuild.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a612c481f6116955d420db5ae1fe4c1eb93eb2f2 Mon Sep 17 00:00:00 2001 -From: Marcin Niemira -Date: Sun, 9 Jun 2019 07:05:06 +1000 -Subject: [PATCH] bpo-11122: fix hardcoded path checking for rpmbuild in - bdist_rpm.py (GH-10594) (cherry picked from commit - 45a14942c969ed508b35abd5e116cb18f84ce5b4) - -Co-authored-by: Marcin Niemira ---- - Lib/distutils/command/bdist_rpm.py | 5 +---- - .../next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst | 1 + - 2 files changed, 2 insertions(+), 4 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst - -diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py -index 20ca7ac6dcffa..74381cc69a6ce 100644 ---- a/Lib/distutils/command/bdist_rpm.py -+++ b/Lib/distutils/command/bdist_rpm.py -@@ -309,10 +309,7 @@ def run(self): - - # build package - log.info("building RPMs") -- rpm_cmd = ['rpm'] -- if os.path.exists('/usr/bin/rpmbuild') or \ -- os.path.exists('/bin/rpmbuild'): -- rpm_cmd = ['rpmbuild'] -+ rpm_cmd = ['rpmbuild'] - - if self.source_only: # what kind of RPMs? - rpm_cmd.append('-bs') diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch deleted file mode 100644 index 4324fc5ea61f..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch +++ /dev/null @@ -1,108 +0,0 @@ -From ba458f33f335b217d078fdce56e9c6f9f93adb49 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Mon, 28 Aug 2017 09:24:06 +0200 -Subject: [PATCH] Don't use ldconfig - ---- - Lib/ctypes/util.py | 78 ++-------------------------------------------- - 1 file changed, 2 insertions(+), 76 deletions(-) - -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 0c2510e..79635a8 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -100,54 +100,7 @@ elif os.name == "posix": - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -- -+ return None - - if sys.platform == "sunos5": - # use /usr/ccs/bin/dump on solaris -@@ -268,34 +221,7 @@ elif os.name == "posix": - else: - - def _findSoname_ldconfig(name): -- import struct -- if struct.calcsize('l') == 4: -- machine = os.uname().machine + '-32' -- else: -- machine = os.uname().machine + '-64' -- mach_map = { -- 'x86_64-64': 'libc6,x86-64', -- 'ppc64-64': 'libc6,64bit', -- 'sparc64-64': 'libc6,64bit', -- 's390x-64': 'libc6,64bit', -- 'ia64-64': 'libc6,IA-64', -- } -- abi_type = mach_map.get(machine, 'libc6') -- -- # XXX assuming GLIBC's ldconfig (with option -p) -- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' -- regex = os.fsencode(regex % (re.escape(name), abi_type)) -- try: -- with subprocess.Popen(['/sbin/ldconfig', '-p'], -- stdin=subprocess.DEVNULL, -- stderr=subprocess.DEVNULL, -- stdout=subprocess.PIPE, -- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: -- res = re.search(regex, p.stdout.read()) -- if res: -- return os.fsdecode(res.group(1)) -- except OSError: -- pass -+ return None - - def _findLib_ld(name): - # See issue #9998 for why this is needed --- -2.30.0 - diff --git a/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch deleted file mode 100644 index df55da3a4132..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/profile-task.patch +++ /dev/null @@ -1,21 +0,0 @@ -Backport from CPython 3.8 of a good list of tests to run for PGO. - -Upstream commit: - https://github.com/python/cpython/commit/4e16a4a31 - -Upstream discussion: - https://bugs.python.org/issue36044 - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 00fdd21ce..713dc1e53 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -259,7 +259,7 @@ TCLTK_LIBS= - # The task to run while instrumented when building the profile-opt target. - # We exclude unittests with -x that take a rediculious amount of time to - # run in the instrumented training build or do not provide much value. --PROFILE_TASK=-m test.regrtest --pgo -+PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c - - # report files for gcov / lcov coverage report - COVERAGE_INFO= $(abs_builddir)/coverage.info diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 63bbcee624a5..e7a99484036f 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -240,23 +240,11 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals mimetypesSupport [ # Make the mimetypes module refer to the right file ./mimetypes.patch - ] ++ optionals isPy37 [ - # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7. - # See: https://bugs.python.org/issue11122 - ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch - # The workaround is for unittests on Win64, which we don't support. - # It does break aarch64-darwin, which we do support. See: - # * https://bugs.python.org/issue35523 - # * https://github.com/python/cpython/commit/e6b247c8e524 - ./3.7/no-win64-workaround.patch ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch ] ++ optionals (pythonAtLeast "3.11") [ ./3.11/darwin-libutil.patch - ] ++ optionals (pythonOlder "3.8") [ - # Backport from CPython 3.8 of a good list of tests to run for PGO. - ./3.7/profile-task.patch ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch @@ -293,15 +281,17 @@ in with passthru; stdenv.mkDerivation { substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; - CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); - LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); - LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}"; - NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({ - "glibc" = "-lgcc_s"; - "musl" = "-lgcc_eh"; - }."${stdenv.hostPlatform.libc}" or ""); - # Determinism: We fix the hashes of str, bytes and datetime objects. - PYTHONHASHSEED=0; + env = { + CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); + LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); + LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}"; + NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({ + "glibc" = "-lgcc_s"; + "musl" = "-lgcc_eh"; + }."${stdenv.hostPlatform.libc}" or ""); + # Determinism: We fix the hashes of str, bytes and datetime objects. + PYTHONHASHSEED=0; + }; configureFlags = [ "--without-ensurepip" diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a6dc3a95c9cd..faab3eb785e4 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -148,19 +148,6 @@ in { inherit passthruFun; }; - python37 = callPackage ./cpython { - self = __splicedPackages.python37; - sourceVersion = { - major = "3"; - minor = "7"; - patch = "16"; - suffix = ""; - }; - sha256 = "sha256-gzjwwiIthH6QTJVTaRVdwb7u7YBujV7wSwDvR4cji/0="; - inherit (darwin) configd; - inherit passthruFun; - }; - python38 = callPackage ./cpython { self = __splicedPackages.python38; sourceVersion = { diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index d30876aa9fde..08dc3ea61ab7 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -93,7 +93,7 @@ in { makePythonHook { name = "python-imports-check-hook.sh"; substitutions = { - inherit pythonCheckInterpreter; + inherit pythonCheckInterpreter pythonSitePackages; }; } ./python-imports-check-hook.sh) {}; diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index f8ca84cd573a..7172ac498545 100644 --- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -6,6 +6,7 @@ pythonImportsCheckPhase () { if [ -n "$pythonImportsCheck" ]; then echo "Check whether the following modules can be imported: $pythonImportsCheck" + export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" ( cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" ) fi } diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index ae386ca859f4..ca67fa9beabf 100644 --- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -57,7 +57,7 @@ installSphinxPhase() { else # shellcheck disable=2154 - docdir="${doc:-$out}/share/doc/${pname}" + docdir="${doc:-$out}/share/doc/${name}" mkdir -p "$docdir" diff --git a/pkgs/development/interpreters/python/setup-hook.nix b/pkgs/development/interpreters/python/setup-hook.nix index 29ce079317f0..8cfb9dd46784 100644 --- a/pkgs/development/interpreters/python/setup-hook.nix +++ b/pkgs/development/interpreters/python/setup-hook.nix @@ -6,7 +6,9 @@ let hook = ./setup-hook.sh; in runCommand "python-setup-hook.sh" { strictDeps = true; - inherit sitePackages; + env = { + inherit sitePackages; + }; } '' cp ${hook} hook.sh substituteAllInPlace hook.sh diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 04ed31bbf3aa..57d1e6d84fe1 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -187,6 +187,18 @@ let sed -i '/CC_VERSION_MESSAGE/d' $rbConfig '' } + + # Allow to override compiler. This is important for cross compiling as + # we need to set a compiler that is different from the build one. + awk -i inplace -F' = ' \ + ' # operate on the line starting with + /^ CONFIG\["CC"\]/ { + # replace the right hand side + sub($2, "ENV[\"CC\"] || \"1\"") + }; { print }' "$rbConfig" + # test that the line isn't mangled in case upstream made the above unnecessary + grep -qx ' CONFIG\["CC"\] = ENV\["CC"\] || "1"' "$rbConfig" + # Remove unnecessary external intermediate files created by gems extMakefiles=$(find $out/${passthru.gemPath} -name Makefile) for makefile in $extMakefiles; do diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index d12396396da4..a6695082684d 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -149,6 +149,8 @@ stdenv.mkDerivation (finalAttrs: rec { # while we have a double-float toolchain NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; + NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; + postPatch = lib.optionalString (lib.versionOlder version "102") '' # This patch is a manually applied fix of # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 diff --git a/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch b/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch deleted file mode 100644 index e13dda549705..000000000000 --- a/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch +++ /dev/null @@ -1,24 +0,0 @@ -From abdfbb94df98fe88be4dd92ca587500126558411 Mon Sep 17 00:00:00 2001 -From: Victor Gaydov -Date: Sun, 26 Jul 2020 11:54:52 +0300 -Subject: [PATCH] Remove deprecated scons call - ---- - SConstruct | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 407025d8..04afa91f 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -49,7 +49,6 @@ env = Environment(ENV=os.environ, tools=[ - # performance tuning - env.Decider('MD5-timestamp') - env.SetOption('implicit_cache', 1) --env.SourceCode('.', None) - - # provide absolute path to force single sconsign file - # per-directory sconsign files seems to be buggy with generated sources --- -2.34.1 - diff --git a/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch b/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch deleted file mode 100644 index 097f1b3ff479..000000000000 --- a/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 15b37bb12a362c7889ac431eca4a47d6b2bdb97c Mon Sep 17 00:00:00 2001 -From: Victor Gaydov -Date: Sat, 5 Dec 2020 18:38:36 +0300 -Subject: [PATCH] Fix compatibility with new SCons - ---- - site_scons/site_tools/roc/config.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/site_scons/site_tools/roc/config.py b/site_scons/site_tools/roc/config.py -index b42b3adb..03b76be7 100644 ---- a/site_scons/site_tools/roc/config.py -+++ b/site_scons/site_tools/roc/config.py -@@ -13,7 +13,13 @@ def _run_prog(context, src, suffix): - # RunProg may incorrectly use cached results from a previous run saved for - # different file contents but the same invocation number. To prevent this, we - # monkey patch its global counter with a hashsum of the file contents. -- SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16) -+ # The workaround is needed only for older versions of SCons, where -+ # _ac_build_counter was an integer. -+ try: -+ if type(SCons.SConf._ac_build_counter) is int: -+ SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16) -+ except: -+ pass - return context.RunProg(src, suffix) - - def CheckLibWithHeaderExt(context, libs, headers, language, expr='1', run=True): --- -2.34.1 - diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index 98c088ed5495..a4916eecfe41 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -8,6 +8,7 @@ libuv, openfecSupport ? true, openfec, + speexdsp, libunwindSupport ? true, libunwind, pulseaudioSupport ? true, @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "roc-toolkit"; - version = "0.1.5"; + version = "0.2.1"; src = fetchFromGitHub { owner = "roc-streaming"; repo = "roc-toolkit"; rev = "v${version}"; - sha256 = "sha256:1pld340zfch4p3qaf5anrspq7vmxrgf9ddsdsq92pk49axaaz19w"; + sha256 = "sha256-W8PiI5W1T6pNaYzR4u6fPtkP8DKq/Z85Kq/WF5dXVxo="; }; nativeBuildInputs = [ @@ -32,20 +33,19 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ + propagatedBuildInputs = [ libuv libunwind openfec libpulseaudio + speexdsp ]; sconsFlags = [ "--build=${stdenv.buildPlatform.config}" "--host=${stdenv.hostPlatform.config}" "--prefix=${placeholder "out"}" - "--disable-sox" - "--disable-doc" - "--disable-tests" ] ++ + "--disable-sox" ] ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ (if (!openfecSupport) @@ -56,10 +56,8 @@ stdenv.mkDerivation rec { prePatch = lib.optionalString stdenv.isAarch64 "sed -i 's/c++98/c++11/g' SConstruct"; - # TODO: Remove these patches in the next version. patches = [ - ./0001-Remove-deprecated-scons-call.patch - ./0002-Fix-compatibility-with-new-SCons.patch + ./fix-pkgconfig-installation.patch ]; meta = with lib; { diff --git a/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch b/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch new file mode 100644 index 000000000000..8c6982f1f7c1 --- /dev/null +++ b/pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch @@ -0,0 +1,13 @@ +diff --git a/src/SConscript b/src/SConscript +index b59f67a7..9f16e0a2 100644 +--- a/src/SConscript ++++ b/src/SConscript +@@ -141,7 +141,7 @@ if not GetOption('disable_shared') or GetOption('enable_static') or GetOption('e + desc='Real-time audio streaming over the network.', + url='https://roc-streaming.org', + version=env['ROC_VERSION']) +- env.AddDistFile(env['PKG_CONFIG_PATH'], pc_file) ++ env.AddDistFile(os.path.join(env['ROC_SYSTEM_LIBDIR'], 'pkgconfig'), pc_file) + + if GetOption('enable_examples'): + examples_env = subenvs.examples.Clone() diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 34e26f547093..de5aff6c3b6e 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, autoreconfHook # doc: https://github.com/ivmai/bdwgc/blob/v8.2.2/doc/README.macros (LARGE_CONFIG) , enableLargeConfig ? false , enableMmap ? true @@ -36,14 +35,14 @@ stdenv.mkDerivation (finalAttrs: { # don't forget to disable the fix (and if the next release does # not fix the problem the test failure will be a reminder to # extend the set of versions requiring the workaround). - makeFlags = if (stdenv.hostPlatform.isPower64 && + makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 && finalAttrs.version == "8.2.2") - then [ + [ # do not use /proc primitives to track dirty bits; see: # https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537 # https://github.com/ivmai/bdwgc/blob/54522af853de28f45195044dadfd795c4e5942aa/include/private/gcconfig.h#L741 "CFLAGS_EXTRA=-DNO_SOFT_VDB" - ] else null; + ]; # `gctest` fails under emulation on aarch64-darwin doCheck = !(stdenv.isDarwin && stdenv.isx86_64); diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix index 3341bc680fb0..1e844157e419 100644 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ b/pkgs/development/libraries/clang-ocl/default.nix @@ -5,12 +5,11 @@ , cmake , rocm-cmake , rocm-device-libs -, clang }: stdenv.mkDerivation (finalAttrs: { pname = "clang-ocl"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -22,17 +21,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake rocm-cmake - clang ]; - buildInputs = [ - rocm-device-libs - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=clang" - "-DCMAKE_CXX_COMPILER=clang++" - ]; + buildInputs = [ rocm-device-libs ]; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; @@ -45,6 +36,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/RadeonOpenCompute/clang-ocl"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = finalAttrs.version != clang.version; + broken = finalAttrs.version != stdenv.cc.cc.version; }; }) diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index f41a97b99ad7..2e74d8ba2765 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -6,6 +6,7 @@ , rocm-cmake , hip , openmp +, clang-tools-extra , gtest , buildTests ? false , buildExamples ? false @@ -14,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "composable_kernel"; - version = "unstable-2022-12-08"; + version = "unstable-2022-12-15"; outputs = [ "out" @@ -29,20 +30,19 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "composable_kernel"; - rev = "d58b7f5155b44c8b608f3edc6a6eab314493ec1a"; - hash = "sha256-4nzyaWhPnY/0TygcoJAqVzdgfXOkf+o/BE2V9N+Bm7Q="; + rev = "0345963eef4f92e9c5eab608bb8557b5463a1dcb"; + hash = "sha256-IJbUZ3/UIPbYO9H+BUPP6T2HyUnC+FVbVPXQE5bEjRg="; }; nativeBuildInputs = [ cmake rocm-cmake hip + clang-tools-extra ]; buildInputs = [ openmp - ] ++ lib.optionals buildTests [ - gtest ]; cmakeFlags = [ @@ -50,16 +50,12 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_CXX_COMPILER=hipcc" ] ++ lib.optionals (gpuTargets != [ ]) [ "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals buildTests [ + "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names ]; # No flags to build selectively it seems... - postPatch = '' - substituteInPlace test/CMakeLists.txt \ - --replace "include(googletest)" "" - - substituteInPlace CMakeLists.txt \ - --replace "enable_testing()" "" - '' + lib.optionalString (!buildTests) '' + postPatch = lib.optionalString (!buildTests) '' substituteInPlace CMakeLists.txt \ --replace "add_subdirectory(test)" "" '' + lib.optionalString (!buildExamples) '' @@ -67,15 +63,12 @@ stdenv.mkDerivation (finalAttrs: { --replace "add_subdirectory(example)" "" ''; - postInstall = '' - mkdir -p $out/bin - mv bin/ckProfiler $out/bin - '' + lib.optionalString buildTests '' + postInstall = lib.optionalString buildTests '' mkdir -p $test/bin - mv bin/test_* $test/bin + mv $out/bin/test_* $test/bin '' + lib.optionalString buildExamples '' mkdir -p $example/bin - mv bin/example_* $example/bin + mv $out/bin/example_* $example/bin ''; passthru.updateScript = unstableGitUpdater { }; @@ -85,9 +78,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - # Several tests seem to either not compile or have a race condition - # Undefined reference to symbol '_ZTIN7testing4TestE' - # Try removing this next update - broken = buildTests; + broken = buildExamples; # bin/example_grouped_gemm_xdl_bfp16] Error 139 }; }) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index e37e90d553a3..ac88df930768 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,15 +1,8 @@ -{ callPackage, fetchpatch, ... }@args: +{ callPackage, ... }@args: callPackage ./generic.nix (rec { - version = "4.4.2"; + version = "4.4.3"; branch = version; - sha256 = "sha256-+YpIJSDEdQdSGpB5FNqp77wThOBZG1r8PaGKqJfeKUg="; + sha256 = "sha256-M7jC281TD+HbVxBBU0Vgm0yiJ70NoeOpMy27DxH9Jzo="; - patches = [ - # SDL2 recently changed their versioning - (fetchpatch { - url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba"; - hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0="; - }) - ]; } // args) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 9d94fe0c44ec..68907d798e19 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl , buildPackages, pkgsHostHost , pkg-config, which, makeWrapper -, zlib, bzip2, libpng, gnumake, glib +, zlib, bzip2, brotli, libpng, gnumake, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). # LCD filtering is also known as ClearType and covered by several Microsoft patents. @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-R2byAVfMTPDNKS+Av5F/ktHEObJDrDAY3r9rkUDEGn8="; }; - propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype + propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence nativeBuildInputs = [ pkg-config which makeWrapper ] diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 7ea8ce6d29b4..c9845feb9678 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , fetchpatch , autoconf , automake @@ -8,6 +10,7 @@ , libjpeg , libwebp , libtiff +, withXorg ? true , libXpm , libavif , fontconfig @@ -33,20 +36,22 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = - [ - "--enable-gd-formats" - ] + configureFlags = [ + "--enable-gd-formats" + ] # -pthread gets passed to clang, causing warnings ++ lib.optional stdenv.isDarwin "--enable-werror=no"; nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libXpm libavif ]; + buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libavif ] + ++ lib.optional withXorg libXpm; outputs = [ "bin" "dev" "out" ]; - postFixup = ''moveToOutput "bin/gdlib-config" $dev''; + postFixup = '' + moveToOutput "bin/gdlib-config" $dev + ''; enableParallelBuilding = true; @@ -57,5 +62,6 @@ stdenv.mkDerivation rec { description = "A dynamic image creation library"; license = licenses.free; # some custom license platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index a1270af259cd..ae5b9f48293a 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -60,7 +60,9 @@ stdenv.mkDerivation rec { ../../../build-support/setup-hooks/role.bash ./gettext-setup-hook.sh ]; - gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl; + env = { + gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl; + }; enableParallelBuilding = true; enableParallelChecking = false; # fails sometimes diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 5b4b18cf9199..7cecc8e545d0 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -117,6 +117,20 @@ stdenv.mkDerivation (finalAttrs: { # Disable flaky test. # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch + + # GVariant security fixes + # https://discourse.gnome.org/t/multiple-fixes-for-gvariant-normalisation-issues-in-glib/12835 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3126.patch"; + sha256 = "CNCxouYy8xNHt4eJtPZ2eOi9b0SxzI2DkklNfQMk3d8="; + }) + + # Menu model security fix + # https://discourse.gnome.org/t/fixes-for-gdbusmenumodel-crashes-in-glib/12846 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/4f4d770a1e40f719d5a310cffdac29cbb4e20c11.patch"; + sha256 = "+S44AnC86HfbMwkRe1ll54IK9pLxaFD3LqiVhPelnXI="; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 22e566fb8b31..780a3e091daf 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -53,9 +53,6 @@ assert withGd -> gd != null && libpng != null; stdenv.mkDerivation ({ version = version + patchSuffix; - linuxHeaders = if withLinuxHeaders then linuxHeaders else null; - - inherit (stdenv) is64bit; enableParallelBuilding = true; @@ -71,9 +68,6 @@ stdenv.mkDerivation ({ */ ./2.35-master.patch.gz - /* Revert this patch contained in the previous bundle. For now, until we know more. */ - ./revert-mktime.patch - /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -174,10 +168,14 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ bison python3Minimal ] ++ extraNativeBuildInputs; buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs; - # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to - # prevent a retained dependency on the bootstrap tools in the stdenv-linux - # bootstrap. - BASH_SHELL = "/bin/sh"; + env = { + linuxHeaders = if withLinuxHeaders then linuxHeaders else ""; + inherit (stdenv) is64bit; + # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to + # prevent a retained dependency on the bootstrap tools in the stdenv-linux + # bootstrap. + BASH_SHELL = "/bin/sh"; + }; # Used by libgcc, elf-header, and others to determine ABI passthru = { inherit version; minorRelease = version; }; diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh index d732e208fa22..d91f936c937b 100644 --- a/pkgs/development/libraries/glibc/locales-builder.sh +++ b/pkgs/development/libraries/glibc/locales-builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi # Glibc cannot have itself in its RPATH. export NIX_NO_SELF_RPATH=1 diff --git a/pkgs/development/libraries/glibc/revert-mktime.patch b/pkgs/development/libraries/glibc/revert-mktime.patch deleted file mode 100644 index d691213e8657..000000000000 --- a/pkgs/development/libraries/glibc/revert-mktime.patch +++ /dev/null @@ -1,73 +0,0 @@ -commit f6d4c1ac648c4ff8baad94500df0bb13108a4f79 -Author: Paul Eggert -Date: Thu Sep 8 20:08:32 2022 -0500 - - REVERT: mktime: improve heuristic for ca-1986 Indiana DST - - This patch syncs mktime.c from Gnulib, fixing a - problem reported by Mark Krenz , - and it should fix BZ#29035 too. - * time/mktime.c (__mktime_internal): Be more generous about - accepting arguments with the wrong value of tm_isdst, by falling - back to a one-hour DST difference if we find no nearby DST that is - unusual. This fixes a problem where "1986-04-28 00:00 EDT" was - rejected when TZ="America/Indianapolis" because the nearest DST - timestamp occurred in 1970, a temporal distance too great for the - old heuristic. This also also narrows the search a bit, which - is a minor performance win. - - (cherry picked from commit 83859e1115269cf56d21669361d4ddbe2687831c) - -diff --git b/time/mktime.c a/time/mktime.c -index e9a6006710..494c89bf54 100644 ---- b/time/mktime.c -+++ a/time/mktime.c -@@ -429,13 +429,8 @@ __mktime_internal (struct tm *tp, - time with the right value, and use its UTC offset. - - Heuristic: probe the adjacent timestamps in both directions, -- looking for the desired isdst. If none is found within a -- reasonable duration bound, assume a one-hour DST difference. -- This should work for all real time zone histories in the tz -- database. */ -- -- /* +1 if we wanted standard time but got DST, -1 if the reverse. */ -- int dst_difference = (isdst == 0) - (tm.tm_isdst == 0); -+ looking for the desired isdst. This should work for all real -+ time zone histories in the tz database. */ - - /* Distance between probes when looking for a DST boundary. In - tzdata2003a, the shortest period of DST is 601200 seconds -@@ -446,14 +441,12 @@ __mktime_internal (struct tm *tp, - periods when probing. */ - int stride = 601200; - -- /* In TZDB 2021e, the longest period of DST (or of non-DST), in -- which the DST (or adjacent DST) difference is not one hour, -- is 457243209 seconds: e.g., America/Cambridge_Bay with leap -- seconds, starting 1965-10-31 00:00 in a switch from -- double-daylight time (-05) to standard time (-07), and -- continuing to 1980-04-27 02:00 in a switch from standard time -- (-07) to daylight time (-06). */ -- int duration_max = 457243209; -+ /* The longest period of DST in tzdata2003a is 536454000 seconds -+ (e.g., America/Jujuy starting 1946-10-01 01:00). The longest -+ period of non-DST is much longer, but it makes no real sense -+ to search for more than a year of non-DST, so use the DST -+ max. */ -+ int duration_max = 536454000; - - /* Search in both directions, so the maximum distance is half - the duration; add the stride to avoid off-by-1 problems. */ -@@ -490,11 +483,6 @@ __mktime_internal (struct tm *tp, - } - } - -- /* No unusual DST offset was found nearby. Assume one-hour DST. */ -- t += 60 * 60 * dst_difference; -- if (mktime_min <= t && t <= mktime_max && convert_time (convert, t, &tm)) -- goto offset_found; -- - __set_errno (EOVERFLOW); - return -1; - } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index e9f324b24533..1d2ae340a806 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -323,6 +323,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs \ scripts/extract-release-date-from-doap-file.py + + # upstream bumps this version check one minor version at a time + # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/subprojects/gst-plugins-bad/ext/opencv/meson.build#L74 + substituteInPlace ext/opencv/meson.build \ + --replace '< 4.7.0' '< 5.0.0' ''; # This package has some `_("string literal")` string formats diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index dac712e82387..395708c2a680 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -79,17 +79,16 @@ stdenv.mkDerivation rec { libjpeg tremor libGL + pango ] ++ lib.optionals (!stdenv.isDarwin) [ libvisual ] ++ lib.optionals stdenv.isDarwin [ - pango OpenGL ] ++ lib.optionals enableAlsa [ alsa-lib ] ++ lib.optionals enableX11 [ libXext libXv - pango ] ++ lib.optionals enableWayland [ wayland wayland-protocols diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh index 4b8f757540b5..73914495d6d4 100644 --- a/pkgs/development/libraries/gtk-sharp/builder.sh +++ b/pkgs/development/libraries/gtk-sharp/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 282486dc88d5..112158a47276 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -145,6 +145,8 @@ stdenv.mkDerivation rec { libSM libXcomposite libXcursor + libXdamage + libXfixes libXi libXrandr libXrender diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 977d39ba3568..9da8e8837bc1 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -32,23 +32,13 @@ stdenv.mkDerivation rec { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "5.3.1"; + version = "6.0.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"; - sha256 = "sha256-Smzgl7dagSH6zEuoO1sIO/7GV/RbADzVo0JPKua0Q00="; + sha256 = "HRAQoXUdB21SkeQzwThQKnlNZ5p0mNEmjuIeLUoUDrQ="; }; - patches = [ - # Pick upstream patch for exported symbol test failing on darwin - # https://github.com/harfbuzz/harfbuzz/issues/3850 - (fetchpatch { - name = "harfbuzz-fix-check-symbol-tests-lto-and-darwin.patch"; - url = "https://github.com/harfbuzz/harfbuzz/commit/b0b7a65388da25ae3fa01e969ad6abc67eed4f49.patch"; - sha256 = "0my064r88pikw6q70hbgf6hwfkw544b9f5ai73qhn2a3c83jqn06"; - }) - ]; - postPatch = '' patchShebangs src/*.py test '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index 68f31e991d61..d0c7d9a1b053 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -4,9 +4,6 @@ , rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocprim , hip , gtest @@ -18,7 +15,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" @@ -42,9 +39,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr rocprim ] ++ lib.optionals buildTests [ gtest diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index fc1e62e65208..a4f8a212310a 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -4,26 +4,27 @@ , rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocsparse , hip , gfortran , git , gtest +, openmp , buildTests ? false +, buildSamples ? false }: # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" ] ++ lib.optionals buildTests [ "test" + ] ++ lib.optionals buildSamples [ + "sample" ]; src = fetchFromGitHub { @@ -41,17 +42,18 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr rocsparse git ] ++ lib.optionals buildTests [ gtest + ] ++ lib.optionals (buildTests || buildSamples) [ + openmp ]; cmakeFlags = [ + "-DCMAKE_C_COMPILER=hipcc" "-DCMAKE_CXX_COMPILER=hipcc" + "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -110,6 +112,11 @@ stdenv.mkDerivation (finalAttrs: { mv $out/bin/hipsparse-test $test/bin mv /build/source/matrices $test rmdir $out/bin + '' + lib.optionalString buildSamples '' + mkdir -p $sample/bin + mv clients/staging/example_* $sample/bin + patchelf --set-rpath $out/lib:${lib.makeLibraryPath ( + finalAttrs.buildInputs ++ [ hip gfortran.cc ])} $sample/bin/example_* ''; passthru.updateScript = rocmUpdateScript { diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 265b02b5d3ca..22b29151caa5 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.20"; + version = "1.20.1"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "sha256-fgIr3TyFGDAXP5+qoAaiMKDg/a1MlT6Fv/S/DaA24S8"; + sha256 = "sha256-cErtSbGetacXizSyhzYg7CmdsIdS1qhXT5XUGHmriFE="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 066ea8b60ddc..381689f9cb65 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -22,44 +22,48 @@ , cmake , nix , samba +, buildPackages }: +let + autoreconfHook = buildPackages.autoreconfHook269; +in assert xarSupport -> libxml2 != null; - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; - rev = "v${version}"; - hash = "sha256-G4wL5DDbX0FqaA4cnOlVLZ25ObN8dNsRtxyas29tpDA="; + rev = "v${finalAttrs.version}"; + hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg="; }; - postPatch = '' + outputs = [ "out" "lib" "dev" ]; + + postPatch = let + skipTestPaths = [ + # test won't work in nix sandbox + "libarchive/test/test_write_disk_perms.c" + # the filesystem does not necessarily have sparse capabilities + "libarchive/test/test_sparse_basic.c" + # the filesystem does not necessarily have hardlink capabilities + "libarchive/test/test_write_disk_hardlink.c" + # access-time-related tests flakey on some systems + "cpio/test/test_option_a.c" + "cpio/test/test_option_t.c" + ]; + removeTest = testPath: '' + substituteInPlace Makefile.am --replace "${testPath}" "" + rm "${testPath}" + ''; + in '' substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)" - declare -a skip_test_paths=( - # test won't work in nix sandbox - 'libarchive/test/test_write_disk_perms.c' - # can't be sure builder will have sparse-capable fs - 'libarchive/test/test_sparse_basic.c' - # can't even be sure builder will have hardlink-capable fs - 'libarchive/test/test_write_disk_hardlink.c' - # access-time-related tests flakey on some systems - 'cpio/test/test_option_a.c' - 'cpio/test/test_option_t.c' - ) - - for test_path in "''${skip_test_paths[@]}" ; do - substituteInPlace Makefile.am --replace "$test_path" "" - rm "$test_path" - done + ${lib.concatStringsSep "\n" (map removeTest skipTestPaths)} ''; - outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -105,7 +109,7 @@ stdenv.mkDerivation rec { includes implementations of the common tar, cpio, and zcat command-line tools that use the libarchive library. ''; - changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}"; + changelog = "https://github.com/libarchive/libarchive/releases/tag/v${finalAttrs.version}"; license = licenses.bsd3; maintainers = with maintainers; [ jcumming AndersonTorres ]; platforms = platforms.all; @@ -114,4 +118,4 @@ stdenv.mkDerivation rec { passthru.tests = { inherit cmake nix samba; }; -} +}) diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 64e1657bcba4..dca45186d4ce 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EGu2avkqQXHFX4gKWsVfVdQN99f4J7Hm86C0sAhuP1Y="; + sha256 = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index ff7cd7a193e3..d03783f2fd90 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "libcamera"; - version = "0.0.1"; + version = "0.0.3"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; rev = "v${version}"; - hash = "sha256-u5FnfXBCjwSp8QBrH8KIkVGV32/9pff41ZWjWXOwuMI="; + hash = "sha256-0/wvH07bJRKFwYnOARRJNzH8enIX3TNnWQnJdfpfvgE="; }; postPatch = '' diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index a53450e11773..14a20a957967 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -7,13 +7,13 @@ in stdenv.mkDerivation rec { pname = "libclc"; - version = "12.0.1"; + version = "14.0.6"; src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = "llvmorg-${version}"; - sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv"; + sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; }; sourceRoot = "source/libclc"; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index a79e5371c01b..35637512e0a5 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,23 +1,37 @@ -{ lib, stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL -, libX11, pkg-config, OpenGL +{ lib +, stdenv +, fetchurl +, libjpeg +, libpng +, libmng +, lcms1 +, libtiff +, openexr +, libGL +, libX11 +, pkg-config +, OpenGL +, runtimeShell +, withXorg ? true }: stdenv.mkDerivation rec { - pname = "libdevil"; version = "1.7.8"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://sourceforge/openil/DevIL-${version}.tar.gz"; sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; - outputs = [ "out" "dev" ]; - - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ] - ++ lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr ] + ++ lib.optionals withXorg [ libX11 libGL ] + ++ lib.optionals stdenv.isDarwin [ OpenGL ]; + configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; preConfigure = '' @@ -31,29 +45,29 @@ stdenv.mkDerivation rec { sed -i '/RESTRICT_KEYWORD/d' include/IL/config.h ''; - patches = - [ ( fetchurl { + patches = [ + (fetchurl { url = "https://sources.debian.org/data/main/d/devil/1.7.8-10/debian/patches/03_CVE-2009-3994.diff"; sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; - } ) - ./ftbfs-libpng15.patch - ./il_endian.h.patch - ]; + }) + ./ftbfs-libpng15.patch + ./il_endian.h.patch + ]; enableParallelBuilding = true; postPatch = '' for a in test/Makefile.in test/format_test/format_checks.sh.in ; do substituteInPlace $a \ - --replace /bin/bash ${stdenv.shell} + --replace /bin/bash ${runtimeShell} done ''; meta = with lib; { - homepage = "http://openil.sourceforge.net/"; + homepage = "https://openil.sourceforge.net/"; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; platforms = platforms.mesaPlatforms; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index c96bc4e41afc..83a426a2afa4 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { the Mesa drivers, the X drivers, libva and similar projects. ''; license = licenses.mit; - platforms = platforms.unix; + platforms = lib.subtractLists platforms.darwin platforms.unix; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 5bfb0d029cdf..d7f5aa24c155 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libksba"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - sha256 = "fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971"; + hash = "sha256-P3LGjbMJceu/FDZ1J3GUI/Ck1fgQP8n0ocAan6RA3lw="; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 2293dfc00a0c..b757d20b71d5 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,20 +3,20 @@ assert zlib != null; let - patchVersion = "1.6.37"; + patchVersion = "1.6.39"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2"; + hash = "sha256-SsS26roAzeISxI22XLlCkQc/68oixcef2ocJFQLoDP0="; }; whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation rec { pname = "libpng" + whenPatched "-apng"; - version = "1.6.37"; + version = "1.6.39"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - sha256 = "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh"; + hash = "sha256-H0aWznC07l+F8eFiPcEimyEAKfpLeu5XPfPiunsDaTc="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; @@ -32,8 +32,9 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = "http://www.libpng.org/pub/png/libpng.html"; + changelog = "https://github.com/glennrp/libpng/blob/v1.6.39/CHANGES"; license = licenses.libpng2; platforms = platforms.all; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ vcunat ]; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 6b174a7dfa4d..a60da602e070 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,7 +15,7 @@ , rustPlatform , rustc , rust -, cargo +, cargo-auditable-cargo-wrapper , gi-docgen , python3Packages , gnome @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { gdk-pixbuf pkg-config rustc - cargo + cargo-auditable-cargo-wrapper python3Packages.docutils vala rustPlatform.cargoSetupHook diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 20c59ed9e0d3..892ed71583d3 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,9 +1,10 @@ { lib, stdenv -, fetchurl -, fetchpatch +, fetchFromGitLab +, nix-update-script , autoreconfHook , pkg-config +, sphinx , libdeflate , libjpeg @@ -22,11 +23,13 @@ stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.4.0"; + version = "4.5.0"; - src = fetchurl { - url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "1vdbk3sc497c58kxmp02irl6nqkfm9rjs3br7g59m59qfnrj6wli"; + src = fetchFromGitLab { + owner = "libtiff"; + repo = "libtiff"; + rev = "v${version}"; + hash = "sha256-KG6rB940JMjFUTAgtkzg+Zh75gylPY6Q7/4gEbL0Hcs="; }; patches = [ @@ -35,32 +38,6 @@ stdenv.mkDerivation rec { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch - (fetchpatch { - name = "CVE-2022-34526.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990.patch"; - sha256 = "sha256-faKsdJjvQwNdkAKjYm4vubvZvnULt9zz4l53zBFr67s="; - }) - (fetchpatch { - name = "CVE-2022-2953.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/48d6ece8389b01129e7d357f0985c8f938ce3da3.patch"; - sha256 = "sha256-h9hulV+dnsUt/2Rsk4C1AKdULkvweM2ypIJXYQ3BqQU="; - }) - (fetchpatch { - name = "CVE-2022-3626.CVE-2022-3627.CVE-2022-3597.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/236b7191f04c60d09ee836ae13b50f812c841047.patch"; - excludes = [ "doc/tools/tiffcrop.rst" ]; - sha256 = "sha256-L2EMmmfMM4oEYeLapO93wvNS+HlO0yXsKxijXH+Wuas="; - }) - (fetchpatch { - name = "CVE-2022-3598.CVE-2022-3570.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/cfbb883bf6ea7bedcb04177cc4e52d304522fdff.patch"; - sha256 = "sha256-SLq2+JaDEUOPZ5mY4GPB6uwhQOG5cD4qyL5o9i8CVVs="; - }) - (fetchpatch { - name = "CVE-2022-3970.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/227500897dfb07fb7d27f7aa570050e62617e3be.patch"; - sha256 = "sha256-pgItgS+UhMjoSjkDJH5y7iGFZ+yxWKqlL7BdT2mFcH0="; - }) ]; postPatch = '' @@ -70,14 +47,15 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; postFixup = '' - moveToOutput include/tif_dir.h $dev_private moveToOutput include/tif_config.h $dev_private + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_hash_set.h $dev_private moveToOutput include/tiffiop.h $dev_private ''; # If you want to change to a different build system, please make # sure cross-compilation works first! - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) @@ -87,9 +65,12 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests = { - inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage; - inherit (python3Packages) pillow imread; + passthru = { + tests = { + inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage; + inherit (python3Packages) pillow imread; + }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch index e1c681502b33..e0ef9f3478a6 100644 --- a/pkgs/development/libraries/libtiff/headers.patch +++ b/pkgs/development/libraries/libtiff/headers.patch @@ -2,15 +2,16 @@ diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am index 44522b62..d66e5948 100644 --- i/libtiff/Makefile.am +++ w/libtiff/Makefile.am -@@ -36,8 +36,11 @@ EXTRA_DIST = \ +@@ -36,8 +36,12 @@ EXTRA_DIST = \ tiffconf.h.cmake.in - + libtiffinclude_HEADERS = \ + tif_config.h \ + tif_dir.h \ ++ tif_hash_set.h \ tiff.h \ tiffio.h \ + tiffiop.h \ tiffvers.h - + if HAVE_CXX diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch index 30601c0f04ee..ddd33ad49045 100644 --- a/pkgs/development/libraries/libtiff/rename-version.patch +++ b/pkgs/development/libraries/libtiff/rename-version.patch @@ -6,15 +6,15 @@ TODO \ - VERSION + VERSION.txt - + EXTRA_DIST = \ cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test man html - +@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc + release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) - (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) + (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - + (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) + pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index f7f1633ed446..326ee3028158 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , autoreconfHook @@ -8,6 +9,7 @@ , libobjc , IOKit , Security +, withExamples ? false , withStatic ? false }: @@ -31,12 +33,20 @@ stdenv.mkDerivation rec { dontDisableStatic = withStatic; - configureFlags = lib.optional (!enableUdev) "--disable-udev"; + configureFlags = + lib.optional (!enableUdev) "--disable-udev" + ++ lib.optional (withExamples) "--enable-examples-build"; preFixup = lib.optionalString enableUdev '' sed 's,-ludev,-L${lib.getLib udev}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; + postInstall = lib.optionalString withExamples '' + mkdir -p $out/{bin,sbin,examples/bin} + cp -r examples/.libs/* $out/examples/bin + ln -s $out/examples/bin/fxload $out/sbin/fxload + ''; + meta = with lib; { homepage = "https://libusb.info/"; description = "cross-platform user-mode USB device library"; @@ -45,6 +55,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ prusnak realsnick ]; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 78230898d7fc..c853c172d240 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -19,6 +19,10 @@ , enablePatentEncumberedCodecs ? true , libclc , jdupes +, cmake +, rustc +, rust-bindgen +, spirv-llvm-translator_14 }: /** Packaging design: @@ -37,9 +41,17 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.2.5"; + version = "22.3.3"; branch = versions.major version; + withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; + + rust-bindgen' = rust-bindgen.override { + rust-bindgen-unwrapped = rust-bindgen.unwrapped.override { + clang = llvmPackages.clang; + }; + }; + self = stdenv.mkDerivation { pname = "mesa"; inherit version; @@ -52,7 +64,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "sha256-hQ8GMUb467JirsBPZmwsHlYj8qGYfdok5DYbF7kSxzs="; + sha256 = "sha256-vteZeIvyvZ7wedl82OCTSL9TywhoGFeOQHc7KxeBKSI="; }; # TODO: @@ -83,6 +95,10 @@ self = stdenv.mkDerivation { ++ lib.optional stdenv.isLinux "driversdev" ++ lib.optional enableOpenCL "opencl"; + # FIXME: this fixes rusticl/iris segfaulting on startup, _somehow_. + # Needs more investigating. + separateDebugInfo = true; + preConfigure = '' PATH=${llvmPackages.libllvm.dev}/bin:$PATH ''; @@ -105,7 +121,6 @@ self = stdenv.mkDerivation { "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri" "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau" - "-Dxvmc-libs-path=${placeholder "drivers"}/lib" "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" "-Dva-libs-path=${placeholder "drivers"}/lib/dri" "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" @@ -119,6 +134,7 @@ self = stdenv.mkDerivation { "-Dglvnd=true" ] ++ optionals enableOpenCL [ "-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend + "-Dgallium-rusticl=true" "-Drust_std=2021" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" ] ++ optional enablePatentEncumberedCodecs "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec" @@ -132,7 +148,7 @@ self = stdenv.mkDerivation { ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optionals stdenv.isDarwin [ libunwind ] - ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped ] + ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator_14 ] ++ lib.optional withValgrind valgrind-light # Mesa will not build zink when gallium-drivers=auto ++ lib.optional (elem "zink" galliumDrivers) vulkan-loader; @@ -150,7 +166,7 @@ self = stdenv.mkDerivation { propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm - ] ++ optional stdenv.isLinux libdrm + ] ++ optional withLibdrm libdrm ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; doCheck = false; @@ -188,12 +204,12 @@ self = stdenv.mkDerivation { mkdir -p $opencl/lib mv -t "$opencl/lib/" \ $out/lib/gallium-pipe \ - $out/lib/libMesaOpenCL* + $out/lib/lib*OpenCL* - # We construct our own .icd file that contains an absolute path. - rm -r $out/etc/OpenCL + # We construct our own .icd files that contain absolute paths. mkdir -p $opencl/etc/OpenCL/vendors/ echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd + echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd '' + lib.optionalString enableOSMesa '' # move libOSMesa to $osmesa, as it's relatively big mkdir -p $osmesa/lib @@ -242,10 +258,11 @@ self = stdenv.mkDerivation { ]; passthru = { - inherit libdrm; inherit (libglvnd) driverLink; inherit llvmPackages; + libdrm = if withLibdrm then libdrm else null; + tests = lib.optionalAttrs stdenv.isLinux { devDoesNotDependOnLLVM = stdenv.mkDerivation { name = "mesa-dev-does-not-depend-on-llvm"; diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch index d220239770d5..02558aaa825d 100644 --- a/pkgs/development/libraries/mesa/opencl.patch +++ b/pkgs/development/libraries/mesa/opencl.patch @@ -1,5 +1,18 @@ +diff --git a/meson.build b/meson.build +index e32338b3f9a..fae804fd41e 100644 +--- a/meson.build ++++ b/meson.build +@@ -1894,7 +1894,7 @@ endif + + dep_clang = null_dep + if with_clc +- llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') ++ llvm_libdir = get_option('clang-libdir') + + dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) + diff --git a/meson_options.txt b/meson_options.txt -index b8f753e2e1a..2163e3ab7ee 100644 +index 6f307018815..ab84eb1006c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,6 +18,12 @@ @@ -16,7 +29,7 @@ index b8f753e2e1a..2163e3ab7ee 100644 'platforms', type : 'array', diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index 14df6b86f7f..adcd5110342 100644 +index 7af210b5693..ff6ac8c61ca 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -30,6 +30,7 @@ if with_ld_version_script @@ -29,7 +42,7 @@ index 14df6b86f7f..adcd5110342 100644 polly_dep = null_dep @@ -60,19 +61,19 @@ else endif - if not (dep_clang.found() and dep_clang_usable) + if not _shared_llvm or not (dep_clang.found() and dep_clang_usable) dep_clang = [ - cpp.find_library('clangCodeGen', dirs : llvm_libdir), - cpp.find_library('clangFrontendTool', dirs : llvm_libdir), @@ -60,12 +73,25 @@ index 14df6b86f7f..adcd5110342 100644 polly_dep, polly_isl_dep, ] # check clang once more -@@ -112,7 +113,7 @@ if with_opencl_icd +@@ -119,7 +120,7 @@ if with_opencl_icd + configuration : _config, input : 'mesa.icd.in', output : 'mesa.icd', - install : true, -- install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), -+ install_dir : join_paths(get_option('prefix'), 'etc', 'OpenCL', 'vendors'), +- install : true, ++ install : false, + install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ) - if meson.version().version_compare('>= 0.58') +diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build +index a968dee52db..69475cf3133 100644 +--- a/src/gallium/targets/rusticl/meson.build ++++ b/src/gallium/targets/rusticl/meson.build +@@ -58,7 +58,7 @@ configure_file( + configuration : _config, + input : 'rusticl.icd.in', + output : 'rusticl.icd', +- install : true, ++ install : false, + install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), + ) + diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix index d48adb09a04c..1e93c149da8c 100644 --- a/pkgs/development/libraries/miopen/default.nix +++ b/pkgs/development/libraries/miopen/default.nix @@ -6,14 +6,10 @@ , pkg-config , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr -, rocm-opencl-runtime , rocblas , rocmlir , hip -, clang +, clang-tools-extra , clang-ocl , llvm , miopengemm @@ -27,17 +23,12 @@ , doxygen , sphinx , zlib +, gtest +, rocm-comgr , python3Packages , buildDocs ? true , buildTests ? false -# LFS isn't working, so we will manually fetch these -# This isn't strictly required, but is recommended to enable -# https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1373 -# -# MIOpen will produce a very large output due to KDBs fetched -# Also possibly in the future because of KDB generation -# This is disabled by default so we can cache on hydra -, fetchKDBs ? false +, fetchKDBs ? true , useOpenCL ? false }: @@ -62,7 +53,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "miopen"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" @@ -76,7 +67,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "MIOpen"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-EOe3LUafOeVLzRoahPdS6DMZ/+6WWeVI7jG25zfPrx8="; + hash = "sha256-GfXPCXiVJVve3d8sQCQcFLb/vEnKkVEn7xYUhHkEEVI="; }; nativeBuildInputs = [ @@ -84,15 +75,11 @@ in stdenv.mkDerivation (finalAttrs: { cmake rocm-cmake hip - clang - llvm + clang-tools-extra ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr - rocm-opencl-runtime + llvm rocblas rocmlir clang-ocl @@ -126,8 +113,6 @@ in stdenv.mkDerivation (finalAttrs: { "-DCMAKE_CXX_COMPILER=hipcc" "-DMIOPEN_BACKEND=HIP" ] ++ lib.optionals useOpenCL [ - "-DCMAKE_C_COMPILER=${clang}/bin/clang" - "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" "-DMIOPEN_BACKEND=OpenCL" ] ++ lib.optionals buildTests [ "-DBUILD_TESTS=ON" @@ -137,37 +122,35 @@ in stdenv.mkDerivation (finalAttrs: { "-DMIOPEN_TEST_GFX908=ON" "-DMIOPEN_TEST_GFX90A=ON" "-DMIOPEN_TEST_GFX103X=ON" + "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names ]; postPatch = '' substituteInPlace CMakeLists.txt \ --replace "enable_testing()" "" \ --replace "MIOPEN_HIP_COMPILER MATCHES \".*clang\\\\+\\\\+$\"" "true" \ - --replace "/opt/rocm/hip" "${hip}" \ - --replace "/opt/rocm/llvm" "${llvm}" \ - --replace "3 REQUIRED PATHS /opt/rocm)" "3 REQUIRED PATHS ${hip})" \ - --replace "hip REQUIRED PATHS /opt/rocm" "hip REQUIRED PATHS ${hip}" \ - --replace "rocblas REQUIRED PATHS /opt/rocm" "rocblas REQUIRED PATHS ${rocblas}" \ - --replace "miopengemm PATHS /opt/rocm" "miopengemm PATHS ${miopengemm}" \ - --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # Fix clang-tidy at some point + --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # error: missing required key 'key' + '' + lib.optionalString buildTests '' + substituteInPlace test/gtest/CMakeLists.txt \ + --replace "enable_testing()" "" '' + lib.optionalString (!buildTests) '' substituteInPlace CMakeLists.txt \ --replace "add_subdirectory(test)" "" '' + lib.optionalString fetchKDBs '' - cp -a ${kdbs.gfx1030_36} src/kernels/gfx1030_36.kdb - cp -a ${kdbs.gfx900_56} src/kernels/gfx900_56.kdb - cp -a ${kdbs.gfx900_64} src/kernels/gfx900_64.kdb - cp -a ${kdbs.gfx906_60} src/kernels/gfx906_60.kdb - cp -a ${kdbs.gfx906_64} src/kernels/gfx906_64.kdb - cp -a ${kdbs.gfx90878} src/kernels/gfx90878.kdb - cp -a ${kdbs.gfx90a68} src/kernels/gfx90a68.kdb - cp -a ${kdbs.gfx90a6e} src/kernels/gfx90a6e.kdb + ln -sf ${kdbs.gfx1030_36} src/kernels/gfx1030_36.kdb + ln -sf ${kdbs.gfx900_56} src/kernels/gfx900_56.kdb + ln -sf ${kdbs.gfx900_64} src/kernels/gfx900_64.kdb + ln -sf ${kdbs.gfx906_60} src/kernels/gfx906_60.kdb + ln -sf ${kdbs.gfx906_64} src/kernels/gfx906_64.kdb + ln -sf ${kdbs.gfx90878} src/kernels/gfx90878.kdb + ln -sf ${kdbs.gfx90a68} src/kernels/gfx90a68.kdb + ln -sf ${kdbs.gfx90a6e} src/kernels/gfx90a6e.kdb ''; # Unfortunately, it seems like we have to call make on these manually postBuild = lib.optionalString buildDocs '' export HOME=$(mktemp -d) - make doc + make -j$NIX_BUILD_CORES doc '' + lib.optionalString buildTests '' make -j$NIX_BUILD_CORES check ''; @@ -180,7 +163,12 @@ in stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString buildTests '' mkdir -p $test/bin mv bin/test_* $test/bin - patchelf --set-rpath ${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])}:$out/lib $test/bin/* + patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ + [ hip rocm-comgr ])} $test/bin/* + '' + lib.optionalString fetchKDBs '' + # Apparently gfx1030_40 wasn't generated so the developers suggest just renaming gfx1030_36 to it + # Should be fixed in the next miopen kernel generation batch + ln -s ${kdbs.gfx1030_36} $out/share/miopen/db/gfx1030_40.kdb ''; passthru.updateScript = rocmUpdateScript { diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index ecc5ba09aad8..45c83021162c 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -5,7 +5,6 @@ , cmake , rocm-cmake , rocm-opencl-runtime -, clang , texlive , doxygen , sphinx @@ -32,7 +31,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "miopengemm"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" @@ -54,7 +53,6 @@ in stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake rocm-cmake - clang ]; buildInputs = [ @@ -70,8 +68,6 @@ in stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_C_COMPILER=clang" - "-DCMAKE_CXX_COMPILER=clang++" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -121,6 +117,6 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = finalAttrs.version != clang.version; + broken = finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 8e3264dcbc51..f118467b56cf 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -31,11 +31,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.49.0"; + version = "1.51.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-LNTbfXX3FJQVMknL6UoJLaTG7NdCQPirGM9kTZ1l9u4="; + sha256 = "sha256-6z6m9bYMbT7b8GXgT0NOjtYpGlyxoHkZxBcwqx/MAOA="; }; outputs = [ "bin" "out" "dev" "lib" ] diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index bc084829e7bb..3062c3cb4e11 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - pname = "onig"; + pname = "oniguruma"; version = "6.9.8"; - src = fetchFromGitHub { - owner = "kkos"; - repo = "oniguruma"; - rev = "v${version}"; - sha256 = "sha256-8aFZdhh6ovLCR0A17rvWq/Oif66rSMnHcCYHjClNElw="; + # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages + src = fetchurl { + url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; + sha256 = "sha256-KM1iwUZGI8eRBWX7HMqqAQSy/osSvNZG6B9ztHU1IT4="; }; + outputs = [ "dev" "lib" "out" ]; + outputBin = "dev"; # onig-config + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-posix-api=yes" ]; @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kkos/oniguruma"; description = "Regular expressions library"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ artturin ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 664f39c0c6cd..2c676e008f00 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -14,6 +14,7 @@ , config , ocl-icd , buildPackages +, qimgv , enableJPEG ? true , libjpeg @@ -76,20 +77,20 @@ }: let - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "sha256-zPkMc6xEDZU5TlBH3LAzvB17XgocSPeHVMG/U6kfpxg="; + sha256 = "sha256-jUeGsu8+jzzCnIFbVMCW8DcUeGv/t1yCY/WXyW+uGDI="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "sha256-hjRqT7V4Sz7t4IEy89F5M+b0x2ObBbqF8GWLKhWFXtE="; + sha256 = "sha256-meya0J3RdOIeMM46e/6IOVwrKn3t/c0rhwP2WQaybkE="; }; # Contrib must be built in order to enable Tesseract support: @@ -365,7 +366,12 @@ stdenv.mkDerivation { popd ''; - passthru = lib.optionalAttrs enablePython { pythonPath = [ ]; }; + passthru = { + tests = { + inherit qimgv; + inherit (gst_all_1) gst-plugins-bad; + } // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }; + } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch b/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch new file mode 100644 index 000000000000..2acedda0e3a4 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.0/CVE-2022-3996.patch @@ -0,0 +1,36 @@ +From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001 +From: Pauli +Date: Fri, 11 Nov 2022 09:40:19 +1100 +Subject: [PATCH] x509: fix double locking problem + +This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the +redundant flag setting. + +Fixes #19643 + +Fixes LOW CVE-2022-3996 + +Reviewed-by: Dmitry Belyavskiy +Reviewed-by: Tomas Mraz +(Merged from https://github.com/openssl/openssl/pull/19652) + +(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5) +--- + crypto/x509/pcy_map.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c +index 05406c6493fc..60dfd1e3203b 100644 +--- a/crypto/x509/pcy_map.c ++++ b/crypto/x509/pcy_map.c +@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps) + + ret = 1; + bad_mapping: +- if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) { +- x->ex_flags |= EXFLAG_INVALID_POLICY; +- CRYPTO_THREAD_unlock(x->lock); +- } + sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free); + return ret; + diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 45a34971c8f0..4c322997963a 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -241,6 +241,9 @@ in { (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) + + # Remove with 3.0.8 release + ./3.0/CVE-2022-3996.patch ]; withDocs = true; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 226b92ccfdd3..82fc33670bc5 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.40"; + version = "10.42"; src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-FOS4PEeDkz3BfpZDGOYyT3yuG8ddjzx5vGlp8AwVnWg="; + hash = "sha256-jTbNjLbqKkwrs1j/ZBGwx4hjOipF2rvxrrS3AdG16EA="; }; configureFlags = [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 8f0852b06a12..ad2bf00a6c23 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -2,7 +2,6 @@ , lib , buildPackages , fetchFromGitLab -, fetchpatch , python3 , meson , ninja @@ -68,7 +67,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.63"; + version = "0.3.64"; outputs = [ "out" @@ -86,7 +85,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-GQJpw5G9YN7T2upu2FLUxE8UvMRev3K2j4Z1uK1/dt4="; + sha256 = "sha256-wIvdciLBWIQjENEipzbVID0eliOcEwqS567pLxVVOsc="; }; patches = [ diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index e9f9120620ac..6d2a56d03ac3 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -167,7 +167,7 @@ stdenv.mkDerivation rec { rsync --archive "${DESTDIR}${system}"/* "$out" rm --recursive "${DESTDIR}${system}"/* rmdir --parents --ignore-fail-on-non-empty "${DESTDIR}${system}" - for o in $outputs; do + for o in $(getAllOutputNames); do rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" rm --recursive "${DESTDIR}/''${!o}" done diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix index 1892ac2ea0e7..fe85be8cf022 100644 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ b/pkgs/development/libraries/protobuf/3.21.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic-v3-cmake.nix ({ - version = "3.21.8"; - sha256 = "sha256-cSNHX18CvMmydpYWqfe6WWk9rGxIlFfY/85rfSyznU4="; + version = "3.21.12"; + sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; } // args) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 178150e26549..dd33d9614207 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -30,16 +30,6 @@ let qtbase = lib.optionals stdenv.isDarwin [ ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - # Downgrade minimal required SDK to 10.12 - ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch - ./qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch - ./qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch - ./qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch - ./qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch - ./qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch - ./qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch - ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch - # Patch framework detection to support X.framework/X.tbd, # extending the current support for X.framework/X. ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch @@ -65,18 +55,19 @@ let qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/372ae3de526f783bdcb5d51b997fbf511055466a/trunk/qt5-webengine-python3.patch"; + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a6f16c6daea3b5a1f7bc9f175d1645922c131563/qt5/qt5-webengine-python3.patch"; hash = "sha256-rUSDwTucXVP3Obdck7LRTeKZ+JYQSNhQ7+W31uHZ9yM="; }) (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/372ae3de526f783bdcb5d51b997fbf511055466a/trunk/qt5-webengine-chromium-python3.patch"; + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/7ae178a617d1e0eceb742557e63721af949bd28a/qt5/qt5-webengine-chromium-python3.patch"; stripLen = 1; extraPrefix = "src/3rdparty/"; - hash = "sha256-BODOw1ksPPns2fmMrk6KC5Po513xB0f1ycbsIL9MmHE="; + hash = "sha256-MZGYeMdGzwypfKoSUaa56K3inbcGRx7he/+AFyk5ekA="; }) ] ++ lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch + ./qtwebengine-darwin-checks.patch ]; qtwebkit = [ (fetchpatch { @@ -136,9 +127,10 @@ let inherit bison cups harfbuzz libGL; withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth + inherit (darwin.apple_sdk_11_0.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; - inherit (darwin) libobjc; + libobjc = darwin.apple_sdk_11_0.objc4; + xcbuild = darwin.apple_sdk_11_0.xcodebuild; }; qt3d = callPackage ../modules/qt3d.nix {}; @@ -147,7 +139,7 @@ let qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgamepad = callPackage ../modules/qtgamepad.nix { - inherit (darwin.apple_sdk.frameworks) GameController; + inherit (darwin.apple_sdk_11_0.frameworks) GameController; }; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; @@ -181,19 +173,21 @@ let rm -r src/3rdparty/chromium/third_party/catapult cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult ''; - inherit (darwin) cctools libobjc libunwind xnu; - inherit (darwin.apple_sdk.libs) sandbox; - inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit + inherit (darwin) cctools xnu; + inherit (darwin.apple_sdk_11_0) libunwind; + inherit (darwin.apple_sdk_11_0.libs) sandbox; + inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; + libobjc = darwin.apple_sdk_11_0.objc4; }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix { inherit (darwin) ICU; - inherit (darwin.apple_sdk.frameworks) OpenGL; + inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; }; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; qtwebview = callPackage ../modules/qtwebview.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation WebKit; + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation WebKit; }; qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch index faf0b643fdba..9d2a47c7c348 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -27,7 +27,7 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 92a9112bca..b80ec1e801 100644 +index abc6d82ade..59b94fe5b6 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,5 @@ @@ -62,7 +62,7 @@ index 92a9112bca..b80ec1e801 100644 - - !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { - warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ -- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.") +- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") - warning("This is an unsupported configuration. You may experience build issues," \ - "and by using") - warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ @@ -77,7 +77,7 @@ index 92a9112bca..b80ec1e801 100644 } !no_objective_c:CONFIG += objective_c -@@ -73,212 +39,6 @@ qt { +@@ -73,230 +39,6 @@ qt { } } @@ -103,6 +103,19 @@ index 92a9112bca..b80ec1e801 100644 - QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -} - +-macos { +- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { +- # If the user has requested a specific set of architectures, +- # build all of those by default, but limited to only those. +- CONFIG -= only_active_arch +- } else { +- # Otherwise allow building all of the architectures available +- # in Qt, but only build the active arch (unless the user has +- # manually overridden this via CONFIG -= only_active_arch). +- QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS +- } +-} +- -macx-xcode { - qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO - !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ @@ -158,15 +171,20 @@ index 92a9112bca..b80ec1e801 100644 - simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS - VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS - -- isEmpty(VALID_ARCHS): \ -- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") -- - single_arch: VALID_ARCHS = $$first(VALID_ARCHS) - -- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- macos { +- only_active_arch: DEFAULT_ARCHS = $$system("uname -m") +- else: DEFAULT_ARCHS = $$VALID_ARCHS +- } - -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ +- $(if $(ARCHS), $(ARCHS), \ +- $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ +- $(EXPORT_VALID_ARCHS)))) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS - - arch_flags = $(EXPORT_ARCH_ARGS) - @@ -291,11 +309,12 @@ index 92a9112bca..b80ec1e801 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 +index 2c91ba6679..a6ab233825 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,60 +1,2 @@ - CONFIG = asset_catalogs rez $$CONFIG +@@ -21,61 +21,3 @@ macos { + } + load(default_pre) - -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch index 98738656114d..bdb6a3616567 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch @@ -8,11 +8,11 @@ Subject: [PATCH 11/11] fix header_module 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index b9e5d35026..9924271042 100644 +index 0b2a30d159..37271e09d9 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -84,7 +84,7 @@ header_module { - CONFIG += qt_no_install_library + qt_no_install_library # Allow creation of .prl, .la and .pc files. - target.path = $$[QT_INSTALL_LIBS] @@ -20,6 +20,3 @@ index b9e5d35026..9924271042 100644 target.CONFIG += dummy_install INSTALLS += target } else { --- -2.25.4 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch deleted file mode 100644 index a43a46d8a69b..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -index a367487e..c3aeca1d 100644 ---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm -@@ -49,6 +49,11 @@ - // but was only added in the 10.14 SDK, so declare it just in case. - extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space); - -+// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html -+#if !defined(kIOSurfaceSuccess) -+#define kIOSurfaceSuccess KERN_SUCCESS -+#endif -+ - QT_BEGIN_NAMESPACE - - Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface"); diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch index 8ef1b08a5b88..f0809f8f9a3f 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch @@ -86,18 +86,6 @@ index 0cf1f31b60d..042319a2aa3 100644 +include(clang-mac.conf) load(qt_config) -diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf -index d16b77acb8e..4ba0a8eaa36 100644 ---- a/mkspecs/common/macx.conf -+++ b/mkspecs/common/macx.conf -@@ -6,7 +6,6 @@ QMAKE_PLATFORM += macos osx macx - QMAKE_MAC_SDK = macosx - - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13 --QMAKE_APPLE_DEVICE_ARCHS = x86_64 - - # Should be 10.15, but as long as the CI builds with - # older SDKs we have to keep this. diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang-arm64/Info.plist.app similarity index 100% rename from mkspecs/macx-clang/Info.plist.app diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch deleted file mode 100644 index de75ecbd0c17..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f156c35975e7844d2369ec5a6633ee40ec56f17a Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:29 -0500 -Subject: [PATCH 1/6] Revert "QCocoaDrag - set image only on the first drag - item" - -This reverts commit 7ee9bfc158a290776f622f62d0202220c6d159bc. ---- - src/plugins/platforms/cocoa/qcocoadrag.mm | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm -index 4bd1b129bd..a506126c72 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -217,18 +217,13 @@ bool QCocoaDrag::maybeDragMultipleItems() - // 0. We start from URLs, which can be actually in a list (thus technically - // only ONE item in the pasteboard. The fact it's only one does not help, we are - // still getting an exception because of the number of items/images mismatch ... -- // We only set the image for the first item and nil for the rest, the image already -- // contains a combined picture for all urls we drag. -- auto imageOrNil = dragImage; - for (const auto &qtUrl : qtUrls) { - NSURL *nsUrl = qtUrl.toNSURL(); - auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease]; - const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, - dragImage.size.width, - dragImage.size.height); -- -- [newItem setDraggingFrame:itemFrame contents:imageOrNil]; -- imageOrNil = nil; -+ [newItem setDraggingFrame:itemFrame contents:dragImage]; - [dragItems addObject:newItem]; - } - // 1. Repeat for non-url items, if any: -@@ -237,7 +232,7 @@ bool QCocoaDrag::maybeDragMultipleItems() - const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, - dragImage.size.width, - dragImage.size.height); -- [newItem setDraggingFrame:itemFrame contents:imageOrNil]; -+ [newItem setDraggingFrame:itemFrame contents:dragImage]; - [dragItems addObject:newItem]; - } - --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch deleted file mode 100644 index ee3a2d9f5a4d..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9aaac67e3c3bf40ef3efc3b07b1655f72c8c54aa Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:31 -0500 -Subject: [PATCH 2/6] Revert "QCocoaDrag::drag - make sure clipboard is ours - and populated" - -This reverts commit 720e2e0c92ca6635c5f05f318770a70cf653c1c7. ---- - src/plugins/platforms/cocoa/qcocoadrag.mm | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm -index a506126c72..c6ee4323ce 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -131,10 +131,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - m_drag = o; - m_executed_drop_action = Qt::IgnoreAction; - -- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); -- m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); -- dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); -- - if (maybeDragMultipleItems()) - return m_executed_drop_action; - -@@ -143,6 +139,10 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()]; - Q_ASSERT(dragImage); - -+ QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); -+ m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); -+ dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); -+ - NSPoint event_location = [m_lastEvent locationInWindow]; - NSWindow *theWindow = [m_lastEvent window]; - Q_ASSERT(theWindow); --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch deleted file mode 100644 index 55211fca64c7..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d1626c55d10537274c6f365855342a1c619a4c3a Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:32 -0500 -Subject: [PATCH 3/6] Revert "QCocoaDrag::maybeDragMultipleItems - fix - erroneous size check" - -This reverts commit b8a03411784803c07ecc1f769860756d6fdc04cd. ---- - src/plugins/platforms/cocoa/qcocoadrag.mm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm -index c6ee4323ce..ab6863a432 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -187,7 +187,7 @@ bool QCocoaDrag::maybeDragMultipleItems() - const auto &qtUrls = m_drag->mimeData()->urls(); - NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; - -- if (qtUrls.size() <= 1) { -+ if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) { - // Good old -dragImage: works perfectly for this ... - return false; - } --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch deleted file mode 100644 index ee9b80ca6ed4..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch +++ /dev/null @@ -1,194 +0,0 @@ -From d5c155a9f3ff38e28ac073f6df43175724ebc290 Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:34 -0500 -Subject: [PATCH 4/6] Revert "QCocoaDrag - avoid using the deprecated API if - possible" - -This reverts commit 8481a9fc974a1f1dd44a9f82decb18fe2290689f. ---- - src/plugins/platforms/cocoa/qcocoadrag.h | 6 -- - src/plugins/platforms/cocoa/qcocoadrag.mm | 90 ------------------- - .../platforms/cocoa/qnsview_dragging.mm | 9 +- - 3 files changed, 1 insertion(+), 104 deletions(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h -index 975741c270..5a5b985c6e 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.h -+++ b/src/plugins/platforms/cocoa/qcocoadrag.h -@@ -48,8 +48,6 @@ - #include - #include - --#include -- - QT_BEGIN_NAMESPACE - - class QCocoaDrag : public QPlatformDrag -@@ -71,15 +69,11 @@ public: - void setLastMouseEvent(NSEvent *event, NSView *view); - - void setAcceptedAction(Qt::DropAction act); -- void exitDragLoop(); - private: - QDrag *m_drag; - NSEvent *m_lastEvent; - NSView *m_lastView; - Qt::DropAction m_executed_drop_action; -- QEventLoop internalDragLoop; -- -- bool maybeDragMultipleItems(); - - QPixmap dragPixmap(QDrag *drag, QPoint &hotSpot) const; - }; -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm -index ab6863a432..b4a16ab912 100644 ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -44,9 +44,6 @@ - #include - #endif - #include --#include -- --#include - - QT_BEGIN_NAMESPACE - -@@ -131,9 +128,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - m_drag = o; - m_executed_drop_action = Qt::IgnoreAction; - -- if (maybeDragMultipleItems()) -- return m_executed_drop_action; -- - QPoint hotSpot = m_drag->hotSpot(); - QPixmap pm = dragPixmap(m_drag, hotSpot); - NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()]; -@@ -164,95 +158,11 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - return m_executed_drop_action; - } - --bool QCocoaDrag::maybeDragMultipleItems() --{ -- Q_ASSERT(m_drag && m_drag->mimeData()); -- Q_ASSERT(m_executed_drop_action == Qt::IgnoreAction); -- -- if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave) { -- // -dragImage: stopped working in 10.14 first. -- return false; -- } -- -- const QMacAutoReleasePool pool; -- -- NSWindow *theWindow = [m_lastEvent window]; -- Q_ASSERT(theWindow); -- -- if (![theWindow.contentView respondsToSelector:@selector(draggingSession:sourceOperationMaskForDraggingContext:)]) -- return false; -- -- auto *sourceView = static_cast*>(theWindow.contentView); -- -- const auto &qtUrls = m_drag->mimeData()->urls(); -- NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; -- -- if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) { -- // Good old -dragImage: works perfectly for this ... -- return false; -- } -- -- std::vector nonUrls; -- for (NSPasteboardItem *item in dragBoard.pasteboardItems) { -- bool isUrl = false; -- for (NSPasteboardType type in item.types) { -- using NSStringRef = NSString *; -- if ([type isEqualToString:NSStringRef(kUTTypeFileURL)]) { -- isUrl = true; -- break; -- } -- } -- -- if (!isUrl) -- nonUrls.push_back(item); -- } -- -- QPoint hotSpot = m_drag->hotSpot(); -- const auto pixmap = dragPixmap(m_drag, hotSpot); -- NSImage *dragImage = [NSImage imageFromQImage:pixmap.toImage()]; -- Q_ASSERT(dragImage); -- -- NSMutableArray *dragItems = [[[NSMutableArray alloc] init] autorelease]; -- const NSPoint itemLocation = m_drag->hotSpot().toCGPoint(); -- // 0. We start from URLs, which can be actually in a list (thus technically -- // only ONE item in the pasteboard. The fact it's only one does not help, we are -- // still getting an exception because of the number of items/images mismatch ... -- for (const auto &qtUrl : qtUrls) { -- NSURL *nsUrl = qtUrl.toNSURL(); -- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease]; -- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, -- dragImage.size.width, -- dragImage.size.height); -- [newItem setDraggingFrame:itemFrame contents:dragImage]; -- [dragItems addObject:newItem]; -- } -- // 1. Repeat for non-url items, if any: -- for (auto *pbItem : nonUrls) { -- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:pbItem] autorelease]; -- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, -- dragImage.size.width, -- dragImage.size.height); -- [newItem setDraggingFrame:itemFrame contents:dragImage]; -- [dragItems addObject:newItem]; -- } -- -- [sourceView beginDraggingSessionWithItems:dragItems event:m_lastEvent source:sourceView]; -- internalDragLoop.exec(); -- return true; --} -- - void QCocoaDrag::setAcceptedAction(Qt::DropAction act) - { - m_executed_drop_action = act; - } - --void QCocoaDrag::exitDragLoop() --{ -- if (internalDragLoop.isRunning()) -- internalDragLoop.exit(); --} -- -- - QPixmap QCocoaDrag::dragPixmap(QDrag *drag, QPoint &hotSpot) const - { - const QMimeData* data = drag->mimeData(); -diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm -index 978d73f7d9..463e3c5579 100644 ---- a/src/plugins/platforms/cocoa/qnsview_dragging.mm -+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm -@@ -232,10 +232,6 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin - if (!target) - return; - -- auto *nativeDrag = QCocoaIntegration::instance()->drag(); -- Q_ASSERT(nativeDrag); -- nativeDrag->exitDragLoop(); -- - QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint(); - - qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint; -@@ -294,12 +294,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin - if (!target) - return; - -- QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag(); -- Q_ASSERT(nativeDrag); -- nativeDrag->exitDragLoop(); -- // for internal drag'n'drop, don't override the action the drop event accepted -- if (!nativeDrag->currentDrag()) -- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); -+ QCocoaIntegration::instance()->drag(); - - // Qt starts drag-and-drop on a mouse button press event. Cococa in - // this case won't send the matching release event, so we have to --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch deleted file mode 100644 index f93f80055982..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e55ca5d08b29e67b699dc217abcb65e4a7655f72 Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 12:32:37 -0500 -Subject: [PATCH 5/6] Revert "macOS: Fix use of deprecated NSOffState" - -This reverts commit 6a0995525d306a1fa224adcbcb9f0ae1fc7d01bd. ---- - src/plugins/styles/mac/qmacstyle_mac.mm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm -index d1febd81d4..b5e6e60ec0 100644 ---- a/src/plugins/styles/mac/qmacstyle_mac.mm -+++ b/src/plugins/styles/mac/qmacstyle_mac.mm -@@ -3955,7 +3955,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter - pbCell = static_cast(pb.cell); - oldPosition = pbCell.arrowPosition; - pbCell.arrowPosition = NSPopUpNoArrow; -- if (pb.state == NSControlStateValueOff) { -+ if (pb.state == NSOffState) { - // NSPopUpButton in this state is smaller. - rAdjusted.origin.x -= 3; - rAdjusted.size.width += 6; --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch deleted file mode 100644 index b5c634aff76b..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 3ce5e752c66307f905fdf732b102a396d9248fbb Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin -Date: Mon, 7 Dec 2020 13:22:02 -0500 -Subject: [PATCH 6/6] git checkout v5.15.0 -- - src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm - ---- - .../cocoa/qcocoacolordialoghelper.mm | 50 +++++++++---------- - 1 file changed, 25 insertions(+), 25 deletions(-) - -diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm -index 5ad1f9d7bb..c9fa035d87 100644 ---- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm -+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm -@@ -180,34 +180,34 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate); - - - (void)updateQtColor - { -- // Discard the color space and pass the color components to QColor. This -- // is a good option as long as QColor is color-unmanaged: we preserve the -- // exact RGB value from the color picker, which is predictable. Further, -- // painting with the color will reproduce the same color on-screen, as -- // long as the the same screen is used for selecting the color. -- NSColor *componentColor = [[mColorPanel color] colorUsingType:NSColorTypeComponentBased]; -- switch (componentColor.colorSpace.colorSpaceModel) -- { -- case NSColorSpaceModelGray: { -- CGFloat white = 0, alpha = 0; -- [componentColor getWhite:&white alpha:&alpha]; -- mQtColor.setRgbF(white, white, white, alpha); -- } break; -- case NSColorSpaceModelRGB: { -- CGFloat red = 0, green = 0, blue = 0, alpha = 0; -- [componentColor getRed:&red green:&green blue:&blue alpha:&alpha]; -- mQtColor.setRgbF(red, green, blue, alpha); -- } break; -- case NSColorSpaceModelCMYK: { -+ NSColor *color = [mColorPanel color]; -+ NSString *colorSpaceName = [color colorSpaceName]; -+ if (colorSpaceName == NSDeviceCMYKColorSpace) { - CGFloat cyan = 0, magenta = 0, yellow = 0, black = 0, alpha = 0; -- [componentColor getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha]; -+ [color getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha]; - mQtColor.setCmykF(cyan, magenta, yellow, black, alpha); -- } break; -- default: -- qWarning("QNSColorPanelDelegate: Unsupported color space model"); -- break; -+ } else if (colorSpaceName == NSCalibratedRGBColorSpace || colorSpaceName == NSDeviceRGBColorSpace) { -+ CGFloat red = 0, green = 0, blue = 0, alpha = 0; -+ [color getRed:&red green:&green blue:&blue alpha:&alpha]; -+ mQtColor.setRgbF(red, green, blue, alpha); -+ } else if (colorSpaceName == NSNamedColorSpace) { -+ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; -+ CGFloat red = 0, green = 0, blue = 0, alpha = 0; -+ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha]; -+ mQtColor.setRgbF(red, green, blue, alpha); -+ } else { -+ NSColorSpace *colorSpace = [color colorSpace]; -+ if ([colorSpace colorSpaceModel] == NSCMYKColorSpaceModel && [color numberOfComponents] == 5){ -+ CGFloat components[5]; -+ [color getComponents:components]; -+ mQtColor.setCmykF(components[0], components[1], components[2], components[3], components[4]); -+ } else { -+ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; -+ CGFloat red = 0, green = 0, blue = 0, alpha = 0; -+ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha]; -+ mQtColor.setRgbF(red, green, blue, alpha); -+ } - } -- - if (mHelper) - emit mHelper->currentColorChanged(mQtColor); - } --- -2.21.0 - diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch deleted file mode 100644 index 3638268de7af..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf ---- a/mkspecs/common/macx.conf -+++ b/mkspecs/common/macx.conf -@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64 - - # Should be 10.15, but as long as the CI builds with - # older SDKs we have to keep this. --QT_MAC_SDK_VERSION_MIN = 10.14 -+QT_MAC_SDK_VERSION_MIN = 10.12 - - QT_MAC_SDK_VERSION_MAX = 10.15 - -diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm ---- a/src/corelib/kernel/qcore_mac.mm -+++ b/src/corelib/kernel/qcore_mac.mm -@@ -261,16 +261,10 @@ QMacAutoReleasePool::QMacAutoReleasePool() - - #ifdef QT_DEBUG - void *poolFrame = nullptr; -- if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) { -- void *frame; -- if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1)) -- poolFrame = frame; -- } else { - static const int maxFrames = 3; - void *callstack[maxFrames]; - if (backtrace(callstack, maxFrames) == maxFrames) - poolFrame = callstack[maxFrames - 1]; -- } - - if (poolFrame) { - Dl_info info; -diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp ---- a/src/gui/rhi/qrhi.cpp -+++ b/src/gui/rhi/qrhi.cpp -@@ -4251,7 +4251,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh - break; - #endif - case Metal: --#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) -+#if 0 - r->d = new QRhiMetal(static_cast(params), - static_cast(importDevice)); - break; -diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri ---- a/src/gui/rhi/rhi.pri -+++ b/src/gui/rhi/rhi.pri -@@ -43,7 +43,7 @@ win32 { - LIBS += -ld3d11 -ldxgi -ldxguid - } - --macos|ios { -+false { - HEADERS += \ - rhi/qrhimetal_p.h \ - rhi/qrhimetal_p_p.h -diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm ---- a/src/plugins/platforms/cocoa/qcocoadrag.mm -+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm -@@ -133,7 +133,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()]; - Q_ASSERT(dragImage); - -- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); -+ QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND); - m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); - dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); - -@@ -144,7 +144,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) - CGFloat flippedY = dragImage.size.height - hotSpot.y(); - event_location.y -= flippedY; - NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0); -- NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; -+ NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; - - [theWindow dragImage:dragImage - at:event_location diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch new file mode 100644 index 000000000000..0d4154837829 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch @@ -0,0 +1,29 @@ +diff --git a/configure.pri b/configure.pri +index e072961f0..ac0861c01 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -442,24 +442,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { + } + + defineTest(qtwebengine_isMacOsPlatformSupported) { +- !qtwebengine_isMinXcodeVersion(10, 0, 0) { +- qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.") +- return(false) +- } +- !clang|intel_icc { +- qtwebengine_platformError("requires Clang.") +- return(false) +- } +- # We require macOS 10.13 (darwin version 17.0.0) or newer. +- darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) +- lessThan(darwin_major_version, 17) { +- qtwebengine_platformError("requires macOS version 10.13 or newer.") +- return(false) +- } +- !qtwebengine_isMinOSXSDKVersion(10, 13): { +- qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) +- } + return(true) + } + diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch index 44df09299251..86663ee80b57 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch @@ -1,28 +1,3 @@ -diff a/configure.pri b/configure.pri ---- a/configure.pri -+++ b/configure.pri -@@ -439,8 +439,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { - - defineTest(qtwebengine_isMacOsPlatformSupported) { - !qtwebengine_isMinXcodeVersion(10, 0, 0) { -- qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.") -- return(false) - } - !clang|intel_icc { - qtwebengine_platformError("requires Clang.") -@@ -449,12 +447,6 @@ defineTest(qtwebengine_isMacOsPlatformSupported) { - # We require macOS 10.13 (darwin version 17.0.0) or newer. - darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 17) { -- qtwebengine_platformError("requires macOS version 10.13 or newer.") -- return(false) -- } -- !qtwebengine_isMinOSXSDKVersion(10, 13): { -- qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) - } - return(true) - } diff a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri --- a/src/buildtools/config/mac_osx.pri +++ b/src/buildtools/config/mac_osx.pri diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 4639bf53a52f..229bfabbece2 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,207 +1,207 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "0ff905d194e273e04e95b72dbbfd4e58193ecbaa", - "sha256": "1jv4xjxdr6xbm4q8fk0ijhl845qnnhxqmwkzqg2ssxdn015iabj9" + "rev": "c3c7e6ebc29cce466d954f72f340a257d76b5ec2", + "sha256": "0lh05j21acs8wz72g4cs092m1yglpbjkhh55ww1351fjrp5gbzrg" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "80b43bfe4109820fb7feddb4a16e227a03bc1c4e", - "sha256": "1m3c0znrm63b2wbz7vghxrh22lxdp1s7bwc00qfwhgjn1ajyrp71" + "rev": "2334cafc110c4e63bec3a5c7abdcd67e5e5ee754", + "sha256": "0p7pydqsrws5x9l74y37ldffd3yz4riyizl8669x6y6hj6177yd3" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "3f8c9f144acbe921a759d261e1314614793f89e0", - "sha256": "1k680n1gvj55i0yb7zrlbai4w3mvhhcbbpmcgm1wlv29rg268gi4" + "rev": "7ede0a6c555518a3fecba8930d5e4d9c58875d0d", + "sha256": "0nvdrbqm469iikkvzwjni3zb7dxwpy3x161m9yly4irklixhxkzh" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "51258629f2cf37fff8406bf705d79c07fc7135ca", - "sha256": "0wsjw7wc493kx6w954plmd5y8qsshbd5wqxdwj350gnv48n63g2k" + "rev": "9cf586d629a04040c9414c4f9e17abbc65c644eb", + "sha256": "1jvm92m3jz34yvzyn4vnihga2phpgszb2wqk0y7pr0ww6vs9kaf6" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "055c6d6e49c5ea369990e7078fd534392a0ba6b9", - "sha256": "0r07yjdlxzk34br905da5kcm6xda50907nrffkw99683ix9y64ag" + "rev": "e30be213e483f2d6f3c40af0cbdc11a8e92e2026", + "sha256": "0vn1xh40lxa6vi87vr6qpskli2vh47mxi3d5srhf8rark0m51lf4" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "6796953f92a1d3af30d0676e56ec5dfd82199611", - "sha256": "16zh10rm2b4sk9mn4r4sfp2mzvrxlz4nqj8bpiy055mplz5day39" + "rev": "056294c0493f814c3951ef57e5d0656efe643fb5", + "sha256": "0byzmd7azrx06xmd8dsapjljpc9wwnsr39jjccbapjl5rfxywipw" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "8e1a57efa1ba3eabbf44098ce6ede3d130c57b5d", - "sha256": "19v7la492414d0qzqdqnbhpxpg0hsqll6ixhv4jrckvdaqv7iqxz" + "rev": "9f0f50ebef04d5ac5ed0ee2a3a71e7748fce3005", + "sha256": "151650nqq29m99cbf7ac02vxzw4ivm4spr4kd2ss3gwhfxby3zgj" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "959b1ac3b7c699ef67ec81155e6e1e579d4e1df7", - "sha256": "0f8l214x38hdn768jjfy31pqdjgya6221k38vidnfap522qs1fcm" + "rev": "8defe7bfcae2ac5cb6dc25bfe3678124b09cf6f9", + "sha256": "0xzdnrhqalsrc52a326c5baf3si815a4rb2p1a4djyf8anp9wcai" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "e3e926a66f0a4ffbf82f0df1a5f570d759faad4f", - "sha256": "1ji5qn9bhyz30z12dvh97xxi3ga9b4lymdc7kmzmcd37y56q9s5c" + "rev": "79d6ef693b6241db4a86a90943c02180c4944214", + "sha256": "0ldskh9dd8qwa96nz1q5sbb8r2jdfcxvq589dyw87m3gpb8v16qq" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "ce0202d67bf1ab2bb887f58122b20eab5b6c1d5d", - "sha256": "11c24b2pzjcv14xix96fghyx3j3kw6rmhh499wqwc0qy5mjb6kpw" + "rev": "ad63dc64f4bdafb503f7015d04e8849cef5d99b4", + "sha256": "06ag3cmg56f4z9pc3ix9lddz5ydx48pf438xc2l1z3x4wxbkfbsy" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "a2b1600300cda89804d48ec90e0068a075fecc8b", - "sha256": "0ca666260mvvlf551076840pvh9r67v2bhmf0yf1xp06rxc205zq" + "rev": "4119e4e6dc94447d773a01c1d6e4de0fefb9235a", + "sha256": "0sdywxrbjzz9qmrywd54hqqssv59b9mlvra16hjxfd0di50brab2" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "adbc372b890ed90f006a6c4f3ca56bf0cba477ef", - "sha256": "05v47ba06lmhrmm9ivnfnxzv9qdhyx2bbx2lkqjfwax2czmnf81j" + "rev": "abe44c0f526e499668b1131c5990d9b571f99c46", + "sha256": "0llw5lsw368vzsc7dnjy3ahxny8qzb7yz3aakgsbd5glk3dgr4i4" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "f920a6cc2931402023840c223fce2fed321e28ea", - "sha256": "08r6h5d120x6lnzrjwscvv1dbjf720mg508wkyf8f999xncmp0yi" + "rev": "f991e28cb0a670597f1955585c76ce8a26ce9e4b", + "sha256": "1vflnscqc0jidr68v5ikxr579rx7k5yhdik8dcmnfgvmz3fq4jlz" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "8bb9237e4e1462f405d931a8a513ed4c27632d9e", - "sha256": "1qd86wrvf3487s3f39m6pvcipa5s7zhn99kbfnmrhg0q35cr2816" + "rev": "56f94cb8e2da9801ada7aa06f86ccf807f5a4ed8", + "sha256": "1pyshl395qmf84h5lyw3rgn3gmz98sm1dq003jvr74w9i746hszf" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "e7d4c37810976b6a1730d842cbca04b66ca7de30", - "sha256": "01kxc4185kb3pq2dfcjyl3n765gjwpf9l2r4q6gncy5v75a2y700" + "rev": "bc397be87f9b02e8279cfe2fc9b893c9f95219b9", + "sha256": "1dr8a7sv00dmk1hc6kzs93rhvjk2wkxx0mxl7riafdzxzyajcl7n" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "f3dc18968c437c993886d3bfb668b62344a10860", - "sha256": "0li29bvvjcck1y4zhhc6imxa8ip3988yv2zz5k6anyasb0ywbip8" + "rev": "0d7cc33ac1404758886acef4f804b788c6774e98", + "sha256": "1ra9iv4pjcgz98927lkbpw494qf1jxsg4vbzxsxi247q2d1dkwzi" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "f34ac77b5955126be60faa2b801be2d19dff896f", - "sha256": "1ip0sp70q4mircngs77p2m8njh8aw6f1q1w6f7nm0i2vkydpqfy2" + "rev": "f082a4c84c54e888b8d023ba68b7085551403425", + "sha256": "03sd0a58b8z340in4avk6lqqa9qzkzkaxnk2yn1a270sxrsq6y0l" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "25ead89b0834f669e0a193e6d6cf2da25d33a452", - "sha256": "1jx44zr8kpjjg92by6sb9p5nqkadsqdhprngdbzyvxzhh1bplg1h" + "rev": "9dfea35b04dcb52d02d7a2883df88d89ba9999ef", + "sha256": "0swliqwzz3b297z7y6sr79ijgv3914s2g9ymq77plxglfdrnm74j" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "95f52cb212f66e6022661fb7f2eb81a8c21e9f22", - "sha256": "0j508pc4fyz7gi9bjmyq4i0q9kmfhcckgwp38wcvgr6xm83f224n" + "rev": "47defc8b33b7bdf1dbf289b65b301fba2def9b1c", + "sha256": "1w4f02kch7p2jhn6dlzks6jpfcsm9ik04jnnaw6qvpxpsxwvcaah" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "c7dae5f6041d6c076311f2d8ed13fcfe3598be70", - "sha256": "1fxvhrikjywh7gbz4lyivkvmsfnlqb7sd7r5rzqg6xi61x7i3fm4" + "rev": "18977875d16e22ad68a1dc2d7ee0a9c9f873c941", + "sha256": "0n3930zzvp4s6m715rvx1bjh2s2fg7cadjs2hq6bc8k9mwlqibk1" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "5465566a4ad9f6f9758bed304153f0c7fec3437b", - "sha256": "03qayykxd07fwp5m1s7dwjvdcv45m3v6zia9k6ipif2bbjbi4dyd" + "rev": "56ce8233382a091a8476c831edd416b5f704ae4f", + "sha256": "1h68s2fdgn1pbf5hsk6c8v4icz8c4cpbxv8iirz22yhlzabc3hdm" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "e2438e010a98d731317c10a64c095e0282b51ab0", - "sha256": "0bbj0blxz3zbz03a85drwysshl0qib0fl46ln22ll52819qw111v" + "rev": "4cd0142a30bfa5eef47c720ac24dd73e12764806", + "sha256": "13vhlgxq8ap796p3y9c3kj645p0370bqjwm5hkz13pazm15sbc9z" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "5f2a598a9134167a0da2efcbf1249fc167ae3750", - "sha256": "1c3cg8fq681wrqk2xhajym1l9f8vfsffc8g0xp06m7lp11hr9bmq" + "rev": "929c7ad0676f084b9ecc469cd47a307596923cb3", + "sha256": "0l94k9fdzk96j40gab2l5n4lmadzaqhvbg8s3m5f3v4im00xa2x9" }, "qtscript": { "url": "https://invent.kde.org/qt/qt/qtscript.git", - "rev": "b169b3e6ac1f9d66834ad61fbe35d3e25ff204bc", - "sha256": "01nfg53ixlggam5id16n1lc9n2anclrk6prvawi2fhpcnw4dpdza" + "rev": "4d8e4bd20b7100b0b7192547b19c3c239aaf7034", + "sha256": "1pvihbjjmczby4934lir3h3kq0rqcvxnbw2vdkl9lhkds3lm0qhf" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "e1faea1db52b91d90ef64dd57eb6529e323b5526", - "sha256": "1j1ckm2jca0h8zyfyq3kzf0dwp8jw9xwlpg7f7qi5dd8wd9dncmi" + "rev": "0c93f94a44e2dce7eed9d17d4976b0c1e14be7bb", + "sha256": "1vvzvin23ws6njhyg93s2dlkxb9p50mkipc611lsx7971gv1wih0" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "5f1f73fdba8906f58c4554cbef9c1a72edcf0230", - "sha256": "0y7zyx9br4scbgkja5smkmyhlb6snqhir8mypsgdc4kllnbr4wkh" + "rev": "6add85fa1a234a7e1943ba175c6fc799ccbae48e", + "sha256": "1k02x3wzczwg7cqh6hav31akdsz9kk8s0vryd3q7zfrhqy9m88sh" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "180cb13048a24510f9a1b20796772d27da762bdd", - "sha256": "1s7y7rdicb50aa2kfsl74y0dm1qd2kd6fncyqaq55w0rn95fks87" + "rev": "ced5c7223d037aece1e7f37d4314f388252de025", + "sha256": "009ajdry6lvf9pifzm2zl0w5zhkmrrxm53mjf9s76jqrsi6yqk30" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "966cf2a2077a8470715894363ad46ea7df0665fa", - "sha256": "1a3f3fhwblifgsn3x6qhx4fmpxp458q4x8vp3jdxmynnkfiigafp" + "rev": "e2851096dc6f6a7cfa635d69ea950b382e3658ab", + "sha256": "071g8d9i3wi8rqqy4lxpp3z25a55pd2xwsy3r8v0a6s6y5g5lcpf" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "d32f4a479d38a11f547598004b975f4356424a16", - "sha256": "1n0f2pym6kl0fh5iqrln7z45hwmw8bha5s7bzswsihrq6zxkca4f" + "rev": "255845e2b2e605363762be25932d92fc10d32749", + "sha256": "0apyk2z9r7i54sh0zgbs8vfncc4jrcrzzvi3q14d105pkhrschp9" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "83296f10ebdb9a666b11dc69f3a148c38b9c425c", - "sha256": "0gifl43lnddp0shbyhmijlm2qpqj6fp2xip96nxn1ql3g70f9kyv" + "rev": "a7a0f2491334e8cb4ef5731f5eb741f3f7b9af76", + "sha256": "13zpzvwqv61dsd74s92nf46rhaw2rw3hl8m6d313wjlaaqi95ln6" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "c4750dd02070ce246ff98cc5d137193825043912", - "sha256": "0zryql6g77hdqsh10gzmw9n8ibki35b5jvh96gjl29yrvan9w5v7" + "rev": "090e526e713d01eac34c64e4a09ad961c612febf", + "sha256": "1zrxv9wdnqayn5hhblwyqyrdn8mj7x2ks2f4qsr2w3cdidcjjz7y" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "c38edd3a5501bcd53132e1e4abb7d25a98e0e1a9", - "sha256": "0if1mx6jic67pzv1p0xqb5fknfbawvzxw7fx90hc4kkrwjm73q7m" + "rev": "af8cd030fed6a47cc1e8727e7ee5445e037bf712", + "sha256": "14fx3r9s3p16rhv9fyrwnv6bn24nvh5xnjwcw1mb04c44ddb9r86" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "8aebadb96c1e57ba89bba2e5962399f676207a32", - "sha256": "0hygidp8l580d10c1g6pgdxd3g6lza0dkgfm6bd2kjrigg71fzh0" + "rev": "5f66c9571303170f07954f73b09cad4cee1ce5d0", + "sha256": "0jzl7a2zr83nd9sskmz9fk2w2spn3v821j0l7kcp2hxydgyhk8v3" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "4b43f2dc58e71732ebdbe1eaf4392272bc692e6d", - "sha256": "157wqyh9wv9kn8671l7dhnv3a4glmqpisqk0vdgnx19b6jdxymvj" + "rev": "f6a1e838e371dc90272c62daeea597fe487dec3e", + "sha256": "0v8vcs4jl24h754ilg9dm4qq1q24fk9mmnanpqk1q102ymmz2rac" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "4e35fe9429920067c17596986b486fb1c1e95db0", - "sha256": "1j74hfrrrb1irchlgqclbk3zjgg98clndfw576psa3zm8xg3szin" + "rev": "f8949655ccfacc2d34cfb0af23c540db84a2b9e5", + "sha256": "1303hghvk6avshb7imnkv24qv1ij5d3nbljba20l6v6dsr7zg7ba" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "3087cdd0758258163299602550f7d4e72edf2a80", - "sha256": "19gsc842njdgmiqhkl7xqqry1d40phjwixzajzphv4s5vmcbxn5w" + "rev": "655be6c5406f8ba42acaca363fc55d78a6198733", + "sha256": "08biydqk1lhjzvrgl3zhbrrgnjcy611pmh9scyw42avdvj2qzpc2" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "594477769ecac4032ba116196493f3ba3db1aaed", - "sha256": "102r5jam8kc46bjlxf3jdjsr1jzdj5vfwmf4yypbhihwz436z791" + "rev": "63fb8da1ecf8e48262cd515690cf71a425f92bf5", + "sha256": "0kjw5dsgn67897laana4h06czr9g8555jiqf1k3pkzv4fxzcqypn" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "b1605fea61a6bbb599b720c54282bc8ddb0aacf0", - "sha256": "158hiqrshblw3axpryv0lqk74691njdc8qmdxbz28hzaaq6rxj5n" + "rev": "dfd86e07019488954cddcf2ba314df3cd0c01c0c", + "sha256": "1crph9sdmxxs0787il86j2dv6k3qylmy8a83hfzczcjcx3pwcf7a" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "2a04b162451460ffc208c2c27acce16a18f763ce", - "sha256": "17h5bd94jhwqgzlb5w75rfgb3v0jkg6fm79kd0byzp7bvp7i7ibj" + "rev": "48318520a4031167c4c0ad559e1a11b2f4c053d6", + "sha256": "04smnp9pl3szizdp05dz7qmdgg8sk57d3r40sdy7v9zwi4lwaqi4" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "9134cdba9386e408ce2ffe515ca0c3f6f6c66685", - "sha256": "03qs1griqx3bccaqas8mifbj4f4bhwfzc3f6knws3zy3mc9l8qzq" + "rev": "e44c85e8643f2724109993a7b9eaf0dff3530fec", + "sha256": "1vs1013zxw54xfmkpid99p5f38hlqds172vija7xjyjaww7j7y3b" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "b798a0f0265538a9dd12b5c7e4dad84ba8e1db4e", - "sha256": "1lh9rci7bqrjw912blns369qs76c7lywnxmmmlhchrhk9l89ailk" + "rev": "3199d91de3f38e5ece3d36bcefe2c33b2c014f3f", + "sha256": "1hjw5ymbc1fl4r4lym7n7ilmb953izmvyp6z8g5l8l7cz9sjz4ka" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index f566c621f249..36cab60e97b4 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,7 +1,7 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.7"; + version = "5.15.8"; overrides = {}; mk = name: args: diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 0102c2fd1b6f..44f72701854c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -9,7 +9,7 @@ , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb -, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, xcbutil +, libxkbcommon, libxml2, libxslt, openssl, pcre2, sqlite, udev, xcbutil , xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core # optional dependencies @@ -27,8 +27,6 @@ }: let - compareVersion = v: builtins.compareVersions version v; - qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; debugSymbols = debug || developerBuild; in @@ -45,7 +43,7 @@ stdenv.mkDerivation { # Image formats libjpeg libpng - (if compareVersion "5.9.0" < 0 then pcre16 else pcre2) + pcre2 ] ++ ( if stdenv.isDarwin then [ # TODO: move to buildInputs, this should not be propagated. @@ -116,7 +114,7 @@ stdenv.mkDerivation { # https://bugs.gentoo.org/803470 sed -i 's/-lpthread/-pthread/' mkspecs/common/linux.conf src/corelib/configure.json - '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' + patchShebangs ./bin '' + ( if stdenv.isDarwin then '' @@ -146,22 +144,18 @@ stdenv.mkDerivation { setOutputFlags = false; preConfigure = '' export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ${lib.optionalString (compareVersion "5.9.0" < 0) '' - # We need to set LD to CXX or otherwise we get nasty compile errors - export LD=$CXX - ''} NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" # paralellize compilation of qtmake, which happens within ./configure export MAKEFLAGS+=" -j$NIX_BUILD_CORES" - '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' + ./bin/syncqt.pl -version $version ''; postConfigure = '' qmakeCacheInjectNixOutputs() { - local cache="$1/${qmakeCacheName}" + local cache="$1/.qmake.stash" echo "qmakeCacheInjectNixOutputs: $cache" if ! [ -f "$cache" ]; then echo >&2 "qmakeCacheInjectNixOutputs: WARNING: $cache does not exist" @@ -184,7 +178,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' - ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' + ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optional stdenv.isLinux "-DUSE_X11" @@ -192,14 +186,10 @@ stdenv.mkDerivation { # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" ] - ++ lib.optionals ((compareVersion "5.15.0" >= 0) && stdenv.isDarwin) [ - # .moc/moc_qprintdialog.cpp:96:31: error: no member named '_q_togglePageSetCombo' in 'QPrintDialogPrivate' - "-DQ_OS_MAC" - ] ++ lib.optionals withGtk3 [ + ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' - ] - ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); + ] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); prefixKey = "-prefix "; @@ -233,18 +223,14 @@ stdenv.mkDerivation { "-L" "${icu.out}/lib" "-I" "${icu.dev}/include" "-pch" - ] ++ lib.optional debugSymbols "-debug" - ++ lib.optionals (compareVersion "5.11.0" < 0) [ - "-qml-debug" - ] ++ lib.optionals (compareVersion "5.9.0" < 0) [ - "-c++11" - "-no-reduce-relocations" - ] ++ lib.optionals developerBuild [ + ] + ++ lib.optional debugSymbols "-debug" + ++ lib.optionals developerBuild [ "-developer-build" "-no-warnings-are-errors" ] ++ (if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" - ] else lib.optionals (compareVersion "5.9.0" >= 0) [ + ] else [ "-sse2" "${lib.optionalString (!stdenv.hostPlatform.sse3Support) "-no"}-sse3" "${lib.optionalString (!stdenv.hostPlatform.ssse3Support) "-no"}-ssse3" @@ -278,7 +264,7 @@ stdenv.mkDerivation { "-make tools" ''-${lib.optionalString (!buildExamples) "no"}make examples'' ''-${lib.optionalString (!buildTests) "no"}make tests'' - ] ++ lib.optional (compareVersion "5.15.0" < 0) "-v" + ] ++ ( if stdenv.isDarwin then [ "-no-fontconfig" @@ -286,9 +272,8 @@ stdenv.mkDerivation { "-qt-libpng" "-no-framework" ] else [ - "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" - ] ++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb" - ++ [ + "-rpath" + ] ++ [ "-xcb" "-qpa xcb" "-L" "${libX11.out}/lib" @@ -303,20 +288,11 @@ stdenv.mkDerivation { ''-${lib.optionalString (cups == null) "no-"}cups'' "-dbus-linked" "-glib" - ] ++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg" - ++ [ + ] ++ [ "-system-libpng" ] ++ lib.optional withGtk3 "-gtk" - ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify" - ++ lib.optionals (compareVersion "5.10.0" >= 0) [ - # Without these, Qt stops working on kernels < 3.17. See: - # https://github.com/NixOS/nixpkgs/issues/38832 - "-no-feature-renameat2" - "-no-feature-getentropy" - ] ++ lib.optionals (compareVersion "5.12.1" < 0) [ - # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 - "-system-xkbcommon" - "-xkbcommon-evdev" + ++ [ + "-inotify" ] ++ lib.optionals (cups != null) [ "-L" "${cups.lib}/lib" "-I" "${cups.dev}/include" @@ -368,12 +344,6 @@ stdenv.mkDerivation { license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; platforms = platforms.unix; - # Qt5 is broken on aarch64-darwin - # the build ends up with the following error: - # error: unknown target CPU 'armv8.3-a+crypto+sha2+aes+crc+fp16+lse+simd+ras+rdm+rcpc' - # note: valid target CPU values are: nocona, core2, penryn, ..., znver1, znver2, x86-64 - # it seems the qmake/cmake passes x86_64 as preferred architecture somewhere - broken = stdenv.isDarwin && stdenv.isAarch64 && (compareVersion "5.15.3" < 0); }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 10e18b3b9844..c7b61ab11f4b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -11,14 +11,14 @@ qtModule { # wrapped executables from `wrapQtAppsHook` (see comment in patch for further # context). Beware: shared among different Qt5 versions. ./qtwayland-app_id.patch - ] ++ lib.optional (lib.versionAtLeast qtbase.version "5.15") + # Backport of https://codereview.qt-project.org/c/qt/qtwayland/+/388338 # Pulled from Fedora as they modified it to not apply to KDE as Plasma 5.x # doesn't behave properly with the patch applied. See the discussion at # https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/39 for details - # This patch won't apply to versions before 5.15. (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt5-qtwayland/raw/46376bb00d4c3dd3db2e82ad7ca5301ce16ea4ab/f/0080-Client-set-constraint-adjustments-for-popups-in-xdg.patch"; sha256 = "sha256-XP+noYCk8fUdA0ItCqMjV7lSXDlNdB7Az9q7NRpupHc="; - }); + }) + ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index d337b030ab8f..3cf2fedbadde 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -80,30 +80,21 @@ qtModule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc - '' + lib.optionalString stdenv.isDarwin ( - (if (lib.versionAtLeast qtCompatVersion "5.14") then '' + '' + lib.optionalString stdenv.isDarwin ('' substituteInPlace src/buildtools/config/mac_osx.pri \ --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' - '' else '' - substituteInPlace src/core/config/mac_osx.pri \ - --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' - '') - # Following is required to prevent a build error: - # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it - + '' + + # Following is required to prevent a build error: + # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ --replace '$sysroot/usr' "${xnu}" - '' - # Apple has some secret stuff they don't share with OpenBSM - + (if (lib.versionAtLeast qtCompatVersion "5.14") then '' - substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \ - --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ - --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" - '' else '' - substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ - --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - '')) + postPatch; + + # Apple has some secret stuff they don't share with OpenBSM + substituteInPlace src/3rdparty/chromium/base/mac/mach_port_rendezvous.cc \ + --replace "audit_token_to_pid(request.trailer.msgh_audit)" "request.trailer.msgh_audit.val[5]" + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/mach/mach_message.cc \ + --replace "audit_token_to_pid(audit_trailer->msgh_audit)" "audit_trailer->msgh_audit.val[5]" + '') + postPatch; NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit @@ -115,19 +106,7 @@ qtModule { ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-elaborated-enum-base" ] ++ lib.optionals stdenv.isDarwin [ - "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12" - "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12" "-Wno-elaborated-enum-base" - - # - # Prevent errors like - # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7: - # error: pointer to non-const type 'id' with no explicit ownership - # id** _kvcPropertyAccessors; - # - # TODO remove when new Apple SDK is in - # - "-fno-objc-arc" ]; preConfigure = '' @@ -139,7 +118,7 @@ qtModule { ''; qmakeFlags = [ "--" "-system-ffmpeg" ] - ++ lib.optional (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" + ++ lib.optional pipewireSupport "-webengine-webrtc-pipewire" ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ @@ -173,7 +152,7 @@ qtModule { xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile - ] ++ lib.optionals (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) [ + ] ++ lib.optionals pipewireSupport [ # Pipewire pipewire_0_2 ] @@ -231,7 +210,7 @@ qtModule { [Paths] Prefix = .. EOF - '' + lib.optionalString (lib.versions.majorMinor qtCompatVersion == "5.15") '' + # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3) sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake ''; @@ -259,10 +238,5 @@ qtModule { # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; - # we are still stuck with MacOS SDK 10.12 on x86_64-darwin - # and qtwebengine 5.14+ requires at least SDK 10.14 - # (qtwebengine 5.12 is fine with SDK 10.12) - # on aarch64-darwin we are already at MacOS SDK 11.0 - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 76f3481386f3..cc2644edd4e6 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -19,35 +19,21 @@ let ''; buildInputs = [ perl ]; }; - usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0"; in qtModule { pname = "qtwebkit"; - qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] - ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia - ++ lib.optional usingAnnulenWebkitFork qtwebchannel; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] - ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ] - ++ lib.optional usingAnnulenWebkitFork hyphen; - nativeBuildInputs = [ - bison flex gdb gperf perl pkg-config python38 ruby - ] ++ lib.optional usingAnnulenWebkitFork cmake; + qtInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] + ++ lib.optional stdenv.isDarwin qtmultimedia; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] + ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; + nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python38 ruby cmake ]; - cmakeFlags = lib.optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] + cmakeFlags = [ "-DPORT=Qt" ] ++ lib.optionals stdenv.isDarwin [ "-DQt5Multimedia_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5Multimedia" "-DQt5MultimediaWidgets_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets" "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF" - ]); - - # QtWebKit overrides qmake's default_pre and default_post features, - # so its custom qmake files must be found first at the front of QMAKEPATH. - preConfigure = lib.optionalString (!usingAnnulenWebkitFork) '' - QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" - fixQtBuiltinPaths . '*.pr?' - # Fix hydra's "Log limit exceeded" - export qmakeFlags="$qmakeFlags CONFIG+=silent" - ''; + ]; NIX_CFLAGS_COMPILE = [ # with gcc7 this warning blows the log over Hydra's limit diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index 6a9b48545749..f501d0e8ced5 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -4,9 +4,6 @@ , rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocm-smi , hip , gtest @@ -16,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rccl"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" @@ -28,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-NbHzRmrUe4kJwkHZtZ+zHjIy2uk+dpN9caE0L5hUnbc="; + hash = "sha256-y9gTGk8LyX7owb2xdtb6VlnIXu/CYHOjnNa/wrNl02g="; }; nativeBuildInputs = [ @@ -38,9 +35,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr rocm-smi gtest ] ++ lib.optionals buildTests [ diff --git a/pkgs/development/libraries/readline/8.1.nix b/pkgs/development/libraries/readline/8.2.nix similarity index 85% rename from pkgs/development/libraries/readline/8.1.nix rename to pkgs/development/libraries/readline/8.2.nix index 35835c1a1436..0fedcdc9397f 100644 --- a/pkgs/development/libraries/readline/8.1.nix +++ b/pkgs/development/libraries/readline/8.2.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "readline"; - version = "8.1p${toString (builtins.length upstreamPatches)}"; + version = "8.2p${toString (builtins.length upstreamPatches)}"; src = fetchurl { url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; - sha256 = "00ibp0n9crbwx15k9vvckq5wsipw98b1px8pd8i34chy2gpb9kpq"; + sha256 = "sha256-P+txcfFqhO6CyhijbXub4QmlLAT0kqBTMx19EJUAfDU="; }; outputs = [ "out" "dev" "man" "doc" "info" ]; @@ -20,15 +20,15 @@ stdenv.mkDerivation rec { (let patch = nr: sha256: fetchurl { - url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline81-${nr}"; + url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline82-${nr}"; inherit sha256; }; in - import ./readline-8.1-patches.nix patch); + import ./readline-8.2-patches.nix patch); patches = [ ./link-against-ncurses.patch - ./no-arch_only-6.3.patch + ./no-arch_only-8.2.patch ] ++ upstreamPatches; @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.unix; - branch = "8.1"; + branch = "8.2"; }; } diff --git a/pkgs/development/libraries/readline/no-arch_only-8.2.patch b/pkgs/development/libraries/readline/no-arch_only-8.2.patch new file mode 100644 index 000000000000..06f01ec0891f --- /dev/null +++ b/pkgs/development/libraries/readline/no-arch_only-8.2.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' readline-6.3-orig/support/shobj-conf readline-6.3/support/shobj-conf +--- support/shobj-conf 2014-02-24 03:06:29.000000000 +0100 ++++ support/shobj-conf 2014-07-22 11:18:52.000000000 +0200 +@@ -159,9 +159,6 @@ + # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4 + *) + case "${host_os}" in +- darwin[89]*|darwin1[012]*) +- SHOBJ_ARCHFLAGS= +- ;; + *) # Mac OS X 10.9 (Mavericks) and later + SHOBJ_ARCHFLAGS= + # for 32 and 64bit universal library diff --git a/pkgs/development/libraries/readline/readline-8.1-patches.nix b/pkgs/development/libraries/readline/readline-8.1-patches.nix deleted file mode 100644 index b2aaadf0e9b5..000000000000 --- a/pkgs/development/libraries/readline/readline-8.1-patches.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0i4ikdqgcjnb40y2ss3lm09rq56zih5rzma3bib50dk3d1d4cak8") -(patch "002" "1p15sfx5xg5k4lam12lyd0givk7dfjddqpnb1jdp3c4clray0nz5") -] diff --git a/pkgs/development/libraries/readline/readline-8.2-patches.nix b/pkgs/development/libraries/readline/readline-8.2-patches.nix new file mode 100644 index 000000000000..48d2bd14badb --- /dev/null +++ b/pkgs/development/libraries/readline/readline-8.2-patches.nix @@ -0,0 +1,5 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "1xxgfgr6hn3ads8m8xsrdi1kbx1f3s69k0danpd9x4haqhg7zydv") +] diff --git a/pkgs/development/libraries/rocalution/default.nix b/pkgs/development/libraries/rocalution/default.nix new file mode 100644 index 000000000000..30d61391ec99 --- /dev/null +++ b/pkgs/development/libraries/rocalution/default.nix @@ -0,0 +1,114 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, rocblas +, rocsparse +, rocprim +, rocrand +, hip +, git +, openmp +, openmpi +, gtest +, buildTests ? false +, buildBenchmarks ? false +, buildSamples ? false +, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900:xnack-" "gfx906:xnack-" ... ] +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocalution"; + version = "5.4.1"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ] ++ lib.optionals buildSamples [ + "sample" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "rocALUTION"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-jovhodhNa7tr1bSqpZCKI/9xF7Ie96JB+giqAEfis2k="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + hip + git + ]; + + buildInputs = [ + rocblas + rocsparse + rocprim + rocrand + openmp + openmpi + ] ++ lib.optionals buildTests [ + gtest + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_COMPILER=hipcc" + "-DROCM_PATH=${hip}" + "-DHIP_ROOT_DIR=${hip}" + "-DSUPPORT_HIP=ON" + "-DSUPPORT_OMP=ON" + "-DSUPPORT_MPI=ON" + "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals buildTests [ + "-DBUILD_CLIENTS_TESTS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DBUILD_CLIENTS_BENCHMARKS=ON" + ]; + + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/rocalution-test $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/rocalution-bench $benchmark/bin + '' + lib.optionalString buildSamples '' + mkdir -p $sample/bin + mv clients/staging/* $sample/bin + rm $sample/bin/rocalution-test || true + rm $sample/bin/rocalution-bench || true + + patchelf --set-rpath \ + $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} \ + $sample/bin/* + '' + lib.optionalString (buildTests || buildBenchmarks) '' + rmdir $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Iterative sparse solvers for ROCm"; + homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + broken = finalAttrs.version != hip.version; + }; +}) diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index 24ead8242005..2d79024c94c9 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -2,20 +2,17 @@ , stdenv , fetchFromGitHub , rocmUpdateScript -, fetchpatch , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , hip , python3 , tensile , msgpack , libxml2 -, llvm , gtest , gfortran +, openmp +, amd-blis , python3Packages , buildTensile ? true , buildTests ? false @@ -30,7 +27,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; - version = "5.4.0"; + version = "5.4.1"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ]; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; @@ -39,16 +44,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4art8/KwH2KDLwSYcyzn/m/xwdg5wQQvgHks73aB+60="; }; - # We currently need this patch due to faulty toolchain includes - # See: https://github.com/ROCmSoftwarePlatform/rocBLAS/issues/1277 - patches = [ - (fetchpatch { - name = "only-std_norm-from-rocblas_complex.patch"; - url = "https://github.com/ROCmSoftwarePlatform/rocBLAS/commit/44b99c6df26002139ca9ec68ee1fc8899c7b001f.patch"; - hash = "sha256-vSZkVYY951fqfOThKFqnYBasWMblS6peEJZ6sFMCk9k="; - }) - ]; - nativeBuildInputs = [ cmake rocm-cmake @@ -56,19 +51,19 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr python3 ] ++ lib.optionals buildTensile [ msgpack libxml2 - llvm - python3Packages.pyyaml python3Packages.msgpack ] ++ lib.optionals buildTests [ gtest + ] ++ lib.optionals (buildTests || buildBenchmarks) [ gfortran + openmp + amd-blis + ] ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [ + python3Packages.pyyaml ]; cmakeFlags = [ @@ -95,12 +90,12 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_CLIENTS_TESTS=ON" ] ++ lib.optionals buildBenchmarks [ "-DBUILD_CLIENTS_BENCHMARKS=ON" + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis" ]; # Tensile REALLY wants to write to the nix directory if we include it normally - # We need to manually fixup the path so tensile will generate .co and .dat files postPatch = lib.optionalString buildTensile '' - export PATH=${llvm}/bin:$PATH cp -a ${tensile} tensile chmod +w -R tensile @@ -113,6 +108,18 @@ stdenv.mkDerivation (finalAttrs: { --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" ''; + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + cp -a $out/bin/* $test/bin + rm $test/bin/*-bench || true + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + cp -a $out/bin/* $benchmark/bin + rm $benchmark/bin/*-test || true + '' + lib.optionalString (buildTests || buildBenchmarks ) '' + rm -rf $out/bin + ''; + passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; owner = finalAttrs.src.owner; @@ -124,8 +131,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - # Tests and benchmarks are a can of worms that I will tackle in a different PR - # It involves completely rewriting the amd-blis derivation - broken = finalAttrs.version != hip.version || buildTests || buildBenchmarks; + broken = finalAttrs.version != hip.version; }; }) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 2837f57897e7..01c1522636af 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , rocmUpdateScript @@ -7,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocclr"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; @@ -26,18 +27,19 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - prePatch = '' + postPatch = '' substituteInPlace device/comgrctx.cpp \ --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" ''; - buildPhase = ""; + dontConfigure = true; + dontBuild = true; installPhase = '' runHook preInstall mkdir -p $out - cp -r * $out/ + cp -a * $out/ runHook postInstall ''; @@ -57,5 +59,6 @@ stdenv.mkDerivation (finalAttrs: { # to be supported yet by the build infrastructure. Recheck in # the future. platforms = [ "x86_64-linux" ]; + broken = finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 8dbf5f16a447..aad49db494e6 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -4,24 +4,21 @@ , rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , hip +, openmp , sqlite , python3 , gtest , boost , fftw , fftwFloat -, llvmPackages , buildTests ? false , buildBenchmarks ? false }: stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" @@ -35,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-XlpWT6PS+VpJjA4iG8yaiFRxE63kugNG1ZyQXoQVJL8="; + hash = "sha256-NsYeEoBQ/0z31ZQ32l7N+qavWEVkH37snkTHntot7nE="; }; nativeBuildInputs = [ @@ -45,9 +42,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr sqlite python3 ] ++ lib.optionals buildTests [ @@ -56,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { boost fftw fftwFloat - llvmPackages.openmp + openmp ]; propogatedBuildInputs = lib.optionals buildTests [ diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 2d26f72fc1b0..fee10be5db50 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -3,14 +3,19 @@ , fetchFromGitHub , rocmUpdateScript , cmake -, clang +, rocm-cmake , rocm-device-libs -, llvm +, libxml2 }: -stdenv.mkDerivation (finalAttrs: { +let + llvmNativeTarget = + if stdenv.isx86_64 then "X86" + else if stdenv.isAarch64 then "AArch64" + else throw "Unsupported ROCm LLVM platform"; +in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -19,21 +24,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-qLsrBTeSop7lIQv8gZDwgpvGZJOAq90zsvMi1QpfbAs="; }; - sourceRoot = "source/lib/comgr"; + patches = [ ./cmake.patch ]; + sourceRoot = "${finalAttrs.src.name}/lib/comgr"; - nativeBuildInputs = [ cmake ]; - - buildInputs = [ clang rocm-device-libs llvm ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=${clang}/bin/clang" - "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" - "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm" - "-DLLD_INCLUDE_DIRS=${llvm}/include" - "-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\"" + nativeBuildInputs = [ + cmake + rocm-cmake ]; - patches = [ ./cmake.patch ]; + buildInputs = [ + rocm-device-libs + libxml2 + ]; + + cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" ]; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; @@ -47,5 +51,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + broken = finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index b6245eea8449..6ed70a6565ac 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , rocmUpdateScript , cmake -, clang -, llvm +, rocm-cmake +, libxml2 }: -stdenv.mkDerivation (finalAttrs: { +let + llvmNativeTarget = + if stdenv.isx86_64 then "X86" + else if stdenv.isAarch64 then "AArch64" + else throw "Unsupported ROCm LLVM platform"; +in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -17,17 +23,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8gxvgy2GlROxM5qKtZVu5Lxa1FmTIVlBTpfp8rxhNhk="; }; - nativeBuildInputs = [ cmake ]; + patches = [ ./cmake.patch ]; - buildInputs = [ clang llvm ]; - - cmakeFlags = [ - "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${llvm}/lib/cmake/clang" - "-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'" - "-DCLANG=${clang}/bin/clang" + nativeBuildInputs = [ + cmake + rocm-cmake ]; - patches = [ ./cmake.patch ]; + buildInputs = [ libxml2 ]; + cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" ]; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; @@ -41,5 +45,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + broken = finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix index fb78c4f04dd0..4602d3646e47 100644 --- a/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -1,4 +1,8 @@ -{ lib, callPackage, stdenv, rocm-opencl-runtime }: +{ lib +, stdenv +, callPackage +, rocm-opencl-runtime +}: stdenv.mkDerivation rec { pname = "rocm-opencl-icd"; @@ -11,12 +15,12 @@ stdenv.mkDerivation rec { echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd ''; - passthru.impureTests = { rocm-opencl = callPackage ./test.nix {}; }; + passthru.impureTests = { rocm-opencl = callPackage ./test.nix { }; }; meta = with lib; { description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 1d250195c23c..5d37c8ad9f25 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -1,28 +1,20 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , rocmUpdateScript , addOpenGLRunpath , cmake -, rocm-cmake -, clang -, glew -, libglvnd -, libX11 -, llvm -, mesa -, numactl -, python3 -, rocclr , rocm-comgr -, rocm-device-libs , rocm-runtime -, rocm-thunk +, rocclr +, glew +, libX11 +, numactl }: stdenv.mkDerivation (finalAttrs: { pname = "rocm-opencl-runtime"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -31,27 +23,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-E1+Y/fgp5b+7H1LN+O1fwVi0/XRCgvsiSxTY3u/q+8I="; }; - nativeBuildInputs = [ cmake rocm-cmake ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - clang - glew - libglvnd - libX11 - llvm - mesa - numactl - python3 rocm-comgr - rocm-device-libs rocm-runtime - rocm-thunk + glew + libX11 + numactl ]; cmakeFlags = [ "-DAMD_OPENCL_PATH=${finalAttrs.src}" "-DROCCLR_PATH=${rocclr}" - "-DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm/opencl" ]; dontStrip = true; @@ -80,5 +64,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; + broken = finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 86ddf5b77038..7b4bd6c11ae5 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -1,36 +1,46 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , rocmUpdateScript -, addOpenGLRunpath -, cmake , pkg-config +, cmake , xxd -, elfutils -, libdrm -, llvm -, numactl , rocm-device-libs -, rocm-thunk }: +, rocm-thunk +, libelf +, libdrm +, numactl +, valgrind +, libxml2 +}: stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-M9kv1Oe5ZZfd9H/+KUJUoK9L1EdyS2qRp2mJDK0dnPE="; + hash = "sha256-JkTXTQmdESHSFbA6HZdMK3pYEApz9aoAlMzdXayzdyY="; }; - sourceRoot = "source/src"; + sourceRoot = "${finalAttrs.src.name}/src"; - nativeBuildInputs = [ cmake pkg-config xxd ]; + nativeBuildInputs = [ + pkg-config + cmake + xxd + ]; - buildInputs = [ elfutils libdrm llvm numactl ]; - - cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ]; + buildInputs = [ + rocm-thunk + libelf + libdrm + numactl + valgrind + libxml2 + ]; postPatch = '' patchShebangs image/blit_src/create_hsaco_ascii_file.sh @@ -45,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: { ''; fixupPhase = '' - rm -rf $out/hsa + rm -rf $out/hsa/* + ln -s $out/{include,lib} $out/hsa ''; passthru.updateScript = rocmUpdateScript { @@ -59,5 +70,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; + broken = finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 6bca7a89fc48..b5825996a44d 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -2,15 +2,17 @@ , stdenv , fetchFromGitHub , rocmUpdateScript -, cmake , pkg-config +, cmake +, rocm-cmake , libdrm , numactl +, valgrind }: stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -19,24 +21,25 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-EU5toaKzVeZpdm/YhaQ0bXq0eoYwYQ5qGLUJzxgZVjE="; }; - preConfigure = '' - export cmakeFlags="$cmakeFlags " - ''; + nativeBuildInputs = [ + pkg-config + cmake + rocm-cmake + ]; - nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + libdrm + numactl + valgrind + ]; - buildInputs = [ libdrm numactl ]; - - # https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/issues/75 - postPatch = '' - substituteInPlace libhsakmt.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - postInstall = '' - cp -r $src/include $out - ''; + cmakeFlags = [ + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; @@ -49,5 +52,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; + broken = finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix index e40eb1b813c1..98843fecfcc7 100644 --- a/pkgs/development/libraries/rocmlir/default.nix +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -3,17 +3,36 @@ , fetchFromGitHub , rocmUpdateScript , cmake -, clang +, ninja +, hip +, rocminfo , git , libxml2 , libedit +, zlib +, ncurses , python3 +, buildRockCompiler ? false }: -stdenv.mkDerivation (finalAttrs: { +# Theoretically, we could have our MLIR have an output +# with the source and built objects so that we can just +# use it as the external LLVM repo for this +let + llvmNativeTarget = + if stdenv.isx86_64 then "X86" + else if stdenv.isAarch64 then "AArch64" + else throw "Unsupported ROCm LLVM platform"; +in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir"; version = "5.4.0"; + outputs = [ + "out" + ] ++ lib.optionals (!buildRockCompiler) [ + "external" + ]; + src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocMLIR"; @@ -23,7 +42,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - clang + ninja + ] ++ lib.optionals (!buildRockCompiler) [ + hip ]; buildInputs = [ @@ -33,12 +54,39 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - cmakeFlags = [ - "-DCMAKE_C_COMPILER=clang" - "-DCMAKE_CXX_COMPILER=clang++" - "-DBUILD_FAT_LIBROCKCOMPILER=ON" + propagatedBuildInputs = [ + zlib + ncurses ]; + cmakeFlags = [ + "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" + "-DLLVM_ENABLE_ZLIB=ON" + "-DLLVM_ENABLE_TERMINFO=ON" + ] ++ lib.optionals buildRockCompiler [ + "-DBUILD_FAT_LIBROCKCOMPILER=ON" + ] ++ lib.optionals (!buildRockCompiler) [ + "-DROCM_PATH=${rocminfo}" + "-DROCM_TEST_CHIPSET=gfx000" + ]; + + dontBuild = true; + doCheck = true; + + # Certain libs aren't being generated, try enabling tests next update + checkTarget = if buildRockCompiler + then "librockCompiler" + else "check-mlir-miopen-build-only"; + + postInstall = let + libPath = lib.makeLibraryPath [ zlib ncurses hip stdenv.cc.cc ]; + in lib.optionals (!buildRockCompiler) '' + mkdir -p $external/lib + cp -a external/llvm-project/llvm/lib/{*.a*,*.so*} $external/lib + patchelf --set-rpath $external/lib:$out/lib:${libPath} $external/lib/*.so* + patchelf --set-rpath $out/lib:$external/lib:${libPath} $out/{bin/*,lib/*.so*} + ''; + passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; owner = finalAttrs.src.owner; @@ -52,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; - broken = finalAttrs.version != clang.version; + # Once again, they haven't updated the tags... + broken = lib.versions.minor finalAttrs.version != lib.versions.minor stdenv.cc.version; }; }) diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index 9b5fabf0fb00..88fad249b8c3 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -4,9 +4,6 @@ , rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , hip , gtest , gbenchmark @@ -16,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" @@ -39,11 +36,7 @@ stdenv.mkDerivation (finalAttrs: { hip ]; - buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr - ] ++ lib.optionals buildTests [ + buildInputs = lib.optionals buildTests [ gtest ] ++ lib.optionals buildBenchmarks [ gbenchmark diff --git a/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch b/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch new file mode 100644 index 000000000000..b70163b08e48 --- /dev/null +++ b/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch @@ -0,0 +1,20 @@ +diff --git a/src/util/hsa_rsrc_factory.cpp b/src/util/hsa_rsrc_factory.cpp +index 643ff16..c08d98f 100644 +--- a/src/util/hsa_rsrc_factory.cpp ++++ b/src/util/hsa_rsrc_factory.cpp +@@ -127,15 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool initialize_hsa) : initialize_hsa_(initialize + if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); + if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); + +- // Get AqlProfile API table +- aqlprofile_api_ = {0}; +-#ifdef ROCP_LD_AQLPROFILE +- status = LoadAqlProfileLib(&aqlprofile_api_); +-#else +- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); +-#endif +- CHECK_STATUS("aqlprofile API table load failed", status); +- + // Get Loader API table + loader_api_ = {0}; + status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_LOADER, 1, sizeof(loader_api_), &loader_api_); diff --git a/pkgs/development/libraries/rocprofiler/default.nix b/pkgs/development/libraries/rocprofiler/default.nix new file mode 100644 index 000000000000..d51e5de6966e --- /dev/null +++ b/pkgs/development/libraries/rocprofiler/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-runtime +, rocm-thunk +, roctracer +, numactl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocprofiler"; + version = "5.4.1"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "rocprofiler"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-CpD/+soMN8WTeSb5X7dsnZ596PMkw+4EVsVSvFtKCak="; + }; + + patches = [ ./0000-dont-require-hsa_amd_aqlprofile.patch ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + rocm-thunk + rocm-runtime + numactl + ]; + + cmakeFlags = [ + "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postPatch = '' + patchShebangs bin test + + substituteInPlace cmake_modules/env.cmake \ + --replace "FATAL_ERROR \"AQL_PROFILE" "WARNING \"AQL_PROFILE" + ''; + + postInstall = '' + patchelf --set-rpath $out/lib:${lib.makeLibraryPath finalAttrs.buildInputs} $out/lib/rocprofiler/librocprof-tool.so + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Profiling with perf-counters and derived metrics"; + homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler"; + license = with licenses; [ mit ]; # mitx11 + maintainers = teams.rocm.members; + broken = finalAttrs.version != stdenv.cc.version; + }; +}) diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix index f0b1cb3e69b6..a3742a5d9725 100644 --- a/pkgs/development/libraries/rocrand/default.nix +++ b/pkgs/development/libraries/rocrand/default.nix @@ -4,9 +4,6 @@ , rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , hip , gtest , gbenchmark @@ -16,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" @@ -40,11 +37,7 @@ stdenv.mkDerivation (finalAttrs: { hip ]; - buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr - ] ++ lib.optionals buildTests [ + buildInputs = lib.optionals buildTests [ gtest ] ++ lib.optionals buildBenchmarks [ gbenchmark diff --git a/pkgs/development/libraries/rocsolver/default.nix b/pkgs/development/libraries/rocsolver/default.nix new file mode 100644 index 000000000000..5b3ad6ce24c4 --- /dev/null +++ b/pkgs/development/libraries/rocsolver/default.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, rocblas +, hip +, fmt +, gtest +, gfortran +, lapack-reference +, buildTests ? false +, buildBenchmarks ? false +, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx906:xnack-" ] +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocsolver"; + version = "5.4.1"; + + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ]; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "rocSOLVER"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-UHUcA9CVPuYFpE2DTvRrRMMj51yNPo5wMTKnByL2RTg="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + hip + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + gfortran + ]; + + buildInputs = [ + rocblas + fmt + ] ++ lib.optionals buildTests [ + gtest + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + lapack-reference + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_COMPILER=hipcc" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals buildTests [ + "-DBUILD_CLIENTS_TESTS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DBUILD_CLIENTS_BENCHMARKS=ON" + ]; + + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/rocsolver-test $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/rocsolver-bench $benchmark/bin + '' + lib.optionalString (buildTests || buildBenchmarks) '' + rmdir $out/bin + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "ROCm LAPACK implementation"; + homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER"; + license = with licenses; [ bsd2 ]; + maintainers = teams.rocm.members; + broken = finalAttrs.version != hip.version; + }; +}) diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index 0edee46cfeb3..0edb0bd14e5e 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -5,9 +5,6 @@ , rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocprim , hip , gfortran @@ -21,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" @@ -46,9 +43,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr rocprim git ] ++ lib.optionals (buildTests || buildBenchmarks) [ diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index 281620780832..0fc3726761a7 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -4,9 +4,6 @@ , rocmUpdateScript , cmake , rocm-cmake -, rocm-runtime -, rocm-device-libs -, rocm-comgr , rocprim , hip , gtest @@ -16,16 +13,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "5.4.0"; + version = "5.4.1"; - # Comment out these outputs until tests/benchmarks are fixed (upstream?) - # outputs = [ - # "out" - # ] ++ lib.optionals buildTests [ - # "test" - # ] ++ lib.optionals buildBenchmarks [ - # "benchmark" - # ]; + outputs = [ + "out" + ] ++ lib.optionals buildTests [ + "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" + ]; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; @@ -41,11 +37,7 @@ stdenv.mkDerivation (finalAttrs: { hip ]; - buildInputs = [ - rocm-runtime - rocm-device-libs - rocm-comgr - ] ++ lib.optionals buildTests [ + buildInputs = lib.optionals buildTests [ gtest ]; @@ -61,18 +53,19 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_TEST=ON" ] ++ lib.optionals buildBenchmarks [ "-DBUILD_BENCHMARKS=ON" + ] ++ lib.optionals (buildTests || buildBenchmarks) [ + "-DCMAKE_CXX_FLAGS=-Wno-deprecated-builtins" # Too much spam ]; - # Comment out these outputs until tests/benchmarks are fixed (upstream?) - # postInstall = lib.optionalString buildTests '' - # mkdir -p $test/bin - # mv $out/bin/test_* $test/bin - # '' + lib.optionalString buildBenchmarks '' - # mkdir -p $benchmark/bin - # mv $out/bin/benchmark_* $benchmark/bin - # '' + lib.optionalString (buildTests || buildBenchmarks) '' - # rmdir $out/bin - # ''; + postInstall = lib.optionalString buildTests '' + mkdir -p $test/bin + mv $out/bin/{test_*,*.hip} $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/benchmark_* $benchmark/bin + '' + lib.optionalString (buildTests || buildBenchmarks) '' + rm -rf $out/bin + ''; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; @@ -85,8 +78,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; - # Tests/Benchmarks don't seem to work, thousands of errors compiling with no clear fix - # Is this an upstream issue? We don't seem to be missing dependencies - broken = finalAttrs.version != hip.version || buildTests || buildBenchmarks; + broken = finalAttrs.version != hip.version; }; }) diff --git a/pkgs/development/libraries/roctracer/default.nix b/pkgs/development/libraries/roctracer/default.nix new file mode 100644 index 000000000000..6b5b23fae9f5 --- /dev/null +++ b/pkgs/development/libraries/roctracer/default.nix @@ -0,0 +1,100 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, clang +, hip +, rocm-device-libs +, rocprofiler +, libxml2 +, doxygen +, graphviz +, gcc-unwrapped +, rocm-runtime +, python3Packages +, buildDocs ? false # Nothing seems to be generated, so not making the output +, buildTests ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "roctracer"; + version = "5.4.1"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildTests [ + "test" + ]; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "roctracer"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-5vYUNczylB2ehlvhq1u/H8KUXt8ku2E+jawKrKsU7LY="; + }; + + nativeBuildInputs = [ + cmake + clang + hip + ] ++ lib.optionals buildDocs [ + doxygen + graphviz + ]; + + buildInputs = [ + rocm-device-libs + rocprofiler + libxml2 + python3Packages.python + python3Packages.cppheaderparser + ]; + + cmakeFlags = [ + "-DCMAKE_MODULE_PATH=${hip}/hip/cmake" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postPatch = '' + export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode + '' + lib.optionalString (!buildTests) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(test)" "" + ''; + + # Tests always fail, probably need GPU + # doCheck = buildTests; + + postInstall = lib.optionalString buildDocs '' + mkdir -p $doc + '' + lib.optionalString buildTests '' + mkdir -p $test/bin + # Not sure why this is an install target + find $out/test -executable -type f -exec mv {} $test/bin \; + rm $test/bin/{*.sh,*.py} + patchelf --set-rpath $out/lib:${lib.makeLibraryPath ( + finalAttrs.buildInputs ++ [ hip gcc-unwrapped.lib rocm-runtime ])} $test/bin/* + rm -rf $out/test + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Tracer callback/activity library"; + homepage = "https://github.com/ROCm-Developer-Tools/roctracer"; + license = with licenses; [ mit ]; # mitx11 + maintainers = teams.rocm.members; + broken = finalAttrs.version != hip.version; + }; +}) diff --git a/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch b/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch index 7208d20a2127..cee603679758 100644 --- a/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch +++ b/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch @@ -1,19 +1,31 @@ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 7e0f2c8..db54eab 100644 +index e1160bb..2a5462e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt -@@ -31,14 +31,6 @@ cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" +@@ -30,26 +30,6 @@ cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" + cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF ) cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF ) - # Test/benchmark requires additional dependencies +-# Test/benchmark requires additional dependencies -include( FetchContent ) - -FetchContent_Declare( - googletest -- URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG 609281088cfefc76f9d0ce82e1ff6c30cc3591e5 -) --FetchContent_MakeAvailable(googletest) -- - include(GoogleTest) +-FetchContent_GetProperties(googletest) +-if(NOT googletest_POPULATED) +- # Fetch the content using default details +- FetchContent_Populate(googletest) +- # Save the shared libs setting, then force to static libs +- set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS}) +- set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build SHARED libraries" FORCE) +- # Add gtest targets as static libs +- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) +- # Restore shared libs setting +- set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE) +-endif() - set(ROCWMMA_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) + set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix index 786d48ee80ca..ecd802612550 100644 --- a/pkgs/development/libraries/rocwmma/default.nix +++ b/pkgs/development/libraries/rocwmma/default.nix @@ -14,6 +14,8 @@ , python3Packages , buildDocs ? true , buildTests ? false +, buildExtendedTests ? false +, buildBenchmarks ? false , buildSamples ? false , gpuTargets ? [ ] # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ] }: @@ -34,14 +36,16 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" ] ++ lib.optionals buildDocs [ "doc" - ] ++ lib.optionals buildTests [ + ] ++ lib.optionals (buildTests || buildBenchmarks) [ "test" + ] ++ lib.optionals buildBenchmarks [ + "benchmark" ] ++ lib.optionals buildSamples [ "sample" ]; @@ -53,7 +57,7 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-HUJPb6IahBgl/v+W4kXludBTNAjRm8k6v0jxKAX+qZM="; }; - patches = lib.optionals buildTests [ + patches = lib.optionals (buildTests || buildBenchmarks) [ ./0000-dont-fetch-googletest.patch ]; @@ -65,7 +69,7 @@ in stdenv.mkDerivation (finalAttrs: { buildInputs = [ openmp - ] ++ lib.optionals buildTests [ + ] ++ lib.optionals (buildTests || buildBenchmarks) [ gtest rocblas ] ++ lib.optionals buildDocs [ @@ -78,8 +82,10 @@ in stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_CXX_COMPILER=hipcc" - "-DROCWMMA_BUILD_TESTS=${if buildTests then "ON" else "OFF"}" + "-DROCWMMA_BUILD_TESTS=${if buildTests || buildBenchmarks then "ON" else "OFF"}" + "-DROCWMMA_BUILD_VALIDATION_TESTS=ON" "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}" + "-DROCWMMA_VALIDATE_WITH_ROCBLAS=ON" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -87,11 +93,10 @@ in stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_INCLUDEDIR=include" ] ++ lib.optionals (gpuTargets != [ ]) [ "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] ++ lib.optionals buildTests [ - "-DROCWMMA_BUILD_VALIDATION_TESTS=ON" - "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON" + ] ++ lib.optionals buildExtendedTests [ "-DROCWMMA_BUILD_EXTENDED_TESTS=ON" - "-DROCWMMA_VALIDATE_WITH_ROCBLAS=ON" + ] ++ lib.optionals buildBenchmarks [ + "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON" "-DROCWMMA_BENCHMARK_WITH_ROCBLAS=ON" ]; @@ -109,16 +114,19 @@ in stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString buildDocs '' mv ../docs/source/_build/html $out/share/doc/rocwmma mv ../docs/source/_build/latex/rocWMMA.pdf $out/share/doc/rocwmma - '' + lib.optionalString buildTests '' + '' + lib.optionalString (buildTests || buildBenchmarks) '' mkdir -p $test/bin - mv $out/bin/*_test* $test/bin + mv $out/bin/{*_test,*-validate} $test/bin + '' + lib.optionalString buildBenchmarks '' + mkdir -p $benchmark/bin + mv $out/bin/*-bench $benchmark/bin '' + lib.optionalString buildSamples '' mkdir -p $sample/bin mv $out/bin/sgemmv $sample/bin mv $out/bin/simple_gemm $sample/bin mv $out/bin/simple_dlrm $sample/bin - '' + lib.optionalString (buildTests || buildSamples) '' - rmdir $out/bin + '' + lib.optionalString (buildTests || buildBenchmarks || buildSamples) '' + rm -rf $out/bin ''; passthru.updateScript = rocmUpdateScript { @@ -132,8 +140,6 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - # Building tests isn't working for now - # undefined reference to symbol '_ZTIN7testing4TestE' - broken = finalAttrs.version != hip.version || buildTests; + broken = finalAttrs.version != hip.version; }; }) diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 318ead830f9b..c337edfa0917 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "soundtouch"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "soundtouch"; repo = "soundtouch"; rev = version; - sha256 = "10znckb8mrnmvwj7vq12732al873qhqw27fpb5f8r0bkjdpcj3vr"; + sha256 = "sha256-+RprzCn0NCueHhDkk2Lgg7Ihw8JDzu25eIVoVZwF+BA="; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 8abdea5249b7..78dc373d4ab6 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.231.0"; + version = "1.3.236.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30="; + hash = "sha256-eWI1MyIWxcg1JepRsnHBmitehDigDa+dR8kXvIkYejY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5e3e8f362e03..eb27c8c8b9eb 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.40.0"; + version = "3.40.1"; # 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-AzNVIHbScAx1NSJW6Rx4v1zWJJFYm6DGmu0KgYaJgOc="; + sha256 = "sha256-LF3qIH+lCNdlrx72ILY33LBlcq+m8B8IFb1bv4ZLM9k="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 1b7fca210faf..bb0a1a7d7393 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.40.0"; + version = "3.40.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-SFUIKBQgUSk+F5/8aoUg9vv9guHNyni5N5L3ZsyJuOI="; + sha256 = "sha256-UGQSaqUNsgw1V4thK1bDEpQlwFBu1NFhDvpKDwG9+NA="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix index df3b580c059f..bfef4716e127 100644 --- a/pkgs/development/libraries/tensile/default.nix +++ b/pkgs/development/libraries/tensile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tensile"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; @@ -36,5 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/ROCmSoftwarePlatform/Tensile"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; + broken = version != stdenv.cc.version; }; } diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 1db531e3732c..8f1202088e58 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.231.0"; + version = "1.3.236.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g="; + hash = "sha256-b1q9QugFH4lieS8CTOyZ3uoQ7bd44G8NPEwRtUPD+24="; }; meta = with lib; { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 27c1423d94e5..8d38f725a64d 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.231.0"; + version = "1.3.236.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - hash = "sha256-HWaa3JT0znhvqbvZdcsAwy8Dr6HDQp4rgpVmMOuCo0s="; + hash = "sha256-Y6OakowZlb40ZatITQCFBK/qSZqSdgTNew1XUFD/jMo="; }); patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index c9d0a7ad3b7c..bb764d641436 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -48,8 +48,9 @@ stdenv.mkDerivation rec { separateDebugInfo = true; mesonFlags = [ - "-Dlibraries=${lib.boolToString withLibraries}" "-Ddocumentation=${lib.boolToString withDocumentation}" + "-Dlibraries=${lib.boolToString withLibraries}" + "-Dtests=${lib.boolToString withLibraries}" ]; depsBuildBuild = [ @@ -95,6 +96,8 @@ stdenv.mkDerivation rec { EOF ''; + passthru = { inherit withLibraries; }; + meta = with lib; { description = "Core Wayland window system code and protocol"; longDescription = '' @@ -109,8 +112,6 @@ stdenv.mkDerivation rec { license = licenses.mit; # Expat version platforms = if withLibraries then platforms.linux else platforms.unix; maintainers = with maintainers; [ primeos codyopel qyliss ]; - # big sur doesn't support gcc stdenv and wayland doesn't build with clang - broken = stdenv.isDarwin; }; passthru.version = version; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 1d4b62788935..bd94cc6b47ed 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; version = "1.31"; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gitlab.freedesktop.org/wayland/wayland-protocols"; license = lib.licenses.mit; # Expat version - platforms = lib.platforms.linux; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index 86f2719537cd..c3ad173b0933 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup mkdir unzipped diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 92f7f11170f6..b63b0101d54b 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -35,8 +35,7 @@ let (mkFlag vtuneSupport "ENABLE_VTUNE") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag - (mkFlag (with stdenv; !(isCross && hostPlatform.isRiscV || isDarwin && isAarch64)) "ENABLE_ASSEMBLY") - ]; + ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF"; cmakeStaticLibFlags = [ "-DHIGH_BIT_DEPTH=ON" diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 700fa1d13dd1..3c0a555dd978 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -26,7 +26,7 @@ let nativeBuildInputs = [ autoreconfHook ]; doCheck = true; - AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git + env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix deleted file mode 100644 index 5340306de79a..000000000000 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{lib, stdenv, packages}: - -stdenv.mkDerivation { - name = "xlibs-wrapper"; - - dontBuild = true; - - installPhase = "mkdir -p $out"; - unpackPhase = "sourceRoot=."; - - propagatedBuildInputs = packages; - - preferLocalBuild = true; - - # For compatability with XFree86. - passthru.buildClientLibs = true; - - meta = { - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/nim-packages/fetch-nimble/builder.sh b/pkgs/development/nim-packages/fetch-nimble/builder.sh index 693ab339408e..bc2f9bfc94f1 100644 --- a/pkgs/development/nim-packages/fetch-nimble/builder.sh +++ b/pkgs/development/nim-packages/fetch-nimble/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup export HOME=$NIX_BUILD_TOP diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 9b42401fc4dc..110094ad8a49 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 2d1c550d3168..3dca6550ad68 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -24,6 +24,8 @@ # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC , PERL_USE_UNSAFE_INC ? "1" +, env ? {} + , ... }@attrs: @@ -43,10 +45,11 @@ lib.throwIf (attrs ? name) "buildPerlPackage: `name` (\"${attrs.name}\") is depr buildInputs = buildInputs ++ [ perl ]; nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ]; - fullperl = buildPerl; - inherit outputs src doCheck checkTarget enableParallelBuilding; - inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC; + env = { + inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC; + fullperl = buildPerl; + } // env; meta = defaultMeta // (attrs.meta or { }); }); diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 698a4165455d..3664d83bfbe0 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 +, packaging , pythonOlder , typing-extensions , pytest @@ -9,15 +10,17 @@ buildPythonPackage rec { pname = "JPype1"; - version = "1.4.0"; + version = "1.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-DF9mXuPm4xwn6dLUjdEr9OtP5oWII+ahEgGgNSdMz+E="; + sha256 = "sha256-3I7oVAc0dK15rhaNkML2iThU9Yk2z6GPNYfK2uDTaW0="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 9118f5a6fcf3..eeae0d7f33d1 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.2.2"; + version = "1.2.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NySGmzY7pjCicqX4n2jAcDUhN7j9F1dlABe34G/aFj8="; + sha256 = "sha256-1go5A9w7sBoYrWqJzb4uTq3GnAvI7x43c7pT1Ew/ejQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 58d07696de20..9e4cac5855e6 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -2,14 +2,17 @@ , arc4 , asn1crypto , asn1tools +, asyauth , asysocks , buildPythonPackage , colorama -, fetchPypi +, fetchFromGitHub , minikerberos , pillow , pyperclip , pythonOlder +, rustPlatform +, setuptools-rust , tqdm , unicrypto , winsspi @@ -17,20 +20,40 @@ buildPythonPackage rec { pname = "aardwolf"; - version = "0.0.8"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-plz1D+Lr5rV8iJo7IUmuXfjxLvVxX9lgyxyYXUlPH0k="; + src = fetchFromGitHub { + owner = "skelsec"; + repo = "aardwolf"; + rev = "86c4b511e0dfeeb767081902af2244f6297a68eb"; + hash = "sha256-ULczCJWVLrj0is6UYZxJNyLV6opzoJAFStqsjEmjaIA="; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "source/aardwolf/utils/rlers"; + name = "${pname}-${version}"; + hash = "sha256-F6NLWc5B577iH0uKAdj2y2TtQfo4eeXkMIK6he1tpvQ="; + }; + + cargoRoot = "aardwolf/utils/rlers"; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + setuptools-rust + ] ++ (with rustPlatform.rust; [ + cargo + rustc + ]); + propagatedBuildInputs = [ arc4 asn1crypto asn1tools + asyauth asysocks colorama minikerberos diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index e2facc919347..8ce782aedc98 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9WiAmTjEmrvaiYJiI8mStjCv0jxjgWCteEDP40dxDZc="; + sha256 = "sha256-Rjw4oI0uTO9sSYt2ulvUhY5MbvUdoaWh8nE5oCLiAkg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/advantage-air/default.nix b/pkgs/development/python-modules/advantage-air/default.nix index 90c8645547fe..205ea0c0e7f8 100644 --- a/pkgs/development/python-modules/advantage-air/default.nix +++ b/pkgs/development/python-modules/advantage-air/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "advantage-air"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "advantage_air"; inherit version; - hash = "sha256-I9HMDLZX9xKDJuYSAweM2r4v3ZKevHTn5dHTYxN3EuE="; + hash = "sha256-3t6ujBmhDVghnDSmJWb/7CHKNsvr4QFsfIqd4p8BHlA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index 6d222dfe51cb..c8fe640760df 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aeppl"; - version = "0.0.39"; + version = "0.0.50"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ILyE3tqoDHNmrKpHPBUJ02jrGevsU5864rjhgmgjwvo="; + hash = "sha256-cc41MspG2mXlNwLz7ViPPqXH/ayskVmms5SXqBo9g3Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 9a6f14f765e5..087e87ded21e 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { pname = "aiohttp"; version = "3.8.3"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -39,6 +41,9 @@ buildPythonPackage rec { postPatch = '' sed -i '/--cov/d' setup.cfg + + substituteInPlace setup.cfg \ + --replace "charset-normalizer >=2.0, < 3.0" "charset-normalizer >=2.0, < 4.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 0ae7c3e8a06c..937ff406ed74 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiojobs"; - version = "1.0.0"; + version = "1.1.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - sha256 = "EQwD0b2B9qFVd/8thKInaio0hpPzvVIjvCN0TcARu2w="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 8263104c3915..8a987027a02b 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-U3hIKmgnafkuVLi1r42BBXDKVcSSvLaRnmOEANasEyY="; + hash = "sha256-ND+0jukCU3jB34Sf4qAZg/+pyXVCoIoMqOoBW7srCSQ="; }; prePatch = '' diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index 23f26ca72b25..3110707ad7fc 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.3"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MartinHjelmare"; repo = pname; - rev = "v${version}"; - hash = "sha256-VvGhFf9x257YdSmOxjztGZW9FLBNd028rH3+BvXAQ4o="; + rev = "refs/tags/v${version}"; + hash = "sha256-jVqOOQLu/vL0L5WWtfU2rL4gNhPX+9HvchBp29aw+qA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 3c2a0e48d329..282870398209 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LGTtVxDujLTpWMVpGE2tEvTJzVk5E1yzj4jGqCYczrM="; + sha256 = "sha256-m4wQizY1TARjO60Op1K1XZVqdgL+PjI0uTn8RK+W8dg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index 9d815dfac059..b7a3bc9d9dee 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.2.0"; - disabled = pythonOlder "3.6"; + version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "1pamfc2l95s1q86jvmbp17chjy129gk01kwy8xm88d2ijy8s1caq"; + hash = "sha256-vx3Fe28r+0it1UFwyDSD9NNyeIN4tywTyr4pVp49WuU="; }; propagatedBuildInputs = [ @@ -29,16 +31,19 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace pytest.ini \ + substituteInPlace setup.cfg \ --replace "filterwarnings = error" "" \ --replace "--cov=aiosignal" "" ''; - pythonImportsCheck = [ "aiosignal" ]; + pythonImportsCheck = [ + "aiosignal" + ]; meta = with lib; { description = "Python list of registered asynchronous callbacks"; homepage = "https://github.com/aio-libs/aiosignal"; + changelog = "https://github.com/aio-libs/aiosignal/blob/v${version}/CHANGES.rst"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 254f1bfa4fe3..b283267faee9 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiosmtpd"; - version = "1.4.2"; + version = "1.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = version; - sha256 = "0hbpyns1j1fpvpj7gyb8cz359j7l4hzfqbig74xp4xih59sih0wj"; + rev = "refs/tags/${version}"; + sha256 = "sha256-QtLtw+2jEPLOxa45vDEbWEaSZ8RIyxf1zkZjR34Wu+8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix index 67d21b7ebfab..42ede58440e7 100644 --- a/pkgs/development/python-modules/aiowatttime/default.nix +++ b/pkgs/development/python-modules/aiowatttime/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiowatttime"; - version = "2021.10.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-cWXhQMgRYBzOVgUQWONIwWFB5n/f0lqkSjUb9IoPwtI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index aefe80a3b0b3..3b13476f31a7 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.8.1"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zQteRbFLcGQmuDPwY2m5ptXuA/gm7DI4cjzoyq9uX/o="; + sha256 = "sha256-+fduQQYfXr4n1P6SYA353WElIadoP5BNqzKLoCz/paI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix index 000c51359f54..4463be9997b3 100644 --- a/pkgs/development/python-modules/allure-behave/default.nix +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "allure-behave"; - version = "2.10.0"; + version = "2.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BzDu/LJBstuchkvUAeCDSIDIiFLZmC4y0s3d+1paGxs="; + sha256 = "sha256-CxdB1gliajS6dUUhnD+yRMVj0zglGEwZC6RDmirH+pg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-pytest/default.nix b/pkgs/development/python-modules/allure-pytest/default.nix index 273aa38b02a4..3df8d19dee15 100644 --- a/pkgs/development/python-modules/allure-pytest/default.nix +++ b/pkgs/development/python-modules/allure-pytest/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "allure-pytest"; - version = "2.10.0"; + version = "2.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Oyq2din0y9hher2BfSsiKSxut+/VWE+ZLRr4FDrqbuc="; + sha256 = "sha256-hbc7Hb6ZCLpPhLgBGKk+EEnALdWTIJJg2MHJUM8ob2w="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix index fcdc76a0897a..a68cf5a90882 100644 --- a/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons-test"; - version = "2.11.0"; + version = "2.12.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-69iSW5pUbYQpA/dgpCr088CUaa1BGIwlijltmFZnEa0="; + sha256 = "sha256-TaeQF9EZ5tLMmVSwnWgrxsRz5lh0O3BZLLEUawd8BeI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix index 052ef498b4a6..414271358545 100644 --- a/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/pkgs/development/python-modules/allure-python-commons/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons"; - version = "2.10.0"; + version = "2.12.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1NMTRLDwA3pKEeFrkbKM8O6yP/oOUMJ/z8aqvnIhLTw="; + sha256 = "sha256-1cNi3QEWfwhjMYIumxkS1Ob9bLwtGgBt0EjnfoKnrnM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix index aadf4d2665e5..fb6ef7873824 100644 --- a/pkgs/development/python-modules/amarna/default.nix +++ b/pkgs/development/python-modules/amarna/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amarna"; - version = "0.1.3"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "crytic"; repo = "amarna"; - rev = "v${version}"; - hash = "sha256-cE7OhACLpRmbJWzMsGTidbbw9FOKBbz47LEJwTW6wck="; + rev = "refs/tags/v${version}"; + hash = "sha256-tyvHWBhanR7YH87MDWdXUsDEzZG6MgnbshezAbxWO+I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 81839ecce007..74f24b2028eb 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.6.0"; + version = "7.1.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-4blAqNT0EhI+3jwUsly5nDyKTVNf0ECqv45Pt7Dk8JI="; + sha256 = "sha256-HkcjjEqp5owMU2ej/XB7psOUm0qvkSsGRArXjdK/AY0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index 489e200afb04..3fc3ae316edb 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "anybadge"; - version = "1.11.1"; + version = "1.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "jongracecox"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-6br4WUwE1ovAneYUeTHcUN3PH5Wm1rnLYCpXDUshk7Q="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A="; }; # setup.py reads its version from the TRAVIS_TAG environment variable diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 9d2e2a333590..927956a49f6d 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.5.0"; + version = "3.6.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,17 +29,9 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-AZ9M/NBCBlMIUpRJgKbJRL/oReZDUh2Jhwtoxoo0tMs="; + hash = "sha256-bootaulvx9zmobQGDirsMz5uxuLeCD9ggAvYkPaKnWo="; }; - patches = [ - (fetchpatch { - # Pytest 7.0 compatibility - url = "https://github.com/agronholm/anyio/commit/fed7cc4f95e196f68251bcb9253da3b143ea8e7e.patch"; - sha256 = "sha256-VmZmiQEmWJ4aPz0Wx+GTMZo7jXRDScnRYf2Hu2hiRVw="; - }) - ]; - preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION=${version} ''; @@ -71,9 +63,17 @@ buildPythonPackage rec { mock ]; + pytestFlagsArray = [ + "-W" "ignore::trio.TrioDeprecationWarning" + ]; + disabledTests = [ # block devices access "test_is_block_device" + # INTERNALERROR> AttributeError: 'NonBaseMultiError' object has no attribute '_exceptions'. Did you mean: 'exceptions'? + "test_exception_group_children" + "test_exception_group_host" + "test_exception_group_filtering" ]; disabledTestPaths = [ @@ -87,6 +87,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "anyio" ]; meta = with lib; { + changelog = "https://github.com/agronholm/anyio/blob/${src.rev}/docs/versionhistory.rst"; description = "High level compatibility layer for multiple asynchronous event loop implementations on Python"; homepage = "https://github.com/agronholm/anyio"; license = licenses.mit; diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index cbedbeb70dca..496e5f9f7107 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -77,7 +77,7 @@ , enabledProviders ? [] }: let - version = "2.4.3"; + version = "2.5.0"; airflow-src = fetchFromGitHub rec { owner = "apache"; @@ -86,7 +86,7 @@ let # Download using the git protocol rather than using tarballs, because the # GitHub archive tarballs don't appear to include tests forceFetchGit = true; - sha256 = "sha256-7E7Em6ZCWjxJiDKQ0j/vozUo58XsAxv8uW0dVVST4Ak="; + hash = "sha256-QWUXSG+RSHkF5kP1ZYtx+tHjO0n7hfya9CFA3lBhJHk="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 2d4adb5ddc5e..f9da71979496 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -45,13 +45,13 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.40.0"; + version = "2.43.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; - rev = "v${version}"; - sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lqGXCC66eyBnHcK06k9knggX5C+2d0m6xBAI5sh0RHo="; }; patches = [ diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 9ad41715a231..b204e97af221 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "5.2.2"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bqZULh6//p/ZW6Ae8/UTUerGwgCpdFYsdHMFm5zSCqc="; + hash = "sha256-522Atznt70viEwkqY4Stf9kzun1k9tWgr/jU2hvveIc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 6e857499f651..d7b15f939bb1 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "5.0.2"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-Jynks+c8OV0t1GoKAk4vP9jYQ0PclJHl3x8q78au5gk="; + hash = "sha256-kbeIGIn8HMXROPiQSmwx3lo7wEX8SDuHYgxh4ws89Mo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 8c97ef6750f7..62d3cc94cbfd 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -1,23 +1,46 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build +, poetry-core + +# runtime +, backports-zoneinfo + +# tests +, pytestCheckHook +, freezegun +}: buildPythonPackage rec { pname = "astral"; - version = "2.2"; - disabled = isPy27; + version = "3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "e41d9967d5c48be421346552f0f4dedad43ff39a83574f5ff2ad32b6627b6fbe"; + hash = "sha256-m3w7QS6eadFyz7JL4Oat3MnxvQGijbi+vmbXXMxTPYg="; }; - propagatedBuildInputs = [ pytz requests freezegun ]; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ pytest ]; - checkPhase = '' - py.test -m "not webtest" - ''; + propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + checkInputs = [ + freezegun + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/sffjunkie/astral/releases/tag/${version}"; description = "Calculations for the position of the sun and the moon"; homepage = "https://github.com/sffjunkie/astral/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 9cacef4ac79a..313c3d5de94d 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.12.12"; # Check whether the version is compatible with pylint + version = "2.12.13"; # Check whether the version is compatible with pylint format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = pname; - rev = "v${version}"; - hash = "sha256-FN/bBAxx9p1iAB3WXIZyyKv/zse7xtXzslclADMbouA="; + rev = "refs/tags/v${version}"; + hash = "sha256-C4A/JOFdIRgaZuV/YOLc4nC05XTtRCC1i0BcGBEG5ps="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index fbf40096daef..9b80f780b852 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -19,7 +19,7 @@ let pname = "astropy"; - version = "5.1"; + version = "5.2"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-HbGyx+3fx3PKZvozvQeyXVucO17uK5NODKJ3+lsbe34="; + sha256 = "sha256-0zVgQCX24W98m/gtW6KOXbR0WoLlgjqdF73Zub1GsqI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index f45c5e7aff33..51e8805465f5 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "asttokens"; - version = "2.1.0"; + version = "2.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-SqdkAaFRyMxXLZBqrXrqKoQXgINKGdeA9DIcD+G1RjU="; + hash = "sha256-RiIRCypvMLd+FHOv+ql+cRvC8H0/EISEIP8YmO2+lPM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix index 84423c6afbbc..afeb78d413a7 100644 --- a/pkgs/development/python-modules/async-modbus/default.nix +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , connio , fetchFromGitHub +, fetchpatch , pytest-asyncio , pytestCheckHook , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "async-modbus"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +21,17 @@ buildPythonPackage rec { owner = "tiagocoutinho"; repo = "async_modbus"; rev = "refs/tags/v${version}"; - hash = "sha256-TB+ndUvLZ9G3XXEBpLb4ULHlYZC2CoqGnL2BjMQrhRg="; + hash = "sha256-OTt/rUa3KLVSFOIUyMNHnqHvPtISxTposNFAgoixRfk="; }; + patches = [ + (fetchpatch { + # Fix tests; https://github.com/tiagocoutinho/async_modbus/pull/13 + url = "https://github.com/tiagocoutinho/async_modbus/commit/d81d8ffe94870f0f505e0c8a0694768c98053ecc.patch"; + hash = "sha256-mG3XO2nAFYitatkswU7er29BJc/A0IL1rL2Zu4daZ7k="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace '"--cov=async_modbus",' "" \ diff --git a/pkgs/development/python-modules/async-modbus/fix-tests.patch b/pkgs/development/python-modules/async-modbus/fix-tests.patch new file mode 100644 index 000000000000..1c9dd605f5b8 --- /dev/null +++ b/pkgs/development/python-modules/async-modbus/fix-tests.patch @@ -0,0 +1,73 @@ +diff --git a/tests/test_async_modbus.py b/tests/test_async_modbus.py +index b0bd3fd..6b8df87 100644 +--- a/tests/test_async_modbus.py ++++ b/tests/test_async_modbus.py +@@ -194,7 +194,7 @@ async def test_read_coils(proto, slave_id, starting_address, expected_reply): + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -204,7 +204,7 @@ async def test_read_coils(proto, slave_id, starting_address, expected_reply): + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + + @pytest.mark.asyncio +@@ -273,7 +273,7 @@ async def test_read_discrete_inputs(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -283,7 +283,7 @@ async def test_read_discrete_inputs(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + + @pytest.mark.asyncio +@@ -306,7 +306,7 @@ async def test_read_holding_registers( + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -316,7 +316,7 @@ async def test_read_holding_registers( + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + + @pytest.mark.asyncio +@@ -383,7 +383,7 @@ async def test_read_input_registers(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply + + server = Server(slave_id, starting_address, expected_reply) + client = AsyncClient(server, protocol) +@@ -393,4 +393,4 @@ async def test_read_input_registers(proto, slave_id, starting_address, expected_ + await coro + else: + reply = await coro +- assert (reply == expected_reply).all() ++ assert reply == expected_reply diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index f9b12e553420..3d16f7bfa48c 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -36,6 +36,10 @@ buildPythonPackage rec { trio ]; + pytestFlagsArray = [ + "-W" "ignore::trio.TrioDeprecationWarning" + ]; + disabledTests = [ # RuntimeWarning: coroutine 'Context.invoke' was never awaited "test_context_invoke_type" diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index 41f2f2864d18..05225ef6ec73 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.14.0"; + version = "0.16.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ByVslOx/XsxVan2/xdRi+wOQR9oVpIGtHPcHlIcHMEk="; + hash = "sha256-f3JqocjOEwNjo6Uv17ij6oEdrjb6Z2wTzdhdVhx46iM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -60,6 +60,7 @@ buildPythonPackage rec { "test_client_websockets" "test_client_pending_calls_threshold" "test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls" + "test_multiple_messages_generators" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index a0c006261629..fae7f6567037 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.28.1"; + version = "3.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-ZKRmjfH3s35DU1Mut63YuN6opKzg2gpyunWYjg/FbHA="; + sha256 = "sha256-Jh3JdrA/ahge/tJipeMGag2CUk4uuGzMXC9I7UWha9E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 44b61fcba725..855b4bf86982 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -3,18 +3,24 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "attrs"; - version = "22.1.0"; - disabled = pythonOlder "3.5"; + version = "22.2.0"; + disabled = pythonOlder "3.6"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Ka3CZlRH5RkdDnxWj954sh+WctNEKB0MbhqwhUKbIrY="; + hash = "sha256-ySJ7/C8BmTwD9o2zfR0VyWkBiDI8BnxkHxo1ylgYX5k="; }; + nativeBuildInputs = [ + setuptools + ]; + outputs = [ "out" "testout" @@ -23,7 +29,7 @@ buildPythonPackage rec { postInstall = '' # Install tests as the tests output. mkdir $testout - cp -R tests $testout/tests + cp -R conftest.py tests $testout ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/attrs/tests.nix b/pkgs/development/python-modules/attrs/tests.nix index c9fae9e0228c..fddf467665c5 100644 --- a/pkgs/development/python-modules/attrs/tests.nix +++ b/pkgs/development/python-modules/attrs/tests.nix @@ -7,6 +7,7 @@ buildPythonPackage { pname = "attrs-tests"; inherit (attrs) version; + format = "other"; srcs = attrs.testout; diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index d4a71d639c73..63bc42c5c4b2 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -25,14 +25,6 @@ buildPythonPackage rec { sha256 = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c="; }; - postPatch = '' - # https://github.com/alandtse/auth_capture_proxy/issues/14 - # https://github.com/alandtse/auth_capture_proxy/issues/15 - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'importlib-metadata = "^3.4.0"' 'importlib-metadata = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index c18d3b2bb84f..11bcb603f909 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -83,8 +83,6 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - # FIXME: remove the following dependencies when web3 gets added - eth-account ] ++ passthru.optional-dependencies.scram ++ passthru.optional-dependencies.serialization ++ passthru.optional-dependencies.xbr; diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix similarity index 77% rename from pkgs/development/tools/analysis/autoflake/default.nix rename to pkgs/development/python-modules/autoflake/default.nix index adc861588dd5..2eebefa5c11d 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -1,21 +1,24 @@ { lib -, python3 +, buildPythonPackage +, fetchPypi +, pyflakes +, pytestCheckHook }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "autoflake"; version = "1.4"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-YaNTASz/arlMoGKCPR+y9pLErNpRx2/4Oo13kV+6Ueo="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ pyflakes ]; - checkInputs = with python3.pkgs; [ + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 094015e56f5e..ba055025d698 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , attrs , pytest-benchmark , pytestCheckHook @@ -10,25 +9,15 @@ }: let automat = buildPythonPackage rec { - version = "20.2.0"; + version = "22.10.0"; pname = "automat"; src = fetchPypi { pname = "Automat"; inherit version; - sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33"; + hash = "sha256-5WvrhO2tGdzBHTDo2biV913ute9elrhKRnBms7hLsE4="; }; - patches = [ - # don't depend on m2r - (fetchpatch { - name = "dont-depend-on-m2r.patch"; - url = "https://github.com/glyph/automat/compare/v20.2.0..2562fa4ddeba5b5945d9482baa4c26a414f5e831.patch"; - includes = [ "setup.py" ]; - hash = "sha256-jlPLJMu1QbBpiVYHDiqPydrXjEoZgYZTVVGNxSA0NxY="; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index a5c7cccffb3e..cc0423397d21 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchpatch , buildPythonPackage +, pythonOlder , pycodestyle , glibcLocales , tomli @@ -10,25 +11,21 @@ buildPythonPackage rec { pname = "autopep8"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "hhatto"; repo = "autopep8"; - rev = "v${version}"; - sha256 = "sha256-77ZVprACHUP8BmylTtvHvJMjb70E1YFKKdQDigAZG6s="; + rev = "refs/tags/v${version}"; + hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo="; }; - patches = [ - (fetchpatch { - name = "fix-pycodestyle-2.10.0.patch"; - url = "https://github.com/hhatto/autopep8/pull/659.patch"; - hash = "sha256-ulvQqJ3lUm8/9QZwH+whzrxbz8c11/ntc8zH2zfmXiE="; - }) + propagatedBuildInputs = [ + pycodestyle + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; - propagatedBuildInputs = [ pycodestyle tomli ]; - checkInputs = [ glibcLocales pytestCheckHook @@ -37,8 +34,9 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; meta = with lib; { + changelog = "https://github.com/hhatto/autopep8/releases/tag/v${version}"; description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; - homepage = "https://pypi.org/project/autopep8/"; + homepage = "https://github.com/hhatto/autopep8"; license = licenses.mit; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 00c50e912016..05a5d4fd5d09 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "2"; + version = "5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XmP0PjE19224Hgkkp07PSHD1hcEan0MlaLN3wEAohow="; + hash = "sha256-5dapDZihTas2WYAV5pJDufg7iFFVYQTL53jKnHmSNlY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index f15810ae8ab8..017144e42703 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.0.0"; + version = "2.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N4KzRkMIPW7nZE6f2z2ur8S2AwpmfyGf1hy3sjSXa2g="; + hash = "sha256-/DbvWTTO14ttikC8lNPqWWZ3JVFrNq/qXtHveUJjp8c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index edd0e9426506..215ce6152e90 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -5,16 +5,19 @@ , jsonschema , mock , parameterized +, pydantic , pytest-env +, pytest-rerunfailures +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml -, six +, typing-extensions }: buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.47.0"; + version = "1.55.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,13 +26,14 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - sha256 = "sha256-FYEJ+mMxb8+OXUVeyLbAqOnujNi/wNhvAl4Lh4ZeE0I="; + sha256 = "sha256-YDqdd4zKInttHDl04kvAgHKtc1vBryW12QfE0wiLU54="; }; propagatedBuildInputs = [ boto3 jsonschema - six + pydantic + typing-extensions ]; postPatch = '' @@ -43,6 +47,8 @@ buildPythonPackage rec { mock parameterized pytest-env + pytest-rerunfailures + pytest-xdist pytestCheckHook pyyaml ]; @@ -52,6 +58,16 @@ buildPythonPackage rec { "test_errors_13_error_definitionuri" ]; + pytestFlagsArray = [ + # samtranslator.translator.arn_generator.NoRegionFound: AWS Region cannot be found + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing" + "--deselect tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls" + "--deselect tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2" + ]; + pythonImportsCheck = [ "samtranslator" ]; diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index fd8ed21cd085..d851cd056066 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.10.0"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mxSST9BijPkpNgVYZGVTVAA/CxrMPhw//eZAPQeZ3Xo="; + sha256 = "sha256-eINfyEHwPlUIWPGKmXPquGGPR/ItL1nt8TBXj6VFqGc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 4e9329f22603..f80ca9f17b8f 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -17,7 +17,7 @@ , typing-extensions }: buildPythonPackage rec { - version = "1.25.1"; + version = "1.26.1"; pname = "azure-core"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-PBzzaGUOduwAnAfNEXSpXNy0cbJHu3LRgkX31WwYCbI="; + sha256 = "sha256-IjsOkMvdHwPEGxlbAyOYmYQ/INAJZNu4XmQ4aHNBSi0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index 7f2933e01a56..1d8ce8d5675a 100644 --- a/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/pkgs/development/python-modules/azure-data-tables/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-data-tables"; - version = "12.4.0"; + version = "12.4.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw="; + sha256 = "sha256-FvEo6PZubKBcB/t4/MxxNJMjHfHYXjPE4lp5yURVhko="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index 796c65bcd077..9d89eae3e07b 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "16.2.0"; + version = "17.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-aWkQZs1aLIbo/arvu4DilAOBrO38gFPfGTtSFNLs5oI="; + hash = "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 312b317d6f62..a2d260339aca 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.2.0"; + version = "13.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-XUsi5fNpirCTQ9Zz4AdYPvX8/WS7N5sQcT5t2q2YDkg="; + hash = "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 6c0f36d92eee..00245ed3ffc7 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "27.2.0"; + version = "29.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-5caVUxZvt+7L/1LDfcD/SiUwvFVF1KXdS6mDIVrSKJ0="; + hash = "sha256-wkRmH/3MMxeTZr7KQMZQbjPHs2GSxAjJFZlSp75pUPI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index cadf74a5f653..3027d54531ac 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.8.1"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-HuCp9J7uukK9QK0w2aHPZXiAsp4Az+6hx60ItbJvfkQ="; + hash = "sha256-IT1LQfdNpvc1yNX4Z/qMK2sL2MkaOA4krRFWz1SAz3s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 442315d0566b..331c0e1e2e95 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "1.0.0"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-QhC2s/onnlbFVxMmK6SJg2hatxp4WTrYWtMV0pXtAZ8="; + sha256 = "sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 47849c9c6f1a..9c7a57adc08d 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.8.0"; + version = "7.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-KTvJXOJ3o2KUL9iPcus6m0qS3hAAB3Wz0uPgCttFqlk="; + hash = "sha256-gI5eCyXGFkQgY0rhyGLioLXj1a4I6vV64Nm/EKyFEks="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index de0909fa0c02..6a84941a5e8f 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-WJZtE7efs1xwalyb0Sr2J+pmPIt9gn2o01/prncb2uM="; + sha256 = "sha256-Q1gGq7EZ/JvYjD7y0mp3kEy15QKZI84UQTdlIBoQLMs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index e62533f491cb..fb71d65d5bb4 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "backoff"; - version = "2.1.2"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "litl"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-eKd1g3UxXlpSlNlik80RKXRaw4mZyvAWl3i2GNuZ3hI="; + sha256 = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index 6fe7a111b5d4..416eba18dec3 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, py , pyhamcrest , pytest-benchmark , pytestCheckHook @@ -10,6 +11,7 @@ buildPythonPackage rec { pname = "base58"; version = "2.1.1"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { @@ -18,6 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ + py pyhamcrest pytest-benchmark pytestCheckHook diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 69c0d605c59a..c22c0c9657f1 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.9.8"; + version = "1.9.9"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/zl5m7IF+S1vLDIvC47/DRwCiPQpGgsY/OYa+k39fz4="; + sha256 = "sha256-KdYZ5sOpSdUdi7AvnrEfDBnfml4P6thTLM0dUPC/toA="; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 617b87bc12f1..a14f973fccce 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -1,23 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +, poetry-core , protobuf +, pytestCheckHook }: buildPythonPackage rec { pname = "biliass"; - version = "1.3.5"; - disabled = pythonOlder "3.6"; + version = "1.3.7"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "yutto-dev"; + repo = "biliass"; + rev = "refs/tags/v${version}"; + hash = "sha256-Opb4rlGe+LDJZs3F7e/NZYfuMtHEWUZeMm8VZQfEzKI="; }; - propagatedBuildInputs = [ protobuf ]; + nativeBuildInputs = [ + poetry-core + ]; - pythonImportsCheck = [ "biliass" ]; + propagatedBuildInputs = [ + protobuf + ]; + + doCheck = false; # test artifacts missing + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "biliass" + ]; meta = with lib; { homepage = "https://github.com/yutto-dev/biliass"; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 303d334936c6..511fbc5318c2 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "billiard"; - version = "4.0.0"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NE2aHX063fFx6yxZbJ6Y0e/4Gw4D8fk5iTmjUYyiY6k="; + sha256 = "sha256-GtLuro4oBT1ym6M3PTTZ1uIQ9uTYvwqcZPkr0FPx7fU="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 002b3ce2e292..e0b419da2926 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.79"; + version = "1.80"; src = fetchPypi { inherit pname version; - sha256 = "edb07eac99d3b8abd7ba56ff4bedec9263f76dfc3c3f450e7d2e2bcdecf8559b"; + sha256 = "sha256-UoBemviHZ+RQ4t+BE7W8Welk4uinu4A6g1cL27UcDkM="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index f49c4c9de47d..a9bbef0e4325 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.6.0"; + version = "2.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VtPxbdgHscVnMqJEzgccE17pc9PtyZKUGMGyTFQ5oP0="; + hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index d4122dddc8bc..01200a2fae82 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.13"; + version = "1.0.16"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-feuHVtBgjzGBjY1eSKh47feTT8prdkSwvs993lJSSiI="; + hash = "sha256-XABdS6CCUJpZ9N1Vra078V0HoDU32u1l3yz96ZKHwFc="; }; patches = [ diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch index 3184e3f0ea8e..6acc6f878f51 100644 --- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6922167..23d8da6 100644 +index 7922652..d85b058 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH @@ -10,7 +10,7 @@ index 6922167..23d8da6 100644 - # Latest commit at the moment this was added here - # Anchored to libsodium v1.0.18 - GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 -+ URL @sodium_src@ ++ URL /nix/store/2nj48a8vb7rzxhwaigdcpa0yyax7yrv7-source ) set(SODIUM_PCH "on" CACHE STRING "") set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") @@ -30,12 +30,12 @@ index 6922167..23d8da6 100644 relic - GIT_REPOSITORY https://github.com/Chia-Network/relic.git - GIT_TAG ${RELIC_GIT_TAG} -+ SOURCE_DIR @relic_src@ ++ SOURCE_DIR /nix/store/6r9v1cmmy535q2y0pk0bkjh3ppyzb2ch-source ) # Relic related options diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt -index 5a8c381..d9aa940 100644 +index 2e331c3..d9aa940 100644 --- a/python-bindings/CMakeLists.txt +++ b/python-bindings/CMakeLists.txt @@ -1,8 +1,7 @@ @@ -43,13 +43,13 @@ index 5a8c381..d9aa940 100644 FetchContent_Declare( pybind11 - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 +- GIT_TAG v2.10.0 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11 relic) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 449164a..15a955e 100644 +index 3164f7f..15a955e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,8 +37,7 @@ install(FILES $ DESTINATION lib) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 75ca944830f1..c323713c7dc5 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -28,16 +28,19 @@ , icalendar , pandas , pythonImportsCheckHook +, contourpy +, xyzservices }: buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.4.3"; + version = "3.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; + hash= "sha256-HChHHvXmEQulvtUTE3/SYFTrxEVLx2hlDq7vxTuJioo="; }; patches = [ @@ -70,10 +73,10 @@ buildPythonPackage rec { requests nbconvert icalendar - pandas ]; propagatedBuildInputs = [ + contourpy pillow jinja2 python-dateutil @@ -81,8 +84,10 @@ buildPythonPackage rec { pyyaml tornado numpy + pandas packaging typing-extensions + xyzservices ] ++ lib.optionals ( isPy27 ) [ futures diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch index f8f33c0021f2..fffdea592b73 100644 --- a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch +++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch @@ -1,9 +1,9 @@ -diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py -index a752aad7d..8af05ff63 100644 ---- a/bokeh/util/compiler.py -+++ b/bokeh/util/compiler.py -@@ -442,8 +442,8 @@ def _detect_nodejs(): - raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version + +diff --git a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py +index 9af8691..4b93543 100644 +--- a/src/bokeh/util/compiler.py ++++ b/src/bokeh/util/compiler.py +@@ -415,8 +415,8 @@ def _detect_nodejs() -> str: + raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + '("conda install nodejs" or follow https://nodejs.org/en/download/)') -_nodejs = None @@ -11,5 +11,5 @@ index a752aad7d..8af05ff63 100644 +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" - def _nodejs_path(): + def _nodejs_path() -> str: global _nodejs diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 698f252909ef..b9aafb7621c2 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -1,50 +1,57 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , botocore , jmespath , s3transfer -, futures ? null -, docutils -, nose -, mock -, isPy3k +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "boto3"; - version = "1.24.75"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.26.38"; # N.B: if you change this, change botocore and awscli to a matching version + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-e/oiQt+bH6c+F/TX959rIlYPVdXaLifleOWF725LFKc="; + src = fetchFromGitHub { + owner = "boto"; + repo = pname; + rev = version; + hash = "sha256-/QkR6gL0XkXofnFDcKa7J0ZbZbgT0IKnqtq2wcilbEs="; }; - propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ docutils nose mock ]; + propagatedBuildInputs = [ + botocore + jmespath + s3transfer + setuptools + ]; - checkPhase = '' - runHook preCheck - # This method is not in mock. It might have appeared in some versions. - sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ - tests/unit/resources/test_factory.py - nosetests -d tests/unit --verbose - runHook postCheck - ''; + doCheck = true; - # Network access - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "boto3" ]; + pythonImportsCheck = [ + "boto3" + ]; - meta = { + disabledTestPaths = [ + # Integration tests require networking + "tests/integration" + ]; + + meta = with lib; { homepage = "https://github.com/boto/boto3"; - license = lib.licenses.asl20; + changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; + license = licenses.asl20; description = "AWS SDK for Python"; longDescription = '' Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for Python, which allows Python developers to write software that makes use of services like Amazon S3 and Amazon EC2. ''; + maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index c6905d2de667..3a8d90de84c1 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -4,43 +4,51 @@ , python-dateutil , jmespath , docutils -, simplejson -, mock -, nose , urllib3 +, pytestCheckHook +, jsonschema }: buildPythonPackage rec { pname = "botocore"; - version = "1.27.75"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.29.40"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-+LHaK0HojFjbUdsMbv9spWQliUjOSlrH6WrDWkabDU8="; + hash = "sha256-5YKsBykBjaQVsLXeFOox/9CtBIOp/bgUeQJSbQY0f7c="; }; propagatedBuildInputs = [ python-dateutil jmespath docutils - simplejson urllib3 ]; - checkInputs = [ mock nose ]; + checkInputs = [ + pytestCheckHook + jsonschema + ]; - checkPhase = '' - nosetests -v - ''; + doCheck = true; - # Network access - doCheck = false; + disabledTestPaths = [ + # Integration tests require networking + "tests/integration" - pythonImportsCheck = [ "botocore" ]; + # Disable slow tests (only run unit tests) + "tests/functional" + ]; + + pythonImportsCheck = [ + "botocore" + ]; meta = with lib; { homepage = "https://github.com/boto/botocore"; + changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; description = "A low-level interface to a growing number of Amazon Web Services"; + maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index e82c5ce78379..bb5b59509801 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "branca"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5vL366fdNozu+PY4Irhn9eEdTTq90Jmnh9ue0rcGWuE="; + sha256 = "sha256-VZSYVSFFBMdYO3G5oDqE3OLpaoQCdhO7U7QtBIRM4k4="; }; checkInputs = [ pytest selenium ]; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index a53af25bd888..9c763e22c696 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , docutils , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , sphinx @@ -21,6 +22,13 @@ buildPythonPackage rec { hash = "sha256-OOc3XQjqQa0cVpA+/HHco+koL+0whUm5qC7x3xiEdwQ="; }; + patches = [ + (fetchpatch { + url = "https://github.com/breathe-doc/breathe/commit/de3504c81c7cefc87c8229743f93232ca00a685d.patch"; + hash = "sha256-UGld5j0F/hnTuS7KUFvgQL52xCUdaJ3/NeuEuHhpCxI="; + }) + ]; + propagatedBuildInputs = [ docutils sphinx diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index b072c5576d1f..b3abb49c01cc 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -6,20 +6,20 @@ , lz4 , keyring , pbkdf2 -, pycryptodome +, pycryptodomex , pyaes }: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.16.2"; + version = "0.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IB0Ms+mCHh7lfG3XYfvE2h/2lec5Tq9AAjqANz7x0hE="; + hash = "sha256-LWqXml6ShNU7gHZChdETwkSmLhipnSCgnyCWnBs7MXw="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { keyring pbkdf2 pyaes - pycryptodome + pycryptodomex ]; # No tests implemented diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 9f91541599c9..46adf39b502e 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "btrees"; - version = "4.11.0"; + version = "4.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-AFwDtIAp1noojnYIeYw3rCSfLAabb1GDZAqUmdzY+qM="; + hash = "sha256-kIUAsCD/mJsAlG+Kb2Vz84qbGAjQd+UuPc8Ej7FwwTo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index 648ec29520bf..a9cf3049d72e 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -3,20 +3,28 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "bytecode"; - version = "0.13.0"; + version = "0.14.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vstinner"; repo = pname; - rev = version; - sha256 = "sha256-aY19qMYW7KziiXVY3lxdnHk7OCAJaNh+aTvlQyJWmDw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-nGZ4qcms27lYr1dYvVe4ebd/jc5qIb1EDhSpSZmKKIo="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 2c4d3bb23516..0dfc302a49a5 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -5,15 +5,15 @@ buildPythonPackage rec { pname = "catboost"; - version = "1.0.5"; + version = "1.1.1"; disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; - rev = "v${version}"; - sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY="; }; nativeBuildInputs = [ clang_12 ]; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 7fd5baf57618..19bc40a1e42d 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.4.3"; + version = "5.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Yrhjxe5s7UAyr+lI88FITzdVUJldO4SYFFI3/ijlRsI="; + hash = "sha256-uJNQDbD+Az5XDDrclWr27vxX4oACa9LYb9U9qfHllNc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 67c3c58794d5..80b58dc69be6 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -38,10 +38,15 @@ buildPythonPackage rec { patches = [ (fetchpatch { - name = "billiard-4.0-comat.patch"; + name = "billiard-4.0-compat.patch"; url = "https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch"; hash = "sha256-NWB/UB0fE7A/vgMRYz6QGmqLmyN1ninAMyL4V2tpzto="; }) + (fetchpatch { + name = "billiard-4.1-compat.patch"; + url = "https://github.com/celery/celery/pull/7781/commits/879af6341974c3778077d8212d78f093b2d77a4f.patch"; + hash = "sha256-+m8/YkeAPPjwm0WF7dw5XZzf7MImVBLXT0/FS+fk0FE="; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix index f198d8b058dd..a278d446fce9 100644 --- a/pkgs/development/python-modules/cepa/default.nix +++ b/pkgs/development/python-modules/cepa/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cepa"; - version = "1.8.3"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "HcbwsyTTei7SyidGSOzo/SyWodL0QPWMDKF6/Ute3no="; + sha256 = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index c2f3c1f7915f..e66435d8cc33 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.31.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-JDhesUU6SQBEf0CG3vo1AhlRfGpltTEUmSqrpGIpptg="; + sha256 = "sha256-fCKTDAJiulwL2SOw4bV3vu0VEsvXGF+1ry8esYori8o="; }; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index fb08761a5284..07c76f81a4b3 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -32,6 +32,24 @@ if isPyPy then null else buildPythonPackage rec { # deemed safe to trust in cffi. # ./darwin-use-libffi-closures.diff + (fetchpatch { + # Drop py.code usage from tests, no longer depend on the deprecated py package + url = "https://foss.heptapod.net/pypy/cffi/-/commit/9c7d865e17ec16a847090a3e0d1498b698b99756.patch"; + excludes = [ + "README.md" + "requirements.txt" + ]; + hash = "sha256-HSuLLIYXXGGCPccMNLV7o1G3ppn2P0FGCrPjqDv2e7k="; + }) + (fetchpatch { + # Replace py.test usage with pytest + url = "https://foss.heptapod.net/pypy/cffi/-/commit/bd02e1b122612baa74a126e428bacebc7889e897.patch"; + excludes = [ + "README.md" + "requirements.txt" + ]; + hash = "sha256-+2daRTvxtyrCPimOEAmVbiVm1Bso9hxGbaAbd03E+ws="; + }) ] ++ lib.optionals (pythonAtLeast "3.11") [ # Fix test that failed because python seems to have changed the exception format in the # final release. This patch should be included in the next version and can be removed when @@ -64,6 +82,12 @@ if isPyPy then null else buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # AssertionError: cannot seem to get an int[10] not completely cleared + # https://foss.heptapod.net/pypy/cffi/-/issues/556 + "test_ffi_new_allocator_1" + ]; + meta = with lib; { maintainers = with maintainers; [ domenkozar lnl7 ]; homepage = "https://cffi.readthedocs.org/"; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 238f5e83630e..e9aafacec9e9 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.61.2"; + version = "0.72.5"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "refs/tags/v${version}"; - sha256 = "sha256-282h1fBWhAfwqCuP+dU3ajn0gQtmOcPNTMKZ0a2+vHU="; + sha256 = "sha256-UDjCTl4AAOrwiXbKYIFsZCaSDjIFXYwNnp8/hIfXbM0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 052120d893d0..735337e43d6f 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -16,7 +16,6 @@ , requests , setuptools , six -, typing , watchdog , websocket-client , wheel @@ -24,20 +23,21 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.27.1"; + version = "1.27.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "aws"; repo = pname; - rev = version; - sha256 = "sha256-Qz8kYXu2NmcgtW8GbmLPfB4BOearEycE6EMmQRXmWeI="; + rev = "refs/tags/${version}"; + hash = "sha256-izzoYxzkaQqcEM5e8BhZeZIxtAGRDNH/qvqwvrx250s="; }; postPatch = '' substituteInPlace setup.py \ --replace "attrs>=19.3.0,<21.5.0" "attrs" \ - --replace "pip>=9,<22.2" "pip" \ - --replace "typing==3.6.4" "typing" + --replace "inquirer>=2.7.0,<3.0.0" "inquirer" \ + --replace "pip>=9,<22.3" "pip" \ ''; propagatedBuildInputs = [ @@ -53,8 +53,6 @@ buildPythonPackage rec { six wheel watchdog - ] ++ lib.optionals (pythonOlder "3.7") [ - typing ]; checkInputs = [ diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index b5cca5110e7c..07a0cbccf258 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -4,18 +4,24 @@ , hypothesis , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "chardet"; - version = "5.0.0"; + version = "5.1.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-A2jfK/14tfwgVyu06bt/tT4sCU9grpmTM56GcdCvuKo="; + hash = "sha256-DWJxK5VrwVT4X7CiZuKjxZE8KWfgA0hwGzJBHW3vMeU="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ hypothesis pytestCheckHook @@ -29,6 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "chardet" ]; meta = with lib; { + changelog = "https://github.com/chardet/chardet/releases/tag/${version}"; description = "Universal encoding detector"; homepage = "https://github.com/chardet/chardet"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index b40ef02fd6d9..df34e4ca1509 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "2.1.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = "refs/tags/${version}"; - hash = "sha256-ntNMHjkQJqzSElEeyFmPIjUh6ZxQkTktPipfPHiJ/Vc="; + hash = "sha256-2kXs6ZdemA6taV4aa9xBKLmhbSgpybjg3Z61EUFabrk="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 3ddcf9599659..a191435331bc 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.10.0"; + version = "5.11.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - sha256 = "sha256-j1MiLUSIun0xnUFCcyZ5p8eGF5Q34jCwoVuQG5xSlkU="; + sha256 = "sha256-Reti8tvBpBxpfNjnZs8wWuS76oEWIKPCxzSdTEO+ykA="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index da5870f7d500..3e80423c4255 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.6.0"; + version = "9.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NmrfbnyslVVIbC0b5il5kwIu/2+MRlXBRDJozKPwjiU="; + hash = "sha256-PUetnuGey+wUS0dYOZA2aS/b9npAuW7vH7FFQ2ez0zg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index b94f30a2c758..c438e9e12cf4 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -78,6 +78,9 @@ buildPythonPackage rec { "test_antistampede" "test_file_stream" + "test_basic_request" + "test_3_Redirect" + "test_4_File_deletion" ] ++ lib.optionals stdenv.isDarwin [ "test_block" ]; diff --git a/pkgs/development/python-modules/chia-rs/Cargo.lock b/pkgs/development/python-modules/chia-rs/Cargo.lock index 96fc3236f142..ad3755638df3 100644 --- a/pkgs/development/python-modules/chia-rs/Cargo.lock +++ b/pkgs/development/python-modules/chia-rs/Cargo.lock @@ -2,6 +2,38 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anyhow" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" + +[[package]] +name = "atomic-polyfill" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +dependencies = [ + "critical-section", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -16,9 +48,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.22.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -36,10 +68,19 @@ dependencies = [ ] [[package]] -name = "bls12_381" -version = "0.5.0" +name = "block-buffer" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54757888b09a69be70b5ec303e382a74227392086ba808cb01eeca29233a2397" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bls12_381" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62250ece575fa9b22068b3a8d59586f01d426dd7785522efd97632959e71c986" dependencies = [ "ff", "group", @@ -49,10 +90,27 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.10.0" +name = "bls12_381_plus" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "c7c681aa947677ec0c5ccfa6f14c0dd039ddbaa7b12952bf146bd5226a5f9880" +dependencies = [ + "digest 0.9.0", + "ff", + "group", + "heapless", + "pairing", + "rand_core", + "serde", + "subtle", + "zeroize", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "byteorder" @@ -60,6 +118,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cfg-if" version = "1.0.0" @@ -68,31 +132,76 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chia" -version = "0.1.5" +version = "0.1.15" dependencies = [ + "chia-protocol", + "clvm-utils", "clvmr", "hex", "num-traits", "pyo3", - "serde", +] + +[[package]] +name = "chia-bls" +version = "0.1.15" +dependencies = [ + "anyhow", + "bls12_381_plus", + "criterion", + "group", + "hex", + "hkdf", + "num-bigint", + "rand", + "sha2 0.9.9", + "tiny-bip39", +] + +[[package]] +name = "chia-protocol" +version = "0.1.15" +dependencies = [ + "chia_py_streamable_macro", + "chia_streamable_macro", + "clvmr", + "hex", + "pyo3", + "sha2 0.10.2", +] + +[[package]] +name = "chia_py_streamable_macro" +version = "0.1.2" +dependencies = [ + "quote", + "syn", ] [[package]] name = "chia_rs" -version = "0.1.5" +version = "0.1.16" dependencies = [ "chia", + "chia-protocol", + "chia_py_streamable_macro", + "chia_streamable_macro", "clvmr", "hex", - "py_streamable", "pyo3", - "serde", - "sha2", +] + +[[package]] +name = "chia_streamable_macro" +version = "0.2.3" +dependencies = [ + "quote", + "syn", ] [[package]] name = "chia_wasm" -version = "0.1.5" +version = "0.1.15" dependencies = [ "chia", "wasm-bindgen", @@ -100,10 +209,65 @@ dependencies = [ ] [[package]] -name = "clvmr" -version = "0.1.20" +name = "ciborium" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18d68c7f9e8e08ea66a6673bec83100bd53103a9d504fe279147bd0a79b260c" +checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" + +[[package]] +name = "ciborium-ll" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "bitflags", + "clap_lex", + "indexmap", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clvm-utils" +version = "0.1.15" +dependencies = [ + "clvmr", +] + +[[package]] +name = "clvmr" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5e907612d322d0d7def6b0ecb3ad681f6af2db106bcfabe4153746c60ef9e4" dependencies = [ "bls12_381", "hex", @@ -111,10 +275,7 @@ dependencies = [ "num-bigint", "num-integer", "num-traits", - "pyo3", - "sha2", - "wasm-bindgen", - "wasm-bindgen-test", + "sha2 0.10.2", ] [[package]] @@ -129,18 +290,123 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.1.5" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] [[package]] -name = "ctor" -version = "0.1.22" +name = "criterion" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +dependencies = [ + "anes", + "atty", + "cast", + "ciborium", + "clap", + "criterion-plot", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", "syn", @@ -156,10 +422,27 @@ dependencies = [ ] [[package]] -name = "ff" -version = "0.10.1" +name = "digest" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer 0.10.3", + "crypto-common", + "subtle", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "bitvec", "rand_core", @@ -168,25 +451,36 @@ dependencies = [ [[package]] name = "funty" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", ] [[package]] -name = "ghost" -version = "0.1.5" +name = "getrandom" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93490550b1782c589a350f2211fff2e34682e25fed17ef53fc4fa8fe184975e" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghost" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" dependencies = [ "proc-macro2", "quote", @@ -195,9 +489,9 @@ dependencies = [ [[package]] name = "group" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" +checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" dependencies = [ "byteorder", "ff", @@ -205,12 +499,94 @@ dependencies = [ "subtle", ] +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "spin", + "stable_deref_trait", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" +dependencies = [ + "digest 0.9.0", + "hmac 0.11.0", +] + +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + [[package]] name = "indoc" version = "0.3.6" @@ -265,6 +641,21 @@ dependencies = [ "syn", ] +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + [[package]] name = "js-sys" version = "0.3.52" @@ -282,15 +673,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -306,10 +697,19 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.4.0" +name = "memoffset" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -318,9 +718,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -328,18 +728,34 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] -name = "once_cell" -version = "1.13.0" +name = "num_cpus" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -348,10 +764,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] -name = "pairing" -version = "0.20.0" +name = "os_str_bytes" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de9d09263c9966e8196fe0380c9dbbc7ea114b5cf371ba29004bc1f9c6db7f3" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "pairing" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" dependencies = [ "group", ] @@ -369,9 +791,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -400,6 +822,49 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "plotters" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" + +[[package]] +name = "plotters-svg" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -408,21 +873,13 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.42" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] -[[package]] -name = "py_streamable" -version = "0.1.0" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "pyo3" version = "0.15.1" @@ -474,24 +931,70 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] [[package]] name = "redox_syscall" @@ -503,10 +1006,55 @@ dependencies = [ ] [[package]] -name = "scoped-tls" -version = "1.0.0" +name = "regex" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" @@ -515,19 +1063,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "serde" -version = "1.0.140" +name = "semver" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" + +[[package]] +name = "serde" +version = "1.0.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.140" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ "proc-macro2", "quote", @@ -535,23 +1089,60 @@ dependencies = [ ] [[package]] -name = "sha2" -version = "0.9.5" +name = "serde_json" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ - "block-buffer", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] [[package]] -name = "smallvec" -version = "1.9.0" +name = "sha2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "spin" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +dependencies = [ + "lock_api", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "subtle" @@ -561,15 +1152,27 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + [[package]] name = "tap" version = "1.0.1" @@ -577,22 +1180,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "typenum" -version = "1.15.0" +name = "textwrap" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tiny-bip39" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" +dependencies = [ + "anyhow", + "hmac 0.12.1", + "once_cell", + "pbkdf2", + "rand", + "rustc-hash", + "sha2 0.10.2", + "thiserror", + "unicode-normalization", + "wasm-bindgen", + "zeroize", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unindent" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44" +checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" [[package]] name = "version_check" @@ -600,6 +1288,23 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.75" @@ -716,6 +1421,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -724,9 +1438,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "wyz" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] + +[[package]] +name = "zeroize" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix index 2df9c16f2a30..36c62153b8b8 100644 --- a/pkgs/development/python-modules/chia-rs/default.nix +++ b/pkgs/development/python-modules/chia-rs/default.nix @@ -7,15 +7,20 @@ buildPythonPackage rec { pname = "chia-rs"; - version = "0.1.5"; + version = "0.1.16"; src = fetchFromGitHub { owner = "chia-network"; repo = "chia_rs"; - rev = version; - sha256 = "sha256-4TIRj7FMIArI/EvDARReC4MqDG44zjn/MKoUHAVqq5s="; + rev = "refs/tags/${version}"; + sha256 = "sha256-WIt7yGceILzVhegluiSb7w3F9qQvI5DjulheGsJrcf8="; }; + patches = [ + # undo a hack from upstream that confuses our build hook + ./fix-build.patch + ]; + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; diff --git a/pkgs/development/python-modules/chia-rs/fix-build.patch b/pkgs/development/python-modules/chia-rs/fix-build.patch new file mode 100644 index 000000000000..cf793f78a744 --- /dev/null +++ b/pkgs/development/python-modules/chia-rs/fix-build.patch @@ -0,0 +1,12 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -1,8 +1,5 @@ +-# the "wheel" crate is excluded from the workspace because pyo3 has problems with +-# "cargo test" and "cargo bench" + [workspace] +-members = ["wasm", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"] +-exclude = ["wheel"] ++members = ["wasm", "wheel", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"] + + [package] + name = "chia" diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index 11452dee2ea5..f8f19e142fbd 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.10"; + version = "1.0.11"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2SqWdGzSXs53PafXnCvTGQXNJqD+5gdJnaYi2O2ABLg="; + sha256 = "sha256-TMRf9549z3IQzGt5c53Rk1Vq3tdrpZ3Pqc8jhj4AKzo="; }; patches = [ diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch index 05bd212e9a6c..86dfad747d85 100644 --- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5d7862b..c2d06a1 100644 +index d1dd25d..96abc65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake) @@ -7,7 +7,7 @@ index 5d7862b..c2d06a1 100644 FetchContent_Declare( pybind11-src - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.7.1 +- GIT_TAG v2.10.0 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index 525bd1748846..4f6c43a9235a 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.7"; + version = "1.0.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-956517eGqRSLg+Y4ybmASiZoypgpYn/D9lbPA4Rcfts="; + hash = "sha256-ilT7tCdX8ak3qmpXJ0LITf0ZGAdFSN4tm6GKw06A/m8="; }; patches = [ diff --git a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch index 9b49db81fcf5..1bcea2e68b31 100644 --- a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c975128..a9f6910 100644 +index fb92c4d..9fa52ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,8 +31,7 @@ include(FetchContent) @@ -7,7 +7,7 @@ index c975128..a9f6910 100644 FetchContent_Declare( pybind11-src - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 +- GIT_TAG v2.10.0 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix index 8b62a57b306f..b33725d54594 100644 --- a/pkgs/development/python-modules/cinemagoer/default.nix +++ b/pkgs/development/python-modules/cinemagoer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cinemagoer"; - version = "2022.2.11"; + version = "2022.12.27"; src = fetchPypi { inherit pname version; - sha256 = "8efe29dab44a7d275702f3160746015bd55c87b2eed85991dd57dda42594e6c6"; + sha256 = "sha256-uUq/6Uijv6krBNCa5ftBWG/uYLs/5pLyDONLvBoxjYo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix index 0c9a08d33a4f..315fe69b69ad 100644 --- a/pkgs/development/python-modules/ciso8601/default.nix +++ b/pkgs/development/python-modules/ciso8601/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ciso8601"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "closeio"; repo = "ciso8601"; - rev = "v${version}"; - sha256 = "sha256-TqB1tQDgCkXu+QuzP6yBEH/xHxhhD/kGR2S0I8Osc5E="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qTpt91Wf3L6Jl7FU8sn9PvGMRd/cjhQ1mQvUaQeLFQU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index c70350a543de..823ecb87c305 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -12,16 +12,21 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.7.4"; + version = "0.7.5"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; - rev = "v${version}"; - sha256 = "sha256-2OLvVJbqV/wR+Quq0cAlR/vCUe1/Km/nALwfoHD9B+U="; + rev = "refs/tags/v${version}"; + hash = "sha256-zpnUw0ThYbbYS7CYgsi0ZL1qxbY4B1cy2NhrUU9uzig="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "packaging>=23.0" "packaging" + ''; + propagatedBuildInputs = [ cchardet chardet @@ -30,7 +35,9 @@ buildPythonPackage rec { tabview ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "clevercsv" diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 02b6c6fccda7..7d7930b4f8b8 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -1,37 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , backports_csv , configobj , mock -, pytest +, pytestCheckHook +, pygments , tabulate , terminaltables , wcwidth }: buildPythonPackage rec { - pname = "cli_helpers"; + pname = "cli-helpers"; version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; + pname = "cli_helpers"; + inherit version; + hash = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; }; propagatedBuildInputs = [ configobj - terminaltables tabulate - wcwidth - ] ++ (lib.optionals isPy27 [ backports_csv ]); + ] ++ tabulate.optional-dependencies.widechars; - # namespace collision between backport.csv and backports.configparser - doCheck = !isPy27; + passthru.optional-dependencies = { + styles = [ pygments ]; + }; - checkInputs = [ pytest mock ]; - - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + mock + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = with lib; { description = "Python helpers for common CLI tasks"; diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index d0f81a20c6d3..5b8d7728c84f 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "clickgen"; - version = "1.2.0"; + version = "2.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ful1e5"; repo = "clickgen"; - rev = "v${version}"; - sha256 = "sha256-01c8SVy+J004dq5KCUe62w7i/xUTxTfl/IpvUtGQgw0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw="; }; buildInputs = [ libXcursor libX11 libpng ]; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index d8ff545c848e..34c02b3da389 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ow0w56z1DjwhSjnuPmaqLytZV+Kh3jc+F7uo6Yx1AaU="; + sha256 = "sha256-u+6CEnMIRyoxI+0QtSiWFsssQ1B0ZW3QcuVTYwU9CRw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 8e62a08ebf94..5e52ab7c1769 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.10.1"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wLgb7HnDSX3OVCVNlBd97iIg+g0ngaDWk7Jcs5fKc7k="; + hash = "sha256-VAEgrM9F9M/HjL726RzofJT/Sc8R6WIF/D/gZH5ncBs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index ffb9d35d2308..e83e3464ad5d 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.142.3"; + version = "2.0.0"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-Cdnsath9p+LPKKzV4cmoOtl4doahi86l1NIgUwliZRU="; + sha256 = "sha256-Mcdpmrjg5hX4BTlBgt2+jQaoCqWjNIqkBykl1iT7McA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index 1ccae736bddb..702a9906868c 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cloup"; - version = "1.0.1"; + version = "2.0.0.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iQfpz2rl7Y3PJIG2aO+Cu1khx2g68XfOwhkRoENqsTg="; + sha256 = "sha256-FDDJB1Bi4Jy2TNhKt6/l1azSit9WHWqzEJ6xl1u9e2s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 890c20b0d25a..760971957ed7 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "ClusterShell"; - version = "1.8.4"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081"; + sha256 = "sha256-A0arNKF9jPRj3GnnOBHG8xDD2YEPpMrPRbZEaKg8FHQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/clvm-tools-rs/default.nix b/pkgs/development/python-modules/clvm-tools-rs/default.nix index 3d88084169a1..0e82989caadb 100644 --- a/pkgs/development/python-modules/clvm-tools-rs/default.nix +++ b/pkgs/development/python-modules/clvm-tools-rs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "clvm-tools-rs"; - version = "0.1.19"; + version = "0.1.25"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -15,13 +15,13 @@ buildPythonPackage rec { owner = "Chia-Network"; repo = "clvm_tools_rs"; rev = version; - sha256 = "sha256-LQbFBZBLUAjyqIAWIn+N8tUrBMskRoKvMMg5gfTyVU8="; + sha256 = "sha256-s4AeXoLOtEIxCSnW5CWVZoZrAJ+wKQPklEehPAvnHMw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-LcDWpMM+PUElsXO82H6QVOp338+NduC/j3pXQKSni3I="; + sha256 = "sha256-4SjSpEMu6NAPn50u7iyAznTw4AL4+KmBvppMV4+w6Jk="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/clvm-tools/default.nix b/pkgs/development/python-modules/clvm-tools/default.nix index 7de885cc7384..4d4f3631595c 100644 --- a/pkgs/development/python-modules/clvm-tools/default.nix +++ b/pkgs/development/python-modules/clvm-tools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "clvm_tools"; - version = "0.4.5"; + version = "0.4.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_tools"; rev = version; - sha256 = "sha256-7FUZh9w6AM+7l7Br9V/ovS/1H62BLoas5gCrbeMvBAc="; + sha256 = "sha256-MAtVTSv1RR2/7QEKCOEQ+QH5vK4aE0Us2TXyRRAMl8U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index d609508822e4..3d88048ebdc5 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.8.0"; + version = "2022.10.27"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/oWbDpjSIrS0WAIgB9qsJ1fpcPBnHUXlXQGTHBtLs8s="; + sha256 = "sha256-k9msdxbqkBygv9GK47aPH2v1HeCDDD8jPvc0/NUqB5k="; }; propagatedNativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 8c5c8c7afed1..76d7249ca880 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -16,11 +16,12 @@ }: let pname = "cmsis-pack-manager"; - version = "0.4.0"; + version = "0.5.1"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-NeUG6PFI2eTwq5SNtAB6ZMA1M3z1JmMND29V9/O5sgw="; + pname = "cmsis_pack_manager"; + inherit version; + sha256 = "sha256-2pKGJlPubR+C4UhdCuMDR9GG2wQOaP6YkMXxeAcaRkk="; }; native = rustPlatform.buildRustPackage { diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 848fb80ff093..2628c19cb46a 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "coconut"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; - rev = "v${version}"; - sha256 = "sha256-TkMwOE/Jug1zKjR1048o/Jmn8o9/oQPNqzwXYakwpgs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zDMcQPAYlxid3fcMT8kRzE+LN1dxUVWjkg8pdVtmwZg="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 688fc7c367bc..9c06cd2f8b7f 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.7.1"; + version = "1.7.2"; # pypi source doesn't include tests src = fetchFromGitHub { owner = "cocotb"; repo = "cocotb"; - rev = "v${version}"; - sha256 = "sha256-wACgT5r0YmSYvLhTsuFhTcJqeCtGGLifOmr7/Lz2Vug="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-gLOYwljqnYkGsdbny7+f93QgroLBaLLnDBRpoCe8uEg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix index 5d259f250b5f..9ffe55d15fd0 100644 --- a/pkgs/development/python-modules/coincurve/default.nix +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "coincurve"; - version = "17.0.0"; + version = "18.0.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ofek"; repo = "coincurve"; - rev = "v${version}"; - sha256 = "sha256-7H4/TDxteuMTrj1PdfpA5rc7CegJAOjqn1PteImfGiQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Z5g6ten8wNICoFu7+aZc6r8ET+RDmFeb93ONjsTzcbw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 33e7942dfc89..dd675373efa6 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "colorcet"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "21c522346a7aa81a603729f2996c22ac3f7822f4c8c303c59761e27d2dfcf3db"; + sha256 = "sha256-UUVaIDU9EvrJH5U3cthAnyR05qDbGvP6T3AF9AWiSAs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix new file mode 100644 index 000000000000..e047717c8d69 --- /dev/null +++ b/pkgs/development/python-modules/comm/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, traitlets +, pytestCheckHook +}: + +let + pname = "comm"; + version = "0.1.2"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "ipython"; + repo = "comm"; + rev = "refs/tags/${version}"; + hash = "sha256-Ve6tCvu89P5wUOj+vlzXItRR5RjJNKxItKnWP2fVk9U="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + traitlets + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc"; + homepage = "https://github.com/ipython/comm"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} + diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix index 2977051d87b2..03017a536155 100644 --- a/pkgs/development/python-modules/cons/default.nix +++ b/pkgs/development/python-modules/cons/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , logical-unification +, py , pytestCheckHook , pytest-html }: @@ -22,6 +23,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook pytest-html ]; diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix new file mode 100644 index 000000000000..f80f16c51979 --- /dev/null +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build +, pybind11 +, setuptools + +# propagates +, numpy + +# optionals +, bokeh +, chromedriver +, selenium + +# tests +, matplotlib +, pillow +, pytestCheckHook +}: + +let countourpy = buildPythonPackage rec { + pname = "contourpy"; + version = "1.0.6"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "contourpy"; + repo = "contourpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-JbLaQ2NomJlgDmEATa7OmZ749Bezt3tvnt1nOA1aOVw="; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + propagatedBuildInputs = [ + numpy + ]; + + passthru.optional-depdendencies = { + bokeh = [ bokeh chromedriver selenium ]; + }; + + doCheck = false; # infinite recursion with matplotlib, tests in passthru + + checkInputs = [ + matplotlib + pillow + pytestCheckHook + ]; + + passthru.tests = { + check = countourpy.overridePythonAttrs (_: { doCheck = true; }); + }; + + pythonImportsCheck = [ + "contourpy" + ]; + + meta = with lib; { + changelog = "https://github.com/contourpy/contourpy/releases/tag/v${version}"; + description = "Python library for calculating contours in 2D quadrilateral grids"; + homepage = "https://github.com/contourpy/contourpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +}; +in countourpy diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index b96929640806..7c4b4525c8a1 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "6.4.4"; + version = "7.0.1"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4WxFtyast4Dh5viLKG08ELORSrA0OPMhF8SqUtfzDVg="; + sha256 = "sha256-pKV0oZ7rZ1daUyildgu7tzf6poVhZYap+dpCgflAEJw="; }; # No tests in archive diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index a88cc233ad56..b132a0d02a7b 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -5,9 +5,11 @@ , stdenv , libiconv , brotli +, hypothesis , lz4 , memory_profiler , numpy +, py , pytest-benchmark , pytestCheckHook , python-snappy @@ -16,39 +18,52 @@ buildPythonPackage rec { pname = "cramjam"; - version = "2.4.0"; + version = "2.6.2.post1"; format = "pyproject"; src = fetchFromGitHub { owner = "milesgranger"; repo = "pyrus-cramjam"; - rev = "v${version}"; - sha256 = "sha256-00KvbiTf8PxYWljLKTRZmPIAbb+PnBleDM4p0AzZhHw="; + rev = "refs/tags/v${version}"; + hash = "sha256-KU1JVNEQJadXNiIWTvI33N2NSq994xoKxcAGGezFjaI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "sha256-4y/jeEZjVUbaXtBx5l3Hrbnj3iNYX089K4xexRP+5v0="; + hash = "sha256-w1bEf+etLgR/YOyLmC3lFtO9fqAx8z2aul/XIKUQb5k="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; checkInputs = [ brotli + hypothesis lz4 memory_profiler numpy + py pytest-benchmark pytestCheckHook python-snappy zstd ]; - pytestFlagsArray = [ "--benchmark-disable" ]; - pythonImportsCheck = [ "cramjam" ]; + + pytestFlagsArray = [ + "--benchmark-disable" + ]; + + disabledTestPaths = [ + "benchmarks/test_bench.py" + ]; + + pythonImportsCheck = [ + "cramjam" + ]; meta = with lib; { description = "Thin Python bindings to de/compression algorithms in Rust"; diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 228f3bfd63cd..c81f2c733a9f 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -6,17 +6,18 @@ , isPy3k , sqlalchemy , pytestCheckHook +, pytz , stdenv }: buildPythonPackage rec { pname = "crate"; - version = "0.28.0"; + version = "0.29.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-lEELJKIjm4509x9d6n9ee4k81gGmLhy7vliAbZykIpA="; + sha256 = "sha256-SywW/b4DnVeSzzRiHbDaKTjcuwDnkwrK6vFfaQVIZhQ="; }; propagatedBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + pytz ]; disabledTests = [ diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index a75a0c9611b4..0b2f51c551af 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -1,25 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, unittestCheckHook +}: let pname = "crccheck"; - version = "1.1"; + version = "1.3.0"; in buildPythonPackage { inherit pname version; - - checkInputs = [ nose ]; - - src = fetchPypi { - inherit pname version; - sha256 = "45962231cab62b82d05160553eebd9b60ef3ae79dc39527caef52e27f979fa96"; - }; + format = "setuptools"; disabled = !isPy3k; + src = fetchFromGitHub { + owner = "MartinScharrer"; + repo = "crccheck"; + rev = "refs/tags/v${version}"; + hash = "sha256-nujt3RWupvCtk7gORejtSwqqVjW9VwztOVGXBHW9T+k="; + }; + + checkInputs = [ + unittestCheckHook + ]; + meta = with lib; { description = "Python library for CRCs and checksums"; - homepage = "https://sourceforge.net/projects/crccheck/"; - license = licenses.gpl3Plus; + homepage = "https://github.com/MartinScharrer/crccheck"; + license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 559af64fe83e..6b38e0c02dc7 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.3.7"; + version = "1.3.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-cu940PgzfrNTk7iJPr+/vrNA8tKuR+DS14Ew40sN2Lk="; + hash = "sha256-MqXsBOl+wIN7zfATdnq9LnHM7u/TwuFMgECYzlGtbNk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index d5e4af33f601..7f746655c766 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -18,6 +18,7 @@ , pretend , libiconv , iso8601 +, py , pytz , hypothesis }: @@ -28,6 +29,7 @@ in buildPythonPackage rec { pname = "cryptography"; version = "38.0.4"; # Also update the hash in vectors.nix + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { @@ -63,6 +65,7 @@ buildPythonPackage rec { hypothesis iso8601 pretend + py pytestCheckHook pytest-benchmark pytest-subtests diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 4de95b000263..31ace7c48ffd 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "cryptography-vectors"; # The test vectors must have the same version as the cryptography package inherit (cryptography) version; + format = "setuptools"; src = fetchPypi { pname = "cryptography_vectors"; diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 5904f80ac2a2..bb9c16ae744d 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W11t6oGl6wyco58RbIV43UE3eAYMlMH1EZY3FhiQkyU="; + sha256 = "sha256-HM2YTauJ/GiVUEOspOGwPgzynK2YgPbijjunp0sUqlo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cu2qu/default.nix b/pkgs/development/python-modules/cu2qu/default.nix new file mode 100644 index 000000000000..b62b4cb11a77 --- /dev/null +++ b/pkgs/development/python-modules/cu2qu/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build +, cython +, setuptools-scm +, setuptools + +# propagates +, defcon +, fonttools + +# tests +, pytestCheckHook +}: + +let + pname = "cu2qu"; + version = "1.6.7.post2"; +in +buildPythonPackage rec { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HfVi2ZvWBZImCI9ENwK/Uc/djMY2I/IxN0WaeNe/WAg="; + extension = "zip"; + }; + + nativeBuildInputs = [ + cython + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + defcon + fonttools + ] ++ fonttools.optional-dependencies.ufo; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/googlefonts/cu2qu/releases/tag/v${version}"; + description = "Cubic-to-quadratic bezier curve conversion"; + homepage = "https://github.com/googlefonts/cu2qu"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index f286cd4a7f02..b2494e9c17f5 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchPypi, buildPythonPackage, pytest, pytest-html }: +{ lib +, fetchPypi +, buildPythonPackage +, py +, pytestCheckHook +, pytest-html + }: buildPythonPackage rec { pname = "cucumber-tag-expressions"; @@ -9,11 +15,14 @@ buildPythonPackage rec { sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"; }; - checkInputs = [ pytest pytest-html ]; - checkPhase = "pytest tests/*/*.py"; + checkInputs = [ + py + pytestCheckHook + pytest-html + ]; meta = with lib; { - homepage = "https://github.com/cucumber/tag-expressions-python"; + homepage = "https://github.com/cucumber/tag-expressions"; description = "Provides tag-expression parser for cucumber/behave"; license = licenses.mit; maintainers = with maintainers; [ maxxk ]; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 9bc7efafff54..5af0f0813043 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -9,12 +9,12 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "11.2.0"; + version = "11.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-wzNh8RejR6Y/aZbql0RtF/HAOPGh9TPlAkZCNQdpI+I="; + sha256 = "sha256-A9UrJibgKjorRtcUwc0D5wLI/jORX8ym7Y3lxTmWT0k="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index da5f16d7f32d..89b66127636d 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -17,16 +17,21 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.2.1"; + version = "1.2.3"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bWdkJkPR3bLyr1m0Zrh9QsSi42eDGte0PDO1nu+ltQ4="; + hash = "sha256-IaeUtv0vdgqddm1o++SUZTT2Xom3Pom4icVQOYVVi4Y="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools <= 64.0.2" "setuptools" + ''; + propagatedBuildInputs = [ cvxopt ecos diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index fc57df26230a..99be1ee674c1 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cwcwidth"; - version = "0.1.7"; + version = "0.1.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wNZH4S46SxWogeHYT3lpN1FmSEieARJXI33CF51rGVE="; + sha256 = "sha256-WtwDS3yQ5qhYa9BGvL9gBONeFrDX4x3jlVE6UNcpu/Y="; }; nativeBuildInputs = [ cython setuptools ]; diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index cb4f7e074ffa..c039222925e4 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.11.1"; + version = "6.13.1"; src = fetchPypi { pname = "cx_Freeze"; inherit version; - sha256 = "sha256-jzowyeM5TykGVeNG07RgkQZWswrGNHqHSZu1rTZcbnw="; + sha256 = "sha256-9pT1Ta8pLpc9krFN8KLp3b10IGyvMjiaU3Cn4eVAiaQ="; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index f01011156273..6292bf259ef4 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -7,25 +7,34 @@ buildPythonPackage rec { pname = "cymem"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "explosion"; repo = "cymem"; - rev = "v${version}"; - sha256 = "sha256-o+44v6wvE9HxeQaDDQ0+gi7z1V7jtkZvWglY8UyVHLg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lYMRFFMS+ETjWd4xi12ezC8CVLbLJfynmOU1DpYQcck="; }; propagatedBuildInputs = [ cython ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; preCheck = '' - cd cymem + TEMPDIR=$(mktemp -d) + cp -R cymem/tests $TEMPDIR/ + pushd $TEMPDIR ''; + postCheck = '' + popd + ''; + + meta = with lib; { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 42305b455799..85b8c7a11e07 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.12.0"; + version = "0.12.1"; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-wQWwX4XgP7zWAkQ3WWjmLkT+eYwVo1Mcki1TEBjSJBI="; + sha256 = "sha256-/DOQk5dIHJDePOyDG/uI2X4iDckZOdmWkgIC8YS0ZI4="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index 96a4eccbc582..14c2ef9223ec 100644 --- a/pkgs/development/python-modules/dasbus/default.nix +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dasbus"; - version = "1.6"; + version = "1.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FJrY/Iw9KYMhq1AVm1R6soNImaieR+IcbULyyS5W6U0="; + hash = "sha256-qIUNhBrf6O5fe7n4LPRJq5tJUNwGM4lwcXGODQA2tvY="; }; propagatedBuildInputs = [ pygobject3 ]; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 232cfb0b7f7d..6933af850a54 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.6.2"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-d2p3ahOqBA4n8XhMR6juluEGNM5EyT+GQFlDcuHZMqs="; + hash = "sha256-kxat6CjX4xPEtlhRiYJF5wN2Luds7DduZyiUA9/kKWY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index f5edffd3e442..78311fb6e30f 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "databases"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3zgHfYGiO2xWualLa4h8A85qjC32ILadw/47Ul1GTmM="; + hash = "sha256-3RRHXkM8/GoIcO6Y1EZGbnp/X5gzYkW/PV4bzGay6ZI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 92bbb9f54db2..fa90f3d72fa1 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "10.4.12"; + version = "10.4.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-T5KGJQryiE2+x9u+AcvTm6dLpU3kh20sCu0CTwpeJao="; + sha256 = "sha256-7lP9pn05EaGLZpaAp+oeed4yLhIjo6/wQg+lDpt1Hwg="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index b9f5561ebe60..d5a765da18bc 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.0.5"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; - rev = "v${version}"; - sha256 = "sha256-Qpdyn6z1mbO4bzyUZ2eYdd9pfIkIP/Aj4YgNXaYwxpE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EMLUXGeVGIXFeaMvaJ+crivRZtOt7W/LCycIO2gwqXA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 950afaabb8dc..e43e8806d655 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.1.4"; + version = "1.1.5"; disabled = pythonOlder "3.7"; @@ -30,8 +30,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scrapinghub"; repo = "dateparser"; - rev = "v${version}"; - sha256 = "sha256-r13WNI+T2NtTwjnGOqX3ZOqPhvr8fBdXGULW7IXszlo="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-uA49pRlmSWWIOjXa1QDjjuTGMKi25GfokQo4VQsBMlc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 6c85d0def6e8..10cf43f4f648 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.99.2"; + version = "0.99.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0="; + hash = "sha256-lAJypyrCfRah22mq/vggaEASzDVT/+mHXVzS46nLadw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index f53a895141e1..5bb53995c0ff 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.82.0"; + version = "1.83.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-mJJElYWTN09zVkx36GqPoILdALAo+fO2JlX4n0dmQ5M="; + rev = "refs/tags/v${version}"; + hash = "sha256-hfO4dbMA6efQPwP0Bp/5IDb7mLHf1NuTuiJjhHivG6I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix index 148599fe1666..2c685abf8066 100644 --- a/pkgs/development/python-modules/deepmerge/default.nix +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "deepmerge"; - version = "1.0.1"; + version = "1.1.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-S0R3ntPS+3kbsYH8JoNCNJb+pCirt683/rIyht5/Cho="; + sha256 = "sha256-TCeg213iheGnzqx9vBUx3qpVa2J96kkAyCRFgezf6i0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 21bb275918dd..4f3cc587fdc5 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.7.0"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O015TOlvFcN7hxwV4SgGmo6vanMuWb+i9KZOYhYZLJM="; + sha256 = "sha256-Y4LSWo6sbHn239qSdQjwfZO4cyNyoGFQVVGvZbRgYfQ="; }; postPatch = '' @@ -26,6 +26,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook ]; diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index a6cc42dfe962..f8aa63d7a22f 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python's missing debug print command and other development tools"; homepage = "https://python-devtools.helpmanual.io/"; + changelog = "https://github.com/samuelcolvin/python-devtools/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jdahm ]; }; diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index 49fd55545178..46c4a8928a54 100644 --- a/pkgs/development/python-modules/diagrams/default.nix +++ b/pkgs/development/python-modules/diagrams/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "diagrams"; - version = "0.22.0"; + version = "0.23.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mingrammer"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-LUuClvBJeOxtrg+S+lYLpP7T1RXCy5dNjFYQO3H54QE="; + sha256 = "sha256-gVUlP3offTgHUBTTIzTBf7b2NpBjGlAHYQQxe6ks0v8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dictpath/default.nix b/pkgs/development/python-modules/dictpath/default.nix index 5a648f7898f5..d6effb6291d6 100644 --- a/pkgs/development/python-modules/dictpath/default.nix +++ b/pkgs/development/python-modules/dictpath/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "dictpath"; - version = "0.1.3"; + version = "0.4.3"; src = fetchFromGitHub { owner = "p1c2u"; repo = "dictpath"; - rev = version; - sha256 = "0314i8wky2z83a66zggc53m8qa1rjgkrznrl2ixsgiq0prcn6v16"; + rev = "refs/tags/${version}"; + sha256 = "sha256-4QRFjbeaggoEPVGAmSY+qVMNW0DKqarNfRXaH6B58ew="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix index 9e24784731cf..c4fd5880526a 100644 --- a/pkgs/development/python-modules/dicttoxml/default.nix +++ b/pkgs/development/python-modules/dicttoxml/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dicttoxml"; - version = "1.7.4"; + version = "1.7.16"; src = fetchPypi { inherit pname version; - sha256 = "ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45"; + sha256 = "sha256-bzbOZEiB21zYlAvum3yz8/a3sye6imfYPT4sqgU4v50="; }; # No tests in archive diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix index 0a448b8de7f8..b33591e8d0f9 100644 --- a/pkgs/development/python-modules/dirty-equals/default.nix +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , pytestCheckHook , pythonOlder , pytz @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dirty-equals"; - version = "0.4"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,17 +18,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; - rev = "v${version}"; - hash = "sha256-rh7N/VRx4sv/MhhGPkaYCn2d19Sv5er2CkG6/fJuXX4="; + rev = "refs/tags/v${version}"; + hash = "sha256-yYptO6NPhQRlF0T2eXliw2WBms9uqTZVzdYzGj9pCug="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; propagatedBuildInputs = [ pytz - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 6b7f535e5152..ad069f589271 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.10.2"; + version = "2022.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-U/Clv276uaWrM0XNkT9tPz1OpETuLtvqMxx/75b9Z9A="; + hash = "sha256-h/7c+/ISbRTDhlyORFxB7Mq9Kwfq/4dSivKv2eIM7Ww="; }; postPatch = '' diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index deee452ae1b4..73ded7625dca 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,14 +1,23 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, setuptools +}: buildPythonPackage rec { pname = "distro"; - version = "1.7.0"; + version = "1.8.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FRrsz2DCFkApMrUuQO5HepOfjViJiSc3igKrvoUsHDk="; + hash = "sha256-AuER0dxqUKu47ta/McPkjtiwgw0eoqG3jGF2XCUT/dg="; }; + nativeBuildInputs = [ + setuptools + ]; + # tests are very targeted at individual linux distributions doCheck = false; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 7936df01bd01..aca3c6735c07 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "8.6"; + version = "9.0"; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hLNILUV7qzqHfh7l3SJAoFveUIRSCHTjEQ3ZC3PhZUY="; + sha256 = "sha256-qEYBHsaHo1gmrsa6q7DQiUJurC7cXhv5e/SQ7R3Tkzc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index bc54eadde8f7..22b7c8caf752 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -3,6 +3,7 @@ , pythonOlder , buildPythonPackage , python +, hatchling , django , jinja2 , sqlparse @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.7"; - format = "setuptools"; + version = "3.8.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +21,13 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LGEx21m5TNotbwKHf5in+EDkYqqNOoF7mBstnfLYe9s="; + hash = "sha256-GlEw25wem8iwwm3rYLk6TFEAIzC1pYjpSHdAkHwtFcE="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ django jinja2 diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index 6f38ae77e16a..65fea1786943 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "django-health-check"; - version = "3.16.5"; + version = "3.17.0"; src = fetchFromGitHub { owner = "KristianOellegaard"; repo = pname; - rev = version; - hash = "sha256-Jfzi+o4ja2sNCSPfX9eRq3WGid1gcfehhayAD1L4f2U="; + rev = "refs/tags/${version}"; + hash = "sha256-f87dgB2pDc+A0h41FX13qTj6Zzw5I4QwsDoC6yPkvAE="; leaveDotGit = true; }; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 9486764e2783..081b6bbbcb7e 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.7"; + version = "1.3.8"; src = fetchPypi { inherit pname version; - sha256 = "6ea8c24c13e7afe744f18e18e4d19d0e74223e0d9bd5d782deea85dcb865feb7"; + sha256 = "sha256-C3ZyiQZ50JFg2e+HS0oIJFK+dV8TcDYehVh875zBRFU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix index d22ae9025f8b..558f0c103388 100644 --- a/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-maintenance-mode"; - version = "0.17.1"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/JMdElJsl7f6THUIvp28XcsoP/5Sa31XzGl3PZFPAH8="; + hash = "sha256-Mcj8O20hCINGf5T3PCG9jq0onSrm4R+Ke5CLMqMDmuU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix index 8af5e8fee892..a185a94aff94 100644 --- a/pkgs/development/python-modules/django-phonenumber-field/default.nix +++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stefanfoulis"; repo = pname; - rev = "refs/tags/v${version}"; + rev = "refs/tags/${version}"; hash = "sha256-rrJTCWn1mFV4QQu8wyLDxheHkZQ/FIE7mRC/9nXNSaM="; }; diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix index c1605a93d39e..bfce8141f473 100644 --- a/pkgs/development/python-modules/django-rest-registration/default.nix +++ b/pkgs/development/python-modules/django-rest-registration/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "apragacz"; repo = pname; - rev = "refs/tags/v${version}"; + rev = "refs/tags/${version}"; hash = "sha256-JoIeVjl5s60ilq9kU28Jo+GaYRKU61hoqy1GzYmMdZQ="; }; diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index ebdbd916ef1d..d0894177c3f9 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-4oc3zco/j4lnAiooW87rU6xkzGSGCj3fIyikjiKQNZk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Na/GeQc74LCoi7Dp3HcSnmUaLi1EjyYYgZTcFyzqOQM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index a03ed9aae01a..0ecb78f47546 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "1.12.0"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6os10NpJ97LumaeRJfGUPgM0Md0RRybWZDzDXeYZIw4="; + sha256 = "sha256-vMYYujU9q8VA2YK52sHVoZIWUvj8KhNlPVRaV9XjzA8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix index 9a8a7c5e4617..34bb765cff5c 100644 --- a/pkgs/development/python-modules/django-vite/default.nix +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MrBin99"; repo = pname; - rev = "refs/tags/v${version}"; + rev = "refs/tags/${version}"; hash = "sha256-lYRFNHTIQBn7CDnWFxSzXELzqEtQcbwHedSZnR7ZtbE="; }; diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 67d6035696ed..7b5b6c67cff4 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8="; + hash = "sha256-puZ5gF6WB7Bz7lJwLZtCa6waVGCdlmExqkNMeGAqwFA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index c6b56651f927..4242c24c90bf 100644 --- a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -2,19 +2,25 @@ , buildPythonPackage , fetchFromGitHub , djangorestframework +, setuptools }: buildPythonPackage rec { pname = "djangorestframework-dataclasses"; - version = "1.1.1"; + version = "1.2.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "oxan"; repo = "djangorestframework-dataclasses"; - rev = "v${version}"; - sha256 = "sha256-wXgA/4Dik6yG0nKl9GbrHgb2lhrPsgS23+cEyaD9MRY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc="; }; + nativeBuildInputs = [ + setuptools + ]; + postPatch = '' patchShebangs manage.py ''; diff --git a/pkgs/development/python-modules/dm-env/default.nix b/pkgs/development/python-modules/dm-env/default.nix index 92c234c215c3..37e645c1ec35 100644 --- a/pkgs/development/python-modules/dm-env/default.nix +++ b/pkgs/development/python-modules/dm-env/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "dm-env"; - version = "1.5"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Pv2ZsGUlY1mVB8QV1ItRiWyIvi8BwrYlCvi6tRVx41M="; + sha256 = "sha256-pDbrHGVMOeDJhqUWzuIYvqcUC1EPzv9j+X60/P89k94="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 87de983330c2..c756ff67a138 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; - rev = "v${version}"; - hash = "sha256-Qa3g3vOPZJt/wBjjuZHAcFUz/gwN/yvirV/8V9CnIko="; + rev = "refs/tags/v${version}"; + hash = "sha256-d5THbfMRrbBL/2sQ99l2yeaTI9gT+bSkcxmVdRJT5bA="; }; outputs = [ diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix index 1b9437096648..837895dcd8ca 100644 --- a/pkgs/development/python-modules/dm-tree/default.nix +++ b/pkgs/development/python-modules/dm-tree/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "dm-tree"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "deepmind"; repo = "tree"; - rev = version; - hash = "sha256-rg6dcGcbTGfK3h4WAyhwCjgM3o64Jj2SImxNsZXJHHM="; + rev = "refs/tags/${version}"; + hash = "sha256-VvSJTuEYjIz/4TTibSLkbg65YmcYqHImTHOomeorMJc="; }; patches = [ diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 5f64ee3a6fe7..3a7c5f74a439 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.23.222"; + version = "2.24.232"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "sha256-c5XpfEGTkojgzk+ATHCSzzh04zeEVJEEKBp+lPfS+x4="; + sha256 = "sha256-Mo4Ih/2ltIonP37BDyCi0fY2bkPt2ij1F0A1Ws1sF1g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index b6f0176dd737..acc8d75e000e 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -4,26 +4,26 @@ , hypothesis , isPy27 , mock -, nose +, nose2 , pytestCheckHook }: buildPythonPackage rec { pname = "dpath"; - version = "2.0.6"; + version = "2.1.3"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-Wh3a5SIz+8jvgbFfuFBzqBEmu0NpjT86G2qvVhpGzcA="; + sha256 = "sha256-0aeg5kJ9CkFWx5LILK8fAQlgP2is55LjbKRZb9LLjZ0="; }; # use pytest as nosetests hangs checkInputs = [ hypothesis mock - nose + nose2 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix index 77ce7d37ff8d..eaf5aa1b9e1f 100644 --- a/pkgs/development/python-modules/drf-writable-nested/default.nix +++ b/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "drf-writable-nested"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "beda-software"; repo = "drf-writable-nested"; - rev = "v${version}"; - sha256 = "sha256-RybtXZ5HipQHaA2RV6TOKIpl6aI9V49mqXDhCH6lg58="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/7MZAw0clzzlBdYchUVKldWT7WqtwdSe+016QAP0hqk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index a081a7445c4a..8595c8c1cadd 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "drms"; - version = "0.6.2"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; + sha256 = "sha256-crPVo7ALErZWvNcsaJ/BuBa0VkfCsZ+C929x4kEZHKw="; }; nativeBuildInputs = [ @@ -38,6 +38,14 @@ buildPythonPackage rec { pytest-doctestplus ]; + disabledTests = [ + "test_query_hexadecimal_strings" + ]; + + disabledTestPaths = [ + "docs/tutorial.rst" + ]; + pythonImportsCheck = [ "drms" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 125e61a89d28..6355ed16b9bd 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.35.0"; + version = "11.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vrOqsRe2sBsL5CIfGCmoO3geE9G0FJl88HRcP6FzZe0="; + hash = "sha256-J2AaGkD4TMDcVzTtdcNH0bgy6de+BRjYdtTaRL3lYrs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index 883ea432cd22..16d85a93b0cb 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "0.34"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ndokter"; repo = "dsmr_parser"; - rev = "v${version}"; - sha256 = "sha256-GO+lSgTmFgi/ljt99mteoot+p5BJnGb6ZFky5I3I6Io="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UjwrlNPnv/iBFiX65tcOZjkdC7gZsJzxxCtPdYTdl6Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 65a9f4b0dcb0..e8866b7a1d73 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -7,11 +7,12 @@ , packaging , pytestCheckHook , setuptools +, git }: buildPythonPackage rec { pname = "dunamai"; - version = "1.13.1"; + version = "1.15.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UoqVfRdwOgxNLY17+dPgYO1GIPw3ZUwE/tiVzHjBxcY="; + sha256 = "sha256-dqMI51UHbkyfkxAPojRlS6qew2Ob4LbUkYua6zmcQgc="; }; nativeBuildInputs = [ @@ -36,9 +37,14 @@ buildPythonPackage rec { # needs to be able to run dunami from PATH preCheck = '' export PATH=$PATH:$out/bin + export HOME=$(mktemp -d) + + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" ''; checkInputs = [ + git pytestCheckHook setuptools ]; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index f5fc366c5f58..db7a8fe62fc1 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.1.13"; + version = "0.28.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dKqn7dMwPxKnLLBPJGgmD/2MFzdzrw7W9+w9Zi/9hsA="; + hash = "sha256-ocwOIhguH460+HJ0sE5Wj+KOiyG4NprJ+QaO+YtfTGU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 7e6a37a12d90..ec02d79b3ab8 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.1.7"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Edp2MRhe/eTUosL4XQfVbtwFWBg3D5RDWRb6r1C4MgE="; + hash = "sha256-Refpekyr114mIGvbaAynxldA+s83EtALeLoTQO73b/M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 3b85d63e8bba..d8996ef8a4cb 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "0.0.9"; + version = "0.0.17"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZUIyNg+PTj5CWC65RqB1whnB+pUp1yNJQj43iSBcyvU="; + hash = "sha256-GDfrkcKP/EZZ/ONZ2Afoxj4Q8sp8mRmtZf93kXcNQcg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 6c9eb60c6c54..18cf6e572f8c 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-task"; - version = "0.1.2"; + version = "0.1.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = pname; - rev = version; - hash = "sha256-LXjfFuLifgzU+3/EevycVCR7LhYBOoN6xg4YeNo5R4M="; + rev = "refs/tags/${version}"; + hash = "sha256-+v1M8bKcHWUTz4DJ85tB1qdFYKI0k8TS/Dvf166o920="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 1507156112d1..ffa8d68e0bdd 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "0.10.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8="; + hash = "sha256-FAupTvaOLPp5EQ0vvE8tQCa8WnKW/qrQTc7i+6F7F1A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 4e220ba64667..796213693286 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "edalize"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "olofk"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-fpUNCxW7+uymodJ/yGME9VNcCEZdBROIdT1+blpgkzA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-h6b0mdAUR4NsN2SpnLu5OgS9Fy9ZRitG+5Sbon1jlUM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix index 41d4a5003424..a01a505dde83 100644 --- a/pkgs/development/python-modules/editdistance/default.nix +++ b/pkgs/development/python-modules/editdistance/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "editdistance"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "roy-ht"; repo = pname; - rev = "v${version}"; - hash = "sha256-c0TdH1nJAKrepatCSCTLaKsDv9NKruMQadCjclKGxBw="; + rev = "refs/tags/v${version}"; + hash = "sha256-42PEK2KhR7rZLfNX9T45V6on+5CoINfKvntz/YQBJco="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index 44b380e10328..0e7f83f92ead 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "einops"; - version = "0.4.1"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arogozhnikov"; repo = pname; - rev = "v${version}"; - hash = "sha256-n4R4lcRimuOncisCTs2zJWPlqZ+W2yPkvkWAnx4R91s="; + rev = "refs/tags/v${version}"; + hash = "sha256-/bnp8IhDxp8EB/PoW5Dz+7rOru0/odOrts84aq4qyJw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 95c201afc4cd..0aa5c6583784 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "2.5.3"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-+NCsWPt5yMXe+GR9nEBU7byYhKrH/6xghQioj9AOGm4="; + hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index a5a87f908d4f..d5eac46926ca 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.1.3"; + version = "4.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-f6GGhZgbpSjt1QQFKp1SEqCapb8VwRpzTtxqhuiotWo="; + sha256 = "sha256-c6WfDSFi0WJFNcPDt1+VZVa9uyBV6vVUp77xR9P5x2A="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index d40bf842fdb5..10f9b3517215 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0dWve9nHhKJzxOHsz6qP6speBIGghxe1MT+iMdoiqQM="; + hash = "sha256-SJED6eSZpWZ2XGBFjuFdGFzwBl8gYKTRamj49Gli7Q0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix index 5ad7696ae1cf..d2785519bf84 100644 --- a/pkgs/development/python-modules/etuples/default.nix +++ b/pkgs/development/python-modules/etuples/default.nix @@ -3,19 +3,20 @@ , fetchFromGitHub , cons , multipledispatch +, py , pytestCheckHook , pytest-html }: buildPythonPackage rec { pname = "etuples"; - version = "0.3.5"; + version = "0.3.8"; src = fetchFromGitHub { owner = "pythological"; repo = "etuples"; - rev = "v${version}"; - sha256 = "sha256-gJNxrO2d/eF4t3bBlz/BwF+9eT1nKrVrTP3F6/dEN00="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wEgam2IoI3z75bN45/R9o+0JmL3g0YmtsuJ4TnZjhi8="; }; propagatedBuildInputs = [ @@ -24,6 +25,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook pytest-html ]; diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 865e14f8e506..54139f48a669 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -4,6 +4,7 @@ , flit-scm , pytestCheckHook , pythonOlder +, pythonAtLeast }: buildPythonPackage rec { @@ -26,6 +27,8 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; + doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 0c75727e7445..db6e9489683e 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -2,23 +2,30 @@ , buildPythonPackage , isPyPy , fetchPypi +, fetchpatch , pytestCheckHook , setuptools-scm , apipkg +, py }: buildPythonPackage rec { pname = "execnet"; version = "1.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"; }; - checkInputs = [ pytestCheckHook ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ apipkg ]; + patches = [ + (fetchpatch { + # Fix test compat with pytest 7.2.0 + url = "https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch"; + hash = "sha256-AT2qr7AUpFXcPps525U63A7ARcEVmf0HM6ya73Z2vi0="; + }) + ]; # remove vbox tests postPatch = '' @@ -29,14 +36,30 @@ buildPythonPackage rec { ${lib.optionalString isPyPy "rm -v testing/test_multi.py"} ''; - pythonImportsCheck = [ "execnet" ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + apipkg + ]; + + checkInputs = [ + py + pytestCheckHook + ]; + + pythonImportsCheck = [ + "execnet" + ]; __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/pytest-dev/execnet/blob/v${version}/CHANGELOG.rst"; description = "Distributed Python deployment and communication"; - license = licenses.mit; homepage = "https://execnet.readthedocs.io/"; + license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 0c7cbf276318..1201ffaff170 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -2,11 +2,12 @@ , asttokens , buildPythonPackage , fetchFromGitHub -, setuptools-scm -, pytestCheckHook , littleutils +, pytestCheckHook , pythonAtLeast +, pythonOlder , rich +, setuptools-scm }: buildPythonPackage rec { @@ -14,25 +15,25 @@ buildPythonPackage rec { version = "1.2.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3M3uSJ5xQ5Ciy8Lz21u9zjju/7SBSFHobCqSiJ6AP8M="; + hash = "sha256-3M3uSJ5xQ5Ciy8Lz21u9zjju/7SBSFHobCqSiJ6AP8M="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; - checkInputs = [ - pytestCheckHook asttokens littleutils + pytestCheckHook ] ++ lib.optionals (pythonAtLeast "3.11") [ rich ]; diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 610d9b0b096c..b54860cc8632 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -1,8 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, coloredlogs, property-manager, fasteners, pytestCheckHook, mock, virtualenv }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, coloredlogs +, humanfriendly +, property-manager +, fasteners +, six +, pytestCheckHook +, mock +, virtualenv +}: buildPythonPackage rec { pname = "executor"; version = "23.2"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { @@ -12,9 +25,19 @@ buildPythonPackage rec { sha256 = "1mr0662c5l5zx0wjapcprp8p2xawfd0im3616df5sgv79fqzwfqs"; }; - propagatedBuildInputs = [ coloredlogs property-manager fasteners ]; + propagatedBuildInputs = [ + coloredlogs + humanfriendly + property-manager + fasteners + six + ]; - checkInputs = [ pytestCheckHook mock virtualenv ]; + checkInputs = [ + pytestCheckHook + mock + virtualenv + ]; # ignore impure tests disabledTests = [ @@ -28,6 +51,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/xolox/python-executor/blob/${version}/CHANGELOG.rst"; description = "Programmer friendly subprocess wrapper"; homepage = "https://github.com/xolox/python-executor"; license = licenses.mit; diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 0a8db8611921..2134c10f6154 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -58,6 +58,8 @@ buildPythonPackage rec { "test_get_extractor_qcow2" # WARNING patch:patch.py:450 inconsistent line ends in patch hunks "test_patch_info_patch_patches_windows_plugin_explorer_patch" + # AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]] + "test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 407083e4f691..e3168c863bce 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { "MongoEngineTestCase" ]; + disabledTestPaths = [ + # incompatible with latest flask-sqlalchemy + "examples/flask_alchemy/test_demoapp.py" + ]; + pythonImportsCheck = [ "factory" ]; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 9b207a81c3c7..5c3db0e4d1ba 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -1,17 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, six, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, importlib-metadata +, importlib-resources +, setuptools +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "fake-useragent"; - version = "0.1.11"; + version = "1.1.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161"; + src = fetchFromGitHub { + owner = "fake-useragent"; + repo = "fake-useragent"; + rev = "refs/tags/${version}"; + hash = "sha256-MKVJM8bduvA03xzL954huoCge7enG2BJtxZEAvo6HIY="; }; - propagatedBuildInputs = [ six ]; + postPatch = '' + sed -i '/addopts/d' pytest.ini + ''; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Up to date simple useragent faker with real world database"; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 9b8e6f7574a1..16ce62cde8b9 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "14.2.0"; + version = "15.3.4"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-bbVuLEOit0JQ0cMy7yX+99wH3LbF+rUynde0RnuO17k="; + hash = "sha256-LVRDck9kDOB2WMqMqLvUDSa1iRTmPuxlSXJ4aapn4sw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 89d047e968aa..0ade6a2718ca 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -28,15 +28,15 @@ buildPythonPackage rec { pname = "falcon"; - version = "3.1.0"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "falconry"; repo = pname; - rev = version; - hash = "sha256-Y6bD0GCXhqpvMV+/i1v59p2qWZ91f2ey7sPQrVALY54="; + rev = "refs/tags/${version}"; + hash = "sha256-5Lhz4qI/x7yK9tqQg4CvYNug+fp9l6ErNGH1pVybZ6c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index f42188fb13ee..ed9e9c5aa216 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.85.2"; + version = "0.88.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j3Set+xWNcRqbn90DJOJQhMrJYI3msvWHlFvN1habP0="; + hash = "sha256-2rjKmQcehqkL5OnmtLRTvsyUSpK2aUgyE9VLvz+oWNw="; }; nativeBuildInputs = [ @@ -84,6 +84,8 @@ buildPythonPackage rec { "test_head" "test_options" "test_trace" + # Unexpected number of warnings caught + "test_warn_duplicate_operation_id" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index a790f1623817..9ad4c8296372 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -1,4 +1,13 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, wasmer +, wasmer-compiler-cranelift +, py +, pytestCheckHook +, pytest-benchmark +}: buildPythonPackage rec { pname = "fastdiff"; @@ -16,11 +25,24 @@ buildPythonPackage rec { --replace "collect_ignore = ['setup.py']" "" ''; - propagatedBuildInputs = [ wasmer wasmer-compiler-cranelift ]; + propagatedBuildInputs = [ + wasmer + wasmer-compiler-cranelift + ]; - checkInputs = [ pytestCheckHook pytest-benchmark ]; + checkInputs = [ + py + pytestCheckHook + pytest-benchmark + ]; - pythonImportsCheck = [ "fastdiff" ]; + pytestFlagsArray = [ + "--benchmark-skip" + ]; + + pythonImportsCheck = [ + "fastdiff" + ]; meta = with lib; { description = "A fast native implementation of diff algorithm with a pure Python fallback"; diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index b5880a21b70e..13e2055cd70d 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -5,20 +5,27 @@ , tqdm , pytestCheckHook , ffmpeg +, procps }: buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.3.0"; + version = "0.6.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/FkVzssJZYafn3MlN8bODd7kA917x9oW0JivIOWxl+8="; + hash = "sha256-JLwvJcYcSe5Z7In34pQqHptd8TCrXJeJ6zPiGGv4T14="; }; propagatedBuildInputs = [ colorama tqdm ]; - checkInputs = [ pytestCheckHook ffmpeg ]; + checkInputs = [ pytestCheckHook ffmpeg procps ]; + + disabledTests = [ + "test_quit" + "test_quit_gracefully" + ]; pytestFlagsArray = [ "test/test.py" ]; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 7afb72545147..5aee39a459bd 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -1,25 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, hatch-vcs +, hatchling , pytestCheckHook , pythonOlder -, setuptools-scm }: buildPythonPackage rec { pname = "filelock"; - version = "3.8.0"; + version = "3.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VUR8qmZvIZjFtrE6JtIITSb6WxFcANBlZkshJGgMTtw="; + hash = "sha256-ezGfJDQLUfVaK/ehKsB1WpsD5xgxHaxWeg9Pf6vS9d4="; }; nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling ]; checkInputs = [ @@ -27,6 +29,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/tox-dev/py-filelock/releases/tag/${version}"; description = "A platform independent file lock for Python"; homepage = "https://github.com/benediktschmitt/py-filelock"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index bec959979353..b85f82d6115a 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -4,7 +4,7 @@ , six , hypothesis , mock -, python-Levenshtein +, levenshtein , pytestCheckHook , termcolor , pythonOlder @@ -32,7 +32,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis mock - python-Levenshtein + levenshtein pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 699d37770a36..91bab299743e 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "flake8-future-import"; - version = "0.4.6"; + version = "0.4.7"; # PyPI tarball doesn't include the test suite src = fetchFromGitHub { owner = "xZise"; repo = "flake8-future-import"; - rev = version; - sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z"; + rev = "refs/tags/${version}"; + sha256 = "sha256-2EcCOx3+PCk9LYpQjHCFNpQVI2Pdi+lWL8R6bNadFe0="; }; patches = lib.optionals (pythonAtLeast "3.10") [ diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix index 6f82b8dd50be..ab8b5e77fa39 100644 --- a/pkgs/development/python-modules/flake8-length/default.nix +++ b/pkgs/development/python-modules/flake8-length/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "flake8-length"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6e3c068005b0b3b5c8345923fe3e9a107c980baa1354dd19d820018f87409427"; + sha256 = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 275b4507fb3b..f2288c883b23 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -4,6 +4,7 @@ , flask , limits +, ordered-set , rich , typing-extensions @@ -18,18 +19,30 @@ buildPythonPackage rec { pname = "Flask-Limiter"; - version = "2.6.2"; + version = "3.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "alisaifee"; repo = "flask-limiter"; - rev = version; - sha256 = "sha256-JjksKwSMWzcslXCs977/Wlq1wDMaACxm8e6Ub+r3wPg="; + rev = "refs/tags/${version}"; + hash = "sha256-eAJRqyAH1j1NHYfagRZM2fPE6hm9+tJHD8FMqvgvMBI="; }; + postPatch = '' + substituteInPlace requirements/main.txt \ + --replace "rich>=12,<13" "rich" + + sed -i "/--cov/d" pytest.ini + + # flask-restful is unmaintained and breaks regularly, don't depend on it + sed -i "/import flask_restful/d" tests/test_views.py + ''; + propagatedBuildInputs = [ flask limits + ordered-set rich typing-extensions ]; @@ -44,13 +57,6 @@ buildPythonPackage rec { pymongo ]; - postPatch = '' - sed -i "/--cov/d" pytest.ini - - # flask-restful is unmaintained and breaks regularly, don't depend on it - sed -i "/import flask_restful/d" tests/test_views.py - ''; - disabledTests = [ # flask-restful is unmaintained and breaks regularly "test_flask_restful_resource" diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 6f7c83010eb1..f68b41e45b69 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -10,6 +10,7 @@ , faker , mock , blinker +, py , pytest-flask , pytest-mock , pytest-benchmark @@ -43,6 +44,7 @@ buildPythonPackage rec { blinker faker mock + py pytest-benchmark pytest-flask pytest-mock diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index c7cc7351e66e..fac30ca41558 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pdm-pep517 , flask , mock , sqlalchemy @@ -9,13 +10,18 @@ buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.5.1"; + version = "3.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; + hash = "sha256-FhmfWz3ftp4N8vUq5Mdq7b/sgjRiNJ2rshobLgorZek="; }; + nativeBuildInputs = [ + pdm-pep517 + ]; + propagatedBuildInputs = [ flask sqlalchemy diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index d9171d14e41d..450f8066789e 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-fZiODo+izOwGjCCTvi11GvUG/VQL1DV9bNXKjvIIw4A="; + sha256 = "sha256-4BYfrwEddA2LCMyDO6PBBYdMVTqqDxhzMCZ5JIIml3g="; }; buildInputs = [ jaxlib ]; diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix index 494df272445f..2a209f2b7cd8 100644 --- a/pkgs/development/python-modules/flit-scm/default.nix +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitLab , pythonOlder -, git , flit-core , setuptools-scm , tomli @@ -11,19 +10,37 @@ buildPythonPackage rec { pname = "flit-scm"; version = "1.7.0"; - format = "pyproject"; src = fetchFromGitLab { owner = "WillDaSilva"; repo = "flit_scm"; - rev = version; - sha256 = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg="; - leaveDotGit = true; + rev = "refs/tags/${version}"; + hash = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg="; }; - nativeBuildInputs = [ flit-core setuptools-scm tomli git ]; - propagatedBuildInputs = [ flit-core setuptools-scm ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + flit-core + setuptools-scm + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + propagatedBuildInputs = [ + flit-core + setuptools-scm + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + pythonImportsCheck = [ + "flit_scm" + ]; + + + doCheck = false; # no tests meta = with lib; { description = "A PEP 518 build backend that uses setuptools_scm to generate a version file from your version control system, then flit to build the package."; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 598905d97ffa..436b65c633c1 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -7,7 +7,6 @@ , testpath , responses , flit-core -, tomli , tomli-w }: @@ -18,14 +17,14 @@ buildPythonPackage rec { pname = "flit"; - version = "3.7.1"; + version = "3.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - sha256 = "sha256-zKgaeK3fskz2TuHvIWlxBrdZIWfIJHhaqopZ3+V36wY="; + hash = "sha256-iXf9K/xI4u+dDV0Zf6S08nbws4NqycrTEW0B8/qCjQc="; }; nativeBuildInputs = [ @@ -36,7 +35,6 @@ buildPythonPackage rec { docutils requests flit-core - tomli tomli-w ]; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 9b8f3c080bae..5ad86c3ef8b5 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "folium"; - version = "0.12.1.post1"; + version = "0.14.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "python-visualization"; repo = "folium"; - rev = "v${version}"; - sha256 = "sha256-4UseN/3ojZdDUopwZLpHZEBon1qDDvCWfdzxodi/BeA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; }; patches = [ diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 87fc01f83df9..1d9c08a81c12 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "fontmake"; - version = "3.4.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g/JTmYE078qAFcTVCumVvGj65LbnDsCIUsFfqVlihTk="; + sha256 = "sha256-njJArNq7nhdoq0Si3+RUDE+VJSwuUvk+e7WeuNaluK0="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 6a595e29079e..403039b5f63d 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.8"; + version = "0.11.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LwEhvLqx3Vu1omc/QrGCptQD25Tbv9Ok5eTURL3hvEQ="; + sha256 = "sha256-He3BAIWxwDIM80ixmYjyAHlwDK9bBe/qS8P4+TVEkEg="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index cfcabbddc289..f67f7e2f3280 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.34.4"; + version = "4.38.0"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-GwbcrDsfxs5qRQJozhK/+n3W3NlO39g7pzxL9iIiDfU="; + sha256 = "sha256-cdZI2kwR3zzS6eiiXGpeHIp+kgPCPEsTOSTV60pODTM="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 9059ba977b7b..81d6b0ade107 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, python-Levenshtein, pycodestyle, hypothesis, pytest }: +{ lib, buildPythonPackage, fetchPypi, levenshtein, pycodestyle, hypothesis, pytest }: buildPythonPackage rec { pname = "fuzzywuzzy"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5"; }; - propagatedBuildInputs = [ python-Levenshtein ]; + propagatedBuildInputs = [ levenshtein ]; checkInputs = [ pycodestyle hypothesis pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 3c0ba94d3ab4..f617078833c5 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.1.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ekbebwsdGkINdOFI+LLdwTRBN6d8mlNmftkj5SNRKNI="; + sha256 = "sha256-8YxC0QYZqgUIKlYLXnm5+tfojQOmOX63dD7cxBO+0Gg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 09f7ca4c8560..c7ddc590d97d 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gdown"; - version = "4.5.4"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-av9n0esi+zpa7StFY3lKo1Bsct8IP4ax7EkyUnCcpo8="; + hash = "sha256-XOPbCu2lT0bKrLLfhvMcPj7NF8NVaJ5kVthftSi6l0k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 3a6fc0d254a9..ca594e747fc7 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mV69KXCjHUfBAKqsECEvR+K/EuKwZTbTiIPJUf807vE="; + hash = "sha256-ZL1+ximQIVh4gi6LJWnRg1BU9WzfU2AN3+mSfjHztI0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 79f85ad95674..730d9cc3eb33 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, py , pytest-benchmark , pytest-mock , pytestCheckHook @@ -19,6 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ + py pytestCheckHook pytest-benchmark pytest-mock diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 28a089296481..690c0b73e6ea 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gevent"; - version = "21.12.0"; + version = "22.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4="; + hash = "sha256-HKAdoXbuN7NSeicC99QNvJ/7jPx75aA7+k+e7EXlXEY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 85d17ee3ab8a..84743d8606c3 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -1,19 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , gevent +, pytestCheckHook }: buildPythonPackage rec { pname = "gipc"; version = "1.4.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-P8d2GIxFAAHeXjXgIxKGwahiH1TW/9fE+V0f9Ra54wo="; + src = fetchFromGitHub { + owner = "jgehrcke"; + repo = "gipc"; + rev = "refs/tags/${version}"; + hash = "sha256-T5TqLanODyzJGyjDZz+75bbz3THxoobYnfJFQxAB76E="; }; - propagatedBuildInputs = [ gevent ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "gevent>=1.5,<=21.12.0" "gevent>=1.5" + ''; + + propagatedBuildInputs = [ + gevent + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "gevent-cooperative child processes and IPC"; diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 0895270d6c9c..3528bb2bcab6 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "gitdb"; - version = "4.0.9"; + version = "4.0.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa"; + sha256 = "sha256-brmQtp304VutiZ6oaNxGVyw/dTOXNWY7gd55sG8X65o="; }; propagatedBuildInputs = [ smmap ]; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 8164d6099a45..706ce1523fe5 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "6.2.0"; + version = "6.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-PKUc1PYfM4MxDFErV4zYyHl/mkPQNvIcjNaDekenHc8="; + hash = "sha256-9+U9kRMkcQY0tjao6Pmi0STqh0xw0pFU0/xZXlawkKM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 73f8310cc0d8..ba4388c25699 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.61.0"; + version = "2.70.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3goMt7sY6/9c99x4K0ikiKFL12hLU4eZ8xvtq33iuD8="; + sha256 = "sha256-Ji3glNWjDTN/WeZlgQGf7UW2mMB4OXrEjdMjwJaCNuc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index ad9d74edbb68..725d955dccfc 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2xG85LPv/Jm1GOwiopA0cOCFPAySvldpTjaE5zjSJRM="; + sha256 = "sha256-gQVqMQ+xxKPlp+GkQ+Hrllk8a7xVsmwCYeTTKV0+ZZM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index c9f5c994aae4..51fb6d04dcf6 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.8.3"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aMkYgmx4TDGSW2/0KB7FTNUHUxtTaVpmeDiIWq7Z5lc="; + hash = "sha256-8E+RvHHs4IK1RrbTtY8wwuBLNQKcDnb058vN6hKfy6Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 72b9d4efb80e..af1f15ffd076 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.9.0"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8/gmeLpdheW7M9nhM0uTlxrpeRcODSgLVOVKPj9O870="; + hash = "sha256-PSk6IYBfGL7g0FBCqUgT4T8k1IYprtLGQQQEybEO99o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 2c35387b124d..7ac264a649c6 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.56.4"; + version = "1.57.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wlhzxHJ5OHz9y9r6NhSYh5AdNiAstkWg5PKWhr9uRBc="; + sha256 = "sha256-J6hJ1iBYOPtsw8HCHLmABwemYbshxs5/sT6Z6x+KDEY="; }; propagatedBuildInputs = [ grpc protobuf ]; diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index f5d9b7904594..728d64ed1f08 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , graphene , graphql-core @@ -13,6 +12,7 @@ , django-filter , mock +, py , pytest-django , pytest-random-order , pytestCheckHook @@ -20,26 +20,17 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "unstable-2022-03-03"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; - rev = "f6ec0689c18929344c79ae363d2e3d5628fa4a2d"; - hash = "sha256-KTZ5jcoeHYXnlaF47t8jIi6+7NyMyA4hDPv+il3bt+U="; + rev = "refs/tags/v${version}"; + hash = "sha256-wSZm0hRukBmvrmU3bsqFuZSQRXBwwye9J4ojuSz1uzE="; }; - patches = [ - ./graphene-3_2_0.patch - (fetchpatch { - url = "https://github.com/graphql-python/graphene-django/commit/ca555293a4334c26cf9a390dd1e3d0bd4c819a17.patch"; - excludes = [ "setup.py" ]; - sha256 = "sha256-RxG1MRhmpBKnHhSg4SV+DjZ3uA0nl9oUeei56xjtUpw="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" @@ -61,6 +52,7 @@ buildPythonPackage rec { checkInputs = [ django-filter mock + py pytest-django pytest-random-order pytestCheckHook diff --git a/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch b/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch deleted file mode 100644 index 0e8fa63464a3..000000000000 --- a/pkgs/development/python-modules/graphene-django/graphene-3_2_0.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py -index 7d440f4..0aec6e4 100644 ---- a/graphene_django/filter/tests/test_fields.py -+++ b/graphene_django/filter/tests/test_fields.py -@@ -1005,7 +1005,7 @@ def test_integer_field_filter_type(): - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null): PetTypeConnection -@@ -1074,7 +1074,7 @@ def test_other_filter_types(): - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null, age_Isnull: Boolean = null, age_Lt: Int = null): PetTypeConnection -diff --git a/graphene_django/tests/test_command.py b/graphene_django/tests/test_command.py -index 70116b8..a4ab4db 100644 ---- a/graphene_django/tests/test_command.py -+++ b/graphene_django/tests/test_command.py -@@ -49,7 +49,7 @@ def test_generate_graphql_file_on_call_graphql_schema(): - assert handle.write.called_once() - - schema_output = handle.write.call_args[0][0] -- assert schema_output == dedent( -+ assert schema_output.rstrip() + "\n" == dedent( - """\ - type Query { - hi: String -diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py -index bde72c7..0b64440 100644 ---- a/graphene_django/tests/test_types.py -+++ b/graphene_django/tests/test_types.py -@@ -247,7 +247,7 @@ def test_schema_representation(): - } - """ - ) -- assert str(schema) == expected -+ assert str(schema).rstrip() + "\n" == expected - - - def with_local_registry(func): -@@ -515,7 +515,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: Pet -@@ -541,7 +541,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: Pet -@@ -576,7 +576,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: Pet -@@ -603,7 +603,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: PetModelKind -@@ -642,7 +642,7 @@ class TestDjangoObjectType: - - schema = Schema(query=Query) - -- assert str(schema) == dedent( -+ assert str(schema).rstrip() + "\n" == dedent( - """\ - type Query { - pet: PetModelKind -diff --git a/graphene_django/tests/test_views.py b/graphene_django/tests/test_views.py -index 945fa87..e2e8b46 100644 ---- a/graphene_django/tests/test_views.py -+++ b/graphene_django/tests/test_views.py -@@ -109,12 +109,10 @@ def test_reports_validation_errors(client): - { - "message": "Cannot query field 'unknownOne' on type 'QueryRoot'.", - "locations": [{"line": 1, "column": 9}], -- "path": None, - }, - { - "message": "Cannot query field 'unknownTwo' on type 'QueryRoot'.", - "locations": [{"line": 1, "column": 21}], -- "path": None, - }, - ] - } -@@ -135,8 +133,6 @@ def test_errors_when_missing_operation_name(client): - "errors": [ - { - "message": "Must provide operation name if query contains multiple operations.", -- "locations": None, -- "path": None, - } - ] - } -@@ -476,8 +472,7 @@ def test_handles_syntax_errors_caught_by_graphql(client): - "errors": [ - { - "locations": [{"column": 1, "line": 1}], -- "message": "Syntax Error: Unexpected Name 'syntaxerror'.", -- "path": None, -+ "message": "Syntax Error: Unexpected Name 'syntaxerror'." - } - ] - } -diff --git a/graphene_django/views.py b/graphene_django/views.py -index c23b020..f533f70 100644 ---- a/graphene_django/views.py -+++ b/graphene_django/views.py -@@ -11,7 +11,6 @@ from django.views.decorators.csrf import ensure_csrf_cookie - from django.views.generic import View - from graphql import OperationType, get_operation_ast, parse, validate - from graphql.error import GraphQLError --from graphql.error import format_error as format_graphql_error - from graphql.execution import ExecutionResult - - from graphene import Schema -@@ -387,7 +386,7 @@ class GraphQLView(View): - @staticmethod - def format_error(error): - if isinstance(error, GraphQLError): -- return format_graphql_error(error) -+ return error.formatted - - return {"message": str(error)} - diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index c6508cef7a7e..8e556fdd7c5d 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -5,6 +5,7 @@ , graphql-core , graphql-relay , promise +, py , pytest-asyncio , pytest-benchmark , pytest-mock @@ -37,6 +38,7 @@ buildPythonPackage rec { checkInputs = [ promise + py pytestCheckHook pytest-asyncio pytest-benchmark diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 22372843bdb0..e4a2d5e937cb 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, py , pytest-benchmark , pytest-asyncio , pytestCheckHook @@ -22,6 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ + py pytest-asyncio pytest-benchmark pytestCheckHook diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index f16ba5fc4c77..c1dde12b3e0b 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "graspologic"; - version = "1.0.0"; + version = "2.0.1"; disabled = isPy27; src = fetchFromGitHub { owner = "microsoft"; repo = "graspologic"; - rev = "v${version}"; - sha256 = "sha256-mzJ3eFo77gnOh/Vs9u68yFDZW3ilXtcCCwKahKyRRmc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EmbCA4JpY2OIwXrRWjBxA4iNm0ddQODjoGmHIYgvAWs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 12f3044f0680..129243b79186 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -2,23 +2,30 @@ , buildPythonPackage , fetchPypi , isPyPy -, unittestCheckHook +, objgraph +, psutil +, pytestCheckHook }: buildPythonPackage rec { pname = "greenlet"; - version = "1.1.3"; + version = "2.0.1"; + format = "setuptools"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "sha256-vLbG3R1r5tONbbKDdH0H/aCJ/4xVmoNSNlYKRBA0BFU="; + hash = "sha256-QuYCVkRg2g6O5ny21yNjY+5eExqhWUO2Zw5E5cLtD2c="; }; - checkInputs = [ unittestCheckHook ]; + checkInputs = [ + objgraph + psutil + pytestCheckHook + ]; - unittestFlagsArray = [ "-v" "greenlet.tests" ]; + doCheck = false; # installed tests need to be executed, not sure how to accomplish that meta = with lib; { homepage = "https://github.com/python-greenlet/greenlet"; diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index 2248bc806b06..b62b73283097 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -6,7 +6,6 @@ , importlib-metadata , isodate , nest-asyncio -, six , pytestCheckHook , mock , pyhamcrest @@ -31,19 +30,20 @@ buildPythonPackage rec { sed -i '/pytest-runner/d' setup.py substituteInPlace setup.py \ - --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' + --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \ + --replace 'importlib-metadata<5.0.0' 'importlib-metadata' ''; # setup-requires requirements nativeBuildInputs = [ importlib-metadata ]; + propagatedBuildInputs = [ aenum aiohttp isodate nest-asyncio - six ]; checkInputs = [ diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 16c6eb513c6d..eab119f39ade 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.7.3"; + version = "1.8.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "sha256-/1YOnG6sCP8G8J3K2/RycTC95rXW9M+U3Mjz4GCt13s="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qz4EWAO++yq72/AGwyNOtH/fTRSFbiCo/K98htROUxI="; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index 3e3fabddf319..3314b6114d71 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -15,13 +15,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.2.4"; + version = "2.3.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; - rev = "v${version}"; - sha256 = "sha256-hQnFHi85Rifco0afLF8kKNOy9oPxKoupfmdm+fht6Cg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-dFNphsgf+0t3EPXO938TVncYcxL4EMOlznrfPR8SYhM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 8b85a488512a..eff3d54d7210 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -6,6 +6,7 @@ , rebulk , pythonOlder , importlib-resources +, py , pytestCheckHook , pytest-mock , pytest-benchmark @@ -14,11 +15,12 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.4.3"; + version = "3.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "731e96e6a1f3b065d05accc8c19f35d4485d880b77ab8dc4b262cc353df294f7"; + hash = "sha256-eiaeOlfMBz5htWJZiT6rPFwC0a2Ky8iuLnjF6DnxELw="; }; propagatedBuildInputs = [ @@ -27,7 +29,7 @@ buildPythonPackage rec { python-dateutil ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - checkInputs = [ pytestCheckHook pytest-mock pytest-benchmark pyyaml ]; + checkInputs = [ py pytestCheckHook pytest-mock pytest-benchmark pyyaml ]; pytestFlagsArray = [ "--benchmark-disable" ]; diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 97ccb7b91206..4e6c830c25a2 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , hpack , hyperframe , pytestCheckHook @@ -20,6 +21,15 @@ buildPythonPackage rec { sha256 = "sha256-qDrKCPvnqst5/seIycC6yTY0NWDtnsGLgqE6EsKNKrs="; }; + patches = [ + # https://github.com/python-hyper/h2/pull/1274 + (fetchpatch { + name = "fix-tests-in-python-3.11.patch"; + url = "https://github.com/python-hyper/h2/commit/8952c91606cd014720ccf202a25b5ee1fbed1591.patch"; + hash = "sha256-skAdAVHMZo1xJEqqKa6FOKPvoQQbGUgGsQjE11jIjtw="; + }) + ]; + propagatedBuildInputs = [ hpack hyperframe @@ -30,6 +40,11 @@ buildPythonPackage rec { hypothesis ]; + disabledTests = [ + # timing sensitive + "test_changing_max_frame_size" + ]; + pythonImportsCheck = [ "h2.connection" "h2.config" diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index faa967d0ce4f..050795185cfd 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -10,16 +10,15 @@ buildPythonPackage rec { pname = "hacking"; - version = "4.1.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m"; + sha256 = "sha256-qzWyCK8/FHpvlZUnMxw4gK5BrCHMzra/1oqE9OtW4CY="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "flake8<3.9.0,>=3.8.0" "flake8" + sed -i 's/flake8.*/flake8/' requirements.txt substituteInPlace hacking/checks/python23.py \ --replace 'H236: class Foo(object):\n __metaclass__ = \' 'Okay: class Foo(object):\n __metaclass__ = \' substituteInPlace hacking/checks/except_checks.py \ diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix new file mode 100644 index 000000000000..de962e6b9585 --- /dev/null +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, hatch +, pytest-mock +, pytestCheckHook +, tomli +, twine +}: + +buildPythonPackage rec { + pname = "hatch-jupyter-builder"; + version = "0.8.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = "hatch-jupyter-builder"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ns5jrVfTAA7NuvUok3/13nIpXSSVZ6WRkgHyTuxkSKA="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + checkInputs = [ + hatch + pytest-mock + pytestCheckHook + tomli + twine + ]; + + disabledTests = [ + # tests pip install, which unsuprisingly fails + "test_hatch_build" + ]; + + meta = with lib; { + changelog = "https://github.com/jupyterlab/hatch-jupyter-builder/releases/tag/v${version}"; + description = "hatch plugin to help build Jupyter packages"; + homepage = "https://github.com/jupyterlab/hatch-jupyter-builder"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/pkgs/development/python-modules/hatch-nodejs-version/default.nix index 6095b696ad78..5c471111ab7e 100644 --- a/pkgs/development/python-modules/hatch-nodejs-version/default.nix +++ b/pkgs/development/python-modules/hatch-nodejs-version/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatch-nodejs-version"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agoose77"; repo = "hatch-nodejs-version"; - rev = "v${version}"; - sha256 = "sha256-TBvqXjka8poQ8xxQ/H1hFYRLqnP1024uan1d9b95ags="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-txF392XiRqHndTEYw6QVk12Oqw9E6cOwF81hUyp2oh4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix new file mode 100644 index 000000000000..b7ba9446575d --- /dev/null +++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatch +, hatchling +, packaging +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "hatch-requirements-txt"; + version = "0.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "repo-helper"; + repo = "hatch-requirements-txt"; + rev = "refs/tags/v${version}"; + hash = "sha256-Gyt5Fs8uqVe0cOKtxFeg1n1WMyeK5Iokh71ynb2i5cM="; + }; + + nativeBuildInputs = [ + hatch + ]; + + propagatedBuildInputs = [ + hatchling + packaging + ]; + + doCheck = false; # missing coincidence dependency + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/repo-helper/hatch-requirements-txt/releases/tag/${version}"; + description = "Hatchling plugin to read project dependencies from requirements.txt"; + homepage = "https://github.com/repo-helper/hatch-requirements-txt"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} + diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix index 4f5c1f9bf3e6..a8aaa70d63e4 100644 --- a/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hatch-vcs"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_vcs"; inherit version; - sha256 = "sha256-mRPXM7NO7JuwNF0GJsoyFlpK0t4V0c5kPDbQnKkIq/8="; + sha256 = "sha256-zsUQfPzkgsZ/i8lvGLvDIMmqDQaBgOFK0xe77loVP+4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix index c1af541def94..5224c84ab5ce 100644 --- a/pkgs/development/python-modules/hepunits/default.nix +++ b/pkgs/development/python-modules/hepunits/default.nix @@ -1,20 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm +, hatch-vcs +, hatchling , pytestCheckHook }: buildPythonPackage rec { pname = "hepunits"; - version = "2.2.1"; + version = "2.3.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YJfmlUekg73Az+TRBuRHteuofFUBBg0xLNnWGqniJBQ="; + hash = "sha256-M7mumot7OvNVFBp0kBy1qlV9zi5MmZKgow7wRDobIgY="; }; + nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling ]; checkInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 6c5132027c5e..4f94ff771318 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.15.2"; + version = "1.15.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3sJBf2VACLHXtkWzHs9iHIvvkBaU5MTnJy7/0Yr6Nts="; + hash = "sha256-pFiRzSuPzUCHQs//81HJKPv0zx730fBEQsfYeG7o6ZQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix index d0fc242c9896..1ca7c73ef2f2 100644 --- a/pkgs/development/python-modules/http-parser/default.nix +++ b/pkgs/development/python-modules/http-parser/default.nix @@ -19,9 +19,14 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + cython setuptools ]; + preBuild = '' + # re-run cython + make -B + ''; pythonImportsCheck = [ "http_parser" diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 61a3b8d73235..408bb8376559 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.16.2"; + version = "0.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-bwGZ/B0jlvc1BmXVTo7gMP6PJIQuCHclkHjKQCgMsyU="; + rev = "refs/tags/${version}"; + hash = "sha256-3bC97CTZi6An+owjoJF7Irtr7ONbP8RtNdTIGJRy0Ng="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 2e68555dc738..4d8f02020018 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-d+X4hGt4K6xmRFw8mevKpZ6RDv+U1PJ8WbmdKGDbVNs="; + hash = "sha256-sUo8B4IbFiIvqWx2UxT3TpHzi2Q2YNW1zrx1Squ2psQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 59c758b25aa6..dd6784335f29 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.54.5"; + version = "6.61.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-mr8ctmAzRgWNVpW+PZlOhaQ0l28P0U8PxvjoVjfHX78="; + hash = "sha256-gTcdJaOgP8Nc4fN8UH6+sLedivq5ZNxMRULajFOVnSo="; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 4bac9c0bb022..76977b770027 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "hypothesmith"; - version = "0.2.0"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; + sha256 = "sha256-vc6EXsmE5uP+0h5l0ugrjrxt5cpeuTZJ39dgNMWQakY="; }; patches = [ @@ -46,6 +46,11 @@ buildPythonPackage rec { "test_source_code_from_libcst_node_type" ]; + disabledTestPaths = [ + # missing blib2to3 + "tests/test_syntactic.py" + ]; + pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/hypothesmith/remove-black.patch b/pkgs/development/python-modules/hypothesmith/remove-black.patch index 565f350b06b4..d37222ef4b2c 100644 --- a/pkgs/development/python-modules/hypothesmith/remove-black.patch +++ b/pkgs/development/python-modules/hypothesmith/remove-black.patch @@ -1,5 +1,5 @@ diff --git a/tests/test_cst.py b/tests/test_cst.py -index c436183..bdba2d7 100644 +index 8532240..bdba2d7 100644 --- a/tests/test_cst.py +++ b/tests/test_cst.py @@ -3,7 +3,6 @@ import ast @@ -15,11 +15,11 @@ index c436183..bdba2d7 100644 -@pytest.mark.xfail --@example("A\u2592", black.FileMode()) +-@example("A\u2592", black.Mode()) -@given( - source_code=hypothesmith.from_node(), - mode=st.builds( -- black.FileMode, +- black.Mode, - line_length=st.just(88) | st.integers(0, 200), - string_normalization=st.booleans(), - is_pyi=st.booleans(), @@ -39,28 +39,27 @@ index c436183..bdba2d7 100644 def test_from_node_always_compilable(source_code): compile(source_code, "", "exec") diff --git a/tests/test_syntactic.py b/tests/test_syntactic.py -index 7ea42e9..a77ac39 100644 +index 7fe9835..17c4f7c 100644 --- a/tests/test_syntactic.py +++ b/tests/test_syntactic.py -@@ -3,8 +3,6 @@ import ast +@@ -3,7 +3,6 @@ import ast import io import tokenize -import black --import blib2to3 + import blib2to3 import parso import pytest - from hypothesis import example, given, reject, strategies as st -@@ -58,34 +56,6 @@ def test_ast_unparse_from_grammar(source_code): +@@ -58,34 +57,6 @@ def test_ast_unparse_from_grammar(source_code): assert ast.dump(first) == ast.dump(second) --@example("\\", black.FileMode()) --@example("A#\r#", black.FileMode()) +-@example("\\", black.Mode()) +-@example("A#\r#", black.Mode()) -@given( - source_code=hypothesmith.from_grammar(), - mode=st.builds( -- black.FileMode, +- black.Mode, - line_length=st.just(88) | st.integers(0, 200), - string_normalization=st.booleans(), - is_pyi=st.booleans(), diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index bcda9af2ec2a..75b7366b3334 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , freezegun , tzdata +, py , pyparsing , pydantic , pytest-asyncio @@ -38,6 +39,7 @@ buildPythonPackage rec { checkInputs = [ freezegun + py pytest-asyncio pytest-benchmark pytest-golden diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 5ef8864417d4..cbf3b09a8cdc 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -1,26 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub +, pythonOlder +, backports-zoneinfo , python-dateutil , pytz +, hypothesis +, pytest }: buildPythonPackage rec { - version = "4.1.0"; + version = "5.0.4"; pname = "icalendar"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-l0i3wC78xD5Y0GFa4JdqxPJl6Q2t7ptPiE3imQXBs5U="; + src = fetchFromGitHub { + owner = "collective"; + repo = "icalendar"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ch0i6hxEnHV/Xu4PqpRVt30KLOHHgtCAI2W9UyXo15E="; }; - buildInputs = [ setuptools ]; - propagatedBuildInputs = [ python-dateutil pytz ]; + propagatedBuildInputs = [ + python-dateutil + pytz + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + checkInputs = [ + hypothesis + pytest + ]; meta = with lib; { + changelog = "https://github.com/collective/icalendar/blob/v${version}/CHANGES.rst"; description = "A parser/generator of iCalendar files"; - homepage = "https://icalendar.readthedocs.org/"; + homepage = "https://github.com/collective/icalendar"; license = licenses.bsd2; maintainers = with maintainers; [ olcai ]; }; diff --git a/pkgs/development/python-modules/ilua/default.nix b/pkgs/development/python-modules/ilua/default.nix index 5b5c129c2749..28bc7524fa9e 100644 --- a/pkgs/development/python-modules/ilua/default.nix +++ b/pkgs/development/python-modules/ilua/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , jupyter_console -, jupyter_core +, jupyter-core , pygments , termcolor , txzmq @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jupyter_console - jupyter_core + jupyter-core pygments termcolor txzmq diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 8a53e856b330..f43908a61e0b 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.9.1"; + version = "0.10.1"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "sha256-ThT3rmB4tauEO3PDebKsULIHRGQV2cJDjIhdbLWv2WI="; + sha256 = "sha256-vHYJYZ7Dw4xEIpKSgjmtPRC13rCviinIOCK3tXsxn4s="; }; propagatedBuildInputs = [ scikit-learn ]; diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 19c38ac3fbc8..5817b38ca0de 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.17.0"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dfSoorrSH9p7a9Qt98oEEg+yRjbr+bVm0lmybyBEsdA="; + hash = "sha256-fuLGoLzaxYGzj66NDzQ/3uVfkfH2psyWQ/z7zGwtw+Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 9e4176a5b1ba..d9f03c521aca 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.12.0"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-Y3JFuLqytlAvy8dSzEt6b2JDuwKzHFwmFWrRA9PUVnA="; + hash = "sha256-QE1I1iu6C3p3/51AXv2RUBvvLmf/Ss4L7UCgzyjDx80="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 124733568723..e8b6e0857e4c 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.9.0"; + version = "5.10.2"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "sha256-VIHpf7Ra+Nzy95iVJiVZHFj+WZ0HNdhrEPVN4IamFoE="; + sha256 = "sha256-5KlsjMAzlkf/ml4FUNnydvxaAf+idgErWOwQjP17hIQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 6e64c946b980..ec8179ae6ae4 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "inflect"; - version = "6.0.0"; + version = "6.0.2"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C8FRbsJyXi2CIXB6YSJFCTy28c6iCc/Yy9T8Xpb6Y2U="; + sha256 = "sha256-8aa8sBBQRviWGf3hp9BExhLGFMLYXvGCWC2dybhtMJo="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 079edcd121ff..b707887bc392 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.34.0"; + version = "1.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Bswlrfh9lBobZDA4Rt/02jMER5IrZ6b3ykpbklCFhUE="; + hash = "sha256-kewhNnbCmciywTkk/NTBqO02jN8IAW/MriH/DkhQkFU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index aff0d77e7022..e9d6c3f1a930 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core , arrow , six , hypothesis @@ -7,28 +10,33 @@ buildPythonPackage rec { pname = "inform"; - version = "1.26"; + version = "1.27"; + format = "pyproject"; src = fetchFromGitHub { owner = "KenKundert"; repo = "inform"; - rev = "v${version}"; - sha256 = "0snrmvmc3rnz90cql5ayzs878rrkadk46rhvf2sn78nb0x57wa20"; + rev = "refs/tags/v${version}"; + hash = "sha256-SvE+UAGpUomUBHlH4aYZ1BYmLp3BherRjosKsIaOA/s="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner>=2.0" "" - ''; + nativeBuildInputs = [ + flit-core + ]; - propagatedBuildInputs = [ arrow six ]; + propagatedBuildInputs = [ + arrow + six + ]; - checkInputs = [ pytestCheckHook hypothesis ]; - preCheck = '' - patchShebangs test.doctests.py test.inform.py - ./test.doctests.py - ./test.inform.py - ''; + checkInputs = [ + pytestCheckHook + hypothesis + ]; + + disabledTests = [ + "test_prostrate" + ]; meta = with lib; { description = "Print and logging utilities"; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 0fb7a2451210..8efdb1ab03b8 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "inquirer"; - version = "2.9.2"; + version = "3.1.1"; format = "pyproject"; src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; - rev = "v${version}"; - sha256 = "sha256-TQEZeZDl4N78dE7CXy5OwquUoHuxxjmDAC3wdxqydaQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-gDJqD0IHshyGw9MmMtYjkkpvYklRLgPd6EtLVqi2I/o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix index 8749ea16132d..e442e0d48d3f 100644 --- a/pkgs/development/python-modules/installer/default.nix +++ b/pkgs/development/python-modules/installer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "installer"; - version = "0.5.1"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pradyunsg"; repo = pname; rev = version; - sha256 = "sha256-vhZYUhUcD5fnjkyEqFMvggVGH9Ri8iNgqRgSBQTOCtM="; + sha256 = "sha256-IXznSrc/4LopgZDGFSC6cAOCbts+siKpdl5SvN1FFvA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 363c8a4f5768..a3ec10d4b2b5 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -1,24 +1,41 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, decorator , ipython , isPyPy -, mock -, toml +, tomli +, setuptools +, unittestCheckHook }: buildPythonPackage rec { pname = "ipdb"; - version = "0.13.9"; + version = "0.13.11"; + format = "pyproject"; + disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5"; + hash = "sha256-wjtnNvAf1Fhswuy+vfeaXrRUeWhT4c2PLtO3uR1KPpM="; }; - propagatedBuildInputs = [ ipython toml ]; - checkInputs = [ mock ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + ipython + decorator + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + checkInputs = [ + unittestCheckHook + ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 36bd9961903c..384391138daf 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -4,6 +4,7 @@ , fetchPypi , hatchling , pythonOlder +, comm , ipython , jupyter-client , packaging @@ -14,14 +15,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.15.3"; + version = "6.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uB1XsOFxZwhEvynNwRVisQENPahxFcRRPg7mYKg2h2U="; + sha256 = "sha256-ffr67GRTAHEMQUecCwvcE6nqZjm+5uOtBCdXZ06amik="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 @@ -34,6 +35,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + comm ipython jupyter-client packaging diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 6c0b15c41b37..77ed45ce4ccd 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.7.0"; + version = "1.8.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fa8ff9b9a73b5a925c4af4c05f1839df2bd0fae0063871f403ee821792d5ab72"; + sha256 = "sha256-0qjvArC8xEr9MSecuAKMBr49fA60FYRyicAADy93N7c="; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index b4689b207756..c3fc01390377 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.0.2"; + version = "8.0.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-CMt1xuCpaDYUfL/cVVgK4E0T4F0m/7w3e04caLqiix8="; + hash = "sha256-wABad6R9d4icr+2JK1jjO0oqlnEhVEBMZUjsIicoEeo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 799f21bbebe7..b4f1606a027d 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "isort"; - version = "5.11.2"; + version = "5.11.4"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; - rev = version; - sha256 = "sha256-4Du9vYI1srStWCTfZr4Rq3uH5c9cRtR8ZqihI36G6hA="; + rev = "refs/tags/${version}"; + sha256 = "sha256-1x0rhQOr6pPFuHtbYSCR10tXeDTGwf47ek49wBmJP+I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 96c8fcfb3c14..eff730e0ad8e 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "2.6"; + version = "2.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rKvnr0C48mTkjbGyHhvNzgJ97p5mJ7F4wU8ZMPYV/rM="; + sha256 = "sha256-9vC+xGwyzsr3vn/YIpbsRpfUvyEB8MSqskzBI5kfojA="; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix index 4b097fd5b096..6a8c0fd1ea4a 100644 --- a/pkgs/development/python-modules/jaraco-context/default.nix +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "jaraco-context"; - version = "4.1.2"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.context"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gfrDZW4d3X/QjUBN8DFSvKRLZge3pnZ6KkI7S7Nz3W0="; + sha256 = "sha256-J7vL+pvwXcKEkqZn44/U01HmP1CI5kIGsJ1aJevp0I4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix index 3f3f9d54f87f..86aca734e114 100644 --- a/pkgs/development/python-modules/jaraco-test/default.nix +++ b/pkgs/development/python-modules/jaraco-test/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "jaraco-test"; - version = "5.1.0"; + version = "5.2.0"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco.test"; inherit version; - sha256 = "04a7503c0c78cd057bd6b5f16ad1e3379b911b619df6694480a564ebc214c0a8"; + sha256 = "sha256-K1OYx58TriCKoGfdLlEw3ArC699DR5w9r7bxLz2bdIs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 686095d3b1c0..e42499b70999 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.5.2"; + version = "3.8.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ByuT6zX55IUISFdVU05mo07xzISvKR/Sfzm0TUwN0sM="; + sha256 = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index de4b8c5ce489..afd7e113189e 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.5.1"; + version = "3.5.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0K3PkXEKCFPv6fI6ePrVhr9n31cvDW2OD6NtKJrhwdk="; + sha256 = "sha256-RbBcFY860ocxB1VW/9R0m9JU7Gf5Hh6zZ9z+v/EVHbQ="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 4891b2ea38c5..91183d4f4082 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.9.1"; + version = "3.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1XzURIpYgCAxhCXgQZTol/lvwjuSuC/5MIok1cvys/s="; + sha256 = "sha256-DdtYlZX+F26oF5yAHKTs4r4Kpx83e5HzymW010GUg1E="; }; pythonNamespaces = [ diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 07f4f5efedbd..cb963a0d6e6a 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -21,7 +21,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.23"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "jax-v${version}"; - hash = "sha256-ruXOwpBwpi1G8jgH9nhbWbs14JupwWkjh+Wzrj8HVU4="; + rev = "refs/tags/jaxlib-v${version}"; + hash = "sha256-ajLI0iD0YZRK3/uKSbhlIZGc98MdW174vA34vhoy7Iw="; }; # jaxlib is _not_ included in propagatedBuildInputs because there are diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index b6d0019407ca..c32b84b75f4c 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.39.0"; + version = "0.40.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pappasam"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-nra2Xvfo1cfMoZkY7sem7NIEDwDmODWbGVNCeefSuQY="; + sha256 = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 2235cb909c01..e9a5faccd3b4 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchFromGitHub , attrs @@ -37,14 +38,21 @@ buildPythonPackage rec { ''; disabledTests = [ - # Assertions mismatches with pytest>=6.0 - "test_completion" - # sensitive to platform, causes false negatives on darwin "test_import" ] ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # disabled until 3.11 is added to _SUPPORTED_PYTHONS in jedi/api/environment.py + "test_find_system_environments" + + # disabled until https://github.com/davidhalter/jedi/issues/1858 is resolved + "test_interpreter" + "test_scanning_venvs" + "test_create_environment_venv_path" + "test_create_environment_executable" + "test_venv_and_pths" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 264bef920ea2..f823cb9c03c6 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { pname = "jira"; - version = "3.4.0"; - format = "setuptools"; + version = "3.4.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pycontribs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XyMywnuJOGSXWsMNbwNbMaOeAa9bosBg6rvfNKw77Ik="; + hash = "sha256-EZCvYpcQ1dSsXDhipUalrHEG5SYOochktYrBdIoNDRo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 969869f86b52..75ee64dc4623 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "2.2.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eycpGLBVQYLlPcNA3dYtm3+QL+x+ewViDATzzO9Hmg4="; + sha256 = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index 2ab8ec45a701..12de6527c866 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -1,20 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +}: buildPythonPackage rec { pname = "jsonref"; - version = "0.2"; + version = "1.0.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "15v69rg2lkcykb2spnq6vbbirv9sfq480fnwmfppw9gn3h95pi7k"; + src = fetchFromGitHub { + owner = "gazpachoking"; + repo = "jsonref"; + rev = "refs/tags/v${version}"; + hash = "sha256-8p0BmDZGpQ6Dl9rkqRKZKc0doG5pyXpfcVpemmetLhs="; }; - checkInputs = [ pytest mock ]; + nativeBuildInputs = [ + poetry-core + ]; - checkPhase = '' - py.test tests.py - ''; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests.py" + ]; meta = with lib; { description = "An implementation of JSON Reference for Python"; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 69dba8bd472e..7ac7a40d32b0 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -11,18 +11,29 @@ , pythonOlder , twisted , typing-extensions + +# optionals +, fqdn +, idna +, isoduration +, jsonpointer +, rfc3339-validator +, rfc3986-validator +, rfc3987 +, uri-template +, webcolors }: buildPythonPackage rec { pname = "jsonschema"; - version = "4.17.0"; + version = "4.17.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W/zyvKFqCHreF+ArKC00r3zNdJ73YkHn+b18DLipQk0="; + sha256 = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; }; postPatch = '' @@ -45,6 +56,29 @@ buildPythonPackage rec { importlib-resources ]; + passthru.optional-dependencies = { + format = [ + fqdn + idna + isoduration + jsonpointer + rfc3339-validator + rfc3987 + uri-template + webcolors + ]; + format-nongpl = [ + fqdn + idna + isoduration + jsonpointer + rfc3339-validator + rfc3986-validator + uri-template + webcolors + ]; + }; + checkInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 2cd29ba4da4b..157184fec1ee 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.5"; + version = "2.6.6"; format = "setuptools"; src = fetchFromGitHub { owner = "Juniper"; repo = "py-junos-eznc"; - rev = version; - hash = "sha256-BoHT6ejccInfREbYtW6psm3fvsQxLS1vpj/aPDqqpnY="; + rev = "refs/tags/${version}"; + hash = "sha256-0JF9/lSIquXp25bM3GESqLC//aorSVT0hHccaOmQuM8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 598cef9a8e58..23a1f35d2de8 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , entrypoints -, jupyter_core +, jupyter-core , hatchling , nest-asyncio , python-dateutil @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.3.5"; + version = "7.4.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PFhGahuNVdugvzzgg05PW3dguvmNHXPbCt1vGd6ezR0="; + sha256 = "sha256-EJo8M7YqnPZaqDJYUKCZmnlfrBVdneT3VVrvXzEO41o="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ entrypoints - jupyter_core + jupyter-core nest-asyncio python-dateutil pyzmq diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix similarity index 84% rename from pkgs/development/python-modules/jupyter_core/default.nix rename to pkgs/development/python-modules/jupyter-core/default.nix index 56dc157a69d2..761db23a5ef8 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -3,13 +3,14 @@ , pythonOlder , fetchFromGitHub , hatchling +, platformdirs , traitlets , pytestCheckHook }: buildPythonPackage rec { - pname = "jupyter_core"; - version = "4.11.2"; + pname = "jupyter-core"; + version = "5.1.1"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -17,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_core"; - rev = version; - hash = "sha256-lDhwvhsOxLHBC6CQjCW/rmtHSuMRPC2yaurBd5K3FLc="; + rev = "refs/tags/v${version}"; + hash = "sha256-54zbo+RXgT9AJabmJYHCznyoinTQqrTORzlM48WpnQQ="; }; patches = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + platformdirs traitlets ]; diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch similarity index 100% rename from pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch rename to pkgs/development/python-modules/jupyter-core/tests_respect_pythonpath.patch diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix new file mode 100644 index 000000000000..0bdf4dbf5f78 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, hatchling + +# runtime +, jsonschema +, python-json-logger +, pyyaml +, traitlets + +# optionals +, click +, rich + +# tests +, pytest-asyncio +, pytest-console-scripts +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jupyter-events"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter"; + repo = "jupyter_events"; + rev = "refs/tags/v${version}"; + hash = "sha256-ak5JNMitxMvXaHPmjMhB58y8Fy8N1oLtqNMNZ9lgpnM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + jsonschema + python-json-logger + pyyaml + traitlets + ] + ++ jsonschema.optional-dependencies.format + ++ jsonschema.optional-dependencies.format-nongpl; + + passthru.optional-dependencies = { + cli = [ + click + rich + ]; + }; + + checkInputs = [ + pytest-asyncio + pytest-console-scripts + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + preCheck = '' + export PATH="$out/bin:$PATH" + ''; + + meta = with lib; { + changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}"; + description = "Configurable event system for Jupyter applications and extensions"; + homepage = "https://github.com/jupyter/jupyter_events"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index ffcde4a5b216..342e0233eb76 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -2,7 +2,7 @@ , lib , buildPythonPackage , fetchPypi -, jupyter_server +, jupyter-server }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - jupyter_server + jupyter-server ]; # tests require network doCheck = false; diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 73797f8fd0d8..b6201769f86b 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , jupyter-packaging -, jupyter_server +, jupyter-server , pytest-tornasync , pytestCheckHook }: @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jupyter_server + jupyter-server ]; checkInputs = [ diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix new file mode 100644 index 000000000000..dfd6dc3164e5 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, hatchling + +# runtime +, terminado + +# tests +, pytest-jupyter +, pytest-timeout +, pytestCheckHook +}: + +let self = buildPythonPackage rec { + pname = "jupyter-server-terminals"; + version = "0.4.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "jupyter_server_terminals"; + rev = "refs/tags/v${version}"; + hash = "sha256-swFMuKP/JIHJJ0zr3Dqv71Ne4WaP7GbzeNQ2tzEBpRU="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + terminado + ]; + + doCheck = false; # infinite recursion + + checkInputs = [ + pytest-jupyter + pytest-timeout + pytestCheckHook + ] ++ pytest-jupyter.optional-dependencies.server; + + passthru.tests = { + check = self.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + changelog = "https://github.com/jupyter-server/jupyter_server_terminals/releases/tag/v${version}"; + description = "A Jupyter Server Extension Providing Support for Terminals"; + homepage = "https://github.com/jupyter-server/jupyter_server_terminals"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +}; +in self diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix similarity index 80% rename from pkgs/development/python-modules/jupyter_server/default.nix rename to pkgs/development/python-modules/jupyter-server/default.nix index 791e238f3874..5af8bbe7e248 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -3,9 +3,12 @@ , buildPythonPackage , fetchPypi , pythonOlder +, hatch-jupyter-builder +, hatchling , pandoc , pytestCheckHook , pytest-console-scripts +, pytest-jupyter , pytest-timeout , pytest-tornasync , argon2-cffi @@ -15,8 +18,10 @@ , ipykernel , ipython_genutils , traitlets -, jupyter_core +, jupyter-core , jupyter-client +, jupyter-events +, jupyter-server-terminals , nbformat , nbconvert , send2trash @@ -29,15 +34,22 @@ }: buildPythonPackage rec { - pname = "jupyter_server"; - version = "1.19.1"; + pname = "jupyter-server"; + version = "2.0.6"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-0cw1lpRYSXQrw+7fBpn+61CtbGBF6+8CqSmLfxPCfp8="; + pname = "jupyter_server"; + inherit version; + hash= "sha256-jddZkukLfKVWeUoe1cylEmPGl6vG0N9WGvV0qhwKAz8="; }; + nativeBuildInputs = [ + hatch-jupyter-builder + hatchling + ]; + propagatedBuildInputs = [ argon2-cffi jinja2 @@ -45,8 +57,10 @@ buildPythonPackage rec { pyzmq ipython_genutils traitlets - jupyter_core + jupyter-core jupyter-client + jupyter-events + jupyter-server-terminals nbformat nbconvert send2trash @@ -62,6 +76,7 @@ buildPythonPackage rec { pandoc pytestCheckHook pytest-console-scripts + pytest-jupyter pytest-timeout pytest-tornasync requests diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index b8914a2a45a0..6fac2db61bd6 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , git -, jupyter_server +, jupyter-server , jupyter-packaging , jupyterlab , nbdime @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.39.2"; + version = "0.41.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "sha256-+wzKAK5jdrlPjtVDgp7QqOyXaBDzzkRJI+6hcbOcnpo="; + sha256 = "sha256-UXZ9qgAvCKfPCzchFOtwbv8vNPEtcLU0dwBGTmiHSD4="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jupyter_server + jupyter-server nbdime git nbformat diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 7077d39cb742..1634e986d025 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "3.0.3"; + version = "3.0.5"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - sha256 = "sha256-x2cYE5m0yotke+/i2ROxJg9Rv52O+behRjLUwae1Nr0="; + sha256 = "sha256-7q7N6vbAOvyWDdriAc7YjVl5tMqcOJG8uPZjGvcF9e8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index cc709c4f47a3..1aeeef157283 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -8,7 +8,7 @@ , pytestCheckHook , json5 , babel -, jupyter_server +, jupyter-server , tomli , openapi-core , pytest-timeout @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.16.3"; + version = "2.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y1oLF2qQHxk1HAIiGhJOWTF8R29REgBAm32GfospBcM="; + hash = "sha256-pbaSPiqeopn5jeW1DN6Qci10748HE6dcvL+/0/Qa0Fg="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { jsonschema json5 babel - jupyter_server + jupyter-server tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 6c2e8466a1de..b3f56a8e0d62 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "k5test"; - version = "0.10.1"; + version = "0.10.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2c9181133f3d52c8e29a5ba970b668273c08f855e5da834aaee2ea9efeb6b069"; + sha256 = "sha256-nJ3uvK1joxXoGDPUXp/RK/IBZmQ7iry5/29NaxhMVx8="; }; patches = [ diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 32f4ad3a5995..788308c92d38 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "2.10.0"; + version = "2.11.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - sha256 = "sha256-JqbiwlIudGjd6iJxCpmzKQSTdo/AijnnXRFzoONFL98="; + sha256 = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index cc10ec96686c..5f2a3323baa8 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.0.0"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-brtfBEyd/SYwh6Mo1R1HmUfR3ckMCdr0GR333HEzQyM="; + sha256 = "sha256-nve0txmnmkoEOHpqpVintspK3xi4Ex8YasrwZD/5e74="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index 62123032a5d4..ebf8aea20305 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "lark"; - version = "1.1.2"; + version = "1.1.5"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; - rev = version; - sha256 = "sha256-Y1bDSiFnqAKTlIcd8aAgtc+I3TLnWF8hhQK2ez96TQs="; + rev = "refs/tags/${version}"; + sha256 = "sha256-drvF+0PSOdrha2rfpntrM8xIbeb0S7eNtfioxkdjEKw="; }; # Optional import, but fixes some re known bugs & allows advanced regex features diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 0619a62fa32d..aec83e4bce49 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4"; + sha256 = "sha256-whmgAkWvD2+k6VkB7SgERUT1AVKEDFtqPnslaNs00VY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index afeeea52f33a..c79aee3bd390 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Functions for fast computation of Levenshtein distance and string similarity"; homepage = "https://github.com/maxbachmann/Levenshtein"; - changelog = "https://github.com/maxbachmann/Levenshtein/blob/${src.rev}/HISTORY.md"; + changelog = "https://github.com/maxbachmann/Levenshtein/blob/${version}/HISTORY.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index d763c52d8191..d24093c12c4c 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.4.7"; + version = "0.4.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,14 +26,14 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-YrGajxs8t8PU4XRkFlhwtxoa9pzpKPXq8ZvN/uqftlE="; + hash = "sha256-ikddvKsvXMNHMfA9jUhvyiDXII0tTs/rE97IGI/azgA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "source/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-V/WHZVvh8HtD8IUNk3V4e8/E2A8DebqY5i/lS1X6x3o="; + hash = "sha256-FWQGv3E5X+VEnTYD0uKN6W4USth8EQlEGbYgUAWZ5EQ="; }; cargoRoot = "native"; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 199f467fbbca..804f4bce0e3c 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , buildPythonPackage , poetry-core +, pytest-rerunfailures , pytestCheckHook , procps , tmux @@ -10,16 +11,20 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.13.0"; + version = "0.18.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u08lxVMuyO5CwFbmxn69QqdSWcvGaSMZgizRJlsHa0k="; + hash = "sha256-OhNyJcnxjbyP/Kpt70qLv3ZtZvXXVTWEMcjv/pa50/4="; }; + postPatch = '' + sed -i '/addopts/d' setup.cfg + ''; + nativeBuildInputs = [ poetry-core ]; @@ -27,11 +32,15 @@ buildPythonPackage rec { checkInputs = [ procps tmux - + pytest-rerunfailures pytestCheckHook ]; - pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_test.py" ]; + pytestFlagsArray = [ + "tests" + ] ++ lib.optionals stdenv.isDarwin [ + "--ignore=tests/test_test.py" + ]; pythonImportsCheck = [ "libtmux" ]; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index ad54268c8cf5..c59f28d6939d 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "3.3.2"; + version = "3.3.3"; src = fetchPypi { inherit pname version; - sha256 = "5d25d16e77c844c297ece2044df57651139bc3c8ad8c4108916374267ac68b64"; + sha256 = "sha256-hX5VmuhKIpY84rYhaCkpadIa3TC8kkaoTU5+7a5nlm0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 2b4499e29e8e..31b4aa02ae36 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "limits"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,14 +25,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alisaifee"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; # Upstream uses versioneer, which relies on git attributes substitution. # This leads to non-reproducible archives on github. Remove the substituted # file here, and recreate it later based on our version info. postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-TBZElCogPtoR2qX1YjBgpYh99LhrvLHFtr2ogemo9/c="; + hash = "sha256-XGYwSe9KWw6PdxDjyqZ5kw5jlBxQR0VYacquwZ2z8rA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 2acb735052bd..496f55b4000c 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.9.20"; + version = "2022.11.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-db+JKQXDffMm5dcyMVtYNj1YFKHSlvYAoyZi86tqoiA="; + hash = "sha256-IvnA9y/pkRrkEabUX05wcAg+8To0OLbt55olQfRUAQc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/littleutils/default.nix b/pkgs/development/python-modules/littleutils/default.nix index ea490f19fe5d..538f4dea0a67 100644 --- a/pkgs/development/python-modules/littleutils/default.nix +++ b/pkgs/development/python-modules/littleutils/default.nix @@ -1,24 +1,32 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib +, pythonOlder }: buildPythonPackage rec { pname = "littleutils"; version = "0.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0vwijrylppmk0nbddqvn527r9cg3zw8d6zk6r58hslry42jf7jp6"; + hash = "sha256-5srjpCA+Uw1RyWZ+0xD/47GUjyh249aWBbPeS32WkW8="; }; - # This tiny package has no unit tests at all + # Module has no tests doCheck = false; - pythonImportsCheck = [ "littleutils" ]; + + pythonImportsCheck = [ + "littleutils" + ]; meta = with lib; { description = "Small collection of Python utility functions"; homepage = "https://github.com/alexmojaki/littleutils"; + changelog = "https://github.com/alexmojaki/littleutils/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index a3d323edf983..1947467c0ec8 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F+FQJwvB1WH7qcfOG6IGY+ZlfKwz39UE5rwoQKnxaac="; + sha256 = "sha256-zMGKGTKomduydhOAxfif/Caf1QJiG2mxig4a+789SJc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index c9856889de1f..bb9c100890af 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "localstack"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; - rev = "v${version}"; - sha256 = "sha256-en/9kxhiW4aesc2SOpg/jRXiRa222iBQuq1O3cHeBJs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cxkEP/fsIGTcFLAM8tn/esCMmAvsIYb46X+EzV2VHDc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix index b89fcb25339e..0762d3986cce 100644 --- a/pkgs/development/python-modules/logical-unification/default.nix +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , toolz , multipledispatch +, py , pytestCheckHook , pytest-html , pytest-benchmark @@ -25,6 +26,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook pytest-html pytest-benchmark # Needed for the `--benchmark-skip` flag diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index f0a9d6ff523a..65cb5afab187 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.9.1"; + version = "4.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/lxml-${version}"; - sha256 = "sha256-5MJw3ciXYnfctSNcemJ/QJGKAaYpadvdbFhkc8+pmPM="; + sha256 = "sha256-IHuTlcDbrZHvS6Gtx48IkznVU+9WxZT9XHUZf8M1WOE="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index aaf4e0aa69bc..c7efc7af57c9 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "4.0.1"; + version = "4.3.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hQuZkstsB37pFDWmA0W6qGd7rAer1mun7Z6MxMp0ZmE="; + sha256 = "sha256-XWkCZhBapjtzH3g3t+xXiB2f54p3Xw0+UBKVNH+gGHQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/mac_alias/default.nix b/pkgs/development/python-modules/mac_alias/default.nix index ac750b13e390..159dfa1d89ad 100644 --- a/pkgs/development/python-modules/mac_alias/default.nix +++ b/pkgs/development/python-modules/mac_alias/default.nix @@ -1,15 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi +, setuptools }: buildPythonPackage rec { - version = "2.2.0"; - pname = "mac_alias"; + pname = "mac-alias"; + version = "2.2.2"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "0eb84a63f98bf54c2f9fbdc4de956a63e64eb8a4a124143a1c1f5a78326442f0"; + pname = "mac_alias"; + inherit version; + hash = "sha256-yZxyjrUS6VXBHxpiA6D/qIg7JlSeiv5ogEAxql2oVrc="; }; + nativeBuildInputs = [ + setuptools + ]; + # pypi package does not include tests; # tests anyway require admin privileges to succeed doCheck = false; diff --git a/pkgs/development/python-modules/mailsuite/default.nix b/pkgs/development/python-modules/mailsuite/default.nix index ff44629de9f1..6767e86feb22 100644 --- a/pkgs/development/python-modules/mailsuite/default.nix +++ b/pkgs/development/python-modules/mailsuite/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mailsuite"; - version = "1.9.7"; + version = "1.9.14"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-d96r712suiL4dSzT5vG/rD+4PInlvpuoAo3cedqVe+w="; + hash = "sha256-8vybabJPQyR0XMXaNp8lQFyuPajrhucgdfazt2ci8Gs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix index 091809d8314b..3d32b507579e 100644 --- a/pkgs/development/python-modules/markdown-include/default.nix +++ b/pkgs/development/python-modules/markdown-include/default.nix @@ -2,21 +2,28 @@ , buildPythonPackage , fetchFromGitHub , markdown +, setuptools-scm }: buildPythonPackage rec { pname = "markdown-include"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; # only wheel on pypi src = fetchFromGitHub { owner = "cmacmackin"; repo = pname; - rev = "v${version}"; - hash = "sha256-2pC0K/Z5l7q6sx4FSM4Pi1/5bt1wLZsqOmcbnE47rVs="; + rev = "refs/tags/v${version}"; + hash = "sha256-wTGgxvM3/h+6plUcheeMSkpk1we7pwuWHurkDkmbnPY="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ markdown ]; diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index d408c0071003..afbe7b18d893 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -6,6 +6,7 @@ , linkify-it-py , mdurl , psutil +, py , pytest-benchmark , pytest-regressions , pytestCheckHook @@ -41,11 +42,16 @@ buildPythonPackage rec { checkInputs = [ psutil + py pytest-benchmark pytest-regressions pytestCheckHook ]; + pytestFlagsArray = [ + "--benchmark-skip" + ]; + pythonImportsCheck = [ "markdown_it" ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 6a507d01ef3b..a033e8a11bab 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo , which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection -, certifi, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging +, certifi, contourpy, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging , enableGhostscript ? true, ghostscript, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -17,7 +17,7 @@ let in buildPythonPackage rec { - version = "3.5.3"; + version = "3.6.2"; pname = "matplotlib"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-M5ysSLgN28i/0F2q4KOnNBRlGoWWkEwqiBz9Httl8mw="; + sha256 = "sha256-sD/RChcJ0BAcBUiDtVD3xMXpdPdR4mgDGHWa8AWWSZA="; }; XDG_RUNTIME_DIR = "/tmp"; @@ -45,8 +45,14 @@ buildPythonPackage rec { Cocoa ]; + # clang-11: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] + hardeningDisable = lib.optionals stdenv.isDarwin [ + "strictoverflow" + ]; + propagatedBuildInputs = [ certifi + contourpy cycler fonttools freetype diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 45689c045168..a364b032ed9a 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -18,6 +18,7 @@ , jsonschema , peewee , poetry-core +, py , pycryptodome , pytest-aiohttp , pytest-benchmark @@ -73,6 +74,7 @@ buildPythonPackage rec { aioresponses faker hypothesis + py pytest-aiohttp pytest-benchmark pytestCheckHook diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index f8001dbdd568..6ba2b4874a38 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "9.3.0"; + version = "10.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "py-mine"; repo = pname; - rev = "v${version}"; - hash = "sha256-kNThVElEDqhbCitktBv5tQkjMaU4IsX0dJk63hvLhb0="; + rev = "refs/tags/v${version}"; + hash = "sha256-rwEZhN/CbIw5lZ1AGorsagr4RlvCMlCK/M0XzQBCvh8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 4174c18d10bf..4b780c40df85 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, setuptools +, flit-core , markdown-it-py , pytest-regressions , pytestCheckHook @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.3.0"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,12 +18,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-3zFSTjqwjUV6+fU6falYbIzj/Hp7E/9EXKZIi00tkg4="; + rev = "refs/tags/v${version}"; + hash = "sha256-9eaVM5KxrMY5q0c2KWmctCHyPGmEGGNa9B3LoRL/mcI="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 9b188f9c2a59..44190b11e599 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.1.0"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-CejgiCiW7an1GpKB5MUiA1Alkigv3RmfTq0um9pc93E="; + hash = "sha256-uz+Pv3DvmhDajIqNpCj+2HsRT7Dh7Ks5yryhiEa8KOI="; }; propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index 0fced5f3e71e..c33aae4d20c4 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { patchPhase = '' # Allow greenlet-1.0.0. # See https://github.com/mopemope/meinheld/pull/123 - substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5,<2.0.0" + substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5" ''; propagatedBuildInputs = [ greenlet ]; @@ -20,6 +20,10 @@ buildPythonPackage rec { # No tests doCheck = false; + pythonImportsCheck = [ + "meinheld" + ]; + meta = with lib; { description = "High performance asynchronous Python WSGI Web Server"; homepage = "https://meinheld.org/"; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index aaf13a76530d..2398551b0daa 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -1,29 +1,46 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, cookiecutter, networkx , pandas, tornado, tqdm -, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, cookiecutter +, networkx +, pandas +, tornado +, tqdm +, pytestCheckHook +}: buildPythonPackage rec { pname = "mesa"; - version = "0.8.7"; + version = "1.1.1"; + format = "setuptools"; # According to their docs, this library is for Python 3+. disabled = isPy27; - src = fetchFromGitHub { - owner = "projectmesa"; - repo = "mesa"; - rev = "v${version}"; - sha256 = "0i1bpdqjrx4avgrzyqxpwxx86j11yhrq1j4kca854xahvhmwis19"; + src = fetchPypi { + pname = "Mesa"; + inherit version; + hash = "sha256-FPQLPClI8CKVsacZs4DLFnaikVSwrevU5TfUMevXgSY="; }; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + cookiecutter + networkx + pandas + tornado + tqdm + ]; - # Ignore test which tries to mkdir in unreachable location. - checkPhase = '' - pytest tests -k "not scaffold" - ''; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ cookiecutter networkx pandas tornado tqdm ]; + disabledTests = [ + "test_examples" + "test_run" + "test_scaffold_creates_project_dir" + ]; meta = with lib; { homepage = "https://github.com/projectmesa/mesa"; diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index a4d650c27f59..d4064e55cb5c 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -7,17 +7,19 @@ , ninja , pyproject-metadata , tomli +, typing-extensions +, pythonOlder }: buildPythonPackage rec { pname = "meson-python"; - version = "0.10.0"; + version = "0.12.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-CN0SLBB029XFW1OZOnGcynPdghY3LJEhf3pVAmD55+E="; + hash = "sha256-jLFZqAk6LnPPqJf4CS7JO3TjhC+U3/f944HG/g4LBk0="; }; nativeBuildInputs = [ @@ -25,6 +27,8 @@ buildPythonPackage rec { ninja pyproject-metadata tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; propagatedBuildInputs = [ @@ -42,8 +46,9 @@ buildPythonPackage rec { ''; meta = { + changelog = "https://github.com/mesonbuild/meson-python/blob/${version}/CHANGELOG.rst"; description = "Meson Python build backend (PEP 517)"; - homepage = "https://github.com/FFY00/meson-python"; + homepage = "https://github.com/mesonbuild/meson-python"; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.fridh ]; }; diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index b7cecc3ba3da..748de6f67541 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -4,7 +4,7 @@ , hatchling , ipykernel , jedi -, jupyter_core +, jupyter-core , pexpect , pythonOlder }: @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel jedi - jupyter_core + jupyter-core pexpect ]; diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix index 7452148e8e47..929a9be81a9f 100644 --- a/pkgs/development/python-modules/minikanren/default.nix +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -6,6 +6,7 @@ , multipledispatch , etuples , logical-unification +, py , pytestCheckHook , pytest-html }: @@ -30,6 +31,7 @@ buildPythonPackage rec { ]; checkInputs = [ + py pytestCheckHook pytest-html ]; diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix index 6b1c353c23d7..1b86734624a5 100644 --- a/pkgs/development/python-modules/mip/default.nix +++ b/pkgs/development/python-modules/mip/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mip"; - version = "1.14.1"; + version = "1.14.2"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bvpm5vUp15fbv/Sw1Lx70ihA7VHsSUzwFzoFDG+Ow1M="; + sha256 = "sha256-wr4gXSh456heG5nsaEi2yo7LMre2Nd6QbTm0dcDCX1k="; }; checkInputs = [ matplotlib networkx numpy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mixpanel/default.nix b/pkgs/development/python-modules/mixpanel/default.nix index fac1afe2c97b..692333e4daae 100644 --- a/pkgs/development/python-modules/mixpanel/default.nix +++ b/pkgs/development/python-modules/mixpanel/default.nix @@ -1,40 +1,41 @@ { buildPythonPackage , fetchFromGitHub -, isPy37 , lib # Python Dependencies -, mock -, pytest , six +, urllib3 +, requests + +# tests +, pytestCheckHook +, responses }: buildPythonPackage rec { pname = "mixpanel"; - version = "4.5.0"; - disabled = !isPy37; + version = "4.10.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "mixpanel"; repo = "mixpanel-python"; - rev = version; - sha256 = "1hlc717wcn71i37ngsfb3c605rlyjhsn3v6b5bplq00373r4d39z"; + rev = "refs/tags/v${version}"; + hash = "sha256-jV2NLEc23uaI5Q7ZXDwGaZV9iAKQLMAETRTw8epZwQA="; }; propagatedBuildInputs = [ + requests six + urllib3 ]; checkInputs = [ - mock - pytest + pytestCheckHook + responses ]; - checkPhase = '' - py.test - ''; - meta = with lib; { homepage = "https://github.com/mixpanel/mixpanel-python"; description = "Official Mixpanel Python library"; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index d82c1a654362..fe1eca400072 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -2,6 +2,9 @@ , callPackage , buildPythonPackage , fetchFromGitHub +, hatch-requirements-txt +, hatch-nodejs-version +, hatchling , jinja2 , markdown , mkdocs @@ -9,12 +12,13 @@ , pygments , pymdown-extensions , pythonOlder +, requests }: buildPythonPackage rec { pname = "mkdocs-material"; - version = "8.4.3"; - format = "setuptools"; + version = "8.5.11"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,9 +26,15 @@ buildPythonPackage rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ntArFD/wnoFC2vMS9WjiFP5/I1XklgSPGKGxFXxdNxs="; + hash = "sha256-jF5lpRv2itkhkqH7RzUXEH5e0Bia3SnTApfoy61RfJA="; }; + nativeBuildInputs = [ + hatch-requirements-txt + hatch-nodejs-version + hatchling + ]; + propagatedBuildInputs = [ jinja2 markdown @@ -32,6 +42,7 @@ buildPythonPackage rec { mkdocs-material-extensions pygments pymdown-extensions + requests ]; # No tests for python diff --git a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix index 2d03c8fa8c5d..4e1c47a8c49d 100644 --- a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix +++ b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix @@ -1,16 +1,25 @@ -{ lib, fetchFromGitHub, buildPythonPackage }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, hatchling +}: buildPythonPackage rec { pname = "mkdocs-material-extensions"; - version = "1.0.3"; + version = "1.1.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = pname; - rev = version; - sha256 = "1mvc13lz16apnli2qcqf0dvlm8mshy47jmz2vp72lja6x8jfq2p3"; + rev = "refs/tags/${version}"; + hash = "sha256-FHI6WEQRd/Ff6pmU13f8f0zPSeFhhbmDdk4/0rdIl4I="; }; + nativeBuildInputs = [ + hatchling + ]; + doCheck = false; # Circular dependency pythonImportsCheck = [ "materialx" ]; diff --git a/pkgs/development/python-modules/mkdocs-minify/default.nix b/pkgs/development/python-modules/mkdocs-minify/default.nix index ee6765d31751..3c952fb06610 100644 --- a/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mkdocs-minify"; - version = "0.5.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "byrnereese"; repo = "${pname}-plugin"; - rev = version; - sha256 = "sha256-7v4uX711KAKuXFeVdLuIdGQi2i+dL4WX7+Zd4H1L3lM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-ABoLt5sFpt8Hm07tkqeAcs63ZvJ4vTbGw4QRYVYpMEA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 2997e93ce0b9..46e3d410614b 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.4.3"; + version = "0.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-N/7JhVX3STsUAz7O6yWkvKz72+3RZA5CNb3Z6FTrdRs="; + sha256 = "sha256-CAIQbSg8o+FxPqb/O9ML1b6OxmmH4c+RRU4ecHyfn8w="; }; propagatedBuildInputs = [ mkdocs beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 0fb61bd8a599..347f7452d73b 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -4,7 +4,11 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder - # runtime deps + +# buildtime +, hatchling + +# runtime deps , click , ghp-import , importlib-metadata @@ -15,7 +19,8 @@ , pyyaml , pyyaml-env-tag , watchdog - # testing deps + +# testing deps , babel , mock , unittestCheckHook @@ -23,16 +28,26 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.3.0"; + version = "1.4.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-S4xkr3jS5GvkMu8JnEGfqhmkxy3FtZZb7Rbuniltudg="; + rev = "refs/tags/${version}"; + hash = "sha256-/NxiKbCd2acYcNe5ww3voM9SGVE2IDqknngqApkDbNs="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "Markdown >=3.2.1, <3.4" "Markdown" + ''; + + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ click jinja2 diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 63cc4e3b39ec..a3747545b4da 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.20.0"; + version = "0.21.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ECDO3nc9IEgmZNdSA70BzOODOi0wnisI00F2Dxzdz+M="; + sha256 = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 53a852934d47..702521de977a 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KFifnu9MR3FoVs7gLv+CpB/p3/6Iej9RJuBf1uc1HJs="; + hash = "sha256-3N9S8QhQ3vtC9SZBQqvwVpE8V062VVWTV3nBhPI1lmA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 7e5d62454c6b..799c67089275 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.8"; + version = "3.10.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-aiofKFE9CPLMVJm+IT6VmtJSsVuH7ucpv5Kp1w7d2FE="; + sha256 = "sha256-fAVw5WvpJOITQWqA8Y6Xi7QbaunZ1WGXxAuUMXbh+Aw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index 4f142c5f2bba..faa8e112c530 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "monai"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Project-MONAI"; repo = "MONAI"; rev = "refs/tags/${version}"; - hash = "sha256-BnsgZpkXsY2l6inuzOkuvK4zJqYs2dj7jF5gKKiLnZM="; + hash = "sha256-XTjZhynIiFtFjJSW6rRAnpErZvf6QHkuK4e2L6l3naM="; }; # Ninja is not detected by setuptools for some reason even though it's present: diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index ff91a63d792f..3ba9c9dea368 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.24.1"; + version = "0.25.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-KmCk4YTkwpWePTOOFyp4hGIcxpy/rrfAAC1/Xes/IYk="; + sha256 = "sha256-2UPjyKJGiW8UfWgMu8WKZJ5l+p4vTR57GxMFC5amb4A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index a5d5958ec0dc..b4b8292ea01d 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2022.9.8"; + version = "2022.9.9"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-3C5L7nKokuxtYlw13AKSrNVsvKH9okmBNyLXt7Vmjqk="; + sha256 = "sha256-7ToNiRSWxe9nNcaWWmS6bhVqWMEwXN4uiwtjAmuK5qw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 1735148c58ec..4f8b9884d44c 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.14.0"; + version = "9.0.0"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wJRDzT1UOLja/M2GemvBywiUOJ6Qy1PSJ0VrCwvMt1A="; + sha256 = "sha256-WmJX5Ah47wUgsYA5kOPiIwOkG1cUAGwyo/2DBLJuoas="; }; nativeBuildInouts = [ diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index ad8b8c13a692..6de072579772 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -20,7 +20,6 @@ , openapi-spec-validator , python-dateutil , python-jose -, pytz , pyyaml , requests , responses @@ -37,21 +36,16 @@ buildPythonPackage rec { pname = "moto"; - version = "4.0.3"; + version = "4.0.12"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iutWdX5oavPkpj+Qr7yXPLIxrarYfFzonmiTbBCbC+k="; + hash = "sha256-MPjzFljxjNsV62JsjLOgdSDw2MIZMib7yzMmrhL7okY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "werkzeug>=0.5,<2.2.0" "werkzeug>=0.5" - ''; - propagatedBuildInputs = [ aws-xray-sdk boto3 @@ -68,7 +62,6 @@ buildPythonPackage rec { openapi-spec-validator python-dateutil python-jose - pytz pyyaml requests responses @@ -139,6 +132,8 @@ buildPythonPackage rec { "tests/test_awslambda/test_lambda_eventsourcemapping.py" "tests/test_awslambda/test_lambda_invoke.py" "tests/test_batch/test_batch_jobs.py" + "tests/test_kinesis/test_kinesis.py" + "tests/test_kinesis/test_kinesis_stream_consumers.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix new file mode 100644 index 000000000000..f8029f9db6c8 --- /dev/null +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -0,0 +1,81 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# propagates +, pyyaml + +# optionals +, boto3 +, botocore +, google-cloud-dataproc +, google-cloud-logging +, google-cloud-storage +, python-rapidjson +, simplejson +, ujson + + +# tests +, pyspark +, unittestCheckHook +, warcio +}: + +buildPythonPackage rec { + pname = "mrjob"; + version = "0.7.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Yelp"; + repo = "mrjob"; + rev = "refs/tags/v${version}"; + hash = "sha256-Yp4yUx6tkyGB622I9y+AWK2AkIDVGKQPMM+LtB/M3uo="; + }; + + propagatedBuildInputs = [ + pyyaml + ]; + + passthru.optional-dependencies = { + aws = [ + boto3 + botocore + ]; + google = [ + google-cloud-dataproc + google-cloud-logging + google-cloud-storage + ]; + rapidjson = [ + python-rapidjson + ]; + simplejson = [ + simplejson + ]; + ujson = [ + ujson + ]; + }; + + doCheck = false; # failing tests + + checkInputs = [ + pyspark + unittestCheckHook + warcio + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + unittestFlagsArray = [ + "-v" + ]; + + meta = with lib; { + changelog = "https://github.com/Yelp/mrjob/blob/v${version}/CHANGES.txt"; + description = "Run MapReduce jobs on Hadoop or Amazon Web Services"; + homepage = "https://github.com/Yelp/mrjob"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index 3b63b02986a2..b2e5f53119f7 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.26.0"; + version = "4.27.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HL56TXZNkjVnap0XIhBT/xDA2N80NLCLpvuXkxXu6zE="; + sha256 = "sha256-LL4CRioio63gpXrsurVucrkFgQrEh0gZPZ79Y2tk/90="; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 6ee071732691..0a32937f13a5 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -7,13 +7,15 @@ buildPythonPackage rec { pname = "multidict"; - version = "6.0.2"; + version = "6.0.4"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X/O9dfOOTEPx9HDy33pNQwuCHEziK+OE4UWctX1rsBM="; + hash = "sha256-NmaQZJLvt2RTwOe5fyz0WbBoLnQCwEialUhJZdvB2kk="; }; postPatch = '' @@ -25,6 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "multidict" ]; meta = with lib; { + changelog = "https://github.com/aio-libs/multidict/blob/v${version}/CHANGES.rst"; description = "Multidict implementation"; homepage = "https://github.com/aio-libs/multidict/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 8558706485c2..6d0780370ff0 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.13"; + version = "0.70.14"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/multiprocess-${version}"; - sha256 = "sha256-L/PesvaidavDEgJGqBxwcCYtG9TlKSwaxrUMJ+XVFOM="; + sha256 = "sha256-pjYOEOI5No9gT0XchmH6FSJ9uDqEnaLj/PyHT2a90jo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index c7d9f7999bc7..6746b314c021 100644 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "myst-docutils"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-evyIuNLbBWR3KfQMv2lNw6fOgX1+/uMS5cHIbSTYDmA="; + sha256 = "sha256-Dxg5TtQaK4plvRmXZa7AqPFIv/jvUOpV8M/BJohiXj0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index e81bf763b3a8..f3efa9f85b2a 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -19,24 +19,24 @@ buildPythonPackage rec { pname = "myst-parser"; - version = "0.18.0"; + version = "0.18.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-GEtrC7o5YnkuvBfQQfhG5P74QMiHz63Fdh1cC/r5CF0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wgRZwafAF05LtwjH6SVKzsY7bKeZ6lUlM3dB5PdOn1E="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "docutils>=0.15,<0.19" "docutils>=0.15" + --replace "docutils>=0.15,<0.19" "docutils>=0.15" \ + --replace "sphinx>=4,<6" "sphinx" ''; - format = "flit"; - nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ @@ -67,6 +67,8 @@ buildPythonPackage rec { "test_fieldlist_extension" # docutils 0.19 expectation mismatches "test_docutils_roles" + # sphinx 6.0 expectation mismatches + "test_sphinx_directives" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 63e795f98c85..d3780e0c3c29 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zoM27XRk+nubh0X0i5xi3qa+2TG5lxXKlHk2BUSZIUM="; + sha256 = "sha256-9LbHwQSNUovWqisnz0KgZEfSsx5FqVsgRJUTB48dhu8="; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/nanoid/default.nix b/pkgs/development/python-modules/nanoid/default.nix new file mode 100644 index 000000000000..495e7337f877 --- /dev/null +++ b/pkgs/development/python-modules/nanoid/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "nanoid"; + version = "2.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WoDK1enG6a46Qfovs0rhiffLQgsqXY+CvZ0jRm5O+mg="; + }; + + doCheck = false; # tests not in sdist, git not tagged + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nanoid" + ]; + + meta = with lib; { + description = "A tiny, secure, URL-friendly, unique string ID generator for Python"; + homepage = "https://github.com/puyuan/py-nanoid"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 4e4fffa53063..592407007221 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -35,7 +35,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.16"; + version = "0.4.17"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Fx3DoTIb2ev5wMP/gmprPIoxeF2f+Cbac6pnWB/zTTw="; + hash = "sha256-34FALCI7h0I295553Rv0KZxKIipuA2OMNsINGde7/oE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 7065191b1ad1..b2554c3f473a 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -6,8 +6,8 @@ , ipython_genutils , jinja2 , jupyter-client -, jupyter_core -, jupyter_server +, jupyter-core +, jupyter-server , nbconvert , nbformat , nest-asyncio @@ -42,8 +42,8 @@ buildPythonPackage rec { ipython_genutils jinja2 jupyter-client - jupyter_core - jupyter_server + jupyter-core + jupyter-server nbconvert nbformat nest-asyncio diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 1643904c314f..937ade730310 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,6 +1,7 @@ { async_generator , buildPythonPackage , fetchFromGitHub +, hatchling , ipykernel , ipywidgets , jupyter-client @@ -11,14 +12,15 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, testpath , traitlets , xmltodict }: let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.6.8"; - format = "setuptools"; + version = "0.7.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,10 +28,20 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+GQkEGWReo9y8bgcysslQdzJUcvQiZkQTQiwmWJ1mx8="; + hash = "sha256-2H6Oi1tK/GrtfMTR1j12tZdRzQkFUxXzMSpfCtGPyWE="; }; - propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + async_generator + traitlets + nbformat + nest-asyncio + jupyter-client + ]; # circular dependencies if enabled by default doCheck = false; @@ -40,6 +52,7 @@ let nbclient = buildPythonPackage rec { nbconvert pytest-asyncio pytestCheckHook + testpath xmltodict ]; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 7f994b4682d8..79386e02740b 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -9,7 +9,7 @@ , importlib-metadata , ipywidgets , jinja2 -, jupyter_core +, jupyter-core , jupyterlab-pygments , lib , markupsafe @@ -66,7 +66,7 @@ in buildPythonPackage rec { bleach defusedxml jinja2 - jupyter_core + jupyter-core jupyterlab-pygments markupsafe mistune diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index a418e5c6b48f..a9dae6b06348 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -6,7 +6,7 @@ , hatch-nodejs-version , fastjsonschema , jsonschema -, jupyter_core +, jupyter-core , traitlets , pep440 , pytestCheckHook @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.7.0"; + version = "5.7.1"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1d4760c15c1a04269ef5caf375be8b98dd2f696e5eb9e603ec2bf091f9b0d3f3"; + sha256 = "sha256-OBCgEwRT7QMZcFIdIJibilkvPC5zKDqCgK40rh91s/g="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fastjsonschema jsonschema - jupyter_core + jupyter-core traitlets ]; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index faa015d85f31..995641eb9253 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.5.5"; + version = "1.5.6"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "sha256-5EIpHNlCaYvmGYI6F6hqV1nqvh+GEwhHkN4Yn+nhbWU="; + sha256 = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA="; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 7c026be5cd26..65a722b8500c 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.8.6"; + version = "2.8.8"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vSt3MDAIYMvS2v6OWvif9cmmXDl1s1J5nYemI4tDAaY="; + sha256 = "sha256-Iw04gRevhw/OVkejxSQB/PdT6Ucg5uprQZelNVZIiF4="; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index fc221085f98e..1e95b77c181d 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -49,12 +49,12 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.8.4"; + version = "1.8.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-yoG6iLfF7ugBL4eNC9OLINIzBj1YgF4TVngFKb77qak="; + sha256 = "sha256-44QnQ/tmBGTdKd5z3Pye9m0nO+ELzGQFn/Ic1e8ellU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix index fa094404b8b1..d95b688ed9ce 100644 --- a/pkgs/development/python-modules/nkdfu/default.nix +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "nkdfu"; - version = "0.1"; + version = "0.2"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y8GonfCBi3BNMhZ99SN6/SDSa0+dbfPIMPoVzALwH5A="; + sha256 = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index a37e0cb3c679..2ca5d0e44fa7 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -1,23 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, jupyter_server +, jupyter-server , pytestCheckHook , pytest-tornasync }: buildPythonPackage rec { pname = "notebook-shim"; - version = "0.1.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook_shim"; - rev = "v${version}"; - sha256 = "sha256-5oIYj8SdC4E0N/yFxsmD2p4VkStHvqrVqAwb/htyPm4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s="; }; - propagatedBuildInputs = [ jupyter_server ]; + propagatedBuildInputs = [ jupyter-server ]; preCheck = '' mv notebook_shim/conftest.py notebook_shim/tests diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index fdb599466ff2..33e2886606f8 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -12,7 +12,7 @@ , tornado , ipython_genutils , traitlets -, jupyter_core +, jupyter-core , jupyter-client , nbformat , nbconvert @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.4.12"; + version = "6.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-YmjJ7JBIz/ekVAXJkMKaycpAsLw+wpJj0hjF4B8rToY="; + sha256 = "sha256-wYl+UxfiJfx4tFVJpqtLZo5MmW/QOgTpOP5eevK//9A="; }; LC_ALL = "en_US.utf8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); propagatedBuildInputs = [ - jinja2 tornado ipython_genutils traitlets jupyter_core send2trash + jinja2 tornado ipython_genutils traitlets jupyter-core send2trash jupyter-client nbformat nbconvert ipykernel terminado requests pexpect prometheus-client argon2-cffi ]; diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index c165e850de0c..29284c97eaeb 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nsz"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "nicoboss"; repo = pname; - rev = version; - sha256 = "sha256-tdngXV+VUOAkg3lF2NOmw0mBeSEE+YpUfuKukTKcPnM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-It815Uxxs4T9BM9EypAfPuq4Oy8rgGLpKA79m2xM8N4="; }; propagatedBuildInputs = [pycryptodome enlighten zstandard ] diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index a188daf6b428..f0b6c0dedc60 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "3.0.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "networktocode"; repo = pname; - rev = "v${version}"; - sha256 = "0kijzmmvq2rw7ima19w7lyb2p26a5w52k70fzbkaqqw78qzw8178"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-uEGl245tmc+W/9G+IclSNu76VTJ7w3zw6BQkhmGgEnY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index bb550bea782c..e6b4e591e921 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -2,28 +2,33 @@ , buildPythonPackage , fetchPypi , isPy27 +, setuptools , setuptools-scm , cython , entrypoints , numpy , msgpack +, py-cpuinfo , pytestCheckHook , python }: buildPythonPackage rec { pname = "numcodecs"; - version = "0.10.2"; + version = "0.11.0"; + format ="pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-IoOMaz/Zhr2cckA5uIhwBX95DiKyDm4cu6oN4ULdWcQ="; + sha256 = "sha256-bAWLMh3oShcpKZsOrk1lKy5I6hyn+d8NplyxNHDmNes="; }; nativeBuildInputs = [ + setuptools setuptools-scm cython + py-cpuinfo ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 6c76a8fc88ee..63d95622c061 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.3"; + version = "2.8.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-y2R8nZx4Xa4HWb9sh1zeK+xHK1w/emAVc0sWGudm0UE="; + hash = "sha256-1UMlN0GNGGkbkRXWFdbaoX7oJ1uu8+3xr7v4vGmAYUc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index c4877e839cd1..1b28ac339f7f 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.17.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NskgGS9EXdV/CRpjYpvdpaknTUdROjOsLvrRJzc5S3o="; + sha256 = "sha256-V4t46ssFKayaui8X3MNj1Yx8PFcIcQwY+MHpll8ugaw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 6f13a90e2ec3..3a73b1bf3d55 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.23.3"; + version = "1.23.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-Ub9JwM0dUr4KJAqmbzRYr8S5XYmT0tBPDZH6YMEK9s0="; + hash = "sha256-Gxdm1vOXwYFT1AAV3fx53bcVyrrcBNLSKNTlqLxN7Ro="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 9eebc8c39a48..6be8e93f545a 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-lJTa8cdhL1mQX6CeZcm4qQu6yzgE2R96lOd4gx5vz6U="; + sha256 = "sha256-sNt7daMjZ6DiXCOzl4QsZeNEoSBlJNFsgGnwockbX0w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 3089093d9cd1..4d85e9bab865 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "7.0"; + version = "7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-V7lSMhwzc9+36uXMCy5uF241XwJ62Pdf59RUulOt4i8="; + hash = "sha256-KCvUBE3qbX6v1HahBj4/jjM8ujvFGtWNuH1D+bTHrQ0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 11525c710382..361eefdfd7d1 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.85.0"; + version = "2.90.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-NaVD7oWdKrUC0wjoFTbRg02tCFMlRyNIRHciTtyra7w="; + hash = "sha256-pDLG8w5YfjmiP5JYDWoSLC0NGTfJ2Zmkz4Ed8zAB1pY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 509e5a2184dd..8a2bcc444dd1 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.16.3"; + version = "0.16.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-aej82CXk0bCE5W0+uuSVSvC08D5yoXv0h1wcoABWRoI="; + hash = "sha256-16DM9HrptQmj95OOM5XSGIEKzxrCkN3sU/7o8Yh0l6s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix index 274294f59388..8fb7d7676403 100644 --- a/pkgs/development/python-modules/openstep-plist/default.nix +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openstep-plist"; - version = "0.3.0"; + version = "0.3.0.post1"; src = fetchPypi { pname = "openstep_plist"; inherit version; - sha256 = "sha256-KO4sGKjod5BwUFQ1MU2S1dG0DyiJ06mdroMbRDsugBk="; + sha256 = "sha256-GK/z1e3tnr++3+ukRKPASDJGl7+KObsENhwN1Tv+qws="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 1236a24628ec..f4dfcf4f58da 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "2.10.1"; + version = "3.0.5"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-HHVEoLCZtEJEfc4xYobQrzRcDDxxeQjgL2Rw2KeVbi0="; + sha256 = "sha256-TfAWL81a7GIePkPm+2uXinBP5jwnhWCZPp5GJjXOC6g="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index fe207cbd5c46..4d2c1e5754c3 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "6.0.1"; + version = "6.1.0"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-mwRU+ZQV0MqsXIYFNxbXRtGY7Oxm5nLY5eY4a2+6orY="; + sha256 = "sha256-drwBCNUKypcraP7IKY55G1+8vrmlGifGmGtBsKamLus="; }; postPatch = '' diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 016f9325db40..fc001c52a5ef 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.2.post5"; + version = "0.6.2.post8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-svoXquQqftSY7CYbM/Jiu0s2BefoRkBiFZ2froF/DWE="; + hash = "sha256-I9a65KNhL2DV9lLQ5fpLLq1QfKv/9dkw2CIFeubtZnc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix index 1e60872b2c1b..005557a2a6e6 100644 --- a/pkgs/development/python-modules/ovoenergy/default.nix +++ b/pkgs/development/python-modules/ovoenergy/default.nix @@ -3,12 +3,15 @@ , buildPythonPackage , click , fetchFromGitHub +, incremental +, pydantic , pythonOlder +, typer }: buildPythonPackage rec { pname = "ovoenergy"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,13 +19,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timmo001"; repo = pname; - rev = "v${version}"; - hash = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI="; + rev = "refs/tags/${version}"; + hash = "sha256-ZbLs8w0qeaV2qWP08FKnlZ3fefj15Bw2A2bGpL6/d0I="; }; + nativeBuildInputs = [ + incremental + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "typer==0.6.1" "typer" + ''; + propagatedBuildInputs = [ aiohttp click + pydantic + typer ]; # Project has no tests diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 9125b96a014c..a48d6b82d104 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.4.4"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-q2wNc4YXtnUYPl8o2zK1FItpStm7oKQMPqJtlrQx22c="; + hash = "sha256-IguY0VzuCyzYOaY1i9Hyc9A1a/lkwaGusy1H2wIVSIs="; }; nativeBuildInputs = [ cython ]; @@ -96,6 +96,10 @@ buildPythonPackage rec { # than expected, e.g. on amd64 with FMA or on arm64 # https://github.com/pandas-dev/pandas/issues/38921 "test_rolling_var_numerical_issues" + # Requires mathplotlib + "test_subset_for_boolean_cols" + # DeprecationWarning from numpy + "test_sort_values_sparse_no_warning" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 1271fb3b4da0..9b35cb6ac177 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.14.1"; + version = "0.14.2"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-DSurTC+inYSoGJ047u03K+wEQhGFqqRX0uS5qb3sNEI="; + hash = "sha256-cDjrim7esGduL8IHxPpoqHB43uA78R9UMIrhNktqUdU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index cacc75f3eb2c..bcdca9cf6470 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "parametrize-from-file"; version = "0.17.0"; + format = "flit"; src = fetchPypi { inherit version; @@ -23,18 +24,19 @@ buildPythonPackage rec { sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j"; }; - format = "flit"; - pythonImportsCheck = [ "parametrize_from_file" ]; - # patch out coveralls since it doesn't provide us value preBuild = '' sed -i '/coveralls/d' ./pyproject.toml + + substituteInPlace pyproject.toml \ + --replace "more_itertools~=8.10" "more_itertools" ''; checkInputs = [ numpy pytestCheckHook ]; + propagatedBuildInputs = [ contextlib2 decopatch @@ -45,6 +47,8 @@ buildPythonPackage rec { toml ]; + pythonImportsCheck = [ "parametrize_from_file" ]; + meta = with lib; { description = "Read unit test parameters from config files"; homepage = "https://github.com/kalekundert/parametrize_from_file"; diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 131d8de094fc..28f69b432079 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "parfive"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/b4KrYg0mXoQJ/L+9ol7gD2myB0aLgDj0IWa8sxarKU="; + sha256 = "sha256-kIIR+cXLUtyLJ5YmhyCV88zhXahok/U7QXbezt3PyF0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index d1207fe84983..a804ed19dfb5 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "particle"; - version = "0.20.1"; + version = "0.21.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HoWWwoGMrkRqlYzrF2apGsxsZAHwHbHSO5TCSCelxUc="; + sha256 = "sha256-SDdIg05+gfLNaQ+glitTf3Z/6K9HBci62mjIu9rIoX0="; }; nativeBuildInputs = [ setuptools-scm diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index 878b2746758c..7ce7a7a3884f 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -1,32 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, six +, pythonOlder +, setuptools , attrs , pytestCheckHook , hypothesis , pretend , arpeggio +, typing-extensions }: buildPythonPackage rec { pname = "parver"; - version = "0.3.1"; + version = "0.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3"; + hash = "sha256-1KPbuTxTNz7poLoFXkhYxEFpsgS5EuSdAD6tlduam8o="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "arpeggio ~= 1.7" "arpeggio" - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ - six attrs arpeggio + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; checkInputs = [ diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index a22aa64e8b1e..0f8a96be94e1 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "path"; - version = "16.4.0"; + version = "16.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uvLnV8Sxm+ggj55n5I+0dbSld9VhNZDORmk7298IL1I="; + hash = "sha256-vqOBbh1U9OM6rHjSAxoLDtL5XmnbhbRdUfF9+XBx2mk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 9c6dd6256606..333f1be21c4e 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.2.9"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/pathos-${version}"; - sha256 = "sha256-39D+itH0nkOzmh3Rpg/HXLRj2F1UPsys+iU0ZiodkM0="; + sha256 = "sha256-Jc7pMVjOUSaZydRh87FsHivEAXpX9v6EbZNkHwPeq/Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 121f83df2898..66facfd1e132 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.10.1"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-es5hYbYh0x55AutrWuFI0Sz9I/SiSbn/trn+4SCEMj0="; + hash = "sha256-ViAN5Ad9nQeRRlqpCVoB1CGGHkBbUJaVUFHe79aX1vY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 156226536bcf..94af38104c6c 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "1.0.4"; + version = "1.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OS+MK0fG7CBVDLjhniS529Jzc0E/BntW7Ndfl2f5MBU="; + sha256 = "sha256-pEB3A9UPpNZxODo1SGiwWhMGDBvzgmTLtd3Jpz5KHcU="; }; preCheck = '' diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 089088a09bd3..8351b05c39a8 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.15.3"; + version = "3.15.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6s+JTUYmuP6Y6D+mi8YTznHbPYUS7yk259MuPpm9H/s="; + hash = "sha256-UbhJWooZuZOm1AUbM+66Qm76zar+sBOvuUnAc1vLvOU="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index b42bb5e4e406..314d3fdfb0e6 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.117"; + version = "2.1.119"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q1dz/xEQuJOrelDAB3YhISK6HPsqBQXGAx7Qgpqq+6w="; + hash = "sha256-QughY8G0Z9/371tlG0VMUqeKW/Nndv9mMbR1AIBlmTA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 5123b9be6856..ce5c8a2e363d 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.2"; + version = "8.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AXn2iNSMDn4WHre52G1YeUCvH1F0+Xwf39iTxZnA2Uo="; + hash = "sha256-fQxFwVQBOXC3i4b0GI4OAKjnfWvr73yB79wDjbh27ro="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index db88015eaf76..fdfd05a8e497 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.17.0"; + version = "2.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bBlNCfq+b73Z/yxIhmP9s2kgjlGz+EKTpI1CnpuqkuU="; + hash = "sha256-t+1i1S8UVd0s9/Fda0H2kaouDDBVS+x6G40Meb2rLYc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 8f04d0ce00dc..4a0e3bf0f98b 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.12.0"; + version = "0.14.0"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - sha256 = "sha256-o6uaqAo/Nb28doByq40XakKJpA4o6/Z/PzMhmb058FE="; + sha256 = "sha256-PGPf05TQfC6Somn2PR07Y2qiOuyg+37U1l16m2LKykU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index b4e68c190946..0dd3650810e1 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pint"; - version = "0.19.2"; + version = "0.20.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "Pint"; - sha256 = "sha256-4dSYn/UQs3ja1k+RcR572r5cp411sGoYVprEVGeMS68="; + sha256 = "sha256-OHzwQHjcff5KcIAzuq1Uq2HYKrBsTuPUkiseRdViYGc="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 7a595a85d8fd..78e2952ceae1 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.11.0"; + version = "6.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kMXcFQ44VuRGO4HMyZMHzPlVTl24OT6yc3BcsLj3HGA="; + hash = "sha256-iO+3spqSP/6sBxPm8j74UpzGF1Un1CuT9zdWzJQ4cpM="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 5c24679a9cb3..09787ab32b49 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "22.2.2"; + version = "22.3.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; - rev = version; - sha256 = "sha256-SLjmxFUFmvgy8E8kxfc6lxxCRo+GN4L77pqkWkRR8aE="; + rev = "refs/tags/${version}"; + hash = "sha256-mrfd3VWqb4SgSjBJAxBhYegABdJa7pVXL7wA5uZtF/A="; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index b3f4f1d450bf..5dd176c7ed90 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.8.3"; + version = "1.9.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qE2kMY3Yb4cKlEeoyYNAqgYha/xvK3vcS4dmmErhhnw="; + sha256 = "sha256-rAPjfk1gGq7kD4CH9j/EoqbJgU3aLI+mqrGxgpZTvfo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index 6da64c191315..3c2d4bd7495c 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -11,7 +11,7 @@ }: let pname = "plantuml-markdown"; - version = "3.7.3"; + version = "3.8.0"; in buildPythonPackage { inherit pname version; @@ -20,7 +20,7 @@ buildPythonPackage { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-iRIHq4GmYzNq11t61Lz69amOoG54j50Mc32NsaLNHOk="; + sha256 = "sha256-6zGE3j+AfS5r3dj+4mfT4juxKUODEOgGlnn3wtvPcEk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 749ffdb7f321..ad2e4545cb04 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "plaster"; - version = "1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "8351c7c7efdf33084c1de88dd0f422cbe7342534537b553c49b857b12d98c8c3"; + sha256 = "sha256-+L78VL+MEUfBCrQCl+yEwmdvotTqXW9STZQ2qAB075g="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index e206c33d34ca..b21e65479bf5 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -2,16 +2,16 @@ , appdirs , buildPythonPackage , fetchFromGitHub +, hatch-vcs +, hatchling , pytest-mock , pytestCheckHook , pythonOlder -, hatchling -, hatch-vcs }: buildPythonPackage rec { pname = "platformdirs"; - version = "2.5.3"; + version = "2.6.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-OAvhbgmwGhElszUPksXkOgB5Dp/Wcf4s8807CcT7eyM="; + rev = "refs/tags/${version}"; + hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -41,8 +41,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python module for determining appropriate platform-specific directories"; + description = "Module for determining appropriate platform-specific directories"; homepage = "https://platformdirs.readthedocs.io/"; + changelog = "https://github.com/platformdirs/platformdirs/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index f150945a37cb..05e7e15a0086 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.10.0"; + version = "5.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TTbZhZt6FTsnNWLe7tjCklh6Ry6x/VfNQVjsidne+ts="; + sha256 = "sha256-Tv70ecLsHYbc2shAW2ynDKZWSad0COOafoSh6i22x4c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 70b4421778f3..d9410f246ba5 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = "plumbum"; - rev = "v${version}"; - sha256 = "sha256-bCCcNFz+ZsbKSF7aCfy47lBHb873tDYN0qFuSCxJp1w="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-SqZO9qYOtBB+KWP0DLsImI64QTTpYKzWMYwSua9k2S0="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-config=setup.cfg" "" + substituteInPlace pyproject.toml \ + --replace '"--cov-config=setup.cfg", ' "" ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -61,6 +61,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}"; description = " Plumbum: Shell Combinators "; homepage = " https://github.com/tomerfiliba/plumbum "; license = licenses.mit; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index d47805bb643f..09a1c31297b7 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "4ea98bea04ebf0f44747bacdfafefc8827787106fbb787f0aedc46482b2dfd53"; + sha256 = "sha256-zZGOCzFpCrzT0gKodCyvlRqy/hVz3nr3HDhFaEf5ICs="; }; buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest; diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index e90529dac6d0..c669de8b03f6 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.3.2"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-3Ryfq0MwrL/mKP8DmkhLOyFlulf3c73z9fFIzMuqOrg="; + hash = "sha256-SCzs2v0LIgx3vBYTavPqc7uwAQdWsdmkbDyHgIjOxrk="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ @@ -58,6 +58,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-poetry/poetry-core/blob/${src.rev}/CHANGELOG.md"; description = "Core utilities for Poetry"; homepage = "https://github.com/python-poetry/poetry-core/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 00baeef1185b..e42228eb3b4e 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.18.0"; + version = "0.21.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UO2D80cZurfPCtDXAEQ4nOJdhNtIghLtZN7gL+9xbGc="; + hash = "sha256-LdcjzfOiKar0BCdU7W+N5adErdk/NOUf+FzeaMlfn3w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/poetry-plugin-export/default.nix b/pkgs/development/python-modules/poetry-plugin-export/default.nix index bbf6013e4fd3..8711a4a527d0 100644 --- a/pkgs/development/python-modules/poetry-plugin-export/default.nix +++ b/pkgs/development/python-modules/poetry-plugin-export/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "poetry-plugin-export"; - version = "1.1.2"; + version = "1.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+BDBQwYaiddq3OQDHKmLap3ehWJe+Gh5D3TwuNXycjg="; + hash = "sha256-xrAGjHFYRT6n+r/16b0xyoI7+1Q1Hsw3lEK92UabIqo="; }; postPatch = '' @@ -29,6 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = []; meta = with lib; { + changelog = "https://github.com/python-poetry/poetry-plugin-export/blob/${src.rev}/CHANGELOG.md"; description = "Poetry plugin to export the dependencies to various formats"; license = licenses.mit; homepage = "https://github.com/python-poetry/poetry-plugin-export"; diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 2e81f7e55312..83c91e847455 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -8,6 +8,7 @@ , deepdiff , dulwich , fetchFromGitHub +, filelock , flatdict , html5lib , httpretty @@ -32,7 +33,9 @@ , requests-toolbelt , shellingham , stdenv +, tomli , tomlkit +, trove-classifiers , urllib3 , virtualenv , xattr @@ -40,7 +43,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.2.2"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,25 +52,19 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-huIjLv1T42HEmePCQNJpKnNxJKdyD9MlEtc2WRPOjRE="; + hash = "sha256-yiV2Y0vBF0d7BFfT5wonzRUGHVH040PZrlAUpVTFCZc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'crashtest = "^0.3.0"' 'crashtest = "*"' \ - --replace 'xattr = { version = "^0.9.7"' 'xattr = { version = "^0.10.0"' - ''; - nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = [ cachecontrol - cachy cleo crashtest dulwich + filelock html5lib jsonschema keyring @@ -81,9 +78,12 @@ buildPythonPackage rec { requests-toolbelt shellingham tomlkit + trove-classifiers virtualenv ] ++ lib.optionals (stdenv.isDarwin) [ xattr + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.8") [ @@ -98,6 +98,7 @@ buildPythonPackage rec { ''; checkInputs = [ + cachy deepdiff flatdict pytestCheckHook @@ -142,6 +143,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-poetry/poetry/blob/${src.rev}/CHANGELOG.md"; homepage = "https://python-poetry.org/"; description = "Python dependency management and packaging made easy"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 15597188135f..d53ac9acddbb 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.7.6.5"; + version = "1.7.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R+DauHpRbAuZks1bDJCDSOTH2WQwTRBrIn+tKK4DIZ4="; + sha256 = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE="; }; propagatedBuildInputs = [ @@ -26,8 +26,9 @@ buildPythonPackage rec { # darwin seems to hang doCheck = !stdenv.isDarwin; checkPhase = '' - cd examples + runHook preCheck ${python.interpreter} -m ppft.tests + runHook postCheck ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 922f85990db7..6df087e3e68e 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -1,24 +1,35 @@ { lib , buildPythonPackage -, fetchPypi -, glibcLocales -, setuptools-scm +, fetchFromGitHub +, pythonOlder +, hatch-vcs +, hatchling , wcwidth , importlib-metadata -, pythonOlder +, pytest-lazy-fixture +, pytestCheckHook }: buildPythonPackage rec { pname = "prettytable"; - version = "3.4.1"; + version = "3.5.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-fX3YTQsgby2qxEcacvKZ1pB/NFFgZP6yg44zOk4lZ70="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jazzband"; + repo = "prettytable"; + rev = "refs/tags/${version}"; + hash= "sha256-J6oWNug2MEkUZSi67mM5H/Nf4tdSTB/ku34plp1XWCM="; }; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ glibcLocales ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; propagatedBuildInputs = [ wcwidth @@ -26,18 +37,21 @@ buildPythonPackage rec { importlib-metadata ]; - preCheck = '' - export LANG="en_US.UTF-8" - ''; + checkInputs = [ + pytest-lazy-fixture + pytestCheckHook + ]; - # no test no longer available in pypi package - doCheck = false; - pythonImportsCheck = [ "prettytable" ]; + pythonImportsCheck = [ + "prettytable" + ]; meta = with lib; { - description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = "http://code.google.com/p/prettytable/"; + changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}"; + description = "Display tabular data in a visually appealing ASCII table format"; + homepage = "https://github.com/jazzband/prettytable"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 038575794bd3..ad0281d7eeb6 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.31"; + version = "3.0.36"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "sha256-mtqVLJ0Xh/Uv9tXzSE0LTfiVJ4fAh+32offCyx6ogUg="; + sha256 = "sha256-PhY/JUvvWgOxRjl9fBljvT4oEvCWS7miTm7HYf0o22M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 01f48e627bd2..b0be35e0c7ba 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { "disk_io_counters" "sensors_battery" "user" + "test_disk_partitions" # problematic on Hydra's Linux builders, apparently ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 9db6cc998956..c2c8d961f6cc 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-sr25519-bindings"; - version = "0.1.5"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "polkascan"; repo = "py-sr25519-bindings"; - rev = "a97398b386c10ebe0a1f6c45dea466add0d407ce"; - sha256 = "sha256-RJfwWeD82J5QqY+qq2bC3vlqT75jUwhTXuIsza4qUzk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Lu3J0+YeQHHKItOZTT24DlQAUJuE9fd+py6Eb46/MSE="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 03ed9fc5884d..73cbce9161a9 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.7.0"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sVu518B+PDSpW6MhYtNWkPpwuT471VfGuDDtpL7Mo/U="; + hash = "sha256-6nfpXzq2yCVDK8pAuWzAVzr0pKn5VHqb3UH9VXhSHJ0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 15b43db0e5b4..d49488ffc3d1 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -10,15 +10,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.14.0"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "PyAthena"; - inherit version; - hash = "sha256-1DeqvlHlOt781nObnPdgZo3JqjwcK8lSREXqUNoKhhU="; + inherit pname version; + hash = "sha256-59NH4HIhgDOxwgSUJq71ewpQTn2sbpNNT9Q3nj8qJss="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index 82f2b685d268..365a8565db65 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "PyAudio"; - version = "0.2.12"; + version = "0.2.13"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-Vd3123K8U3u6X128o6ufAiLuW4Qr2oOXjqsLe49g+54="; + sha256 = "sha256-JrzMgeQkPRwP9Uh+a0gd5jKfzWXHk2XCZ87zjzY6K1Y="; }; buildInputs = [ pkgs.portaudio ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 18717f40f4fe..6bedbefb1954 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.15.3"; + version = "0.15.5"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TZnJebxLwgnP9woC0downJv4xrAzjioLZuvqd8fzxGE="; + sha256 = "sha256-ryIiWpFoh0KSmyLI4LDn+EkXEYwDIr8/A7opoZJ+bo4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 642d3c7e97f5..7b35cbb3008b 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-9NS0/fLW2zEmEXhI9GfNN3C/CeI5xibFHwMoUebI90U="; + hash = "sha256-YxAkozyWNTKMCIEk3AhHZbRHtzhRrCSB3wh/Qy9CIyU="; }; postPatch = '' @@ -78,6 +78,12 @@ buildPythonPackage rec { "tests/extra_setuptools/test_setuphelper.py" ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ + # expects KeyError, gets RuntimeError + # https://github.com/pybind/pybind11/issues/4243 + "test_cross_module_exception_translator" + ]; + meta = with lib; { homepage = "https://github.com/pybind/pybind11"; changelog = "https://github.com/pybind/pybind11/blob/${src.rev}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index ee77b3e10358..5d17ecef0386 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.21.0"; + version = "1.23.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cwkGN5O15DduCLkFWeh8DPO4lY64iIlCQaUsCBKB8Mw="; + sha256 = "sha256-tkyVTJUdL2pBpBUpWsiDPKnd5OV88w3TdEOMxMc+hPM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 74dc59aefbe8..84a7cbe1ba42 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -1,18 +1,24 @@ { lib +, aiodns , buildPythonPackage , c-ares , cffi , fetchPypi , idna +, pythonOlder +, tornado }: buildPythonPackage rec { pname = "pycares"; - version = "4.2.2"; + version = "4.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4fV6gAQ3AIBpS9b7lpof/JFxpZxoJNVPeRwbLk0pg4U="; + hash = "sha256-xUJpb22sl46dmRkjhHRaZfgKfZRQUBFR5KdWPgYBDUU="; }; buildInputs = [ @@ -31,11 +37,18 @@ buildPythonPackage rec { # Requires network access doCheck = false; - pythonImportsCheck = [ "pycares" ]; + passthru.tests = { + inherit aiodns tornado; + }; + + pythonImportsCheck = [ + "pycares" + ]; meta = with lib; { description = "Python interface for c-ares"; homepage = "https://github.com/saghul/pycares"; + changelog = "https://github.com/saghul/pycares/releases/tag/pycares-${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index 6a344365b25b..a1a17fd8dc59 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyclip"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spyoungtech"; repo = pname; - rev = "v${version}"; - hash = "sha256-NCWmCp4VGwwvubqN8FUUJ0kcZbXjOEyB6+BfGky1Kj4="; + rev = "refs/tags/v${version}"; + hash = "sha256-0nOkNgT8XCwtXI9JZntkhoMspKQU602rTKBFajVKBoM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 9216f0d5b893..2f0f500f6784 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyclipper"; - version = "1.3.0.post3"; + version = "1.3.0.post4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-viBnmzbCAH9QaVHwUq43rm11e8o3N/jtGsGpmRZokaw="; + hash = "sha256-FMqOZ0WOorTtbdweeu9UdoUNWOPrcwc+0SK+55XxyQQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index f3817a16d996..a2c3cb01511c 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "3.6"; + version = "3.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-96M/QKt4AdiZoZ7L9AHocSyZPkwEb2iuRJKW3rVP3hc="; + sha256 = "sha256-Yow5MVbaBgKA7U6RNpS/Yh1mG3XSLKPSDsUeBRSln1U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index c0e0043d0597..6f425f10bf21 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pycognito"; - version = "2022.08.0"; + version = "2022.12.0"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-A80iYF2zwM2YkhnwJMU/bZezsCzs389ro1fikG8vXSA="; + sha256 = "sha256-WepDna9f3Z3dBxWdE6G7nbl3yPK5vMG+7X1rxbZwdjE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index c0ea080396bd..e2a41cca4a3a 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -24,11 +24,11 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2022.1"; + version = "2022.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rNkDDZPnbmCxIuM60WvPAbsTRPTDBN7f8c0r/7DzE6M="; + sha256 = "sha256-zZLnJGu0WsNFKVWhEHFBEmdM3ztKni9P8lpBWcaE5rs="; }; preConfigure = with lib.versions; '' diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 31f456dabc68..7ccd400326ae 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, autoflake , cython , devtools , email-validator @@ -9,6 +10,7 @@ , pytestCheckHook , python-dotenv , pythonOlder +, pyupgrade , typing-extensions # dependencies for building documentation. # docs fail to build in Darwin sandbox: https://github.com/samuelcolvin/pydantic/issues/4245 @@ -27,7 +29,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.9.2"; + version = "1.10.4"; outputs = [ "out" @@ -41,7 +43,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZGFxyQ1qD3zZWTdfTeoGj3UcUwAzO8K0DySdVAsMHyI="; + sha256 = "sha256-BFyv1uVq2pLcJeS5955G/pDA3ce9YTqZ6F7kAkwnuvY="; }; postPatch = '' @@ -52,6 +54,7 @@ buildPythonPackage rec { cython ] ++ lib.optionals withDocs [ # dependencies for building documentation + autoflake ansi2html markdown-include mdx-truly-sane-lists @@ -67,6 +70,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ devtools email-validator + pyupgrade python-dotenv typing-extensions ]; @@ -76,6 +80,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # https://github.com/pydantic/pydantic/issues/4817 + "-W" "ignore::pytest.PytestReturnNotNoneWarning" + ]; + preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 1f0bcc15b3ea..817a39cedf9e 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyelftools"; - version = "0.28"; + version = "0.29"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +17,16 @@ buildPythonPackage rec { owner = "eliben"; repo = pname; rev = "v${version}"; - hash = "sha256-+T5C0ah2oj5E8fWaQbuzYRVgD5bSiUbaArrlxNLojvw="; + hash = "sha256-tPY0C5CoA9hGHeEA/KWQ1RAVT5kqMlAwuWpOSH+KJ9Y="; }; doCheck = stdenv.hostPlatform.system == "x86_64-linux" && stdenv.hostPlatform.isGnu; checkPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" test/external_tools/readelf - ${python.interpreter} test/all_tests.py + ${python.interpreter} test/run_all_unittests.py + ${python.interpreter} test/run_examples_test.py + ${python.interpreter} test/run_readelf_tests.py --parallel ''; pythonImportsCheck = [ @@ -34,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for analyzing ELF files and DWARF debugging information"; homepage = "https://github.com/eliben/pyelftools"; + changelog = "https://github.com/eliben/pyelftools/blob/v${version}/CHANGES"; license = licenses.publicDomain; maintainers = with maintainers; [ igsha pamplemousse ]; }; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index bac9202a2b22..67364ba58ebd 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.6.3"; + version = "5.0.0"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bfEqfPZXY3obA2vCAFlyfGQvkpkOkP7i+wA9qjzabKE="; + sha256 = "sha256-GdHY8e5SCJHXi27QXCB44HktVF+D3uM0YfuqXMcuGH0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 7404a5fefcbb..f57004f3727d 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "064"; + version = "067"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - sha256 = "sha256-13+fK1hYxiMh0T+xbbmHViZjyBoQfRyIDc05fIJ/46U="; + sha256 = "sha256-ZBd9jq+20A8kxsvZxuCIfyzuZvk5/73vhh4xmExuwGQ="; }; propagatedBuildInputs = [ pygame python-i18n ]; diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index 3b22c119ba20..c6ce198ee26d 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pygeos"; - version = "0.13"; + version = "0.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HDcweKrVou/tHDnNcceXqiAzvzCH8191FrrIm+ULmGE="; + sha256 = "sha256-MPvBf2SEQgC4UTO4hfz7ZVQbh3lTH270+P5GfT+6diM="; }; patches = [ diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 413b79c562b1..35230d44a5aa 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.10.1"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NUZRvwYsAtHwgEHW+/GptL96k6/OZZeb3Ai9xlZTqi4="; + hash = "sha256-eT9YP9M2IPCsODdtsPV3aO8pIribRZ51saxEA3frZOw="; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index f1c4bb44d9ae..b8aa22e9251b 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.27"; + version = "2.0.2.1"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TQDgZ0UfOxD9UbaXZP3atlRENyoto0TuKzXwqObr8AU="; + sha256 = "sha256-WonGjdooD3Yb3rAha536An+y4nUZoOo8FvZViyBPHl8="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index a2a993de7f17..83c7bc5cc0fa 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Z38fZvmeWDLZEIyH+UG6Nb6KNnjEuXIn3RRH4CPWz9A="; + sha256 = "sha256-wbqJaibRZW7qiNyLArr7I/dzHprILHQpORtdHWkIfSE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 8abf3b8ea44b..86467a66aa40 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-CIkttiijbJCR0zdmwM5JvFogQKYuHUXHJhdyWonHcGk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + nativeBuildInputs = [ hatch-vcs hatchling @@ -34,10 +39,12 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'dynamic = ["version"]' 'version = "${version}"' - ''; + disabledTests = [ + # Tests started failing with numpy 1.24 + "test_numpy_numeric_type_complex" + "test_numpy_numeric_type_float" + "test_numpy_numeric_type_int" + ]; pythonImportsCheck = [ "hamcrest" diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index a46a05ba9c23..bd3b33578d05 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyjwt"; - version = "2.5.0"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyJWT"; inherit version; - sha256 = "sha256-53q4lICQXYaZhEKsV4jzUzP6hfZQR6U0rcOO3zyI/Ds="; + sha256 = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index b4b442945962..642e5ba9d581 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c0L3XnMRA+ZT/B9rn9q8JBDPkrbnsGFggEp1eGybV0c="; + sha256 = "sha256-eAtpPQVVuFfXqrMeNdQpO/Tr253sekW6S7I7RAD2Jtw="; }; buildInputs = [ openmp ]; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 64f8e62c2862..321507c3ce6e 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchurl , isPyPy +, pythonAtLeast , liblo , cython }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "pyliblo"; version = "0.10.0"; - disabled = isPyPy; + disabled = isPyPy || pythonAtLeast "3.11"; src = fetchurl { url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index e572ec542fbc..af522cd2171b 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "0.14.2"; + version = "1.0.0"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; rev = "refs/tags/v${version}"; - hash = "sha256-4jmFU8jlrEAYTAQH+uQCWrzqwKX4onb7Xk4iTYzx9dI="; + hash = "sha256-05mg2raHiKg0gHxF/7zFd81C/8OrhStThMwEnpaFGSc="; }; propagatedBuildInputs = [ psutil six future ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index a8a0229f8621..60204d70ca64 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -16,6 +16,7 @@ , tomlkit , typing-extensions , gitpython +, py , pytest-timeout , pytest-xdist , pytestCheckHook @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.15.5"; + version = "2.15.9"; format = "pyproject"; disabled = pythonOlder "3.7.2"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - hash = "sha256-dchzwMaUhHB1TqcaMZO9tCZ4KA5I1T+tdkGOxikm5AY="; + hash = "sha256-T+om5rrG0Gjyr05L5X4j82/S11Q7JBUDNOm4gVEQ494="; }; patches = [ @@ -75,6 +76,7 @@ buildPythonPackage rec { checkInputs = [ gitpython # https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt + py pytest-timeout pytest-xdist pytestCheckHook diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index dbb35d71c5dd..aef852cafc55 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.3"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,17 +20,9 @@ buildPythonPackage rec { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-fZ2bPPjBK/H2jMI4S3EhvWJaNl4tK7HstxcHSAkoFW4="; + hash = "sha256-BpYg2noReHFgJ/5iQI09XUWNAN7UdcYgqpZ/IPr17Ao="; }; - patches = [ - (fetchpatch { - name = "0001-adapt-test-to-latest-mypy.patch"; - url = "https://github.com/python-lsp/pylsp-mypy/commit/99cf687798464f810b128881dbbec82aa5353e04.patch"; - sha256 = "sha256-wLaGMaW/gTab2fX7zGnemLQQNDWxBURYb7VsgEas61Y="; - }) - ]; - propagatedBuildInputs = [ mypy python-lsp-server diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index baa31b40e342..d9b51d9d0755 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.35"; + version = "2.4.37"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P2pqcxI6w9cw4b26g5ad5CeW9Sf1fNN0FGiIzOWfOCU="; + sha256 = "sha256-dU561/kOBW++mrfzX/kqNVPgi7m/QniBrCJxBD/fZ1Y="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index b61766324130..8603eeabdee1 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "4.4.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-ZBltvvKXfqHYLeYOEYFK8kQc0wHM9+UHLRJFMSYX4Ow="; + hash = "sha256-uWvzWbZyRRE8L9X9+azmN+1JYahwwNSYCk2fQ/C8Yi0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 08749312580c..a360517eb128 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -38,14 +38,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "9.5"; + version = "9.9"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - sha256 = "sha256-bgvoY+8bbGoG1A93A+Uan1UDpQmEUu/TJu3FOkXechQ="; + sha256 = "sha256-JZtze6KjiBJGEQzA8lsTShhZu96wxAr4KeKzCe0A18Q="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix index 162f3ab55966..8cece9b0e67a 100644 --- a/pkgs/development/python-modules/pymeeus/default.nix +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyMeeus"; - version = "0.5.11"; + version = "0.5.12"; src = fetchPypi { inherit pname version; - sha256 = "bb9d670818d8b0594317b48a7dadea02a0594e5344263bf2054e1a011c8fed55"; + sha256 = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 41babc82175e..bb002a0fe8eb 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -9,6 +9,7 @@ , pygments , pyserial , pyserial-asyncio +, pytest-asyncio , pytestCheckHook , redis , sqlalchemy @@ -18,13 +19,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.5.3"; + version = "3.0.2"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-7zuFKJuKc+J4g7qoK22xed8dmXJatQbQXz4aKAOcvN8="; }; # Twisted asynchronous version is not supported due to a missing dependency @@ -41,6 +42,7 @@ buildPythonPackage rec { checkInputs = [ asynctest mock + pytest-asyncio pytestCheckHook redis sqlalchemy diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 285a729eb894..292e7fceead6 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,18 +2,25 @@ , buildPythonPackage , fetchPypi , pythonOlder +, dnspython }: buildPythonPackage rec { pname = "pymongo"; - version = "4.2.0"; - disabled = pythonOlder "3.6"; + version = "4.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cvM49qq9N9NDvZ0f3T3pIRBNOVdmvMXNxAOeTC3Zd2Y="; + hash = "sha256-NOlf+wpov/vDtDfy0fJfyRb+899c3u0JktpfQvrpuAc="; }; + propagatedBuildInputs = [ + dnspython + ]; + # Tests call a running mongodb instance doCheck = false; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 8095ee1b7c0c..075444ca17bd 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.21.0"; + version = "1.21.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMuPDF"; inherit version; - hash = "sha256-pj38KJ4SeharYDEO5gBf6DEhx6l/fBINtoj5KByeXQ8="; + hash = "sha256-+BV0GkNcYqADa7y/X6bFM1Z71pxTONQTcU/FeyLbk+A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 725a2dbcf43b..18775d0facf5 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , importlib-metadata , joblib , llvmlite @@ -23,6 +24,18 @@ buildPythonPackage rec { hash = "sha256-p8VSVpv2BKEB/VS7odJ8EjieBllF3uOmd3pRjGOkbys="; }; + patches = [ + # Fix sklearn 1.2.0 compat; https://github.com/lmcinnes/pynndescent/issues/207 + (fetchpatch { + url = "https://github.com/lmcinnes/pynndescent/commit/00444be2107b71169b853847e7b334623c58a4e3.patch"; + hash = "sha256-mbe01BwroS5q6hENsj3NejmGGhmk2IeX4LD6Iq6PR0c="; + }) + (fetchpatch { + url = "https://github.com/lmcinnes/pynndescent/commit/e56b92776a4a05f2dabb80d25479bd37e7ebd88e.patch"; + hash = "sha256-zVTaW4syGEHh2HAGPyBN3YXqUGe55v/LxKLX/zjXT5Y="; + }) + ]; + propagatedBuildInputs = [ joblib llvmlite diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix index 91cff70bae35..a0a884297737 100644 --- a/pkgs/development/python-modules/pynrrd/default.nix +++ b/pkgs/development/python-modules/pynrrd/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynrrd"; - version = "0.4.3"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mhe"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4UM2NAKWfsjxAoLQCFSPVKG5GukxqppywqvLM0V/dIs="; + hash = "sha256-R/bUItF2BaKTFdMNBHFJKq0jSX6z49e8CGXENUn07SU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index 621850742af2..d9172c959550 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "2.4.0.0"; + version = "2.5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - hash = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg="; + hash = "sha256-0dxWtlN3x3orBgtCTxTsql39+MBVsgeHO7gXjOO8qcA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix new file mode 100644 index 000000000000..6e719ea6f417 --- /dev/null +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build time +, hatchling +, hatch-vcs +, setuptools-scm + +# runtime +, packaging +, toml +, tomli + +# docs +, sphinxHook +, furo +, sphinx-autodoc-typehints + +# tests +, pytest-mock +, pytestCheckHook +, virtualenv +, wheel +}: + +buildPythonPackage rec { + pname = "pyproject-api"; + version = "1.2.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "tox-dev"; + repo = "pyproject-api"; + rev = "refs/tags/${version}"; + hash = "sha256-IRNg0/lTWoS8znsbipZNoeun+uOpZtCApL4HkF2lwhU="; + }; + + outputs = [ + "out" + "doc" + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatchling + hatch-vcs + setuptools-scm + + # docs + sphinxHook + furo + sphinx-autodoc-typehints + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + virtualenv + wheel + ]; + + disabledTests = [ + # requires eol python2 interpreter + "test_can_build_on_python_2" + ]; + + pythonImportsCheck = [ + "pyproject_api" + ]; + + meta = with lib; { + changelog = "https://github.com/tox-dev/pyproject-api/releases/tag/${version}"; + description = "API to interact with the python pyproject.toml based projects"; + homepage = "https://github.com/tox-dev/pyproject-api"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix new file mode 100644 index 000000000000..dd882531105b --- /dev/null +++ b/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit-core +, pytestCheckHook +, pythonOlder +, setuptools +, testpath +, tomli +}: + +buildPythonPackage rec { + pname = "pyproject-hooks"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi rec { + pname = "pyproject_hooks"; + inherit version; + hash = "sha256-8nGymLl/WVXVP7ErcsH7GUjCLBprcLMVxUztrKAmTvU="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + checkInputs = [ + pytestCheckHook + setuptools + testpath + ]; + + disabledTests = [ + # fail to import setuptools + "test_setup_py" + "test_issue_104" + ]; + + pythonImportsCheck = [ + "pyproject_hooks" + ]; + + meta = with lib; { + description = "Low-level library for calling build-backends in `pyproject.toml`-based project "; + homepage = "https://github.com/pypa/pyproject-hooks"; + changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pypytools/default.nix b/pkgs/development/python-modules/pypytools/default.nix index e88891172deb..1828ede0a921 100644 --- a/pkgs/development/python-modules/pypytools/default.nix +++ b/pkgs/development/python-modules/pypytools/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { checkInputs = [ freezegun numpy + py pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index b0cc9c7f91cd..48bc622f4adb 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-4Afl0ROCpY78+4+61xxy6vEGbIZsaNxURXDEGMGCiks="; + hash = "sha256-Pt1DgbAg0S6KtQ6+ApjHpo0VC4oCT5mK2G/ax6MI1Q4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 5a1b66bfa26c..35758684474f 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.18.1"; + version = "0.19.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-1NYfi5k6clW6cU3zrKUnAPgSUon4T3BM+AkWUXxG65Y="; + sha256 = "sha256-GimUdzcGu7SZXDGpe8lPFBgxSSO9EEjG2WSDcEA3ZEA="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 55883383c61d..461d0c19d854 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.19.1"; + version = "0.20.0"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "refs/tags/v${version}"; - sha256 = "sha256-fbvfobffLha1eFatnHvh0tOYcuMRLTmy/BJ9QXFHx2o="; + sha256 = "sha256-7yEZJ+iIw4qOxsanlKQlqt1bfi8MvyYjGJWiVDmXBrc="; }; nativeBuildInputs = [ samtools ]; diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 4fd0bacc89e6..ad68da4478db 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.22"; + version = "1.0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrey-git"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AUcdKcdoYCg8OgUcFoLLpNK5GQMTg89XCR5CkTfNkcc="; + hash = "sha256-lLorBf4HjynkTyLfKGcxEpSzyCawjKDej/HFtHl/Ar8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index b33a1bd9f385..f3d2589d62e6 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ pytestCheckHook wireshark-cli ]; + checkInputs = [ py pytestCheckHook wireshark-cli ]; pythonImportsCheck = [ "pyshark" ]; diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 01f30bf2d5f1..497f76c9ec93 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -1,26 +1,28 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pyasn1 , pythonOlder +, tqdm }: buildPythonPackage rec { pname = "pysmb"; - version = "1.2.8"; + version = "1.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - format = "setuptools"; - extension = "zip"; - hash = "sha256-OwfbFiF0ZQOdDCVpTAcFuDZjyoIlniCfNWbVd1Nqc5U="; + src = fetchFromGitHub { + owner = "miketeo"; + repo = "pysmb"; + rev = "refs/tags/pysmb-${version}"; + hash = "sha256-2AZAtypotSVXWfwokUpfWYQMiMq6EgbdBx2G7bU0Cqw="; }; propagatedBuildInputs = [ pyasn1 + tqdm ]; # Tests require Network Connectivity and a server up and running @@ -33,6 +35,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/miketeo/pysmb/releases/tag/pysmb-${version}"; description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines"; homepage = "https://miketeo.net/wp/index.php/projects/pysmb"; license = licenses.zlib; diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix index 425d1a67f136..462ed0f0b139 100644 --- a/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/pkgs/development/python-modules/pyspellchecker/default.nix @@ -1,20 +1,29 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "pyspellchecker"; - version = "0.7.0"; - format = "setuptools"; + version = "0.7.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-zKbDJCjuOI0Vsbh+lK/Dv5T7GGK6hIo7RJvs1inSatM="; + src = fetchFromGitHub { + owner = "barrust"; + repo = "pyspellchecker"; + rev = "refs/tags/v${version}"; + hash = "sha256-DM1Q8OirFMoYqjdSnsNL5r7Zxffxc0DEXwv1W6y8GnE="; }; - # no tests in PyPI - doCheck = false; + nativeBuildInputs = [ + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Pure python spell checking"; diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 966fb6679237..303310a6b5dc 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.5.3"; + version = "0.7.0"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-awlS1VHXj6n9Ee4qUI1x5tEdkMF/ZEr9NPKh4ICkv3g="; + sha256 = "sha256-FtXHbPilQKqo/pmFAYRCoSHkq2fIhP9DYi8kNNBz7uM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 120867f389cc..dd258c380c6f 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -1,22 +1,69 @@ -{ lib, python, fetchPypi, buildPythonPackage, cython }: +{ lib +, python +, fetchPypi +, fetchFromGitHub +, fetchpatch +, buildPythonPackage +, cython +, libstemmer + }: buildPythonPackage rec { pname = "PyStemmer"; - version = "2.0.1"; + version = "2.2.0"; + format = "setuptools"; - src = fetchPypi { + src' = fetchPypi { inherit pname version; - sha256 = "9b81c35302f1d2a5ad9465b85986db246990db93d97d3e8f129269ed7102788e"; + sha256 = "sha256-4hcbkbhrscap3d8J6Mhn5Ij4vWm94H0EEKNc3O4NhXw="; + }; + + src = fetchFromGitHub { + owner = "snowballstem"; + repo = "pystemmer"; + rev = "refs/tags/v${version}"; + hash = "sha256-bJVFeO7XP+aZ2nowQiuws5ziL/FmS1eaOllW6QxA70U="; }; nativeBuildInputs = [ cython ]; - preBuild = '' - cython src/Stemmer.pyx + patches = [ + (fetchpatch { + # Allow building with system libstemmer + url = "https://github.com/snowballstem/pystemmer/commit/2f52b4b2ff113fe6c33cebe14ed4fd4388bb1742.patch"; + hash = "sha256-JqR/DUmABgWaq23CNjoKSasL0mNhM2QuU986mouK6A8="; + }) + (fetchpatch { + # Fix doctests + url = "https://github.com/snowballstem/pystemmer/commit/b2826f19fe8ba65238b5f3b4cee7096a698f048e.patch"; + hash = "sha256-VTZydjYaJJ/KoHD4KbON36kZnkuAyO51H0Oeg6VXTqg="; + }) + ]; + + postConfigure = '' + export PYSTEMMER_SYSTEM_LIBSTEMMER="${lib.getDev libstemmer}/include" ''; + NIX_CFLAGS_COMPILE = [ + "-I${lib.getDev libstemmer}/include" + ]; + + NIX_CFLAGS_LINK = [ + "-L${libstemmer}/lib" + ]; + + #preBuild = '' + # cython src/Stemmer.pyx + #''; + + pythonImportsCheck = [ + "Stemmer" + ]; + checkPhase = '' + runHook preCheck ${python.interpreter} runtests.py + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 728544bd2618..a1e43a28435a 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -40,6 +40,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # pytest 7.2.0 incompatibilities + # https://github.com/aio-libs/pytest-aiohttp/issues/50 + "tests/test_fixtures.py" + ]; + meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/v${version}/CHANGES.rst"; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 855b5f618f81..e13f67ec83b5 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.19.0"; + version = "0.20.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A8ngASbSRwY4RjanalnWBGgskZMDO50ffOf6wMNqOvA="; + hash = "sha256-oq28wJ/Tq4yuQ/98tdzYKDyatpliS0Xcbc6T46ZTP7I="; }; outputs = [ diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index cfae0cb2bf95..8490fba2b369 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,48 +1,49 @@ { lib , buildPythonPackage , fetchFromGitHub -, execnet -, glob2 , Mako -, mock , parse , parse-type -, py +, poetry-core , pytest , pytestCheckHook , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "pytest-bdd"; - version = "6.0.0"; - format = "setuptools"; + version = "6.1.1"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1dyAhvEw8gUe78qDpgrcwl6grWKiwPgSe/QeFAjBzZg="; + hash = "sha256-+76jIgfDQPdIoesTr1+QUu8wmOnrdf4KT+TJr9F2Hqk="; }; + nativeBuildInputs = [ + poetry-core + ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ - glob2 Mako parse parse-type - py + typing-extensions ]; checkInputs = [ pytestCheckHook - execnet - mock + setuptools ]; preCheck = '' diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index f13cf9bba100..bda2aec16cf6 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.0.10"; + version = "1.3.0"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-ng7c10Dyxb5qbO22TDkNl5wAzXg2eYrLO21sjtEBoio="; + hash = "sha256-o4eWjWJSVzjNnzalKAEzFtfZFc8Mz1vhRqOOf/+gu6k="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 971b12dc01c7..88e77f9f7ce9 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"; + sha256 = "sha256-mWt5795kM829AIiHLbxfs+1/4VeLaM27pjTxS7jdBHA="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-describe/default.nix b/pkgs/development/python-modules/pytest-describe/default.nix index 7f5fbf361597..52e7764ce43b 100644 --- a/pkgs/development/python-modules/pytest-describe/default.nix +++ b/pkgs/development/python-modules/pytest-describe/default.nix @@ -6,6 +6,7 @@ , pytest # tests +, py , pytestCheckHook }: @@ -27,6 +28,7 @@ buildPythonPackage { ]; checkInputs = [ + py pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 9f722ca92836..531e21fc4b50 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -5,13 +5,14 @@ , pytest , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pytest-doctestplus"; version = "0.12.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging + setuptools ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 72df18c88475..6947f56b8b11 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -1,15 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, hatch-vcs +, hatchling +, pytest +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-env"; - version = "0.6.2"; + version = "0.8.1"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "1hl0ln0cicdid4qjk7mv90lw9xkb0v71dlj7q7rn89vzxxm9b53y"; + pname = "pytest_env"; + inherit version; + hash = "sha256-17L1Jz7G0eIhdXmYvC9Q0kdO19C5MxuSVWAR+txOmr8="; }; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + buildInputs = [ + pytest + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Pytest plugin used to set environment variables"; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 594a5efaa894..2feb14f01248 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , setuptools-scm , py , pytest @@ -19,6 +20,18 @@ buildPythonPackage rec { sha256 = "sha256-i2dYfI+Yy7rf3YBFOe1UVbbtA4AiA0hd0vU8FCLXRA4="; }; + patches = [ + # pytest 7.2.0 compat, remove after 1.4.0 + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-forked/commit/c3c753e96916a4bc5a8a37699e75c6cbbd653fa2.patch"; + hash = "sha256-QPgxBeMQ0eKJyHXYZyBicVbE+JyKPV/Kbjsb8gNJBGA="; + }) + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-forked/commit/de584eda15df6db7912ab6197cfb9ff23024ef23.patch"; + hash = "sha256-VLE32xZRwFK0nEgCWuSoMW/yyFHEURtNFU9Aa9haLhk="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ @@ -29,7 +42,12 @@ buildPythonPackage rec { py ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + py + pytestCheckHook + ]; + + setupHook = ./setup-hook.sh; meta = { description = "Run tests in isolated forked subprocesses"; diff --git a/pkgs/development/python-modules/pytest-forked/setup-hook.sh b/pkgs/development/python-modules/pytest-forked/setup-hook.sh new file mode 100644 index 000000000000..e613feadf834 --- /dev/null +++ b/pkgs/development/python-modules/pytest-forked/setup-hook.sh @@ -0,0 +1,25 @@ +pytestForkedHook() { + pytestFlagsArray+=( + "--forked" + ) + + # Using --forked on darwin leads to crashes when fork safety is + # enabled. This often happens when urllib tries to request proxy + # settings on MacOS through `urllib.request.getproxies()` + # - https://github.com/python/cpython/issues/77906 + if [[ "$OSTYPE" == "darwin"* ]]; then + export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES + fi +} + +# the flags should be added before pytestCheckHook runs so +# until we have dependency mechanism in generic builder, we need to use this ugly hack. + +if [ -z "${dontUsePytestForked-}" ] && [ -z "${dontUsePytestCheck-}" ]; then + if [[ " ${preDistPhases:-} " =~ " pytestCheckPhase " ]]; then + preDistPhases+=" " + preDistPhases="${preDistPhases/ pytestCheckPhase / pytestForkedHook pytestCheckPhase }" + else + preDistPhases+=" pytestForkedHook" + fi +fi diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 78b2de292f1d..dea7f772f78f 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-html"; - version = "3.1.1"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3"; + sha256 = "sha256-xOL0uwv/xDf1GtIXSoo+cd+Bu8L2iUYE5gSvGPvmh8M="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index cba9a9294e7c..eebbcacb5037 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -1,35 +1,50 @@ { lib , buildPythonPackage -, fetchPypi -, pytest-cov +, fetchFromGitHub +, poetry-core , pytestCheckHook +, pythonOlder , requests +, toml , werkzeug }: buildPythonPackage rec { pname = "pytest-httpserver"; version = "1.0.6"; + format = "pyproject"; - src = fetchPypi { - pname = "pytest_httpserver"; - inherit version; - sha256 = "sha256-kEDQe/WaxF2N49sdRGj9LR1geXXk2kyHLswEAs2/ez4="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "csernazs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-LY5Ur0cIcsNrgvyQlY2E479ZzRcuwqTuiT2MtRupVcs="; }; - propagatedBuildInputs = [ werkzeug ]; - - checkInputs = [ - pytest-cov - pytestCheckHook - requests + nativeBuildInputs = [ + poetry-core ]; - pythonImportsCheck = [ "pytest_httpserver" ]; + propagatedBuildInputs = [ + werkzeug + ]; + + checkInputs = [ + pytestCheckHook + requests + toml + ]; + + pythonImportsCheck = [ + "pytest_httpserver" + ]; meta = with lib; { description = "HTTP server for pytest to test HTTP clients"; homepage = "https://www.github.com/csernazs/pytest-httpserver"; + changelog = "https://github.com/csernazs/pytest-httpserver/blob/${version}/CHANGES.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 6a66727b1ebb..45c094d9f3c2 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.21.0"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; - rev = "v${version}"; - hash = "sha256-mUzmtZCguaab4fAE7VcUhv+NQVYiPpxxHpiVVlzwrIo="; + rev = "refs/tags/v${version}"; + hash = "sha256-pIYSXmOxLfWknWTfrnhslx76UMSSlnqzFE7qvJo1mz4="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix new file mode 100644 index 000000000000..def50bf46d65 --- /dev/null +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build +, hatchling +, pytest + +# runtime +, jupyter-core + +# optionals +, jupyter-client +, ipykernel +, jupyter-server +, nbformat + +# tests +, pytest-timeout +, pytestCheckHook +}: + +let self = buildPythonPackage rec { + pname = "pytest-jupyter"; + version = "0.6.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "pytest-jupyter"; + rev = "refs/tags/v${version}"; + hash = "sha256-kY4QHrlj0opEBywe4SpwE4Ck6l6JIzEosx6uuXh+yCQ="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + jupyter-core + ]; + + passthru.optional-dependencies = rec { + client = [ + jupyter-client + ipykernel + ]; + server = [ + jupyter-server + nbformat + ] ++ client; + }; + + doCheck = false; # infinite recursion with jupyter-server + + checkInputs = [ + pytest-timeout + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + passthru.tests = { + check = self.overridePythonAttrs (_: { doCheck = false; }); + }; + + meta = with lib; { + changelog = "https://github.com/jupyter-server/pytest-jupyter/releases/tag/v${version}"; + description = "pytest plugin for testing Jupyter core libraries and extensions"; + homepage = "https://github.com/jupyter-server/pytest-jupyter"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +}; +in self diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 321aacb5c704..7555ed351ea4 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,24 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, poetry-core , pytest +, pytestCheckHook , pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "pytest-metadata"; - version = "2.0.2"; + version = "2.0.4"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-/NL0FvFb4pWUNSezyLoWpErlpxQZOckMPcXOnRZ88qU="; + pname = "pytest_metadata"; + inherit version; + hash = "sha256-/MZT9l/jA1tHiCC1KE+/D1KANiLuP2Ci+u16fTuh9B4="; }; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + poetry-core + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Plugin for accessing test session metadata"; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index ed25a10d3a4e..3e35bcba1bb4 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , pytest , pytest-asyncio , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.8.2"; + version = "3.10.0"; disabled = pythonOlder "3.7"; @@ -18,9 +19,17 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-d/A/RVQ5JVhwApXgWu0LEJaiDUpgpPPdzeWLDDHI/KI="; + hash = "sha256-+72whe98JSoyb9jNysCqOxMz2IEfExvcxwEALhvn7U8="; }; + patches = [ + (fetchpatch { + # Remove unnecessary py.code import + url = "https://github.com/pytest-dev/pytest-mock/pull/328/commits/e2016928db1147a2a46de6ee9fa878ca0e9d8fc8.patch"; + hash = "sha256-5Gpzi7h7Io1CMykmBCZR/upM8E9isc3jEItYgwjEOWA="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index bec0ee59d0c5..e4d368bf61d4 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.9.1"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-n/o79AXBLFxr6ekuIr67arLJG5wy9FsPDJOvRzJpq1w="; + sha256 = "sha256-+EWPZCMj8Toso+LmFQn3dnlmtSe02K3M1QMsPntP09s="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 99d65ec28669..0a7c1907635f 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-quickcheck"; - version = "0.8.6"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "3ef9bde7ba1fe6470c5b61631440186d1254e276c67a527242d91451ab7994e5"; + sha256 = "sha256-UFF8ldnaImXU6al4kGjf720mbwXE6Nut9VlvNVrMVoY="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 99099d3ac924..08269f054ae9 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.3.1"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-s+xM2zTo9idgYnXYuDTGXmDhowc+MmuzcnpCcnPQIh0="; + sha256 = "sha256-Jk0j6BMt7rV0Qc9Ga3tdtEV5fzRucrZyyVt/UqR78Bs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 9b16760b23b8..8ea63cfa5ff4 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "10.2"; + version = "10.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9e1e1bad51e07642c5bbab809fc1d4ec8eebcb7de86f90f1a26e6ef9de446697"; + sha256 = "sha256-2CRNeZ+Jpu215XMB3a6ztvENZpFjjVHoCzcTEVkuKMY="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index e3b2277fa99b..64b0ff0c1d0d 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,14 +1,33 @@ -{ lib, isPyPy, buildPythonPackage, fetchPypi -, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, path, execnet -, contextlib2, termcolor, six }: +{ lib +, isPyPy +, buildPythonPackage +, fetchPypi + +# build +, pytest + +# runtime +, setuptools-git +, mock +, path +, execnet +, contextlib2 +, termcolor +, six + +# tests +, cmdline +, pytestCheckHook + }: buildPythonPackage rec { pname = "pytest-shutil"; version = "1.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0q8j0ayzmnvlraml6i977ybdq4xi096djhf30n2m1rvnvrhm45nq"; + hash = "sha256-2BZSYd5251CFBcNB2UwCsRPclj8nRUOrynTb+r0CEmE="; }; postPatch = '' @@ -16,13 +35,31 @@ buildPythonPackage rec { --replace "path.py" "path" ''; - buildInputs = [ pytest ]; - checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock path execnet contextlib2 termcolor six ]; + buildInputs = [ + pytest + ]; - checkPhase = '' - py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} - ''; + propagatedBuildInputs = [ + setuptools-git + mock + path + execnet + contextlib2 + termcolor + six + ]; + + checkInputs = [ + cmdline + pytestCheckHook + ]; + + disabledTests = [ + "test_pretty_formatter" + ] ++ lib.optionals isPyPy [ + "test_run" + "test_run_integration" + ]; meta = with lib; { description = "A goodie-bag of unix shell and environment tools for py.test"; diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 9b59eb2e55b8..4377990df3c3 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-sugar"; - version = "0.9.5"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7qeLbxW2NSd9PZAoDNOG2P7qHKsPm+dZR6Ym6LArR30="; + sha256 = "sha256-xHk0lfPDLhFPD1QWKQlGwxbrlq1aNoTc2t2pJn5Zsrg="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 4748cdedf81b..1b9ab4c8336c 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.4.0"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PVLXOBTo2xnMBM4wyvrmGgyztW0ajGxMU+oIhrjZiw8="; + hash = "sha256-3tYW0RWRbbGKbPpXWuqJ79sRWMj+vnffS0XNa7Yb0fw="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index b17b6f2f763a..9efbd95cff83 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -7,32 +7,47 @@ , filelock , execnet , pytest -, pytest-forked , psutil -, pexpect +, setproctitle }: buildPythonPackage rec { pname = "pytest-xdist"; - version = "2.5.0"; + version = "3.1.0"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-RYDeyj/wTdsqxT66Oddstd1e3qwFDLb7x2iw3XErTt8="; + hash = "sha256-QP2481RJIcXfzUhqwIDOIocOcdgs7W0uePqXwq3dSAw="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; + buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook filelock pexpect ]; - propagatedBuildInputs = [ execnet pytest-forked psutil ]; + + propagatedBuildInputs = [ + execnet + ]; + + checkInputs = [ + filelock + pytestCheckHook + ]; + + passthru.optional-dependencies = { + psutil = [ psutil ]; + setproctitle = [ setproctitle ]; + }; pytestFlagsArray = [ # pytest can already use xdist at this point "--numprocesses=$NIX_BUILD_CORES" - "--forked" ]; # access file system diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 61d0f64d1a4d..4c6473cea64d 100644 --- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -1,16 +1,7 @@ pytestXdistHook() { pytestFlagsArray+=( "--numprocesses=$NIX_BUILD_CORES" - "--forked" ) - - # Using --forked on darwin leads to crashes when fork safety is - # enabled. This often happens when urllib tries to request proxy - # settings on MacOS through `urllib.request.getproxies()` - # - https://github.com/python/cpython/issues/77906 - if [[ "$OSTYPE" == "darwin"* ]]; then - export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES - fi } # the flags should be added before pytestCheckHook runs so diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index c6262b7f1e0e..bed564319450 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -1,30 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , psutil +, py , pytest , setuptools-scm }: buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.20.0"; + version = "0.21.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AhZ1IsTcdZ+RxKsZhUY5zR6fbgq/ynXhGWgrVB0b1j8="; + sha256 = "sha256-+UcL/PiE9ymetrgqQ9KYwxi45T7DFO5iTJh+DofBtEk="; }; - nativeBuildInputs = [ setuptools-scm ]; - - buildInputs = [ pytest ]; - - propagatedBuildInputs = [ psutil ]; - - # Remove test QoL package from install_requires postPatch = '' + # Remove test QoL package from install_requires substituteInPlace setup.py \ --replace "'pytest-cache', " "" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + psutil + py + ]; + # There's no tests in repo doCheck = false; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 7690b84fd3fa..b329fee256ff 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -11,6 +11,7 @@ # propagates , attrs +, exceptiongroup , iniconfig , packaging , pluggy @@ -20,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.1.3"; + version = "7.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TzZf7C3/nBFi+DTZ8YrxuhMGLbDHCL97lG+KXHYYDDk="; + hash = "sha256-xAFOtA4Q8R81WtTjwvssbG0ZGcc/O1pDPeRwggLK3lk="; }; outputs = [ @@ -44,6 +45,8 @@ buildPythonPackage rec { pluggy py tomli + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; postInstall = '' @@ -69,7 +72,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/7.1.3/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.2.0/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index cc8181e7325c..06bc1ff0cafa 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -20,13 +20,13 @@ let ''; in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.28.4"; + version = "0.28.6"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-gsGg9zHVyDTCVZmFUI8qqXDt0ui+o3hPwjRlsYUmShg="; + sha256 = "sha256-tNV1GQsUG5BGTNGB0VBUa0Yxqv/HsRSlRfEU4KNd29w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 63cfb7c38846..6682b57ed7ae 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.11.0"; + version = "3.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-25Rytq5PupaLQJ3DL67iDdZQiQZdqpPgjSG3lqZdZXg="; + hash = "sha256-VnOQwrk2kNrmLtlzi/nyIfpFwBN4/fiWCJ2/fIoTT70="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix index 78a3b018c7ea..b108de64dd21 100644 --- a/pkgs/development/python-modules/python-http-client/default.nix +++ b/pkgs/development/python-modules/python-http-client/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - pname = "python_http_client"; + pname = "python-http-client"; version = "3.3.7"; format = "setuptools"; @@ -25,6 +25,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # checks date in license file and subsequently fails after new years + "test_daterange" + ]; + pythonImportsCheck = [ "python_http_client" ]; diff --git a/pkgs/development/python-modules/python-levenshtein/default.nix b/pkgs/development/python-modules/python-levenshtein/default.nix deleted file mode 100644 index 9795c27d9901..000000000000 --- a/pkgs/development/python-modules/python-levenshtein/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "python-levenshtein"; - version = "0.12.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "dc2395fbd148a1ab31090dd113c366695934b9e85fe5a4b2a032745efd0346f6"; - }; - - # No tests included in archive - doCheck = false; - - pythonImportsCheck = [ - "Levenshtein" - ]; - - meta = with lib; { - description = "Functions for fast computation of Levenshtein distance and string similarity"; - homepage = "https://github.com/ztane/python-Levenshtein"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ aske ]; - }; -} diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index 6d6c5c90fdfe..ffd93a2e28f0 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-nomad"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "087a7d5d2af9fd8ce5da70d29e4b456c6b8b0ea3cd16613ed50f6eb8ad6cdba6"; + sha256 = "sha256-VpngJvm9eK60lPeFIbjnTwzWWoJ9tRBDYP5SghDMbAg="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 7671e5a4a9b2..deb84265fd1c 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "python-redis-lock"; - version = "3.7.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "4265a476e39d476a8acf5c2766485c44c75f3a1bd6cf73bb195f3079153b8374"; + sha256 = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index b0d0fbd36616..4d8f29de081b 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -3,29 +3,31 @@ , buildPythonPackage , curio , fetchFromGitHub +, anyio , flask , pytest-asyncio , pytest-trio , pythonOlder , pytestCheckHook , trio +, trustme , yarl }: buildPythonPackage rec { pname = "python-socks"; - version = "2.0.3"; + version = "2.1.1"; format = "setuptools"; - disabled = pythonOlder "3.6.1"; + disabled = pythonOlder "3.6.2"; __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "romis2012"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-tVoBon9HF9MTOK+dN9g58fQO706ElNlCeULx//7hPWA="; + repo = "python-socks"; + rev = "refs/tags/v${version}"; + hash = "sha256-QvUuCS8B/6+dgzWrflizLfNlAUeOPpUPtmFaE6LGYGc="; }; propagatedBuildInputs = [ @@ -34,11 +36,15 @@ buildPythonPackage rec { async-timeout ]; + doCheck = false; # requires tiny_proxy module + checkInputs = [ + anyio flask pytest-asyncio pytest-trio pytestCheckHook + trustme yarl ]; @@ -47,6 +53,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/romis2012/python-socks/releases/tag/v${version}"; description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; homepage = "https://github.com/romis2012/python-socks"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 51ac732b1729..3799a7fda405 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-stdnum"; - version = "1.17"; + version = "1.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N04rXhORLM2/ULCyP8osPgUxF0gFwy104UXzd1Yyg0A="; + hash = "sha256-vMdj2cSa4j2l0remhtX9He7J2QUTQRYKENGscjomvsA="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 1bef56a01a40..da72cc0839af 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "pythonocc-core"; - version = "7.6.2"; + version = "7.7.0"; src = fetchFromGitHub { owner = "tpaviot"; repo = "pythonocc-core"; - rev = version; - sha256 = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-YybpwiCeBnwZfYS6ZxUbycHFn2DlqYxcNMylRN5ihFM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index a3c50a44d0fc..529d0d2a361c 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -1,17 +1,29 @@ { lib , buildPythonPackage -, docutils , fetchFromGitHub -, packaging -, pdm-pep517 -, platformdirs -, pydantic -, pytest-timeout -, pytestCheckHook , pythonOlder + +# build +, pdm-pep517 + +# docs +, docutils +, sphinxHook +, sphinx-rtd-theme +, sphinx-autodoc-typehints + +# runtime +, tomli +, packaging + +# optionals +, pydantic +, platformdirs , sphinx , tabulate -, tomli + +# tests +, pytestCheckHook }: buildPythonPackage rec { @@ -23,22 +35,32 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bagel897"; - repo = pname; + repo = "pytoolconfig"; rev = "refs/tags/v${version}"; hash = "sha256-b7er/IgXr2j9dSnI87669BXWA5CXNTzwa1DTpl8PBZ4="; }; - postPatch = '' - # License file name doesn't match - substituteInPlace pyproject.toml \ - --replace "license = { file = 'LGPL-3.0' }" "" \ - --replace 'dynamic = ["version"]' 'version = "${version}"' \ - --replace "packaging>=22.0" "packaging" - ''; + outputs = [ + "out" + "doc" + ]; + + PDM_PEP517_SCM_VERSION = version; nativeBuildInputs = [ pdm-pep517 - ]; + + # docs + docutils + sphinx-autodoc-typehints + sphinx-rtd-theme + sphinxHook + ] ++ passthru.optional-dependencies.doc; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "packaging>=22.0" "packaging" + ''; propagatedBuildInputs = [ packaging @@ -59,21 +81,19 @@ buildPythonPackage rec { ]; }; - checkInputs = [ - docutils - pytestCheckHook - ] ++ passthru.optional-dependencies.global - ++ passthru.optional-dependencies.doc; - pythonImportsCheck = [ "pytoolconfig" ]; + checkInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + meta = with lib; { - description = "Module for tool configuration"; - homepage = "https://github.com/bagel897/pytoolconfig"; changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}"; + description = "Python tool configuration"; + homepage = "https://github.com/bagel897/pytoolconfig"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab hexa ]; }; } diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index a2d8da399d28..55e580308aa8 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.6.5"; + version = "1.8.6"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CgD5g5nhz2DI4gOQyPl8/Cq6wWHzL0ALgOB5SgUOgaI="; + hash = "sha256-5AyOCeRFiV7rdmoBPx03Xju6eTR/3jiE+HQBiEmdzmo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 79750bb2435b..374187f9b97e 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,13 @@ buildPythonPackage rec { pname = "pytz"; - version = "2022.6"; + version = "2022.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6JUSQGt5PKOfWXG8mZzFOM4SXA5RwnlBvvRWi0YAleI="; + hash = "sha256-fM+ue0ssBnRkpnM8YmFnP9uP0b6QVGA5a5egc+n6aDo="; }; checkInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix index cf7b3eb2aeb0..41fbc08b0102 100644 --- a/pkgs/development/python-modules/pyu2f/default.nix +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -10,17 +10,29 @@ buildPythonPackage rec { pname = "pyu2f"; version = "0.1.5a"; + format = "setuptools"; src = fetchFromGitHub { owner = "google"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; sha256 = "0mx7bn1p3n0fxyxa82wg3c719hby7vqkxv57fhf7zvhlg2zfnr0v"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; - checkInputs = [ mock pyfakefs pytestCheckHook ]; + checkInputs = [ + mock + pyfakefs + pytestCheckHook + ]; + + disabledTestPaths = [ + # API breakage with pyfakefs>=5.0 + "pyu2f/tests/hid/linux_test.py" + ]; meta = with lib; { description = "U2F host library for interacting with a U2F device over USB"; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 829833eb94e2..3f0c4e263d81 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -10,6 +10,7 @@ , packaging , pillow , poetry-core +, py , pydantic , pyjwt , pytest-aiohttp @@ -22,6 +23,7 @@ , pythonOlder , pytz , setuptools +, setuptools-scm , termcolor , typer , ffmpeg @@ -46,8 +48,11 @@ buildPythonPackage rec { --replace "--cov=pyunifiprotect --cov-append" "" ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -74,6 +79,7 @@ buildPythonPackage rec { checkInputs = [ ffmpeg # Required for command ffprobe + py pytest-aiohttp pytest-asyncio pytest-benchmark diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 4b7a179678a3..2218f81bbdb5 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-37GptqqBSIFOpm6SpS61ZZ9C4iU5AiOduVq255mTRNo="; + hash = "sha256-1EAkE2uYjo8sUbSrF6E1AGZkKPTxkSre3ov2RU8YhfM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 4f07951be5db..54ee52c347bf 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.0.1"; + version = "8.0.0.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DVqC5giVMixj9NlGJ2gaH7ybX3hdQsdNTjuTkesao9E="; + hash = "sha256-K3gCG4TYyCiHKhrixPwBtBZ4s0bNd7Z4f3CLGnqCDG0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index a85a59ff4ab6..52ff09078e9b 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "PyWavelets"; - version = "1.3.0"; + version = "1.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-y6qdYgUtna+Np2X8jnwww46iuOnhwYhBkT37SuxnHuU="; + sha256 = "sha256-ZDevPd8IMRjCbY+Xq0OwckuVbJ+Vjp6niGWfaig0upM="; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index b80c85d8e13b..28c0da0e0434 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "3.7"; + version = "3.7.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-RRq6b0hqAzig/WwFK0VsrhHO6ar8HhMdAEIosPPNUQg="; + hash = "sha256-5e05XkyxvOGLaEwKljYFppHQ99BxDQ7wPkViRlRo1VI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix index 9833a29593e8..4e22e5f5d9cc 100644 --- a/pkgs/development/python-modules/pyworld/default.nix +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyworld"; - version = "0.3.0"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "e19b5d8445e0c4fc45ded71863aeaaf2680064b4626b0e7c90f72e9ace9f6b5b"; + sha256 = "sha256-Zo0JhCw8+nSx9u2r2wBYpkwE+c8XuTiD5tqBHhIErU0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 35bfaecda977..1ad0391ea34d 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyxattr"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "68477027e6d3310669f98aaef15393bfcd9b2823d7a7f00a6f1d91a3c971ae64"; + sha256 = "sha256-e/QM7FrpPdZWEocX29Joz8Ozso2VU214hndslPomeFU="; }; # IOError: [Errno 95] Operation not supported (expected) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 480247d01bb0..af8131306f7c 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "23.2.1"; + version = "24.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KzgaqGfs59CoLzCgx/PUOHt88uBpfjPvqlvtbFeEq80="; + hash = "sha256-IW9dfbtnFmdZ5ZsEebyoK4rPm+1gFbUmuOsQFD+wjnc="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index f7ad8da805a0..0941574a9575 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.10.4"; + version = "0.11.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit-aer"; - rev = version; - sha256 = "sha256-mf+Pgw/daFkt1bvqSeYzlO/Sd2F2MtwZcLr+h1u+eb0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-ew9ucqOWDztjB+hJTh9WkJiutVBJyVQobtEcWeUwEcw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 45764b4983ef..f731249ceef2 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-finance"; - version = "0.3.3"; + version = "0.3.4"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1XM4gBuMsvjwU4GSdQJobMyyDFZOOTbwvnUPG0nXFoc="; + sha256 = "sha256-Ijoqn6nANLsEVKA5nycd1xbW5htJ+TQm6LkiMUWTsSs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index e4761dc33b02..a9b46f5980f8 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.4.0"; + version = "0.5.0"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-WZSXt+sVeO64wCVbDgBhuGvo5jTn/JKh9oNSO7ZY9wo="; + sha256 = "sha256-wK0ZRNnU7WJlTWRJ2ce6LN6WGKlkh5jBrbXMDYcPQJI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 7c7510675f13..ee869d032f37 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.4.3"; + version = "0.5.2"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-trThxcft6AOxalOglOKPwrJ23Bqt/FmMCAucKmNmB7c="; + sha256 = "sha256-rUY5fnsWg2UisF0tGORvHot8laCs8eVAvuVKUOG5ibw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 458fa6a146e3..02782b5939d6 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -28,7 +28,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.37.0"; + version = "0.39.4"; disabled = pythonOlder "3.6"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = "refs/tags/${version}"; - sha256 = "sha256-TsDDiSWSjk2iXaxFjGXQxPFEPCR242dR26H0cpA6ZxY="; + sha256 = "sha256-4Lf+0Dq64J53qTEzr9gtuYwe1a+zIgHmgoKMTBEef8M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 5c618b418931..6eb47d0fd5f1 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , ipykernel -, jupyter_core +, jupyter-core , jupyter-client , pygments , pyqt5 @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel - jupyter_core + jupyter-core jupyter-client pygments pyqt5 diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 97d2111677f3..f1c601f76810 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2F8bEh8kpBrSbFXERuZqvbfFKIOfjE8R8VbsRUGQORQ="; + sha256 = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 48cc70d5f2af..23ed3bb47414 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -23,10 +23,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # Tests don't work with current numpy - # https://github.com/python-quantities/python-quantities/pull/195 - "test_arctan2" - "test_fix" + # test fails with numpy 1.24 + "test_mul" ]; pythonImportsCheck = [ "quantities" ]; diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 1b8c1b8bf382..1a96fc947b45 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -6,6 +6,7 @@ , cython , doCheck ? true , fetchFromGitHub +, ipython , matplotlib , numpy , packaging @@ -43,7 +44,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-rerunfailures - ] ++ passthru.optional-dependencies.graphics; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Disabling OpenMP support on Darwin. setupPyGlobalFlags = lib.optionals (!stdenv.isDarwin) [ @@ -75,6 +76,9 @@ buildPythonPackage rec { graphics = [ matplotlib ]; + ipython = [ + ipython + ]; semidefinite = [ cvxpy cvxopt diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 258cd012716c..322db5b8f9cd 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.14.0"; + version = "0.14.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-7C8XgGlpNVUONSfg9DsIS8Awpy6iDzFOLAFs1xpfHXI="; + hash = "sha256-Xyj9yA4Rif3/BWEBnFubXQxwMM0IkHQ1koFZ+HWYQcI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 7876e6667491..01dca1adf748 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.3.0"; # not x.y[ab]z, those are alpha/beta versions + version = "4"; # not x.y[ab]z, those are alpha/beta versions format = "pyproject"; disabled = pythonOlder "3.6"; @@ -38,8 +38,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; - rev = "refs/tags/${version}"; - hash = "sha256-CBnG1zNMOL3rAmnErv7XZZ2Cu9W+DnRPcjtKdmYXHUA="; + rev = "refs/tags/release-test-${version}"; + hash = "sha256-YO0FnmIEt+88f6k2mdXDSQg7UKq1Swr8wqVUGdRyQR4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 27356390cfda..5ae23438b7a2 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -18,12 +18,13 @@ , html5lib # tests +, pytest-cov , pytestCheckHook }: buildPythonPackage rec { pname = "rdflib"; - version = "6.1.1"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RDFLib"; repo = pname; - rev = version; - hash = "sha256:1ih7vx4i16np1p8ig5faw74apmbm7kgyj9alya521yvzid6d7pzd"; + rev = "refs/tags/${version}"; + hash = "sha256-GkqfSyApOFKPIiIYXhgaRZuMawk7PRYmxGDhnRI+Rz0="; }; propagatedBuildInputs = [ @@ -53,6 +54,7 @@ buildPythonPackage rec { }; checkInputs = [ + pytest-cov pytestCheckHook ] ++ passthru.optional-dependencies.networkx @@ -68,6 +70,10 @@ buildPythonPackage rec { # Requires network access "test_service" "testGuessFormatForParse" + "test_infix_owl_example1" + "test_context" + "test_guess_format_for_parse" + "rdflib.extras.infixowl" ] ++ lib.optionals stdenv.isDarwin [ # Require loopback network access "TestGraphHTTP" diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 81c489bd8c09..0b21c483cd02 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -12,20 +12,20 @@ buildPythonPackage rec { pname = "readchar"; - version = "3.0.5"; + version = "4.0.3"; format = "setuptools"; # Don't use wheels on PyPI src = fetchFromGitHub { owner = "magmax"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "sha256:01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-QMaTZRS9iOSuax706Es9WhkwU3vdcNb14dbiSt48aN0="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov readchar" "" + --replace "--cov=readchar" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index e0ba8cd57cf4..6ff9d965b288 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.1.8"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pX43E9r3e/kdG6GeS5iIpHwKv+tj7PAuOsd/z9mb/mk="; + sha256 = "sha256-5e/82CWBYRGjd6t6iXuBkhUTj45eisyG+ZIYMo+VckA="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 897a8239f0fa..4b4d283e309c 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -8,19 +8,25 @@ , requests , pytestCheckHook , responses +, setuptools }: buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.14.0"; + version = "14.26.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; - rev = version; - sha256 = "sha256-3qrjNd1jX4JP3qG9YX8MQqwPh8cvfkZa1tEk0uCwego="; + rev = "refs/tags/${version}"; + hash = "sha256-U7A9HmkXPcuYEsY/uGUVh3LYHDYhV/uizELh1/vXG+U="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 extruct diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index adaf4d86ef69..649a1192afd0 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.3.4"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3fJwcd9K3zghxPLKWdZ1JcOoLl8mi+2XuBPLT6v4eIA="; + sha256 = "sha256-e4yH0ZxF0/EnGxJIWNKlwTFgxOdNSDXignNAD6NNUig="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 1bd2d8b5d871..d41bed6136ed 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.9.13"; + version = "2022.10.31"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8HNztuVqbzoN89dbZRonjKe9NXp5YHiiapWOoc4FiP0="; + hash = "sha256-o6mJIdqaG/hFeu7mpVGUioNgFonl7N1zaJTqm77HfoM="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 070c665e8a41..13b1c662c8a4 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0.61"; + version = "0.63"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XUYTDHh0oTro6BT+h4LjRdMukOZTlWP+giFpjLciZNQ="; + hash = "sha256-qwS7frXRk4gCBoAyBFLlbpYsyQZYqMLGB/pdznwyCoA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 7a58aaddaace..a84ed43c5c05 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -12,11 +12,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.11"; + version = "3.6.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BPxEIPBUiBXQYj4DHIah9/PzAD5pnZr3FIdC4tcrAko="; + sha256 = "sha256-sTzr9OOXu6FFQrzQIzOLb/LBUaOhKqvKie7L+XLLNho="; }; patches = [ diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index a8643ca65073..da889482998c 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.9"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zhjI4MjlCV9zR0nNcss+C36CZXY/imGsalfKMGacfi0="; + hash = "sha256-pXSUVeTrxtSqKTa286xdCAAFipg38iR4XSO6CRfWXtc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index af6788d173fc..1b86cddc50f6 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "requests-toolbelt"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-loCJ1FhK1K18FxRU8KXG2sI5celHJSHqO21J1hCqb8A="; + hash = "sha256-YuCff/XMvakncqKfOUpJw61ssYHVaLEzdiayq7Yopj0="; }; propagatedBuildInputs = [ @@ -29,25 +29,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - (fetchpatch { - # Fix collections.abc deprecation warning, https://github.com/requests/toolbelt/pull/246 - name = "fix-collections-abc-deprecation.patch"; - url = "https://github.com/requests/toolbelt/commit/7188b06330e5260be20bce8cbcf0d5ae44e34eaf.patch"; - sha256 = "sha256-pRkG77sNglG/KsRX6JaPgk4QxmmSBXypFRp/vNA3ot4="; - }) - # Make pyopenssl optional - (fetchpatch { - url = "https://github.com/requests/toolbelt/commit/c7c1f8626b73e5715e6ecc1de0833fabdfd67323.patch"; - sha256 = "sha256-OhE3nyYyKKRHs9rCq8EJYebwaYyjWjbvbtL79MIMMRc="; - }) - # Make pyopenssl optional - (fetchpatch { - url = "https://github.com/requests/toolbelt/commit/2453f32f1c995e7b19294750a4177bc32326826e.patch"; - sha256 = "sha256-qmKHp+aVeazZt8X+sZeYfZCB56SE0OvFvWCXRZtkCew="; - }) - ]; - disabledTests = [ # https://github.com/requests/toolbelt/issues/306 "test_no_content_length_header" diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index d7230c532eb2..26641f51a8ed 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -6,6 +6,7 @@ , chardet , charset-normalizer , fetchPypi +, fetchpatch , idna , pysocks , pytest-mock @@ -18,6 +19,7 @@ buildPythonPackage rec { pname = "requests"; version = "2.28.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; @@ -27,6 +29,10 @@ buildPythonPackage rec { hash = "sha256-fFWZsQL+3apmHIJsVqtP7ii/0X9avKHrvj5/GdfJeYM="; }; + patches = [ + ./relax-charset-normalizer.patch + ]; + propagatedBuildInputs = [ brotlicffi certifi diff --git a/pkgs/development/python-modules/requests/relax-charset-normalizer.patch b/pkgs/development/python-modules/requests/relax-charset-normalizer.patch new file mode 100644 index 000000000000..ef14c09fffb8 --- /dev/null +++ b/pkgs/development/python-modules/requests/relax-charset-normalizer.patch @@ -0,0 +1,55 @@ +From 54ae822ce968f49a4d5a10e30c5d75e76c887fe4 Mon Sep 17 00:00:00 2001 +From: deedy5 <65482418+deedy5@users.noreply.github.com> +Date: Thu, 20 Oct 2022 18:26:18 +0000 +Subject: [PATCH] Allow charset normalizer >=2 and <4 (#6261) + +--- + requests/__init__.py | 4 ++-- + setup.cfg | 2 +- + setup.py | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/requests/__init__.py b/requests/__init__.py +index 7ac8e29..22db3c1 100644 +--- a/requests/__init__.py ++++ b/requests/__init__.py +@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver + elif charset_normalizer_version: + major, minor, patch = charset_normalizer_version.split(".")[:3] + major, minor, patch = int(major), int(minor), int(patch) +- # charset_normalizer >= 2.0.0 < 3.0.0 +- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0) ++ # charset_normalizer >= 2.0.0 < 4.0.0 ++ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0) + else: + raise Exception("You need either charset_normalizer or chardet installed") + +diff --git a/setup.cfg b/setup.cfg +index 93d1f99..ea45aaf 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -5,7 +5,7 @@ provides-extra = + use_chardet_on_py3 + requires-dist = + certifi>=2017.4.17 +- charset_normalizer>=2,<3 ++ charset_normalizer>=2,<4 + idna>=2.5,<4 + urllib3>=1.21.1,<1.27 + +diff --git a/setup.py b/setup.py +index 23977ed..092b40d 100755 +--- a/setup.py ++++ b/setup.py +@@ -59,7 +59,7 @@ if sys.argv[-1] == "publish": + sys.exit() + + requires = [ +- "charset_normalizer>=2,<3", ++ "charset_normalizer>=2,<4", + "idna>=2.5,<4", + "urllib3>=1.21.1,<1.27", + "certifi>=2017.4.17", +-- +2.38.1 + diff --git a/pkgs/development/python-modules/rfc3986-validator/default.nix b/pkgs/development/python-modules/rfc3986-validator/default.nix new file mode 100644 index 000000000000..793eb2f9fe22 --- /dev/null +++ b/pkgs/development/python-modules/rfc3986-validator/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, rfc3987 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rfc3986-validator"; + version = "0.1.1"; + format = "setuptools"; + + src = fetchPypi { + pname = "rfc3986_validator"; + inherit version; + hash = "sha256-PUS955IbO57Drk463KNwQ47M68Z2RWRJsUXVM7JA0FU="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; + + checkInputs = [ + hypothesis + pytestCheckHook + rfc3987 + ]; + + meta = with lib; { + description = "Pure python rfc3986 validator"; + homepage = "https://github.com/naimetti/rfc3986-validator"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 5d9c1f45c3b3..a760ed03dfde 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "rich"; - version = "12.6.0"; + version = "13.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Textualize"; repo = pname; - rev = "v${version}"; - hash = "sha256-g3tXftEoBCJ1pMdLyDBXQvY9haGMQkuY1/UBOtUqrLE="; + rev = "refs/tags/v${version}"; + hash = "sha256-Mc2ZTpn2cPGXIBblwwukJGiD8etdVi8ag9Xb77gG62A="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 504a5ac557ea..e0f04758b66f 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "RoboMachine"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "4251d405759a38f1e665acc245dcbcdec319376718169a73c57560183370fe0e"; + sha256 = "sha256-XrxHaV9U7mZ2TvySHGm6qw1AsoukppzwPq4wufIjL+k="; }; propagatedBuildInputs = [ pyparsing robotframework allpairspy ]; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 4f925c341dcf..2b52290fbcba 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "5.0.1"; + version = "6.0.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-aJUXqY6OFlbdLIr5Qpg27mGFm6hD+WvCrqXmf204WUo="; + sha256 = "sha256-WyT7nZfWEXLWaAU7aRnCK/Uw99iysmq4hyjEIn4DCCc="; }; checkInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index f831e7af40c0..2c91bdf72b65 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,11 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytoolconfig , pytest-timeout , pytestCheckHook , pythonOlder , setuptools -, pytoolconfig }: buildPythonPackage rec { @@ -28,17 +28,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytoolconfig - ]++ pytoolconfig.optional-dependencies.global; + ] ++ pytoolconfig.optional-dependencies.global; checkInputs = [ pytest-timeout pytestCheckHook ]; - pythonImportsCheck = [ - "rope" - ]; - disabledTests = [ "test_search_submodule" "test_get_package_source_pytest" diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index 33f8547496db..e05c08640ed9 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -1,21 +1,34 @@ -{ lib, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, appdirs +, py +, pytestCheckHook +}: buildPythonPackage rec { pname = "rply"; version = "0.7.7"; + format = "setuptools"; src = fetchFromGitHub { owner = "alex"; repo = "rply"; rev = "v${version}"; - sha256 = "1qv37hn7hhxd388znri76g0zjxsbwhxhcaic94dvw9pq4l60vqp6"; + hash = "sha256-5uINDCX4Jr4bSSwqBjvkS3f5wTMnZvsRGq1DeCw8Y+M="; }; - propagatedBuildInputs = [ appdirs ]; + propagatedBuildInputs = [ + appdirs + ]; - checkInputs = [ pytest ]; - checkPhase = '' - HOME=$(mktemp -d) py.test tests + checkInputs = [ + py + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) ''; meta = with lib; { diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index b1bebfce47c0..d295c73b2fe2 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,16 +11,20 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.10.0"; + version = "2022.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6N64DyC9CyBZFBuHT9udauuMzjUxLqXywCsiWnigBAY="; + hash = "sha256-EMWsKDpPW2f/rW0fJf9+4CYUJ1DFxdyGh0bNkE9hfDM="; }; + postPatch = '' + sed -i 's/fsspec==.*/fsspec/' requirements.txt + ''; + buildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index ebcb42920618..cac3e0fc4049 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.109.0"; + version = "2.126.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hs71bIoByh5S1ncsku+y4X2i0yU65FknJE05lEmnru4="; + hash = "sha256-wuU53FmrtAY8E08Q+W4OhBoBQ8kks3LjJiR7kxlbfAg="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 36c20604852c..22d6d1777193 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -9,13 +9,12 @@ , httptools , multidict , pytest-asyncio -, pytest-benchmark -, pytest-sugar -, pytestCheckHook + ,pytestCheckHook , pythonOlder , pythonAtLeast , sanic-routing , sanic-testing +, setuptools , ujson , uvicorn , uvloop @@ -26,7 +25,7 @@ buildPythonPackage rec { pname = "sanic"; version = "22.12.0"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,6 +36,10 @@ buildPythonPackage rec { hash = "sha256-Vj780rP5rJ+YsMWlb3BR9LTKT/nTt0C2H3J0X9sysj8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aioquic @@ -76,44 +79,34 @@ buildPythonPackage rec { pytestFlagsArray = [ "--asyncio-mode=auto" + "-vvv" ]; disabledTests = [ # Require networking "test_full_message" - # Fails to parse cmdline arguments - "test_dev" - "test_auto_reload" - "test_host_port_ipv6_loopback" + # Server mode mismatch (debug vs production) "test_num_workers" - "test_debug" - "test_access_logs" - "test_noisy_exceptions" - # OSError: foo - "test_bad_headers" - "test_create_server_trigger_events" - "test_json_body_requests" - "test_missing_startup_raises_exception" - "test_no_body_requests" - "test_oserror_warning" - "test_running_multiple_offset_warning" - "test_streaming_body_requests" - "test_trigger_before_events_create_server" - "test_keep_alive_connection_context" # Racy tests "test_keep_alive_client_timeout" "test_keep_alive_server_timeout" "test_zero_downtime" - # TLS tests - "test_missing_sni" - "test_no_matching_cert" - "test_wildcards" - # They thtow execptions + # sanic.exceptions.SanicException: Cannot setup Sanic Simple Server without a path to a directory "test_load_app_simple" - "worker/test_loader.py" - # broke with ujson 5.4 upgrade - # https://github.com/sanic-org/sanic/pull/2504 - "test_json_response_json" + # create defunct python processes + "test_reloader_live" + "test_reloader_live_with_dir" + "test_reload_listeners" + # crash the python interpreter + "test_host_port_localhost" + "test_host_port" + "test_server_run" + # NoneType object is not subscriptable + "test_serve_app_implicit" + # AssertionError: assert [] == ['Restarting a process', 'Begin restart termination', 'Starting a process'] + "test_default_reload_shutdown_order" + # App not found. + "test_input_is_dir" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 40e391347702..87ef6331196d 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -60,13 +60,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.1.1"; + version = "31.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/QLW+rxkDbrv/78xiXOuSNaQvY+0oYZQV0/m60CEZLk="; + hash = "sha256-+5zYYpH8EyHPruX9LDWzeVPny7VoFiARb4+32FXMxUc="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index e86b384f9c4a..27e2063b075a 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "0.5.7"; + version = "0.5.8"; pname = "scikit-bio"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y0PKDGIeL8xdHAQsi+MgBmTFMllWqDvqdRzxvMddHak="; + sha256 = "sha256-1VqDw+XyyhEydE4UCSM/th2a8MWpXet7KR5uNAcSuGs="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 802b50cab32f..2685c42df626 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.1.3"; + version = "0.1.5"; format = "pyproject"; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-qkVj7fS2+JB8mpJ788vTw4jhD/TGtZAMtCiBlmjbFM8="; + hash = "sha256-OUS/QOaBd0DDBrDk8c3LzFrPVrVF65EJQPRjGtnUmjU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 4a466fcef06d..e2d2cffde73c 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -23,14 +23,20 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.15.0"; + version = "0.16.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5yPNDzSJoEI3C56piLu5z9dyXoslsgyhx5gYIfz2X7k="; + hash = "sha256-KiDEreqzwq7BHXC86WkJlc/w5Tvq/jIae1MACayo5zE="; }; + # This line in the filterwarnings section of the pytest configuration leads to this error: + # E UserWarning: Distutils was imported before Setuptools, but importing Setuptools also replaces the `distutils` module in `sys.modules`. This may lead to undesirable behaviors or errors. To avoid these issues, avoid using distutils directly, ensure that setuptools is installed in the traditional way (e.g. not an editable install), and/or make sure that setuptools is always imported before distutils. + postPatch = '' + sed -i "/'error',/d" pyproject.toml + ''; + propagatedBuildInputs = [ distro packaging diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index ca5bc74c0105..ca982ecb7128 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.1.3"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vvUZeKUewZl3cA/nuGrs6knIJYhPOBF1a3SjsVK7TjU="; + sha256 = "sha256-aAtls8ruRpVBOF0spbA/9wQI9sYYxYOUgxLw0hJd9oA="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 1dd50b6380d8..38d602e291bc 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.18.0"; + version = "0.19.0.post1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LfQESmKxSJ4tWlp3EZTBajOxZC3IEOUtJmX8A5ROpmU="; + sha256 = "sha256-UBhUCpRXyd5gLxaf38wBURo2DIoUgMmROogGF3bwWJk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix new file mode 100644 index 000000000000..f8b5d45bbc7f --- /dev/null +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "setuptools-gettext"; + version = "0.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "breezy-team"; + repo = "setuptools-gettext"; + rev = "refs/tags/v${version}"; + hash = "sha256-MifsEuWNTEDJa9RfIbM/EDMJg0cmHXX6oJxNskKEbY4="; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "setuptools_gettext" + ]; + + meta = with lib; { + changelog = "https://github.com/breezy-team/setuptools-gettext/releases/tag/v${version}"; + description = "setuptools plugin for building mo files"; + homepage = "https://github.com/breezy-team/setuptools-gettext"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index b4e8cc5afa62..dc338bd41120 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -5,24 +5,33 @@ , typing-extensions , tomli , setuptools +, pythonOlder , lib }: buildPythonPackage rec { pname = "setuptools-scm"; - version = "7.0.5"; + version = "7.1.0"; + format = "pyproject"; src = fetchPypi { pname = "setuptools_scm"; inherit version; - sha256 = "sha256-Ax4Tr3cdb4krlBrbbqBFRbv5Hrxc5ox4qvP/9uH7SEQ="; + hash = "sha256-bFCDRadxqtfVbr/w5wYovysOx1c3Yr6ZYCFHMN4njyc="; }; + nativeBuildInputs = [ + packaging + setuptools + typing-extensions + ]; + propagatedBuildInputs = [ packaging - typing-extensions - tomli setuptools + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/setuptools-scm/tests.nix b/pkgs/development/python-modules/setuptools-scm/tests.nix index b90797abf7eb..c81323b27fa4 100644 --- a/pkgs/development/python-modules/setuptools-scm/tests.nix +++ b/pkgs/development/python-modules/setuptools-scm/tests.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "setuptools-scm-tests"; inherit (setuptools-scm) version; + format = "other"; src = setuptools-scm.src; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 9fab8747b67f..993850922f5c 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,7 +10,7 @@ let pname = "setuptools"; - version = "65.3.0"; + version = "65.6.3"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ let owner = "pypa"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LPguGVWvwEMZpJFuXWLVFzIlzw+/QSMjVi2oYh0cI0s="; + hash = "sha256-B/1MhH0RDW7/pUam2FHnIcUPN6NpvQYBjRyHIm+E9rI="; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index a74e6c46830e..f23cc45ebe1f 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "shapely"; version = "2.0.0"; - disabled = pythonOlder "3.7"; - format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo="; + hash = "sha256-EfGxIxpsBCE/sSJsaWjRsbOzaexC0ellUGavh2MYYOo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index b443e319290c..097cf5be5334 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "shortuuid"; - version = "1.0.9"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RZ8S+hrMNP8hOxNxRnwDJRaWRaMe2YniaIcjOa91Y9U="; + hash = "sha256-/HXyYVkUgVqOTLFQGzpRN0XLZu8P1fxvufjD+jSB94k="; }; checkInputs = [ @@ -25,10 +25,6 @@ buildPythonPackage rec { "shortuuid" ]; - pytestFlagsArray = [ - "shortuuid/tests.py" - ]; - meta = with lib; { description = "Library to generate concise, unambiguous and URL-safe UUIDs"; homepage = "https://github.com/stochastic-technologies/shortuuid/"; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index ff139523e1f4..6d805c68a850 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -1,9 +1,16 @@ -{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools-scm +{ buildPythonPackage +, fetchPypi +, isPy27 +, lib +, setuptools +, setuptools-scm +, py , pytestCheckHook }: buildPythonPackage rec { pname = "simpy"; version = "4.0.1"; + format = "setuptools"; disabled = isPy27; @@ -12,11 +19,18 @@ buildPythonPackage rec { sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + py + pytestCheckHook + ]; meta = with lib; { homepage = "https://simpy.readthedocs.io/en/${version}/"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 07a731b53d92..5facfac582c0 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.7.4"; + version = "6.7.5"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "sha256-nb+KDnyNdtFkLi/dP1PmpSL3wwmA5Sd2PEV2DCUFz78="; + sha256 = "sha256-llXQieHQxfv2a94RVYqHSYBykTK1vQwq41WsGnuJOrQ="; }; propagatedBuildInputs = [ packaging ply toml ]; diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 24fe639211d1..61e6a178660d 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -1,30 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "six"; version = "1.16.0"; + format = "setuptools"; + src = fetchPypi { inherit pname version; sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test test_six.py - ''; - - # To prevent infinite recursion with pytest - doCheck = false; + pythonImportsCheck = [ "six" ]; meta = { - description = "A Python 2 and 3 compatibility library"; - homepage = "https://pypi.python.org/pypi/six/"; + changelog = "https://github.com/benjaminp/six/blob/${version}/CHANGES"; + description = "Python 2 and 3 compatibility library"; + homepage = "https://github.com/benjaminp/six"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 1c02d592d679..49e3cc70a30b 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -1,12 +1,14 @@ { lib , stdenv , aiohttp +, boto3 , buildPythonPackage -, codecov , fetchFromGitHub -, flake8 +, flask +, flask-sockets , isPy3k , mock +, moto , psutil , pytest-cov , pytest-mock @@ -15,20 +17,23 @@ , requests , responses , six +, sqlalchemy +, websockets , websocket-client }: buildPythonPackage rec { pname = "slackclient"; - version = "2.9.3"; + version = "3.19.5"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; - rev = "v${version}"; - sha256 = "1rfb7izgddv28ag37gdnv3sd8z2zysrxs7ad8x20x690zshpaq16"; + rev = "refs/tags/v${version}"; + hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk="; }; propagatedBuildInputs = [ @@ -39,22 +44,30 @@ buildPythonPackage rec { ]; checkInputs = [ - codecov - flake8 + boto3 + flask + flask-sockets mock + moto psutil - pytest-cov pytest-mock pytestCheckHook - pytest-runner responses + sqlalchemy + websockets ]; # Exclude tests that requires network features pytestFlagsArray = [ "--ignore=integration_tests" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" + "test_interactions" + "test_send_message_while_disconnection" ] ++ lib.optionals stdenv.isDarwin [ # these fail with `ConnectionResetError: [Errno 54] Connection reset by peer` "test_issue_690_oauth_access" diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix index 273972cbe4ee..411bc3e9297e 100644 --- a/pkgs/development/python-modules/sly/default.nix +++ b/pkgs/development/python-modules/sly/default.nix @@ -1,24 +1,39 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, setuptools +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "sly"; - version = "0.4"; + version = "0.5"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0an31bm5m8wqwphanmcsbbnmycy6l4xkmg4za4bwq8hk4dm2dwp5"; + hash = "sha256-JR1CAV6FBxWK7CFk8GA130qCsDFM5kUPRX1xJedkkCQ="; }; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + ]; - # tests not included with pypi release - doCheck = false; + postPatch = '' + # imperative dev dependency installation + rm Makefile + ''; + + pythonImportsCheck = [ + "sly" + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "An improved PLY implementation of lex and yacc for Python 3"; diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix index ffb22d1c4b42..79f177b1f945 100644 --- a/pkgs/development/python-modules/smbus-cffi/default.nix +++ b/pkgs/development/python-modules/smbus-cffi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , cffi +, py , pytestCheckHook , pyserial , fetchpatch @@ -37,7 +38,7 @@ buildPythonPackage rec { # requires hardware access pytestFlagsArray = [ "--ignore=test/test_smbus_integration.py" ]; - checkInputs = [ pytestCheckHook pyserial ]; + checkInputs = [ py pytestCheckHook pyserial ]; meta = with lib; { description = "Python module for SMBus access through Linux I2C /dev interface"; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 880eab4629c6..f0299b231b06 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; version = "2.9.0"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,6 +30,12 @@ buildPythonPackage rec { hash = "sha256-dVGyQEsmhQ+xLGIy0BW6XRCtsTsJHjef6Lg2ZJL2JLg="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "charset_normalizer>=2,<3" "charset_normalizer" \ + --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL" + ''; + propagatedBuildInputs = [ asn1crypto certifi @@ -47,12 +53,6 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL" \ - --replace "charset-normalizer~=2.0.0" "charset_normalizer>=2" - ''; - # Tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 6c3df4eb6f98..70bfb13f8008 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.0"; + version = "6.1.3"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; - rev = "v${version}"; - sha256 = "sha256-T49KVAsgcAZySkaJi47IrFcMHGZvEkGDjPWsdMarzwM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix index e51f1cd143f1..af8724d1999d 100644 --- a/pkgs/development/python-modules/solc-select/default.nix +++ b/pkgs/development/python-modules/solc-select/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, packaging +, pycryptodome }: buildPythonPackage rec { pname = "solc-select"; - version = "0.2.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6VawTcffIgnR+zuC4rti+Ocwu1VMTX+VihT/L7LzchI="; + sha256 = "sha256-zrpWHQdoCVDGaDGDf9fWhnRsTe1GVwqk1qls1PyvlLw="; }; + propagatedBuildInputs = [ + packaging + pycryptodome + ]; + # no tests doCheck = false; pythonImportsCheck = [ "solc_select" ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 54c96a73cb82..c64e1384c65a 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.4.1"; + version = "3.4.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-WcXPXTSKbA5kpZrFz+bNhdCOhmM3hwyV0exhYdUx5GM="; + hash = "sha256-5QDPLLXxhJRhp5KPomlwN1YGm9+3FVkGUkCvbQIIsIw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index a4a414328b55..778ce64016b6 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -7,11 +7,12 @@ buildPythonPackage rec { pname = "sphinx-argparse"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-5UrWyPiVrGu50N2foH5H4TeipCrhinFFFSYuhrTMS6s="; + pname = "sphinx_argparse"; + inherit version; + sha256 = "sha256-4PNBhOtW8S+s53T7yHuICr25AXoJmNHsVZsmfpaX5Ek="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 85f6366f0f07..bd3edbd9c0f6 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, hatch-vcs +, hatchling , pythonOlder , sphinx , pytestCheckHook @@ -8,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.19.2"; + version = "1.19.5"; in buildPythonPackage { @@ -20,9 +22,14 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-hy+y17PXlIJsKONu32c56TVJSRRH3KvrB8WIVen5FN4="; + hash = "sha256-OKInN44rwVyE4pr4yx11gRgtoRBxEf0ciLGbXrcHYgU="; }; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + propagatedBuildInputs = [ sphinx ]; @@ -39,6 +46,7 @@ buildPythonPackage { ]; meta = with lib; { + changelog = "https://github.com/tox-dev/sphinx-autodoc-typehints/releases/tag/${version}"; description = "Type hints (PEP 484) support for the Sphinx autodoc extension"; homepage = "https://github.com/tox-dev/sphinx-autodoc-typehints"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sphinx-automodapi/default.nix b/pkgs/development/python-modules/sphinx-automodapi/default.nix index c8b586d0fc6e..9145cc416e79 100644 --- a/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -36,6 +36,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace "sphinx_automodapi/tests/helpers.py" \ --replace '[0]), None)' "[0]), (None, '${testInventory}'))" + + substituteInPlace "sphinx_automodapi/tests/test_cases.py" \ + --replace '[0]), None)' "[0]), (None, '${testInventory}'))" ''; checkInputs = [ diff --git a/pkgs/development/python-modules/sphinx-markdown-tables/default.nix b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix new file mode 100644 index 000000000000..55fb0b41f43e --- /dev/null +++ b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, markdown +}: + +buildPythonPackage rec { + pname = "sphinx-markdown-tables"; + version = "0.0.17"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-a8bT1ADqzP7r0ohEa8CN2DCDNnxYuF1A/mwS1371kvE="; + }; + + propagatedBuildInputs = [ + sphinx + markdown + ]; + + pythonImportsCheck = [ "sphinx_markdown_tables" ]; + + meta = with lib; { + description = "Sphinx extension for rendering tables written in markdown"; + homepage = "https://github.com/ryanfox/sphinx-markdown-tables"; + maintainers = with maintainers; [ Madouura ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index 246c30e79664..ad4f1b5d326e 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; - version = "0.5.2"; + version = "0.5.3"; format = "flit"; src = fetchPypi { pname = "sphinx_mdinclude"; inherit version; - hash = "sha256-F7UVe1xNrz+vCbJOCxwyJQoxfwSCORW+qu9vDH7oEPc="; + hash = "sha256-KZjj0YswIsmYPRtyGR/jfiX/zNVBZcvjrLIszu3ZGvQ="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 514ce279fe79..2820080e118c 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -9,17 +9,18 @@ buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "1.0.0"; + version = "1.1.1"; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - sha256 = "0p3abj91c3l72ajj5jwblscsdf1jflrnn0djx2h5y6f2wjbx9ipf"; + sha256 = "sha256-YUbIRfHhlHs8PdRDLCiZihaTzMdCtPmtfGMSnwdXwQM="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "docutils<0.18" "docutils" + substituteInPlace setup.cfg \ + --replace "docutils <0.18" "docutils" \ + --replace "sphinx >=1.6,<6" "sphinx" ''; preBuild = '' diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 5a27f04bd0ee..d40416019b23 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -5,6 +5,9 @@ , fetchFromGitHub , fetchpatch +# nativeBuildInputs +, flit-core + # propagatedBuildInputs , babel , alabaster @@ -34,8 +37,8 @@ buildPythonPackage rec { pname = "sphinx"; - version = "5.1.1"; - format = "setuptools"; + version = "5.3.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -43,7 +46,7 @@ buildPythonPackage rec { owner = "sphinx-doc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dTgQNMRIn7ETm+1HgviOkWWOCmLX7Ez6DM9ChlI32mY="; + hash = "sha256-80bVg1rfBebgSOKbWkzP84vpm39iLgM8lWlVD64nSsQ="; postFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ @@ -52,13 +55,9 @@ buildPythonPackage rec { ''; }; - postPatch = '' - # 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" "" - ''; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ babel diff --git a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 6f53dd79d364..799a4ba1b5cf 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-bayesnet"; - version = "0.1"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "0x1kisvj7221cxfzmwplx3xlwbavl636fpncnjh7gghp1af71clw"; + sha256 = "sha256-+M+K8WzQqxQUGgAgGPK+isf3gKK7HOrdI6nNW/V8Wv0="; }; propagatedBuildInputs = [ sphinx sphinxcontrib-tikz ]; diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index 83d813b3dbd9..a17e7ada4522 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , sqlalchemy , sqlalchemy-utils +, six }: buildPythonPackage rec { @@ -17,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy sqlalchemy-utils + six ]; # tests require running a postgresql server diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 49bba2811312..af108f17c0d3 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,58 +1,101 @@ { lib , buildPythonPackage , fetchPypi -, six +, pythonOlder + +# runtime +, importlib-metadata , sqlalchemy -, colour -, flexmock -, jinja2 -, mock -, pg8000 + +# optionals +, babel +, arrow +, pendulum +#, intervals , phonenumbers -, pygments -, pymysql -, pytestCheckHook +, passlib +, colour , python-dateutil +, furl +, cryptography + +# tests +, pytestCheckHook +, pygments +, jinja2 +, docutils +, flexmock +, psycopg2 +, psycopg2cffi +, pg8000 +, pytz +, backports-zoneinfo +, pymysql +, pyodbc + }: buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.38.3"; + version = "0.39.0"; + format = "setuptools"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "sha256-n5r7pgekBFXPcDrfqYRlhL8mFooMWmCnAGO3DWUFH00="; + hash = "sha256-s3JAkX2BwU/htuUJakArrORysXkSE4TkfBDYVNv1r5I="; }; patches = [ - # We don't run MySQL, MSSQL, or PostgreSQL ./skip-database-tests.patch ]; propagatedBuildInputs = [ - six sqlalchemy + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; + passthru.optional-dependencies = { + babel = [ babel ]; + arrow = [ arrow ]; + pendulum = [ pendulum ]; + #intervals = [ intervals ]; + phone = [ phonenumbers ]; + password = [ passlib ]; + color = [ colour ]; + timezone = [ python-dateutil ]; + url = [ furl ]; + encrypted = [ cryptography ]; + }; + checkInputs = [ - colour - flexmock - jinja2 - mock - pg8000 - phonenumbers - pygments - pymysql pytestCheckHook + pygments + jinja2 + docutils + flexmock + psycopg2 + psycopg2cffi + pg8000 + pytz python-dateutil + pymysql + pyodbc + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies) + ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ]; - disabledTests = [ - "test_literal_bind" + pytestFlagsArray = [ + "--deselect tests/functions/test_database.py::TestDatabasePostgresCreateDatabaseCloseConnection::test_create_database_twice" + "--deselect tests/functions/test_database.py::TestDatabasePostgresPg8000::test_create_and_drop" + "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop" ]; meta = with lib; { + changelog = "https://github.com/kvesteri/sqlalchemy-utils/releases/tag/${version}"; homepage = "https://github.com/kvesteri/sqlalchemy-utils"; description = "Various utility functions and datatypes for SQLAlchemy"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch b/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch index 79aa12f03d99..d5f9a46ecb88 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch +++ b/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch @@ -1,13 +1,12 @@ diff --git a/conftest.py b/conftest.py -index 9e146cd..8dbc9a5 100644 +index 4426e02..1f84096 100644 --- a/conftest.py +++ b/conftest.py -@@ -61,17 +61,12 @@ def mysql_db_user(): - +@@ -73,17 +73,12 @@ def mysql_db_user(): @pytest.fixture def postgresql_dsn(postgresql_db_user, postgresql_db_password, postgresql_db_host, db_name): -- return 'postgresql://{0}:{1}@{2}/{3}'.format( +- return 'postgresql://{}:{}@{}/{}'.format( - postgresql_db_user, - postgresql_db_password, - postgresql_db_host, @@ -18,83 +17,18 @@ index 9e146cd..8dbc9a5 100644 @pytest.fixture def mysql_dsn(mysql_db_user, db_name): -- return 'mysql+pymysql://{0}@localhost/{1}'.format(mysql_db_user, db_name) +- return f'mysql+pymysql://{mysql_db_user}@localhost/{db_name}' + pytest.skip() @pytest.fixture -@@ -108,8 +104,7 @@ def mssql_db_driver(): +@@ -121,8 +116,7 @@ def mssql_db_driver(): @pytest.fixture def mssql_dsn(mssql_db_user, mssql_db_password, mssql_db_driver, db_name): -- return 'mssql+pyodbc://{0}:{1}@localhost/{2}?driver={3}'\ +- return 'mssql+pyodbc://{}:{}@localhost/{}?driver={}'\ - .format(mssql_db_user, mssql_db_password, db_name, mssql_db_driver) + pytest.skip() @pytest.fixture -diff --git a/tests/functions/test_database.py b/tests/functions/test_database.py -index 0ad6721..83f208d 100644 ---- a/tests/functions/test_database.py -+++ b/tests/functions/test_database.py -@@ -76,28 +76,6 @@ class TestDatabasePostgres(DatabaseTest): - "TEMPLATE my_template") in str(excinfo.value) - - --class TestDatabasePostgresPg8000(DatabaseTest): -- -- @pytest.fixture -- def dsn(self, postgresql_db_user, postgresql_db_password): -- return 'postgresql+pg8000://{0}:{1}@localhost/{2}'.format( -- postgresql_db_user, -- postgresql_db_password, -- 'db_to_test_create_and_drop_via_pg8000_driver' -- ) -- -- --class TestDatabasePostgresPsycoPG2CFFI(DatabaseTest): -- -- @pytest.fixture -- def dsn(self, postgresql_db_user, postgresql_db_password): -- return 'postgresql+psycopg2cffi://{0}:{1}@localhost/{2}'.format( -- postgresql_db_user, -- postgresql_db_password, -- 'db_to_test_create_and_drop_via_psycopg2cffi_driver' -- ) -- -- - @pytest.mark.usefixtures('postgresql_dsn') - class TestDatabasePostgresWithQuotedName(DatabaseTest): - -@@ -116,31 +94,6 @@ class TestDatabasePostgresWithQuotedName(DatabaseTest): - 'TEMPLATE "my-template"') in str(excinfo.value) - - --class TestDatabasePostgresCreateDatabaseCloseConnection: -- def test_create_database_twice( -- self, -- postgresql_db_user, -- postgresql_db_password -- ): -- dsn_list = [ -- 'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-a'.format( -- postgresql_db_user, -- postgresql_db_password -- ), -- 'postgresql://{0}:{1}@localhost/db_test_sqlalchemy-util-b'.format( -- postgresql_db_user, -- postgresql_db_password -- ), -- ] -- for dsn_item in dsn_list: -- assert not database_exists(dsn_item) -- create_database(dsn_item, template="template1") -- assert database_exists(dsn_item) -- for dsn_item in dsn_list: -- drop_database(dsn_item) -- assert not database_exists(dsn_item) -- -- - @pytest.mark.usefixtures('mssql_dsn') - class TestDatabaseMssql(DatabaseTest): - diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 7c842352eb02..a517b3583687 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.41"; # TODO: check python3Packages.fastapi when updating to >= 1.4.42 + version = "1.4.46"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ApL3DReX48VOhi5vMK5HQBRki8nHI+FKL9pzCtsKl5E="; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; nativeBuildInputs = lib.optionals (!isPyPy) [ diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index 5634eb41601a..bb373761504d 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -1,18 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub +, py +, pytest-benchmark , pytestCheckHook }: buildPythonPackage rec { pname = "sqlitedict"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; - rev = "refs/tags/${version}"; - sha256 = "sha256-8dmGn5h3NigCdDtnDYjpjntRpyjk7ivRp1B8x8nUgpE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GfvvkQ6a75UBPn70IFOvjvL1MedSc4siiIjA3IsQnic="; }; preCheck = '' @@ -20,9 +22,15 @@ buildPythonPackage rec { ''; checkInputs = [ + py + pytest-benchmark pytestCheckHook ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; + meta = with lib; { description = "Persistent, thread-safe dict"; homepage = "https://github.com/RaRe-Technologies/sqlitedict"; diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 29e92cdecb93..16b5626da199 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.4.2"; + version = "0.4.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae"; + sha256 = "sha256-acqASEa7EU0uw4DkNgqKNA24PwzPOvzusUBN8Cj1cmg="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 5108f9ea5eaa..8dd111b0797c 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -6,35 +6,49 @@ , catalogue , mock , numpy +, psutil , pytest , ruamel-yaml +, setuptools +, tornado }: buildPythonPackage rec { pname = "srsly"; - version = "2.4.4"; + version = "2.4.5"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg="; + hash = "sha256-yEIliWe6pSfOqTZ5huQrgUOhqJDn1KGNJaNu3Dx6M8c="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + setuptools + ]; - propagatedBuildInputs = [ catalogue ]; + propagatedBuildInputs = [ + catalogue + ]; checkInputs = [ mock numpy + psutil pytest ruamel-yaml + tornado ]; - pythonImportsCheck = [ "srsly" ]; + pythonImportsCheck = [ + "srsly" + ]; meta = with lib; { + changelog = "https://github.com/explosion/srsly/releases/tag/v${version}"; description = "Modern high-performance serialization utilities for Python"; homepage = "https://github.com/explosion/srsly"; license = licenses.mit; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index bd73a6abaead..b21f043f0b5e 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "ssdp"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "codingjoe"; repo = pname; - rev = version; - sha256 = "19d2b5frpq2qkfkpz173wpjk5jwhkjpk75p8q92nm8iv41nrzljy"; + rev = "refs/tags/${version}"; + sha256 = "sha256-D2mww3sEc2SvufWNmT450a2CW+ogROn3RHypljkebuY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 6d96df91c4f5..d23d83f7cf76 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -2,7 +2,10 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch +, hatchling + +# runtime +, ApplicationServices , aiofiles , anyio , contextlib2 @@ -10,20 +13,22 @@ , jinja2 , python-multipart , pyyaml +, typing-extensions + +# tests , requests , aiosqlite , databases +, httpx , pytestCheckHook , pythonOlder , trio -, typing-extensions -, ApplicationServices }: buildPythonPackage rec { pname = "starlette"; - version = "0.20.4"; - format = "setuptools"; + version = "0.23.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -31,15 +36,11 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vP2TJPn9lRGnLGkO8lUmnsoT6rSnhuWDD3WqNk76SM0="; + hash = "sha256-LcFrdaRgFBqcdylCzNlewj/papsg/sZ1FMVxBDLvQWI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/encode/starlette/commit/ab70211f0e1fb7390668bf4891eeceda8d9723a0.diff"; - excludes = [ "requirements.txt" ]; # conflicts - hash = "sha256-UHf4c4YUWp/1I1vD8J0hMewdlfkmluA+FyGf9ZsSv3Y="; - }) + nativeBuildInputs = [ + hatchling ]; postPatch = '' @@ -66,11 +67,17 @@ buildPythonPackage rec { checkInputs = [ aiosqlite databases + httpx pytestCheckHook trio typing-extensions ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + "-W" "ignore::trio.TrioDeprecationWarning" + ]; + disabledTests = [ # asserts fail due to inclusion of br in Accept-Encoding "test_websocket_headers" @@ -82,6 +89,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/encode/starlette/releases/tag/${version}"; homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index da455c02d670..3f9caa13132e 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -1,19 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , nose , mock }: buildPythonPackage rec { pname = "statsd"; - version = "3.3.0"; + version = "4.0.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "07yxnlalvcglgwa9pjs1clwrmwx7a4575jai7q05jz3g4i6dprp3"; + hash = "sha256-mXY9qBv+qNr2s9ItEarMsBqND1LqUh2qs351ikyn0Sg="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ nose mock ]; patchPhase = '' diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix index 9ad5e2285ffb..1259e4cc91bb 100644 --- a/pkgs/development/python-modules/stem/default.nix +++ b/pkgs/development/python-modules/stem/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stem"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1hk8alc0r4m669ggngdfvryndd0fbx0w62sclcmg55af4ak8xd50"; + sha256 = "sha256-gdQ6fGaLqde8EQOy56kR6dFIKUs3PSelmujaee96Pi8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index a06a375be0e5..c59ffc8253b7 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "stravalib"; - version = "0.10.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "451817c68a11e0c77db9cb628e3c4df0f4806c5a481536598ab3baa1d1c21215"; + sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index ca4b1b81725d..cd01471d366d 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.125.0"; + version = "0.151.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; - rev = version; - sha256 = "sha256-8ERmG10qNiYg9Zr8oUZk/Uz68sCE+oWrqmJ5kUMqbRo="; + rev = "refs/tags/${version}"; + sha256 = "sha256-sHrdZ33irwTkm3OHQ2yxxcCWZDcaNbKy7amfRTtPVZ8="; }; patches = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 18d348b144cb..96a7310cb04c 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "4.1.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hSrKk/Lu6rWCPSrPSlvtsl+Ub6EM6llaW1l9B0jxNl8="; + hash = "sha256-vcjF7o5rU8R2e75yB1LO24r5HbRq2W5RHt0Pt0lkrF0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/subprocess-tee/default.nix b/pkgs/development/python-modules/subprocess-tee/default.nix index adc4cae187bc..4b1c120e31d1 100644 --- a/pkgs/development/python-modules/subprocess-tee/default.nix +++ b/pkgs/development/python-modules/subprocess-tee/default.nix @@ -8,11 +8,12 @@ buildPythonPackage rec { pname = "subprocess-tee"; - version = "0.3.5"; + version = "0.4.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577"; + sha256 = "sha256-s8EkmT+LiNHrHC/eC8IGl4fqxyC6iHccuhfoyTMkgl0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 88dca4a51d4a..253be956cdc6 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.0.5"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7I23WtSeZPtHULJ7sNAbOdwAuzjiPE6WW2ukKUCMODs="; + hash = "sha256-DAWc5G5YTydxHIuZkY7Nb3euejPn0aQy7D01xChFDeM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix new file mode 100644 index 000000000000..c3430a2d6f90 --- /dev/null +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest +, colored +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "syrupy"; + version = "3.0.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tophat"; + repo = "syrupy"; + rev = "refs/tags/v${version}"; + hash = "sha256-8DdPgah1cWVY9YZT78otlAv7X00iwxfi+Fkn3OmLgeM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + colored + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/tophat/syrupy/releases/tag/v${version}"; + description = "Pytest Snapshot Test Utility"; + homepage = "https://github.com/tophat/syrupy"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 34e668339878..e1867c9ce76f 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -1,22 +1,39 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pythonOlder +, setuptools-scm +, setuptools +, wcwidth +, pytestCheckHook }: buildPythonPackage rec { - version = "0.8.10"; + version = "0.9.0"; pname = "tabulate"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bFfz8916wngncBVfOtstsLGiaWN+QvJ1mZJeZLEU9Rk="; + hash = "sha256-AJWxK/WWbeUpwP6x+ghnFnGzNo7sd9fverEUviwGizw="; }; - checkInputs = [ nose ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Tests: cannot import common (relative import). - doCheck = false; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + passthru.optional-dependencies = { + widechars = [ wcwidth ]; + }; + + checkInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = { description = "Pretty-print tabular data"; diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 654c8a9e2ab0..0e24cbc03451 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "tempest"; - version = "32.0.0"; + version = "33.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MPaGhT2H8Hzk29qylQru9Z6QaRrHM+9I7N5qhe9Wts4="; + sha256 = "sha256-aEtBAE3p+HVw/macwZtKo20mSJctrsIN7idqWe6Dvtc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 8b50406c7eac..2549fc234df2 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tempora"; - version = "5.0.2"; + version = "5.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MfpbszsmQQJiEfI+gI64vTUZAZiLFn1F8yPI9FDs8hE="; + sha256 = "sha256-PnxKU2mheIyIqZtr46THTAx3KNO2L9dop+gb0L4OiN8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index 2cb1629ffe67..158437a93d1f 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tensorboard_plugin_profile"; - version = "2.8.0"; + version = "2.11.1"; format = "wheel"; src = fetchPypi { @@ -17,7 +17,7 @@ buildPythonPackage rec { format = "wheel"; dist = "py3"; python = "py3"; - hash = "sha256-2LzXSdPrzS5G63ONvchdEL4aJD75eU9dF1pMqLcfbto="; + hash = "sha256-t9AZg0BGjDcOxtoRBHZO0joIgLHpoKqEUY4pxmw8sjg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index f42d1b3220b7..7a10279ce88f 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , pythonAtLeast +, pythonRelaxDepsHook , numpy , wheel , werkzeug @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.10.0"; + version = "2.11.0"; format = "wheel"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; @@ -31,23 +32,17 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-dskaXolZzSIIzDLLF6DLACutq7ZqBqwq8Cp4EPSaWeM="; + hash = "sha256-oOWS7oeWLhevPw3Of6rj+70jkDAVnp5iXM6BC341xT0="; }; - postPatch = '' - chmod u+rwx -R ./dist - pushd dist - wheel unpack --dest unpacked ./*.whl - pushd unpacked/tensorboard-${version} + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; - substituteInPlace tensorboard-${version}.dist-info/METADATA \ - --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<1.0,>=0.4.1)" \ - --replace "protobuf (<3.20,>=3.9.2)" "protobuf (>=3.9.2)" - - popd - wheel pack ./unpacked/tensorboard-${version} - popd - ''; + pythonRelaxDeps = [ + "google-auth-oauthlib" + "protobuf" + ]; propagatedBuildInputs = [ absl-py diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 1afd6c55a3fb..b9639806b12f 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.6.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - sha256 = "sha256-z52UZz9d1AaZklLOPbWuzByEl1hJ6ra4Hoz6eNGD+hg="; + sha256 = "sha256-YG0Abb5xdTaq+/0I45KU02wuZHyLKD5oMSINJOy7Nrk="; }; patches = [ diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 994d821d9a25..f5008136f0b5 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.9.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - sha256 = "sha256-6BtKHyVrprtEb2Bi7g2YuctUykWSRXmKwADfHzGkYjc="; + sha256 = "sha256-pgeQ9qMcz/DsdvF3THMZ4uPToLxtIM0No/kgRlBzU8A="; }; patches = [ diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 96f54632069e..7a2d29b75c7c 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -49,6 +49,9 @@ in buildPythonPackage { inherit (packages) version; format = "wheel"; + # Python 3.11 still unsupported + disabled = pythonAtLeast "3.11"; + src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; platform = if stdenv.isDarwin then "mac" else "linux"; diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index b1cfc0dc0461..e6bb7e3bafef 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "termcolor"; - version = "2.0.1"; + version = "2.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ayz3aekzZKJnbh3lanwM/yz1vQfzfpzICw3WMg6/44g="; + sha256 = "sha256-Z87iAJrcZEnGUPa8873u0AyLpTqM2lNiczxT4KOftws="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index ac5481e13a8e..92586f37243e 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.15.0"; + version = "0.17.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q07u3M/MHmE0v+6GEGr5CFLGnWAohOo6Hoym1Ehum/4="; + sha256 = "sha256-bMu806T4olpewEmR85oLjbUt/NSH6g5XjZd+Z1I4AzM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 4769dc64e7ab..2e95c6acc2fc 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "tern"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MMsq8/Obe3ogQSjiP8EebYseUJGcchMOczUrxE9jht4="; + hash = "sha256-MELPpz7UeOKSAW7hC2xDIog/bdLUflU00vvIbAePNBA="; }; preBuild = '' diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index b104bd845962..9b492747bf22 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.4"; + version = "1.6.7"; src = fetchPypi { inherit pname version; - sha256 = "42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9"; + sha256 = "sha256-KQNI+2f3dGkxvN/VWsdYTs1OWwhGqxZDM/B5SxIXYPI="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 5806b28e3490..4afe9220fa15 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -2,15 +2,24 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, importlib-metadata +, nanoid , rich , typing-extensions +, aiohttp +, click +, jinja2 +, msgpack +, pytest-aiohttp , pytestCheckHook , pythonOlder +, syrupy +, time-machine }: buildPythonPackage rec { pname = "textual"; - version = "0.1.18"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,29 +27,38 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Textualize"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-a32H5X3VsfYuU1TkOH5uGn1eDLvGUDI6WhXEQ0AKwq8="; }; nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'importlib-metadata = "^4.11.3"' 'importlib-metadata = "*"' + ''; + propagatedBuildInputs = [ + importlib-metadata + nanoid rich - ] ++ lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; checkInputs = [ + aiohttp + click + jinja2 + msgpack + pytest-aiohttp pytestCheckHook + syrupy + time-machine ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^12.3.0"' 'rich = "*"' - ''; - pythonImportsCheck = [ "textual" ]; diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix index e521182a395a..2f203e74b313 100644 --- a/pkgs/development/python-modules/thefuzz/default.nix +++ b/pkgs/development/python-modules/thefuzz/default.nix @@ -4,7 +4,7 @@ , pythonOlder , pytestCheckHook , hypothesis -, python-Levenshtein +, levenshtein }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-b3Em2y8silQhKwXjp0DkX0KRxJfXXSB1Fyj2Nbt0qj0="; }; - propagatedBuildInputs = [ python-Levenshtein ]; + propagatedBuildInputs = [ levenshtein ]; # Skip linting postPatch = '' diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 1a43bcbbc4ed..64646c08cc65 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.1"; + version = "8.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m5AoKYTzy6rJjgNn3xsa+eSDYjG8Bj361yQqnQ3VK80="; + hash = "sha256-kkHDd2HwBP5oTmN9K02Lea3eurxk40OqHLoUT60sm0c="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 8e4bacad9aac..f2b841e22b47 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2022.8.12"; + version = "2022.10.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PnTg/UiDhHfrz0Dgm3eAvQle5ZILIjj0heLGhGOj3LQ="; + hash = "sha256-ULYbqUO4ZtGRKVvDigAZHJ/asj7OBjVEx/GiZOP2qo4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 99020f8d7ac1..ab5cf84d8697 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.16.3"; + version = "0.19.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - sha256 = "sha256-Tg2MHlLwwcpXoHoflaNWXmXr6s7dg3IJou4PZBahRzc="; + sha256 = "sha256-eha0I/SJmBGFdvJrNUBg/sx54UXdbjhEbyvI40Vngm4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index c7775aa435d6..ee264c909323 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "timetagger"; - version = "22.10.1"; + version = "22.12.1"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+7PKYVZfX+zDBKpaFwEVftyp4yPL90X9HSQDvoNNFuA="; + sha256 = "sha256-yoDILEE/mUWkGPWp2xTKlkpmw1gZctaQmBsed8U7bHc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index f5dc5f7c346f..c747cac05c02 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.0.2"; + version = "6.1.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jannikmi"; repo = pname; - rev = version; - hash = "sha256-jquaA/+alSRUaa2wXQ6YoDR4EY9OlZCAdcxS5TR0CAU="; + rev = "refs/tags/${version}"; + hash = "sha256-A5s1npvgJGp6SvIqoXGRmFN3iE0pqMUl1ZTi07ix5b0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 6bd461db75a2..03ccef3a7832 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.11.4"; + version = "0.11.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MjWpAQ+uVDI+cnw6wG+3IHUv5mNbNCbjedrsYPvUSoM="; + hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM="; }; propagatedBuildInputs = @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/sdispater/tomlkit"; + changelog = "https://github.com/sdispater/tomlkit/blob/${version}/CHANGELOG.md"; description = "Style-preserving TOML library for Python"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix index f751a046aeca..c18f1c68be98 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "torchinfo"; - version = "1.7.1"; + version = "1.64"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TylerYep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jiQ24gx3N9djvTTB6IthzxcuGWX2/php0Up3IdEDvm8="; + hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index eee18b2cb7b3..8dbf0cd3cdf1 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -15,7 +15,7 @@ let pname = "torchmetrics"; - version = "0.9.3"; + version = "0.11.0"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-L2p8UftRkuBuRJX4V5+OYkJeJ5pCK3MvfA1OvSfgglY="; + hash = "sha256-vHWW9TAIocU4g7++UQ0SWtOV/Cdtdq+tOV1x0MLwY7E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 9c167a7614c8..b0cf95cd3ae8 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pythonOlder , packaging , pluggy , py @@ -10,27 +11,69 @@ , toml , tomli , filelock -, pythonOlder +, hatchling +, hatch-vcs +, platformdirs +, pyproject-api +, colorama +, chardet +, cachetools +, testers +, tox }: buildPythonPackage rec { pname = "tox"; - version = "3.27.1"; + version = "4.1.0"; + format = "pyproject"; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ packaging pluggy py six virtualenv filelock ] - ++ lib.optional (pythonOlder "3.11") tomli; + src = fetchFromGitHub { + owner = "tox-dev"; + repo = "tox"; + rev = "refs/tags/${version}"; + hash = "sha256-ApJa7v1HJDca2jvZFKqOgKho4fI2tXFrjaFzLcS9Vfk="; + }; - doCheck = false; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "packaging>=22" "packaging" + ''; - src = fetchPypi { - inherit pname version; - hash = "sha256-sqkg41pmjMBpQv/RzzpPsiGk2QnKchkftthLCxinvgQ="; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInputs = [ + cachetools + chardet + colorama + filelock + packaging + platformdirs + pluggy + py + pyproject-api + six + toml + virtualenv + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + doCheck = false; # infinite recursion via devpi-client + + passthru.tests = { + version = testers.testVersion { package = tox; }; }; meta = with lib; { - description = "Virtualenv-based automation of test activities"; - homepage = "https://tox.readthedocs.io/"; + changelog = "https://github.com/tox-dev/tox/releases/tag/${version}"; + description = "A generic virtualenv management and test command line tool"; + homepage = "https://github.com/tox-dev/tox"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 627c21ee4bf0..1e0b177b8928 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -17,7 +17,7 @@ let pname = "trainer"; - version = "0.0.16"; + version = "0.0.20"; in buildPythonPackage { inherit pname version; @@ -27,7 +27,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-G2qFQEO5OOEI2jsb+zXsO8cbC13o7pqAC2xkFrhGkLc="; + hash = "sha256-se2Q2wJyynPc/3TkfEn4nEh+emqBJBwPGDSnOV+sH4I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 30bff404032e..565730bd34da 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.4.0"; + version = "5.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PyxOQ14nFZL+Q5DxdG6laDbjoID4Tngz8PgB2WE/7Dk="; + sha256 = "sha256-bMV9bcKMhdU2WWFyb/0ZtThzk0d0nhPr404DMjoOj4Q="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index 7f247bbdc07d..17f12cab5b07 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "treex"; - version = "0.6.10"; + version = "0.6.11"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; - rev = version; - hash = "sha256-ZHfgmRNbFh8DFZkmilY0pmRNQhJFqT689I7Lu8FuFm4="; + rev = "refs/tags/${version}"; + hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ="; }; # At the time of writing (2022-03-29), rich is currently at version 11.0.0. diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index 25caa3e965fb..2cbd32b910e8 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -40,8 +40,9 @@ buildPythonPackage rec { pytestFlagsArray = [ # https://github.com/python-trio/trio-asyncio/issues/112 - "-W" - "ignore::DeprecationWarning" + "-W" "ignore::DeprecationWarning" + # trio.MultiError is deprecated since Trio 0.22.0; use BaseExceptionGroup (on Python 3.11 and later) or exceptiongroup.BaseExceptionGroup (earlier versions) instead (https://github.com/python-trio/trio/issues/2211) + "-W" "ignore::trio.TrioDeprecationWarning" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 7bbfb6f2ca9c..c38011978d0f 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -2,6 +2,7 @@ , attrs , sortedcontainers , async_generator +, exceptiongroup , idna , outcome , pytestCheckHook @@ -17,12 +18,13 @@ buildPythonPackage rec { pname = "trio"; - version = "0.21.0"; + version = "0.22.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uj85t7ae73NQHOv+Gq/UAKmq1bA1Q6Dt7VKVJIj/HBM="; + hash = "sha256-zmjxxUAKR7E3xaTecsfJAb1OeiT73r/ptB3oxsBOqs8="; }; propagatedBuildInputs = [ @@ -32,6 +34,8 @@ buildPythonPackage rec { idna outcome sniffio + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; # tests are failing on Darwin diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix new file mode 100644 index 000000000000..c8e99f7971ec --- /dev/null +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, calver +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "trove-classifiers"; + version = "2022.12.22"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-/g/j8IWYcWGu4qWoU8fMfN9kUVxZZdV62Wj92Mw7A2I="; + }; + + nativeBuildInputs = [ + calver + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "trove_classifiers" ]; + + meta = { + description = "Canonical source for classifiers on PyPI"; + homepage = "https://github.com/pypa/trove-classifiers"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index fb145ac9a99a..649e2de1c179 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -21,10 +20,9 @@ buildPythonPackage rec { }; checkInputs = [ - service-identity - pytestCheckHook - ] ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyopenssl + pytestCheckHook + service-identity ]; propagatedBuildInputs = [ @@ -34,17 +32,6 @@ buildPythonPackage rec { futures ]; - # aarch64-darwin forbids W+X memory, but this tests depends on it: - # * https://github.com/pyca/pyopenssl/issues/873 - disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "test_pyopenssl_end_to_end" - ]; - - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - substituteInPlace "tests/test_trustme.py" \ - --replace "import OpenSSL.SSL" "" - ''; - # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index ce39ed5d1a05..9f13bbe53da8 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -13,7 +13,7 @@ , wrapt , passlib , pydot -, python-Levenshtein +, levenshtein , html2text , weasyprint , gevent @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.4.5"; + version = "6.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AF8LG68K+CvHpFOIoGbxD+lF7IVwBDk8K06I4uTNguI="; + sha256 = "sha256-fE1JBlvKIvDFjMat/lgOM22rIpMlqnxoo9p8VJF6szs="; }; propagatedBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { # extra dependencies pydot - python-Levenshtein + levenshtein html2text weasyprint gevent diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index afa66b288ab2..0301a8673165 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ttp"; - version = "0.9.1"; + version = "0.9.2"; format = "pyproject"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FhuIYXktcNnOVX+KU5cDOd2Qk7AcWaSKvfB/BZYpsZo="; + hash = "sha256-KhQRC4zcLCnYUtQm08wJzb/YwBquOEGR5L0YUmnzheg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index a04d16a959fd..b6c0549c040a 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "turnt"; - version = "1.8.0"; + version = "1.9.0"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "c6cfcb68a3353032c4ce6fff352196e723d05f9cee23eaf4f36d4dcfd89b8e49"; + sha256 = "sha256-X0uJmY2MVnvM50LDBXDn9hK4NuHAil4Kf39V/8b8OIQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index f68ec91e1cbb..fdc750fa8962 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "twill"; - version = "3.0.2"; + version = "3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dWtrdkiR1+IBfeF9jwbOjKE2UMXDJji0iOb+USbY7zk="; + hash = "sha256-tWcZRvBvkRyQ7gD5zjocBzFVlzQ0Mhf1unF3gUkhB94="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 03a6045372bb..f90cdeec51cb 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -57,6 +57,13 @@ buildPythonPackage rec { hash = "sha256-Mqy9QKlPX0bntCwQm/riswIlCUVWF4Oot6BZBI8tTTE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/twisted/twisted/pull/11787.diff"; + hash = "sha256-bQgUmbvDa61Vg8p/o/ivfkOAHyj1lTgHkrRVEGLM9aU="; + }) + ]; + __darwinAllowLocalNetworking = true; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 9427d39c20af..96fdbd249746 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "2.5.7.1"; + version = "3.2.1"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-ZhmzrHWbwoHL+9FdkVoc+GGxH1v2j7rB/3ZiaWu9kjQ="; + hash = "sha256-E01LkuTnHy2R4Vdr2iLNi7f8KjsIRoDHokyjLAnWieM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 81ca0bfd0bf3..f866e631a089 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -13,13 +13,14 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "1.1.1"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-fbo4oj84j7Vkz2V6B/EqoyRl9OutSpm5Ko9Tctu2DYM="; + pname = "typed_settings"; + inherit version; + hash = "sha256-o0cPD/7/DS9aUtLDA1YhxKrxUDE7Elv4B7zlKVSsFJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 35a946c6079b..0048109bccae 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -17,16 +17,21 @@ buildPythonPackage rec { pname = "typer"; - version = "0.6.1"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LVcgpeY/c+rzHtqhX2q4fzXwaQ+MojMBfX0j10OpHXM="; + hash = "sha256-/3l4RleKnyogG1NEKu3rVDMZRmhw++HHAeq2bddoEWU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "rich >=10.11.0,<13.0.0" "rich" + ''; + nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 92415fb04c61..862b8ff805c2 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.20.4.2"; + version = "4.21.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/WWrhQL5oI4InyytJtUvqwTNVzIs+JbFcKszkcp2C64="; + sha256 = "sha256-ffSD00rT/LH6f/8Qc1YNWWyawfQZz6hRsiDJqTOGyZg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 36464204e75d..01ef53e479ad 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.3.0"; + version = "4.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-5tJnejL0f8frJ5XbHdFcHzTv9ha8ryz7Xpl/hU+hxKY="; + hash = "sha256-FRFDS7kr+N0ZjBKxzIEugA1Bgc/LhnZ04PgnnMkwh6o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 1a82fe4b70a8..a472cc1546cb 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551"; + sha256 = "sha256-6G96xqoO9MbEnwBLT9Q1vOmcI+LdXXMAPz+YFgJMK9g="; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 6fb474aefc2b..985a0af28f83 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.6.0"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LDG3ShCFbszyWNc8TQjlysTWBgo0uYNIkL/UK8sTg1A="; + sha256 = "sha256-fOA+tGANKKHeq0uGbzd9Tq5/yc3Gfj6I94jV8daD3IY="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 5a87bfd42c2b..5e20ffaafe67 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -1,45 +1,50 @@ { lib , buildPythonPackage , fetchPypi + +# build , setuptools-scm -, fonttools -, defcon -, compreffor + +# runtime , booleanoperations , cffsubr +, compreffor +, cu2qu +, defcon +, fonttools +, skia-pathops , ufoLib2 + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "ufo2ft"; - version = "2.28.0"; - + version = "2.30.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pWHvjAvHNWlmJiQ75JRmFyrjYnzbJG7M8/DGoIWpEBk="; + hash = "sha256-ZpO55rNXkVbqMdGxsZn77gJnGBbM8c8GIAaQnTzVnf8="; }; - patches = [ - # Use cu2qu from fonttools. - # https://github.com/googlefonts/ufo2ft/pull/461 - ./fonttools-cu2qu.patch - ]; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ + cu2qu fonttools defcon compreffor booleanoperations cffsubr ufoLib2 - ]; + skia-pathops + ] + ++ fonttools.optional-dependencies.lxml + ++ fonttools.optional-dependencies.ufo; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix index fab42e5169b8..e42b6766f439 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufoLib2/default.nix @@ -4,35 +4,46 @@ , attrs , fonttools , pytestCheckHook -, fs , setuptools-scm + +# optionals +, cattrs +, lxml +, orjson +, msgpack }: buildPythonPackage rec { pname = "ufoLib2"; - version = "0.13.1"; - + version = "0.14.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MnWi2mI+bUt+4pyYTNs6W4a7wj8KHOlEhti7XDCKpHs="; + hash = "sha256-OdUJfNe3nOQyCf3nT9/5y/C8vZXnSAWiLHvZ8GXMViw="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ attrs fonttools - # required by fonttools[ufo] - fs - ]; + ] ++ fonttools.optional-dependencies.ufo; - nativeBuildInputs = [ setuptools-scm ]; + passthru.optional-dependencies = { + lxml = [ lxml ]; + converters = [ cattrs ]; + json = [ cattrs orjson ]; + msgpack = [ cattrs msgpack ]; + }; checkInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); -pythonImportsCheck = [ "ufoLib2" ]; + pythonImportsCheck = [ "ufoLib2" ]; meta = with lib; { description = "Library to deal with UFO font sources"; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 15c7322fb3c3..b22de9043ecb 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.8.0"; + version = "3.9.0"; disabled = pythonAtLeast "3.9"; # See: https://github.com/rocky/python-uncompyle6/issues/331 src = fetchPypi { inherit pname version; - sha256 = "sha256-YgYzYY9t/B8+eBh+Igk014/8Y5wOOdrsofxTWquBcBQ="; + sha256 = "sha256-HmqQLeYOpcP30q9+J0UAa05Lm97eiIoH+EQcmTjy7n0="; }; checkInputs = [ nose pytest hypothesis six ]; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 96e487871aa3..e2ac00de2177 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "unidecode"; - version = "1.3.4"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "avian2"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-2LRV6Egst2bdxefEzfuA9Ef8zMSWvmlCEV/sIzezyPw="; + hash = "sha256-75E2OlrGIxvwR9MeZEB4bDLdFd1SdprCVcBIJCPS3hM="; }; checkInputs = [ @@ -29,7 +29,8 @@ buildPythonPackage rec { meta = with lib; { description = "ASCII transliterations of Unicode text"; - homepage = "https://pypi.python.org/pypi/Unidecode/"; + homepage = "https://github.com/avian2/unidecode"; + changelog = "https://github.com/avian2/unidecode/blob/unidecode-${version}/ChangeLog"; license = licenses.gpl2Plus; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 52b422c0e1d3..310480a49ab4 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -8,13 +8,14 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-iXwJPe6YYG2TWiQ/dXbeIiadzGMgFzZa6Now692r+t0="; + pname = "upb_lib"; + inherit version; + hash = "sha256-/TNKsno0JJtxBY9HCPQfp7OhlfkOP6sJI51rgp2ujDg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index ec63f5f21ed9..86083a4cc573 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.12"; + version = "1.26.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-P6ls9CPmmHmX/DJq6N85bbKot8ZndH1H3djsupH0p04="; + hash = "sha256-wIPdDc5o2/vhEp1SccuQ+UR96n1SCXxuASYSDFId3qg="; }; # FIXME: remove backwards compatbility hack @@ -64,15 +64,27 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; + brotli = if isPyPy then [ + brotlicffi + ] else [ + brotli + ]; # Use carefully since pyopenssl is not supported aarch64-darwin - secure = [ certifi cryptography idna pyopenssl ]; - socks = [ pysocks ]; + secure = [ + certifi + cryptography + idna + pyopenssl + ]; + socks = [ + pysocks + ]; }; meta = with lib; { description = "Powerful, sanity-friendly HTTP client for Python"; homepage = "https://github.com/shazow/urllib3"; + changelog = "https://github.com/urllib3/urllib3/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 706c6eb85ec8..04190a8eb4ba 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "vector"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "b785678f449de32476f427911248391ddcc7c3582a522a88cbbd50c92dcae490"; + sha256 = "sha256-/e0wZDWIIm9vi37NEkIEitQj0p1M132AAO6id0eaA5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 9bc875963163..989a26c11d98 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage , fetchPypi, pythonOlder -, jupyter_core, pandas, ipywidgets, jupyter }: +, jupyter-core, pandas, ipywidgets, jupyter }: buildPythonPackage rec { pname = "vega"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-cO+7Ynbv/+uoNUOPQvDNZji04llHUBlm95Cyfy+Ny80="; }; - propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; + propagatedBuildInputs = [ jupyter jupyter-core pandas ipywidgets ]; # currently, recommonmark is broken on python3 doCheck = false; diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix index a6ac156b7063..1158d9fa9171 100644 --- a/pkgs/development/python-modules/videocr/default.nix +++ b/pkgs/development/python-modules/videocr/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, python-Levenshtein +, levenshtein , pytesseract , opencv4 , fuzzywuzzy @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - python-Levenshtein + levenshtein pytesseract opencv4 fuzzywuzzy diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index f0b365761f6c..cb9f8ed989bc 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,9 +1,8 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , pythonOlder , isPy27 -, backports-entry-points-selectable , cython , distlib , fetchPypi @@ -18,16 +17,18 @@ , pytest-timeout , pytestCheckHook , setuptools-scm -, six }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.16.5"; + version = "20.17.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-In6huZlP3F6jGXe6M4PvKW10cuqFvp1nMuQqkcBOgNo="; + hash = "sha256-+LknaE78bxzCBsnbKXpXCrmtDlHBb6nkVIfTbRkFwFg="; }; nativeBuildInputs = [ @@ -35,13 +36,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - backports-entry-points-selectable distlib filelock platformdirs - six - ] ++ lib.optionals (pythonOlder "3.4" && !stdenv.hostPlatform.isWindows) [ - pathlib2 ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ] ++ lib.optionals (pythonOlder "3.8") [ @@ -65,8 +62,8 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - # Ignore tests which require network access disabledTestPaths = [ + # Ignore tests which require network access "tests/unit/create/test_creator.py" "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" ]; @@ -77,16 +74,16 @@ buildPythonPackage rec { "test_seed_link_via_app_data" # Permission Error "test_bad_exe_py_info_no_raise" - ] ++ lib.optionals isPy27 [ - "test_python_via_env_var" - "test_python_multi_value_prefer_newline_via_env_var" ]; - pythonImportsCheck = [ "virtualenv" ]; + pythonImportsCheck = [ + "virtualenv" + ]; meta = with lib; { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; + changelog = "https://github.com/pypa/virtualenv/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index 6b86123ade75..4df2ecd0ed94 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { pname = "viv-utils"; - version = "0.7.5"; + version = "0.7.7"; src = fetchFromGitHub { owner = "williballenthin"; repo = "viv-utils"; - rev = "v${version}"; - sha256 = "sha256-JDu+1n1wP2Vsp2V/bKdE+RFp6bE8RNmimi4wdsatwME="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ih6CtnsGfHRLDjoaF7BkoUENu+0pU3NB6TG0A70f3nE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index d87bbff3595e..40303c29f9c9 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "9.5.0"; + version = "9.6.0"; src = fetchPypi{ inherit pname version; - sha256 = "sha256-LfEP0T/dYFuLPgz8cBtO6iajfnTt9GXCuor0NibP0qY="; + sha256 = "sha256-LHs98lccPjub5GDPB3dxtkOYCDxri04CVpSSsypa4xI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 4928c2adc40c..1551ab31183e 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -1,23 +1,31 @@ { lib , buildPythonPackage , fetchPypi +, click , requests }: buildPythonPackage rec { pname = "vsure"; - version = "1.8.1"; + version = "2.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Zh83t7yjZU2NjOgCkqPUHbqvEyEWXGITRgr5d2fLtRI="; + hash = "sha256-KMLW1270Xs9s2a4ROWTvwRpfr4n4RO9rIYlskNjGzFQ="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + click + requests + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "verisure" ]; + + pythonImportsCheck = [ + "verisure" + ]; meta = with lib; { description = "Python library for working with verisure devices"; diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index 0062bbd9e415..bb5d1fd31b45 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.5"; + version = "2.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KDFpQFXrLjagnDt2gJNINxArm2wJaSBuOQLVE2Ehd8M="; + hash = "sha256-JRX6hIGBAB3Ipzq6agGhoXQG9dNy8k7H9xkYZvn0mX4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix index 396642b0c13a..b0e943b433d4 100644 --- a/pkgs/development/python-modules/wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , imagemagickBig +, py , pytestCheckHook }: @@ -22,6 +23,7 @@ buildPythonPackage rec { ''; checkInputs = [ + py pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index b649bd16880a..8925ea7f3476 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.13.5"; + version = "0.13.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1GoFmncG5bUWJOIUDLatopQMxCFsmlcj8aofJMGUTzQ="; + hash = "sha256-o9mIGSILztnHY3Eyb0MlznUEdMbCfA1BT6ux0UlesBc="; }; patches = [ diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 2f751e8105e4..6fc0f16bec4e 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -1,23 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , pythonOlder + +# tests +, ipykernel +, nbconvert +, pytestCheckHook +, typing-extensions }: buildPythonPackage rec { pname = "wasabi"; - version = "0.10.1"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yONyeBvhknKUI4KxTZkxTRdVGNeCIFfLepcBDEJZ0kk="; + sha256 = "sha256-RaYTplXhFKsnL1rxRMNR+VT92S2ym3z6buIQuCwZeeU="; }; checkInputs = [ + ipykernel + nbconvert + typing-extensions pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wasserstein/default.nix b/pkgs/development/python-modules/wasserstein/default.nix index 79994a616951..391712828ecd 100644 --- a/pkgs/development/python-modules/wasserstein/default.nix +++ b/pkgs/development/python-modules/wasserstein/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - pname = "Wasserstein"; + pname = "wasserstein"; version = "1.1.0"; src = fetchFromGitHub { owner = "pkomiske"; - repo = pname; + repo = "Wasserstein"; rev = "89c2d6279a7e0aa3b56bcc8fb7b6009420f2563e"; # https://github.com/pkomiske/Wasserstein/issues/1 hash = "sha256-s9en6XwvO/WPsF7/+SEmGePHZQgl7zLgu5sEn4nD9YE="; }; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index f42645940aac..b4c8dcaf6b0c 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -1,37 +1,36 @@ { lib , stdenv , buildPythonPackage -, fetchPypi -, pathtools -, pyyaml -, flaky -, pytest-timeout -, pytestCheckHook , CoreServices , fetchpatch +, fetchPypi +, flaky +, pathtools +, pytest-timeout +, pytestCheckHook +, pythonOlder +, pyyaml }: buildPythonPackage rec { pname = "watchdog"; - version = "2.1.9"; + version = "2.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-Q84g67NqUfIfo3b3bR1GkkUrJSfM1gGVDWntNrniFgk="; + hash = "sha256-g8+Lxg2cYTtmpMAYBRhz1ic9nkXQQO7QbWqWJBvY7AE="; }; patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ ./force-kqueue.patch - ] ++ [ - (fetchpatch { - url = "https://github.com/gorakhargosh/watchdog/commit/255d1e45c17929dd5ba8a6f91aa28771109931cd.patch"; - sha256 = "sha256-gGgEGuB/0g+4Pv1dXMvIdObjqKruWKkxtufS/dzSlY8="; - excludes = [ "changelog.rst" ]; - }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + ]; propagatedBuildInputs = [ pathtools @@ -70,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API and shell utilities to monitor file system events"; homepage = "https://github.com/gorakhargosh/watchdog"; + changelog = "https://github.com/gorakhargosh/watchdog/blob/v${version}/changelog.rst"; license = licenses.asl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 71ae956d6df8..96b7ec489800 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "57.0"; + version = "57.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-e29cwTgZ6afYdIwdvw6NJET3pIGKmDOfgtzKqCK/kRs="; + hash = "sha256-uOnvLcvPvILpkhWs/Wj5R7K18ZmbWxVtt1+r44C6fpo="; }; patches = [ diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix index 9244e26520cd..5c6d0114d034 100644 --- a/pkgs/development/python-modules/whatthepatch/default.nix +++ b/pkgs/development/python-modules/whatthepatch/default.nix @@ -2,19 +2,25 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "whatthepatch"; - version = "1.0.2"; + version = "1.0.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "cscorley"; repo = pname; - rev = version; - hash = "sha256-0l/Ebq7Js9sKFJ/RzkQ1aWEDCxt+COVd2qVnLSWwFx0="; + rev = "refs/tags/${version}"; + hash = "sha256-P4SYSMdDjwXOmre3hXKS4gQ0OS9pz0SWqBeD/WQMQFw="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 7b077d14c58e..65d5eebfeaa4 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.3"; + version = "4.0.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NIJIZMBisLMDCteCENta5qOWDfth1bJ1YtZjF3TeAoY="; + hash = "sha256-AD9xbZMNOFvj/Z3kLdm/AI4wBT9zvd3iNdFPvq7/Ga8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 72a2f013928d..ce8c81b2ab94 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "wordfreq"; - version = "2.5.1"; + version = "3.0.2"; disabled = isPy27; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; - rev = "v${version}"; - sha256 = "1lw7kbsydd89hybassnnhqnj9s5ch9wvgd6pla96198nrq9mj7fw"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ANOBbQWLB35Vz6oil6QZDpsNpKHeKUJnDKA5Q9JRVdE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix index 244541f7d852..df8855cc7a2f 100644 --- a/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/pkgs/development/python-modules/xarray-einstats/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xarray-einstats"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N8ievasPaqusx51FCxcl1FGIjXooyBsRqsuRU73puRM="; + hash = "sha256-6Wf5pc8e36lMv1V115N6sQbmE4l3QT6kbO7izUws0zc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 2d10f0ddb572..a24743ed2884 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2022.6.0"; + version = "2022.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ECjRmEk/ZrsVvTXc/dEd79gxy+469lif/xb0G93WfoQ="; + sha256 = "sha256-CD0I5VKnZHx+zhNt+jpLahN5JWvrVbvti43fBfHhTsc="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index cb9e1ddf921c..3f3a35edf1dc 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -3,17 +3,17 @@ , fetchPypi , xorg , cffi -, nose , six +, pytestCheckHook }: buildPythonPackage rec { - version = "0.11.1"; + version = "1.1.2"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "12949cfe2e68c806efd57596bb9bf3c151f399d4b53e15d1101b2e9baaa66f5a"; + sha256 = "sha256-Wqc6wlUUUpfMeJmhEFmEf41TDz2zhLPeOqwT+GDgS6w="; }; patchPhase = '' @@ -25,7 +25,11 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + xorg.xeyes + xorg.xorgserver + ]; pythonImportsCheck = [ "xcffib" ]; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 05d5e095a163..29bab5e9b289 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -13,24 +13,29 @@ buildPythonPackage rec { pname = "xlib"; - version = "0.31"; + version = "0.33"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; - rev = version; - sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06"; + rev = "refs/tags/${version}"; + hash = "sha256-u06OWlMIOUzHOVS4hvm72jGgTSXWUqMvEQd8bTpFog0="; }; - patches = [ - ./fix-no-protocol-specified.patch + nativeBuildInputs = [ + setuptools-scm ]; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ xorg.libX11 ]; - propagatedBuildInputs = [ six ]; + buildInputs = [ + xorg.libX11 + ]; + + propagatedBuildInputs = [ + six + ]; doCheck = !stdenv.isDarwin; + checkInputs = [ pytestCheckHook mock @@ -46,9 +51,11 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-xlib/python-xlib/releases/tag/${version}"; description = "Fully functional X client library for Python programs"; - homepage = "http://python-xlib.sourceforge.net/"; - license = licenses.gpl2Plus; + homepage = "https://github.com/python-xlib/python-xlib"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 28c9a856b3f8..5a9b839c3b57 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.15.1"; + version = "3.15.3"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - sha256 = "sha256-/0Y49ZSaPM3IAFJGmWKiKD+mziA0LYQ3fvGFrkPkl9Y="; + sha256 = "sha256-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 3dcfe8d7d026..b22f626d1a73 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "1.11.3"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-z6VgLRDp5PHaYstdV30gt6xGVd4uifz4LkYQ2z3ayk4="; + hash = "sha256-rt7QScg458ezDwktO1QRydmC3XqedX+kPpv6J+JvLzQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 658784387354..00cc42ee56c2 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rCGx4h3G/f7ppXtT9Hd1OdU6hPLhVGo/gC8Vn5lmvcE="; + sha256 = "sha256-Gv1Hr4lVxdtzD2MK1TrnmM9/rgrLZM67PPlNNcR90Ig="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix new file mode 100644 index 000000000000..fc74c7c374b2 --- /dev/null +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, mercantile +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "xyzservices"; + version = "2022.9.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VWUZYXCLmhSEmXizOd92AIyIbfeoMmMIpVSbrlUWJgw="; + }; + + pythonImportsCheck = [ + "xyzservices.providers" + ]; + + checkInputs = [ + mercantile + pytestCheckHook + requests + ]; + + meta = with lib; { + changelog = "https://github.com/geopandas/xyzservices/releases/tag/${version}"; + description = "Source of XYZ tiles providers"; + homepage = "https://github.com/geopandas/xyzservices"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 42caebb92e8b..2978799699e6 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.14"; + version = "1.4.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OMqtZ/kPj7ge235nuyrfCzawG6AOAqfJPzQHF8cW4Ok="; + sha256 = "sha256-yw/LwWjHW4vgHp06E/DgqauTvdfLxerHw1avge91XLU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 249bf974322e..3c0a218b8e89 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , pythonOlder , idna , multidict @@ -10,11 +11,15 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.8.1"; + version = "1.8.2"; + + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r4h4RbjC4GDrVgX/crby3SqrenYTeTc/2J0xT0dSq78="; + hash = "sha256-SdQ0AsbjATrQl4YCv2v1MoU1xI0ZIwS5G5ejxnkLFWI="; }; postPatch = '' @@ -37,6 +42,10 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + "test_not_a_scheme2" + ]; + postCheck = '' popd ''; @@ -44,6 +53,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "yarl" ]; meta = with lib; { + changelog = "https://github.com/aio-libs/yarl/blob/v${version}/CHANGES.rst"; description = "Yet another URL library"; homepage = "https://github.com/aio-libs/yarl"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 7a76ebeb8f28..86d93a604990 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.93"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AyuIngXReI4PX554SuGIgoQoklFieZiEZzeVBcvPvEk="; + hash = "sha256-1xO+zz+syuiWeZAxnRIV0va8WOIW2P9elRBtHDk7w1M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yoyo-migrations/default.nix b/pkgs/development/python-modules/yoyo-migrations/default.nix index 14c90dbd5f28..14aec06320d7 100644 --- a/pkgs/development/python-modules/yoyo-migrations/default.nix +++ b/pkgs/development/python-modules/yoyo-migrations/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, importlib-metadata , setuptools , sqlparse , tabulate @@ -8,14 +9,19 @@ buildPythonPackage rec { pname = "yoyo-migrations"; - version = "7.3.2"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RIQIKOGgFp9UHnAtWu3KgYWtpoCH57rUhQpvxdced6Q="; + sha256 = "sha256-ggYGoD4mLPHNT1niVsKPpEZCUiTVuCo9EnX9eBeFI+Q="; }; - propagatedBuildInputs = [ setuptools sqlparse tabulate ]; + propagatedBuildInputs = [ + importlib-metadata + setuptools + sqlparse + tabulate + ]; doCheck = false; # pypi tarball does not contain tests diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 72cd251dcb31..dbe559724789 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.12.0"; + version = "2.13.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-UVox7kuta7SK4FF4xYiuSaAqNd76Ad2aMpMwaQM2gWU="; + sha256 = "sha256-2ySwkGFsY49l4zprxdlW1kIiEYKWFRXMvCixf7DQtIw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index 23eae31057fc..738fbb075603 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zdaemon"; - version = "4.3"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "f249fc6885646d165d7d6b228a7b71f5170fc7117de9e0688271f8fb97840f72"; + sha256 = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw="; }; propagatedBuildInputs = [ zconfig ]; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 521bca4ece8c..22e4530674f3 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ZConfig"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oo6VoK4zV5V0fsytNbLLcI831Ex/Ml4qyyAemDMLFuU="; + sha256 = "sha256-RCLH1mOvdizXeVd1NmvGpnq0QKGreW6w90JbDpA08HY="; }; patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 83ee3f37f7e4..033975ed5dbc 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -28,25 +28,17 @@ buildPythonPackage rec { pname = "zeep"; - version = "4.1.0"; + version = "4.2.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mvantellingen"; repo = "python-zeep"; - rev = version; - sha256 = "sha256-fJLr2LJpbNQTl183R56G7sJILfm04R39qpJxLogQLoo="; + rev = "refs/tags/${version}"; + sha256 = "sha256-8f6kS231gbaZ8qyE8BKMcbnZsm8o2+iBoTlQrs5X+jY="; }; - patches = [ - (fetchpatch { - # fixes pytest_httpx test case; https://github.com/mvantellingen/python-zeep/pull/1293 - url = "https://github.com/mvantellingen/python-zeep/commit/2907848185adcb4e6d8c093db6c617c64cb8c8bf.patch"; - hash = "sha256-hpksgMfrBLvYtI1QIs1aHBtFq7C1PWpnAj8BW5ak1/4="; - }) - ]; - propagatedBuildInputs = [ attrs cached-property diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index cdabed860c92..5a80489e8091 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.10.0"; + version = "3.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-enJi/ZML0+NsULmmSJeuw/r/89/e7JYjriK0DpP5m7g="; + sha256 = "sha256-p6IuBZKSkKZ0AUQLOWkK5lYyebztXzFGCdnQN5j1Z2Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index f1bc3bf72f74..20d810064b6d 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "zope-hookable"; - version = "5.2"; + version = "5.4"; src = fetchPypi { pname = "zope.hookable"; inherit version; - sha256 = "sha256-TDAYvPKznPXMz0CCb3mbS4wUAFbbeA+WywyjMqJDvSk="; + sha256 = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw="; }; checkInputs = [ zope_testing ]; diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix index be4cdca72b65..ce9595ad537d 100644 --- a/pkgs/development/python-modules/zope_copy/default.nix +++ b/pkgs/development/python-modules/zope_copy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "zope.copy"; - version = "4.2"; + version = "4.3"; src = fetchPypi { inherit pname version; - sha256 = "47bb9d09ff06c600b446f220f47a742396598ac4828d738d3d85e6490629a71a"; + sha256 = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index 118a3a2c44a3..fddf45ef0631 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "zope.event"; - version = "4.5.0"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330"; + sha256 = "sha256-gdmIEwRvyGzEE242mP7mKKMoL5wyDbGGWMIXSSNfzoA="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index fb1eb07154a0..16da25903ea1 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.exceptions"; - version = "4.5"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TjW7oEiJxdEU3KpVKXQl1fM/YYqF7323Ehs7dxEAeE4="; + sha256 = "sha256-YZ0kpMZb7Zez3QUV5zLoK2nxVdQsyUlV0b6MKCiGg80="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index 1155adc83e9e..3e89f05f60ff 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zope.i18nmessageid"; - version = "5.0.1"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "9534142b684c986f5303f469573978e5a340f05ba2eee4f872933f1c38b1b059"; + sha256 = "sha256-R7djR7gOCytmxIbuZvP4bFdJOiB1uFqfuAJpD6cwvZI="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index c1f61a4cbee5..eea485ab2a58 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "5.4.0"; + version = "5.5.2"; src = fetchPypi { inherit pname version; - sha256 = "5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e"; + sha256 = "sha256-v+4fP/YhQ4GUmeNI9bin86oCWfmspeDdrnOR0Fnc5nE="; }; propagatedBuildInputs = [ zope_event ]; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 69fee2e338ff..f4fe420951dd 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.location"; - version = "4.2"; + version = "4.3"; src = fetchPypi { inherit pname version; - sha256 = "a720f9e3c8a51d5007ed6fcd47e1834df02671d85dbfd1062a0d808de8bf80ac"; + sha256 = "sha256-Fx7tyKIOw6isJxOaqQzyd/93dy6gMrVLaicBp5J7OsU="; }; propagatedBuildInputs = [ zope_proxy ]; diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 70e329cce9e9..24210e8c73cc 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.5.0"; + version = "4.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1329846261cf6c552b05579f3cfad199b2d178510d0b4703eb5f7cdd6ebad01a"; + sha256 = "sha256-+xUTt6jtc3oxI/1XHCRPB+7iRdYIGlY3CyBhHUAPCXQ="; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index 9472000f15d1..4dd97d94e43b 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.schema"; - version = "6.2.0"; + version = "6.2.1"; src = fetchPypi { inherit pname version; - sha256 = "2201aef8ad75ee5a881284d7a6acd384661d6dca7bde5e80a22839a77124595b"; + sha256 = "sha256-47M8i8i6nYWlZxOrjwo8JhXVSoCF8eQVzgyN+15UC+Y="; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index f8ea4e83b15c..773209adcdf4 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.testing"; - version = "4.10"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O25ZBsrd0UjCP+lY5qrj+tyKCKilP3R9l5HC2BNe5W4="; + sha256 = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; }; doCheck = !isPyPy; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 1b838354c4cf..a1f85a9d0f36 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.5.1"; + version = "5.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ahDTg1RZ7tO8hDHyGq9gS8dU/4OSopeXzSDlqUHBQ74="; + sha256 = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q="; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix index 67f48f34731d..96568bcd56ba 100644 --- a/pkgs/development/python-modules/zxcvbn/default.nix +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -1,22 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "zxcvbn"; version = "4.4.28"; + format = "setuptools"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "dwolfhub"; repo = "zxcvbn-python"; - rev = "45afdf0d3dd8477bc7e457629bb4bc9680794cd7"; # not tagged in repository - sha256 = "0w0sx9ssjks8da973cdv5xi87yjsf038jqxmzj2y26xvpyjsg2v2"; + rev = "refs/tags/v${version}"; + hash = "sha256-etcST7pxlpOH5Q9KtOPGf1vmnkyjEp6Cd5QCmBjW9Hc="; }; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Python implementation of Dropbox's realistic password strength estimator"; diff --git a/pkgs/development/rocm-modules/update-script/default.nix b/pkgs/development/rocm-modules/update-script/default.nix index 1d2b268a34b6..6188587de31a 100644 --- a/pkgs/development/rocm-modules/update-script/default.nix +++ b/pkgs/development/rocm-modules/update-script/default.nix @@ -1,4 +1,4 @@ -{ runtimeShell +{ lib , writeScript }: @@ -10,6 +10,11 @@ }: let + pname = + if lib.hasPrefix "rocm-llvm-" name + then "llvmPackages_rocm.${lib.removePrefix "rocm-llvm-" name}" + else name; + updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts @@ -22,6 +27,6 @@ let version="''${version}.0" fi - update-source-version ${name} "$version" --ignore-same-hash + update-source-version ${pname} "$version" --ignore-same-hash ''; in [ updateScript ] diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh index dcc38b9ec74a..96fe8ebfac29 100644 --- a/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup unpackPhase diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh index c1481dc6a144..e007cbac9582 100644 --- a/pkgs/development/tools/build-managers/boot/builder.sh +++ b/pkgs/development/tools/build-managers/boot/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup boot_bin=$out/bin/boot diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index a72106ace3c4..803476e3f98c 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -25,7 +25,7 @@ let newPython = python3.override { version = "1.5.0"; src = oldAttrs.src.override { inherit version; - sha256 = "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f"; + hash = "sha256-Dlh1auOPvY/DAg1UutuOrhfFudy+04ixe7Vbilko35I="; }; }); }; diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 0a3e44e02299..6fd4c2b58868 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -30,5 +30,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = teams.rocm.members; platforms = platforms.unix; + broken = finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index e774b554dc06..c6852ddf1cb1 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -11,6 +11,7 @@ , passlib , platformdirs , pluggy +, py , pyramid , pytestCheckHook , repoze_lru @@ -24,6 +25,7 @@ buildPythonApplication rec { pname = "devpi-server"; version = "6.7.0"; + format = "setuptools"; disabled = isPy27; @@ -62,6 +64,7 @@ buildPythonApplication rec { checkInputs = [ beautifulsoup4 nginx + py pytestCheckHook webtest ]; diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 5671f5dbe641..6b41cc9862b9 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchpatch -, fetchFromGitHub +, fetchurl , autoreconfHook , onigurumaSupport ? true , oniguruma @@ -11,19 +10,14 @@ stdenv.mkDerivation rec { pname = "jq"; version = "1.6"; - src = fetchFromGitHub { - owner = "stedolan"; - repo = "jq"; - rev = "${pname}-${version}"; - hash = "sha256-CIE8vumQPGK+TFAncmpBijANpFALLTadOvkob0gVzro"; + # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages + src = fetchurl { + url = "https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; + sha256 = "sha256-XejI4pqqP7nMa0e7JymfJxNU67clFOOsytx9OLW7qnI="; }; patches = [ - (fetchpatch { - name = "fix-tests-when-building-without-regex-supports.patch"; - url = "https://github.com/stedolan/jq/pull/2292/commits/f6a69a6e52b68a92b816a28eb20719a3d0cb51ae.patch"; - sha256 = "pTM5FZ6hFs5Rdx+W2dICSS2lcoLY1Q//Lan3Hu8Gr58="; - }) + ./fix-tests-when-building-without-regex-supports.patch ]; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; @@ -69,7 +63,7 @@ stdenv.mkDerivation rec { description = "A lightweight and flexible command-line JSON processor"; homepage = "https://stedolan.github.io/jq/"; license = licenses.mit; - maintainers = with maintainers; [ raskin globin ]; + maintainers = with maintainers; [ raskin globin artturin ]; platforms = platforms.unix; downloadPage = "https://stedolan.github.io/jq/download/"; }; diff --git a/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch b/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch new file mode 100644 index 000000000000..ac7614ed80b2 --- /dev/null +++ b/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch @@ -0,0 +1,38 @@ +From f6a69a6e52b68a92b816a28eb20719a3d0cb51ae Mon Sep 17 00:00:00 2001 +From: Dmitry Bogatov +Date: Sat, 27 Mar 2021 00:00:00 +0000 +Subject: [PATCH] Disable some tests when building without regex support + +--- + Makefile.am | 5 ++++- + configure.ac | 1 + + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index f5c1db594..f3f44bb9e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -130,7 +130,10 @@ endif + + ### Tests (make check) + +-TESTS = tests/optionaltest tests/mantest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test ++TESTS = tests/optionaltest tests/jqtest tests/shtest tests/utf8test tests/base64test ++if WITH_ONIGURUMA ++TESTS += tests/mantest tests/onigtest ++endif + TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND) + + # This is a magic make variable that causes it to treat tests/man.test as a +diff --git a/configure.ac b/configure.ac +index 0441d4a2c..987d94e0a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -278,6 +278,7 @@ AC_SUBST(onig_CFLAGS) + AC_SUBST(onig_LDFLAGS) + + AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes]) ++AM_CONDITIONAL([WITH_ONIGURUMA], [test "x$with_oniguruma" = xyes]) + AC_SUBST([BUNDLER], ["$bundle_cmd"]) + + AC_CONFIG_MACRO_DIR([config/m4]) diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/development/tools/language-servers/ansible-language-server/default.nix index 084e2e023d92..5b0ba5bfca20 100644 --- a/pkgs/development/tools/language-servers/ansible-language-server/default.nix +++ b/pkgs/development/tools/language-servers/ansible-language-server/default.nix @@ -18,7 +18,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-rJ1O2OsrJhTIfywK9/MRubwwcCmMbu61T4zyayg+mAU="; npmBuildScript = "compile"; - # We remove the prepare and prepack scripts because they run the + # We remove/ignore the prepare and prepack scripts because they run the # build script, and therefore are redundant. # # Additionally, the prepack script runs npm ci in addition to the @@ -30,6 +30,7 @@ buildNpmPackage rec { sed -i '/"prepack"/d' package.json ''; + npmPackFlags = [ "--ignore-scripts" ]; passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index e54a2acca67e..0cb1d5d61e33 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup # Wrap the given `aclocal' program, appending extra `-I' flags diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 45edeb89a9c7..6c2799cfadf7 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; configureScript = "../configure"; - doCheck = true; + doCheck = !(with stdenv; isDarwin && isAarch64); # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of # the build daemon when building in a chroot. See diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 7320fe1929e3..667acd91f349 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, targetPackages # Build time -, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch + # backport readline=8.2 support + (fetchpatch { + name = "readline-8.2.patch"; + url = "https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=1add37b567a7dee39d99f37b37802034c3fce9c4"; + hash = "sha256-KmQXylPAWNGXF8wtXCCArhUzHi+GUY8ii2Xpx8R08jE="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch # Does not nave to be conditional. We apply it conditionally diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index aa991e8ea978..5a255df46806 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "lit"; - version = "14.0.0"; + version = "15.0.6"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "45e08ce87b0ea56ab632aa02fa857418a5dd241a711c7c756878b73a130c3efe"; + hash = "sha256-S06OQfDmDyutls21HxyQ016ku3FTTsDOP8Di67d9f+k="; }; passthru = { @@ -14,6 +14,9 @@ python3.pkgs.buildPythonApplication rec { }; # Non-standard test suite. Needs custom checkPhase. + # Needs LLVM's `FileCheck` and `not`: `$out/bin/lit tests` + # There should be `llvmPackages.lit` since older LLVM versions may + # have the possibility of not correctly interfacing with newer lit versions doCheck = false; meta = { diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh index b8e7791b6fc9..55259b932124 100644 --- a/pkgs/development/tools/parsing/antlr/builder.sh +++ b/pkgs/development/tools/parsing/antlr/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup tar zxvf $src diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 9979153842b1..36a66d091aeb 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -1669,7 +1669,6 @@ lib.composeManyExtensions [ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cairo - pkgs.xlibsWrapper ]; mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 34dcb52526bd..64368fa0c95a 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -1,13 +1,12 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , rocmUpdateScript -, fetchpatch , cmake -, rocm-runtime -, python3 , rocm-cmake +, rocm-runtime , busybox +, python3 , gnugrep # rocminfo requires that the calling user have a password and be in # the video group. If we let rocm_agent_enumerator rely upon @@ -19,7 +18,7 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "5.4.0"; + version = "5.4.1"; pname = "rocminfo"; src = fetchFromGitHub { @@ -29,25 +28,21 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-4wZTm5AZgG8xEd6uYqxWq4bWZgcSYZ2WYA1z4RAPF8U="; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; - buildInputs = [ rocm-cmake rocm-runtime ]; - - cmakeFlags = [ - "-DROCM_DIR=${rocm-runtime}" - "-DROCRTST_BLD_TYPE=Release" + nativeBuildInputs = [ + cmake + rocm-cmake ]; + buildInputs = [ rocm-runtime ]; + propagatedBuildInputs = [ python3 ]; + cmakeFlags = [ "-DROCRTST_BLD_TYPE=Release" ]; + prePatch = '' - sed 's,#!/usr/bin/env python3,#!${python3}/bin/python,' -i rocm_agent_enumerator + patchShebangs rocm_agent_enumerator sed 's,lsmod | grep ,${busybox}/bin/lsmod | ${gnugrep}/bin/grep ,' -i rocminfo.cc ''; - installPhase = '' - mkdir -p $out/bin - cp rocminfo $out/bin - cp rocm_agent_enumerator $out/bin - '' + lib.optionalString (defaultTargets != []) '' + postInstall = lib.optionalString (defaultTargets != [ ]) '' echo '${lib.concatStringsSep "\n" defaultTargets}' > $out/bin/target.lst ''; @@ -63,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = stdenv.isAarch64 || finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix deleted file mode 100644 index 64580d8ad8b3..000000000000 --- a/pkgs/development/tools/rust/cargo-auditable/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-auditable"; - version = "0.5.5"; - - src = fetchFromGitHub { - owner = "rust-secure-code"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-mEmTgd7sC2jmYeb5pEO985v/aWWKlq/mSQUAGi32loY="; - }; - - cargoSha256 = "sha256-G72UUqvFaTY/GQSkpz1wIzjb7vIWuAjvKMZosUB6YsA="; - - meta = with lib; { - description = "A tool to make production Rust binaries auditable"; - homepage = "https://github.com/rust-secure-code/cargo-auditable"; - changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md"; - license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index b276a618110f..384030c903d9 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.13.0"; + version = "0.14.5"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-uKpYI+Oc49xgoIZCh72baBMZLcpMXk7g2Jb1DQxW9lk="; + hash = "sha256-3TEEmraQ9KGx29ok7IUdVzTW0ilaAci1dOZUlKvQYJE="; }; - cargoHash = "sha256-levBWghFIXOXe+NGXvwBqQpPmWeUK53ruSyLik1urSU="; + cargoHash = "sha256-/biWBTNIysg6HDozyF8UdKoxlgkHl9tnyean8+333hI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index aa2b694b3a1a..82e9770c9c03 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -22,6 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hanikqugN4HgdGxFOgOzT53phb60GfZr3o/ljD96HSM="; }; + auditable = true; # TODO: remove when this is the default + cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; cargoTestFlags = [ "--package" "rust-analyzer" "--package" "proc-macro-srv-cli" ]; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 7edba948586e..6f95ded63e15 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.231.0"; + version = "1.3.236.0"; src = (assert version == spirv-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "sdk-${version}"; - hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0="; + hash = "sha256-BV7V/jS782zdvtuw/wNY5fyAdx8Z2niWSocNaW0Atho="; } ); diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 4f6a766e5e96..17e898301956 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.231.0"; + version = "1.3.236.0"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - hash = "sha256-5bzUauu8081zyRaWmRUtOxHjUU4gc1GWoJtU783Msh0="; + hash = "sha256-+VbiXtxzYaF5o+wIrJ+09LmgBdaLv/0VJGFDnBkrXms="; }); # Include absolute paths to layer libraries in their associated diff --git a/pkgs/development/web/nodejs/npm-patches.nix b/pkgs/development/web/nodejs/npm-patches.nix new file mode 100644 index 000000000000..28432f806dc6 --- /dev/null +++ b/pkgs/development/web/nodejs/npm-patches.nix @@ -0,0 +1,23 @@ +{ fetchpatch }: + +[ + # Makes `npm pack` obey `--foreground-scripts` + (fetchpatch { + name = "libnpmpack-obey-foreground-scripts.patch"; + url = "https://github.com/npm/cli/commit/e4e8ae20aef9e27e57282e87e8757d5b364abb39.patch"; + hash = "sha256-NQ8CZBfRqAOMe0Ysg3cq1FiferWKTzXC1QXgzX+f8OU="; + stripLen = 2; + extraPrefix = "deps/npm/node_modules/"; + includes = [ "deps/npm/node_modules/libnpmpack/lib/index.js" ]; + }) + + # Makes `npm pack` obey `--ignore-scripts` + (fetchpatch { + name = "libnpmpack-obey-ignore-scripts.patch"; + url = "https://github.com/npm/cli/commit/a990c3c9a0e67f0a8b6454213675e159fe49432d.patch"; + hash = "sha256-eA5YST9RxMMjk5FCwEbl1HQUpXZuwWZkx5WC4yJium8="; + stripLen = 2; + extraPrefix = "deps/npm/node_modules/"; + includes = [ "deps/npm/node_modules/libnpmpack/lib/index.js" ]; + }) +] diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 86358be5bcf0..4563dd7a045a 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.21.1"; - sha256 = "sha256-PbldbKcolXvwkLYwGnqdLYBxSyoG2Jih22XG5Csdp6w="; + version = "14.21.2"; + sha256 = "00zzl43iis8mr8x48hww5ncj8mj5dmpn05rq7ihpffkp2q7rmw6q"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index a35c347c3d14..c8241ababc0d 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -5,13 +5,15 @@ let inherit openssl; python = python3; }; + + npmPatches = callPackage ./npm-patches.nix { }; in buildNodejs { inherit enableNpm; - version = "16.18.1"; - sha256 = "sha256-H4BRqI+G9CBk9EFf56mA5ZsKUC7Mje9YP2MDvE1EUjg="; + version = "16.19.0"; + sha256 = "01k72p0hp4lhlpz1syd9cbkm2gpfww0hn10xdpmzd4i3x8dfq7sg"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch - ]; + ] ++ npmPatches; } diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 29f133a81105..5d1dfa555431 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,25 +1,19 @@ -{ callPackage, openssl, fetchpatch, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl; python = python3; }; + + npmPatches = callPackage ./npm-patches.nix { }; in buildNodejs { inherit enableNpm; - version = "18.12.1"; - sha256 = "sha256-T6QGRRvFJlmikOUs/bIWKnYL1UnaS4u+vmop8pbZON8="; + version = "18.13.0"; + sha256 = "0s6sscynhw9limpp43f965rn9grdamcvsnd9wfb2h5qxw1icajpx"; patches = [ - (fetchpatch { - # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200 - name = "revert-arm64-pointer-auth.patch"; - url = "https://github.com/nodejs/node/pull/43200/commits/d42c42cc8ac652ab387aa93205aed6ece8a5040a.patch"; - sha256 = "sha256-ipGzg4lEoftTJbt6sW+0QJO/AZqHvUkFKe0qlum+iLY="; - revert = true; - }) - ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch - ]; + ] ++ npmPatches; } diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index cbed3bbef9aa..454d647dad2c 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -5,11 +5,12 @@ let inherit openssl; python = python3; }; + in buildNodejs { inherit enableNpm; - version = "19.2.0"; - sha256 = "sha256-CVaw/wHy9jg4J+kWpgSBWc4r2wUhf2VKj/9U6BFtwX4="; + version = "19.4.0"; + sha256 = "0qdj67dgxbjpllm2z9vm46c50s3dqk8a34hbp81vsa7mf3b42182"; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 6d05cc48270f..e41e33b4003c 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -26,6 +26,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-cK5n75T+Kkd6F4q4MFZNn0R6W6Nk2/H23AGhIe2FCig="; + auditable = true; # TODO: remove when this is the default + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index f8c5f539f7d2..74c2be586ceb 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -26,7 +26,5 @@ stdenv.mkDerivation rec { license = licenses.free; longDescription = "Play the german card game Skat against the AI or over IRC."; homepage = "http://www.xskat.de/"; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index 80de216e8639..bb749b57d01e 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -42,7 +42,5 @@ stdenv.mkDerivation rec { maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; homepage = "https://tracker.debian.org/pkg/xsok"; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 30e0ce44ca4a..b707647377ca 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace cups/testfile.c \ --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin' + + # The cups.socket unit shouldn't be part of cups.service: stopping the + # service would stop the socket and break subsequent socket activations. + # See https://github.com/apple/cups/issues/6005 + sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in ''; nativeBuildInputs = [ pkg-config removeReferencesTo ]; diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh index f750df6e5063..bdb522744182 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup arch=$(uname -m) diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index 68996e4e457c..86e7e3048e74 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -29,7 +29,8 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'rich = "^12.4.0"' 'rich = "*"' + --replace 'rich = "^12.4.0"' 'rich = "*"' \ + --replace 'textual = "^0.1.18"' 'textual = "*"' ''; pythonImportsCheck = [ diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 4565f698d26c..42109062b72d 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -58,17 +58,18 @@ let configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration; IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit; - callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { + xcodebuild = pkgs.xcbuild.override { inherit (pkgs.darwin.apple_sdk_11_0) stdenv; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO; + }; + + callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec { + inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild; darwin = pkgs.darwin.overrideScope (_: prev: { inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; apple_sdk = prev.darwin.apple_sdk_11_0; CF = prev.darwin.apple_sdk_11_0.CoreFoundation; }); - xcodebuild = pkgs.xcbuild.override { - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO; - inherit stdenv; - }; xcbuild = xcodebuild; }); diff --git a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh index cca65661f8a9..6a254cd82123 100644 --- a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh +++ b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh @@ -25,7 +25,7 @@ signDarwinBinariesIn() { signDarwinBinariesInAllOutputs() { local output - for output in $outputs; do + for output in $(getAllOutputNames); do signDarwinBinariesIn "${!output}" done } diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 1e188fbe6074..3306d875272f 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.54"; + version = "0.55"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - sha256 = "sha256-Oi+S4DWXuTUL36Xh3iWIZj9rdN2qUDHmZiFSH1csW+8="; + sha256 = "sha256-vMWs+0iaszq+p55Z9AhqkNHWeOwlgt2iq7uuA8xGjJ4="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 8c1a778ec8bf..3c5443f3432f 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -1,37 +1,31 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, libusb1 +}: stdenv.mkDerivation rec { pname = "fxload"; - version = "2002.04.11"; + version = libusb1.version; + dontUnpack = true; + dontBuild = true; + dontConfigure = true; + dontInstall = true; + dontPatch = true; + dontPatchELF = true; - src = fetchurl { - url = "mirror://sourceforge/linux-hotplug/fxload-${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; - }; - - patches = [ - # Will be needed after linux-headers is updated to >= 2.6.21. - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/fxload/files/fxload-20020411-linux-headers-2.6.21.patch?rev=1.1"; - sha256 = "0ij0c8nr1rbyl5wmyv1cklhkxglvsqz32h21cjw4bjm151kgmk7p"; - }) - ]; - - preBuild = '' - substituteInPlace Makefile --replace /usr / - makeFlagsArray=(INSTALL=install prefix=$out) - ''; - - preInstall = '' + # fxload binary exist inside the `examples/bin` directory of `libusb1` + postFixup = '' mkdir -p $out/sbin - mkdir -p $out/share/man/man8 - mkdir -p $out/share/usb + ln -s ${passthru.libusb}/examples/bin/fxload $out/sbin/fxload ''; + passthru.libusb = libusb1.override { withExamples = true; }; + meta = with lib; { - homepage = "http://linux-hotplug.sourceforge.net/?selected=usb"; - description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; - license = licenses.gpl2; + homepage = "https://github.com/libusb/libusb"; + description = "Tool to upload firmware to into an21, fx, fx2, fx2lp and fx3 ez-usb devices"; + license = licenses.gpl2Only; platforms = platforms.linux; + maintainers = with maintainers; [ realsnick ]; }; } diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 89c191cb7f35..9a63a28a7a96 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "UjE56ecq7JljdPot50vkxT0t0FWJSIk00h/5e64ZWAo="; + sha256 = "sha256-XOEqD+xrIScl7yGHNZQbLat2JE235yZGp2AhsFN7Q6s="; }; patches = [ diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index b3895c286c56..54a9a53a0367 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.0"; + version = "2.1"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-9eQ2fW3ha69ngugYonbYdqrpERqt8aM0Ed4HM0CrmUU="; + sha256 = "sha256-Aq038SG8vuxCA6mYOP5I6VWCUty5vgdbpAa9J+bIfZM="; }; outputs = [ "out" "man" "doc" ] diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index d8bfb59bf12a..34fbde9d676a 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -114,12 +114,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "6.0"; in + linuxHeaders = let version = "6.1"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - sha256 = "sha256-XCRDpVON5SaI77VcJ6sFOcH161jAz9FqK5+7CP2BeI4="; + sha256 = "sha256-LKHxcFGkMPb+0RluSVJxdQcXGs/ZfZZXchJQJwOyXes="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 04322a35b4fe..d6bb9d4a431b 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-2rzVah+CxCztKnlEWMIQrUS2JJTLiWscfIA1aOBtIzs="; + sha256 = "sha256-/vt6IA1o0gjFtXUWhEKIZ1DUWIN2LOvrhLfFzJBACGY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index eadf88fd1168..1cf1400f996b 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup unpackManually() { diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index cd21899e60e7..34f9b1579455 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup mkdir -p $out/lib diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index c6fd417d0d6f..f0e2c281aa56 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,57 +1,62 @@ -{ lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt -, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison, runtimeShell -, libxcrypt, pam ? null, glibcCross ? null +{ lib, stdenv, fetchFromGitHub +, runtimeShell, nixosTests, fetchpatch +, autoreconfHook, bison, flex +, docbook_xml_dtd_45, docbook_xsl +, itstool , libxml2, libxslt +, libxcrypt +, glibcCross ? null +, pam ? null +, withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb }: - let - glibc = - if stdenv.hostPlatform != stdenv.buildPlatform - then glibcCross + if stdenv.hostPlatform != stdenv.buildPlatform then glibcCross else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc; - dots_in_usernames = fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch"; - sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692"; - }; - in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.11.1"; + version = "4.13"; src = fetchFromGitHub { owner = "shadow-maint"; - repo = "shadow"; - rev = "v${version}"; - sha256 = "sha256-PxLX5V0t18JftT5wT41krNv18Ew7Kz3MfZkOi/80ODA="; + repo = pname; + rev = version; + sha256 = "sha256-L54DhdBYthfB9436t/XWXiqKhW7rfd0GLS7pYGB32rA="; }; - buildInputs = [ libxcrypt ] - ++ lib.optional (pam != null && stdenv.isLinux) pam; - nativeBuildInputs = [autoreconfHook libxslt libxml2 - docbook_xml_dtd_45 docbook_xsl flex bison itstool - ]; - - patches = - [ ./keep-path.patch - # Obtain XML resources from XML catalog (patch adapted from gtk-doc) - ./respect-xml-catalog-files-var.patch - dots_in_usernames - ./runtime-shell.patch - ]; + outputs = [ "out" "su" "dev" "man" ]; RUNTIME_SHELL = runtimeShell; + nativeBuildInputs = [ + autoreconfHook bison flex + docbook_xml_dtd_45 docbook_xsl + itstool libxml2 libxslt + ]; + + buildInputs = [ libxcrypt ] + ++ lib.optional (pam != null && stdenv.isLinux) pam + ++ lib.optional withTcb tcb; + + patches = [ + ./keep-path.patch + # Obtain XML resources from XML catalog (patch adapted from gtk-doc) + ./respect-xml-catalog-files-var.patch + ./runtime-shell.patch + ./fix-install-with-tcb.patch + # Fix HAVE_SHADOWGRP configure check + (fetchpatch { + url = "https://github.com/shadow-maint/shadow/commit/a281f241b592aec636d1b93a99e764499d68c7ef.patch"; + sha256 = "sha256-GJWg/8ggTnrbIgjI+HYa26DdVbjTHTk/IHhy7GU9G5w="; + }) + ]; + # The nix daemon often forbids even creating set[ug]id files. - postPatch = - ''sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am - ''; - - outputs = [ "out" "su" "man" ]; - - enableParallelBuilding = true; + postPatch = '' + sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am + ''; # Assume System V `setpgrp (void)', which is the default on GNU variants # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) @@ -65,23 +70,24 @@ stdenv.mkDerivation rec { "--with-group-name-max-length=32" "--with-bcrypt" "--with-yescrypt" - ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"; + ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd" + ++ lib.optional withTcb "--with-tcb"; - preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") - '' - substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd - ''; + preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd + ''; - postInstall = - '' - # Don't install ‘groups’, since coreutils already provides it. - rm $out/bin/groups - rm $man/share/man/man1/groups.* + postInstall = '' + # Don't install ‘groups’, since coreutils already provides it. + rm $out/bin/groups + rm $man/share/man/man1/groups.* - # Move the su binary into the su package - mkdir -p $su/bin - mv $out/bin/su $su/bin - ''; + # Move the su binary into the su package + mkdir -p $su/bin + mv $out/bin/su $su/bin + ''; + + enableParallelBuilding = true; disallowedReferences = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.shellPackage; diff --git a/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch b/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch new file mode 100644 index 000000000000..ff6166b92f1d --- /dev/null +++ b/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch @@ -0,0 +1,28 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index a1a2e4e..fa17f9d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -74,10 +74,6 @@ suidubins += newgidmap newuidmap + endif + endif + +-if WITH_TCB +-shadowsgidubins = passwd +-endif +- + LDADD = $(INTLLIBS) \ + $(top_builddir)/libmisc/libmisc.la \ + $(top_builddir)/lib/libshadow.la \ +@@ -146,12 +142,6 @@ install-am: all-am + set -e; for i in $(suidusbins); do \ + chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \ + done +-if WITH_TCB +- set -e; for i in $(shadowsgidubins); do \ +- chown root:shadow $(DESTDIR)$(ubindir)/$$i; \ +- chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \ +- done +-endif + if ENABLE_SUBIDS + if FCAPS + setcap cap_setuid+ep $(DESTDIR)$(ubindir)/newuidmap diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 33b7a92d8cf7..4799cdb06b76 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,7 +6,6 @@ , fetchFromGitHub , fetchpatch , fetchzip -, applyPatches , buildPackages , makeBinaryWrapper , ninja @@ -89,7 +88,7 @@ , withDocumentation ? true , withEfi ? stdenv.hostPlatform.isEfi && !stdenv.hostPlatform.isMusl , withFido2 ? true -, withHomed ? false +, withHomed ? !stdenv.hostPlatform.isMusl , withHostnamed ? true , withHwdb ? true , withImportd ? !stdenv.hostPlatform.isMusl @@ -131,7 +130,7 @@ assert withHomed -> withCryptsetup; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "252.1"; + version = "252.4"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -148,7 +147,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - hash = "sha256-G43qbNF7znTITSM78sOL0qi8nqaA7qIhmiqP/rZKjXY="; + hash = "sha256-8ejSEt3QyCSARGGVbXWac2dB9jdUpC4eX2rN0iENQX0="; }; # On major changes, or when otherwise required, you *must* reformat the patches, @@ -178,20 +177,10 @@ stdenv.mkDerivation { ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-d43ec090ceb2bf0016a065103a4c34d0c43cb906.tar.gz"; - sha256 = "sha256-e5rHmz0uyNgJwrAj96VGWWu9YHhZtJXoDpCtj17eC5w="; + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-cccd4bcaf381c2729adc000381bd89906003e72a.tar.gz"; + sha256 = "2CFZEzWqUy6OOF3c+LN4Zmy3RqMzfdRHp+B5zlWJsoE="; }; - oe-core-patched = applyPatches { - src = oe-core; - patches = [ - (fetchpatch { - url = "https://lore.kernel.org/all/20221109002306.853567-1-raj.khem@gmail.com/raw"; - includes = [ "meta/recipes-core/systemd/systemd/*" ]; - sha256 = "sha256-aPJjN4vesZwFzgY4Nb6uaIuHz/quH1HccSVEof32IOU="; - }) - ]; - }; - musl-patches = oe-core-patched + "/meta/recipes-core/systemd/systemd"; + musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; in [ (musl-patches + "/0003-missing_type.h-add-comparison_fn_t.patch") @@ -213,8 +202,7 @@ stdenv.mkDerivation { (musl-patches + "/0001-pass-correct-parameters-to-getdents64.patch") (musl-patches + "/0002-Add-sys-stat.h-for-S_IFDIR.patch") (musl-patches + "/0001-Adjust-for-musl-headers.patch") - (musl-patches + "/0001-networkd-ipv4acd.c-Use-net-if.h-for-getting-IFF_LOOP.patch") - (musl-patches + "/0001-test-compile-test-utmp.c-only-if-UTMP-is-enabled.patch") + (musl-patches + "/0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch") ] ); diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 39f6981a6dad..98201ef05641 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -106,6 +106,16 @@ let }; }); + pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { + version = "2.5.3"; + src = fetchFromGitHub { + owner = "riptideio"; + repo = "pymodbus"; + rev= "refs/tags/v${version}"; + hash = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4="; + }; + }); + python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh index 2e36367e9dcf..d334ab6f927f 100644 --- a/pkgs/servers/http/tomcat/axis2/builder.sh +++ b/pkgs/servers/http/tomcat/axis2/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup unzip $src diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index c05dbe28f249..ad2eb3691314 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; # needs to find a local perl module during build - PERL_USE_UNSAFE_INC = "1"; + env.PERL_USE_UNSAFE_INC = "1"; # TODO: tests are failing https://munin-monitoring.org/ticket/1390#comment:1 # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index 5a832cb14d53..9ee81091584b 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi # This is the builder for all X.org components. source $stdenv/setup diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 59d66abf994b..ed9efb690fa8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -38,7 +38,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "bitmap"; version = "1.0.9"; builder = ./builder.sh; @@ -48,13 +48,13 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "editres"; version = "1.0.7"; builder = ./builder.sh; @@ -64,7 +64,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -1578,7 +1578,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { + oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "oclock"; version = "1.0.4"; builder = ./builder.sh; @@ -1588,7 +1588,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -1690,7 +1690,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt }: stdenv.mkDerivation { + viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "viewres"; version = "1.0.5"; builder = ./builder.sh; @@ -1700,7 +1700,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -1724,11 +1724,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { pname = "xauth"; - version = "1.1"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2"; - sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; + url = "mirror://xorg/individual/app/xauth-1.1.2.tar.xz"; + sha256 = "0072ivzn4z59ysanz838nh8s4mcmdsx6q9xkvlfysv2k37ynmfkq"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1770,7 +1770,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xcalc"; version = "1.1.0"; builder = ./builder.sh; @@ -1780,7 +1780,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -1914,7 +1914,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xclock"; version = "1.0.9"; builder = ./builder.sh; @@ -1924,7 +1924,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -1962,7 +1962,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xconsole"; version = "1.0.7"; builder = ./builder.sh; @@ -1972,7 +1972,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -2010,7 +2010,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xdm"; version = "1.1.12"; builder = ./builder.sh; @@ -2020,7 +2020,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -2460,11 +2460,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-mga"; - version = "2.0.0"; + version = "2.0.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2"; - sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; + url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz"; + sha256 = "1aq3aqh2yg09gy864kkshfx5pjl5w05jdz97bx5bnrbrhdq3p8r7"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2588,11 +2588,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-r128"; - version = "6.11.0"; + version = "6.12.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2"; - sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; + url = "mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz"; + sha256 = "0hf7h54wxgs8njavp0kgadjq1787fhbd588j7pj685hz2wmkq0kx"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2906,7 +2906,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { + xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xfd"; version = "1.1.3"; builder = ./builder.sh; @@ -2916,13 +2916,13 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ pkg-config gettext wrapWithXFileSearchPathHook ]; buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xfontsel"; version = "1.0.6"; builder = ./builder.sh; @@ -2932,7 +2932,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -2986,7 +2986,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xgc"; version = "1.0.5"; builder = ./builder.sh; @@ -2996,7 +2996,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -3146,7 +3146,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { + xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xload"; version = "1.1.3"; builder = ./builder.sh; @@ -3156,7 +3156,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ pkg-config gettext wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -3210,7 +3210,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xmag"; version = "1.0.6"; builder = ./builder.sh; @@ -3220,13 +3220,13 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xmessage"; version = "1.0.5"; builder = ./builder.sh; @@ -3236,7 +3236,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -3258,7 +3258,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xmore"; version = "1.0.3"; builder = ./builder.sh; @@ -3268,7 +3268,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; @@ -3466,7 +3466,7 @@ self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt }: stdenv.mkDerivation { + xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { pname = "xsm"; version = "1.0.4"; builder = ./builder.sh; @@ -3476,7 +3476,7 @@ self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libICE libSM libX11 libXaw libXt ]; meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 987895ab6e1d..a3751bf16f00 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -23,7 +23,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext", "meson", "ninja" ); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext", "meson", "ninja", "wrapWithXFileSearchPathHook" ); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; @@ -195,6 +195,10 @@ while (<>) { push @{$extraAttrs{$pkg}}, "postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`\$PKG_CONFIG' '';"; } + if (@@ = glob("$tmpDir/*/app-defaults/")) { + push @nativeRequires, "wrapWithXFileSearchPathHook"; + } + sub process { my $requires = shift; my $s = shift; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8b3129f5ae21..6de759498b21 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,6 +1,7 @@ { abiCompat ? null, + callPackage, lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, - automake, autoconf, gettext, libiconv, libtool, intltool, + automake, autoconf, libiconv, libtool, intltool, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, @@ -22,25 +23,28 @@ let in self: super: { + wrapWithXFileSearchPathHook = callPackage ({ makeBinaryWrapper, makeSetupHook, writeScript }: makeSetupHook { + name = "wrapWithXFileSearchPathHook"; + deps = [ makeBinaryWrapper ]; + } (writeScript "wrapWithXFileSearchPathHook.sh" '' + wrapWithXFileSearchPath() { + paths=( + "$out/share/X11/%T/%N" + "$out/include/X11/%T/%N" + "${xorg.xbitmaps}/include/X11/%T/%N" + ) + for exe in $out/bin/*; do + wrapProgram "$exe" \ + --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}") + done + } + postInstallHooks+=(wrapWithXFileSearchPath) + '')) {}; + bdftopcf = super.bdftopcf.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ]; }); - bitmap = super.bitmap.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ]; - postInstall = '' - paths=( - "$out/share/X11/%T/%N" - "$out/include/X11/%T/%N" - "${xorg.xbitmaps}/include/X11/%T/%N" - ) - wrapProgram "$out/bin/bitmap" \ - --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}") - makeWrapper "$out/bin/bitmap" "$out/bin/bitmap-color" \ - --suffix XFILESEARCHPATH : "$out/share/X11/%T/%N-color" - ''; - }); - editres = super.editres.overrideAttrs (attrs: { hardeningDisable = [ "format" ]; }); @@ -140,6 +144,14 @@ self: super: configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); + libFS = super.libFS.overrideAttrs (attrs: { + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; + }); + libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: { + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; + }); xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: { configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; @@ -312,11 +324,6 @@ self: super: }); libxshmfence = super.libxshmfence.overrideAttrs (attrs: { - name = "libxshmfence-1.3"; - src = fetchurl { - url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; - sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; - }; outputs = [ "out" "dev" ]; # mainly to avoid propagation }); @@ -705,10 +712,6 @@ self: super: postPatch = with lib; concatStrings (mapAttrsToList patchIn layouts); }); - xload = super.xload.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ gettext ]; - }); - xlsfonts = super.xlsfonts.overrideAttrs (attrs: { meta = attrs.meta // { license = lib.licenses.mit; }; }); @@ -1023,7 +1026,7 @@ self: super: rev = "31486f40f8e8f8923ca0799aea84b58799754564"; sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM="; }; - buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXfixes xorg.libXv xorg.pixman xorg.utilmacros ]; + buildInputs = attrs.buildInputs ++ [ xorg.libXScrnSaver xorg.libXv xorg.pixman xorg.utilmacros ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; @@ -1066,6 +1069,13 @@ self: super: }); xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: { + patches = [ + (fetchpatch { + name = "add-aarch64-darwin-support.patch"; + url = "https://gitlab.freedesktop.org/xorg/util/cf/-/commit/8d88c559b177e832b581c8ac0aa383b6cf79e0d0.patch"; + sha256 = "sha256-wCijdmlUtVgOh9Rp/LJrg1ObYm4OPTke5Xwu0xC0ap4="; + }) + ]; postInstall = lib.optionalString stdenv.isDarwin '' substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" ''; @@ -1091,17 +1101,6 @@ self: super: ''; }); - xcalc = super.xcalc.overrideAttrs (attrs: { - configureFlags = attrs.configureFlags or [] ++ [ - "--with-appdefaultdir=${placeholder "out"}/share/X11/app-defaults" - ]; - nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/xcalc \ - --set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults - ''; - }); - # convert Type1 vector fonts to OpenType fonts fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index e6a9a3168897..608b66b093ea 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -24,7 +24,7 @@ mirror://xorg/individual/app/transset-1.0.2.tar.bz2 mirror://xorg/individual/app/twm-1.0.10.tar.bz2 mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 -mirror://xorg/individual/app/xauth-1.1.tar.bz2 +mirror://xorg/individual/app/xauth-1.1.2.tar.xz mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2 mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2 mirror://xorg/individual/app/xclock-1.0.9.tar.bz2 @@ -101,7 +101,7 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2 @@ -109,7 +109,7 @@ mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.nix similarity index 79% rename from pkgs/shells/bash/5.1.nix rename to pkgs/shells/bash/5.nix index 458210873a68..40db2abe03ab 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPackages , fetchurl , binutils @@ -14,25 +15,25 @@ }: let - upstreamPatches = import ./bash-5.1-patches.nix (nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-5.1-patches/bash51-${nr}"; + upstreamPatches = import ./bash-5.2-patches.nix (nr: sha256: fetchurl { + url = "mirror://gnu/bash/bash-5.2-patches/bash52-${nr}"; inherit sha256; }); in stdenv.mkDerivation rec { name = "bash-${lib.optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}"; - version = "5.1"; + version = "5.2"; src = fetchurl { url = "mirror://gnu/bash/bash-${version}.tar.gz"; - sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc"; + sha256 = "sha256-oTnBZt9/9EccXgczBRZC7lVWwcyKSnjxRVg8XIGrMvs="; }; hardeningDisable = [ "format" ] - # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment: - # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593 - # or you can check libc/include/sys/cdefs.h in bionic source code - ++ lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify"; + # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment: + # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593 + # or you can check libc/include/sys/cdefs.h in bionic source code + ++ lib.optional (stdenv.hostPlatform.libc == "bionic") "fortify"; outputs = [ "out" "dev" "man" "doc" "info" ]; @@ -50,7 +51,12 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; patches = upstreamPatches - ++ [ ./pgrp-pipe-5.1.patch ]; + ++ [ ./pgrp-pipe-5.patch ] + ++ lib.optional stdenv.hostPlatform.isStatic (fetchurl { + name = "fix-static.patch"; + url = "https://cgit.freebsd.org/ports/plain/shells/bash/files/patch-configure?id=3e147a1f594751a68fea00a28090d0792bee0b51"; + sha256 = "XHFMQ6eXTReNoywdETyrfQEv1rKF8+XFbQZP4YoVKFk="; + }); configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") diff --git a/pkgs/shells/bash/bash-5.1-patches.nix b/pkgs/shells/bash/bash-5.1-patches.nix deleted file mode 100644 index 41eb92710588..000000000000 --- a/pkgs/shells/bash/bash-5.1-patches.nix +++ /dev/null @@ -1,20 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "1ymm8ppss6gyh9ifznjwiabrb4k91npd09c10y7mk66xp8yppc7b") -(patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm") -(patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2") -(patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls") -(patch "005" "19bdyigdr81824nxvqr6a7k0cax60wq7376j6b91afbnwvlvbjyc") -(patch "006" "051x8wlwrqk0yr0zg378vh824iklfl5g9pkmcdf62qp8gn9pvqbm") -(patch "007" "0fir80pp1gmlpadmqcgkrv4y119pc7xllchjzg05fd7px73viz5c") -(patch "008" "1lfjgshk8i9vch92p5wgc9r90j3phw79aa7gbai89w183b2z6b7j") -(patch "009" "1vn36dzd9g4y1h3jiss6418crla0rbcd0d6wwsyv9d5l7aaxlp74") -(patch "010" "0amfmvbzsand7bdypylkjdpcp88fa3cplfshn7vyzv2ff2rdgj52") -(patch "011" "0yq24abb4fzfxqnwl20b330sxl9lr9ds0nc4yi30f81l94b1y6aq") -(patch "012" "165bff97ffih49vfs4mkr5w3z5gn1w6zfyrf773iajkw6v48kw8h") -(patch "013" "1bfmgv3lagbk3aq9a831d29xv7jz4sjq7jhn9hq89limyinvdb67") -(patch "014" "1l43dw4kpddn7l41i8wmj406z9abxky1wb3rk8krcys33g4f0kka") -(patch "015" "1w40vzadzx019v0zhs4q6yqycrk04x1k8xs6qb73vk7ny4p6jdqv") -(patch "016" "0krqqljz4bkp9wrdnwfx51bxkb8rkwf8ivc93as1znx5fr7i96c8") -] diff --git a/pkgs/shells/bash/bash-5.2-patches.nix b/pkgs/shells/bash/bash-5.2-patches.nix new file mode 100644 index 000000000000..e118f03e0300 --- /dev/null +++ b/pkgs/shells/bash/bash-5.2-patches.nix @@ -0,0 +1,19 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "02iibpd3jq8p1bhdzgik8ps6gi1145vr463a82gj1hivjbp2ybzl") +(patch "002" "1f6p1z85qh1lavdp3xikgp0bfv0vqhvgpgwmdzlywl35hwdmxk25") +(patch "003" "1zxsi869jd90hksx3nyypgyqwrxhw2ws3r6hmk76yc1lsgdhq2ba") +(patch "004" "04i5liw5cg6dqkdxfgazqc2jrw40bmclx3dx45bwy259pcj7g0iq") +(patch "005" "0mykflv9qnbx3jz71l4f7isadiw9knm4qimqkwsv9cv88dafpq7c") +(patch "006" "13265akl8w6zyrg0l7f0x6arjgqjhllcwl6lk46rl53x4mm5dq6i") +(patch "007" "146lrwkn5wgxzs6vx34wl47g69zsxdy032k40qzi626b47ya6015") +(patch "008" "1s5i8hcayrv25lc8fxcr431v634yx5sii53b8fmip789s0pxjjvb") +(patch "009" "1kfk25151ka9wkmk1myf12irgcmvhsd8b0nfifvhrszah9w82npr") +(patch "010" "1kf1jrwm30js0v3d1r2rk4x09s1pyjp70wnd1qqhf9bmkw15ww67") +(patch "011" "1x5nkvbj6hci7gx42q7qa72hg2a9wwxh85dk79gn521ypwjmy6w3") +(patch "012" "0b6lcwzm7v5bzjiwaz2c8n5aj77w8ckhp2vwk4v3zsdq3z70gc9g") +(patch "013" "1rkwpibd6j2ghppfhqsva2jm4kdni6b7jpdsxdps52643gc4yjq9") +(patch "014" "09766vqqw4ffnmysm725v35qkhp1g9j4qgqag941xvq655pj9y9y") +(patch "015" "12im449abnq5gaqjmdxr5i38kmp02fa8l8wffad3jryvd58r0wzg") +] diff --git a/pkgs/shells/bash/pgrp-pipe-5.1.patch b/pkgs/shells/bash/pgrp-pipe-5.1.patch deleted file mode 100644 index 478327cafc45..000000000000 --- a/pkgs/shells/bash/pgrp-pipe-5.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -u ./configure ../bash-5.0-fixed/configure ---- ./configure 2019-01-02 15:43:31.000000000 +0100 -+++ ../bash-5.0-fixed/configure 2020-01-08 14:18:21.017296179 +0100 -@@ -16312,11 +16312,7 @@ - solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; - lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; - linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading -- case "`uname -r`" in -- 1.*|2.[0123]*) : ;; -- *) $as_echo "#define PGRP_PIPE 1" >>confdefs.h -- ;; -- esac ;; -+ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; - netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; - *qnx[67]*) LOCAL_LIBS="-lncurses" ;; - *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; diff --git a/pkgs/shells/bash/pgrp-pipe-5.patch b/pkgs/shells/bash/pgrp-pipe-5.patch new file mode 100644 index 000000000000..71b397901cb0 --- /dev/null +++ b/pkgs/shells/bash/pgrp-pipe-5.patch @@ -0,0 +1,15 @@ +--- ./configure 2022-12-20 17:13:17.804045620 +0100 ++++ ./configure-fixed 2022-12-20 17:16:00.444114824 +0100 +@@ -21723,11 +21723,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 1.*|2.[0123]*) : ;; +- *) printf "%s\n" "#define PGRP_PIPE 1" >>confdefs.h +- ;; +- esac ;; ++ printf "%s\n" "#define PGRP_PIPE 1" >>confdefs.h ;; + netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + freebsd*|midnightbsd*) LOCAL_CFLAGS='-DHEREDOC_PIPESIZE=4096' ;; + *qnx[67]*) LOCAL_LIBS="-lncurses" ;; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9a7cd9aa9dee..113aa9462761 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -262,11 +262,12 @@ rec { ln -s ${bootstrapTools}/bin/rewrite-tbd $out/bin ''; - binutils-unwrapped = { name = "bootstrap-stage0-binutils"; outPath = bootstrapTools; }; + binutils-unwrapped = bootstrapTools // { + name = "bootstrap-stage0-binutils"; + }; - cctools = { + cctools = bootstrapTools // { name = "bootstrap-stage0-cctools"; - outPath = bootstrapTools; targetPrefix = ""; }; @@ -581,7 +582,7 @@ rec { let persistent = self: super: with prevStage; { inherit - gnumake gzip gnused bzip2 gawk ed xz patch bash python3 + gnumake gzip gnused bzip2 ed xz patch bash python3 ncurses libffi zlib gmp pcre gnugrep cmake coreutils findutils diffutils patchutils ninja libxml2; diff --git a/pkgs/stdenv/generic/default-builder.sh b/pkgs/stdenv/generic/default-builder.sh index 273fc55c7552..8c6fec7873b6 100644 --- a/pkgs/stdenv/generic/default-builder.sh +++ b/pkgs/stdenv/generic/default-builder.sh @@ -1,2 +1,6 @@ +if [ -f .attrs.sh ]; then + . .attrs.sh +fi + source $stdenv/setup genericBuild diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 81255726284b..cf194be92bd7 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -57,28 +57,21 @@ argsStdenv@{ name ? "stdenv", preHook ? "", initialPath let defaultNativeBuildInputs = extraNativeBuildInputs ++ - [ ../../build-support/setup-hooks/move-docs.sh - ../../build-support/setup-hooks/make-symlinks-relative.sh + [ + ../../build-support/setup-hooks/audit-tmpdir.sh ../../build-support/setup-hooks/compress-man-pages.sh - ../../build-support/setup-hooks/strip.sh + ../../build-support/setup-hooks/make-symlinks-relative.sh + ../../build-support/setup-hooks/move-docs.sh + ../../build-support/setup-hooks/move-lib64.sh + ../../build-support/setup-hooks/move-sbin.sh + ../../build-support/setup-hooks/move-systemd-user-units.sh + ../../build-support/setup-hooks/multiple-outputs.sh ../../build-support/setup-hooks/patch-shebangs.sh ../../build-support/setup-hooks/prune-libtool-files.sh - ] - # FIXME this on Darwin; see - # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369 - ++ lib.optionals hostPlatform.isLinux [ - ../../build-support/setup-hooks/audit-tmpdir.sh - ../../build-support/setup-hooks/move-systemd-user-units.sh - ] - ++ [ - ../../build-support/setup-hooks/multiple-outputs.sh - ../../build-support/setup-hooks/move-sbin.sh - ../../build-support/setup-hooks/move-lib64.sh - ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh ../../build-support/setup-hooks/reproducible-builds.sh - # TODO use lib.optional instead - (if hasCC then cc else null) - ]; + ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh + ../../build-support/setup-hooks/strip.sh + ] ++ lib.optionals hasCC [ cc ]; defaultBuildInputs = extraBuildInputs; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 510537aac9f3..81fc31d67289 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -154,6 +154,12 @@ let (! attrs ? outputHash) # Fixed-output drvs can't be content addressed too && config.contentAddressedByDefault +# Experimental. For simple packages mostly just works, +# but for anything complex, be prepared to debug if enabling. +, __structuredAttrs ? config.structuredAttrsByDefault or false + +, env ? { } + , ... } @ attrs: let @@ -259,13 +265,16 @@ else let lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies)); + envIsExportable = lib.isAttrs env && !lib.isDerivation env; + derivationArg = (removeAttrs attrs - ["meta" "passthru" "pos" + (["meta" "passthru" "pos" "checkInputs" "installCheckInputs" "__darwinAllowLocalNetworking" "__impureHostDeps" "__propagatedImpureHostDeps" - "sandboxProfile" "propagatedSandboxProfile"]) + "sandboxProfile" "propagatedSandboxProfile"] + ++ lib.optional (__structuredAttrs || envIsExportable) "env")) // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { name = let @@ -289,7 +298,7 @@ else let then attrs.name + hostSuffix else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}" ); - }) // { + }) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // { builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; inherit stdenv; @@ -304,8 +313,7 @@ else let userHook = config.stdenv.userHook or null; __ignoreNulls = true; - - inherit strictDeps; + inherit __structuredAttrs strictDeps; depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; @@ -410,6 +418,7 @@ else let outputHashAlgo = attrs.outputHashAlgo or "sha256"; outputHashMode = attrs.outputHashMode or "recursive"; } // lib.optionalAttrs (enableParallelBuilding) { + inherit enableParallelBuilding; enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { NIX_HARDENING_ENABLE = enabledHardeningOptions; @@ -473,6 +482,19 @@ else let else true); }; + checkedEnv = + let + overlappingNames = lib.attrNames (builtins.intersectAttrs env derivationArg); + in + assert lib.assertMsg envIsExportable + "When using structured attributes, `env` must be an attribute set of environment variables."; + assert lib.assertMsg (overlappingNames == [ ]) + "The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${lib.concatStringsSep ", " overlappingNames}"; + lib.mapAttrs + (n: v: assert lib.assertMsg (lib.isString v || lib.isBool v || lib.isInt v || lib.isDerivation v) + "The ‘env’ attribute set can only contain derivation, string, boolean or integer attributes. The ‘${n}’ attribute is of type ${builtins.typeOf v}."; v) + env; + in lib.extendDerivation @@ -509,7 +531,7 @@ lib.extendDerivation # should be made available to Nix expressions using the # derivation (e.g., in assertions). passthru) - (derivation derivationArg); + (derivation (derivationArg // lib.optionalAttrs envIsExportable checkedEnv)); in fnOrAttrs: diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index c6cdb6c3df75..b07420bb4185 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -15,8 +15,33 @@ if (( "${NIX_DEBUG:-0}" >= 6 )); then set -x fi -: ${outputs:=out} +if [ -f .attrs.sh ]; then + __structuredAttrs=1 + echo "structuredAttrs is enabled" +else + __structuredAttrs= +fi +if [ -n "$__structuredAttrs" ]; then + for outputName in "${!outputs[@]}"; do + # ex: out=/nix/store/... + export "$outputName=${outputs[$outputName]}" + done + # $NIX_ATTRS_JSON_FILE points to the wrong location in sandbox + # https://github.com/NixOS/nix/issues/6736 + export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json" + export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh" +else + : ${outputs:=out} +fi + +getAllOutputNames() { + if [ -n "$__structuredAttrs" ]; then + echo "${!outputs[*]}" + else + echo "$outputs" + fi +} ###################################################################### # Hook handling. @@ -175,6 +200,109 @@ addToSearchPath() { addToSearchPathWithCustomDelimiter ":" "$@" } +# Prepend elements to variable "$1", which may come from an attr. +# +# This is useful in generic setup code, which must (for now) support +# both derivations with and without __structuredAttrs true, so the +# variable may be an array or a space-separated string. +# +# Expressions for individual packages should simply switch to array +# syntax when they switch to setting __structuredAttrs = true. +prependToVar() { + local -n nameref="$1" + + useArray= + if [ -n "$__structuredAttrs" ]; then + useArray=true + else + useArray=false + fi + + # check if variable already exist and if it does then do extra checks + if declare -p "$1" 2> /dev/null | grep -q '^'; then + type="$(declare -p "$1")" + if [[ "$type" =~ "declare -A" ]]; then + echo "prependToVar(): ERROR: trying to use prependToVar on an associative array." >&2 + return 1 + elif [[ "$type" =~ "declare -a" ]]; then + useArray=true + else + useArray=false + fi + fi + + shift + + if $useArray; then + nameref=( "$@" ${nameref+"${nameref[@]}"} ) + else + nameref="$* ${nameref-}" + fi +} + +# Same as above +appendToVar() { + local -n nameref="$1" + + useArray= + if [ -n "$__structuredAttrs" ]; then + useArray=true + else + useArray=false + fi + + # check if variable already exist and if it does then do extra checks + if declare -p "$1" 2> /dev/null | grep -q '^'; then + type="$(declare -p "$1")" + if [[ "$type" =~ "declare -A" ]]; then + echo "appendToVar(): ERROR: trying to use appendToVar on an associative array, use variable+=([\"X\"]=\"Y\") instead." >&2 + return 1 + elif [[ "$type" =~ "declare -a" ]]; then + useArray=true + else + useArray=false + fi + fi + + shift + + if $useArray; then + nameref=( ${nameref+"${nameref[@]}"} "$@" ) + else + nameref="${nameref-} $*" + fi +} + +# Accumulate into `flagsArray` the flags from the named variables. +# +# If __structuredAttrs, the variables are all treated as arrays +# and simply concatenated onto `flagsArray`. +# +# If not __structuredAttrs, then: +# * Each variable is treated as a string, and split on whitespace; +# * except variables whose names end in "Array", which are treated +# as arrays. +_accumFlagsArray() { + local name + if [ -n "$__structuredAttrs" ]; then + for name in "$@"; do + local -n nameref="$name" + flagsArray+=( ${nameref+"${nameref[@]}"} ) + done + else + for name in "$@"; do + local -n nameref="$name" + case "$name" in + *Array) + flagsArray+=( ${nameref+"${nameref[@]}"} ) ;; + *) + flagsArray+=( ${nameref-} ) ;; + esac + done + fi + +} + # Add $1/lib* into rpaths. # The function is used in multiple-outputs.sh hook, # so it is defined here but tried after the hook. @@ -255,6 +383,14 @@ printWords() { ###################################################################### # Initialisation. +# If using structured attributes, export variables from `env` to the environment. +# When not using structured attributes, those variables are already exported. +if [[ -n $__structuredAttrs ]]; then + for envVar in "${!env[@]}"; do + declare -x "${envVar}=${env[${envVar}]}" + done +fi + # Set a fallback default value for SOURCE_DATE_EPOCH, used by some build tools # to provide a deterministic substitute for the "current" time. Note that @@ -469,6 +605,10 @@ findInputs() { done } +# The way we handle deps* and *Inputs works with structured attrs +# either enabled or disabled. For this it's convenient that the items +# in each list must be store paths, and therefore space-free. + # Make sure all are at least defined as empty : ${depsBuildBuild=} ${depsBuildBuildPropagated=} : ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=} @@ -477,29 +617,29 @@ findInputs() { : ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=} : ${depsTargetTarget=} ${depsTargetTargetPropagated=} -for pkg in $depsBuildBuild $depsBuildBuildPropagated; do +for pkg in ${depsBuildBuild[@]} ${depsBuildBuildPropagated[@]}; do findInputs "$pkg" -1 -1 done -for pkg in $nativeBuildInputs $propagatedNativeBuildInputs; do +for pkg in ${nativeBuildInputs[@]} ${propagatedNativeBuildInputs[@]}; do findInputs "$pkg" -1 0 done -for pkg in $depsBuildTarget $depsBuildTargetPropagated; do +for pkg in ${depsBuildTarget[@]} ${depsBuildTargetPropagated[@]}; do findInputs "$pkg" -1 1 done -for pkg in $depsHostHost $depsHostHostPropagated; do +for pkg in ${depsHostHost[@]} ${depsHostHostPropagated[@]}; do findInputs "$pkg" 0 0 done -for pkg in $buildInputs $propagatedBuildInputs ; do +for pkg in ${buildInputs[@]} ${propagatedBuildInputs[@]} ; do findInputs "$pkg" 0 1 done -for pkg in $depsTargetTarget $depsTargetTargetPropagated; do +for pkg in ${depsTargetTarget[@]} ${depsTargetTargetPropagated[@]}; do findInputs "$pkg" 1 1 done # Default inputs must be processed last -for pkg in $defaultNativeBuildInputs; do +for pkg in ${defaultNativeBuildInputs[@]}; do findInputs "$pkg" -1 0 done -for pkg in $defaultBuildInputs; do +for pkg in ${defaultBuildInputs[@]}; do findInputs "$pkg" 0 1 done @@ -787,6 +927,10 @@ substituteInPlace() { } _allFlags() { + # export some local variables for the awk below + # so some substitutions such as name don't have to be in the env attrset + # when __structuredAttrs is enabled + export system pname name version for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do if (( "${NIX_DEBUG:-0}" >= 1 )); then printf "@%s@ -> %q\n" "${varName}" "${!varName}" @@ -909,6 +1053,13 @@ unpackPhase() { srcs="$src" fi + local -a srcsArray + if [ -n "$__structuredAttrs" ]; then + srcsArray=( "${srcs[@]}" ) + else + srcsArray=( $srcs ) + fi + # To determine the source directory created by unpacking the # source archives, we record the contents of the current # directory, then look below which directory got added. Yeah, @@ -921,7 +1072,7 @@ unpackPhase() { done # Unpack all source archives. - for i in $srcs; do + for i in "${srcsArray[@]}"; do unpackFile "$i" done @@ -971,7 +1122,14 @@ unpackPhase() { patchPhase() { runHook prePatch - for i in ${patches:-}; do + local -a patchesArray + if [ -n "$__structuredAttrs" ]; then + patchesArray=( ${patches:+"${patches[@]}"} ) + else + patchesArray=( ${patches:-} ) + fi + + for i in "${patchesArray[@]}"; do header "applying patch $i" 3 local uncompress=cat case "$i" in @@ -988,9 +1146,17 @@ patchPhase() { uncompress="lzma -d" ;; esac + + local -a flagsArray + if [ -n "$__structuredAttrs" ]; then + flagsArray=( "${patchFlags[@]:--p1}" ) + else + # shellcheck disable=SC2086 + flagsArray=( ${patchFlags:--p1} ) + fi # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.) # shellcheck disable=SC2086 - $uncompress < "$i" 2>&1 | patch ${patchFlags:--p1} + $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}" done runHook postPatch @@ -1018,7 +1184,6 @@ configurePhase() { # set to empty if unset : ${configureScript=} - : ${configureFlags=} if [[ -z "$configureScript" && -x ./configure ]]; then configureScript=./configure @@ -1049,31 +1214,29 @@ configurePhase() { fi if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then - configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" + prependToVar configureFlags "${prefixKey:---prefix=}$prefix" fi if [[ -f "$configureScript" ]]; then # Add --disable-dependency-tracking to speed up some builds. if [ -z "${dontAddDisableDepTrack:-}" ]; then if grep -q dependency-tracking "$configureScript"; then - configureFlags="--disable-dependency-tracking $configureFlags" + prependToVar configureFlags --disable-dependency-tracking fi fi # By default, disable static builds. if [ -z "${dontDisableStatic:-}" ]; then if grep -q enable-static "$configureScript"; then - configureFlags="--disable-static $configureFlags" + prependToVar configureFlags --disable-static fi fi fi if [ -n "$configureScript" ]; then - # Old bash empty array hack - # shellcheck disable=SC2086 - local flagsArray=( - $configureFlags "${configureFlagsArray[@]}" - ) + local -a flagsArray + _accumFlagsArray configureFlags configureFlagsArray + echoCmd 'configure flags' "${flagsArray[@]}" # shellcheck disable=SC2086 $configureScript "${flagsArray[@]}" @@ -1089,22 +1252,17 @@ configurePhase() { buildPhase() { runHook preBuild - # set to empty if unset - : ${makeFlags=} - - if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then + if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then echo "no Makefile, doing nothing" else foundMakefile=1 - # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags "${makeFlagsArray[@]}" - $buildFlags "${buildFlagsArray[@]}" ) + _accumFlagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray echoCmd 'build flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1141,11 +1299,17 @@ checkPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags "${makeFlagsArray[@]}" - ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" - ${checkTarget} ) + _accumFlagsArray makeFlags makeFlagsArray + if [ -n "$__structuredAttrs" ]; then + flagsArray+=( "${checkFlags[@]:-VERBOSE=y}" ) + else + flagsArray+=( ${checkFlags:-VERBOSE=y} ) + fi + _accumFlagsArray checkFlagsArray + flagsArray+=( ${checkTarget} ) + echoCmd 'check flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1163,14 +1327,16 @@ installPhase() { mkdir -p "$prefix" fi - # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( SHELL=$SHELL - $makeFlags "${makeFlagsArray[@]}" - $installFlags "${installFlagsArray[@]}" - ${installTargets:-install} ) + _accumFlagsArray makeFlags makeFlagsArray installFlags installFlagsArray + if [ -n "$__structuredAttrs" ]; then + flagsArray+=( "${installTargets[@]:-install}" ) + else + flagsArray+=( ${installTargets:-install} ) + fi echoCmd 'install flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1186,7 +1352,7 @@ installPhase() { fixupPhase() { # Make sure everything is writable so "strip" et al. work. local output - for output in $outputs; do + for output in $(getAllOutputNames); do if [ -e "${!output}" ]; then chmod -R u+w "${!output}"; fi done @@ -1194,7 +1360,7 @@ fixupPhase() { # Apply fixup to each output. local output - for output in $outputs; do + for output in $(getAllOutputNames); do prefix="${!output}" runHook fixupOutput done @@ -1239,7 +1405,10 @@ fixupPhase() { if [ -n "${setupHooks:-}" ]; then mkdir -p "${!outputDev}/nix-support" local hook - for hook in $setupHooks; do + # have to use ${setupHooks[@]} without quotes because it needs to support setupHooks being a array or a whitespace separated string + # # values of setupHooks won't have spaces so it won't cause problems + # shellcheck disable=2068 + for hook in ${setupHooks[@]}; do local content consumeEntire content < "$hook" substituteAllStream content "file '$hook'" >> "${!outputDev}/nix-support/setup-hook" @@ -1275,11 +1444,12 @@ installCheckPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags "${makeFlagsArray[@]}" - $installCheckFlags "${installCheckFlagsArray[@]}" - ${installCheckTarget:-installcheck} ) + _accumFlagsArray makeFlags makeFlagsArray \ + installCheckFlags installCheckFlagsArray + flagsArray+=( ${installCheckTarget:-installcheck} ) + echoCmd 'installcheck flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" unset flagsArray @@ -1292,11 +1462,9 @@ installCheckPhase() { distPhase() { runHook preDist - # Old bash empty array hack - # shellcheck disable=SC2086 - local flagsArray=( - $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} - ) + local flagsArray=() + _accumFlagsArray distFlags distFlagsArray + flagsArray+=( ${distTarget:-dist} ) echo 'dist flags: %q' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1307,7 +1475,7 @@ distPhase() { # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. # shellcheck disable=SC2086 - cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs" + cp -pvd ${tarballs[*]:-*.tar.gz} "$out/tarballs" fi runHook postDist @@ -1357,14 +1525,18 @@ genericBuild() { return fi - if [ -z "${phases:-}" ]; then - phases="${prePhases:-} unpackPhase patchPhase ${preConfigurePhases:-} \ - configurePhase ${preBuildPhases:-} buildPhase checkPhase \ - ${preInstallPhases:-} installPhase ${preFixupPhases:-} fixupPhase installCheckPhase \ - ${preDistPhases:-} distPhase ${postPhases:-}"; + if [ -z "${phases[*]:-}" ]; then + phases="${prePhases[*]:-} unpackPhase patchPhase ${preConfigurePhases[*]:-} \ + configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase \ + ${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase \ + ${preDistPhases[*]:-} distPhase ${postPhases[*]:-}"; fi - for curPhase in $phases; do + # The use of ${phases[*]} gives the correct behavior both with and + # without structured attrs. This relies on the fact that each + # phase name is space-free, which it must be because it's the name + # of either a shell variable or a shell function. + for curPhase in ${phases[*]}; do if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then continue; fi if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then continue; fi if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi @@ -1414,6 +1586,7 @@ runHook userHook dumpVars + # Restore the original options for nix-shell [[ $__nixpkgs_setup_set_original == *e* ]] || set +e [[ $__nixpkgs_setup_set_original == *u* ]] || set +u diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 5116de980348..870fb04c3883 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -312,7 +312,7 @@ in # Apparently iconv won't work with bootstrap glibc, but it will be used # with glibc built later where we keep *this* build of libunistring, # so we need to trick it into supporting libiconv. - am_cv_func_iconv_works = "yes"; + env = attrs.env or {} // { am_cv_func_iconv_works = "yes"; }; }); libidn2 = super.libidn2.overrideAttrs (attrs: { postFixup = attrs.postFixup or "" + '' diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index bf0842f26698..818001018b3a 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -21,11 +21,14 @@ with pkgs; cc-wrapper-clang-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.stdenv; }; cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; }; stdenv-inputs = callPackage ./stdenv-inputs { }; + stdenv = callPackage ./stdenv { }; config = callPackage ./config.nix { }; haskell = callPackage ./haskell { }; + hooks = callPackage ./hooks { }; + cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; diff --git a/pkgs/test/hooks/default.nix b/pkgs/test/hooks/default.nix new file mode 100644 index 000000000000..aabf939b6865 --- /dev/null +++ b/pkgs/test/hooks/default.nix @@ -0,0 +1,8 @@ +# To run these tests: +# nix-build -A tests.hooks + +{ stdenv, tests, lib }: + +{ + default-stdenv-hooks = lib.recurseIntoAttrs tests.stdenv.hooks; +} diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh index 65f7e4c11ba1..908faec3c388 100644 --- a/pkgs/test/simple/builder.sh +++ b/pkgs/test/simple/builder.sh @@ -1,3 +1,4 @@ +if [ -e .attrs.sh ]; then source .attrs.sh; fi set -x export NIX_DEBUG=1 diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix new file mode 100644 index 000000000000..5ff18298f217 --- /dev/null +++ b/pkgs/test/stdenv/default.nix @@ -0,0 +1,256 @@ +# To run these tests: +# nix-build -A tests.stdenv + +{ stdenv +, pkgs +, lib +, +}: + +let + # early enough not to rebuild gcc but late enough to have patchelf + earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages; + # use a early stdenv so when hacking on stdenv this test can be run quickly + bootStdenv = stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv; + pkgsStructured = import pkgs.path { config = { structuredAttrsByDefault = true; }; inherit (stdenv.hostPlatform) system; }; + bootStdenvStructuredAttrsByDefault = pkgsStructured.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv; + + + ccWrapperSubstitutionsTest = { name, stdenv', extraAttrs ? { } }: + + stdenv'.cc.overrideAttrs (previousAttrs: ({ + inherit name; + + postFixup = previousAttrs.postFixup + '' + declare -p wrapperName + echo "env.wrapperName = $wrapperName" + [[ $wrapperName == "CC_WRAPPER" ]] || (echo "'\$wrapperName' was not 'CC_WRAPPER'" && false) + declare -p suffixSalt + echo "env.suffixSalt = $suffixSalt" + [[ $suffixSalt == "${stdenv'.cc.suffixSalt}" ]] || (echo "'\$suffxSalt' was not '${stdenv'.cc.suffixSalt}'" && false) + + grep -q "@out@" $out/bin/cc || echo "@out@ in $out/bin/cc was substituted" + grep -q "@suffixSalt@" $out/bin/cc && (echo "$out/bin/cc contains unsubstituted variables" && false) + + touch $out + ''; + } // extraAttrs)); + + testEnvAttrset = { name, stdenv', extraAttrs ? { } }: + stdenv'.mkDerivation + ({ + inherit name; + env = { + string = "testing-string"; + }; + + passAsFile = [ "buildCommand" ]; + buildCommand = '' + declare -p string + echo "env.string = $string" + [[ $string == "testing-string" ]] || (echo "'\$string' was not 'testing-string'" && false) + [[ "$(declare -p string)" == 'declare -x string="testing-string"' ]] || (echo "'\$string' was not exported" && false) + touch $out + ''; + } // extraAttrs); + + testPrependAndAppendToVar = { name, stdenv', extraAttrs ? { } }: + stdenv'.mkDerivation + ({ + inherit name; + env = { + string = "testing-string"; + }; + + passAsFile = [ "buildCommand" ] ++ lib.optionals (extraAttrs ? extraTest) [ "extraTest" ]; + buildCommand = '' + declare -p string + appendToVar string hello + # test that quoted strings work + prependToVar string "world" + declare -p string + + declare -A associativeArray=(["X"]="Y") + [[ $(appendToVar associativeArray "fail" 2>&1) =~ "trying to use" ]] || (echo "prependToVar did not catch prepending associativeArray" && false) + [[ $(prependToVar associativeArray "fail" 2>&1) =~ "trying to use" ]] || (echo "prependToVar did not catch prepending associativeArray" && false) + + [[ $string == "world testing-string hello" ]] || (echo "'\$string' was not 'world testing-string hello'" && false) + + # test appending to a unset variable + appendToVar nonExistant created hello + typeset -p nonExistant + if [[ -n $__structuredAttrs ]]; then + [[ "''${nonExistant[@]}" == "created hello" ]] + else + # there's a extra " " in front here and a extra " " in the end of prependToVar + # shouldn't matter because these functions will mostly be used for $*Flags and the Flag variable will in most cases already exit + [[ "$nonExistant" == " created hello" ]] + fi + + eval "$extraTest" + + touch $out + ''; + } // extraAttrs); + +in + +{ + # tests for hooks in `stdenv.defaultNativeBuildInputs` + hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; }); + + test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; }; + + # Test compatibility with derivations using `env` as a regular variable. + test-env-derivation = bootStdenv.mkDerivation rec { + name = "test-env-derivation"; + env = bootStdenv.mkDerivation { + name = "foo"; + buildCommand = '' + mkdir "$out" + touch "$out/bar" + ''; + }; + + passAsFile = [ "buildCommand" ]; + buildCommand = '' + declare -p env + [[ $env == "${env}" ]] + touch "$out" + ''; + }; + + test-prepend-append-to-var = testPrependAndAppendToVar { + name = "test-prepend-append-to-var"; + stdenv' = bootStdenv; + }; + + test-structured-env-attrset = testEnvAttrset { + name = "test-structured-env-attrset"; + stdenv' = bootStdenv; + extraAttrs = { __structuredAttrs = true; }; + }; + + test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest { + name = "test-cc-wrapper-substitutions"; + stdenv' = bootStdenv; + }; + + structuredAttrsByDefault = lib.recurseIntoAttrs { + + hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenvStructuredAttrsByDefault; pkgs = earlyPkgs; }); + + test-cc-wrapper-substitutions = ccWrapperSubstitutionsTest { + name = "test-cc-wrapper-substitutions-structuredAttrsByDefault"; + stdenv' = bootStdenvStructuredAttrsByDefault; + }; + + test-structured-env-attrset = testEnvAttrset { + name = "test-structured-env-attrset-structuredAttrsByDefault"; + stdenv' = bootStdenvStructuredAttrsByDefault; + }; + + test-prepend-append-to-var = testPrependAndAppendToVar { + name = "test-prepend-append-to-var-structuredAttrsByDefault"; + stdenv' = bootStdenvStructuredAttrsByDefault; + extraAttrs = { + # will be a bash indexed array in attrs.sh + # declare -a list=('a' 'b' ) + # and a json array in attrs.json + # "list":["a","b"] + list = [ "a" "b" ]; + # will be a bash associative array(dictionary) in attrs.sh + # declare -A array=(['a']='1' ['b']='2' ) + # and a json object in attrs.json + # {"array":{"a":"1","b":"2"} + array = { a = "1"; b = "2"; }; + extraTest = '' + declare -p array + array+=(["c"]="3") + declare -p array + + [[ "''${array[c]}" == "3" ]] || (echo "c element of '\$array' was not '3'" && false) + + declare -p list + prependToVar list hello + # test that quoted strings work + appendToVar list "world" + declare -p list + + [[ "''${list[0]}" == "hello" ]] || (echo "first element of '\$list' was not 'hello'" && false) + [[ "''${list[1]}" == "a" ]] || (echo "first element of '\$list' was not 'a'" && false) + [[ "''${list[-1]}" == "world" ]] || (echo "last element of '\$list' was not 'world'" && false) + ''; + }; + }; + + test-golden-example-structuredAttrs = + let + goldenSh = earlyPkgs.writeText "goldenSh" '' + declare -A EXAMPLE_ATTRS=(['foo']='bar' ) + declare EXAMPLE_BOOL_FALSE= + declare EXAMPLE_BOOL_TRUE=1 + declare EXAMPLE_INT=123 + declare EXAMPLE_INT_NEG=-123 + declare -a EXAMPLE_LIST=('foo' 'bar' ) + declare EXAMPLE_STR='foo bar' + ''; + goldenJson = earlyPkgs.writeText "goldenSh" '' + { + "EXAMPLE_ATTRS": { + "foo": "bar" + }, + "EXAMPLE_BOOL_FALSE": false, + "EXAMPLE_BOOL_TRUE": true, + "EXAMPLE_INT": 123, + "EXAMPLE_INT_NEG": -123, + "EXAMPLE_LIST": [ + "foo", + "bar" + ], + "EXAMPLE_NESTED_ATTRS": { + "foo": { + "bar": "baz" + } + }, + "EXAMPLE_NESTED_LIST": [ + [ + "foo", + "bar" + ], + [ + "baz" + ] + ], + "EXAMPLE_STR": "foo bar" + } + ''; + in + bootStdenvStructuredAttrsByDefault.mkDerivation { + name = "test-golden-example-structuredAttrsByDefault"; + nativeBuildInputs = [ earlyPkgs.jq ]; + + EXAMPLE_BOOL_TRUE = true; + EXAMPLE_BOOL_FALSE = false; + EXAMPLE_INT = 123; + EXAMPLE_INT_NEG = -123; + EXAMPLE_STR = "foo bar"; + EXAMPLE_LIST = [ "foo" "bar" ]; + EXAMPLE_NESTED_LIST = [ [ "foo" "bar" ] [ "baz" ] ]; + EXAMPLE_ATTRS = { foo = "bar"; }; + EXAMPLE_NESTED_ATTRS = { foo.bar = "baz"; }; + + inherit goldenSh; + inherit goldenJson; + + buildCommand = '' + mkdir -p $out + cat $NIX_ATTRS_SH_FILE | grep "EXAMPLE" | grep -v -E 'installPhase|jq' > $out/sh + jq 'with_entries(select(.key|match("EXAMPLE")))' $NIX_ATTRS_JSON_FILE > $out/json + diff $out/sh $goldenSh + diff $out/json $goldenJson + ''; + }; + + }; +} diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix new file mode 100644 index 000000000000..7f25d7dbd2db --- /dev/null +++ b/pkgs/test/stdenv/hooks.nix @@ -0,0 +1,126 @@ +{ stdenv, pkgs }: + +# ordering should match defaultNativeBuildInputs + +{ + # TODO: add audit-tmpdir + compress-man-pages = + let + manFile = pkgs.writeText "small-man" '' + .TH HELLO "1" "May 2022" "hello 2.12.1" "User Commands" + .SH NAME + hello - friendly greeting program + ''; + in + stdenv.mkDerivation { + name = "test-compress-man-pages"; + buildCommand = '' + mkdir -p $out/share/man + cp ${manFile} $out/share/man/small-man.1 + compressManPages $out + [[ -e $out/share/man/small-man.1.gz ]] + ''; + }; + make-symlinks-relative = stdenv.mkDerivation { + name = "test-make-symlinks-relative"; + buildCommand = '' + mkdir -p $out/{bar,baz} + source1="$out/bar/foo" + destination1="$out/baz/foo" + echo foo > $source1 + ln -s $source1 $destination1 + echo "symlink before patching: $(readlink $destination1)" + + _makeSymlinksRelative + + echo "symlink after patching: $(readlink $destination1)" + ([[ -e $destination1 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) + ([[ $(readlink $destination1) == "../bar/foo" ]] && echo "absolute symlink was made relative") || (echo "symlink was not made relative" && exit 1) + ''; + }; + move-docs = stdenv.mkDerivation { + name = "test-move-docs"; + buildCommand = '' + mkdir -p $out/{man,doc,info} + touch $out/{man,doc,info}/foo + cat $out/{man,doc,info}/foo + + _moveToShare + + (cat $out/share/{man,doc,info}/foo 2>/dev/null && echo "man,doc,info were moved") || (echo "man,doc,info were not moved" && exit 1) + ''; + }; + move-lib64 = stdenv.mkDerivation { + name = "test-move-lib64"; + buildCommand = '' + mkdir -p $out/lib64 + touch $out/lib64/foo + cat $out/lib64/foo + + _moveLib64 + + # check symlink + [[ -h $out/lib64 ]] + ([[ -e $out/lib64 ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) + [[ -e $out/lib/foo ]] + ''; + }; + move-sbin = stdenv.mkDerivation { + name = "test-move-sbin"; + buildCommand = '' + mkdir -p $out/sbin + touch $out/sbin/foo + cat $out/sbin/foo + + _moveSbin + + # check symlink + [[ -h $out/sbin ]] + ([[ -e $out/sbin ]] && echo "symlink isn't broken") || (echo "symlink is broken" && exit 1) + [[ -e $out/bin/foo ]] + ''; + }; + # TODO: add multiple-outputs + # TODO: move patch-shebangs test from pkgs/test/patch-shebangs/default.nix to here + prune-libtool-files = + let + libFoo = pkgs.writeText "libFoo" '' + # Generated by libtool (GNU libtool) 2.4.6 + old_library=''' + dependency_libs=' -Lbar.la -Lbaz.la' + ''; + in + stdenv.mkDerivation { + name = "test-prune-libtool-files"; + buildCommand = '' + mkdir -p $out/lib + cp ${libFoo} $out/lib/libFoo.la + _pruneLibtoolFiles + grep "^dependency_libs=''' #pruned" $out/lib/libFoo.la + # confirm file doesn't only contain the above + grep "^old_library='''" $out/lib/libFoo.la + ''; + }; + reproducible-builds = stdenv.mkDerivation { + name = "test-reproducible-builds"; + buildCommand = '' + # can't be tested more precisely because the value of random-seed changes depending on the output + [[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]] + touch $out + ''; + }; + set-source-date-epoch-to-latest = stdenv.mkDerivation { + name = "test-set-source-date-epoch-to-latest"; + buildCommand = '' + sourceRoot=$NIX_BUILD_TOP/source + mkdir -p $sourceRoot + touch --date=1/1/2015 $sourceRoot/foo + + _updateSourceDateEpochFromSourceRoot + + [[ $SOURCE_DATE_EPOCH == "1420070400" ]] + touch $out + ''; + }; + # TODO: add strip +} diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 34fd3e45906f..04c87d780cb9 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.25.76"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.27.40"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-PSr0zZEGXFxcFSN7QQ5Ux0Z4aCwwm9na+2hIv/gR6+s="; + hash = "sha256-xP+ugapi6KJE+UokGKmG67ze5dH6nJuJk7BjIr6dtTE="; }; # https://github.com/aws/aws-cli/issues/4837 @@ -82,6 +82,7 @@ with py.pkgs; buildPythonApplication rec { meta = with lib; { homepage = "https://aws.amazon.com/cli/"; + changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; mainProgram = "aws"; diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 28fcf8bc90fa..8489922f6c6d 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -83,6 +83,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ e2fsprogs + py python-dateutil pytest-benchmark pytest-xdist diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index abc19356c950..59f1901bd9fd 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xz"; - version = "5.2.9"; + version = "5.4.0"; src = fetchurl { url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; - sha256 = "sZRQf7o6Rip1PFUxSczaoWgze8t97v3dBnuph8g9/OY="; + sha256 = "eV6gSUxm1QmwUt3DbcY71jTln/Kg85wWo7VkTdAdh+Y="; }; strictDeps = true; @@ -45,7 +45,8 @@ stdenv.mkDerivation rec { # Expect the text in format of '>xz-5.2.6.tar.bz2' # We pick first match where a stable release goes first. new_version="$(curl -s https://tukaani.org/xz/ | - pcregrep -o1 '>xz-([0-9.]+)[.]tar[.]bz2')" + pcregrep -o1 '>xz-([0-9.]+)[.]tar[.]bz2' | + head -n1)" update-source-version ${pname} "$new_version" ''; }; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index f45d4cd95b69..c0cd784aed47 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; - rev = "refs/tags/${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc="; }; diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 11ca657ebfed..efc58c370736 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa +{ lib, stdenv, fetchurl, fetchpatch +, freeglut, glew, libGL, libGLU, libX11, libXext, mesa , meson, ninja, pkg-config, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -13,21 +14,31 @@ stdenv.mkDerivation rec { patches = [ # https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/83 ./demos-data-dir.patch + + (fetchpatch { + url = "https://gitlab.freedesktop.org/mesa/demos/-/commit/b6d183f9943a275990aef7f08773e54c597572e5.patch"; + sha256 = "4UdV+cxvNRqoT+Pdy0gkCPXJbhFr6CSCw/UOOB+rvuw="; + }) ]; buildInputs = [ - freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland + freeglut glew libX11 libXext libGL libGLU mesa wayland wayland-protocols - ]; + ] ++ lib.optional (mesa ? osmesa) mesa.osmesa ; nativeBuildInputs = [ meson ninja pkg-config ]; - mesonFlags = [ "-Dwith-system-data-files=true" ]; + mesonFlags = [ + "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}" + "-Dlibdrm=${if mesa.libdrm == null then "disabled" else "enabled"}" + "-Dosmesa=${if mesa ? osmesa then "enabled" else "disabled"}" + "-Dwayland=${if wayland.withLibraries then "enabled" else "disabled"}" + "-Dwith-system-data-files=true" + ]; meta = with lib; { + inherit (mesa.meta) homepage platforms; description = "Collection of demos and test programs for OpenGL and Mesa"; - homepage = "https://www.mesa3d.org/"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ andersk ]; }; } diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 6a8056dfe41d..bf60e8ed85f3 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.231.0"; + version = "1.3.236.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "sdk-${version}"; - hash = "sha256-8Z9w+3WFPYp8QKEUVkEQCGy9LXMWYlZDgGt8i34T5DU="; + hash = "sha256-NlBS7UuV2AZPY5VyoqTnTf63M7fHIPQDZRtMZ4XwMzA="; }); nativeBuildInputs = [ cmake jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index e8d3907251ba..11cef8eeb886 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -11,6 +11,7 @@ , libffi , libxcb , wayland +, which , xcbutilkeysyms , xcbutilwm , vulkan-headers @@ -23,18 +24,18 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.3.231.0"; + version = "1.3.236.0"; src = (assert version == vulkan-headers.version; fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "sdk-${version}"; - hash = "sha256-qomhouuKVv4Dat9Sv7X68Dw6bRnaUjj6iEXC9pCqX4E="; + hash = "sha256-0dGD3InmEd9hO8+uVGMqBHXXfyX8tswyuOaZCftudz0="; fetchSubmodules = true; }); - nativeBuildInputs = [ cmake python3 jq ]; + nativeBuildInputs = [ cmake python3 jq which ]; buildInputs = [ expat diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index cb3fb8456a8d..8e94997db6c8 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.231.0"; + version = "1.3.236.0"; # It's not strictly necessary to have matching versions here, however # since we're using the SDK version we may as well be consistent with @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - hash = "sha256-6oimP4ISa0dX4bLU3Nch8Ur6MzEMQscnL8EfRrqT/Es="; + hash = "sha256-PmNTpdAkXJkARLohRtUOuKTZPoKgeVF4DAo1wsAq5xE="; }); nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index f78d52f5b679..4c202939e722 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -11,7 +11,7 @@ let pygobject3 (toPythonModule ibus) pyxdg - python-Levenshtein + levenshtein ]); in stdenv.mkDerivation rec { pname = "ibus-uniemoji"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 18169a794384..85bc47dab545 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-PT95U1l+BVX7sby3GKktZMmbNNQoPYR8nL+H90EnqZY="; + auditable = true; # TODO: remove when this is the default + nativeBuildInputs = [ installShellFiles ]; # skip flaky test diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 06efbbfff449..e694106a0eaf 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { go nodejs pytest-env + pytest-forked pytest-xdist pytestCheckHook re-assert diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 999079e55860..3688957af704 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -5,6 +5,7 @@ , installShellFiles , cmake , fetchpatch +, git , nixosTests , Security , Foundation @@ -37,6 +38,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-hs0ImaozKH6QcUfts+oseUqecg7bGX5cx50ixnNamW8="; + checkInputs = [ git ]; + preCheck = '' HOME=$TMPDIR ''; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 6d5f28e7a82f..311e9e1b8c76 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -47,14 +47,14 @@ assert !(opensslSupport && wolfsslSupport); stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "7.86.0"; + version = "7.87.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" ]; - sha256 = "sha256-9cpp2wPuoX+ocFvfsan1jXakbJAQUYEJuzjzExN+Cig="; + hash = "sha256-XW4Sh2G3EQlG0Sdq/28PJm8rcm9eYZ9+CgV6R0FV8wc="; }; patches = [ diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 1eb8b85166fe..6d4e28f6cb6b 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "dnsmasq"; - version = "2.87"; + version = "2.88"; src = fetchurl { url = "https://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; - sha256 = "sha256-AijANkp/I1b9fn8VSZN8vzCZp407LrG6W7DDHiuJ3no="; + sha256 = "sha256-I1RN7aEDQMBTvqbxWpP+1up/WqqFMWv8Zx/6bSL7wbM="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 2dc17936abc1..049154d64413 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -30,7 +30,5 @@ stdenv.mkDerivation rec { description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH"; license = licenses.mit; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 5b98582a1dff..9af953d2365e 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -8,12 +8,12 @@ let # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738 packageOverrides = self: super: { resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec { - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; - rev = version; - sha256 = "sha256-QDHEdVET7HN2ZCKxNUMofabR+rxJy0erWhNQn94D7eI="; + rev = "/refs/tags/${version}"; + hash = "sha256-xzu8sMNMihJ80vezMdGkOT5Etx08qy3T/TkEn5EAY48="; }; }); }; @@ -24,13 +24,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.1.5"; + version = "2.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-W+5B1JfOyTpJaT+le1zxyDNwGATrErxNNHw+x5VdfOc="; + hash = "sha256-zaSNM5Ey4oI2MtUPYBHG0PCMgJdasVatwkjaRBrT1RQ="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonApplication rec { pep517 pip platformdirs + pyproject-hooks python-dotenv requests-toolbelt resolvelib diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index b539772213bb..4b4103ff9fb1 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,30 +1,21 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , which , enableStatic ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.4.3"; pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "sha256-HkDgWwHoRWCNtWyfP4sj3veEd+KT5J7yL4J4Z/hJcrE="; + sha256 = "sha256-R+dHYG0DBI1uo+yF/pxoTv/V9WSfph043bH6erZjeCE="; }; - patches = [ - # Fix clang configuration; remove with next release - (fetchpatch { - url = "https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc.patch"; - sha256 = "0i5jz2s37h278c8d36pzphhp8rjy660zmhpg2cqlp960f6ny8wwj"; - }) - ]; - nativeBuildInputs = [ which ]; # configure script is not autotools-based, doesn't support these options diff --git a/pkgs/tools/security/tcb/default.nix b/pkgs/tools/security/tcb/default.nix index 63b252be9521..6a1f5b5eb5f2 100644 --- a/pkgs/tools/security/tcb/default.nix +++ b/pkgs/tools/security/tcb/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { --replace "PREFIX = /usr" "PREFIX = $out" \ --replace "SBINDIR = /sbin" "SBINDIR = $bin/bin" \ --replace "INCLUDEDIR = \$(PREFIX)/include" "INCLUDEDIR = $dev/include" + + # Override default 'CC=gcc' + makeFlagsArray+=("CC=$CC") ''; meta = with lib; { @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.openwall.com/tcb/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = systems.inspect.patterns.isGnu; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 66bcde737146..9b0b09066438 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -2,15 +2,16 @@ , hwdata , static ? stdenv.hostPlatform.isStatic , IOKit +, gitUpdater }: stdenv.mkDerivation rec { pname = "pciutils"; - version = "3.8.0"; # with release-date database + version = "3.9.0"; # with release-date database src = fetchurl { url = "mirror://kernel/software/utils/pciutils/pciutils-${version}.tar.xz"; - sha256 = "sha256-ke29BCmoRwXJrRVtT/OMzHJNQepUxMW4jjjplvijTwU="; + sha256 = "sha256-zep66XI53uIySaCcaKGaKHo/EJ++ssIy67YWyzhZkBI="; }; nativeBuildInputs = [ pkg-config ]; @@ -43,6 +44,12 @@ stdenv.mkDerivation rec { cp --reflink=auto ${hwdata}/share/hwdata/pci.ids $out/share/pci.ids ''; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://github.com/pciutils/pciutils.git"; + rev-prefix = "v"; + }; + meta = with lib; { homepage = "https://mj.ucw.cz/sw/pciutils/"; description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 33bda1e56455..6b67ef13128b 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; @@ -37,5 +37,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = [ "x86_64-linux" ]; + broken = finalAttrs.version != stdenv.cc.version; }; }) diff --git a/pkgs/tools/text/gawk/darwin-no-pma.patch b/pkgs/tools/text/gawk/darwin-no-pma.patch new file mode 100644 index 000000000000..f198acd41af1 --- /dev/null +++ b/pkgs/tools/text/gawk/darwin-no-pma.patch @@ -0,0 +1,31 @@ +https://git.savannah.gnu.org/cgit/gawk.git/patch/?id=e0b7737930f8a677d3c509f8ce72b9130965ec0a +--- a/m4/pma.m4 ++++ b/m4/pma.m4 +@@ -23,15 +23,18 @@ then + [LDFLAGS="${LDFLAGS} -no-pie" + export LDFLAGS]) + ;; +- *darwin*) +- # 23 October 2022: See README_d/README.macosx for +- # the details on what's happening here. See also +- # the manual. +- +- # Compile as Intel binary all the time, even on M1. +- CFLAGS="${CFLAGS} -arch x86_64" +- LDFLAGS="${LDFLAGS} -Xlinker -no_pie" +- export CFLAGS LDFLAGS ++ *darwin*) ++ # 27 November 2022: PMA only works on Intel. ++ case $host in ++ x86_64-*) ++ LDFLAGS="${LDFLAGS} -Xlinker -no_pie" ++ export LDFLAGS ++ ;; ++ *) ++ # disable on all other macOS systems ++ use_persistent_malloc=no ++ ;; ++ esac + ;; + *cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* ) + true # nothing do, exes on these systems are not PIE diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 3f91a301fd1b..a85e91b1a0c1 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -2,6 +2,7 @@ # TODO: links -lsigsegv but loses the reference for some reason , withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv , interactive ? false, readline +, autoreconfHook # no-pma fix /* Test suite broke on: stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 @@ -15,20 +16,28 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "gawk" + lib.optionalString interactive "-interactive"; - version = "5.1.1"; + version = "5.2.1"; src = fetchurl { url = "mirror://gnu/gawk/gawk-${version}.tar.xz"; - sha256 = "18kybw47fb1sdagav7aj95r9pp09r5gm202y3ahvwjw9dqw2jxnq"; + hash = "sha256-ZzVTuR+eGMxXku1RB1341RDJBA9VCm904Jya3SQ6fk8="; }; + patches = [ + # Pull upstream fix for aarch64-darwin where pma does not work. + # Can be removed after next gawk release. + ./darwin-no-pma.patch + ]; + # When we do build separate interactive version, it makes sense to always include man. outputs = [ "out" "info" ] ++ lib.optional (!interactive) "man"; - nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales; + nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales + # no-pma fix + ++ [ autoreconfHook ]; buildInputs = lib.optional withSigsegv libsigsegv ++ lib.optional interactive readline @@ -74,4 +83,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix ++ platforms.windows; maintainers = [ ]; }; -} +} // lib.optionalAttrs stdenv.hostPlatform.isMusl { + # PIE is incompatible with the "persistent malloc" ("pma") feature. + # FIXME: make unconditional in staging (added to avoid rebuilds in staging-next) + hardeningDisable = [ "pie" ]; +}) diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 32f6f30cb1ac..f493e4f358d6 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnused"; - version = "4.8"; + version = "4.9"; src = fetchurl { url = "mirror://gnu/sed/sed-${version}.tar.xz"; - sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp"; + sha256 = "sha256-biJrcy4c1zlGStaGK9Ghq6QteYKSLaelNRljHSSXUYE="; }; outputs = [ "out" "info" ]; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 96b0f3dbfcf8..d3bf8b2d8bf4 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-6UiE/b6iJkuM/9g5yhB33WwTZ2VYlWFWQdfdHzA39CM="; + auditable = true; # TODO: remove when this is the default + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; passthru = { diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 022f8bd25bb7..be989994dbff 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -22,6 +22,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1kfdgh8dra4jxgcdb0lln5wwrimz0dpp33bq3h7jgs8ngaq2a9wp"; + auditable = true; # TODO: remove when this is the default + nativeBuildInputs = [ asciidoctor installShellFiles ] ++ lib.optional withPCRE2 pkg-config; buildInputs = lib.optional withPCRE2 pcre2 diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh index eab37c3c68fb..cd513337f6f3 100755 --- a/pkgs/tools/typesetting/lout/builder.sh +++ b/pkgs/tools/typesetting/lout/builder.sh @@ -1,6 +1,7 @@ # Prepare a makefile specifying the appropriate output directories. # # Written by Ludovic Courtès . +if [ -e .attrs.sh ]; then source .attrs.sh; fi source "$stdenv/setup" || exit 1 diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index e9fc7826f8d3..baf6fcc6873b 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -238,7 +238,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex "xetex" ]; postInstall = '' - for output in $outputs; do + for output in $(getAllOutputNames); do mkdir -p "''${!output}/bin" done diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 71902a194ac5..e7aaac3c8de6 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -3,7 +3,7 @@ - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv -, callPackage, ghostscriptX, harfbuzz +, callPackage, ghostscript_headless, harfbuzz , makeWrapper, python3, ruby, perl, gnused, gnugrep, coreutils , libfaketime , useFixedHashes ? true @@ -12,7 +12,7 @@ let # various binaries (compiled) bin = callPackage ./bin.nix { - ghostscript = ghostscriptX; + ghostscript = ghostscript_headless; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; @@ -25,7 +25,7 @@ let combine = import ./combine.nix { inherit bin combinePkgs buildEnv lib makeWrapper writeText stdenv python3 ruby perl gnused gnugrep coreutils libfaketime; - ghostscript = ghostscriptX; # could be without X, probably, but we use X above + ghostscript = ghostscript_headless; }; # the set of TeX Live packages, collections, and schemes; using upstream naming diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 8a2d6f744422..f75c38111a57 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -22,6 +22,8 @@ in rustPlatform.buildRustPackage rec { cargoHash = "sha256-iHOmItooNsGq6iTIb9M5IPXMwYh2nQ03qfjomkgCdgw="; + auditable = true; # TODO: remove when this is the default + nativeBuildInputs = [ nasm cargo-c ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index e9c4a6e40ebb..af784bce9817 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -49,10 +49,10 @@ with localPython.pkgs; buildPythonApplication rec { substituteInPlace setup.py \ --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ --replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \ - --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.76" \ + --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \ --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \ --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \ - --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.1.0" + --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.2.0" ''; buildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ad2822a69be2..ef36289e05c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1641,6 +1641,7 @@ mapAliases ({ xfceUnstable = throw "xfceUnstable has been removed, use xfce instead"; # added 2022-12-25 xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 + xlibsWrapper = throw "'xlibsWrapper' has been replaced by its constituents"; # Converted to throw 2022-12-27 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22 xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 820987ae3534..38d9f438a963 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1248,7 +1248,7 @@ with pkgs; aflplusplus = callPackage ../tools/security/aflplusplus { clang = clang_9; llvm = llvm_9; - python = python37; + python = python3; wine = null; }; @@ -1924,9 +1924,7 @@ with pkgs; thicket = callPackage ../applications/version-management/thicket { }; - tig = callPackage ../applications/version-management/tig { - readline = readline81; - }; + tig = callPackage ../applications/version-management/tig { }; top-git = callPackage ../applications/version-management/topgit { }; @@ -2656,7 +2654,7 @@ with pkgs; authenticator = callPackage ../applications/misc/authenticator { }; - autoflake = callPackage ../development/tools/analysis/autoflake { }; + autoflake = with python3.pkgs; toPythonApplication autoflake; autospotting = callPackage ../applications/misc/autospotting { }; @@ -13621,16 +13619,16 @@ with pkgs; any-nix-shell = callPackage ../shells/any-nix-shell { }; - bash = lowPrio (callPackage ../shells/bash/5.1.nix { + bash = lowPrio (callPackage ../shells/bash/5.nix { binutils = stdenv.cc.bintools; }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed - bashInteractive = callPackage ../shells/bash/5.1.nix { + bashInteractive = callPackage ../shells/bash/5.nix { binutils = stdenv.cc.bintools; interactive = true; withDocs = true; }; - bashInteractiveFHS = callPackage ../shells/bash/5.1.nix { + bashInteractiveFHS = callPackage ../shells/bash/5.nix { binutils = stdenv.cc.bintools; interactive = true; withDocs = true; @@ -13954,6 +13952,7 @@ with pkgs; clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; clang-sierraHack-stdenv = overrideCC stdenv buildPackages.clang-sierraHack; libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; + rocmClangStdenv = llvmPackages_rocm.rocmClangStdenv; clasp-common-lisp = callPackage ../development/compilers/clasp { llvmPackages = llvmPackages_6; @@ -14097,9 +14096,11 @@ with pkgs; wrapNonDeterministicGcc = stdenv: ccWrapper: if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: { - cc = old.cc.override { - reproducibleBuild = false; - profiledCompiler = with stdenv; (!isDarwin && hostPlatform.isx86); + env = old.env // { + cc = old.env.cc.override { + reproducibleBuild = false; + profiledCompiler = with stdenv; (!isDarwin && hostPlatform.isx86); + }; }; }) else ccWrapper; @@ -15257,83 +15258,157 @@ with pkgs; rml = callPackage ../development/compilers/rml { }; composable_kernel = callPackage ../development/libraries/composable_kernel { - inherit (llvmPackages) openmp; + inherit (llvmPackages_rocm) openmp clang-tools-extra; + stdenv = rocmClangStdenv; + }; + + rocprofiler = callPackage ../development/libraries/rocprofiler { + stdenv = rocmClangStdenv; }; clang-ocl = callPackage ../development/libraries/clang-ocl { - inherit (llvmPackages_rocm) clang; + stdenv = rocmClangStdenv; }; rgxg = callPackage ../tools/text/rgxg { }; - rocclr = callPackage ../development/libraries/rocclr { }; - - hip = callPackage ../development/compilers/hip { - inherit (llvmPackages_rocm) clang llvm; + rocclr = callPackage ../development/libraries/rocclr { + stdenv = rocmClangStdenv; }; - hipcub = callPackage ../development/libraries/hipcub { }; + hip-common = callPackage ../development/compilers/hip-common { + inherit (llvmPackages_rocm) llvm; + stdenv = rocmClangStdenv; + }; - hipsparse = callPackage ../development/libraries/hipsparse { }; + hipcc = callPackage ../development/compilers/hipcc { + inherit (llvmPackages_rocm) llvm; + stdenv = rocmClangStdenv; + }; - rccl = callPackage ../development/libraries/rccl { }; + hip = callPackage ../development/compilers/hip { + inherit (llvmPackages_rocm) llvm; + inherit (cudaPackages) cudatoolkit; + stdenv = rocmClangStdenv; + }; - rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake { }; + hip-amd = hip.override { + useNVIDIA = false; + }; + + hip-nvidia = hip.override { + useNVIDIA = true; + }; + + hipcub = callPackage ../development/libraries/hipcub { + stdenv = rocmClangStdenv; + }; + + hipsparse = callPackage ../development/libraries/hipsparse { + inherit (llvmPackages_rocm) openmp; + stdenv = rocmClangStdenv; + }; + + rccl = callPackage ../development/libraries/rccl { + stdenv = rocmClangStdenv; + }; + + rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake { + stdenv = rocmClangStdenv; + }; rocm-comgr = callPackage ../development/libraries/rocm-comgr { - inherit (llvmPackages_rocm) clang llvm; + stdenv = rocmClangStdenv; + }; + + rocalution = callPackage ../development/libraries/rocalution { + inherit (llvmPackages_rocm) openmp; + stdenv = rocmClangStdenv; }; rocm-device-libs = callPackage ../development/libraries/rocm-device-libs { - inherit (llvmPackages_rocm) clang llvm; + stdenv = rocmClangStdenv; }; - rocm-opencl-icd = callPackage ../development/libraries/rocm-opencl-icd { }; + rocm-opencl-icd = callPackage ../development/libraries/rocm-opencl-icd { + stdenv = rocmClangStdenv; + }; + + rocsolver = callPackage ../development/libraries/rocsolver { + stdenv = rocmClangStdenv; + }; rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime { - inherit (llvmPackages_rocm) clang llvm; + stdenv = rocmClangStdenv; }; rocm-runtime = callPackage ../development/libraries/rocm-runtime { - inherit (llvmPackages_rocm) llvm; + stdenv = rocmClangStdenv; }; - rocm-smi = python3Packages.callPackage ../tools/system/rocm-smi { }; + rocm-smi = python3Packages.callPackage ../tools/system/rocm-smi { + stdenv = rocmClangStdenv; + }; - rocm-thunk = callPackage ../development/libraries/rocm-thunk { }; + rocm-thunk = callPackage ../development/libraries/rocm-thunk { + stdenv = rocmClangStdenv; + }; - rocminfo = callPackage ../development/tools/rocminfo { }; + rocminfo = callPackage ../development/tools/rocminfo { + stdenv = rocmClangStdenv; + }; rocmlir = callPackage ../development/libraries/rocmlir { - inherit (llvmPackages_rocm) clang; + stdenv = rocmClangStdenv; }; - rocprim = callPackage ../development/libraries/rocprim { }; + rocmlir-rock = rocmlir.override { + buildRockCompiler = true; + }; - rocsparse = callPackage ../development/libraries/rocsparse { }; + rocprim = callPackage ../development/libraries/rocprim { + stdenv = rocmClangStdenv; + }; - rocfft = callPackage ../development/libraries/rocfft { }; + rocsparse = callPackage ../development/libraries/rocsparse { + stdenv = rocmClangStdenv; + }; - rocrand = callPackage ../development/libraries/rocrand { }; + rocfft = callPackage ../development/libraries/rocfft { + inherit (llvmPackages_rocm) openmp; + stdenv = rocmClangStdenv; + }; - tensile = python3Packages.callPackage ../development/libraries/tensile { }; + rocrand = callPackage ../development/libraries/rocrand { + stdenv = rocmClangStdenv; + }; + + tensile = python3Packages.callPackage ../development/libraries/tensile { + stdenv = rocmClangStdenv; + }; rocwmma = callPackage ../development/libraries/rocwmma { - inherit (llvmPackages) openmp; + inherit (llvmPackages_rocm) openmp; + stdenv = rocmClangStdenv; }; rocblas = callPackage ../development/libraries/rocblas { - inherit (llvmPackages_rocm) llvm; + inherit (llvmPackages_rocm) openmp; + stdenv = rocmClangStdenv; }; miopengemm = callPackage ../development/libraries/miopengemm { - inherit (llvmPackages_rocm) clang; + stdenv = rocmClangStdenv; }; - rocthrust = callPackage ../development/libraries/rocthrust { }; + rocthrust = callPackage ../development/libraries/rocthrust { + stdenv = rocmClangStdenv; + }; miopen = callPackage ../development/libraries/miopen { - inherit (llvmPackages_rocm) clang llvm; + inherit (llvmPackages_rocm) llvm clang-tools-extra; + stdenv = rocmClangStdenv; + rocmlir = rocmlir-rock; boost = boost.override { enableStatic = true; }; }; @@ -15347,15 +15422,22 @@ with pkgs; rocmUpdateScript = callPackage ../development/rocm-modules/update-script { }; + # Requires GCC + roctracer = callPackage ../development/libraries/roctracer { + inherit (llvmPackages_rocm) clang; + }; + rtags = callPackage ../development/tools/rtags { inherit (darwin) apple_sdk; }; - rust_1_65 = callPackage ../development/compilers/rust/1_65.nix { + rust_1_66 = callPackage ../development/compilers/rust/1_66.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_14 = llvmPackages_14.libllvm; + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; - rust = rust_1_65; + rust = rust_1_66; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -15364,10 +15446,10 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_65 = rust_1_65.packages.stable; - rustPackages = rustPackages_1_65; + rustPackages_1_66 = rust_1_66.packages.stable; + rustPackages = rustPackages_1_66; - inherit (rustPackages) cargo clippy rustc rustPlatform; + inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix {}; @@ -15397,7 +15479,6 @@ with pkgs; cargo-audit = callPackage ../development/tools/rust/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-auditable = callPackage ../development/tools/rust/cargo-auditable { }; cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { inherit (darwin.apple_sdk.frameworks) Security; openssl = openssl_1_1; @@ -16247,12 +16328,6 @@ with pkgs; bluezSupport = true; x11Support = true; }; - python37Full = python37.override { - self = python37Full; - pythonAttr = "python37Full"; - bluezSupport = true; - x11Support = true; - }; python38Full = python38.override { self = python38Full; pythonAttr = "python38Full"; @@ -16271,19 +16346,24 @@ with pkgs; bluezSupport = true; x11Support = true; }; + python311Full = python310.override { + self = python311Full; + pythonAttr = "python311Full"; + bluezSupport = true; + x11Support = true; + }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; + inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; # Python package sets. python27Packages = python27.pkgs; - python37Packages = python37.pkgs; python38Packages = python38.pkgs; - python39Packages = recurseIntoAttrs python39.pkgs; + python39Packages = python39.pkgs; python310Packages = recurseIntoAttrs python310.pkgs; - python311Packages = python311.pkgs; + python311Packages = recurseIntoAttrs python311.pkgs; python312Packages = python312.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; @@ -20367,9 +20447,7 @@ with pkgs; libargs = callPackage ../development/libraries/libargs { }; - libarchive = callPackage ../development/libraries/libarchive { - autoreconfHook = buildPackages.autoreconfHook269; - }; + libarchive = callPackage ../development/libraries/libarchive { }; libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { }; @@ -20502,7 +20580,9 @@ with pkgs; libcint = callPackage ../development/libraries/libcint { }; - libclc = callPackage ../development/libraries/libclc { }; + libclc = callPackage ../development/libraries/libclc { + llvmPackages = llvmPackages_latest; + }; libcli = callPackage ../development/libraries/libcli { }; @@ -20571,8 +20651,7 @@ with pkgs; }; libdevil-nox = libdevil.override { - libX11 = null; - libGL = null; + withXorg = false; }; libdecor = callPackage ../development/libraries/libdecor { }; @@ -21793,8 +21872,9 @@ with pkgs; mesa = callPackage ../development/libraries/mesa { llvmPackages = llvmPackages_latest; - inherit (darwin.apple_sdk.frameworks) OpenGL; - inherit (darwin.apple_sdk.libs) Xplugin; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; + inherit (darwin.apple_sdk_11_0.libs) Xplugin; }; mesa_glu = callPackage ../development/libraries/mesa-glu { @@ -22459,11 +22539,12 @@ with pkgs; qt5 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; - inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; + inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; inherit bison cups dconf harfbuzz libGL perl gtk3 python3; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; inherit buildPackages; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { @@ -22550,13 +22631,13 @@ with pkgs; raylib = callPackage ../development/libraries/raylib { }; - readline = readline81; + readline = readline82; readline63 = callPackage ../development/libraries/readline/6.3.nix { }; readline70 = callPackage ../development/libraries/readline/7.0.nix { }; - readline81 = callPackage ../development/libraries/readline/8.1.nix { }; + readline82 = callPackage ../development/libraries/readline/8.2.nix { }; readosm = callPackage ../development/libraries/readosm { }; @@ -23453,14 +23534,6 @@ with pkgs; xgeometry-select = callPackage ../tools/X11/xgeometry-select { }; - # Avoid using this. It isn't really a wrapper anymore, but we keep the name. - xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { - packages = [ - freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt - xorg.libXft xorg.libXext xorg.libSM xorg.libICE - ]; - }; - xmlada = callPackage ../development/libraries/ada/xmlada { }; xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; @@ -25339,9 +25412,7 @@ with pkgs; drbd = callPackage ../os-specific/linux/drbd { }; - dropwatch = callPackage ../os-specific/linux/dropwatch { - readline = readline81; - }; + dropwatch = callPackage ../os-specific/linux/dropwatch { }; dsd = callPackage ../applications/radio/dsd { }; @@ -26253,6 +26324,7 @@ with pkgs; withEfi = false; withFido2 = false; withHostnamed = false; + withHomed = false; withHwdb = false; withImportd = false; withLibBPF = false; @@ -28315,9 +28387,7 @@ with pkgs; cplay-ng = callPackage ../applications/audio/cplay-ng { }; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { - python3Packages = python37Packages; - }; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; cqrlog = callPackage ../applications/radio/cqrlog { hamlib = hamlib_4; @@ -37017,6 +37087,11 @@ with pkgs; x11Support = true; }; + ghostscript_headless = ghostscript.override { + cupsSupport = false; + x11Support = false; + }; + glava = callPackage ../applications/misc/glava {}; gnuk = callPackage ../misc/gnuk { diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index a47655f11424..1de93a9f3fde 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -47,6 +47,10 @@ let feature = "set `strictDeps` to true by default"; }; + structuredAttrsByDefault = mkMassRebuild { + feature = "set `__structuredAttrs` to true by default"; + }; + enableParallelBuildingByDefault = mkMassRebuild { feature = "set `enableParallelBuilding` to true by default"; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23c6bb112ba4..5be362dc58e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23029,7 +23029,7 @@ let # For some crazy reason Makefile.PL doesn't generate a Makefile if # AUTOMATED_TESTING is set. - AUTOMATED_TESTING = false; + env.AUTOMATED_TESTING = false; # Makefile.PL looks for ncurses in Glibc's prefix. preConfigure = @@ -27058,7 +27058,7 @@ let hash = "sha256-gxxY8549/ebS3QORjSs8IgdBs2aD05Tu+9Bn70gu7gQ="; }) ]; - AUTOMATED_TESTING = false; + env.AUTOMATED_TESTING = false; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 18d921f2e01c..84b81abbd981 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -108,6 +108,8 @@ mapAliases ({ itanium_demangler = itanium-demangler; # added 2022-1017 jinja2_time = jinja2-time; # added 2022-11-07 jupyter_client = jupyter-client; # added 2021-10-15 + jupyter_core = jupyter-core; # added 2023-01-05 + jupyter_server = jupyter-server; # added 2023-01-05 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 @@ -179,6 +181,7 @@ mapAliases ({ python_magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03 + python-Levenshtein = levenshtein; python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0fc94994a679..78df192f7fb0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -782,6 +782,8 @@ self: super: with self; { autofaiss = callPackage ../development/python-modules/autofaiss { }; + autoflake = callPackage ../development/python-modules/autoflake { }; + autograd = callPackage ../development/python-modules/autograd { }; autoit-ripper = callPackage ../development/python-modules/autoit-ripper { }; @@ -1921,6 +1923,8 @@ self: super: with self; { cometblue-lite = callPackage ../development/python-modules/cometblue-lite { }; + comm = callPackage ../development/python-modules/comm { }; + commandparse = callPackage ../development/python-modules/commandparse { }; commentjson = callPackage ../development/python-modules/commentjson { }; @@ -1979,6 +1983,8 @@ self: super: with self; { contexttimer = callPackage ../development/python-modules/contexttimer { }; + contourpy = callPackage ../development/python-modules/contourpy { }; + convertdate = callPackage ../development/python-modules/convertdate { }; cookiecutter = callPackage ../development/python-modules/cookiecutter { }; @@ -2094,6 +2100,8 @@ self: super: with self; { csvw = callPackage ../development/python-modules/csvw { }; + cu2qu = callPackage ../development/python-modules/cu2qu { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; cufflinks = callPackage ../development/python-modules/cufflinks { }; @@ -4197,10 +4205,14 @@ self: super: with self; { hatch-fancy-pypi-readme = callPackage ../development/python-modules/hatch-fancy-pypi-readme { }; + hatch-jupyter-builder = callPackage ../development/python-modules/hatch-jupyter-builder { }; + hatch-vcs = callPackage ../development/python-modules/hatch-vcs { }; hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { }; + hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { }; + haversine = callPackage ../development/python-modules/haversine { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; @@ -4940,11 +4952,16 @@ self: super: with self; { jupyter_console = callPackage ../development/python-modules/jupyter_console { }; - jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + jupyter-core = callPackage ../development/python-modules/jupyter-core { }; + + jupyter-events = callPackage ../development/python-modules/jupyter-events { }; jupyter-lsp = callPackage ../development/python-modules/jupyter-lsp { }; - jupyter_server = callPackage ../development/python-modules/jupyter_server { }; + jupyter-server = callPackage ../development/python-modules/jupyter-server { }; + + jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { }; + jupyterhub = callPackage ../development/python-modules/jupyterhub { }; @@ -5654,6 +5671,7 @@ self: super: with self; { matplotlib = callPackage ../development/python-modules/matplotlib { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + ghostscript = pkgs.ghostscript_headless; }; matplotlib-inline = callPackage ../development/python-modules/matplotlib-inline { }; @@ -5979,6 +5997,8 @@ self: super: with self; { mpyq = callPackage ../development/python-modules/mpyq { }; + mrjob = callPackage ../development/python-modules/mrjob { }; + mrkd = callPackage ../development/python-modules/mrkd { }; ms-active-directory = callPackage ../development/python-modules/ms-active-directory { }; @@ -6101,6 +6121,8 @@ self: super: with self; { nampa = callPackage ../development/python-modules/nampa { }; + nanoid = callPackage ../development/python-modules/nanoid { }; + nanoleaf = callPackage ../development/python-modules/nanoleaf { }; nomadnet = callPackage ../development/python-modules/nomadnet { }; @@ -6976,6 +6998,10 @@ self: super: with self; { pyprecice = callPackage ../development/python-modules/pyprecice { }; + pyproject-api = callPackage ../development/python-modules/pyproject-api { }; + + pyproject-hooks = callPackage ../development/python-modules/pyproject-hooks { }; + pypsrp = callPackage ../development/python-modules/pypsrp { }; phpserialize = callPackage ../development/python-modules/phpserialize { }; @@ -8938,6 +8964,8 @@ self: super: with self; { pytest-json-report = callPackage ../development/python-modules/pytest-json-report { }; + pytest-jupyter = callPackage ../development/python-modules/pytest-jupyter { }; + pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; @@ -9181,8 +9209,6 @@ self: super: with self; { python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; - python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; - python-linux-procfs = callPackage ../development/python-modules/python-linux-procfs { }; python-logstash = callPackage ../development/python-modules/python-logstash { }; @@ -9891,6 +9917,8 @@ self: super: with self; { rfc3986 = callPackage ../development/python-modules/rfc3986 { }; + rfc3986-validator = callPackage ../development/python-modules/rfc3986-validator { }; + rfc3987 = callPackage ../development/python-modules/rfc3987 { }; rfc6555 = callPackage ../development/python-modules/rfc6555 { }; @@ -10310,6 +10338,8 @@ self: super: with self; { setuptools-declarative-requirements = callPackage ../development/python-modules/setuptools-declarative-requirements { }; + setuptools-gettext = callPackage ../development/python-modules/setuptools-gettext { }; + setuptools-git = callPackage ../development/python-modules/setuptools-git { }; setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; @@ -10652,7 +10682,9 @@ self: super: with self; { spinners = callPackage ../development/python-modules/spinners { }; - sphinx-automodapi = callPackage ../development/python-modules/sphinx-automodapi { }; + sphinx-automodapi = callPackage ../development/python-modules/sphinx-automodapi { + graphviz = pkgs.graphviz; + }; sphinx-better-theme = callPackage ../development/python-modules/sphinx-better-theme { }; @@ -10758,6 +10790,8 @@ self: super: with self; { sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { }; + sphinx-markdown-tables = callPackage ../development/python-modules/sphinx-markdown-tables { }; + sphinx-material = callPackage ../development/python-modules/sphinx-material { }; sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { }; @@ -11030,6 +11064,8 @@ self: super: with self; { sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; + syrupy = callPackage ../development/python-modules/syrupy { }; + tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; tables = callPackage ../development/python-modules/tables { }; @@ -11481,6 +11517,8 @@ self: super: with self; { troposphere = callPackage ../development/python-modules/troposphere { }; + trove-classifiers = callPackage ../development/python-modules/trove-classifiers { }; + trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme { }; @@ -12292,6 +12330,8 @@ self: super: with self; { xxhash = callPackage ../development/python-modules/xxhash { }; + xyzservices = callPackage ../development/python-modules/xyzservices { }; + yabadaba = callPackage ../development/python-modules/yabadaba { }; yahooweather = callPackage ../development/python-modules/yahooweather { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 00d28e73854f..83a90a2a5e6d 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -79,6 +79,10 @@ with self; with super; { typing = callPackage ../development/python2-modules/typing { }; + six = super.six.overridePythonAttrs (_: { + doCheck = false; # circular dependency with pytest + }); + zeek = disabled super.zeek; zipp = callPackage ../development/python2-modules/zipp { };