diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index d94acf130a2c..77828110cc4f 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -374,6 +374,50 @@ mkPythonMetaPackage { } ``` +#### `mkPythonEditablePackage` function {#mkpythoneditablepackage-function} + +When developing Python packages it's common to install packages in [editable mode](https://setuptools.pypa.io/en/latest/userguide/development_mode.html). +Like `mkPythonMetaPackage` this function exists to create an otherwise empty package, but also containing a pointer to an impure location outside the Nix store that can be changed without rebuilding. + +The editable root is passed as a string. Normally `.pth` files contains absolute paths to the mutable location. This isn't always ergonomic with Nix, so environment variables are expanded at runtime. +This means that a shell hook setting up something like a `$REPO_ROOT` variable can be used as the relative package root. + +As an implementation detail, the [PEP-518](https://peps.python.org/pep-0518/) `build-system` specified won't be used, but instead the editable package will be built using [hatchling](https://pypi.org/project/hatchling/). +The `build-system`'s provided will instead become runtime dependencies of the editable package. + +Note that overriding packages deeper in the dependency graph _can_ work, but it's not the primary use case and overriding existing packages can make others break in unexpected ways. + +``` nix +{ pkgs ? import { } }: + +let + pyproject = pkgs.lib.importTOML ./pyproject.toml; + + myPython = pkgs.python.override { + self = myPython; + packageOverrides = pyfinal: pyprev: { + # An editable package with a script that loads our mutable location + my-editable = pyfinal.mkPythonEditablePackage { + # Inherit project metadata from pyproject.toml + pname = pyproject.project.name; + inherit (pyproject.project) version; + + # The editable root passed as a string + root = "$REPO_ROOT/src"; # Use environment variable expansion at runtime + + # Inject a script (other PEP-621 entrypoints are also accepted) + inherit (pyproject.project) scripts; + }; + }; + }; + + pythonEnv = testPython.withPackages (ps: [ ps.my-editable ]); + +in pkgs.mkShell { + packages = [ pythonEnv ]; +} +``` + #### `python.buildEnv` function {#python.buildenv-function} Python environments can be created using the low-level `pkgs.buildEnv` function. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74569537259e..50248fdd7dbc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2476,6 +2476,13 @@ github = "beezow"; githubId = 42082156; }; + ben9986 = { + name = "Ben Carmichael"; + email = "ben9986.unvmn@passinbox.com"; + github = "ben9986"; + githubId = 38633150; + keys = [ { fingerprint = "03C7 A587 74B3 F0E8 CE1F 4F8E ABBC DD77 69BC D3B0"; } ]; + }; benaryorg = { name = "benaryorg"; email = "binary@benary.org"; @@ -5806,12 +5813,6 @@ githubId = 8146736; name = "Florentin Eckl"; }; - eclairevoyant = { - email = "contactmeongithubinstead@proton.me"; - github = "eclairevoyant"; - githubId = 848000; - name = "éclairevoyant"; - }; edanaher = { email = "nixos@edanaher.net"; github = "edanaher"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f88125e56ccc..39c548efd91b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -942,7 +942,6 @@ with lib.maintainers; steam = { members = [ atemu - eclairevoyant k900 mkg20001 ]; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 317b32aa3bd9..a4b71e34e36e 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -197,6 +197,9 @@ moved into the top level scope (i.e., `budgie.budgie-desktop` is now `budgie-desktop`) +- The method to safely handle secrets in the `networking.wireless` module has been changed to benefit from a [new feature](https://w1.fi/cgit/hostap/commit/?id=e680a51e94a33591f61edb210926bcb71217a21a) of wpa_supplicant. + The syntax to refer to secrets has changed slightly and the option `networking.wireless.environmentFile` has been replaced by `networking.wireless.secretsFile`; see the description of the latter for how to upgrade. + - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`). - All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`). diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index e516d8ea6f8b..6e9ab0079581 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -1,11 +1,7 @@ # This module creates a bootable ISO image containing the given NixOS # configuration. The derivation for the ISO image will be placed in # config.system.build.isoImage. - { config, lib, pkgs, ... }: - -with lib; - let /** * Given a list of `options`, concats the result of mapping each options @@ -22,8 +18,8 @@ let (option: '' menuentry '${defaults.name} ${ # Name appended to menuentry defaults to params if no specific name given. - option.name or (optionalString (option ? params) "(${option.params})") - }' ${optionalString (option ? class) " --class ${option.class}"} { + option.name or (lib.optionalString (option ? params) "(${option.params})") + }' ${lib.optionalString (option ? class) " --class ${option.class}"} { # Fallback to UEFI console for boot, efifb sometimes has difficulties. terminal_output console @@ -153,8 +149,8 @@ let APPEND ${toString config.boot.loader.grub.memtest86.params} ''; - isolinuxCfg = concatStringsSep "\n" - ([ baseIsolinuxCfg ] ++ optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); + isolinuxCfg = lib.concatStringsSep "\n" + ([ baseIsolinuxCfg ] ++ lib.optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); refindBinary = if targetArch == "x64" || targetArch == "aa64" then "refind_${targetArch}.efi" else null; @@ -182,7 +178,7 @@ let insmod gfxterm insmod png set gfxpayload=keep - set gfxmode=${concatStringsSep "," [ + set gfxmode=${lib.concatStringsSep "," [ # GRUB will use the first valid mode listed here. # `auto` will sometimes choose the smallest valid mode it detects. # So instead we'll list a lot of possibly valid modes :/ @@ -321,7 +317,7 @@ let cat < $out/EFI/boot/grub.cfg - set textmode=${boolToString (config.isoImage.forceTextMode)} + set textmode=${lib.boolToString (config.isoImage.forceTextMode)} set timeout=${toString grubEfiTimeout} clear @@ -480,7 +476,7 @@ in { options = { - isoImage.isoName = mkOption { + isoImage.isoName = lib.mkOption { default = "${config.isoImage.isoBaseName}.iso"; type = lib.types.str; description = '' @@ -488,7 +484,7 @@ in ''; }; - isoImage.isoBaseName = mkOption { + isoImage.isoBaseName = lib.mkOption { default = config.system.nixos.distroId; type = lib.types.str; description = '' @@ -496,7 +492,7 @@ in ''; }; - isoImage.compressImage = mkOption { + isoImage.compressImage = lib.mkOption { default = false; type = lib.types.bool; description = '' @@ -505,7 +501,7 @@ in ''; }; - isoImage.squashfsCompression = mkOption { + isoImage.squashfsCompression = lib.mkOption { default = "zstd -Xcompression-level 19"; type = lib.types.nullOr lib.types.str; description = '' @@ -515,7 +511,7 @@ in example = "zstd -Xcompression-level 6"; }; - isoImage.edition = mkOption { + isoImage.edition = lib.mkOption { default = ""; type = lib.types.str; description = '' @@ -524,9 +520,9 @@ in ''; }; - isoImage.volumeID = mkOption { + isoImage.volumeID = lib.mkOption { # nixos-$EDITION-$RELEASE-$ARCH - default = "nixos${optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.uname.processor}"; + default = "nixos${lib.optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.uname.processor}"; type = lib.types.str; description = '' Specifies the label or volume ID of the generated ISO image. @@ -535,8 +531,8 @@ in ''; }; - isoImage.contents = mkOption { - example = literalExpression '' + isoImage.contents = lib.mkOption { + example = lib.literalExpression '' [ { source = pkgs.memtest86 + "/memtest.bin"; target = "boot/memtest.bin"; } @@ -548,15 +544,15 @@ in ''; }; - isoImage.storeContents = mkOption { - example = literalExpression "[ pkgs.stdenv ]"; + isoImage.storeContents = lib.mkOption { + example = lib.literalExpression "[ pkgs.stdenv ]"; description = '' This option lists additional derivations to be included in the Nix store in the generated ISO image. ''; }; - isoImage.includeSystemBuildDependencies = mkOption { + isoImage.includeSystemBuildDependencies = lib.mkOption { default = false; type = lib.types.bool; description = '' @@ -568,7 +564,7 @@ in ''; }; - isoImage.makeBiosBootable = mkOption { + isoImage.makeBiosBootable = lib.mkOption { # Before this option was introduced, images were BIOS-bootable if the # hostPlatform was x86-based. This option is enabled by default for # backwards compatibility. @@ -586,7 +582,7 @@ in ''; }; - isoImage.makeEfiBootable = mkOption { + isoImage.makeEfiBootable = lib.mkOption { default = false; type = lib.types.bool; description = '' @@ -594,7 +590,7 @@ in ''; }; - isoImage.makeUsbBootable = mkOption { + isoImage.makeUsbBootable = lib.mkOption { default = false; type = lib.types.bool; description = '' @@ -602,7 +598,7 @@ in ''; }; - isoImage.efiSplashImage = mkOption { + isoImage.efiSplashImage = lib.mkOption { default = pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/efi-background.png"; sha256 = "18lfwmp8yq923322nlb9gxrh5qikj1wsk6g5qvdh31c4h5b1538x"; @@ -612,7 +608,7 @@ in ''; }; - isoImage.splashImage = mkOption { + isoImage.splashImage = lib.mkOption { default = pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/isolinux/bios-boot.png"; sha256 = "1wp822zrhbg4fgfbwkr7cbkr4labx477209agzc0hr6k62fr6rxd"; @@ -622,15 +618,15 @@ in ''; }; - isoImage.grubTheme = mkOption { + isoImage.grubTheme = lib.mkOption { default = pkgs.nixos-grub2-theme; - type = types.nullOr (types.either types.path types.package); + type = lib.types.nullOr (lib.types.either lib.types.path lib.types.package); description = '' The grub2 theme used for UEFI boot. ''; }; - isoImage.syslinuxTheme = mkOption { + isoImage.syslinuxTheme = lib.mkOption { default = '' MENU TITLE ${config.system.nixos.distroName} MENU RESOLUTION 800 600 @@ -655,15 +651,15 @@ in MENU COLOR UNSEL 37;44 #FF000000 #00000000 none MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std ''; - type = types.str; + type = lib.types.str; description = '' The syslinux theme used for BIOS boot. ''; }; - isoImage.prependToMenuLabel = mkOption { + isoImage.prependToMenuLabel = lib.mkOption { default = ""; - type = types.str; + type = lib.types.str; example = "Install "; description = '' The string to prepend before the menu label for the NixOS system. @@ -674,9 +670,9 @@ in ''; }; - isoImage.appendToMenuLabel = mkOption { + isoImage.appendToMenuLabel = lib.mkOption { default = " Installer"; - type = types.str; + type = lib.types.str; example = " Live System"; description = '' The string to append after the menu label for the NixOS system. @@ -687,9 +683,9 @@ in ''; }; - isoImage.forceTextMode = mkOption { + isoImage.forceTextMode = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; example = true; description = '' Whether to use text mode instead of graphical grub. @@ -706,7 +702,7 @@ in # store them in lib so we can mkImageMediaOverride the # entire file system layout in installation media (only) config.lib.isoFileSystems = { - "/" = mkImageMediaOverride + "/" = lib.mkImageMediaOverride { fsType = "tmpfs"; options = [ "mode=0755" ]; @@ -715,7 +711,7 @@ in # Note that /dev/root is a symlink to the actual root device # specified on the kernel command line, created in the stage 1 # init script. - "/iso" = mkImageMediaOverride + "/iso" = lib.mkImageMediaOverride { device = "/dev/root"; neededForBoot = true; noCheck = true; @@ -723,20 +719,20 @@ in # In stage 1, mount a tmpfs on top of /nix/store (the squashfs # image) to make this a live CD. - "/nix/.ro-store" = mkImageMediaOverride + "/nix/.ro-store" = lib.mkImageMediaOverride { fsType = "squashfs"; device = "/iso/nix-store.squashfs"; options = [ "loop" ]; neededForBoot = true; }; - "/nix/.rw-store" = mkImageMediaOverride + "/nix/.rw-store" = lib.mkImageMediaOverride { fsType = "tmpfs"; options = [ "mode=0755" ]; neededForBoot = true; }; - "/nix/store" = mkImageMediaOverride + "/nix/store" = lib.mkImageMediaOverride { fsType = "overlay"; device = "overlay"; options = [ @@ -760,11 +756,11 @@ in message = "BIOS boot is only supported on x86-based architectures."; } { - assertion = !(stringLength config.isoImage.volumeID > 32); + assertion = !(lib.stringLength config.isoImage.volumeID > 32); # https://wiki.osdev.org/ISO_9660#The_Primary_Volume_Descriptor # Volume Identifier can only be 32 bytes message = let - length = stringLength config.isoImage.volumeID; + length = lib.stringLength config.isoImage.volumeID; howmany = toString length; toomany = toString (length - 32); in @@ -777,7 +773,7 @@ in boot.loader.grub.enable = false; environment.systemPackages = [ grubPkgs.grub2 grubPkgs.grub2_efi ] - ++ optional (config.isoImage.makeBiosBootable) pkgs.syslinux + ++ lib.optional (config.isoImage.makeBiosBootable) pkgs.syslinux ; # In stage 1 of the boot, mount the CD as the root FS by label so @@ -803,7 +799,7 @@ in # script and the top-level system configuration directory. isoImage.storeContents = [ config.system.build.toplevel ] ++ - optional config.isoImage.includeSystemBuildDependencies + lib.optional config.isoImage.includeSystemBuildDependencies config.system.build.toplevel.drvPath; # Individual files to be included on the CD, outside of the Nix @@ -819,7 +815,7 @@ in { source = pkgs.writeText "version" config.system.nixos.label; target = "/version.txt"; } - ] ++ optionals (config.isoImage.makeBiosBootable) [ + ] ++ lib.optionals (config.isoImage.makeBiosBootable) [ { source = config.isoImage.splashImage; target = "/isolinux/background.png"; } @@ -833,7 +829,7 @@ in { source = "${pkgs.syslinux}/share/syslinux"; target = "/isolinux"; } - ] ++ optionals config.isoImage.makeEfiBootable [ + ] ++ lib.optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; } @@ -846,11 +842,11 @@ in { source = config.isoImage.efiSplashImage; target = "/EFI/boot/efi-background.png"; } - ] ++ optionals (config.boot.loader.grub.memtest86.enable && config.isoImage.makeBiosBootable) [ + ] ++ lib.optionals (config.boot.loader.grub.memtest86.enable && config.isoImage.makeBiosBootable) [ { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; } - ] ++ optionals (config.isoImage.grubTheme != null) [ + ] ++ lib.optionals (config.isoImage.grubTheme != null) [ { source = config.isoImage.grubTheme; target = "/EFI/boot/grub-theme"; } @@ -866,10 +862,10 @@ in syslinux = if config.isoImage.makeBiosBootable then pkgs.syslinux else null; squashfsContents = config.isoImage.storeContents; squashfsCompression = config.isoImage.squashfsCompression; - } // optionalAttrs (config.isoImage.makeUsbBootable && config.isoImage.makeBiosBootable) { + } // lib.optionalAttrs (config.isoImage.makeUsbBootable && config.isoImage.makeBiosBootable) { usbBootable = true; isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin"; - } // optionalAttrs config.isoImage.makeEfiBootable { + } // lib.optionalAttrs config.isoImage.makeEfiBootable { efiBootable = true; efiBootImage = "boot/efi.img"; }); diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index b5e33f3c0986..a6cd80384533 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let name = "mpd"; @@ -12,11 +9,11 @@ let credentialsPlaceholder = (creds: let - placeholders = (imap0 - (i: c: ''password "{{password-${toString i}}}@${concatStringsSep "," c.permissions}"'') + placeholders = (lib.imap0 + (i: c: ''password "{{password-${toString i}}}@${lib.concatStringsSep "," c.permissions}"'') creds); in - concatStringsSep "\n" placeholders); + lib.concatStringsSep "\n" placeholders); mpdConf = pkgs.writeText "mpd.conf" '' # This file was automatically generated by NixOS. Edit mpd's configuration @@ -31,16 +28,16 @@ let state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" - ${optionalString (cfg.network.listenAddress != "any") ''bind_to_address "${cfg.network.listenAddress}"''} - ${optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} - ${optionalString (cfg.fluidsynth) '' + ${lib.optionalString (cfg.network.listenAddress != "any") ''bind_to_address "${cfg.network.listenAddress}"''} + ${lib.optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} + ${lib.optionalString (cfg.fluidsynth) '' decoder { plugin "fluidsynth" soundfont "${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2" } ''} - ${optionalString (cfg.credentials != []) (credentialsPlaceholder cfg.credentials)} + ${lib.optionalString (cfg.credentials != []) (credentialsPlaceholder cfg.credentials)} ${cfg.extraConfig} ''; @@ -53,16 +50,16 @@ in { services.mpd = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable MPD, the music player daemon. ''; }; - startWhenNeeded = mkOption { - type = types.bool; + startWhenNeeded = lib.mkOption { + type = lib.types.bool; default = false; description = '' If set, {command}`mpd` is socket-activated; that @@ -71,10 +68,10 @@ in { ''; }; - musicDirectory = mkOption { - type = with types; either path (strMatching "(http|https|nfs|smb)://.+"); + musicDirectory = lib.mkOption { + type = with lib.types; either path (strMatching "(http|https|nfs|smb)://.+"); default = "${cfg.dataDir}/music"; - defaultText = literalExpression ''"''${dataDir}/music"''; + defaultText = lib.literalExpression ''"''${dataDir}/music"''; description = '' The directory or NFS/SMB network share where MPD reads music from. If left as the default value this directory will automatically be created before @@ -83,10 +80,10 @@ in { ''; }; - playlistDirectory = mkOption { - type = types.path; + playlistDirectory = lib.mkOption { + type = lib.types.path; default = "${cfg.dataDir}/playlists"; - defaultText = literalExpression ''"''${dataDir}/playlists"''; + defaultText = lib.literalExpression ''"''${dataDir}/playlists"''; description = '' The directory where MPD stores playlists. If left as the default value this directory will automatically be created before the MPD server starts, @@ -95,8 +92,8 @@ in { ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra directives added to to the end of MPD's configuration file, @@ -106,8 +103,8 @@ in { ''; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/${name}"; description = '' The directory where MPD stores its state, tag cache, playlists etc. If @@ -117,22 +114,22 @@ in { ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = name; description = "User account under which MPD runs."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = name; description = "Group account under which MPD runs."; }; network = { - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; example = "any"; description = '' @@ -141,8 +138,8 @@ in { ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 6600; description = '' This setting is the TCP port that is desired for the daemon to get assigned @@ -152,33 +149,33 @@ in { }; - dbFile = mkOption { - type = types.nullOr types.str; + dbFile = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = "${cfg.dataDir}/tag_cache"; - defaultText = literalExpression ''"''${dataDir}/tag_cache"''; + defaultText = lib.literalExpression ''"''${dataDir}/tag_cache"''; description = '' The path to MPD's database. If set to `null` the parameter is omitted from the configuration. ''; }; - credentials = mkOption { - type = types.listOf (types.submodule { + credentials = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - passwordFile = mkOption { - type = types.path; + passwordFile = lib.mkOption { + type = lib.types.path; description = '' Path to file containing the password. ''; }; permissions = let perms = ["read" "add" "control" "admin"]; - in mkOption { - type = types.listOf (types.enum perms); + in lib.mkOption { + type = lib.types.listOf (lib.types.enum perms); default = [ "read" ]; description = '' List of permissions that are granted with this password. - Permissions can be "${concatStringsSep "\", \"" perms}". + Permissions can be "${lib.concatStringsSep "\", \"" perms}". ''; }; }; @@ -193,8 +190,8 @@ in { ]; }; - fluidsynth = mkOption { - type = types.bool; + fluidsynth = lib.mkOption { + type = lib.types.bool; default = false; description = '' If set, add fluidsynth soundfont and configure the plugin. @@ -207,31 +204,31 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # install mpd units systemd.packages = [ pkgs.mpd ]; - systemd.sockets.mpd = mkIf cfg.startWhenNeeded { + systemd.sockets.mpd = lib.mkIf cfg.startWhenNeeded { wantedBy = [ "sockets.target" ]; listenStreams = [ "" # Note: this is needed to override the upstream unit (if pkgs.lib.hasPrefix "/" cfg.network.listenAddress then cfg.network.listenAddress - else "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}") + else "${lib.optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}") ]; }; systemd.services.mpd = { - wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target"; + wantedBy = lib.optional (!cfg.startWhenNeeded) "multi-user.target"; preStart = '' set -euo pipefail install -m 600 ${mpdConf} /run/mpd/mpd.conf - '' + optionalString (cfg.credentials != []) - (concatStringsSep "\n" - (imap0 + '' + lib.optionalString (cfg.credentials != []) + (lib.concatStringsSep "\n" + (lib.imap0 (i: c: ''${pkgs.replace-secret}/bin/replace-secret '{{password-${toString i}}}' '${c.passwordFile}' /run/mpd/mpd.conf'') cfg.credentials)); @@ -242,13 +239,13 @@ in { ExecStart = [ "" "${pkgs.mpd}/bin/mpd --systemd /run/mpd/mpd.conf" ]; RuntimeDirectory = "mpd"; StateDirectory = [] - ++ optionals (cfg.dataDir == "/var/lib/${name}") [ name ] - ++ optionals (cfg.playlistDirectory == "/var/lib/${name}/playlists") [ name "${name}/playlists" ] - ++ optionals (cfg.musicDirectory == "/var/lib/${name}/music") [ name "${name}/music" ]; + ++ lib.optionals (cfg.dataDir == "/var/lib/${name}") [ name ] + ++ lib.optionals (cfg.playlistDirectory == "/var/lib/${name}/playlists") [ name "${name}/playlists" ] + ++ lib.optionals (cfg.musicDirectory == "/var/lib/${name}/music") [ name "${name}/music" ]; }; }; - users.users = optionalAttrs (cfg.user == name) { + users.users = lib.optionalAttrs (cfg.user == name) { ${name} = { inherit uid; group = cfg.group; @@ -258,7 +255,7 @@ in { }; }; - users.groups = optionalAttrs (cfg.group == name) { + users.groups = lib.optionalAttrs (cfg.group == name) { ${name}.gid = gid; }; }; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 0d157afd51a0..67b15b520f59 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -5,6 +5,11 @@ let cfg = config.power.ups; defaultPort = 3493; + envVars = { + NUT_CONFPATH = "/etc/nut"; + NUT_STATEPATH = "/var/lib/nut"; + }; + nutFormat = { type = with lib.types; let @@ -493,7 +498,9 @@ in }) ]; + # For interactive use. environment.systemPackages = [ pkgs.nut ]; + environment.variables = envVars; networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = @@ -517,8 +524,7 @@ in ExecReload = "${pkgs.nut}/sbin/upsmon -c reload"; LoadCredential = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}:${monitor.passwordFile}") cfg.upsmon.monitor; }; - environment.NUT_CONFPATH = "/etc/nut"; - environment.NUT_STATEPATH = "/var/lib/nut"; + environment = envVars; }; systemd.services.upsd = let @@ -537,8 +543,7 @@ in ExecReload = "${pkgs.nut}/sbin/upsd -c reload"; LoadCredential = lib.mapAttrsToList (name: user: "upsdusers_password_${name}:${user.passwordFile}") cfg.users; }; - environment.NUT_CONFPATH = "/etc/nut"; - environment.NUT_STATEPATH = "/var/lib/nut"; + environment = envVars; restartTriggers = [ config.environment.etc."nut/upsd.conf".source ]; @@ -555,8 +560,7 @@ in # TODO: replace 'root' by another username. ExecStart = "${pkgs.nut}/bin/upsdrvctl -u root start"; }; - environment.NUT_CONFPATH = "/etc/nut"; - environment.NUT_STATEPATH = "/var/lib/nut"; + environment = envVars; restartTriggers = [ config.environment.etc."nut/ups.conf".source ]; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index b068f2227310..e13d574c0d73 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -45,20 +45,11 @@ let "update_config=1" ]) ++ [ "pmf=1" ] + ++ optional (cfg.secretsFile != null) + "ext_password_backend=file:${cfg.secretsFile}" ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' ++ optional (cfg.extraConfig != "") cfg.extraConfig); - configIsGenerated = with cfg; - networks != {} || extraConfig != "" || userControlled.enable; - - # the original configuration file - configFile = - if configIsGenerated - then pkgs.writeText "wpa_supplicant.conf" generatedConfig - else "/etc/wpa_supplicant.conf"; - # the config file with environment variables replaced - finalConfig = ''"$RUNTIME_DIRECTORY"/wpa_supplicant.conf''; - # Creates a network block for wpa_supplicant.conf mkNetwork = opts: let @@ -90,8 +81,8 @@ let let deviceUnit = optional (iface != null) "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device"; configStr = if cfg.allowAuxiliaryImperativeNetworks - then "-c /etc/wpa_supplicant.conf -I ${finalConfig}" - else "-c ${finalConfig}"; + then "-c /etc/wpa_supplicant.conf -I ${pkgs.writeText "wpa_supplicant.conf" generatedConfig}" + else "-c /etc/wpa_supplicant.conf"; in { description = "WPA Supplicant instance" + optionalString (iface != null) " for interface ${iface}"; @@ -109,37 +100,14 @@ let serviceConfig.UMask = "066"; serviceConfig.RuntimeDirectory = "wpa_supplicant"; serviceConfig.RuntimeDirectoryMode = "700"; - serviceConfig.EnvironmentFile = mkIf (cfg.environmentFile != null) - (builtins.toString cfg.environmentFile); script = '' - ${optionalString (configIsGenerated && !cfg.allowAuxiliaryImperativeNetworks) '' - if [ -f /etc/wpa_supplicant.conf ]; then - echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." - fi - ''} - # ensure wpa_supplicant.conf exists, or the daemon will fail to start ${optionalString cfg.allowAuxiliaryImperativeNetworks '' touch /etc/wpa_supplicant.conf ''} - # substitute environment variables - if [ -f "${configFile}" ]; then - ${pkgs.gawk}/bin/awk '{ - for(varname in ENVIRON) { - find = "@"varname"@" - repl = ENVIRON[varname] - if (i = index($0, find)) - $0 = substr($0, 1, i-1) repl substr($0, i+length(find)) - } - print - }' "${configFile}" > ${finalConfig} - else - touch ${finalConfig} - fi - iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}" ${if iface == null then '' @@ -231,36 +199,34 @@ in { ''; }; - environmentFile = mkOption { + secretsFile = mkOption { type = types.nullOr types.path; default = null; - example = "/run/secrets/wireless.env"; + example = "/run/secrets/wireless.conf"; description = '' File consisting of lines of the form `varname=value` to define variables for the wireless configuration. - See section "EnvironmentFile=" in {manpage}`systemd.exec(5)` for a syntax reference. - Secrets (PSKs, passwords, etc.) can be provided without adding them to - the world-readable Nix store by defining them in the environment file and - referring to them in option {option}`networking.wireless.networks` - with the syntax `@varname@`. Example: + the world-readable Nix store by defining them in the secrets file and + referring to them in option [](#opt-networking.wireless.networks) + with the syntax `ext:secretname`. Example: ``` - # content of /run/secrets/wireless.env - PSK_HOME=mypassword - PASS_WORK=myworkpassword - ``` + # content of /run/secrets/wireless.conf + psk_home=mypassword + psk_other=6a381cea59c7a2d6b30736ba0e6f397f7564a044bcdb7a327a1d16a1ed91b327 + pass_work=myworkpassword - ``` # wireless-related configuration - networking.wireless.environmentFile = "/run/secrets/wireless.env"; + networking.wireless.secretsFile = "/run/secrets/wireless.conf"; networking.wireless.networks = { - home.psk = "@PSK_HOME@"; + home.pskRaw = "ext:psk_home"; + other.pskRaw = "ext:psk_other"; work.auth = ''' eap=PEAP identity="my-user@example.com" - password="@PASS_WORK@" + password=ext:pass_work '''; }; ``` @@ -271,15 +237,16 @@ in { type = types.attrsOf (types.submodule { options = { psk = mkOption { - type = types.nullOr types.str; + type = types.nullOr (types.strMatching "[[:print:]]{8,63}"); default = null; description = '' The network's pre-shared key in plaintext defaulting to being a network without any authentication. ::: {.warning} - Be aware that this will be written to the nix store - in plaintext! Use an environment variable instead. + Be aware that this will be written to the Nix store + in plaintext! Use {var}`pskRaw` with an external + reference to keep it safe. ::: ::: {.note} @@ -289,19 +256,28 @@ in { }; pskRaw = mkOption { - type = types.nullOr types.str; + type = types.nullOr + (types.strMatching "([[:xdigit:]]{64})|(ext:[^=]+)"); default = null; + example = "ext:name_of_the_secret_here"; description = '' - The network's pre-shared key in hex defaulting - to being a network without any authentication. + Either the raw pre-shared key in hexadecimal format + or the name of the secret (as defined inside + [](#opt-networking.wireless.secretsFile) and prefixed + with `ext:`) containing the network pre-shared key. ::: {.warning} - Be aware that this will be written to the nix store - in plaintext! Use an environment variable instead. + Be aware that this will be written to the Nix store + in plaintext! Always use an external reference. ::: ::: {.note} - Mutually exclusive with {var}`psk`. + The external secret can be either the plaintext + passphrase or the raw pre-shared key. + ::: + + ::: {.note} + Mutually exclusive with {var}`psk` and {var}`auth`. ::: ''; }; @@ -354,22 +330,21 @@ in { example = '' eap=PEAP identity="user@example.com" - password="@EXAMPLE_PASSWORD@" + password=ext:example_password ''; description = '' - Use this option to configure advanced authentication methods like EAP. - See - {manpage}`wpa_supplicant.conf(5)` - for example configurations. + Use this option to configure advanced authentication methods + like EAP. See {manpage}`wpa_supplicant.conf(5)` for example + configurations. ::: {.warning} - Be aware that this will be written to the nix store - in plaintext! Use an environment variable for secrets. + Be aware that this will be written to the Nix store + in plaintext! Use an external reference like + `ext:secretname` for secrets. ::: ::: {.note} - Mutually exclusive with {var}`psk` and - {var}`pskRaw`. + Mutually exclusive with {var}`psk` and {var}`pskRaw`. ::: ''; }; @@ -393,13 +368,14 @@ in { type = types.nullOr types.int; default = null; description = '' - By default, all networks will get same priority group (0). If some of the - networks are more desirable, this field can be used to change the order in - which wpa_supplicant goes through the networks when selecting a BSS. The - priority groups will be iterated in decreasing priority (i.e., the larger the - priority value, the sooner the network is matched against the scan results). - Within each priority group, networks will be selected based on security - policy, signal strength, etc. + By default, all networks will get same priority group (0). If + some of the networks are more desirable, this field can be used + to change the order in which wpa_supplicant goes through the + networks when selecting a BSS. The priority groups will be + iterated in decreasing priority (i.e., the larger the priority + value, the sooner the network is matched against the scan + results). Within each priority group, networks will be selected + based on security policy, signal strength, etc. ''; }; @@ -411,9 +387,7 @@ in { ''; description = '' Extra configuration lines appended to the network block. - See - {manpage}`wpa_supplicant.conf(5)` - for available options. + See {manpage}`wpa_supplicant.conf(5)` for available options. ''; }; @@ -432,7 +406,7 @@ in { }; echelon = { # safe version of the above: read PSK from the - psk = "@PSK_ECHELON@"; # variable PSK_ECHELON, defined in environmentFile, + pskRaw = "ext:psk_echelon"; # variable psk_echelon, defined in secretsFile, }; # this won't leak into /nix/store "echelon's AP" = { # SSID with spaces and/or special characters @@ -493,6 +467,31 @@ in { }; }; + imports = [ + (mkRemovedOptionModule [ "networking" "wireless" "environmentFile" ] + '' + Secrets are now handled by the `networking.wireless.secretsFile` and + `networking.wireless.networks..pskRaw` options. + The change is motivated by a mechanism recently added by wpa_supplicant + itself to separate secrets from configuration, making the previous + method obsolete. + + The syntax of the `secretsFile` is the same as before, except the + values are interpreted literally, unlike environment variables. + To update, remove quotes or character escapes, if necessary, and + apply the following changes to your configuration: + { + home.psk = "@psk_home@"; → home.pskRaw = "ext:psk_home"; + other.pskRaw = "@psk_other@"; → other.pskRaw = "ext:psk_other"; + work.auth = ''' + eap=PEAP + identity="my-user@example.com" + password=@pass_work@ → password=ext:pass_work + '''; + } + '') + ]; + config = mkIf cfg.enable { assertions = flip mapAttrsToList cfg.networks (name: cfg: { assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1; @@ -517,6 +516,9 @@ in { hardware.wirelessRegulatoryDatabase = true; + environment.etc."wpa_supplicant.conf" = + lib.mkIf (!cfg.allowAuxiliaryImperativeNetworks) { text = generatedConfig; }; + environment.systemPackages = [ pkgs.wpa_supplicant ]; services.dbus.packages = optional cfg.dbusControlled pkgs.wpa_supplicant; diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix index d73bd2646c80..07e8be34266e 100644 --- a/nixos/modules/services/system/userborn.nix +++ b/nixos/modules/services/system/userborn.nix @@ -97,14 +97,14 @@ in # home. tmpfiles.settings.home-directories = lib.mapAttrs' ( username: opts: - lib.nameValuePair opts.home { + lib.nameValuePair (toString opts.home) { d = { mode = opts.homeMode; user = username; inherit (opts) group; }; } - ) (lib.filterAttrs (_username: opts: opts.home != "/var/empty") userCfg.users); + ) (lib.filterAttrs (_username: opts: opts.createHome && opts.home != "/var/empty") userCfg.users); services.userborn = { wantedBy = [ "sysinit.target" ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b537674798c6..6c9ff9fb9c20 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1101,7 +1101,7 @@ in { without-nix = handleTest ./without-nix.nix {}; wmderland = handleTest ./wmderland.nix {}; workout-tracker = handleTest ./workout-tracker.nix {}; - wpa_supplicant = handleTest ./wpa_supplicant.nix {}; + wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; }; wordpress = handleTest ./wordpress.nix {}; wrappers = handleTest ./wrappers.nix {}; writefreely = handleTest ./web-apps/writefreely.nix {}; diff --git a/nixos/tests/swayfx.nix b/nixos/tests/swayfx.nix index 77844ec80ae1..fe1caf8fffa8 100644 --- a/nixos/tests/swayfx.nix +++ b/nixos/tests/swayfx.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ( { name = "swayfx"; meta = { - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; }; # testScriptWithTypes:49: error: Cannot call function of unknown type diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix index 5e3b39f27ecf..71b9ba358fa1 100644 --- a/nixos/tests/wpa_supplicant.nix +++ b/nixos/tests/wpa_supplicant.nix @@ -1,17 +1,18 @@ -import ./make-test-python.nix ({ pkgs, lib, ...}: -{ - name = "wpa_supplicant"; +{ pkgs, runTest }: + +let + + inherit (pkgs) lib; + meta = with lib.maintainers; { maintainers = [ oddlama rnhmjoj ]; }; - nodes = let - machineWithHostapd = extraConfigModule: { ... }: { - imports = [ - ../modules/profiles/minimal.nix - extraConfigModule - ]; + runConnectionTest = name: extraConfig: runTest { + name = "wpa_supplicant-${name}"; + inherit meta; + nodes.machine = { # add a virtual wlan interface boot.kernelModules = [ "mac80211_hwsim" ]; @@ -53,27 +54,49 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: }; # wireless client - networking.wireless = { - # the override is needed because the wifi is - # disabled with mkVMOverride in qemu-vm.nix. - enable = lib.mkOverride 0 true; - userControlled.enable = true; - interfaces = [ "wlan1" ]; - fallbackToWPA2 = lib.mkDefault true; + networking.wireless = lib.mkMerge [ + { + # the override is needed because the wifi is + # disabled with mkVMOverride in qemu-vm.nix. + enable = lib.mkOverride 0 true; + userControlled.enable = true; + interfaces = [ "wlan1" ]; + fallbackToWPA2 = lib.mkDefault true; - # networks will be added on-demand below for the specific - # network that should be tested - - # secrets - environmentFile = pkgs.writeText "wpa-secrets" '' - PSK_NIXOS_TEST="reproducibility" - ''; - }; + # secrets + secretsFile = pkgs.writeText "wpa-secrets" '' + psk_nixos_test=reproducibility + ''; + } + extraConfig + ]; }; - in { - basic = { ... }: { - imports = [ ../modules/profiles/minimal.nix ]; + testScript = '' + # save hostapd config file for manual inspection + machine.wait_for_unit("hostapd.service") + machine.copy_from_vm("/run/hostapd/wlan0.hostapd.conf") + + with subtest("Daemon can connect to the access point"): + machine.wait_for_unit("wpa_supplicant-wlan1.service") + machine.wait_until_succeeds( + "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" + ) + ''; + }; + +in + +{ + # Test the basic setup: + # - automatic interface discovery + # - WPA2 fallbacks + # - connecting to the daemon + basic = runTest { + name = "wpa_supplicant-basic"; + inherit meta; + + nodes.machine = { # add a virtual wlan interface boot.kernelModules = [ "mac80211_hwsim" ]; @@ -83,7 +106,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: # disabled with mkVMOverride in qemu-vm.nix. enable = lib.mkOverride 0 true; userControlled.enable = true; - interfaces = [ "wlan1" ]; fallbackToWPA2 = true; networks = { @@ -96,28 +118,34 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: psk = "password"; authProtocols = [ "SAE" ]; }; - - # secrets substitution test cases - test1.psk = "@PSK_VALID@"; # should be replaced - test2.psk = "@PSK_SPECIAL@"; # should be replaced - test3.psk = "@PSK_MISSING@"; # should not be replaced - test4.psk = "P@ssowrdWithSome@tSymbol"; # should not be replaced - test5.psk = "@PSK_AWK_REGEX@"; # should be replaced }; - - # secrets - environmentFile = pkgs.writeText "wpa-secrets" '' - PSK_VALID="S0m3BadP4ssw0rd"; - # taken from https://github.com/minimaxir/big-list-of-naughty-strings - PSK_SPECIAL=",./;'[]\/\-= <>?:\"{}|_+ !@#$%^&*()`~"; - PSK_AWK_REGEX="PassowrdWith&symbol"; - ''; }; }; - imperative = { ... }: { - imports = [ ../modules/profiles/minimal.nix ]; + testScript = '' + config_file = "/etc/static/wpa_supplicant.conf" + with subtest("Daemon is running and accepting connections"): + machine.wait_for_unit("wpa_supplicant.service") + status = machine.wait_until_succeeds("wpa_cli status") + assert "Failed to connect" not in status, \ + "Failed to connect to the daemon" + + with subtest("WPA2 fallbacks have been generated"): + assert int(machine.succeed(f"grep -c sae-only {config_file}")) == 1 + assert int(machine.succeed(f"grep -c mixed-wpa {config_file}")) == 2 + + # save file for manual inspection + machine.copy_from_vm(config_file) + ''; + }; + + # Test configuring the daemon imperatively + imperative = runTest { + name = "wpa_supplicant-imperative"; + inherit meta; + + nodes.machine = { # add a virtual wlan interface boot.kernelModules = [ "mac80211_hwsim" ]; @@ -130,108 +158,55 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: }; }; - # Test connecting to the SAE-only hotspot using SAE - machineSae = machineWithHostapd { - networking.wireless = { - fallbackToWPA2 = false; - networks.nixos-test-sae = { - psk = "@PSK_NIXOS_TEST@"; - authProtocols = [ "SAE" ]; - }; - }; - }; - - # Test connecting to the SAE and WPA2 mixed hotspot using SAE - machineMixedUsingSae = machineWithHostapd { - networking.wireless = { - fallbackToWPA2 = false; - networks.nixos-test-mixed = { - psk = "@PSK_NIXOS_TEST@"; - authProtocols = [ "SAE" ]; - }; - }; - }; - - # Test connecting to the SAE and WPA2 mixed hotspot using WPA2 - machineMixedUsingWpa2 = machineWithHostapd { - networking.wireless = { - fallbackToWPA2 = true; - networks.nixos-test-mixed = { - psk = "@PSK_NIXOS_TEST@"; - authProtocols = [ "WPA-PSK-SHA256" ]; - }; - }; - }; - - # Test connecting to the WPA2 legacy hotspot using WPA2 - machineWpa2 = machineWithHostapd { - networking.wireless = { - fallbackToWPA2 = true; - networks.nixos-test-wpa2 = { - psk = "@PSK_NIXOS_TEST@"; - authProtocols = [ "WPA-PSK-SHA256" ]; - }; - }; - }; - }; - - testScript = - '' - config_file = "/run/wpa_supplicant/wpa_supplicant.conf" - - with subtest("Configuration file is inaccessible to other users"): - basic.wait_for_file(config_file) - basic.fail(f"sudo -u nobody ls {config_file}") - - with subtest("Secrets variables have been substituted"): - basic.fail(f"grep -q @PSK_VALID@ {config_file}") - basic.fail(f"grep -q @PSK_SPECIAL@ {config_file}") - basic.succeed(f"grep -q @PSK_MISSING@ {config_file}") - basic.succeed(f"grep -q P@ssowrdWithSome@tSymbol {config_file}") - basic.succeed(f"grep -q 'PassowrdWith&symbol' {config_file}") - - with subtest("WPA2 fallbacks have been generated"): - assert int(basic.succeed(f"grep -c sae-only {config_file}")) == 1 - assert int(basic.succeed(f"grep -c mixed-wpa {config_file}")) == 2 - - # save file for manual inspection - basic.copy_from_vm(config_file) - + testScript = '' with subtest("Daemon is running and accepting connections"): - basic.wait_for_unit("wpa_supplicant-wlan1.service") - status = basic.succeed("wpa_cli -i wlan1 status") + machine.wait_for_unit("wpa_supplicant-wlan1.service") + status = machine.wait_until_succeeds("wpa_cli -i wlan1 status") assert "Failed to connect" not in status, \ "Failed to connect to the daemon" with subtest("Daemon can be configured imperatively"): - imperative.wait_for_unit("wpa_supplicant-wlan1.service") - imperative.wait_until_succeeds("wpa_cli -i wlan1 status") - imperative.succeed("wpa_cli -i wlan1 add_network") - imperative.succeed("wpa_cli -i wlan1 set_network 0 ssid '\"nixos-test\"'") - imperative.succeed("wpa_cli -i wlan1 set_network 0 psk '\"reproducibility\"'") - imperative.succeed("wpa_cli -i wlan1 save_config") - imperative.succeed("grep -q nixos-test /etc/wpa_supplicant.conf") - - machineSae.wait_for_unit("hostapd.service") - machineSae.copy_from_vm("/run/hostapd/wlan0.hostapd.conf") - with subtest("Daemon can connect to the SAE access point using SAE"): - machineSae.wait_until_succeeds( - "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" - ) - - with subtest("Daemon can connect to the SAE and WPA2 mixed access point using SAE"): - machineMixedUsingSae.wait_until_succeeds( - "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" - ) - - with subtest("Daemon can connect to the SAE and WPA2 mixed access point using WPA2"): - machineMixedUsingWpa2.wait_until_succeeds( - "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" - ) - - with subtest("Daemon can connect to the WPA2 access point using WPA2"): - machineWpa2.wait_until_succeeds( - "wpa_cli -i wlan1 status | grep -q wpa_state=COMPLETED" - ) + machine.succeed("wpa_cli -i wlan1 add_network") + machine.succeed("wpa_cli -i wlan1 set_network 0 ssid '\"nixos-test\"'") + machine.succeed("wpa_cli -i wlan1 set_network 0 psk '\"reproducibility\"'") + machine.succeed("wpa_cli -i wlan1 save_config") + machine.succeed("grep -q nixos-test /etc/wpa_supplicant.conf") ''; -}) + }; + + # Test connecting to a SAE-only hotspot using SAE + saeOnly = runConnectionTest "sae-only" { + fallbackToWPA2 = false; + networks.nixos-test-sae = { + pskRaw = "ext:psk_nixos_test"; + authProtocols = [ "SAE" ]; + }; + }; + + # Test connecting to a mixed SAE/WPA2 hotspot using SAE + mixedUsingSae = runConnectionTest "mixed-using-sae" { + fallbackToWPA2 = false; + networks.nixos-test-mixed = { + pskRaw = "ext:psk_nixos_test"; + authProtocols = [ "SAE" ]; + }; + }; + + # Test connecting to a mixed SAE/WPA2 hotspot using WPA2 + mixedUsingWpa2 = runConnectionTest "mixed-using-wpa2" { + fallbackToWPA2 = true; + networks.nixos-test-mixed = { + pskRaw = "ext:psk_nixos_test"; + authProtocols = [ "WPA-PSK-SHA256" ]; + }; + }; + + # Test connecting to a legacy WPA2-only hotspot using WPA2 + legacy = runConnectionTest "legacy" { + fallbackToWPA2 = true; + networks.nixos-test-wpa2 = { + pskRaw = "ext:psk_nixos_test"; + authProtocols = [ "WPA-PSK-SHA256" ]; + }; + }; +} diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index eef3c083b5a1..e937cd6ea779 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -22,15 +22,21 @@ let in mkDerivation rec { pname = "sayonara"; - version = "1.7.0-stable3"; + version = "1.10.0-stable1"; src = fetchFromGitLab { owner = "luciocarreras"; repo = "sayonara-player"; rev = version; - hash = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw="; + hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI="; }; + # error: no matching function for call to 'max' + postPatch = '' + substituteInPlace src/Components/Playlist/PlaylistModifiers.cpp \ + --replace-fail "std::max" "std::max" + ''; + nativeBuildInputs = [ cmake ninja pkg-config qttools ]; buildInputs = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index fdd699a5d783..3b5dd1c2912b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -551,6 +551,13 @@ let ''; }); + units-mode = super.units-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace units-mode.el \ + --replace-fail 'units-binary-path "units"' 'units-binary-path "${lib.getExe pkgs.units}"' + ''; + }); + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b76efb103edb..e32282400902 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.18.10"; - hash = "sha256-0Bb1DFuVjpAaMGK6o8+yIprVZgEf64itSh87H3jL7R8="; + version = "1.18.11"; + hash = "sha256-j1igEItS4TT1WxSxK3tFG29McTTo8ojEs6TJShGZiGI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 5d56759f0861..cd2e10055d06 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2024.5.11021008"; - hash = "sha256-UnI0leRKqCtFLBdGS/UvLuCcxQhibyY0ChmzQ9uytoY="; + version = "2024.15.2024091001"; + hash = "sha256-CtPOLKaTIp4uMIaGVo3h6XxP/BYilgU6GBSA5wZMW8o="; }; buildInputs = [ icu ]; diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 69706dcfd720..2c73ab48ad71 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -35,7 +35,7 @@ vulkanSupport ? false, sdlSupport ? false, usbSupport ? false, - mingwSupport ? false, + mingwSupport ? stdenv.isDarwin, waylandSupport ? false, x11Support ? false, embedInstallers ? false, # The Mono and Gecko MSI installers diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 43e1b73cf87a..62936d950521 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.23"; + version = "13.24"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-GC1Csxhr2uh9oLgC+mFxJZiwCO7TMI2ljv6GMdEiuZQ="; + hash = "sha256-qdfNW29SvY0dQy4rS4IDVuYL3h6BByluCecsNSgHbn8="; }; buildInputs = [ diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix deleted file mode 100644 index ce6cbc2a3b76..000000000000 --- a/pkgs/applications/misc/merkaartor/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, gdal -, proj -, qtsvg -, qtwebengine -, withGeoimage ? true, exiv2 -, withGpsdlib ? (!stdenv.isDarwin), gpsd -, withLibproxy ? false, libproxy -, withZbar ? false, zbar -}: - -stdenv.mkDerivation rec { - pname = "merkaartor"; - version = "0.19.0"; - - src = fetchFromGitHub { - owner = "openstreetmap"; - repo = "merkaartor"; - rev = version; - hash = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ="; - }; - - patches = [ - (fetchpatch { - name = "exiv2-0.28.patch"; - url = "https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd.patch"; - hash = "sha256-aHjJLKYvqz7V0QwUIg0SbentBe+DaCJusVqy4xRBVWo="; - }) - # https://github.com/openstreetmap/merkaartor/pull/290 - (fetchpatch { - url = "https://github.com/openstreetmap/merkaartor/commit/7dede77370d89e8e7586f6ed5af225f9b5bde6cf.patch"; - hash = "sha256-3oDRPysVNvA50t/b9xOcVQgac3U1lDPrencanl4c6Zk="; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; - - buildInputs = [ gdal proj qtsvg qtwebengine ] - ++ lib.optional withGeoimage exiv2 - ++ lib.optional withGpsdlib gpsd - ++ lib.optional withLibproxy libproxy - ++ lib.optional withZbar zbar; - - cmakeFlags = [ - (lib.cmakeBool "GEOIMAGE" withGeoimage) - (lib.cmakeBool "GPSD" withGpsdlib) - (lib.cmakeBool "LIBPROXY" withLibproxy) - (lib.cmakeBool "WEBENGINE" true) - (lib.cmakeBool "ZBAR" withZbar) - ]; - - postInstall = '' - # Binary is looking for .qm files in share/merkaartor - mv $out/share/merkaartor/{translations/*.qm,} - rm -r $out/share/merkaartor/translations - '' + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/{Applications,bin} - mv $out/merkaartor.app $out/Applications - # Prevent wrapping, otherwise plugins will not be loaded - chmod -x $out/Applications/merkaartor.app/Contents/plugins/background/*.dylib - makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor - ''; - - meta = with lib; { - description = "OpenStreetMap editor"; - homepage = "http://merkaartor.be/"; - license = licenses.gpl2Plus; - mainProgram = "merkaartor"; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index da1f2dc629d2..a727bdac62ba 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { mainProgram = "openbangla-gui"; homepage = "https://openbangla.github.io/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ eclairevoyant hqurve ]; + maintainers = with lib.maintainers; [ hqurve ]; platforms = lib.platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.isLinux && stdenv.isAarch64; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 12ce2374eb6a..41a21e8f49ed 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -146,7 +146,7 @@ rec { + lib.removePrefix "Redshift" redshift.meta.longDescription; homepage = "https://gitlab.com/chinstrap/gammastep"; mainProgram = "gammastep"; - maintainers = (with lib.maintainers; [ eclairevoyant primeos ]) ++ redshift.meta.maintainers; + maintainers = (with lib.maintainers; [ primeos ]) ++ redshift.meta.maintainers; }; }; } diff --git a/pkgs/applications/misc/sunwait/default.nix b/pkgs/applications/misc/sunwait/default.nix index f824011f1b86..2f369c1eb9ce 100644 --- a/pkgs/applications/misc/sunwait/default.nix +++ b/pkgs/applications/misc/sunwait/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights"; homepage = "https://github.com/risacher/sunwait"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "sunwait"; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 504aa3377e33..575b93651312 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,8 +1,8 @@ { - "packageVersion": "130.0-1", + "packageVersion": "130.0-3", "source": { - "rev": "130.0-1", - "sha256": "1ynw6hzyvyv02a1y838w4jkq0a8yg95c0zs7q0bdxca5grw154qi" + "rev": "130.0-3", + "sha256": "0ah6k4637fg3v3l13rk6bw6wxsx0mc41hvi9sld5psbl8l2kyk29" }, "firefox": { "version": "130.0", diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index d9ccd5d5148f..54d7adb9bfb7 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.5.0"; + version = "2.5.11"; src = fetchFromGitHub { - owner = "kubefirst"; + owner = "konstructio"; repo = "kubefirst"; rev = "refs/tags/v${version}"; - hash = "sha256-1VadsiZZii6gI8vdTNfwmbBPuHcgPh4kWZ2jf/EkFKU="; + hash = "sha256-paGb/Ifslj2XsXhY99ETXs72s3vSXAUqTeGPg+Nviho="; }; vendorHash = "sha256-tOCVDp9oClfeBsyZ6gv6HoGPjZByoxxAceV/wxQeBSA="; @@ -19,7 +19,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/kubefirst/runtime/configs.K1Version=v${version}" + "-X=github.com/konstructio/kubefirst-api/configs.K1Version=v${version}" ]; doCheck = false; @@ -27,8 +27,8 @@ buildGoModule rec { meta = with lib; { description = "Tool to create instant GitOps platforms that integrate some of the best tools in cloud native from scratch"; mainProgram = "kubefirst"; - homepage = "https://github.com/kubefirst/kubefirst/"; - changelog = "https://github.com/kubefirst/kubefirst/releases/tag/v${version}"; + homepage = "https://github.com/konstructio/kubefirst/"; + changelog = "https://github.com/konstructio/kubefirst/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ qjoly ]; }; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index af9c96c6c5eb..7d27205855c4 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-z83c8Ji0zSM1QDwjB4FwhHW6XCqG0Hb5crM3jjK46jk="; + hash = "sha256-GHFs8QvLcXu+DZ851TCLI7EVc9wMS5fRC4TYBXzyv3Q="; }; - vendorHash = "sha256-KqWmwwQRrWoyRehuSJBnlyPQgwk5hUGk2/d0Ue/reVc="; + vendorHash = "sha256-5LRsT04T/CKv+YHaiM2g6giimWWXyzPju3iZuj2DfAY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index f66f0262242b..10e133ac4cab 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { description = "Command line client for the dropbox daemon"; license = lib.licenses.gpl3Plus; mainProgram = "dropbox"; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3026fd84e9f4..87bd8fce2e49 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -82,7 +82,7 @@ buildFHSEnv { description = "Online stored folders (daemon version)"; homepage = "http://www.dropbox.com/"; license = licenses.unfree; - maintainers = with maintainers; [ eclairevoyant ttuegel ]; + maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; mainProgram = "dropbox"; }; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 2b60e2ae6b84..49df94819656 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -264,7 +264,6 @@ stdenv.mkDerivation rec { lib.licenses.free ]; maintainers = with lib.maintainers; [ - eclairevoyant mic92 equirosa urandom diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 5767efab733c..3b31f069b0e4 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "apr24a"; - version = "20240401_a"; + srcVersion = "sep24a"; + version = "20240901_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-Eq6S5S8xrhkCo6O2wUaHnoMDVG9WeiSurGvOc+2JKbM="; + sha256 = "sha256-dZ03J3I1dgoSgSc9yGfO13ZvNawCSYKN3+SGvp1eyGA="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 1e0ab925c832..717a410eae80 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.29.0"; + version = "3.29.2"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-QEZF6bCNAXvGTC1KUMRyhIfgUBh4wjgfuoiBEG7jKFE="; + hash = "sha256-C3AQ5HHsD2JfF/BO+t3Rbx1DQwRXMG41i2wsk/9BkF8="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index 12b52ec042b8..892c856bc867 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "16.0.0"; + version = "16.1.1"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-aSnUJLoHq5byILuiNRrguawfBzL5as7u7ekAbuAmUgM="; + hash = "sha256-H4FtFSI/c7UxRLZB8kz873DIN6kLUwmRZtz3+4zaR7w="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index f1536e8c54b2..13ff1b70f297 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, python3Packages +, python311Packages , fetchFromGitHub , fetchurl , cargo @@ -83,7 +83,7 @@ let substituteInPlace build-tar.py \ --replace-fail 'run(yarn + ["--cwd", src_join(), "install", "--prefer-offline"])' 'pass' - ${python3Packages.python}/bin/python3 build-tar.py \ + ${python311Packages.python}/bin/python3 build-tar.py \ --output isl-dist.tar.xz \ --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' @@ -101,7 +101,7 @@ let }; in # Builds the main `sl` binary and its Python extensions -python3Packages.buildPythonApplication { +python311Packages.buildPythonApplication { pname = "sapling"; inherit src version; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 204f0e1311fa..cff0c5560e24 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -201,7 +201,7 @@ stdenv.mkDerivation (finalAttrs: { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ]; + maintainers = with maintainers; [ jb55 materus fpletz ]; license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 9394e2708d89..a7e19dec98a1 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation { description = "Darktable fork minus the bloat plus some design vision"; homepage = "https://ansel.photos/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "ansel"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 66ad50e47dfe..624beb87fe33 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { description = "Wayland-native, highly customizable runner"; homepage = "https://github.com/kirottu/anyrun"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ eclairevoyant NotAShelf ]; + maintainers = with lib.maintainers; [ NotAShelf ]; mainProgram = "anyrun"; }; } diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 87b1544859e6..8c3482676d3f 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -11,13 +11,13 @@ }: let - version = "1.17.3"; + version = "1.17.4"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-cnhtge0ueveo70cYDpb/+ss5osHbO1Yyv74NrYBYZOM="; + hash = "sha256-7lJUyn7UAY+wdbPXcLFz54m2Jl90EMZ6ieSPWysMoWE="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -47,7 +47,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-w6SurZ4EG2QW7paZsWxu0gNXMXxnzQygClOUdLeBKdw="; + npmDepsHash = "sha256-hd85cCpxx0vqtUXDUorHK8I9IbGZiwewI/RxKF/9ZNw="; dontNpmBuild = true; # Uncomment this flag when using unreleased peer dependencies # npmFlags = [ "--legacy-peer-deps" ]; @@ -94,7 +94,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-y7arZsXjJ0LdWpXdSZjc7EBJPN/oWAje4uQDEhkRbDM="; + npmDepsHash = "sha256-UKxFWhgarMdT24rFU5Ev+JoKbT6ByLnZ1CTKd34YrRE="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix index 6ab0b4aaff79..4d578abdd941 100644 --- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix +++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform }: -let version = "2.4.0"; +let version = "2.5.0"; in rustPlatform.buildRustPackage { pname = "catppuccin-whiskers"; inherit version; @@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage { owner = "catppuccin"; repo = "whiskers"; rev = "refs/tags/v${version}"; - hash = "sha256-rbPr5eSs99nS70J785SWO7tVBdiX/S7XUNHuo3aOQU4="; + hash = "sha256-HsHBMJPSoDhSNwjAR7LbFG4Za4H2H+7itqgiKRdb4M8="; }; - cargoHash = "sha256-T7dreELSHfJizfbJEvvgkOmkMwlOETZVUdLwRFJOJEo="; + cargoHash = "sha256-FpBgXP4kXSzrYP+ad+KubUG4NSDpyoaJwyReS86ETy8="; meta = { homepage = "https://github.com/catppuccin/whiskers"; diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 8becb62771bf..733a46a24f06 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.52.1"; + version = "2.52.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-USDZ3tEXXOTNyA6tCJndZiHTDBFg70EFnvxYsrFbgi0="; + hash = "sha256-SSwQQoHCcSVHMEpngpmdTThhwrob5/0TP9nQhOD6+1U="; }; - vendorHash = "sha256-xof2uSVUzWPlMhWU7p9/dlbHnr2/Keu7JpUUvuTB2dM="; + vendorHash = "sha256-t+lw1AtYnCBjJT+/pQZ71xycx4dJggqz08dNonbkP74="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix index 96383fdd6667..7d2e25026722 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -45,7 +45,6 @@ appimageTools.wrapType2 { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ aw - eclairevoyant nshalman ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/co/connman/package.nix b/pkgs/by-name/co/connman/package.nix index 238e84c09169..b7906fd72c6c 100644 --- a/pkgs/by-name/co/connman/package.nix +++ b/pkgs/by-name/co/connman/package.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/about/"; license = lib.licenses.gpl2Only; mainProgram = "connmanctl"; - maintainers = with lib.maintainers; [ eclairevoyant AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix index 8250d0edb591..61d5e5133731 100644 --- a/pkgs/by-name/co/converseen/package.nix +++ b/pkgs/by-name/co/converseen/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://converseen.fasterland.net/"; changelog = "https://github.com/Faster3ck/Converseen/blob/${finalAttrs.src.rev}/CHANGELOG"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "converseen"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index 157571269688..68722d2c6142 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -39,7 +39,7 @@ buildDotnetModule rec { homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; license = licenses.gpl3Plus; changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; - maintainers = with maintainers; [ eclairevoyant ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "discordchatexporter-cli"; }; diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix index 4f42e1b6d9d7..0b05839f1976 100644 --- a/pkgs/by-name/do/dopamine/package.nix +++ b/pkgs/by-name/do/dopamine/package.nix @@ -6,11 +6,11 @@ }: appimageTools.wrapType2 rec { pname = "dopamine"; - version = "3.0.0-preview.32"; + version = "3.0.0-preview.33"; src = fetchurl { url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; - hash = "sha256-1gn/oD9UL6+xjEwQIAhvJjHJybI0tY2We3QF1biHDgg="; + hash = "sha256-W8XkXnsP0AqYV0wznKe1dbPm2VuhoZWl03G7hib/uxE="; }; extraInstallCommands = diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index f3cc565cab42..1c3ba7798c1f 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -67,7 +67,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ coffeeispower - eclairevoyant figsoda lom w-lfchen diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index 5687e0299942..17b55284a031 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fantomas"; - version = "6.3.12"; + version = "6.3.13"; - nugetHash = "sha256-LFZn2cO72FlsmLI0vTLz52Bn4XBeGILTOr8rz/EuXeg="; + nugetHash = "sha256-ZVNYG0GtFlNYLE1J8Ts4GEfJlEgoMaQwGdHdCX3ru50="; meta = with lib; { description = "F# source code formatter"; diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index c85e4aeecd04..99307c37dcea 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -11,13 +11,13 @@ }: let pname = "feishin"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; rev = "v${version}"; - hash = "sha256-9ExTxVptPEZ+E1Tr7vS3JCfH8RoRDfZ0daA1AHWuuas="; + hash = "sha256-3gQ39GhYPme0kGAtM5DsG9RYwf23OAdkp3uVt7c1SQU="; }; electron = electron_31; @@ -26,7 +26,7 @@ buildNpmPackage { inherit pname version; inherit src; - npmDepsHash = "sha256-7CsbhwdNGkeNTNYrpMfOiQDU5lo23723F4zmM6QyFdA="; + npmDepsHash = "sha256-u+zbPB6u9EYVr9oHnLlKC0AyCLn4nq4TFVPSs2oWsbo="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; @@ -60,7 +60,7 @@ buildNpmPackage { inherit version; src = "${src}/release/app"; - npmDepsHash = "sha256-2LsciXkFSCxFghiMRM7NoCv+7k9MC9W0xPtMsddZCZk="; + npmDepsHash = "sha256-3qUmXRiAloGgLAErR16+BGEUT0ZwHHhCxMDQRCENQB4="; npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; diff --git a/pkgs/by-name/fi/fireplace/package.nix b/pkgs/by-name/fi/fireplace/package.nix index 16040a18d56d..f7791438ec55 100644 --- a/pkgs/by-name/fi/fireplace/package.nix +++ b/pkgs/by-name/fi/fireplace/package.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; maintainers = with lib.maintainers; [ multivac61 - eclairevoyant ]; mainProgram = "fireplace"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/fn/fnott/package.nix b/pkgs/by-name/fn/fnott/package.nix index c41f0ff96f7e..e0069e18c8f0 100644 --- a/pkgs/by-name/fn/fnott/package.nix +++ b/pkgs/by-name/fn/fnott/package.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ mit zlib ]; maintainers = with lib.maintainers; [ jmbaur - eclairevoyant ]; mainProgram = "fnott"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ge/geist-font/package.nix b/pkgs/by-name/ge/geist-font/package.nix index 34dd5dae26b8..12ba112d04a9 100644 --- a/pkgs/by-name/ge/geist-font/package.nix +++ b/pkgs/by-name/ge/geist-font/package.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec { description = "Font family created by Vercel in collaboration with Basement Studio"; homepage = "https://vercel.com/font"; license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ eclairevoyant x0ba ]; + maintainers = with lib.maintainers; [ x0ba ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; diff --git a/pkgs/by-name/gf/gfortran48/package.nix b/pkgs/by-name/gf/gfortran48/package.nix deleted file mode 100644 index e31c9d0c6ebd..000000000000 --- a/pkgs/by-name/gf/gfortran48/package.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ wrapCC, gcc48 }: -wrapCC ( - gcc48.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - } -) diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix index 655a6a8c1ff4..b9f44017da96 100644 --- a/pkgs/by-name/go/gopls/package.nix +++ b/pkgs/by-name/go/gopls/package.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-4RpQrlFj0stefVBouxyYN3Pf0PkYZ4cn4IKIskqUhVY="; + hash = "sha256-amy00VMUcmyjDoZ4d9/+YswfcZ+1/cGvFsA4sAmc1dA="; }; modRoot = "gopls"; - vendorHash = "sha256-D+ew0XyHRns1i9KAdV5vhCs3Uu338EujYjwU6IIZ8OY="; + vendorHash = "sha256-ta94xPboFtSxFeuMtPX76XiC1O7osNl4oLk64wIyyz4="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${version}" ]; diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 8caaddf8b465..ca51b3f8ecfd 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.18.0"; + version = "2.19.2"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-XFV+cdqtBJID/s0I3Z6TBfeyzN/e9euUoQVTWy64NYM="; + hash = "sha256-+mp195Yyj4O5k/WxnAllVHbeTt/ZzR7olPG27xfUrlQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix index ed7487766bba..4c30a16cd468 100644 --- a/pkgs/by-name/ha/hayabusa/package.nix +++ b/pkgs/by-name/ha/hayabusa/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { description = "Swift rust fetch program"; homepage = "https://github.com/notarin/hayabusa"; license = lib.licenses.cc-by-nc-nd-40; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "hayabusa"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix index b0101f323b74..8b9c4b6ad183 100644 --- a/pkgs/by-name/i3/i3bar-river/package.nix +++ b/pkgs/by-name/i3/i3bar-river/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "i3bar-river"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "i3bar-river"; rev = "v${version}"; - hash = "sha256-tG23bdEKp8+9RMS1fpW8EVe+bAdjQp7nVW0eHl3eYSQ="; + hash = "sha256-CZdulSe4qPb9ZOyH26dMVCiv/Y2T/u8fLohK8VeS1Ao="; }; - cargoHash = "sha256-nSzGWpnyGRus9qCTPAd+BM4KsujSNyRmFUCc4Lg4D5k="; + cargoHash = "sha256-K+fDdAWrAKLQSMIMtEavhk7gIHINmL2eJLBhDLc1Jtg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/pkgs/by-name/jw/jwasm/package.nix b/pkgs/by-name/jw/jwasm/package.nix index 8a1390aac9f5..a1cf1a9cf5c0 100644 --- a/pkgs/by-name/jw/jwasm/package.nix +++ b/pkgs/by-name/jw/jwasm/package.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: { --replace "/usr/local/bin" "${placeholder "out"}/bin" ''; + preInstall = '' + mkdir -p ${placeholder "out"}/bin + ''; + postInstall = '' install -Dpm644 $src/Html/License.html \ $src/Html/Manual.html \ @@ -36,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Baron-von-Riedesel/JWasm/"; description = "MASM-compatible x86 assembler"; changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/${finalAttrs.src.rev}"; + mainProgram = "jwasm"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libgrapheme/package.nix b/pkgs/by-name/li/libgrapheme/package.nix index 1aaed5f1a604..44883d17d0c6 100644 --- a/pkgs/by-name/li/libgrapheme/package.nix +++ b/pkgs/by-name/li/libgrapheme/package.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { hash = "sha256-pou93edr1Vul1kEWzl5CoT3wRcgcCFLemrYIlqoUMSU="; }; + postPatch = '' + substituteInPlace configure \ + --replace-fail "uname" "echo ${stdenv.hostPlatform.uname.system}" + ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" "BUILD_CC=$(CC_FOR_BUILD)" ]; diff --git a/pkgs/by-name/li/libkvmi/package.nix b/pkgs/by-name/li/libkvmi/package.nix new file mode 100644 index 000000000000..cc1a4efe93d6 --- /dev/null +++ b/pkgs/by-name/li/libkvmi/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + autoreconfHook, + autoconf-archive, + pkg-config, + glib, + libuuid, +}: + +stdenv.mkDerivation { + pname = "libkvmi"; + version = "1.1.0-unstable-2023-12-13"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "bitdefender"; + repo = "libkvmi"; + rev = "bc80de986bda1b891a1106badf87587bb92dbbb3"; + hash = "sha256-evYRIwguaKgJ8pMhhKKkSc/65GDYnG6DoYRMSkLjowI="; + }; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + + buildInputs = [ + glib + libuuid + ]; + + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + + meta = { + description = "KVM virtual machine introspection library"; + homepage = "https://github.com/bitdefender/libkvmi"; + license = lib.licenses.lgpl3Only; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ sigmasquadron ]; + mainProgram = "hookguest-libkvmi"; + outputsToInstall = [ "lib" ]; + }; +} diff --git a/pkgs/by-name/li/librewolf-bin/package.nix b/pkgs/by-name/li/librewolf-bin/package.nix index 29a17a3bc46a..80c0875fa69c 100644 --- a/pkgs/by-name/li/librewolf-bin/package.nix +++ b/pkgs/by-name/li/librewolf-bin/package.nix @@ -27,7 +27,7 @@ appimageTools.wrapType2 { description = "Fork of Firefox, focused on privacy, security and freedom (upstream AppImage release)"; homepage = "https://librewolf.net"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; mainProgram = "librewolf"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix new file mode 100644 index 000000000000..4dc844bd802f --- /dev/null +++ b/pkgs/by-name/li/libvmi/package.nix @@ -0,0 +1,97 @@ +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + autoreconfHook, + autoconf-archive, + bison, + flex, + glib, + pkg-config, + json_c, + libvirt, + + withVMIFS ? true, + fuse, + + legacyKVM ? false, + libkvmi, + + xenSupport ? true, + xen-slim, +}: + +let + pname = "libvmi"; + version = "0.14.0-unstable-2024-08-06"; + libVersion = "0.0.15"; + + src = fetchFromGitHub { + owner = "libvmi"; + repo = "libvmi"; + rev = "bdb9ffb8f1f70b425454bc41da2be353cc6cbf5c"; + hash = "sha256-5K+9Qq5vGeYYy8kqWIeO25iNJoD/HvtyircH6odr/qA="; + }; +in + +stdenv.mkDerivation { + inherit pname version src; + + outputs = [ + "out" + "lib" + "dev" + ]; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + bison + flex + pkg-config + ]; + + buildInputs = + [ + glib + json_c + libvirt + ] + ++ lib.optionals xenSupport [ xen-slim ] + ++ lib.optionals (!legacyKVM) [ libkvmi ] + ++ lib.optionals withVMIFS [ fuse ]; + + configureFlags = + lib.optionals (!xenSupport) [ "--disable-xen" ] + ++ lib.optionals legacyKVM [ "--enable-kvm-legacy" ] + ++ lib.optionals withVMIFS [ "--enable-vmifs" ]; + + # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here + postFixup = lib.optionalString xenSupport '' + libvmi="$lib/lib/libvmi.so.${libVersion}" + oldrpath=$(patchelf --print-rpath "$libvmi") + patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen-slim ]}" "$libvmi" + ''; + + passthru = { + updateScript = unstableGitUpdater { tagPrefix = "v"; }; + inherit libVersion; + }; + + meta = { + description = "C library for virtual machine introspection"; + longDescription = '' + LibVMI is a C library with Python bindings that makes it easy to monitor the low-level + details of a running virtual machine by viewing its memory, trapping on hardware events, + and accessing the vCPU registers. + ''; + homepage = "https://libvmi.com/"; + license = with lib.licenses; [ + gpl3Only + lgpl3Only + ]; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ sigmasquadron ]; + }; +} diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix index a3f5f404593c..1af974647cba 100644 --- a/pkgs/by-name/li/lightningcss/package.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - hash = "sha256-ZPqRxHbca8iflWwsDT2/sVbTstWnKVFcExcgrBXgzGc="; + hash = "sha256-YOTFyIDQIdqnrbXtnnY5U32rk9/fZ+1NcSb3slgkxZU="; }; - cargoHash = "sha256-QYrjDJJTJo4BDQOqY1pZn7ph+uuQvbsMbzaAUr4siaE="; + cargoHash = "sha256-nzRvsdW+PfcS1ocg49JtRQ9RmFJ3iz65plH1ToQXSGU="; patches = [ # Backport fix for build error for lightningcss-napi diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix new file mode 100644 index 000000000000..198992988741 --- /dev/null +++ b/pkgs/by-name/me/merkaartor/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + gdal, + proj, + protobuf, + qt5, + withGeoimage ? true, + exiv2, + withGpsdlib ? (!stdenv.isDarwin), + gpsd, + withLibproxy ? false, + libproxy, + withZbar ? false, + zbar, +}: + +stdenv.mkDerivation rec { + pname = "merkaartor"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "openstreetmap"; + repo = "merkaartor"; + rev = version; + hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.qttools + qt5.wrapQtAppsHook + ]; + + buildInputs = + [ + gdal + proj + protobuf + qt5.qtnetworkauth + qt5.qtsvg + qt5.qtwebengine + ] + ++ lib.optional withGeoimage exiv2 + ++ lib.optional withGpsdlib gpsd + ++ lib.optional withLibproxy libproxy + ++ lib.optional withZbar zbar; + + cmakeFlags = [ + (lib.cmakeBool "GEOIMAGE" withGeoimage) + (lib.cmakeBool "GPSD" withGpsdlib) + (lib.cmakeBool "LIBPROXY" withLibproxy) + (lib.cmakeBool "WEBENGINE" true) + (lib.cmakeBool "ZBAR" withZbar) + ]; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/merkaartor.app $out/Applications + # Prevent wrapping, otherwise plugins will not be loaded + chmod -x $out/Applications/merkaartor.app/Contents/plugins/background/*.dylib + makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor + ''; + + meta = { + description = "OpenStreetMap editor"; + homepage = "http://merkaartor.be/"; + license = lib.licenses.gpl2Plus; + mainProgram = "merkaartor"; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index 6b06397a5dbe..8bfd8d2da10e 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.8.9"; + version = "2.8.12"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vXdBqMe5+GfB2D9G1YceUJ0ksqQAtUktpYrJgDZcBGU="; + hash = "sha256-QqjryLHEpsdcZkIu/QmrQ0t9u4PysnE7FTXsIWBz7tk="; }; postPatch = '' diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 531e0b00a215..3435e3e5b916 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -24,7 +24,7 @@ in python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 0495e794b714..18a2d175c50c 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.2.2"; + version = "2.2.3"; providers = { airplay = [ ]; diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index f8a6ecb8291a..1c54ea57330e 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.3.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-4aZ7WGLhjpTHOggJ+sRdln0YOG3jf7TKT9/bH/n3LmQ="; + hash = "sha256-PissALQ/3gARnm2hiURABFqF2OKkFITMKf2Rww56hEM="; }; - npmDepsHash = "sha256-ts3UuThIMf+wwSr3DpZ+k1i9RnHi/ltvhD/7lomVxQk="; + npmDepsHash = "sha256-A8wzM8gYxYHIhPwxZeIWkNwHJ3skSD7MyNA5qWmX0q8="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix index f0107ff16bf8..ab8757708ac6 100644 --- a/pkgs/by-name/no/nomnatong/package.nix +++ b/pkgs/by-name/no/nomnatong/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "http://nomfoundation.org/nom-tools/Nom-Font"; description = "Hán-Nôm Coded Character Set and Nom Na Tong Regular Reference Font"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/applications/office/notes/default.nix b/pkgs/by-name/no/notes/package.nix similarity index 54% rename from pkgs/applications/office/notes/default.nix rename to pkgs/by-name/no/notes/package.nix index 7f41ca33e3dc..c9ca49ffe745 100644 --- a/pkgs/applications/office/notes/default.nix +++ b/pkgs/by-name/no/notes/package.nix @@ -1,22 +1,24 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, wrapQtAppsHook -, qtbase -, qtdeclarative -, Cocoa +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + darwin, + overrideSDK, }: - -stdenv.mkDerivation (finalAttrs: { +let + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { pname = "notes"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "nuttyartist"; repo = "notes"; rev = "v${finalAttrs.version}"; - hash = "sha256-ShChF87ysRoisKshY86kJTa3ZAiQhBOImuL8OsEqgBo="; + hash = "sha256-Z89Z7Il9K9pOxvNfFCoRUkRs0Wf5a6TQACDbBrQhGyw="; fetchSubmodules = true; }; @@ -24,15 +26,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; - buildInputs = [ - qtbase - qtdeclarative - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - ]; + buildInputs = + [ + qt6.qtbase + qt6.qtdeclarative + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Cocoa + ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir $out/Applications @@ -41,11 +45,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Fast and beautiful note-taking app"; + homepage = "https://github.com/nuttyartist/notes"; mainProgram = "notes"; - downloadPage = "https://github.com/nuttyartist/notes"; - homepage = "https://www.get-notes.com"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ zendo ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ zendo ]; }; }) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 968b65fd56ae..cb00def2cbfd 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -40,13 +40,13 @@ assert builtins.elem acceleration [ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-h/IFD7OaiIWNhJywqWG4uOPXExHfcnipr6f9YD1OjNc="; + hash = "sha256-iNjqnhiM0L873BiBPAgI2Y0KEQyCInn2nEihzwLasFU="; fetchSubmodules = true; }; @@ -60,11 +60,9 @@ let (preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=") (preparePatch "03-load_exception.diff" "sha256-NJkT/k8Mf8HcEMb0XkaLmyUNKV3T+384JRPnmwDI/sk=") (preparePatch "04-metal.diff" "sha256-bPBCfoT3EjZPjWKfCzh0pnCUbM/fGTj37yOaQr+QxQ4=") - (preparePatch "05-default-pretokenizer.diff" "sha256-PQ0DgfzycUQ8t6S6/yjsMHHx/nFJ0w8AH6afv5Po89w=") - (preparePatch "06-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=") + (preparePatch "05-default-pretokenizer.diff" "sha256-mxqHnDbiy8yfKFUYryNTj/xay/lx9KDiZAiekFSkxr8=") + (preparePatch "06-embeddings.diff" "sha256-+4yAEAX1JJenOksG2OxDCwiLEoLj1glJQLIgV08BI5Q=") (preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=") - (preparePatch "09-lora.diff" "sha256-tNtI3WHHjBq+PJZGJCBsXHa15dlNJeJm+IiaUbFC0LE=") - (preparePatch "11-phi3-sliding-window.diff" "sha256-VbcR4SLa9UXoh8Jq/bPVBerxfg68JZyWALRs7fz7hEs=") ]; preparePatch = diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 8db2c9a981e4..319d08a7bee7 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2024_07_26.57a21d2"; + version = "2024_08_21.1d6142f"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-UK3Klpo3cp4EH42W16qh5WbZlCxb+ETQtWbpgatL/Dc="; + hash = "sha256-lM4xz60BHInPFsqQlyj2wr0C7WQGa6GrkoRQgfw8id0="; }; makeFlags = [ diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix index be8b07aab425..6a343140cab7 100644 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pcsx2-bin"; - version = "2.1.116"; + version = "2.1.136"; src = fetchurl { url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-QKblXvqziToYOhSf7k9c/5J5NviRqo4NBLFCN1Q+0VA="; + hash = "sha256-TAyOQLBOHOe+EBjirmST7Dmg6F13e/9SACr24/7FVgE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pg/pg-gvm/package.nix b/pkgs/by-name/pg/pg-gvm/package.nix index 96aa7a2f68b9..dca83ea0bdd6 100644 --- a/pkgs/by-name/pg/pg-gvm/package.nix +++ b/pkgs/by-name/pg/pg-gvm/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + postgresql ]; buildInputs = [ diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index 5b5ee466a16c..eb92f27d55f4 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.4.2"; + version = "3.4.4"; pluginManagerVersion = "1.2.9"; src = fetchFromGitHub { @@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}' ${lib.getExe meson} subprojects download \ - colors plugins ppm + colors widget plugins ppm find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-mYLYRyyKfjTCD8mi1KrQNLqwd8QX1wgpJtpWASQCLQU="; + hash = "sha256-YAIndKTqne4I+wuCrVtfkjdp1rsFF+xyBnl5WcuDyz4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix index f493f6ec3dab..82508c4df5d3 100644 --- a/pkgs/by-name/pr/previewqt/package.nix +++ b/pkgs/by-name/pr/previewqt/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://photoqt.org/previewqt"; changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${version}/CHANGELOG"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "previewqt"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ri/rippkgs/package.nix b/pkgs/by-name/ri/rippkgs/package.nix index 96763f000bde..ae64a4d93bee 100644 --- a/pkgs/by-name/ri/rippkgs/package.nix +++ b/pkgs/by-name/ri/rippkgs/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { description = "CLI for indexing and searching packages in Nix expressions"; homepage = "https://github.com/replit/rippkgs"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant cdmistman ]; + maintainers = with lib.maintainers; [ cdmistman ]; mainProgram = "rippkgs"; }; } diff --git a/pkgs/by-name/sa/salut/package.nix b/pkgs/by-name/sa/salut/package.nix index 83818dae8bdc..5e61e524e4fa 100644 --- a/pkgs/by-name/sa/salut/package.nix +++ b/pkgs/by-name/sa/salut/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { description = "Sleek notification daemon for Wayland"; homepage = "https://gitlab.com/snakedye/salut/-/wikis/Home"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "salut"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index a9aa0989fcaf..7ffc14ec81cb 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; - hash = "sha256-t2fb8AA9m2I7Qna/v4F2GNL02iCU0r7zz5TgajHUmrg="; + hash = "sha256-jimq+Dx3RoJmnUDcfCkgE6Hk7OvPH/fs1v/Nri8Xtz8="; }; patches = [ diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix index 3d688dfeece4..d3704f1434ff 100644 --- a/pkgs/by-name/sc/scenefx/package.nix +++ b/pkgs/by-name/sc/scenefx/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects"; homepage = "https://github.com/wlrfx/scenefx"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "scenefx"; pkgConfigModules = [ "scenefx" ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/so/sov/package.nix b/pkgs/by-name/so/sov/package.nix index abb204ed8fa7..fcc4e3a2da73 100644 --- a/pkgs/by-name/so/sov/package.nix +++ b/pkgs/by-name/so/sov/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/milgra/sov"; license = lib.licenses.gpl3Only; mainProgram = "sov"; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix index 4a8baeb05cc8..be087a9a62dc 100644 --- a/pkgs/by-name/ss/sshesame/package.nix +++ b/pkgs/by-name/ss/sshesame/package.nix @@ -33,7 +33,7 @@ buildGoModule rec { ''; homepage = "https://github.com/jaksi/sshesame"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "sshesame"; }; } diff --git a/pkgs/by-name/su/sunpaper/package.nix b/pkgs/by-name/su/sunpaper/package.nix index 8aa569922bf9..fa9917a2d2af 100644 --- a/pkgs/by-name/su/sunpaper/package.nix +++ b/pkgs/by-name/su/sunpaper/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/hexive/sunpaper"; license = lib.licenses.asl20; mainProgram = "sunpaper"; - maintainers = with lib.maintainers; [ eclairevoyant jevy ]; + maintainers = with lib.maintainers; [ jevy ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/sw/sway-easyfocus/package.nix b/pkgs/by-name/sw/sway-easyfocus/package.nix index bc19c7ebd01d..3d3b73f7c93f 100644 --- a/pkgs/by-name/sw/sway-easyfocus/package.nix +++ b/pkgs/by-name/sw/sway-easyfocus/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "Tool to help efficiently focus windows in Sway, inspired by i3-easyfocus"; homepage = "https://github.com/edzdez/sway-easyfocus"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "sway-easyfocus"; }; } diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index 1edc6d3d4cb9..bdd11a3d7763 100644 --- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -137,7 +137,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/WillPower3309/swayfx/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - eclairevoyant ricarch97 ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index defd4f4ffc3c..7ea7c372a069 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "swiftlint"; - version = "0.56.1"; + version = "0.57.0"; src = fetchurl { url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"; - hash = "sha256-EEOEKwZsLOdSdf24uj1oN6uyY4Ox+HIkClXIJ1d+wpk="; + hash = "sha256-m1+5hPze016ryyoQrs8CCbcLjWY3ONMn4Zgh6sReuBA="; }; dontPatch = true; diff --git a/pkgs/by-name/sw/swipe-guess/package.nix b/pkgs/by-name/sw/swipe-guess/package.nix index 2f6d5f8fe9a5..881dd9718a6f 100644 --- a/pkgs/by-name/sw/swipe-guess/package.nix +++ b/pkgs/by-name/sw/swipe-guess/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~earboxer/swipeGuess/"; license = lib.licenses.agpl3Only; mainProgram = "swipeGuess"; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index 0c147beaa7b1..ff3256cbf89a 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -85,7 +85,6 @@ buildNpmPackage rec { license = lib.licenses.mit; mainProgram = "webcord"; maintainers = with lib.maintainers; [ - eclairevoyant huantian ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/x1/x16/package.nix b/pkgs/by-name/x1/x16/package.nix index aa731c436cd2..b6f8926a4d1c 100644 --- a/pkgs/by-name/x1/x16/package.nix +++ b/pkgs/by-name/x1/x16/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-emulator"; - version = "47"; + version = "48"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-emulator"; rev = "r${finalAttrs.version}"; - hash = "sha256-v7INa0Xpq7WlrSqc6VNBwLQPUoloqsGbv5rd/VTQtUg="; + hash = "sha256-E4TosRoORCWLotOIXROP9oqwqo1IRSa6X13GnmuxE9A="; }; postPatch = '' diff --git a/pkgs/by-name/x1/x16/rom.nix b/pkgs/by-name/x1/x16/rom.nix index b7c290dd6489..989e81094159 100644 --- a/pkgs/by-name/x1/x16/rom.nix +++ b/pkgs/by-name/x1/x16/rom.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-rom"; - version = "47"; + version = "48"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-rom"; rev = "r${finalAttrs.version}"; - hash = "sha256-+NvuCW8CIj5cnrGh+VQOExhAeXMElqdl9DVJjjGhNPk="; + hash = "sha256-MXt839wpPdGVFgf1CAqfmWEP2Ws+5uUFOI14vAdUTvk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index ba7d53b43583..8b447015f7fe 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -7,7 +7,6 @@ , libcCross , threadsCross , noSysDirs -, texinfo5 , cloog_0_18_0, cloog , lowPrio , wrapCC @@ -30,15 +29,11 @@ let else if atLeast "9" then isl_0_20 else if atLeast "7" then isl_0_17 else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14) - else if atLeast "4.9" then isl_0_11 - else /* "4.8" */ isl_0_14; - } // lib.optionalAttrs (majorMinorVersion == "4.8") { - texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump + else /* "4.9" */ isl_0_11; } // lib.optionalAttrs (!(atLeast "6")) { cloog = if stdenv.isDarwin then null - else if atLeast "4.9" then cloog_0_18_0 - else /* 4.8 */ cloog; + else /* 4.9 */ cloog_0_18_0; } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) { # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 2b806301bd1c..7eb5dae616a9 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -93,7 +93,6 @@ let is7 = majorVersion == "7"; is6 = majorVersion == "6"; is49 = majorVersion == "4" && versions.minor version == "9"; - is48 = majorVersion == "4" && versions.minor version == "8"; disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler); @@ -429,8 +428,8 @@ pipe ((callFile ./common/builder.nix {}) ({ passthru = { inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD langJava version; isGNU = true; - hardeningUnsupportedFlags = optional is48 "stackprotector" - ++ optional ( + hardeningUnsupportedFlags = + optional ( (targetPlatform.isAarch64 && !atLeast9) || !atLeast8 ) "stackclashprotection" ++ optional (!atLeast11) "zerocallusedregs" @@ -461,7 +460,7 @@ pipe ((callFile ./common/builder.nix {}) ({ badPlatforms = # avr-gcc8 is maintained for the `qmk` package if (is8 && targetPlatform.isAvr) then [] - else if !(is48 || is49 || is6) then [ "aarch64-darwin" ] + else if !(is49 || is6) then [ "aarch64-darwin" ] else platforms.darwin; } // optionalAttrs is10 { badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 12aa57336f32..124232b2614f 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -45,7 +45,6 @@ let is7 = majorVersion == "7"; is6 = majorVersion == "6"; is49 = majorVersion == "4" && lib.versions.minor version == "9"; - is48 = majorVersion == "4" && lib.versions.minor version == "8"; inherit (lib) optionals optional; in @@ -346,22 +345,3 @@ in ## gcc 4.8 only ############################################################################## ++ optional (!atLeast49 && hostPlatform.isDarwin) ./gfortran-darwin-NXConstStr.patch -++ optionals is48 [ - (fetchpatch { - name = "libc_name_p.diff"; # needed to build with gcc6 - url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f1"; - sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl"; - excludes = [ "gcc/cp/ChangeLog" ]; - }) - # glibc-2.26 - ./struct-ucontext-4.8.patch - ./sigsegv-not-declared.patch - ./res_state-not-declared.patch - # gcc-11 compatibility - (fetchpatch { - name = "gcc4-char-reload.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d57c99458933a21fdf94f508191f145ad8d5ec58"; - includes = [ "gcc/reload.h" ]; - sha256 = "sha256-66AMP7/ajunGKAN5WJz/yPn42URZ2KN51yPrFdsxEuM="; - }) -] diff --git a/pkgs/development/compilers/gcc/patches/res_state-not-declared.patch b/pkgs/development/compilers/gcc/patches/res_state-not-declared.patch deleted file mode 100644 index e970487786d0..000000000000 --- a/pkgs/development/compilers/gcc/patches/res_state-not-declared.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc -index fe69430..49f5270 100644 ---- a/libsanitizer/tsan/tsan_platform_linux.cc -+++ b/libsanitizer/tsan/tsan_platform_linux.cc -@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) { - // closes within glibc. The code is a pure hack. - int ExtractResolvFDs(void *state, int *fds, int nfd) { - int cnt = 0; -- __res_state *statp = (__res_state*)state; -+ struct __res_state *statp = (struct __res_state*)state; - for (int i = 0; i < MAXNS && cnt < nfd; i++) { - if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) - fds[cnt++] = statp->_u._ext.nssocks[i]; diff --git a/pkgs/development/compilers/gcc/patches/sigsegv-not-declared.patch b/pkgs/development/compilers/gcc/patches/sigsegv-not-declared.patch deleted file mode 100644 index f9cfaec82026..000000000000 --- a/pkgs/development/compilers/gcc/patches/sigsegv-not-declared.patch +++ /dev/null @@ -1,13 +0,0 @@ -error: 'SIGSEGV' was not declared in this scope -diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc -index 0692eb1..472f734 100644 ---- a/libsanitizer/asan/asan_linux.cc -+++ b/libsanitizer/asan/asan_linux.cc -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/pkgs/development/compilers/gcc/patches/struct-ucontext-4.8.patch b/pkgs/development/compilers/gcc/patches/struct-ucontext-4.8.patch deleted file mode 100644 index 630ef6586e45..000000000000 --- a/pkgs/development/compilers/gcc/patches/struct-ucontext-4.8.patch +++ /dev/null @@ -1,177 +0,0 @@ -From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001 -From: jsm28 -Date: Tue, 4 Jul 2017 10:23:57 +0000 -Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files. - -Current glibc no longer gives the ucontext_t type the tag struct -ucontext, to conform with POSIX namespace rules. This requires -various linux-unwind.h files in libgcc, that were previously using -struct ucontext, to be fixed to use ucontext_t instead. This is -similar to the removal of the struct siginfo tag from siginfo_t some -years ago. - -This patch changes those files to use ucontext_t instead. As the -standard name that should be unconditionally safe, so this is not -restricted to architectures supported by glibc, or conditioned on the -glibc version. - -Tested compilation together with current glibc with glibc's -build-many-glibcs.py. - - * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), - config/alpha/linux-unwind.h (alpha_fallback_frame_state), - config/bfin/linux-unwind.h (bfin_fallback_frame_state), - config/i386/linux-unwind.h (x86_64_fallback_frame_state, - x86_fallback_frame_state), config/m68k/linux-unwind.h (struct - uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), - config/pa/linux-unwind.h (pa32_fallback_frame_state), - config/sh/linux-unwind.h (sh_fallback_frame_state), - config/tilepro/linux-unwind.h (tile_fallback_frame_state), - config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use - ucontext_t instead of struct ucontext. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++ - libgcc/config/aarch64/linux-unwind.h | 2 +- - libgcc/config/alpha/linux-unwind.h | 2 +- - libgcc/config/bfin/linux-unwind.h | 2 +- - libgcc/config/i386/linux-unwind.h | 4 ++-- - libgcc/config/m68k/linux-unwind.h | 2 +- - libgcc/config/nios2/linux-unwind.h | 2 +- - libgcc/config/pa/linux-unwind.h | 2 +- - libgcc/config/sh/linux-unwind.h | 2 +- - libgcc/config/tilepro/linux-unwind.h | 2 +- - libgcc/config/xtensa/linux-unwind.h | 2 +- - 11 files changed, 25 insertions(+), 11 deletions(-) - -diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h -index 4512efb..06de45a 100644 ---- a/libgcc/config/aarch64/linux-unwind.h -+++ b/libgcc/config/aarch64/linux-unwind.h -@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe - { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - }; - - struct rt_sigframe *rt_; -diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h -index bdbba4a..e84812e 100644 ---- a/libgcc/config/alpha/linux-unwind.h -+++ b/libgcc/config/alpha/linux-unwind.h -@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; - } -diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h -index 77b7c23..8bf5e82 100644 ---- a/libgcc/config/bfin/linux-unwind.h -+++ b/libgcc/config/bfin/linux-unwind.h -@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, - void *puc; - char retcode[8]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h -index 540a0a2..29efbe3 100644 ---- a/libgcc/config/i386/linux-unwind.h -+++ b/libgcc/config/i386/linux-unwind.h -@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, - if (*(unsigned char *)(pc+0) == 0x48 - && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) - { -- struct ucontext *uc_ = context->cfa; -+ ucontext_t *uc_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem - because it does not alias anything. */ -@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, - siginfo_t *pinfo; - void *puc; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h -index 75b7cf7..f964e24 100644 ---- a/libgcc/config/m68k/linux-unwind.h -+++ b/libgcc/config/m68k/linux-unwind.h -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - /* is unfortunately broken right now. */ - struct uw_ucontext { - unsigned long uc_flags; -- struct ucontext *uc_link; -+ ucontext_t *uc_link; - stack_t uc_stack; - mcontext_t uc_mcontext; - unsigned long uc_filler[80]; -diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h -index 9a2657f..e47493d 100644 ---- a/libgcc/config/pa/linux-unwind.h -+++ b/libgcc/config/pa/linux-unwind.h -@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, - struct sigcontext *sc; - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *frame; - - /* rt_sigreturn trampoline: -diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h -index e389cac..0bf43ba 100644 ---- a/libgcc/config/sh/linux-unwind.h -+++ b/libgcc/config/sh/linux-unwind.h -@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h -index 796e976..75f8890 100644 ---- a/libgcc/config/tilepro/linux-unwind.h -+++ b/libgcc/config/tilepro/linux-unwind.h -@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe { - unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* Return if this is not a signal handler. */ -diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h -index 9872492..586a9d4 100644 ---- a/libgcc/config/xtensa/linux-unwind.h -+++ b/libgcc/config/xtensa/linux-unwind.h -@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, - - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* movi a2, __NR_rt_sigreturn; syscall */ --- -2.9.3 - diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix index eee117adf978..287d1fd4aa53 100644 --- a/pkgs/development/compilers/gcc/versions.nix +++ b/pkgs/development/compilers/gcc/versions.nix @@ -10,7 +10,6 @@ let "7" = "7.5.0"; "6" = "6.5.0"; "4.9"= "4.9.4"; - "4.8"= "4.8.5"; }; fromMajorMinor = majorMinorVersion: @@ -28,7 +27,6 @@ let "7.5.0" = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"; "6.5.0" = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; "4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; - "4.8.5" = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"; }."${version}"; in { diff --git a/pkgs/development/emilua-plugins/qt5/basic_test.lua b/pkgs/development/emilua-plugins/qt5/basic_test.lua new file mode 100644 index 000000000000..5e37771a1ca5 --- /dev/null +++ b/pkgs/development/emilua-plugins/qt5/basic_test.lua @@ -0,0 +1,12 @@ +local qt = require 'qt5' +local qml = qt.load_qml(byte_span.append([[ + import QtQml 2.0 + QtObject { + function foobar(a: int, b: int): int { + return a + b + } + } +]])) +assert(qml.object('foobar(int,int)', 1, 2), 3) + +print("done 👍") diff --git a/pkgs/development/emilua-plugins/qt5/default.nix b/pkgs/development/emilua-plugins/qt5/default.nix new file mode 100644 index 000000000000..95b8919f723c --- /dev/null +++ b/pkgs/development/emilua-plugins/qt5/default.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + meson, + ninja, + fetchFromGitLab, + gperf, + gawk, + gitUpdater, + pkg-config, + boost, + luajit_openresty, + asciidoctor, + libsForQt5, + emilua, + liburing, + fmt, + runCommand, + xvfb-run, + qt5, # this +}: + +stdenv.mkDerivation rec { + pname = "emilua-qt5"; + version = "1.0.1"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "qt5"; + rev = "v${version}"; + hash = "sha256-FkBfzGzUX7dvHjWRBjVwppU4jZBbY02gP+fIta8mjIw="; + }; + + buildInputs = [ + luajit_openresty + boost + libsForQt5.qtdeclarative + emilua + liburing + fmt + libsForQt5.qtbase + ]; + + nativeBuildInputs = [ + gperf + gawk + pkg-config + asciidoctor + meson + ninja + libsForQt5.wrapQtAppsHook + libsForQt5.qttools + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.basic = + runCommand "test-basic-qt5" + { + buildInputs = [ + emilua + qt5 + libsForQt5.wrapQtAppsHook + xvfb-run + ]; + dontWrapQtApps = true; + } + '' + makeWrapper ${lib.getExe emilua} payload \ + ''${qtWrapperArgs[@]} \ + --add-flags ${./basic_test.lua} + xvfb-run ./payload + touch $out + ''; + }; + + meta = with lib; { + description = "Qt5 bindings for Emilua"; + homepage = "https://emilua.org/"; + license = licenses.boost; + maintainers = with maintainers; [ + manipuladordedados + lucasew + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/emilua-plugins/qt6/basic_test.lua b/pkgs/development/emilua-plugins/qt6/basic_test.lua new file mode 100644 index 000000000000..1c3ca102520c --- /dev/null +++ b/pkgs/development/emilua-plugins/qt6/basic_test.lua @@ -0,0 +1,12 @@ +local qt = require 'qt6' +local qml = qt.load_qml(byte_span.append([[ + import QtQml 2.0 + QtObject { + function foobar(a: int, b: int): int { + return a + b + } + } +]])) +assert(qml.object('foobar(int,int)', 1, 2), 3) + +print("done 👍") diff --git a/pkgs/development/emilua-plugins/qt6/default.nix b/pkgs/development/emilua-plugins/qt6/default.nix new file mode 100644 index 000000000000..e8245200eccc --- /dev/null +++ b/pkgs/development/emilua-plugins/qt6/default.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + fetchFromGitLab, + asciidoctor, + ninja, + gperf, + gawk, + pkg-config, + boost, + luajit_openresty, + fmt, + meson, + emilua, + qt6Packages, + openssl, + liburing, + gitUpdater, + runCommand, + xvfb-run, + qt6, # this +}: + +stdenv.mkDerivation rec { + pname = "emilua-qt6"; + version = "1.0.3"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "qt6"; + rev = "v${version}"; + hash = "sha256-azMnM17HQMzC0ExgWurQzbR3fX9EwBRSu4kVTm3U2Ic="; + }; + + buildInputs = with qt6Packages; [ + qtbase + qtdeclarative + boost + luajit_openresty + emilua + fmt + openssl + liburing + ]; + + nativeBuildInputs = with qt6Packages; [ + qttools + wrapQtAppsHook + gperf + gawk + asciidoctor + pkg-config + meson + ninja + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.basic = + runCommand "test-basic-qt6" + { + buildInputs = [ + emilua + qt6 + qt6Packages.wrapQtAppsHook + qt6Packages.qtbase + qt6Packages.qtdeclarative + xvfb-run + ]; + dontWrapQtApps = true; + } + '' + makeWrapper ${lib.getExe emilua} payload \ + ''${qtWrapperArgs[@]} \ + --add-flags ${./basic_test.lua} + xvfb-run ./payload + touch $out + ''; + }; + + meta = with lib; { + description = "Qt6 bindings for Emilua"; + homepage = "https://emilua.org/"; + license = licenses.boost; + maintainers = with maintainers; [ + manipuladordedados + lucasew + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/python/editable.nix b/pkgs/development/interpreters/python/editable.nix new file mode 100644 index 000000000000..df63bbd14fe3 --- /dev/null +++ b/pkgs/development/interpreters/python/editable.nix @@ -0,0 +1,99 @@ +{ + buildPythonPackage, + lib, + hatchling, + tomli-w, +}: +{ + pname, + version, + + # Editable root as string. + # Environment variables will be expanded at runtime using os.path.expandvars. + root, + + # Arguments passed on verbatim to buildPythonPackage + derivationArgs ? { }, + + # Python dependencies + dependencies ? [ ], + optional-dependencies ? { }, + + # PEP-518 build-system https://peps.python.org/pep-518 + build-system ? [ ], + + # PEP-621 entry points https://peps.python.org/pep-0621/#entry-points + scripts ? { }, + gui-scripts ? { }, + entry-points ? { }, + + passthru ? { }, + meta ? { }, +}: + +# Create a PEP-660 (https://peps.python.org/pep-0660/) editable package pointing to an impure location outside the Nix store. +# The primary use case of this function is to enable local development workflows where the local package is installed into a virtualenv-like environment using withPackages. + +assert lib.isString root; +let + # In editable mode build-system's are considered to be runtime dependencies. + dependencies' = dependencies ++ build-system; + + pyproject = { + # PEP-621 project table + project = { + name = pname; + inherit + version + scripts + gui-scripts + entry-points + ; + dependencies = map lib.getName dependencies'; + optional-dependencies = lib.mapAttrs (_: lib.getName) optional-dependencies; + }; + + # Allow empty package + tool.hatch.build.targets.wheel.bypass-selection = true; + + # Include our editable pointer file in build + tool.hatch.build.targets.wheel.force-include."_${pname}.pth" = "_${pname}.pth"; + + # Build editable package using hatchling + build-system = { + requires = [ "hatchling" ]; + build-backend = "hatchling.build"; + }; + }; + +in +buildPythonPackage ( + { + inherit + pname + version + optional-dependencies + passthru + meta + ; + dependencies = dependencies'; + + pyproject = true; + + unpackPhase = '' + python -c "import json, tomli_w; print(tomli_w.dumps(json.load(open('$pyprojectContentsPath'))))" > pyproject.toml + echo 'import os.path, sys; sys.path.insert(0, os.path.expandvars("${root}"))' > _${pname}.pth + ''; + + build-system = [ hatchling ]; + } + // derivationArgs + // { + # Note: Using formats.toml generates another intermediary derivation that needs to be built. + # We inline the same functionality for better UX. + nativeBuildInputs = (derivationArgs.nativeBuildInputs or [ ]) ++ [ tomli-w ]; + pyprojectContents = builtins.toJSON pyproject; + passAsFile = [ "pyprojectContents" ]; + preferLocalBuild = true; + } +) diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index edd0937098b6..9fad8e56d5d4 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -61,6 +61,8 @@ let removePythonPrefix = lib.removePrefix namePrefix; + mkPythonEditablePackage = callPackage ./editable.nix { }; + mkPythonMetaPackage = callPackage ./meta-package.nix { }; # Convert derivation to a Python module. @@ -99,7 +101,7 @@ in { inherit buildPythonPackage buildPythonApplication; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; - inherit mkPythonMetaPackage; + inherit mkPythonMetaPackage mkPythonEditablePackage; python = toPythonModule python; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 2cd29ca99032..99bc38890c6a 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -122,6 +122,43 @@ let } ); + # Test editable package support + editableTests = let + testPython = python.override { + self = testPython; + packageOverrides = pyfinal: pyprev: { + # An editable package with a script that loads our mutable location + my-editable = pyfinal.mkPythonEditablePackage { + pname = "my-editable"; + version = "0.1.0"; + root = "$NIX_BUILD_TOP/src"; # Use environment variable expansion at runtime + # Inject a script + scripts = { + my-script = "my_editable.main:main"; + }; + }; + }; + }; + + + in { + editable-script = runCommand "editable-test" { + nativeBuildInputs = [ (testPython.withPackages (ps: [ ps.my-editable ])) ]; + } '' + mkdir -p src/my_editable + + cat > src/my_editable/main.py << EOF + def main(): + print("hello mutable") + EOF + + test "$(my-script)" == "hello mutable" + test "$(python -c 'import sys; print(sys.path[1])')" == "$NIX_BUILD_TOP/src" + + touch $out + ''; + }; + # Tests to ensure overriding works as expected. overrideTests = let extension = self: super: { @@ -192,4 +229,4 @@ let ''; }; -in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests // condaTests) +in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests // condaTests // editableTests) diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index cdca8c574fff..212b854c1e33 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub, cmake, enableStatic ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "double-conversion"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = lib.optional (! enableStatic) "-DBUILD_SHARED_LIBS=ON"; # Case sensitivity issue preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index a6d2c884f8a7..c3e5e278b590 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.10.0"; + version = "22.11.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; rev = "refs/tags/v${version}"; - hash = "sha256-o86bNwoGUw6VLESkaamWXPOfrdbFipJZmQCL6W5+nfk="; + hash = "sha256-VYFAy6VVASNOBLs39qukePYr5pV0IR1qjztv+veNCVc="; }; postPatch = '' diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix deleted file mode 100644 index b350592147bc..000000000000 --- a/pkgs/development/libraries/libvmi/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, - fetchFromGitHub, - autoreconfHook, - bison, - flex, - glib, - pkg-config, - json_c, - xen, - libvirt, - xenSupport ? true }: - -stdenv.mkDerivation rec { - pname = "libvmi"; - version = "0.12.0"; - libVersion = "0.0.12"; - - src = fetchFromGitHub { - owner = "libvmi"; - repo = "libvmi"; - rev = "v${version}"; - sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv"; - }; - - buildInputs = [ glib libvirt json_c ] ++ (lib.optional xenSupport xen); - nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; - - configureFlags = lib.optional (!xenSupport) "--disable-xen"; - - # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here - postFixup = lib.optionalString xenSupport '' - libvmi="$out/lib/libvmi.so.${libVersion}" - oldrpath=$(patchelf --print-rpath "$libvmi") - patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen ]}" "$libvmi" - ''; - - meta = with lib; { - homepage = "https://libvmi.com/"; - description = "C library for virtual machine introspection"; - longDescription = '' - LibVMI is a C library with Python bindings that makes it easy to monitor the low-level - details of a running virtual machine by viewing its memory, trapping on hardware events, - and accessing the vCPU registers. - ''; - license = with licenses; [ gpl3 lgpl3 ]; - platforms = platforms.linux; - maintainers = [ ]; - broken = true; - }; -} diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 0bbb6eea2f9d..5e0b0cbdc04a 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.5.14.0"; + version = "2.5.15.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "v${version}"; - hash = "sha256-EIJVqY97C1GaQBYQcSN3ETS63MOPFq/4HjmFJqKbt9U="; + hash = "sha256-jtX6IDR/yFn10hf+FxM0s4St9XYxhQ1UlMAsNzOxuio="; }; # Workaround broken zlib version detecion in CMake < 3.37. diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index e104f94d13a9..157c2b420290 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "cryptokit"; - version = "1.19"; + version = "1.20.1"; minimalOCamlVersion = "4.08"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "xavierleroy"; repo = "cryptokit"; rev = "release${lib.replaceStrings ["."] [""] version}"; - hash = "sha256-8RRAPFgL2pqKotc1I3fIB9q2cNi46SP8pt+0rZM+QUc="; + hash = "sha256-VFY10jGctQfIUVv7dK06KP8zLZHLXTxvLyTCObS+W+E="; }; # dont do autotools configuration, but do trigger findlib's preConfigure hook diff --git a/pkgs/development/ocaml-modules/dates_calc/default.nix b/pkgs/development/ocaml-modules/dates_calc/default.nix index d577cd61664a..e1def37250e7 100644 --- a/pkgs/development/ocaml-modules/dates_calc/default.nix +++ b/pkgs/development/ocaml-modules/dates_calc/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "dates_calc"; - version = "0.0.4"; + version = "0.0.6"; minimalOCamlVersion = "4.11"; duneVersion = "3"; @@ -13,7 +13,7 @@ buildDunePackage rec { owner = "catalalang"; repo = "dates-calc"; rev = version; - sha256 = "sha256-tpKOoPVXkg/k+NW5R8A4fGAKhdMn9UcqMogCjafJuw4="; + sha256 = "sha256-B4li8vIK6AnPXJ1QSJ8rtr+JOcy4+h5sc1SH97U+Vgw="; }; propagatedBuildInputs = []; diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix index 1c8b2597b2bb..255f92378feb 100644 --- a/pkgs/development/ocaml-modules/gluten/default.nix +++ b/pkgs/development/ocaml-modules/gluten/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { pname = "gluten"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - hash = "sha256-VZcbMFDRv+TVSXG05wUYxaWbTnBSa43RiVx9OesPnZY="; + hash = "sha256-se7Yn59ggLtL0onMjSUsa88B8D05Vybmb6YGcgfnAV8="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix index 0a5970fe7391..1b4e1c318fb3 100644 --- a/pkgs/development/ocaml-modules/miou/default.nix +++ b/pkgs/development/ocaml-modules/miou/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "miou"; - version = "0.2.0"; + version = "0.3.0"; minimalOCamlVersion = "5.0.0"; src = fetchurl { url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz"; - hash = "sha256-hxYCG1NkDEbVyDvN8eS/Fj6s10YyS7NRGlyNOkLy6sA="; + hash = "sha256-kjGAbm1glF427gYOXKSogb+HpgUQqK5fqL9F06FtC4Q="; }; meta = { diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index a60b02e4f3c3..c475cc7a97d0 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.7"; + version = "3.6.8"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-1Q/9W2adM+2w2InEdqcd5IiNkACNWDNgONIQztKPgQw="; + hash = "sha256-mCIeXsvpea/iFuJkvearu6wr804qFPCcH4WOaUKYC9k="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 3de101383891..b9665ecc0552 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ppx_blob"; - version = "0.8.0"; + version = "0.9.0"; duneVersion = "3"; src = fetchurl { url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; - sha256 = "sha256-drobFwMTKd/a3aP5CX/08WhvgS1CkARH6zo+nSiwl08="; + sha256 = "sha256-8RXpCl8Qdc7cnZMKuRJx+GcOzk3uENwRR6s5uK+1cOQ="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix index 7ddbc1f5d514..49d02693843c 100644 --- a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix +++ b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ppx_yojson_conv_lib"; - version = "0.16.0"; + version = "0.17.0"; minimalOCamlVersion = "4.02.3"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "janestreet"; repo = pname; rev = "v${version}"; - hash = "sha256-TOf6DKyvc+RsSWsLi//LXW+J0sd5uJtF/HFQllcL7No="; + hash = "sha256-XGgpcAEemBNEagblBjpK+BiL0OUsU2JPqOq+heHbqVk="; }; propagatedBuildInputs = [ yojson ]; diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 56f4f8f30323..8e887d263657 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "resto"; - version = "1.0"; + version = "1.2"; duneVersion = "3"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "resto"; rev = "v${version}"; - hash = "sha256-DIm7fmISsCgRDi4p3NsUk7Cvs/dHpIKMdAOVdYLX2mc="; + hash = "sha256-VdkYUy7Fi53ku6F/1FV55/VcyF/tDZKN4NTMabDd/T4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index cfd03493d3af..e45961f403e1 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "sqlite3"; - version = "5.1.0"; + version = "5.2.0"; duneVersion = "3"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - hash = "sha256-uw23EWkajfok/insTstpEkRK2Q4PTER6+Jgx5tHf/qU="; + hash = "sha256-lCKDpFT0sh91F/Lovj06MFlHeceKawR49LcLjKfJjLs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/tezt/default.nix b/pkgs/development/ocaml-modules/tezt/default.nix index afad07e77917..0dc05750896a 100644 --- a/pkgs/development/ocaml-modules/tezt/default.nix +++ b/pkgs/development/ocaml-modules/tezt/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "tezt"; - version = "4.0.0"; + version = "4.1.0"; minimalOCamlVersion = "4.12"; @@ -17,7 +17,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = pname; rev = version; - hash = "sha256-waFjE/yR+XAJOew1YsCnbvsJR8oe9gflyVj4yXAvNuM="; + hash = "sha256-1Cl/GOB+MDPJIl/6600PLTSL+vCYcAZGjedd6hr7rJw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/timedesc/default.nix b/pkgs/development/ocaml-modules/timedesc/default.nix index b77f5af17b40..9acd69305bee 100644 --- a/pkgs/development/ocaml-modules/timedesc/default.nix +++ b/pkgs/development/ocaml-modules/timedesc/default.nix @@ -10,11 +10,11 @@ buildDunePackage rec { pname = "timedesc"; - version = "2.0.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/daypack-dev/timere/releases/download/timedesc-${version}/timedesc-${version}.tar.gz"; - hash = "sha256-NnnQpWOE1mt/F5lkWRPdDwpqXCUlcNi+Z5GE6YQQLK8="; + hash = "sha256-nEachJymJC8TP/Ha2rOFU3n09rxVlIZYmgQnYiNCiHE="; }; sourceRoot = "."; diff --git a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix index 888c88029d26..4e5aa3650b16 100644 --- a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "tsdl-mixer"; - version = "0.5"; + version = "0.6"; duneVersion = "3"; @@ -17,7 +17,7 @@ buildDunePackage rec { owner = "sanette"; repo = pname; rev = version; - hash = "sha256-HGtO5iO3lxuVa707MDIhw0pgDZLHt9qY+Rd24sFkags="; + hash = "sha256-szuGmLzgGyQExCQwpopVNswtZZdhP29Q1+uNQJZb43Q="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index 6044c069609b..c44bf8e44468 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -2,17 +2,15 @@ lib, async-timeout, buildPythonPackage, + cramjam, cython, fetchFromGitHub, gssapi, - kafka-python, - lz4, packaging, - python-snappy, pythonOlder, setuptools, + typing-extensions, zlib, - zstandard, }: buildPythonPackage rec { @@ -20,7 +18,7 @@ buildPythonPackage rec { version = "0.11.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; @@ -38,15 +36,19 @@ buildPythonPackage rec { dependencies = [ async-timeout - kafka-python packaging + typing-extensions ]; optional-dependencies = { - snappy = [ python-snappy ]; - lz4 = [ lz4 ]; - zstd = [ zstandard ]; + snappy = [ cramjam ]; + lz4 = [ cramjam ]; + zstd = [ cramjam ]; gssapi = [ gssapi ]; + all = [ + cramjam + gssapi + ]; }; # Checks require running Kafka server diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index cf484c1f07b3..03d7e6c23519 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -22,7 +22,7 @@ let pname = "ansible"; - version = "10.1.0"; + version = "10.2.0"; in buildPythonPackage { inherit pname version; @@ -32,7 +32,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-fYxEVX9XBocwbhnQ4ylq0jBZPLEr2jXc/JJ0pgY68io="; + hash = "sha256-iqBim6js7WRl4s60kCnpPTN8Sm/Fo+bpiCXCWN1qcFc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index 35790227d5e5..1a1f03dea288 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { pname = "bundlewrap"; - version = "4.19.0"; - format = "setuptools"; + version = "4.20.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,11 +27,11 @@ buildPythonPackage rec { owner = "bundlewrap"; repo = "bundlewrap"; rev = "refs/tags/${version}"; - hash = "sha256-sNdtJRpP54xlkYis4whoGiJJ/Tjnrs4TW6EO3eAMBAo="; + hash = "sha256-GoMOEPZb7efFoZn7D2y1XO4XtP9z+1EmakLvSxcCT8I="; }; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + dependencies = [ setuptools cryptography jinja2 diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index 49bf0b39adf5..a60f3f0e4aef 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -25,16 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-zio00ki86DZqWtGnVseDR28He4DW1jjKdwfsxRwFDfg="; + hash = "sha256-Rz0E7GBaN/7zb0dqAxo0SJ4Bd+eQuOOv6x1WubIUh6A="; }; build-system = [ @@ -45,7 +42,7 @@ buildPythonPackage rec { dependencies = [ xarray ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ matplotlib pint @@ -60,7 +57,7 @@ buildPythonPackage rec { dask pytestCheckHook scipy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cf_xarray" ]; diff --git a/pkgs/development/python-modules/cmaes/default.nix b/pkgs/development/python-modules/cmaes/default.nix index 3ba69af21618..6a0f96d469e5 100644 --- a/pkgs/development/python-modules/cmaes/default.nix +++ b/pkgs/development/python-modules/cmaes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cmaes"; - version = "0.11.0"; + version = "0.11.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "CyberAgentAILab"; repo = "cmaes"; rev = "refs/tags/v${version}"; - hash = "sha256-YuoJUo+bMMHkB9LH6mX3iw06NT8xFeu9LJvX94vfLc4="; + hash = "sha256-u2CgU9n8N9AMxfMBbDbnYzBMdl/IGOLTxOeh8RlnB/Y="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 125c25d8a6b5..3ba13153d123 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -1,14 +1,13 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - setuptools, - nodejs, - yarn, - fixup-yarn-lock, + yarnConfigHook, fetchYarnDeps, + nodejs, + + setuptools, flask, werkzeug, @@ -37,23 +36,19 @@ buildPythonPackage rec { pname = "dash"; - version = "2.17.1"; + version = "2.18.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-51/nMnXUhb+hTL4xS9x4urI+2eENo/8sEKtk/kt6xTk="; + hash = "sha256-4/MiiS2uspjfGg0KIrgzShG7eW10Be6CoISCOnXSou0="; }; nativeBuildInputs = [ - setuptools + yarnConfigHook nodejs - yarn - fixup-yarn-lock ]; yarnOfflineCache = fetchYarnDeps { @@ -61,25 +56,25 @@ buildPythonPackage rec { hash = "sha256-L/or8jO6uEypI5krwy/ElIxa6jJrXGsCRZ9mh+0kcGA="; }; - preBuild = '' + # as of writing this yarnConfigHook has no parameter that changes in which directory it will be run + # until then we use preConfigure for entering the directory and preBuild for exiting it + preConfigure = '' pushd @plotly/dash-jupyterlab - export HOME=$(mktemp -d) + substituteInPlace package.json \ + --replace-fail 'jlpm' 'yarn' + ''; - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} - fixup-yarn-lock yarn.lock - - substituteInPlace package.json --replace jlpm yarn - yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts - patchShebangs node_modules - - # Generates the jupyterlab extension files - yarn run build:pack + preBuild = '' + # Generate the jupyterlab extension files + yarn --offline run build:pack popd ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ flask werkzeug plotly @@ -93,7 +88,7 @@ buildPythonPackage rec { nest-asyncio ]; - passthru.optional-dependencies = { + optional-dependencies = { celery = [ celery redis diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 6df2f77721f9..766e7af77ad8 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.49.1"; + version = "0.50.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TLenmRr2ytuGj+RQzUVkc+ZfEfxni3189hBE/xxgdNg="; + hash = "sha256-OljoX42kfEpHiTtCx1lXC6AoDNISQT2bckbLj8uG9YY="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix index e73892f1f998..3c1c982b74a5 100644 --- a/pkgs/development/python-modules/dazl/default.nix +++ b/pkgs/development/python-modules/dazl/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "dazl"; - version = "7.11.0"; + version = "7.12.0"; src = fetchPypi { inherit pname version; - hash = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8="; + hash = "sha256-fbemLaOh1PHBvQAmMy06JWgnOqdy/kLByAZh4U8ghxc="; }; patches = [ diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index e4d8f0037e5d..05127c50e84d 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "4.0"; + version = "4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-iQbHt8qhplwR/CHaDOWr/pDCZ+lPbrWDJKr3989DLDA="; + hash = "sha256-8CEvn2TJTXm0t4GBG9OQo9TgSy1+sTZIusaiiGNu05M="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 6e79803b03bf..772df769ae39 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -12,8 +12,8 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.11"; - format = "pyproject"; + version = "3.12"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -21,15 +21,15 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-rwn7nKfEmv92JdSMhKztMWptvggzlWhGA0gg5C0EbFM="; + hash = "sha256-zRAZqziVS4I7FDa7E4j67ekl9FXt0X+0oUpwmpNeI+I="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 6e6fb8d2b437..130c767c39f4 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -6,41 +6,48 @@ setuptools, setuptools-scm, flask, + zstandard, brotli, brotlicffi, pytestCheckHook, }: buildPythonPackage rec { - version = "1.14"; - pname = "Flask-Compress"; - format = "pyproject"; + version = "1.15"; + pname = "flask-compress"; + pyproject = true; src = fetchFromGitHub { owner = "colour-science"; repo = "flask-compress"; rev = "refs/tags/v${version}"; - hash = "sha256-eP6i4h+O4vkjlhfy3kyB+PY7iHVzOnRBRD8lj5yHehU="; + hash = "sha256-J7d/OIUsDWM6DoXS0P4EOE3k6txXKm6m4Yq/EJk6FRE="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ flask + zstandard ] ++ lib.optionals (!isPyPy) [ brotli ] ++ lib.optionals isPyPy [ brotlicffi ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "flask_compress" ]; - meta = with lib; { + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools_scm[toml]<8" "setuptools_scm" + ''; + + meta = { description = "Compress responses in your Flask app with gzip, deflate or brotli"; homepage = "https://github.com/colour-science/flask-compress"; changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 2ca4ab01e716..d51041828a64 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -17,19 +17,21 @@ buildPythonPackage rec { pname = "ftfy"; - version = "6.2.0"; + version = "6.2.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XkIUPHAl75eUTKJhnWthsGGfxmVPmHcdOehiwUJMdcA="; + hash = "sha256-ebUFmI8p1XelipBpr+dVU6AqRuQt5gkcBmDNxngSutw="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ wcwidth ]; + dependencies = [ wcwidth ]; + + pythonImportsCheck = [ "ftfy" ]; nativeCheckInputs = [ versionCheckHook @@ -49,7 +51,7 @@ buildPythonPackage rec { description = "Given Unicode text, make its representation consistent and possibly less broken"; mainProgram = "ftfy"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; - license = licenses.mit; + license = licenses.asl20; maintainers = with maintainers; [ aborsu ]; }; } diff --git a/pkgs/development/python-modules/gemfileparser2/default.nix b/pkgs/development/python-modules/gemfileparser2/default.nix index 1f92395c8a29..de981df2e4aa 100644 --- a/pkgs/development/python-modules/gemfileparser2/default.nix +++ b/pkgs/development/python-modules/gemfileparser2/default.nix @@ -4,30 +4,28 @@ fetchPypi, pytestCheckHook, pythonOlder, + setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "gemfileparser2"; - version = "0.9.3"; - format = "pyproject"; + version = "0.9.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BFKJZOf0W2b0YNbKIwnrmoKGvtP8A6R9PrUt7kYC/Dk="; + hash = "sha256-ezfioBwlZMGb1cEzzwa1afXUrTnxsgpzX0CNOTyVzgY="; }; dontConfigure = true; - postPatch = '' - # https://github.com/nexB/gemfileparser2/pull/8 - substituteInPlace setup.cfg \ - --replace ">=3.6.*" ">=3.6" - ''; - - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -35,8 +33,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library to parse Rubygem gemspec and Gemfile files"; - homepage = "https://github.com/nexB/gemfileparser2"; - changelog = "https://github.com/nexB/gemfileparser2/blob/v${version}/CHANGELOG.rst"; + homepage = "https://github.com/aboutcode-org/gemfileparser2"; + changelog = "https://github.com/aboutcode-org/gemfileparser2/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ mit # or gpl3Plus diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index cb7b6ba70f15..a61999ef5b78 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -18,11 +18,6 @@ buildPythonPackage rec { hash = "sha256-UFX/6EDqj1BcMDeL4Cr7Tb7LM0gOVU3r4Qtj1rL2QcM="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'protobuf>=4.21.6,<5.0dev' 'protobuf' - ''; - outputs = [ "out" "dev" @@ -30,7 +25,14 @@ buildPythonPackage rec { enableParallelBuilding = true; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ + "protobuf" + "grpcio" + ]; + + dependencies = [ protobuf grpcio setuptools diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix deleted file mode 100644 index 67e7febd7f17..000000000000 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pytest, - six, - mock, -}: - -buildPythonPackage rec { - version = "2.0.2"; - format = "setuptools"; - pname = "kafka-python"; - - src = fetchPypi { - inherit pname version; - sha256 = "04dfe7fea2b63726cd6f3e79a2d86e709d608d74406638c5da33a01d45a9d7e3"; - }; - - nativeCheckInputs = [ - pytest - six - mock - ]; - - checkPhase = '' - py.test - ''; - - # Upstream uses tox but we don't on Nix. Running tests manually produces however - # from . import unittest - # E ImportError: cannot import name 'unittest' - doCheck = false; - - meta = with lib; { - description = "Pure Python client for Apache Kafka"; - homepage = "https://github.com/dpkp/kafka-python"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix index fd6d202f0f4c..f615bea4926c 100644 --- a/pkgs/development/python-modules/lm-format-enforcer/default.nix +++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lm-format-enforcer"; - version = "0.10.4"; + version = "0.10.7"; pyproject = true; src = fetchFromGitHub { owner = "noamgat"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GOnMj910rgzYeIeN2yLcXZDDel/Hu6nv7ov5BrlHJLg="; + hash = "sha256-25/qnSKBXbyAnasNYuv+LV2U2KLipKtH6B+wXlH6eRs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 17d7b4e3096b..b65a4ccdcf06 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.7"; + version = "7.2.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-Qb3KPwSODtIqwS4FfR+DHphx4duPsNdMlHt2rpdV2+Y="; + hash = "sha256-BWzG8qYfTxk59lRAAL78YFCuHku8L2VxCSNpbi8Dr3k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index 023cf92090bc..9263ed7b0419 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.28"; + version = "2.3.29"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BTZFcX7/mPDgahK9K2WiVQUWK5lFhtH4f4IilgIIwgw="; + hash = "sha256-N5oO77DiLMzybQiE45mIIfu5DoT3/nR0iejB/SPpWLQ="; }; diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix index 9dfe9b1ebde3..492d6ee00946 100644 --- a/pkgs/development/python-modules/opentsne/default.nix +++ b/pkgs/development/python-modules/opentsne/default.nix @@ -4,38 +4,35 @@ fetchFromGitHub, cython, numpy, - oldest-supported-numpy, scipy, scikit-learn, pytestCheckHook, pythonOlder, setuptools, - wheel, }: let self = buildPythonPackage rec { pname = "opentsne"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pavlin-policar"; repo = "openTSNE"; rev = "refs/tags/v${version}"; - hash = "sha256-UTfEjjNz1mm5fhyTw9GRlMNURwWlr6kLMjrMngkFV3Y="; + hash = "sha256-e1YXF9cdguzcEW0KanIHYlZQiUc+FH8IVOaPshAswco="; }; - nativeBuildInputs = [ + build-system = [ cython - oldest-supported-numpy + numpy setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy scikit-learn diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 302b67eea7b2..0ca2084fd8c4 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "plux"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; # Tests are not available from PyPi @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "localstack"; repo = "plux"; rev = "refs/tags/v${version}"; - hash = "sha256-krlI7WimBluzkw3MVtGeotK5NFf+gsaUfL4CfhNPfpE="; + hash = "sha256-M4N3Ccuw95OcLsWQVtITv4QShBJKliTh5QIoqji8x9o="; }; build-system = [ diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock index caba522cc143..d497643fc267 100644 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ b/pkgs/development/python-modules/polars/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "adler32" version = "1.2.0" @@ -39,9 +45,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -63,9 +69,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -90,15 +96,15 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "apache-avro" @@ -109,7 +115,7 @@ dependencies = [ "crc32fast", "digest", "lazy_static", - "libflate 2.0.0", + "libflate 2.1.0", "log", "num-bigint", "quad-rand", @@ -118,13 +124,28 @@ dependencies = [ "serde", "serde_json", "snap", - "strum", - "strum_macros", + "strum 0.25.0", + "strum_macros 0.25.3", "thiserror", "typed-builder", "uuid", ] +[[package]] +name = "arboard" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +dependencies = [ + "clipboard-win", + "log", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot", + "x11rb", +] + [[package]] name = "argminmax" version = "0.6.2" @@ -141,10 +162,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" [[package]] -name = "arrow-array" -version = "50.0.0" +name = "arrayref" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "arrow-array" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" dependencies = [ "ahash", "arrow-buffer", @@ -152,15 +185,15 @@ dependencies = [ "arrow-schema", "chrono", "half", - "hashbrown 0.14.3", + "hashbrown", "num", ] [[package]] name = "arrow-buffer" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69615b061701bcdffbc62756bc7e85c827d5290b472b580c972ebbbf690f5aa4" +checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" dependencies = [ "bytes", "half", @@ -169,9 +202,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d644b91a162f3ad3135ce1184d0a31c28b816a581e08f29e8e9277a574c64e" +checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" dependencies = [ "arrow-buffer", "arrow-schema", @@ -181,9 +214,9 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "50.0.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029" +checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" [[package]] name = "arrow2" @@ -224,18 +257,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -254,10 +287,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" [[package]] -name = "autocfg" -version = "1.1.0" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "avro-schema" @@ -277,9 +316,9 @@ dependencies = [ [[package]] name = "aws-config" -version = "1.1.7" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b96342ea8948ab9bef3e6234ea97fc32e2d8a88d8fb6a084e52267317f94b6b" +checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697" dependencies = [ "aws-credential-types", "aws-runtime", @@ -297,19 +336,19 @@ dependencies = [ "fastrand", "hex", "http 0.2.12", - "hyper", "ring", "time", "tokio", "tracing", + "url", "zeroize", ] [[package]] name = "aws-credential-types" -version = "1.1.7" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "273fa47dafc9ef14c2c074ddddbea4561ff01b7f68d5091c0e9737ced605c01d" +checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -319,9 +358,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.1.7" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e38bab716c8bf07da24be07ecc02e0f5656ce8f30a891322ecdcb202f943b85" +checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -334,7 +373,8 @@ dependencies = [ "bytes", "fastrand", "http 0.2.12", - "http-body", + "http-body 0.4.6", + "once_cell", "percent-encoding", "pin-project-lite", "tracing", @@ -343,10 +383,11 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.17.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d35d39379445970fc3e4ddf7559fff2c32935ce0b279f9cb27080d6b7c6d94" +checksum = "67520cfee50a8a075a86e7960a6ff30a0a93f6b83ef36f7dff42a9fad9ec1818" dependencies = [ + "ahash", "aws-credential-types", "aws-runtime", "aws-sigv4", @@ -361,20 +402,25 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", + "fastrand", + "hex", + "hmac", "http 0.2.12", - "http-body", + "http-body 0.4.6", + "lru", "once_cell", "percent-encoding", "regex-lite", + "sha2", "tracing", "url", ] [[package]] name = "aws-sdk-sso" -version = "1.15.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84bd3925a17c9adbf6ec65d52104a44a09629d8f70290542beeee69a95aee7f" +checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81" dependencies = [ "aws-credential-types", "aws-runtime", @@ -394,9 +440,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.15.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c2dae39e997f58bc4d6292e6244b26ba630c01ab671b6f9f44309de3eb80ab8" +checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74" dependencies = [ "aws-credential-types", "aws-runtime", @@ -416,9 +462,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.15.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fd9a53869fee17cea77e352084e1aa71e2c5e323d974c13a9c2bcfd9544c7f" +checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574" dependencies = [ "aws-credential-types", "aws-runtime", @@ -439,9 +485,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.1.7" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ada00a4645d7d89f296fe0ddbc3fe3554f03035937c849a05d37ddffc1f29a1" +checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -468,9 +514,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.1.7" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf7f09a27286d84315dfb9346208abb3b0973a692454ae6d0bc8d803fcce3b4" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" dependencies = [ "futures-util", "pin-project-lite", @@ -479,9 +525,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.60.6" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd4b66f2a8e7c84d7e97bda2666273d41d2a2e25302605bcf906b7b2661ae5e" +checksum = "509e33efbd853e1e670c47e49af2f4df3d2ae0de8b845b068ddbf04636a6700d" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -490,7 +536,7 @@ dependencies = [ "crc32fast", "hex", "http 0.2.12", - "http-body", + "http-body 0.4.6", "md-5", "pin-project-lite", "sha1", @@ -511,9 +557,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.6" +version = "0.60.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6ca214a6a26f1b7ebd63aa8d4f5e2194095643023f9608edf99a58247b9d80d" +checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -522,7 +568,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.12", - "http-body", + "http-body 0.4.6", "once_cell", "percent-encoding", "pin-project-lite", @@ -532,18 +578,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.60.6" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af80ecf3057fb25fe38d1687e94c4601a7817c6a1e87c1b0635f7ecb644ace5" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.60.6" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb27084f72ea5fc20033efe180618677ff4a2f474b53d84695cfe310a6526cbc" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" dependencies = [ "aws-smithy-types", "urlencoding", @@ -551,9 +597,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.1.7" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb5fca54a532a36ff927fbd7407a7c8eb9c3b4faf72792ba2965ea2cad8ed55" +checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -561,24 +607,26 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", - "hyper-rustls", + "http-body 0.4.6", + "http-body 1.0.1", + "httparse", + "hyper 0.14.30", + "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", "pin-utils", - "rustls", + "rustls 0.21.12", "tokio", "tracing", ] [[package]] name = "aws-smithy-runtime-api" -version = "1.1.7" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22389cb6f7cac64f266fb9f137745a9349ced7b47e0d2ba503e9e40ede4f7060" +checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -593,16 +641,19 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.1.7" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f081da5481210523d44ffd83d9f0740320050054006c719eae0232d411f024d3" +checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8" dependencies = [ "base64-simd", "bytes", "bytes-utils", "futures-core", "http 0.2.12", - "http-body", + "http 1.1.0", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", "itoa", "num-integer", "pin-project-lite", @@ -616,39 +667,38 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.6" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fccd8f595d0ca839f9f2548e66b99514a85f92feb4c01cf2868d93eb4888a42" +checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.1.7" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07c63521aa1ea9a9f92a701f1a08ce3fd20b46c6efc0d5c8947c1fd879e3df1" +checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" dependencies = [ "aws-credential-types", "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "http 0.2.12", "rustc_version", "tracing", ] [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -665,6 +715,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64-simd" version = "0.8.0" @@ -692,19 +748,26 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -715,10 +778,19 @@ dependencies = [ ] [[package]] -name = "brotli" -version = "3.4.0" +name = "block2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -727,9 +799,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -737,9 +809,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" dependencies = [ "cargo-lock", "chrono", @@ -748,35 +820,41 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] -name = "bytes" +name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bytes-utils" @@ -817,12 +895,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.90" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -833,15 +912,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -895,18 +974,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.2" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstyle", "clap_lex", @@ -914,28 +993,37 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] [[package]] name = "cmake" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] [[package]] name = "comfy-table" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ "crossterm", - "strum", - "strum_macros", + "strum 0.26.3", + "strum_macros 0.26.4", "unicode-width", ] @@ -965,6 +1053,12 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "core-foundation" version = "0.9.4" @@ -977,9 +1071,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core2" @@ -992,9 +1086,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -1016,18 +1110,18 @@ checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" [[package]] name = "crc32c" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" +checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" dependencies = [ "rustc_version", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1070,9 +1164,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1107,9 +1201,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -1117,7 +1211,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.2", + "bitflags", "crossterm_winapi", "libc", "parking_lot", @@ -1233,9 +1327,12 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] [[package]] name = "elliptic-curve" @@ -1257,25 +1354,16 @@ dependencies = [ "zeroize", ] -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - [[package]] name = "enum_dispatch" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1296,14 +1384,20 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "error-code" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + [[package]] name = "ethnum" version = "1.5.0" @@ -1324,9 +1418,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -1340,13 +1434,13 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "libz-ng-sys", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1379,6 +1473,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs4" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de" +dependencies = [ + "rustix", + "windows-sys 0.52.0", +] + [[package]] name = "futures" version = "0.3.30" @@ -1435,7 +1539,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1479,10 +1583,20 @@ dependencies = [ ] [[package]] -name = "getrandom" -version = "0.2.12" +name = "gethostname" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1493,17 +1607,17 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.4.2", + "bitflags", "libc", "libgit2-sys", "log", @@ -1529,9 +1643,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1547,10 +1661,29 @@ dependencies = [ ] [[package]] -name = "half" -version = "2.4.0" +name = "h2" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1563,7 +1696,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", "serde", ] @@ -1575,22 +1708,14 @@ checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", "rayon", + "serde", ] [[package]] @@ -1599,12 +1724,24 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -1663,10 +1800,33 @@ dependencies = [ ] [[package]] -name = "httparse" -version = "1.8.0" +name = "http-body" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1682,17 +1842,17 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1704,6 +1864,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1712,12 +1892,50 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", + "hyper 0.14.30", "log", - "rustls", - "rustls-native-certs", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.12", + "rustls-native-certs 0.7.2", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1731,7 +1949,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1755,20 +1973,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", "serde", ] [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inventory" @@ -1784,11 +2002,11 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -1804,18 +2022,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "itoap" @@ -1845,18 +2063,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1874,9 +2092,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lexical-core" @@ -1944,9 +2162,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libflate" @@ -1961,15 +2179,15 @@ dependencies = [ [[package]] name = "libflate" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" +checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" dependencies = [ "adler32", "core2", "crc32fast", "dary_heap", - "libflate_lz77 2.0.0", + "libflate_lz77 2.1.0", ] [[package]] @@ -1983,20 +2201,20 @@ dependencies = [ [[package]] name = "libflate_lz77" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" +checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" dependencies = [ "core2", - "hashbrown 0.13.2", + "hashbrown", "rle-decode-fast", ] [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -2006,12 +2224,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -2022,9 +2240,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -2032,9 +2250,9 @@ dependencies = [ [[package]] name = "libz-ng-sys" -version = "1.1.15" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" +checksum = "4436751a01da56f1277f323c80d584ffad94a3d14aecd959dd0dff75aa73a438" dependencies = [ "cmake", "libc", @@ -2042,9 +2260,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.15" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -2054,15 +2272,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2070,15 +2288,24 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +dependencies = [ + "hashbrown", +] [[package]] name = "lz4" -version = "1.24.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" +checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68" dependencies = [ "libc", "lz4-sys", @@ -2086,19 +2313,28 @@ dependencies = [ [[package]] name = "lz4-sys" -version = "1.9.4" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" dependencies = [ "cc", "libc", ] [[package]] -name = "matrixmultiply" -version = "0.3.8" +name = "lz4_flex" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +dependencies = [ + "twox-hash", +] + +[[package]] +name = "matrixmultiply" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -2116,9 +2352,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2131,18 +2367,18 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -2155,29 +2391,39 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] -name = "mio" -version = "0.8.11" +name = "miniz_oxide" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "multiversion" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c7b9d7fe61760ce5ea19532ead98541f6b4c495d87247aff9826445cf6872a" +checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142" dependencies = [ "multiversion-macros", "target-features", @@ -2185,9 +2431,9 @@ dependencies = [ [[package]] name = "multiversion-macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a83d8500ed06d68877e9de1dde76c1dbb83885dcdbda4ef44ccbc3fbda2ac8" +checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90" dependencies = [ "proc-macro2", "quote", @@ -2228,9 +2474,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -2242,20 +2488,19 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -2277,9 +2522,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2288,11 +2533,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -2300,29 +2544,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "numpy" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef41cbb417ea83b30525259e30ccef6af39b31c240bda578889494c5392d331" +version = "0.21.0" +source = "git+https://github.com/stinodego/rust-numpy.git?rev=9ba9962ae57ba26e35babdce6f179edf5fe5b9c8#9ba9962ae57ba26e35babdce6f179edf5fe5b9c8" dependencies = [ "libc", "ndarray", @@ -2330,32 +2563,131 @@ dependencies = [ "num-integer", "num-traits", "pyo3", - "rustc-hash", + "rustc-hash 1.1.0", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] [[package]] name = "object_store" -version = "0.9.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8718f8b65fdf67a45108d1548347d4af7d71fb81ce727bbf9e3b2535e079db3" +checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" dependencies = [ "async-trait", - "base64", + "base64 0.22.1", "bytes", "chrono", "futures", "humantime", - "hyper", - "itertools 0.12.1", + "hyper 1.4.1", + "itertools 0.13.0", "md-5", "parking_lot", "percent-encoding", @@ -2363,7 +2695,7 @@ dependencies = [ "rand", "reqwest", "ring", - "rustls-pemfile 2.1.1", + "rustls-pemfile 2.1.3", "serde", "serde_json", "snafu", @@ -2381,9 +2713,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "openssl-probe" @@ -2410,9 +2742,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2420,15 +2752,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2443,9 +2775,9 @@ dependencies = [ [[package]] name = "parse-zoneinfo" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" dependencies = [ "regex", ] @@ -2495,10 +2827,30 @@ dependencies = [ ] [[package]] -name = "pin-project-lite" -version = "0.2.13" +name = "pin-project" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2533,9 +2885,9 @@ dependencies = [ [[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -2546,25 +2898,26 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] [[package]] name = "polars" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", "apache-avro", + "arrow-buffer", "avro-schema", "either", "ethnum", @@ -2590,7 +2943,7 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", "arrow-array", @@ -2612,10 +2965,9 @@ dependencies = [ "ethnum", "fast-float", "flate2", - "foreign_vec", "futures", "getrandom", - "hashbrown 0.14.3", + "hashbrown", "hex", "indexmap", "itoa", @@ -2623,16 +2975,17 @@ dependencies = [ "lz4", "multiversion", "num-traits", + "parking_lot", "polars-arrow-format", "polars-error", "polars-utils", "proptest", "rand", "regex", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", "ryu", "sample-arrow2", - "sample-std 0.1.1", + "sample-std", "sample-test", "serde", "simdutf8", @@ -2658,7 +3011,7 @@ dependencies = [ [[package]] name = "polars-compute" -version = "0.38.1" +version = "0.42.0" dependencies = [ "bytemuck", "either", @@ -2673,18 +3026,18 @@ dependencies = [ [[package]] name = "polars-core" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", "arrow-array", "bincode", - "bitflags 2.4.2", + "bitflags", "bytemuck", "chrono", "chrono-tz", "comfy-table", "either", - "hashbrown 0.14.3", + "hashbrown", "indexmap", "ndarray", "num-traits", @@ -2708,10 +3061,11 @@ dependencies = [ [[package]] name = "polars-doc-examples" -version = "0.38.1" +version = "0.42.0" dependencies = [ "aws-config", "aws-sdk-s3", + "aws-smithy-checksums", "chrono", "polars", "rand", @@ -2721,7 +3075,7 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.38.1" +version = "0.42.0" dependencies = [ "avro-schema", "object_store", @@ -2731,9 +3085,28 @@ dependencies = [ "thiserror", ] +[[package]] +name = "polars-expr" +version = "0.42.0" +dependencies = [ + "ahash", + "bitflags", + "once_cell", + "polars-arrow", + "polars-core", + "polars-io", + "polars-json", + "polars-ops", + "polars-plan", + "polars-time", + "polars-utils", + "rayon", + "smartstring", +] + [[package]] name = "polars-ffi" -version = "0.38.1" +version = "0.42.0" dependencies = [ "polars-arrow", "polars-core", @@ -2741,17 +3114,21 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", "async-trait", "atoi_simd", + "blake3", "bytes", "chrono", "chrono-tz", "fast-float", "flate2", + "fs4", "futures", + "glob", + "hashbrown", "home", "itoa", "memchr", @@ -2785,12 +3162,13 @@ dependencies = [ [[package]] name = "polars-json" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", "chrono", + "chrono-tz", "fallible-streaming-iterator", - "hashbrown 0.14.3", + "hashbrown", "indexmap", "itoa", "num-traits", @@ -2804,20 +3182,23 @@ dependencies = [ [[package]] name = "polars-lazy" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", - "bitflags 2.4.2", + "bitflags", "futures", - "glob", + "memchr", "once_cell", "polars-arrow", "polars-core", + "polars-expr", "polars-io", "polars-json", + "polars-mem-engine", "polars-ops", "polars-pipe", "polars-plan", + "polars-stream", "polars-time", "polars-utils", "pyo3", @@ -2828,19 +3209,40 @@ dependencies = [ "version_check", ] +[[package]] +name = "polars-mem-engine" +version = "0.42.0" +dependencies = [ + "futures", + "memmap2", + "polars-arrow", + "polars-core", + "polars-error", + "polars-expr", + "polars-io", + "polars-json", + "polars-ops", + "polars-plan", + "polars-time", + "polars-utils", + "pyo3", + "rayon", + "tokio", +] + [[package]] name = "polars-ops" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", "aho-corasick", "argminmax", - "base64", + "base64 0.22.1", "bytemuck", "chrono", "chrono-tz", "either", - "hashbrown 0.14.3", + "hashbrown", "hex", "indexmap", "jsonpath_lib_polars_vendor", @@ -2865,23 +3267,26 @@ dependencies = [ [[package]] name = "polars-parquet" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", "async-stream", - "base64", + "base64 0.22.1", "brotli", + "bytemuck", "ethnum", "fallible-streaming-iterator", "flate2", "futures", "lz4", + "lz4_flex", "num-traits", "parquet-format-safe", "polars-arrow", + "polars-compute", "polars-error", "polars-utils", - "seq-macro", + "rand", "serde", "simdutf8", "snap", @@ -2892,17 +3297,18 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.38.1" +version = "0.42.0" dependencies = [ "crossbeam-channel", "crossbeam-queue", "enum_dispatch", "futures", - "hashbrown 0.14.3", + "hashbrown", "num-traits", "polars-arrow", "polars-compute", "polars-core", + "polars-expr", "polars-io", "polars-ops", "polars-plan", @@ -2917,15 +3323,19 @@ dependencies = [ [[package]] name = "polars-plan" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", + "bitflags", "bytemuck", "chrono", "chrono-tz", "ciborium", + "either", "futures", + "hashbrown", "libloading", + "memmap2", "once_cell", "percent-encoding", "polars-arrow", @@ -2939,16 +3349,52 @@ dependencies = [ "polars-utils", "pyo3", "rayon", + "recursive", "regex", "serde", + "serde_json", "smartstring", - "strum_macros", + "strum_macros 0.26.4", + "version_check", +] + +[[package]] +name = "polars-python" +version = "0.42.0" +dependencies = [ + "ahash", + "arboard", + "bytemuck", + "ciborium", + "either", + "itoa", + "libc", + "ndarray", + "num-traits", + "numpy", + "once_cell", + "polars", + "polars-core", + "polars-error", + "polars-io", + "polars-lazy", + "polars-ops", + "polars-parquet", + "polars-plan", + "polars-stream", + "polars-time", + "polars-utils", + "pyo3", + "recursive", + "serde_json", + "smartstring", + "thiserror", "version_check", ] [[package]] name = "polars-row" -version = "0.38.1" +version = "0.42.0" dependencies = [ "bytemuck", "polars-arrow", @@ -2958,25 +3404,56 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.38.1" +version = "0.42.0" dependencies = [ "hex", + "once_cell", "polars-arrow", "polars-core", "polars-error", "polars-lazy", + "polars-ops", "polars-plan", + "polars-time", "rand", "serde", "serde_json", "sqlparser", ] +[[package]] +name = "polars-stream" +version = "0.42.0" +dependencies = [ + "atomic-waker", + "crossbeam-deque", + "crossbeam-utils", + "futures", + "memmap2", + "parking_lot", + "pin-project-lite", + "polars-core", + "polars-error", + "polars-expr", + "polars-io", + "polars-mem-engine", + "polars-parquet", + "polars-plan", + "polars-utils", + "rand", + "rayon", + "recursive", + "slotmap", + "tokio", + "version_check", +] + [[package]] name = "polars-time" -version = "0.38.1" +version = "0.42.0" dependencies = [ "atoi", + "bytemuck", "chrono", "chrono-tz", "now", @@ -2993,28 +3470,33 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.38.1" +version = "0.42.0" dependencies = [ "ahash", "bytemuck", - "hashbrown 0.14.3", + "bytes", + "hashbrown", "indexmap", + "libc", + "memmap2", "num-traits", "once_cell", "polars-error", "rand", "raw-cpuid", "rayon", + "serde", "smartstring", + "stacker", "sysinfo", "version_check", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "powerfmt" @@ -3024,32 +3506,35 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ - "bitflags 2.4.2", + "bitflags", "lazy_static", "num-traits", "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", "unarray", ] @@ -3077,43 +3562,35 @@ dependencies = [ ] [[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] name = "py-polars" -version = "0.20.15" +version = "1.6.0" dependencies = [ - "ahash", "built", - "ciborium", - "either", - "itoa", "jemallocator", "libc", "mimalloc", - "ndarray", - "num-traits", - "numpy", - "once_cell", "polars", - "polars-core", - "polars-error", - "polars-lazy", - "polars-ops", - "polars-parquet", - "polars-plan", - "polars-utils", + "polars-python", "pyo3", - "pyo3-built", - "serde_json", - "smartstring", - "thiserror", ] [[package]] name = "pyo3" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ "cfg-if", + "chrono", "indoc", "inventory", "libc", @@ -3128,25 +3605,19 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" dependencies = [ "once_cell", "target-lexicon", ] -[[package]] -name = "pyo3-built" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" - [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" dependencies = [ "libc", "pyo3-build-config", @@ -3154,27 +3625,27 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -3185,9 +3656,9 @@ checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88" [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", "serde", @@ -3205,10 +3676,58 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.35" +name = "quinn" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3274,11 +3793,11 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.0.1" +version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" dependencies = [ - "bitflags 2.4.2", + "bitflags", ] [[package]] @@ -3289,9 +3808,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3308,62 +3827,82 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.4.1" +name = "recursive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e" dependencies = [ - "bitflags 1.3.2", + "recursive-proc-macro-impl", + "stacker", +] + +[[package]] +name = "recursive-proc-macro-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" +dependencies = [ + "quote", + "syn 2.0.76", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags", ] [[package]] name = "ref-cast" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] name = "regex-lite" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" @@ -3373,26 +3912,28 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64", + "base64 0.22.1", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", - "http 0.2.12", - "http-body", - "hyper", - "hyper-rustls", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.2", + "hyper-util", "ipnet", "js-sys", "log", @@ -3400,16 +3941,17 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-native-certs", - "rustls-pemfile 1.0.4", + "quinn", + "rustls 0.23.12", + "rustls-native-certs 0.7.2", + "rustls-pemfile 2.1.3", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.0", "tokio-util", "tower-service", "url", @@ -3417,7 +3959,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg", + "windows-registry", ] [[package]] @@ -3454,9 +3996,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3464,6 +4006,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -3475,11 +4023,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -3488,16 +4036,30 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.6", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -3510,30 +4072,43 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.7", ] [[package]] name = "rustls-pemfile" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" @@ -3546,16 +4121,27 @@ dependencies = [ ] [[package]] -name = "rustversion" -version = "1.0.14" +name = "rustls-webpki" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3573,20 +4159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "502b30097ae5cc57ee8359bb59d8af349db022492de04596119d83f561ab8977" dependencies = [ "arrow2", - "sample-std 0.2.1", -] - -[[package]] -name = "sample-std" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567a153dc3302ce838920fb095c025a6d0529fff0290d25deeec2136e41a57c8" -dependencies = [ - "casey", - "quickcheck", - "rand", - "rand_regex", - "regex", + "sample-std", ] [[package]] @@ -3604,24 +4177,24 @@ dependencies = [ [[package]] name = "sample-test" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713e500947ff19fc1ae2805afa33ef45f3bb2ec656c77d92252d24cf9e3091b2" +checksum = "e8b253ca516416756b09b582e2b7275de8f51f35e5d5711e20712b9377c7d5bf" dependencies = [ "quickcheck", - "sample-std 0.1.1", + "sample-std", "sample-test-macros", ] [[package]] name = "sample-test-macros" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1a2c832a259aae95b6ed1da3aa377111ffde38d4282fa734faa3fff356534e" +checksum = "5cc6439a7589bb4581fdadb6391700ce4d26f8bffd34e2a75acb320822e9b5ef" dependencies = [ "proc-macro2", "quote", - "sample-std 0.1.1", + "sample-std", "syn 1.0.109", ] @@ -3666,11 +4239,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -3679,9 +4252,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3689,56 +4262,51 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] -[[package]] -name = "seq-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" - [[package]] name = "serde" -version = "1.0.197" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3778,10 +4346,16 @@ dependencies = [ ] [[package]] -name = "signal-hook-registry" -version = "1.4.1" +name = "shlex" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3798,9 +4372,9 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.13.8" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faf8f101b9bc484337a6a6b0409cf76c139f2fb70a9e3aee6b6774be7bfbf76" +checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" dependencies = [ "ahash", "getrandom", @@ -3836,10 +4410,19 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.13.1" +name = "slotmap" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smartstring" @@ -3869,7 +4452,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3883,9 +4466,9 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3909,13 +4492,26 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.39.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", ] +[[package]] +name = "stacker" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a5daa25ea337c85ed954c0496e3bdd2c7308cc3b24cf7b50d04876654c579f" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "windows-sys 0.36.1", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -3949,24 +4545,43 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" + [[package]] name = "strum_macros" version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.76", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.76", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3981,9 +4596,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -3992,94 +4607,76 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "sysinfo" -version = "0.30.7" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c385888ef380a852a16209afc8cfad22795dd8873d69c9a14d2e2088f118d18" +checksum = "2b92e0bdf838cbc1c4c9ba14f9c97a7ec6cdcd1ae66b10e1e42775a25553f45d" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "windows", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "target-features" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb5fa503293557c5158bd215fdc225695e567a77e453f5d4452a50a193969bd" +checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5" [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "num-conv", @@ -4097,9 +4694,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -4126,9 +4723,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4141,31 +4738,30 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4174,15 +4770,26 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -4190,7 +4797,6 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4207,9 +4813,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -4228,10 +4834,31 @@ dependencies = [ ] [[package]] -name = "tower-service" -version = "0.3.2" +name = "tower" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4252,7 +4879,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4270,6 +4897,16 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + [[package]] name = "typed-builder" version = "0.16.2" @@ -4287,7 +4924,7 @@ checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4325,9 +4962,9 @@ dependencies = [ [[package]] name = "unicode-reverse" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bea5dacebb0d2d0a69a6700a05b59b3908bf801bf563a49bd27a1b60122962c" +checksum = "4b6f4888ebc23094adfb574fdca9fdc891826287a6397d2cd28802ffd6f20c76" dependencies = [ "unicode-segmentation", ] @@ -4340,9 +4977,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unindent" @@ -4358,9 +4995,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4375,9 +5012,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -4403,9 +5040,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vsimd" @@ -4440,34 +5077,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4477,9 +5115,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4487,22 +5125,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" @@ -4519,9 +5157,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4545,11 +5183,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4560,12 +5198,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core", - "windows-targets 0.52.4", + "windows-core 0.57.0", + "windows-targets 0.52.6", ] [[package]] @@ -4574,16 +5212,93 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows-targets 0.48.5", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] [[package]] @@ -4592,7 +5307,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4612,17 +5336,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4633,9 +5358,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" @@ -4645,9 +5376,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" @@ -4657,9 +5394,21 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" @@ -4669,9 +5418,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" @@ -4681,9 +5436,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4693,9 +5448,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" @@ -4705,9 +5466,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -4719,15 +5480,22 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" +name = "x11rb" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "gethostname", + "rustix", + "x11rb-protocol", ] +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + [[package]] name = "xmlparser" version = "0.13.6" @@ -4736,59 +5504,60 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xxhash-rust" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index c6aca67e2859..4ad80d3de698 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -21,7 +21,7 @@ in buildPythonPackage rec { pname = "polars"; - version = "0.20.15"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-N/VIi0s5unYWqlR5Mpaq9cqXl2ccbzWPuOtE2UbmQw8="; + hash = "sha256-qJTBGGRxMAirgygm7Ke60olO5sTZboZ80JkYI0LZSMk="; }; # Cargo.lock file is sometimes behind actual release which throws an error, @@ -40,7 +40,10 @@ buildPythonPackage rec { #sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock ''; - cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes."numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw="; + }; buildAndTestSubdir = "py-polars"; @@ -53,7 +56,7 @@ buildPythonPackage rec { # with simd enabled with our stable rust (instead of nightly). maturinBuildFlags = [ "--no-default-features" - "--features=all" + "--all-features" ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 9ddbd38d9339..3ec9a6f76d76 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -4,30 +4,32 @@ pythonOlder, fetchPypi, appdirs, - importlib-metadata, jedi, prompt-toolkit, pygments, + setuptools, }: buildPythonPackage rec { pname = "ptpython"; - version = "3.0.28"; - format = "setuptools"; + version = "3.0.29"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vFBvVNuvRHykdMhRytNx5J4rdg2JGcQidAMH+tIqUIc="; + hash = "sha256-udYlGDrvk6Zz/DLL4cH8r1FBLnpPGVkFIc2syt8lGG4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ appdirs jedi prompt-toolkit pygments - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # no tests to run doCheck = false; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index d992ac3156f8..cf83474b807e 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20240907"; + version = "1.0.2.20240911"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+DzSFzdgGyirt8X+vW7fzofyHOLXbuVySxV+8CZ5ZlQ="; + hash = "sha256-U3gcjBmDGThIFXNw8E6yxEL3sYULfrEdOxgIWzGbhSk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyixapi/default.nix b/pkgs/development/python-modules/pyixapi/default.nix index 3a051450c5dc..50c825dcc959 100644 --- a/pkgs/development/python-modules/pyixapi/default.nix +++ b/pkgs/development/python-modules/pyixapi/default.nix @@ -1,10 +1,12 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, poetry-core, - requests, pyjwt, + pythonOlder, + pytestCheckHook, + requests, }: buildPythonPackage rec { @@ -12,24 +14,32 @@ buildPythonPackage rec { version = "0.2.3"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-qkgPBIYv9xzGa29RiPAU3zNhcyutTUX1Vkmpd9YdeJU="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "peering-manager"; + repo = "pyixapi"; + rev = "refs/tags/${version}"; + hash = "sha256-IiLjxOtyxGSaItxgEbsF8AER/j4Qe7SP9ZAEPjTiYI4="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "pyjwt" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ requests pyjwt ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "pyixapi" ]; meta = with lib; { + description = "Python API client library for IX-API"; homepage = "https://github.com/peering-manager/pyixapi/"; changelog = "https://github.com/peering-manager/pyixapi/releases/tag/${version}"; - description = "Python API client library for IX-API"; license = licenses.asl20; maintainers = teams.wdz.members; }; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index eb96516e84e4..73976a1d60e0 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "3.2.3"; + version = "3.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; rev = "refs/tags/v${version}"; - hash = "sha256-J+68YwjVhaMPlvLCMI/BdnUCQPDYU9u0pIvOYlbzWvs="; + hash = "sha256-b3KkSgTmN6ojMJaVQGwvHIa41M2eZS9prxcL5peX/xU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 8b54e55c037f..60801a0c966f 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -21,7 +21,7 @@ in buildPythonPackage ( rec { pname = "pyqtwebengine"; - version = "5.15.6"; + version = "5.15.7"; format = "pyproject"; disabled = isPy27; @@ -29,7 +29,7 @@ buildPythonPackage ( src = fetchPypi { pname = "PyQtWebEngine"; inherit version; - hash = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; + hash = "sha256-8SGsbkovlqwolhm8/Df2Tmg2LySjRlU/XWxC76Qiik0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index 05f16043172a..fe4489dcf0ec 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-examples"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pytest-examples"; rev = "refs/tags/v${version}"; - hash = "sha256-hTLTL3w4OEv8Pkzc/h9qDMnlhe6P+Q6XUImLVDsDKvk="; + hash = "sha256-R0gSWQEGMkJhkeXImyris2wzqjJ0hC3zO0voEdhWLoY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index ca345bda486c..a430b889b53f 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytest-twisted"; - version = "1.14.2-unstable-2024-08-22"; + version = "1.14.3"; pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-twisted"; - rev = "0f10b1500aa6c46a2b206abc690a4e00e3c7556b"; + rev = "refs/tags/v${version}"; hash = "sha256-1dAfCa6hON0Vh9StI1Xw69IAwBzUkR6DdjQ0HNyoyME="; }; diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 049064754937..832f2e6666d3 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; disabled = isPy27; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1y7VCnzgwFOMeMloVdYyszNhf/zZlBJUjuF4qgA5c0A="; + hash = "sha256-xlTqUUF+tUIbULd1B8XR18Kxd7kl2TRKdbp0GoAfi4g="; }; build-system = [ diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index d248b962f0d3..a1de5b4107c3 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.9.2"; + version = "1.9.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-BNWP2uAJcEOCE92QakNI7Ils0iXRN5PUA9cSVrhDmx4="; + hash = "sha256-Ah3kb+Hk1pMlQ8D1SMPAISbL2n6TDG0Ih9ezmW7oIRk="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/simple-parsing/default.nix b/pkgs/development/python-modules/simple-parsing/default.nix new file mode 100644 index 000000000000..b263f24ba1d6 --- /dev/null +++ b/pkgs/development/python-modules/simple-parsing/default.nix @@ -0,0 +1,83 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + poetry-dynamic-versioning, + + # dependencies + docstring-parser, + typing-extensions, + + # optional-dependencies + tomli, + tomli-w, + pyyaml, + + # tests + matplotlib, + numpy, + orion, + pytest-benchmark, + pytest-regressions, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "simple-parsing"; + version = "0.1.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lebrice"; + repo = "SimpleParsing"; + rev = "refs/tags/v${version}"; + hash = "sha256-RDS1sWzaQqXp/0a7dXlUHnd6z+GTIpUN1MnUCTI9LGw="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + docstring-parser + typing-extensions + ]; + + optional-dependencies = { + toml = [ + tomli + tomli-w + ]; + yaml = [ pyyaml ]; + }; + + pythonImportsCheck = [ "simple_parsing" ]; + + nativeCheckInputs = [ + matplotlib + numpy + orion + pytest-benchmark + pytest-regressions + pytestCheckHook + ]; + + disabledTests = [ + # Expected: OrderedDict([('a', 1), ('b', 2), ('c', 5), ('d', 6), ('e', 7)]) + # Got: OrderedDict({'a': 1, 'b': 2, 'c': 5, 'd': 6, 'e': 7}) + # https://github.com/lebrice/SimpleParsing/issues/326 + "simple_parsing.utils.dict_union" + ]; + + meta = { + description = "Simple, Elegant, Typed Argument Parsing with argparse"; + changelog = "https://github.com/lebrice/SimpleParsing/releases/tag/v${version}"; + homepage = "https://github.com/lebrice/SimpleParsing"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 5db44269d0f0..1d9ec9df1313 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "10.7.0"; + version = "10.10.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ntrb2osKtZRajWo7WNTw0UyPTneE9b1+c6uF/jYBRe8="; + hash = "sha256-gjUfnhBVwhYdw4wIqbv1xLbH8cr/z5EemZpwEjaUFeI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 23c8e031c489..8ac06879c105 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,38 +1,38 @@ { lib, buildPythonPackage, - fetchPypi, - freezegun, + fetchFromGitHub, jaraco-functools, - pytest-freezegun, + pytest-freezer, pytestCheckHook, + python-dateutil, pythonOlder, - pytz, setuptools-scm, }: buildPythonPackage rec { pname = "tempora"; - version = "5.6.0"; - format = "pyproject"; + version = "5.7.0"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-O/zBLL27uv7KrMuQl/w3VENbnQY9zkMzjk+ofTkQSu0="; + src = fetchFromGitHub { + owner = "jaraco"; + repo = "tempora"; + rev = "refs/tags/v${version}"; + hash = "sha256-M6nWKYvgn4tk2diiTDAYb1uQdP8H1M8yqhsFLJ9H7HU="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ jaraco-functools - pytz + python-dateutil ]; nativeCheckInputs = [ - freezegun - pytest-freezegun + pytest-freezer pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index dbbf81f588bd..362088e0145c 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1228"; + version = "3.0.1229"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-YNGehz2pTTJ6D2sZM95YLZ0Fr/rhcN+IsZT3mQCBgP0="; + hash = "sha256-sFI16249sSnBAEQOTqO/QaVSoF3Fy44X5GaAkYi9ukQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix index 3a1e587fc106..e99c8a6d0f46 100644 --- a/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -1,10 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, six, httplib2, - py, pytestCheckHook, pythonOlder, requests, @@ -19,10 +18,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "wsgi_intercept"; - inherit version; - hash = "sha256-eb1sY5qxH36r5dGK2aIPYu6CocQ1EkqHbP/YA49sJME="; + src = fetchFromGitHub { + owner = "cdent"; + repo = "wsgi-intercept"; + rev = "refs/tags/v${version}"; + hash = "sha256-hs5yB0+eDlh/pNPaqYIU9C+RBpyrdPOAscQGIoqzmvU="; }; build-system = [ setuptools ]; @@ -30,9 +30,8 @@ buildPythonPackage rec { dependencies = [ six ]; nativeCheckInputs = [ - httplib2 - py pytestCheckHook + httplib2 requests urllib3 ]; @@ -48,11 +47,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "wsgi_intercept" ]; - meta = with lib; { + meta = { description = "Module that acts as a WSGI application in place of a real URI for testing"; homepage = "https://github.com/cdent/wsgi-intercept"; changelog = "https://github.com/cdent/wsgi-intercept/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ mikecm ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mikecm ]; }; } diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index a2f1191de9a3..229ee20bc95c 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -22,13 +22,12 @@ pythonOlder, pyyaml, requests, - six, wcwidth, }: buildPythonPackage rec { pname = "xml2rfc"; - version = "3.21.0"; + version = "3.23.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,15 +36,13 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-7lYNEyoLYbxn1ld08eXaN8BumYhN9EftpHQKxdu64MY="; + hash = "sha256-6yjWDHcEp1NLqyNopaKvLHtCstpVRPBdy2UiLa5Zvnw="; }; postPatch = '' substituteInPlace Makefile \ - --replace "SHELL := /bin/bash" "SHELL := bash" \ - --replace "test flaketest" "test" - substituteInPlace setup.py \ - --replace "'tox'," "" + --replace-fail "SHELL := /bin/bash" "SHELL := bash" \ + --replace-fail "test flaketest" "test" ''; propagatedBuildInputs = [ @@ -64,7 +61,6 @@ buildPythonPackage rec { pypdf2 pyyaml requests - six wcwidth ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 6e8b2ce8a7ec..43aacdddb6e6 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -476,6 +476,7 @@ let RODBC = [ pkgs.libiodbc ]; rpanel = [ pkgs.bwidget ]; Rpoppler = [ pkgs.poppler ]; + RPostgres = with pkgs; [ postgresql ]; RPostgreSQL = with pkgs; [ postgresql postgresql ]; RProtoBuf = [ pkgs.protobuf ]; RSclient = [ pkgs.openssl.dev ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index e3a8c11c8fc4..a9827e7a0a7e 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -3,7 +3,7 @@ rec { gen = - { version, nativeVersion, hash, + { version, hash, # The default JDK/JRE that will be used for derived Gradle packages. # A current LTS version of a JDK is a good choice. @@ -36,6 +36,7 @@ rec { , testers , runCommand , writeText + , autoPatchelfHook # The JDK/JRE used for running Gradle. , java ? defaultJava @@ -57,8 +58,22 @@ rec { dontBuild = true; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ java ]; + nativeBuildInputs = [ + makeWrapper + unzip + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + ]; + + buildInputs = [ + java + stdenv.cc.cc + ncurses5 + ncurses6 + ]; + + # We only need to patchelf some libs embedded in JARs. + dontAutoPatchelf = true; installPhase = with builtins; let @@ -87,18 +102,22 @@ rec { fixupPhase = let arch = if stdenv.is64bit then "amd64" else "i386"; in '' + . ${./patching.sh} + + nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)" for variant in "" "-ncurses5" "-ncurses6"; do - mkdir "patching$variant" - pushd "patching$variant" - jar xf $out/lib/gradle/lib/native-platform-linux-${arch}$variant-${nativeVersion}.jar - patchelf \ - --set-rpath "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" \ - net/rubygrapefruit/platform/linux-${arch}$variant/libnative-platform*.so - jar cf native-platform-linux-${arch}$variant-${nativeVersion}.jar . - mv native-platform-linux-${arch}$variant-${nativeVersion}.jar $out/lib/gradle/lib/ - popd + autoPatchelfInJar \ + $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \ + "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" done + # The file-events library _seems_ to follow the native-platform version, but + # we won’t assume that. + fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" + autoPatchelfInJar \ + $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ + "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + # The scanner doesn't pick up the runtime dependency in the jar. # Manually add a reference where it will be found. mkdir $out/nix-support @@ -162,21 +181,18 @@ rec { gradle_8 = gen { version = "8.10"; - nativeVersion = "0.22-milestone-26"; hash = "sha256-W5xes/n8LJSrrqV9kL14dHyhF927+WyFnTdBGBoSvyo="; defaultJava = jdk21; }; gradle_7 = gen { version = "7.6.4"; - nativeVersion = "0.22-milestone-25"; hash = "sha256-vtHaM8yg9VerE2kcd/OLtnOIEZ5HlNET4FEDm4Cvm7E="; defaultJava = jdk17; }; gradle_6 = gen { version = "6.9.4"; - nativeVersion = "0.22-milestone-20"; hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo="; defaultJava = jdk11; }; diff --git a/pkgs/development/tools/build-managers/gradle/patching.sh b/pkgs/development/tools/build-managers/gradle/patching.sh new file mode 100644 index 000000000000..73659fad2f80 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/patching.sh @@ -0,0 +1,29 @@ +extractVersion() { + local jar version + local prefix="$1" + shift + local candidates="$@" + + jar="$(basename -a $candidates | sort | head -n1)" + + version="${jar#$prefix-}" + + echo "${version%.jar}" +} + +autoPatchelfInJar() { + local file="$1" rpath="$2" + local work + + work="$(mktemp -dt patching.XXXXXXXXXX)" + pushd "$work" + + jar xf "$file" + rm "$file" + + autoPatchelf -- . + + jar cf "$file" . + + popd +} diff --git a/pkgs/development/tools/build-managers/gradle/update.sh b/pkgs/development/tools/build-managers/gradle/update.sh index 310c368405cb..4e247954f028 100755 --- a/pkgs/development/tools/build-managers/gradle/update.sh +++ b/pkgs/development/tools/build-managers/gradle/update.sh @@ -49,20 +49,7 @@ do read -d "\n" gradle_hash gradle_path < <(nix-prefetch-url --print-path $url) gradle_hash=$(nix-hash --to-sri --type sha256 "$gradle_hash") - # Prefix and suffix for "native-platform" dependency. - gradle_native_prefix="gradle-$v/lib/native-platform-" - gradle_native_suffix=".jar" - tmp=$(mktemp) - zipinfo -1 "$gradle_path" "$gradle_native_prefix*$gradle_native_suffix" > $tmp - gradle_native=$(cat $tmp | head -n1) - gradle_native=${gradle_native#"$gradle_native_prefix"} - gradle_native=${gradle_native%"$gradle_native_suffix"} - - # Supported architectures - #grep -Pho "(linux|osx)-\w+" $tmp | sort | uniq - rm -f $tmp - - echo -e "{\\n version = \"$v\";\\n nativeVersion = \"$gradle_native\";\\n sha256 = \"$gradle_hash\";\\n}" > $f + echo -e "{\\n version = \"$v\";\\n sha256 = \"$gradle_hash\";\\n}" > $f echo "$v DONE" done diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 81101b23f54a..638d046aa675 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "9.2.0"; + version = "9.2.1"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/9.2.0/2aa043a/heroku-v9.2.0-2aa043a-linux-x64.tar.xz"; - hash = "sha256-WQM9+yftFSPVTSHX7M05ZQNsk75dIIjZFmq50ZaIDpU="; + url = "https://cli-assets.heroku.com/versions/9.2.1/6e4f307/heroku-v9.2.1-6e4f307-linux-x64.tar.xz"; + hash = "sha256-9MeZx4LmKyh3DSIz+ZZVY/qpFDqk5oE4P/MIUQPmRb8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index 3ba0b0ced416..2aeab15f5d72 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BPadZ9FVWnE/5OVYRyGZVGQQ4B3Is+HhUWcf3ZVS7jM="; + sha256 = "sha256-f12p9d6c3dXOOSnR//bIAs6wB9359GEeN9P1Lfb1/0Y="; }; patches = [ ./version.patch ]; diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix index 4131b6a53920..ae1046318cd5 100644 --- a/pkgs/development/tools/misc/texinfo/packages.nix +++ b/pkgs/development/tools/misc/texinfo/packages.nix @@ -88,10 +88,6 @@ in branch = finalAttrs.version; }; }); - texinfo5 = buildTexinfo { - version = "5.2"; - hash = "sha256-VHHvaDpkWIp8/vRu8r3T+8vKidhH4QgyYSKT8QXkTto="; - }; texinfo6_5 = buildTexinfo { version = "6.5"; hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I="; diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 0cb424fdca64..43b531d09837 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.11.0"; + version = "1.11.1"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-zndqNd4CTzXuDkkc6uzjwKdUnypnV/4NppcVJ0N3S1U="; + hash = "sha256-gSfj5d8g2eQGhaT4dGyNPqWy+9GkDxMkMuZ7vKnhFVQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index a80e8282f8f4..4809110d8c80 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.10"; + version = "2.4.11"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-d/RLFsQDyQR4KXZQexaYJs4Tszfd2vJz7TAv+FIwg54="; + hash = "sha256-Si7fjcUsj5Q+SezBGzQtzvu6OK2ZFk6YruYabYpuyK4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 178b10b0be09..fa8ba8accb04 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-jdGNZg/LXOoudxVhJbFeWEC9L3s0HW1S4nhfsGR4mEI="; + hash = "sha256-MCsFcEdP8SaT6PiCidUD5DBjRdeS+YIrQHpKsAnL4gA="; }; - cargoHash = "sha256-YW++YcpQM1Al7qD+KoVJitfK41i59sLjb3edBge1cvA="; + cargoHash = "sha256-Eif6e/6HHOLI4dvptQvk1LTIoaalCoVtXwM4CpEivcI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index b49fb2c89473..527188019e73 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://chessx.sourceforge.io/"; description = "Browse and analyse chess games"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eclairevoyant luispedro ]; + maintainers = with maintainers; [ luispedro ]; platforms = platforms.linux; mainProgram = "chessx"; }; diff --git a/pkgs/games/cutechess/default.nix b/pkgs/games/cutechess/default.nix index 5e374afa1bca..6c473857ba75 100644 --- a/pkgs/games/cutechess/default.nix +++ b/pkgs/games/cutechess/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { description = "GUI, CLI, and library for playing chess"; homepage = "https://cutechess.com/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ eclairevoyant ]; + maintainers = with maintainers; [ ]; platforms = with platforms; (linux ++ windows); mainProgram = "cutechess"; }; diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index f16f625c7c64..81874617f70a 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -76,6 +76,7 @@ applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; karousel = self.callPackage ./third-party/karousel {}; + krohnkite = self.callPackage ./third-party/krohnkite {}; kzones = self.callPackage ./third-party/kzones {}; } ); diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix new file mode 100644 index 000000000000..03b3e64adcfe --- /dev/null +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs_22, + kwin, + kpackage, + zip, +}: +buildNpmPackage rec { + pname = "krohnkite"; + version = "0.9.7"; + + src = fetchFromGitHub { + owner = "anametologin"; + repo = "krohnkite"; + rev = "refs/tags/${version}"; + hash = "sha256-8A3zW5tK8jK9fSxYx28b8uXGsvxEoUYybU0GaMD2LNw="; + }; + + npmDepsHash = "sha256-My1goFEoZW9kFA3zb8xKPxAPXm6bypyq+ajPM8zVOHQ="; + + dontWrapQtApps = true; + + nodejs = nodejs_22; + + nativeBuildInputs = [ + kpackage + zip + kwin + ]; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + npmBuildScript = "tsc"; + + installPhase = '' + runHook preInstall + + substituteInPlace Makefile --replace-fail '7z a -tzip' 'zip -r' + make krohnkite-${version}.kwinscript + kpackagetool6 --type=KWin/Script --install=krohnkite-${version}.kwinscript --packageroot=$out/share/kwin/scripts + + runHook postInstall + ''; + + meta = { + description = "Dynamic Tiling Extension for KWin 6"; + homepage = "https://github.com/anametologin/krohnkite"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ben9986 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/kde/third-party/krohnkite/package-lock.json b/pkgs/kde/third-party/krohnkite/package-lock.json new file mode 100644 index 000000000000..2ac91ccab875 --- /dev/null +++ b/pkgs/kde/third-party/krohnkite/package-lock.json @@ -0,0 +1,877 @@ +{ + "name": "krohnkite", + "version": "0.9.7", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "krohnkite", + "version": "0.9.7", + "license": "MIT", + "devDependencies": { + "mocha": "^10.4.0", + "typescript": "^5.4.5" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/diff": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha": { + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", + "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", + "dev": true, + "dependencies": { + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/typescript": { + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/workerpool": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/kde/third-party/kzones/default.nix b/pkgs/kde/third-party/kzones/default.nix index a53d88af099a..de2ff39b311b 100644 --- a/pkgs/kde/third-party/kzones/default.nix +++ b/pkgs/kde/third-party/kzones/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kzones"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "gerritdevriese"; repo = "kzones"; rev = "v${finalAttrs.version}"; - hash = "sha256-6cZJEcvynlP9nXyBKRst8Bca0d8Mh51ft7ocRrgCV7w="; + hash = "sha256-xqTQiL+7T6p+Y86eC5InAk6waYoM82iFoLflkN6/dG8="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index b853c21ac31a..e656d68d6356 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.13.3"; + version = "10.14.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-tjaYsvCj0Vy0DyTgoZthtQhYYLuBw1+ncVdb9rB71Vw="; + hash = "sha256-bYxA/+bzbam7fT9kAPZ7W5gLDu8l5vowL26OrD+qlCA="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-WZfaIoVwLMoXU/NLVQAiwH6SuEU0BEKy4Vg887K6c6o="; + vendorHash = "sha256-innmJ40h80SFx8dRVsY4vR5QehFuavkl357zShXiyIE="; nativeBuildInputs = [ installShellFiles @@ -52,8 +52,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20231130153524/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-ZKr6D4DI+lr8FDjfLMgpn4Zq4i5kiwcLEDEScuuCBBw="; + url = "https://web.archive.org/web/20240910172801/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-r4ahroyU4hyTN88UK02FvXU8OTQ6OoNInt9WrzZk7Bk="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 28e5af7a44d6..b169e5a83dab 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, libxml2, zlib, bzip2, which, file +, autoreconfHook , openssl , enableDbi ? false, libdbi , enableMagnet ? false, lua5_1 @@ -14,11 +15,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.75"; + version = "1.4.76"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-i3IcqTnTEq+qbvMdy9avtRYe04Wsgo5vzNTFt2vhidY="; + sha256 = "sha256-jL9CluNzz9DO3+nZeHYLWwXFj9xASLTivK8KYayPUBE="; }; separateDebugInfo = true; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcre2 pcre2.dev libxml2 zlib bzip2 which file openssl ] ++ lib.optional enableDbi libdbi ++ lib.optional enableMagnet lua5_1 diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index 8f8bef86ab2b..811fa2e92d9b 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -7,13 +7,13 @@ , enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; rev = "refs/tags/v${version}"; - hash = "sha256-a/EWz/aCkBE6XdDpmZcx2Q7/xKNwGCiZUhZc9YIIDhU="; + hash = "sha256-4H+zUH0GEQ5e/9Bv0BVdf1/pXulx2ihZrhJ+jl/db+U="; }; patches = [ diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index e7e9c7f7360b..6ba8bbedd76f 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2024-07-03"; + version = "0-unstable-2024-09-08"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "f11139d4c918802a87730bc14d094670ee4ce572"; - hash = "sha256-vkBXzIezC9DWlGpk6klUvtmq4F4D5LJWwjEllMIr8D0="; + rev = "877bce095a192ead0e9b6e0d5ce3071482cf0f6e"; + hash = "sha256-s1l7IyWRzaBTtoj71W+Ubmcigw4w7Ypf1Yg44vxN2Qg="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 3e8a2e628578..74746fa5f1f3 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { # and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction # the unRAR compression code is disabled by default lib.optionals enableUnfree [ unfree ]; - maintainers = with lib.maintainers; [ anna328p eclairevoyant jk peterhoeg ]; + maintainers = with lib.maintainers; [ anna328p jk peterhoeg ]; platforms = with lib.platforms; unix ++ windows; mainProgram = "7zz"; }; diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 2bca01f54527..9b50d87d9920 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - hash = "sha256-qPdrcWCD8BYwRwnynNhcti7eUskgHP1kAS6KiS0LHsc="; + hash = "sha256-qTJU5o0wjHu3M8zMwMm6/QTAqD2JvCg9XnxfW77MCoI="; }; - vendorHash = "sha256-tKbn/dFnYTc0fYwYUrrpdN1hzx047yQSFdTG94CifhM="; + vendorHash = "sha256-y5ao4C24Py8NmZLZlpoz3C7TvUe5vsI74QdzQ7LAh6o="; excludedPackages = [ "sdk/java/libjfs" ]; diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index 0d2a5eb4ac7e..caea55766d1f 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/emersion/grim"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ eclairevoyant ]; + maintainers = with maintainers; [ ]; mainProgram = "grim"; }; } diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix index 4219275fab4f..b6a9253148c4 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Vietnamese input method engine support for Fcitx"; homepage = "https://github.com/fcitx/fcitx5-bamboo"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 08d130513cd9..f84c93eb3faa 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { description = "Terminal session recorder and the best companion of asciinema.org"; homepage = "https://asciinema.org/"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; mainProgram = "asciinema"; }; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 3a6270d19602..08ff99cbb5e6 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.14.2"; + version = "1.14.3"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-BK2QTlcns+e3LL3NgcVYk4an+j/x0btpKAuBZ+QIN+Q="; + sha256 = "sha256-uYQO+PSvBJN1GYtycpVi1h9bD8RNoVC+R+WKJy+qDMc="; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix index bc841b7fcf8e..39d936527dfa 100644 --- a/pkgs/tools/misc/glasgow/default.nix +++ b/pkgs/tools/misc/glasgow/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "0-unstable-2024-07-13"; + version = "0-unstable-2024-09-10"; # from `pdm show` realVersion = let tag = builtins.elemAt (lib.splitString "-" version) 0; @@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "c8fa37e7c84efb296a06c58b2949f676a1e149cc"; - sha256 = "sha256-rOgd5y9KQf4cpBT31RHlrVwHsiqdofRihtFbeC69DY4="; + rev = "f2c0ecbe0d47d96f940e77f9def209e9c57d3962"; + sha256 = "sha256-aNzNh/YkWjnHiO+QWbJu2Y3kL/53kDvVn/8Ncz2kpFI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index 8e39737532d2..bb4f78b0861b 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-Hws8bq2NVBBS3ngzCT5mPNThHDOK5waX4TxK4zlsNC0="; + sha256 = "sha256-Aoa3cqjnyPXxS0KRZ+2L0EK5KhjEUVQtQuKbO+ouo3I="; }; - vendorHash = "sha256-DHGPWHOEobBqb2QpUh7WAEViOQKQ8+8PDLPBi812H+k="; + vendorHash = "sha256-AhoS/I1ypHI4oxsBaFGsMA74eX8so1kAf5Fui36uDaE="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 234a6265144b..a92d2132d697 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.18.1"; + version = "2.18.2"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; rev = "refs/tags/${version}"; - hash = "sha256-pCBwt55tu9bEVVHfdPsJ5vaJXVXEZ2+4ft9LathwBt0="; + hash = "sha256-R3oeu8HvPWAQoO0FHHx9lSKmB/riPtQ9gq4qKtQCeiA="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index 1b874921cce7..af20cb3ff775 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.29.0"; + version = "1.31.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-x37FRSjhqV7LxD8VFSmVjg/FPlxsa4NEX6y7OEAniF4="; + hash = "sha256-ShczC0DvAO92apkNq5oyYRbkqGdqwl6vaCY1hn8O6so="; }; pythonRelaxDeps = true; @@ -70,6 +70,7 @@ python3.pkgs.buildPythonApplication rec { "test_check_git_dir" "test_does_not_fail_if_cache" # Encoding issues + "test_create_files_from_paths" "test_file_decode_content" "test_file_is_longer_than_does_not_read_utf8_file" "test_file_is_longer_using_8bit_codec" diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 193a5433b598..e7710b7d151e 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "secp256k1"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; rev = "refs/tags/v${version}"; - sha256 = "sha256-XcxBzOJngrm1szs48bBS6pcH2yaLfLKPUtyQ51eItaw="; + sha256 = "sha256-IYvvBob8e82EiPLX9yA8fd+KWrMri1rI5csp81rAdrg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 8e6d7b06d170..0eaa1bb04a37 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ec2-ami-tools"; - version = "1.5.7"; + version = "1.5.19"; nativeBuildInputs = [ makeWrapper unzip ]; src = fetchurl { url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip"; - sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias"; + sha256 = "sha256-vdpElL6n1V3/+ZVFndRwWpU/M2W7xp8DQwx5a1zB3X8="; }; # Amazon EC2 requires that disk images are writable. If they're diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3ac307ad53b6..ce21eab77ab6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -509,10 +509,12 @@ mapAliases ({ garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12 garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 + gcc48 = throw "'gcc48' has been removed from nixpkgs"; # Added 2024-09-10 gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 + gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 @@ -1219,6 +1221,7 @@ mapAliases ({ pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; postgis = postgresqlPackages.postgis; + texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10 timescaledb = postgresqlPackages.timescaledb; tsearch_extras = postgresqlPackages.tsearch_extras; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92447a39ca25..05f9f913f35c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8022,7 +8022,9 @@ with pkgs; ggobi = callPackage ../tools/graphics/ggobi { }; - ggshield = callPackage ../tools/security/ggshield { }; + ggshield = callPackage ../tools/security/ggshield { + python3 = python311; + }; ghost = callPackage ../tools/security/ghost { }; @@ -10744,10 +10746,6 @@ with pkgs; notify-osd = callPackage ../applications/misc/notify-osd { }; - notes = qt6Packages.callPackage ../applications/office/notes { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - notes-up = callPackage ../applications/office/notes-up { }; notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { }; @@ -15014,7 +15012,7 @@ with pkgs; }; inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; }) - gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; + gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; gcc_latest = gcc14; @@ -19014,7 +19012,6 @@ with pkgs; texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { }; inherit (texinfoPackages) texinfo413 - texinfo5 # needed for gcc48 texinfo6_5 # needed for allegro texinfo6_7 # needed for gpm, iksemel and fwknop texinfo6 @@ -31409,8 +31406,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; - libvmi = callPackage ../development/libraries/libvmi { }; - libutp = callPackage ../applications/networking/p2p/libutp { }; libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { }; @@ -31627,8 +31622,6 @@ with pkgs; mercurialFull = mercurial.override { fullBuild = true; }; - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { }; meshcentral = callPackage ../tools/admin/meshcentral { }; diff --git a/pkgs/top-level/emilua-plugins.nix b/pkgs/top-level/emilua-plugins.nix index a4387b18e653..eb220d4b3ab7 100644 --- a/pkgs/top-level/emilua-plugins.nix +++ b/pkgs/top-level/emilua-plugins.nix @@ -9,4 +9,6 @@ emilua: (lib.makeScope newScope (self: { inherit emilua; beast = self.callPackage ../development/emilua-plugins/beast { }; + qt5 = self.callPackage ../development/emilua-plugins/qt5 { }; + qt6 = self.callPackage ../development/emilua-plugins/qt6 { }; })) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 721f2409520a..2deac32df67c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -283,6 +283,7 @@ mapAliases ({ jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 jupyterlab_launcher = throw "jupyterlab_launcher has been removed as it's abandoned for over 5 years and broken"; # added 2023-11-11 jupyterlab_server = jupyterlab-server; # added 2023-11-12 + kafka-python = kafka-python-ng; # added 2024-07-19 Kajiki = kajiki; # added 2023-02-19 keepkey_agent = keepkey-agent; # added 2024-01-06 Keras = keras; # added 2021-11-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d983736161e..32e9eca5c43a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6612,8 +6612,6 @@ self: super: with self; { kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; - kafka-python = callPackage ../development/python-modules/kafka-python { }; - kafka-python-ng = callPackage ../development/python-modules/kafka-python-ng { }; kaggle = callPackage ../development/python-modules/kaggle { }; @@ -14180,6 +14178,8 @@ self: super: with self; { simber = callPackage ../development/python-modules/simber { }; + simple-parsing = callPackage ../development/python-modules/simple-parsing { }; + simple-term-menu = callPackage ../development/python-modules/simple-term-menu { }; simpleaudio = callPackage ../development/python-modules/simpleaudio { };