diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 02dfa3508c4f..8374d55ac2f7 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -64,7 +64,7 @@ To avoid costly file system access when locating icons, GTK, [as well as Qt](htt ### Packaging icon themes {#ssec-icon-theme-packaging} -Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. +Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the [icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest), icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. The package `hicolor-icon-theme` provides a setup hook which makes symbolic links for the parent themes into the directory `share/icons` of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, together with `hicolor-icon-theme`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 86ba6402a342..8c1b474b231b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12193,6 +12193,11 @@ github = "lenivaya"; githubId = 49302467; }; + lenny = { + name = "Lenny."; + matrix = "lenny@flipdot.org"; + keys = [ { fingerprint = "6D63 2D4D 0CFE 8D53 F5FD C7ED 738F C800 6E9E A634"; } ]; + }; leo248 = { github = "leo248"; githubId = 95365184; @@ -15580,6 +15585,12 @@ githubId = 3159451; name = "Nicolas Schneider"; }; + nipeharefa = { + name = "Nipe Harefa"; + email = "nipeharefa@gmail.com"; + github = "nipeharefa"; + githubId = 12620257; + }; NIS = { name = "NSC IT Solutions"; github = "dev-nis"; diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index ede54318d558..39961f0f25d5 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -99,8 +99,9 @@ in rec { l = reverseList (stringToCharacters s); suffix = head l; nums = tail l; - in elem suffix (["K" "M" "G" "T"] ++ digits) - && all (num: elem num digits) nums; + in builtins.isInt s + || (elem suffix (["K" "M" "G" "T"] ++ digits) + && all (num: elem num digits) nums); assertByteFormat = name: group: attr: optional (attr ? ${name} && ! isByteFormat attr.${name}) diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index 6f33f592cf57..8fc3cb9920fa 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -10,7 +10,7 @@ default = true; description = '' Whether to install files to support the - [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html). + [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest). ''; }; }; diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index b0267d21d3eb..5fc7b3506a1d 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -10,7 +10,7 @@ default = true; description = '' Whether to install files to support the - [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html). + [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/latest). ''; }; xdg.icons.fallbackCursorThemes = lib.mkOption { diff --git a/nixos/modules/config/xdg/menus.nix b/nixos/modules/config/xdg/menus.nix index a71a46dd36cc..6c05d49189ad 100644 --- a/nixos/modules/config/xdg/menus.nix +++ b/nixos/modules/config/xdg/menus.nix @@ -10,7 +10,7 @@ default = true; description = '' Whether to install files to support the - [XDG Desktop Menu specification](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html). + [XDG Desktop Menu specification](https://specifications.freedesktop.org/menu-spec/latest). ''; }; }; diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 9bd1af397002..20a49a5346e2 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -17,8 +17,8 @@ in default = true; description = '' Whether to install files to support the - [XDG Shared MIME-info specification](https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html) and the - [XDG MIME Applications specification](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html). + [XDG Shared MIME-info specification](https://specifications.freedesktop.org/shared-mime-info-spec/latest) and the + [XDG MIME Applications specification](https://specifications.freedesktop.org/mime-apps-spec/latest). ''; }; @@ -32,7 +32,7 @@ in description = '' Adds associations between mimetypes and applications. See the [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information. + specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. ''; }; @@ -46,7 +46,7 @@ in description = '' Sets the default applications for given mimetypes. See the [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#default) for more information. + specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/default) for more information. ''; }; @@ -60,7 +60,7 @@ in description = '' Removes associations between mimetypes and applications. See the [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information. + specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. ''; }; }; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 6e3e2eb475f3..34526c1b20a3 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -217,7 +217,7 @@ in imports = let mkToolModule = { name, package ? pkgs.${name} }: { config, ... }: { options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // { - default = config.nix.enable; + default = config.nix.enable && ! config.system.disableInstallerTools; internal = true; }; @@ -235,27 +235,14 @@ in (mkToolModule { name = "nixos-version"; package = nixos-version; }) ]; - config = lib.mkMerge [ - (lib.mkIf config.system.disableInstallerTools { - system.tools = { - nixos-build-vms.enable = false; - nixos-enter.enable = false; - nixos-generate-config.enable = false; - nixos-install.enable = false; - nixos-option.enable = false; - nixos-rebuild.enable = false; - nixos-version.enable = false; - }; - }) - { - documentation.man.man-db.skipPackages = [ nixos-version ]; + config = { + documentation.man.man-db.skipPackages = [ nixos-version ]; - # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally. - system.build = { - inherit nixos-generate-config nixos-install nixos-rebuild; - nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option; - nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter; - }; - } - ]; + # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally. + system.build = { + inherit nixos-generate-config nixos-install nixos-rebuild; + nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option; + nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter; + }; + }; } diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index f4944d3ce318..dd739798963c 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -32,6 +32,12 @@ let ${cfg.extraCgroupConfig} ''; + mpiConf = pkgs.writeTextDir "mpi.conf" + '' + PMIxCliTmpDirBase=${cfg.mpi.PmixCliTmpDirBase} + ${cfg.mpi.extraMpiConfig} + ''; + slurmdbdConf = pkgs.writeText "slurmdbd.conf" '' DbdHost=${cfg.dbdserver.dbdHost} @@ -45,7 +51,7 @@ let # in the same directory as slurm.conf etcSlurm = pkgs.symlinkJoin { name = "etc-slurm"; - paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths; + paths = [ configFile cgroupConfig plugStackConfig mpiConf ] ++ cfg.extraConfigPaths; }; in @@ -242,6 +248,24 @@ in ''; }; + mpi = { + PmixCliTmpDirBase = lib.mkOption { + default = "/tmp/pmix"; + type = lib.types.str; + description = '' + Base path for PMIx temporary files. + ''; + }; + + extraMpiConfig = lib.mkOption { + default = ""; + type = lib.types.lines; + description = '' + Extra configuration for that will be added to `mpi.conf`. + ''; + }; + }; + extraPlugstackConfig = lib.mkOption { default = ""; type = lib.types.lines; @@ -372,8 +396,9 @@ in }; }; - systemd.tmpfiles.rules = lib.mkIf cfg.client.enable [ + systemd.tmpfiles.rules = lib.optionals cfg.client.enable [ "d /var/spool/slurmd 755 root root -" + "d ${cfg.mpi.PmixCliTmpDirBase} 755 root root -" ]; services.openssh.settings.X11Forwarding = lib.mkIf cfg.client.enable (lib.mkDefault true); diff --git a/nixos/modules/services/misc/renovate.nix b/nixos/modules/services/misc/renovate.nix index 9062b7424b68..9fbd8ec9e1ac 100644 --- a/nixos/modules/services/misc/renovate.nix +++ b/nixos/modules/services/misc/renovate.nix @@ -100,12 +100,10 @@ in ] ++ cfg.runtimePackages; serviceConfig = { - Type = "oneshot"; User = "renovate"; Group = "renovate"; DynamicUser = true; LoadCredential = lib.mapAttrsToList (name: value: "SECRET-${name}:${value}") cfg.credentials; - RemainAfterExit = false; Restart = "on-failure"; CacheDirectory = "renovate"; StateDirectory = "renovate"; diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 034de0620d88..18b646c80890 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -84,6 +84,10 @@ in { docbook5 docbook_xsl_ns grub2 + nixos-artwork.wallpapers.simple-dark-gray-bootloader + perlPackages.FileCopyRecursive + perlPackages.XMLSAX + perlPackages.XMLSAXBase kbd kbd.dev kmod.dev @@ -92,16 +96,20 @@ in { libxml2.bin libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom - ntp + perlPackages.ConfigIniFiles + perlPackages.FileSlurp + perlPackages.JSON perlPackages.ListCompare perlPackages.XMLLibXML - python3 + # make-options-doc/default.nix + (python3.withPackages (p: [ p.mistune ])) shared-mime-info - stdenv sudo + switch-to-configuration-ng texinfo unionfs-fuse xorg.lndir + os-prober # add curl so that rather than seeing the test attempt to download # curl's tarball, we see what it's trying to download diff --git a/nixos/tests/renovate.nix b/nixos/tests/renovate.nix index a30b5b3d60b9..deaac4faa5ce 100644 --- a/nixos/tests/renovate.nix +++ b/nixos/tests/renovate.nix @@ -58,12 +58,12 @@ import ./make-test-python.nix ( machine.succeed("git -C /tmp/kitty push origin") machine.succeed(f"echo '{accessToken}' > /etc/renovate-token") - machine.systemctl("start renovate.service") + machine.systemctl("start --wait renovate.service") machine.succeed("tea pulls list --repo meow/kitty | grep 'Configure Renovate'") machine.succeed("tea pulls merge --repo meow/kitty 1") - machine.systemctl("start renovate.service") + machine.systemctl("start --wait renovate.service") ''; } ) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix deleted file mode 100644 index 1da0b6ee0d22..000000000000 --- a/pkgs/applications/audio/distrho/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ lib -, stdenv -, alsa-lib -, fetchFromGitHub -, fftwFloat -, freetype -, libGL -, libX11 -, libXcursor -, libXext -, libXrender -, meson -, ninja -, pkg-config -}: - -let rpathLibs = [ - fftwFloat -]; -in -stdenv.mkDerivation rec { - pname = "distrho-ports"; - version = "2021-03-15"; - - src = fetchFromGitHub { - owner = "DISTRHO"; - repo = "DISTRHO-Ports"; - rev = version; - sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf"; - }; - - nativeBuildInputs = [ pkg-config meson ninja ]; - - buildInputs = rpathLibs ++ [ - alsa-lib - freetype - libGL - libX11 - libXcursor - libXext - libXrender - ]; - - postFixup = '' - for file in \ - $out/lib/lv2/vitalium.lv2/vitalium.so \ - $out/lib/vst/vitalium.so \ - $out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so - do - patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file - done - ''; - - meta = with lib; { - homepage = "http://distrho.sourceforge.net/ports"; - description = "Linux audio plugins and LV2 ports"; - longDescription = '' - Includes: - arctican-function - arctican-pilgrim - dexed - drowaudio-distortion - drowaudio-distortionshaper - drowaudio-flanger - drowaudio-reverb - drowaudio-tremolo - drumsynth - easySSP - eqinox - HiReSam - juce-opl - klangfalter - LUFSMeter - LUFSMeter-Multi - luftikus - obxd - pitchedDelay - refine - stereosourceseparation - swankyamp - tal-dub-3 - tal-filter - tal-filter-2 - tal-noisemaker - tal-reverb - tal-reverb-2 - tal-reverb-3 - tal-vocoder-2 - temper - vex - vitalium - wolpertinger - ''; - license = with licenses; [ gpl2Only gpl3Only gpl2Plus lgpl2Plus lgpl3Only mit ]; - maintainers = [ ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 6f28bf98a1b1..bd6513e4e4f7 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -50,27 +50,14 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-wgujiFvaWejSEXTbq/Re/7Ca1jIqso2uZej3Lb3V4I8="; + sha256 = "sha256-bHpPhav9JBPkwJA9o+IFHRWbvxWnGkD1wHBHS4XJ/YE="; }; - patches = [ - # https://github.com/musescore/MuseScore/pull/24326 - (fetchpatch { - name = "fix-menubar-with-qt6.5+.patch"; - url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch"; - hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0="; - }) - (fetchpatch { - name = "fix-crash-accessing-uninitialized-properties.patch"; - url = "https://github.com/musescore/MuseScore/pull/24714.patch"; - hash = "sha256-ErrCU/U+wyfD7R8kiZTifGIeuCAdKi1q7uxYsoE/OLA="; - }) - ]; cmakeFlags = [ "-DMUSE_APP_BUILD_MODE=release" diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index 56fffc0080cd..d53540ba0cf6 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.9.1"; - hash = "sha256-XWWBk/QW37Dg0RJJwJ65w1r9WGC6iAGCgigsnGm/ilc="; + version = "1.9.3"; + hash = "sha256-3+KIO2d/0egvc4awStYgPvpWa9fmYH0V7QHUavzFn8A="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 527e26c2d9c3..02e8a74f4107 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -6,28 +6,28 @@ }: let - version = "0.12.2"; + version = "0.12.3"; sources = { "x86_64-linux" = { arch = "linux-x64"; url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; - hash = "sha256-42xUp1HDnu1YZwXYgBhqshNzA0sx7VZLZzSaQypZb1M="; + hash = "sha256-dpvdWE0LL4PY2bzfRLazqP+VB9SSyhwnMLoOLsMmNJw="; }; "x86_64-darwin" = { arch = "darwin-x64"; url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; - hash = "sha256-RFxhGKQpQnMbwuYfHQolFRJxI61hzog2A44x7W39yKw="; + hash = "sha256-81ahZTuIG5ukXm+gmVzg4RgryRTyOIBaQ6BvGLCXVp0="; }; "aarch64-linux" = { arch = "linux-arm64"; url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; - hash = "sha256-KHeg2wAe1aynwAbQh5Do/rCbk2bqLZ3iIrYpDFRIw/E="; + hash = "sha256-brheyxw4tHXF5Guzn8fzolQmcLQvOknPeAtGNPowcBk="; }; "aarch64-darwin" = { arch = "darwin-arm64"; url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; - hash = "sha256-3y/MhxDgQBnbQ2OYLYFcl7488sKE7iVO4YhUhmQyCIM="; + hash = "sha256-EgupFXNfKKkk3FgEmgYwsY/QdaTLlbghKIIHQcvLatY="; }; }; in diff --git a/pkgs/applications/file-managers/mucommander/deps.json b/pkgs/applications/file-managers/mucommander/deps.json deleted file mode 100644 index 264328bca01d..000000000000 --- a/pkgs/applications/file-managers/mucommander/deps.json +++ /dev/null @@ -1,1064 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains": { - "jediterm#jediterm-core/3.17": { - "jar": "sha256-H+W44u9O07KMjsN6RQeX4X/XrD55JPlo7x1It5dvja8=", - "pom": "sha256-Q90WihOSMfQwY4TrVl5a6t9m23kKyvs8ZdF/clKpcug=" - }, - "jediterm#jediterm-ui/3.17": { - "jar": "sha256-7NUda5rQJjnDi+xq60mXwZKHj3i2/DCoBzzQSFT2Vhw=", - "pom": "sha256-Cc/AVJs6u5eNfJiBkAk4+/reuzup4Xl1LjvOtLXf3cg=" - }, - "pty4j#purejavacomm/0.0.11.1": { - "jar": "sha256-McBIqGBX4HJyQpqibpBxPtvelq+XRzYvJ0cNjoajmKM=", - "pom": "sha256-x/2ePzjDduHwyb3HGm+NWKz6ytqK/sF99dbjjadR02s=" - } - }, - "https://plugins.gradle.org/m2": { - "com/athaydes/osgi-run#com.athaydes.osgi-run.gradle.plugin/1.6.0": { - "pom": "sha256-+xykaSPbBh7wPQYefKAvJmXT/HIz/B/NDrsFqpZPDLk=" - }, - "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.4": { - "pom": "sha256-0kiTtasyoeS0aMK/2OoTMqA9qBFFhgpuz3e/bM6fE6c=" - }, - "edu/sc/seis/launch4j#launch4j/2.5.4": { - "jar": "sha256-ItJxFUklmcsCnJcoo1nKPuEHXuoMVNMCLP9l8CNB734=", - "module": "sha256-36qMMXxT12p0b8RM8T8onfxF/6dx1e9gRkinCOMv8bA=", - "pom": "sha256-x3C0urW9xQxP3xKUkCBdFmfYKEwGLK5wS7vGy2xXKv8=" - }, - "gradle/plugin/com/athaydes/gradle/osgi#osgi-run-core/1.6.0": { - "jar": "sha256-aL4xq5FzCujxcNdLADLLdjwNGLRrInpyGfcA3NXJIig=", - "pom": "sha256-WrXeDFsFM5qb4YtafXw/nW/ubTYi+uYoMmM3qvntAsc=" - }, - "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { - "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" - } - }, - "https://repo.maven.apache.org/maven2": { - "ant#ant/1.6.5": { - "jar": "sha256-8GpgHHGKfJJi10t+w7qtFMglhOiSNQibT4IdakTZ4eQ=", - "pom": "sha256-b83RPYGzLw7byJCBHS9z1HU7ZebkKe3QByxBYP4Hd0A=" - }, - "avalon-framework#avalon-framework/4.1.5": { - "jar": "sha256-gz8eUN+mKPE9SkIGs+xtj0LpYoSjXXbActiAgEt0egQ=", - "pom": "sha256-WsHHwtsp/rJWj1xxlZpsCKbEHgZZsSa/owisdCHyysg=" - }, - "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/6.4.0": { - "jar": "sha256-G9LIOa4YEoDsBrXCBRuE+sf1mZagUZQOGk24RtvG828=", - "pom": "sha256-677wPInYJxwp7I2b7oZWCG+D5M273AKTUtcBWk/mMNk=" - }, - "biz/aQute/bnd#biz.aQute.bnd.gradle/6.4.0": { - "jar": "sha256-lakUFc2tA0LJJb97sDgwVye9TU1+MSLScClC/zWbCTo=", - "pom": "sha256-IhATjNEm8dfAKe0waawigmXckZfw3XSjyESPKwoXIpQ=" - }, - "biz/aQute/bnd#biz.aQute.bnd.util/6.4.0": { - "jar": "sha256-ZbW9Sg+rFoEvGADJj/dKA483o4v+iZrzgu/tTv3B4+E=", - "pom": "sha256-o9QfkwNfFvSai1AFrNPQlrfzJoagUVMNmhiuzT25DCE=" - }, - "biz/aQute/bnd#biz.aQute.bndlib/6.4.0": { - "jar": "sha256-NXFFB0hy+dv2fmKfzSN+YVJwflddc130U1KC+fWI0tg=", - "pom": "sha256-6jk7yLU4PHFhu+XjqqjPvQCzZkR1GiI4VaTJAEumrZw=" - }, - "biz/aQute/bnd#biz.aQute.repository/6.4.0": { - "jar": "sha256-0k3V0QvZ5gZ2FlJzpq6NWsYS4d/Mm4w0kSCWeciBL/U=", - "pom": "sha256-++slSN+o3ttLLtBwWu6vImqbriDrDwJdxHuKb366iXo=" - }, - "biz/aQute/bnd#biz.aQute.resolve/6.4.0": { - "jar": "sha256-wxf5KC5I2FlOK5d0mYbS2WX7vaYMO4MModjDcS14p+g=", - "pom": "sha256-290Wg307M+k0i/9KhTgPuiee4UapzAI6Ch9zm2y0FY4=" - }, - "ch/qos/logback#logback-classic/1.2.3": { - "jar": "sha256-+1P4U55/y48JOlbhOBEgVuwdyAnrsCC1nYo2peusN+A=", - "pom": "sha256-oFHrGiVIuTyZq8qOtx1cddL/BpdmgpYDSBJLxJAaUxU=" - }, - "ch/qos/logback#logback-core/1.2.3": { - "jar": "sha256-WUbYN/5vlgwCpT7aemkm7MPHWLvdaapFPuQp+FghfyI=", - "pom": "sha256-301xgexRZVuqqrBnlxGA12gWQ93SdBOfDDB426FOl+A=" - }, - "ch/qos/logback#logback-parent/1.2.3": { - "pom": "sha256-ec0CHa/HsCVdPN0/1wy6pjjfc5lXSaNI7oLEVjXqsmo=" - }, - "com/athaydes/osgiaas#osgiaas-cli-api/0.7": { - "jar": "sha256-/5g6U3a4GDCkAx8njhnvjSVd9MvFWDeaMUk/p0EGMMI=", - "pom": "sha256-LniyokqUSW72hNIUFWrGA0dLheNWLd1nW78X3PiJpLE=" - }, - "com/athaydes/osgiaas#osgiaas-cli-core/0.7": { - "jar": "sha256-+29PYDq4B/TjvN0XF7w9+GAcFlu7aY0pOuEvDogMIYU=", - "pom": "sha256-6dAawLpzKBVYwK74apiVGiC5PLnJUcdx44BPf+yWGgY=" - }, - "com/athaydes/osgiaas#osgiaas-common/0.7": { - "jar": "sha256-IAZKBz8SHtQkqOCKDUdjquTTQLK+alIGhjGz3Q4/uGw=", - "pom": "sha256-aN9UOc4DQls8eDzZ4qQTt96gJmIes2WReU5kgJXArK8=" - }, - "com/beust#jcommander/1.64": { - "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", - "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" - }, - "com/beust#jcommander/1.82": { - "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=", - "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=", - "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM=" - }, - "com/dropbox/core#dropbox-core-sdk/5.2.0": { - "jar": "sha256-uo+xxTATiLSzM6JgT4hlVLJ/ATFdRsRhMfoSifMMfYA=", - "module": "sha256-U7JRv2oYUiiMl7Qzr2BdyIjmOf/EgK4jkrdhMAHaA1A=", - "pom": "sha256-MirGoEbZW6GKmqjZidQ74DYgM1JPVz+b5wiQ6oop4Bc=" - }, - "com/fasterxml#oss-parent/25": { - "pom": "sha256-3EFgl7m8Tv6JbcJWewbKuGqTZ4bSNuyyhM4t2GBymkA=" - }, - "com/fasterxml#oss-parent/33": { - "pom": "sha256-xUNwlkz8ziMZvZqF9eFPUAyFGJia5WsbR13xs0i3MQg=" - }, - "com/fasterxml#oss-parent/38": { - "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" - }, - "com/fasterxml/jackson#jackson-base/2.10.0": { - "pom": "sha256-r5dC9EUhQ/GySYSfgioZ84drb40wyufDVeu0oopIPQ4=" - }, - "com/fasterxml/jackson#jackson-base/2.9.6": { - "pom": "sha256-+81gnH4GPoOzDc5YVVsj3uPlGdwAqqx0ceUrQUCRcyk=" - }, - "com/fasterxml/jackson#jackson-bom/2.10.0": { - "pom": "sha256-LDGTpqe7yfycHmh8jwWtuWM7q8qAd6puqu4ZDYbhTVk=" - }, - "com/fasterxml/jackson#jackson-bom/2.9.6": { - "pom": "sha256-9BOCmOts2HKgOORiRoAxqGA6p4SC6aIjnJFy81ci8Pg=" - }, - "com/fasterxml/jackson#jackson-parent/2.10": { - "pom": "sha256-pQ24CCnE+JfG0OfpVHLLtDsOvs4TWmjjnCe4pv4z5IE=" - }, - "com/fasterxml/jackson#jackson-parent/2.7": { - "pom": "sha256-OJQmHGTKZDJFHjNRM9UCFgwRtXwqaVqyEgmg7113+Hs=" - }, - "com/fasterxml/jackson#jackson-parent/2.9.1.1": { - "pom": "sha256-IlykrxyJWrSEXPLSn9WsUOU4s1OAXnW7K3Shs7nYa8U=" - }, - "com/fasterxml/jackson/core#jackson-annotations/2.10.0": { - "jar": "sha256-d6CEYhl3SoJpvBs4zAApSQjTTnf4qdo02XZzmC91hT0=", - "pom": "sha256-FLGqxIj74H7Oqug/X8ppId8ETUX8hejG7DsW5zQ42tg=" - }, - "com/fasterxml/jackson/core#jackson-core/2.10.0": { - "jar": "sha256-aedpWx5Ag0+hJC/DKKQBBgeRHO03Bqt5q8dp1FEZdRM=", - "pom": "sha256-rZo5sYeQgaVlVuUCd2742RD5BHMfhlXFJoH/882kr54=" - }, - "com/fasterxml/jackson/core#jackson-core/2.7.9": { - "jar": "sha256-vZByFCC7iZqXTtCaEH/vQsqMx8jgVXYvbIFXYTLlu8U=", - "pom": "sha256-Y5RpKyntD9jelAX/5gr0cCz0JLMkcSXqyxUxv6olHWw=" - }, - "com/fasterxml/jackson/core#jackson-core/2.9.6": { - "jar": "sha256-+rh0au3WQneI7jkOoE1DjsFBv/frNHb4vdXZEQ+ycYo=", - "pom": "sha256-fd0tyP0KY04n4wapqoVJWczEckV5dijFC8g3F3WkLjI=" - }, - "com/fasterxml/jackson/core#jackson-databind/2.10.0": { - "jar": "sha256-jmxWbGf8YalsXfxKcdQw8lZXZXeOyabvIWxUYKmRG2A=", - "pom": "sha256-kAdHbEZ6U59DnFEiWw9s1MTiNNZ93pKaICEYZhAmkic=" - }, - "com/fifesoft#rsyntaxtextarea/3.3.3": { - "jar": "sha256-BtzbujMTN/g1cBWAYe9JdFMTG6yAyFbscRQs1d1WSfo=", - "module": "sha256-gyR4XKxJ1K0GLZU5wpS+WGeWO9uhkazgLqsFGiuSEQU=", - "pom": "sha256-vPdSvzOppTP6qTd0XtOOdhbbVWWV7Doqsbeny0P5e8I=" - }, - "com/formdev#flatlaf/1.0": { - "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", - "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", - "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" - }, - "com/formdev#flatlaf/2.2": { - "jar": "sha256-CRiJizWqeFWfPJiWsUKKlo58Zp1e6LBFm61Q4ZLks18=", - "module": "sha256-FVtOnXOuoXXbX9Cwp7zbDgUurJRXZkpS10bqR1aGzJU=", - "pom": "sha256-iDEsV9UfzoVt4O4wSl3U2LI7wNOICiteBGprhOofGTo=" - }, - "com/formdev#flatlaf/2.6": { - "jar": "sha256-aol8rBnE9IsiiEohp93L+kfH/aJm26aYBKb4R6uel8g=", - "module": "sha256-bI6NyWonUOIHu1jOAV6LV4fEZiOxCves4Hg1zz6c8uA=", - "pom": "sha256-LyBWRSdf3po/+KaqsTgf29k7T67QfiDqkCujsUaVSuQ=" - }, - "com/github/junrar#junrar/7.5.4": { - "jar": "sha256-xZRJh80HDROp+9UVJi9LomPHLm3T+Yak1/EOrhtusM4=", - "module": "sha256-dl/GX7jryzhbcCG3J95RAAypDNMKcQm9Ed8QYv94lGk=", - "pom": "sha256-puop94MBMKrQQOMFjwNC4UBybts1QtXoDn1qZcmbAc8=" - }, - "com/github/mwiede#jsch/0.2.8": { - "jar": "sha256-0vgM9unIlvl/6UgT03ofW0zcGOF9oDFGxuFGMasb6bs=", - "pom": "sha256-CyRCnDntCWozUfpmflRNcg+M559/cRcRmTqzGHsQQGA=" - }, - "com/github/pcorless/icepdf#icepdf-core/7.0.1": { - "jar": "sha256-RBAMICxzxmPzHJ7TgHg/0G0mr9HdJAX7YL49R3r7f9g=", - "pom": "sha256-MwixlyFAVBbfn1xS+cyBUywXnlaZRaMpoleRHyxSc/o=" - }, - "com/github/pcorless/icepdf#icepdf-viewer/7.0.1": { - "jar": "sha256-cUQ/NKc4sbq51CwZnZGFZQetc+Fp2UuF8Hw5HKF27Hc=", - "pom": "sha256-ZRY98Xd643d1jG63i6nddkac8zxWBjU1vnhTvXx5Ahc=" - }, - "com/google/api-client#google-api-client-parent/1.25.0": { - "pom": "sha256-NElJWTWT7Wp7YMFmdQcr4lO3PMOAxyC5yWiT/KVhzUc=" - }, - "com/google/api-client#google-api-client/1.25.0": { - "jar": "sha256-JOGmnWwE5ucuPhZ1fUbTLap91DyzLDiV+DLyU1i+FAI=", - "pom": "sha256-xyaAUSeQpZObOW/XaPC2GXWGQj4QW4962fsetrNYTZg=" - }, - "com/google/apis#google-api-services-drive/v3-rev197-1.25.0": { - "jar": "sha256-lvAOQzAcToTxHvGJZyrOxVegIUhtcoSHvakWXqPs1L8=", - "pom": "sha256-g9+53Y56ucZWRyJcIuo3eGxFPcMTvn5Kp27ZWqRw3Ak=" - }, - "com/google/code/findbugs#jsr305/1.3.9": { - "jar": "sha256-kFchoO6pCoFTSrt+5u9OouXmRfod7wpc2IQC3xtGye0=", - "pom": "sha256-/quRkTEcPXru8rZtYGSvyA09HVLZgPsHrkPHjJh7qTo=" - }, - "com/google/code/findbugs#jsr305/3.0.2": { - "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", - "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" - }, - "com/google/code/gson#gson-parent/2.9.0": { - "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" - }, - "com/google/code/gson#gson/2.9.0": { - "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", - "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" - }, - "com/google/errorprone#error_prone_annotations/2.11.0": { - "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", - "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" - }, - "com/google/errorprone#error_prone_parent/2.11.0": { - "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" - }, - "com/google/guava#failureaccess/1.0.1": { - "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", - "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" - }, - "com/google/guava#guava-parent/26.0-android": { - "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" - }, - "com/google/guava#guava-parent/30.1.1-android": { - "pom": "sha256-2Oaw8PpL9r4hc03FMPdNhpbp0Kw60n+8eSi6PY9k12E=" - }, - "com/google/guava#guava-parent/31.1-android": { - "pom": "sha256-chYh8BUxLnop8NtXDQi7NjJ/vUpTo+6T3zIUNjzlOXE=" - }, - "com/google/guava#guava-parent/31.1-jre": { - "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" - }, - "com/google/guava#guava/30.1.1-android": { - "pom": "sha256-shjebjRaeYP+/OSaBLrxn2rONZytHISXMZDNbE2gWEY=" - }, - "com/google/guava#guava/31.1-android": { - "jar": "sha256-Mqwu1wnZbSeLXS4+XOoXj6STmTnFJftkdTLwEzCNswk=", - "pom": "sha256-ZikplWROlVN+6XqJ6JkBcdjzwmrPmEgwp3kZlwc9RR0=" - }, - "com/google/guava#guava/31.1-jre": { - "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", - "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" - }, - "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { - "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", - "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" - }, - "com/google/http-client#google-http-client-bom/1.41.8": { - "pom": "sha256-yVh1SDQDTW6bV19FDYAINuQYkW1vNIOXqwpMmzfLhKA=" - }, - "com/google/http-client#google-http-client-gson/1.41.8": { - "jar": "sha256-FRKmpkILWW8UJXXvBFDQK7XQbo9Y4RRAT1Tfg1NfO1g=", - "pom": "sha256-MytVQtfeavHdJZ4UvOGcpfVpX18apBVC/KvtqGtYRRk=" - }, - "com/google/http-client#google-http-client-jackson2/1.25.0": { - "jar": "sha256-+efg0xiGCiCS1wtWMxl2KAxOk0igZe3juZySqgMv2FM=", - "pom": "sha256-kJ9uCYAW/9nOnr83IN+2YbxKF6qTLLTCIYNpl9whWF8=" - }, - "com/google/http-client#google-http-client-parent/1.25.0": { - "pom": "sha256-BinHEZjqaXXv6PEi72pbyqcvvtbPMMO4PMPLtkcI/as=" - }, - "com/google/http-client#google-http-client-parent/1.41.8": { - "pom": "sha256-HKVBMLDXTBxWaWEdPp9+XCXtxsSKMJCcMjDi4Jld7Vw=" - }, - "com/google/http-client#google-http-client/1.41.8": { - "jar": "sha256-mfps8okNuo1yUIo/1wEhHlXaZsgSBZGXcibkTVf18Bc=", - "pom": "sha256-3tTlt+Us2xmGB+rfh6huKKmSbEC/fKao9UZ5kWyfdvI=" - }, - "com/google/j2objc#j2objc-annotations/1.3": { - "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", - "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" - }, - "com/google/oauth-client#google-oauth-client-java6/1.34.0": { - "jar": "sha256-zWbH9vnIzmFFPRL05/iComFqAyOeqTf9D86G7bUWKMU=", - "pom": "sha256-+WIvkogQedMf7W2DjC4eyR3DmOqKots9y60o6JDxYk8=" - }, - "com/google/oauth-client#google-oauth-client-jetty/1.34.0": { - "jar": "sha256-p97u4NDKLERAyRI95uV6jznV4ZglyYrscgSatE7EIs4=", - "pom": "sha256-hz/FGUgZeoSiBbUpQ/KoWYiJdJV/awRxaJYrlpobZqA=" - }, - "com/google/oauth-client#google-oauth-client-parent/1.34.0": { - "pom": "sha256-Pq1EPY3oIipV15kAq6aeIhnL7GhRmlelqmOzdMS4FqA=" - }, - "com/google/oauth-client#google-oauth-client/1.34.0": { - "jar": "sha256-QCDi9jQvFR55cYfoQzuS0ZpAs6SAHyKrg4nXBhXRcNI=", - "pom": "sha256-DJ03VEuUcRXdzOoUiV0ZpgmEEKcrDD1FGy2KWzkDGDg=" - }, - "com/googlecode/javaewah#JavaEWAH/1.1.13": { - "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", - "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" - }, - "com/googlecode/json-simple#json-simple/1.1.1": { - "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", - "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" - }, - "com/googlecode/plist#dd-plist/1.23": { - "jar": "sha256-PXlPKAjQ6Qx+yIlljoQ/kqJEFL1N8Y7PnxR4cmrxI4w=", - "pom": "sha256-irwhpc7IBIMPGpXg6ePumjP+vuugYUoKC39r1Q2sNoM=" - }, - "com/ibm/icu#icu4j/59.2": { - "jar": "sha256-S+43qfIsCzNv6Km/6Lp+8XL6FBO+1Nfyb9Q1EQzIl5s=", - "pom": "sha256-rULdMCtmkeYiiWFf01Xd8XDArSvqYRG55SF1swkKmS0=" - }, - "com/jamesmurty/utils#java-xmlbuilder/1.1": { - "jar": "sha256-Ulf963GblQOfxs81ASUnk5hWsvLJ12PVk8wMtk6IqyQ=", - "pom": "sha256-CPvh/9g2Z7fusWo3U/WqwQ1aUqwt3Dvu/aqA9q3oSt4=" - }, - "com/sun/activation#all/1.2.0": { - "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" - }, - "com/sun/activation#javax.activation/1.2.0": { - "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", - "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" - }, - "com/thoughtworks/xstream#xstream-parent/1.4.19": { - "pom": "sha256-DUgSxOMREJtuOk5gZvgh10kZgTl25P6p5CfPNi8vBYM=" - }, - "com/thoughtworks/xstream#xstream/1.4.19": { - "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=", - "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34=" - }, - "com/twelvemonkeys#twelvemonkeys/3.9.4": { - "pom": "sha256-gOzTBd8tVuolgm89azuQc6gopH6WUu8FZKOPHzt3VSc=" - }, - "com/twelvemonkeys/common#common-image/3.9.4": { - "jar": "sha256-pfQZkdJJLyjOTwS4Kr//uJ9f+p38h/TljxDVJuW6SoM=", - "pom": "sha256-8e4RuOVYMAMujk1Zi2EoHjXnZ0+N2adwFGpxOaDOPkE=" - }, - "com/twelvemonkeys/common#common-io/3.9.4": { - "jar": "sha256-zHwnlHvyGnX7w9YT55vdhhmQjme4jMfXMJGlWHbk/Tg=", - "pom": "sha256-CsHg6dQkTPzshRxVmIXUi4RZGGEQh63lSc3V1e6rsWI=" - }, - "com/twelvemonkeys/common#common-lang/3.9.4": { - "jar": "sha256-pSG3l9WPZbgPqMo2XZWRFiJAjKsiD9XYUhaYBfZArL0=", - "pom": "sha256-mS8V1Ni9Bv+g5GYY7FV5wqvSizgmDLPljY3wGJ4YjJM=" - }, - "com/twelvemonkeys/common#common/3.9.4": { - "pom": "sha256-eMLMiO9JfTKBbZrtHWZ0YYWwk4ANvICJDFJqweuwWQE=" - }, - "com/twelvemonkeys/imageio#imageio-core/3.9.4": { - "jar": "sha256-JEhDp7yOz277IKpfgX6Xet2vs/awznA5Oz5tEQlZH64=", - "pom": "sha256-bkmhULWKTlKRmufie0l2KCI1JF44gdqMTuPipOj7eBc=" - }, - "com/twelvemonkeys/imageio#imageio-metadata/3.9.4": { - "jar": "sha256-WAozT44gyZ/5En+psAIrDwKpgbRuazjg3zkwUjKaYyQ=", - "pom": "sha256-VmIGSg5hQybZFjeDeRi/kdT9MiDN7yN5N/xQojyZLtU=" - }, - "com/twelvemonkeys/imageio#imageio-psd/3.9.4": { - "jar": "sha256-LB+jMxlkYUDbQw/PNohyRIO+0Asd4Ze3ZGs29aFu1ok=", - "pom": "sha256-smU8jX25W0PnzV94pCx18xJTGHNMsofkXDMHztIu3IU=" - }, - "com/twelvemonkeys/imageio#imageio-tiff/3.9.4": { - "jar": "sha256-RfOfSeOnDS2yzlSTtpp4nYACwSKqTk5gTZv6LfQmyDw=", - "pom": "sha256-yS09aeR3Rl6A44DDllbGypQmFyD3Xdxd/HYl9KVaGFo=" - }, - "com/twelvemonkeys/imageio#imageio/3.9.4": { - "pom": "sha256-q24dY2m5UtPiKwv8mmZYbKRhYX3oMEjDVQBp398INyo=" - }, - "commons-beanutils#commons-beanutils/1.9.4": { - "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", - "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" - }, - "commons-cli#commons-cli/1.2": { - "jar": "sha256-582JUZVtNJtWi3zP1PWyUpqMET5nwysCj1L/2jcSWdk=", - "pom": "sha256-GPPpIHbgjC/eSDFwJQmOn2uqqF9pEutD8tfmjVcORWE=" - }, - "commons-codec#commons-codec/1.11": { - "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", - "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" - }, - "commons-codec#commons-codec/1.17.0": { - "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" - }, - "commons-codec#commons-codec/1.3": { - "jar": "sha256-G6/S7OLojbTN+DWn+PDeZfq1sRR5d6XcxZt8G4xvUIA=", - "pom": "sha256-0VfjQkTohN2R+gGSHKhDcuEfe7CP7bXUVsBnDCgFRjY=" - }, - "commons-codec#commons-codec/1.9": { - "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", - "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" - }, - "commons-codec/commons-codec/maven-metadata": { - "xml": { - "groupId": "commons-codec", - "lastUpdated": "20240427124755", - "release": "1.17.0" - } - }, - "commons-collections#commons-collections/3.2.2": { - "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", - "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" - }, - "commons-el#commons-el/1.0": { - "jar": "sha256-DWdVDsACK2U0U8dZ8GOmQ8L+ZLxI+qiyX5WiIOKiguI=", - "pom": "sha256-CvMQHgSH7l4LJ/6GusL2gvoSo6KSuzvRm58n1e2ArsQ=" - }, - "commons-httpclient#commons-httpclient/3.0.1": { - "pom": "sha256-prCLPpblcaY7vWHEYzsfRrA4Y1JQ1uYn3TSkSjYetB4=" - }, - "commons-httpclient#commons-httpclient/3.1": { - "jar": "sha256-29SVPQE+EOfBzDcBo+bM2MlQyJLwjYBPq/rCFwWTBEM=", - "pom": "sha256-ipsH1FjT5zAiHb7N+vpzU+wbq9O5TIQyJ8RxBKkMbWw=" - }, - "commons-logging#commons-logging/1.2": { - "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", - "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" - }, - "commons-net#commons-net/1.4.1": { - "jar": "sha256-BaNhHe35DQqz6O2D3sTuSSABSMCUJUN+uTSFYv3n2Dw=", - "pom": "sha256-1REvVdum8eRbaz00zlvhox9BBFkwbbksME/spDBP7Ko=" - }, - "commons-net#commons-net/3.8.0": { - "jar": "sha256-NSsLocZX2JMAY6m4OHj7cX3u8tKe4l0TlDvpvszGTUk=", - "pom": "sha256-WKIkqJs9YGMxCzm5riRAluoyPCMTH58YShS6d6CZ08k=" - }, - "eu/agno3/jcifs#jcifs-ng/2.1.7": { - "jar": "sha256-6mlza+XKjx9l8dputipQaz/iX/SY/0uO2eWdpFBGqRU=", - "pom": "sha256-QWCb9JaBLTeupRJrjd65GD0tRWCMZr6h0FvIDLpe7ZI=" - }, - "hsqldb#hsqldb/1.8.0.10": { - "jar": "sha256-sEs7OsKV1JfIcjDutPiIMnpaFbnDwVZ9sgKlHYOsnkE=", - "pom": "sha256-2QDYa4u/4/bugeqfIgbwd5Myu8pYjmo1/Rh4agoRkzE=" - }, - "io/github/x-stream#mxparser/1.2.2": { - "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", - "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" - }, - "io/grpc#grpc-context/1.27.2": { - "jar": "sha256-vL+QVd/0U/1lCL18yioKotXwWanJS+7R9f2h3AFWB7g=", - "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg=" - }, - "io/opencensus#opencensus-api/0.31.0": { - "jar": "sha256-cCulXXjznVUZXc8EH9+qt6dJCprEUBNUJIftnk06TSM=", - "pom": "sha256-m0eVkefD4KtFOB+gQ6kWV4Fb3Yw1k68BDHrDb0yQWRk=" - }, - "io/opencensus#opencensus-contrib-http-util/0.31.0": { - "jar": "sha256-vMbNebAMLCqln8KgLUCUEIMAWFDrtS2X1jkI0253r9M=", - "pom": "sha256-fvy/lNXcYnWCw/4LjEgz5N08vF0vEvpx7yko9MOoWgg=" - }, - "javax/activation#activation/1.1.1": { - "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", - "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A=" - }, - "javax/jws#javax.jws-api/1.1": { - "jar": "sha256-nyCrH+o/lXHtUqnZjjxlHMfATIpwmt3yODErYJh8byw=", - "pom": "sha256-2MBdp0oEuZfbN+I8xFBokVMZkJXfvn5eR9HMRJT1zXM=" - }, - "javax/xml#jaxrpc-api/1.1": { - "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", - "pom": "sha256-7l6D/wZZh4dIA7uRJ5r8zC8dP526odNX2f1X6Ls7xUY=" - }, - "javax/xml/bind#jaxb-api/2.2.9": { - "jar": "sha256-FmXRK8xopBjKJNOJ3OPFhs0W/J1XHfIdQkn/Hjj8uZI=", - "pom": "sha256-IfsrIZfYZypJLBrgGN18cxgwQeptHMmYSKSdYu7cHL0=" - }, - "javax/xml/soap#javax.xml.soap-api/1.3.5": { - "jar": "sha256-/Ne06NLZVpWtonmH3TXVJGgkiAHK3zpgPZaawpqZ3Yw=", - "pom": "sha256-a8CULqgG3xhh/DZ966JAKEXbh8nXcImhIPfoipqRIdU=" - }, - "javax/xml/ws#jaxws-api/2.2.12": { - "jar": "sha256-fnbOOvYwVFkrEUHe7THpb8SzhQK4bfSNU3bQALAwLJQ=", - "pom": "sha256-nlweszqLecaX7vPaFugWk9bBAsyq4q65UqaidYHfPco=" - }, - "jline#jline/2.14.2": { - "jar": "sha256-c3wEwqrwkAlyMygUYICvrnhp1AViWLQjg0pUeHkhOGw=", - "pom": "sha256-VOIz9HwTd6tBH7ZNJuMhULzZkEUTecWZUCeIeGO4p6c=" - }, - "junit#junit/4.10": { - "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=", - "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU=" - }, - "junit#junit/4.12": { - "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", - "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" - }, - "junit#junit/4.5": { - "jar": "sha256-kjurxR22dfOSN3fDn/fYaOenbmmkU0C6Ts84zlMa3w4=", - "pom": "sha256-dS6JNTrcfSfLat1xKija1YKK5zDhAuusLTSa9uLvda4=" - }, - "log4j#log4j/1.2.17": { - "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", - "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" - }, - "net/iharder#base64/2.3.8": { - "jar": "sha256-u/Qf2iKHelOPa8LVrQqjcqfd9KdWrzOGqgnT1O6oT38=", - "pom": "sha256-GztOxlWgmYGaS9QCKQBNP14Y0kz1Iy/rOS4faUoENzA=" - }, - "net/java#jvnet-parent/1": { - "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" - }, - "net/java#jvnet-parent/3": { - "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" - }, - "net/java#jvnet-parent/4": { - "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s=" - }, - "net/java#jvnet-parent/5": { - "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" - }, - "net/java/dev/jets3t#jets3t/0.7.1": { - "jar": "sha256-zzwEdXFHFoKn9Z31SAinFD14xrj2gmgJ7pWi+WN7fmA=", - "pom": "sha256-Ll4uq1m1a8DqquHRTgulO+6sYjvXK14c9UdcpcvR4Hs=" - }, - "net/java/dev/jets3t#jets3t/0.9.4": { - "jar": "sha256-oD8NJegQ7P8wE34NMUjRv5r9z2I1fr0bGvM49/YRW7s=", - "pom": "sha256-nqFHD161gt9fJa+pteIFPCy2GPJjlqG/IQ3m6T2XZGI=" - }, - "net/java/dev/jna#jna-platform/5.10.0": { - "jar": "sha256-H3Gv2XcFG/AQnvXjdn1OKv13e+iU2JeIzA84rWj2oW8=", - "pom": "sha256-5Kho919p2VQvw5nczcs5mxDB/8hJUlUJvoJOM7IbApU=" - }, - "net/java/dev/jna#jna-platform/5.12.1": { - "jar": "sha256-jOlpEWyslb1hsHqNXgcXSzUuYzAUc8qscsOV48CEiNI=", - "pom": "sha256-wnn/o7UWjiIDCHIxxjiRmnzsdFgAaxzaZpWXR4YPtFc=" - }, - "net/java/dev/jna#jna-platform/5.5.0": { - "jar": "sha256-JNgWIfgqwp/N2adBFgMfWQeiNDFY5hb0Vzu/okNK4NU=", - "pom": "sha256-EFaeNiLpdNPmYlW6hZI8El2E+iV+8lQ9isHGWNnrzRA=" - }, - "net/java/dev/jna#jna/5.10.0": { - "jar": "sha256-4zXBBnn3QyB9gixfeUjpMDGYNUkldanbprlPijuW/Mg=", - "pom": "sha256-B3PdO7r1MF5MDIL+NFzF1Mjp+tYjAqVVEYAj9ePq4xY=" - }, - "net/java/dev/jna#jna/5.12.1": { - "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=", - "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y=" - }, - "net/java/dev/jna#jna/5.5.0": { - "jar": "sha256-swj66/5O1AnehBDgpjLRZLISawNfbqz/lo05CMr7TZ4=", - "pom": "sha256-pRrZTj90+Fo8362XU5KCkxZFJmn1iCA8e0nl+Beb5Tk=" - }, - "net/sf/kosmosfs#kfs/0.3": { - "jar": "sha256-GAfL/7bIh2z0QLj310j/9JzqQN3S0EK7tiuuPIe6iEI=", - "pom": "sha256-vh1i+xebfsSFJ1HqBmd9ZgUt9fwBwur8eUUudaXBZfg=" - }, - "net/sf/launch4j#launch4j/3.14": { - "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" - }, - "net/sf/launch4j#launch4j/3.14/core": { - "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA=" - }, - "net/sf/launch4j#launch4j/3.14/workdir-linux64": { - "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" - }, - "net/sf/sevenzipjbinding#sevenzipjbinding-all-platforms/16.02-2.01": { - "jar": "sha256-cvq1Op0x4W1lP+H0AAEdAqf2vGqR6GNLXPrVzhXUZ7s=", - "pom": "sha256-u3FCxepITF/phCbcFezhuYu/3UZTRWqI2idCHXJnAmU=" - }, - "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": { - "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=", - "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE=" - }, - "org/ajoberstar/grgit#grgit-core/5.0.0": { - "jar": "sha256-euHeUDb2pP8sTyHULuJ53LvKcOYDpEtP6zBZK0eu8G8=", - "module": "sha256-fuADv+5+8bNRyxV2GAXUs5HI7CUAwxdax1o1MgM7KjU=", - "pom": "sha256-wmURBGMEd98+Iig8ChGyIiwm3184m+t2G2ACnGXiGpw=" - }, - "org/ajoberstar/grgit#grgit-gradle/5.0.0": { - "jar": "sha256-aa8WiXAg1WPHBtYBRNgBpnrSS2cd4GA5j8rJho7aPCw=", - "module": "sha256-RJ+Wog22yCYvNtpsLZWdEkJb3LY6ki6Ikit50KC+VJk=", - "pom": "sha256-D6nV84E9yjIz2f2rjUWtaJ7nQ+qPxJVUVYbK6Ufw0pY=" - }, - "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { - "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" - }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, - "org/apache#apache/16": { - "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" - }, - "org/apache#apache/17": { - "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8=" - }, - "org/apache#apache/18": { - "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" - }, - "org/apache#apache/19": { - "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" - }, - "org/apache#apache/21": { - "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" - }, - "org/apache#apache/23": { - "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" - }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" - }, - "org/apache#apache/4": { - "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" - }, - "org/apache#apache/9": { - "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" - }, - "org/apache/commons#commons-compress/1.20": { - "jar": "sha256-CutiXJSMaX6nsgUVbhEjY7We1eJVEhLNTkYL23LHwG4=", - "pom": "sha256-2VZ4469WsXx9ts/5ZF761etZvp88HKqvXwFG7fBGkdc=" - }, - "org/apache/commons#commons-lang3/3.12.0": { - "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", - "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" - }, - "org/apache/commons#commons-parent/11": { - "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" - }, - "org/apache/commons#commons-parent/32": { - "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" - }, - "org/apache/commons#commons-parent/34": { - "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" - }, - "org/apache/commons#commons-parent/39": { - "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" - }, - "org/apache/commons#commons-parent/42": { - "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" - }, - "org/apache/commons#commons-parent/47": { - "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" - }, - "org/apache/commons#commons-parent/48": { - "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" - }, - "org/apache/commons#commons-parent/52": { - "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" - }, - "org/apache/commons#commons-parent/69": { - "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" - }, - "org/apache/commons#commons-vfs2-project/2.3": { - "pom": "sha256-esuoQCmKFoMHNgZkPcGX0+XwIoOrIMuUyLbjB18pU7E=" - }, - "org/apache/commons#commons-vfs2/2.3": { - "jar": "sha256-VtHuk/pi7VJzsUQDwZwAlV7vN5JgUwfksQa0GuXYOmY=", - "pom": "sha256-HAjXM3vPvbo1PJKIYKRlE8A95kp4mTCs1rwQIE4pHjY=" - }, - "org/apache/felix#felix-parent/2.1": { - "pom": "sha256-xVKlZDq0Z8MSJeB8tVsdwq5agR5WdIGnOiVKOJgThzY=" - }, - "org/apache/felix#felix-parent/4": { - "pom": "sha256-XM0w8s5e1T09oZGiPs71mxWw/Q5JSgGu60AmRBQn5Gg=" - }, - "org/apache/felix#felix-parent/6": { - "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU=" - }, - "org/apache/felix#org.apache.felix.framework/7.0.5": { - "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=", - "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk=" - }, - "org/apache/felix#org.apache.felix.main/7.0.5": { - "jar": "sha256-IIUtVR3jJ4BKU7IOUPL7v3e2KwP0JubpXnYG06WPjpg=", - "pom": "sha256-p5ct/DzTQrxR5G2PMD5avTzjDhgOi1cVLAnxiUpTLv0=" - }, - "org/apache/felix#org.apache.felix.scr/2.0.12": { - "jar": "sha256-jaF57ceJ4SYH+x7pCNuEkJkh6A4JO9Sdm648LCDsqQ0=", - "pom": "sha256-Tj7MhctREnNZO/4c7/RpZAkzjs0+2wvv05oie/2iZaI=" - }, - "org/apache/felix#org.apache.felix.shell/1.4.3": { - "jar": "sha256-xT4vgt58Qntj27+RG4uJA4b0qxI41s/olFsQ8B3YqgQ=", - "pom": "sha256-E3gqgSD8OX+Fxl5jdRrxQhrWjxbqQ9etxpjI9wDJUeY=" - }, - "org/apache/hadoop#hadoop-core/0.20.2": { - "jar": "sha256-NpnQfjXPWJgtIovrrzBz70z4Tg9PgtyRY2EYyrEy5PY=", - "pom": "sha256-8IygIDOByE19sy1x1giwIWt2NY8BBLLBcJ1uyCHs4A4=" - }, - "org/apache/httpcomponents#httpclient/4.5": { - "jar": "sha256-o8FVmR3h416FHoKKZ/iU0QEVjEEkzA8d9fEtJ8+kd3I=", - "pom": "sha256-KXbd8fDEATUubMf0kmbH+D/h+hEwhlB1Ik/DfJAr28s=" - }, - "org/apache/httpcomponents#httpclient/4.5.13": { - "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", - "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" - }, - "org/apache/httpcomponents#httpcomponents-client/4.5": { - "pom": "sha256-VPLVLc8b3fp7AEvsk8fmDjLyU6Rkj9ee8t/gOL1KrhM=" - }, - "org/apache/httpcomponents#httpcomponents-client/4.5.13": { - "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" - }, - "org/apache/httpcomponents#httpcomponents-core/4.4.1": { - "pom": "sha256-QSBuBZ8samqOylrk4YC0C5P2+raJ65tcCTa3K2K3GNI=" - }, - "org/apache/httpcomponents#httpcomponents-core/4.4.15": { - "pom": "sha256-YNQ3J6YXSATIrhf5PpzGMuR/PEEQpMVLn6/IzZqMpQk=" - }, - "org/apache/httpcomponents#httpcomponents-parent/11": { - "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" - }, - "org/apache/httpcomponents#httpcore/4.4.1": { - "jar": "sha256-3ROQwX1A92D35RuyBSOo1j3raelLq+r1Z+t27NLK1CI=", - "pom": "sha256-uBpinKyR8Q4siiRfd0tvCIlQOerWifqITHj0csdSxIM=" - }, - "org/apache/httpcomponents#httpcore/4.4.15": { - "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=", - "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms=" - }, - "org/apache/httpcomponents#project/7": { - "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM=" - }, - "org/apache/pdfbox#fontbox/2.0.27": { - "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=", - "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY=" - }, - "org/apache/pdfbox#jbig2-imageio/3.0.4": { - "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=", - "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s=" - }, - "org/apache/pdfbox#pdfbox-parent/2.0.27": { - "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po=" - }, - "org/bouncycastle#bcpkix-jdk15on/1.70": { - "jar": "sha256-5bnLgh31f3CwWTNY6JwOjXJmUV2p0IivbGRvY9QzwHw=", - "pom": "sha256-bqVQK37r7HAYJxu4qCy4Gb9MHytlQ1ScXP2E1qE5lr8=" - }, - "org/bouncycastle#bcprov-ext-jdk15on/1.70": { - "jar": "sha256-XYGfO4hZfsaAyUFRoLoKOv/wwMHJmbWwZaZ8mYo+Phs=", - "pom": "sha256-349vD7+aZoBvsV+M/E40S1fEdgoiYpAIbKuLkb4X4m8=" - }, - "org/bouncycastle#bcprov-jdk15on/1.52": { - "jar": "sha256-DcTRgeTTR4k8LdvS5s1dcof8ZRwDZI+mSyNBxzZrF3M=", - "pom": "sha256-fko0x7Y9h5xc7EVOLkfrHmHicaWGcuflSGWfTyN0JQA=" - }, - "org/bouncycastle#bcprov-jdk15on/1.69": { - "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", - "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" - }, - "org/bouncycastle#bcprov-jdk15on/1.70": { - "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", - "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" - }, - "org/bouncycastle#bcutil-jdk15on/1.70": { - "jar": "sha256-UtxVUbAldmZSbFCVQkVn/tfcewDSsbp71SKYQRESsdA=", - "pom": "sha256-nrrnHCXgyfLNdWADwB8a0Pw5jKBvvNoNF15xysWECq0=" - }, - "org/checkerframework#checker-qual/3.12.0": { - "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", - "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", - "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" - }, - "org/checkerframework#checker-qual/3.24.0": { - "jar": "sha256-2tGJ1OO0he3wI6niC7yEeDA9yM3clX5oij9ZTV5zu3s=", - "module": "sha256-EC7EgMhtWlEqb6BEgroCeX+kiwiSJ3cRBLgsRFGapDw=", - "pom": "sha256-70TDGulmr9RNMXge4m7zviQm1UITPeVC10lBGOagAjE=" - }, - "org/codehaus#codehaus-parent/3": { - "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" - }, - "org/codehaus/jackson#jackson-core-asl/1.9.13": { - "jar": "sha256-RAqctcqVshX5U9OiCmsaENofCbUpqd3qX4pJBd2rT1o=", - "pom": "sha256-95Xcr5QSdPZanVRaSSanQtCygttPLrGUADBgyvvv2QA=" - }, - "org/codehaus/jackson#jackson-mapper-asl/1.9.13": { - "jar": "sha256-dOegenby7breKTEqWi68z6AZEovAIezjhW12GX6b4MI=", - "pom": "sha256-MPLZHeJHhRcjaODaGKh5cQLHWZqJdmuhf+YzDCQMy/4=" - }, - "org/codehaus/mojo#animal-sniffer-annotations/1.9": { - "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=", - "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0=" - }, - "org/codehaus/mojo#animal-sniffer-parent/1.9": { - "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs=" - }, - "org/codehaus/mojo#mojo-parent/28": { - "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc=" - }, - "org/eclipse/jdt#core/3.1.1": { - "jar": "sha256-+eOc9zJrYNHTAW7ZD63ASfcdMSyXqpfLqvhR1jdnMLo=", - "pom": "sha256-thSFD4+KUKt1m1nJIZqv+xxbzz7yQMbE0eFjN/9ZJao=" - }, - "org/eclipse/jgit#org.eclipse.jgit-parent/6.0.0.202111291000-r": { - "pom": "sha256-KlNYEM2GhoEaaT0au4sQGRE1bfRlhdxpD0TNNGx3vwU=" - }, - "org/eclipse/jgit#org.eclipse.jgit/6.0.0.202111291000-r": { - "jar": "sha256-NSkKqsxiVhMEzQLvjPpbKXqIAHVdfXQk5SlU/MUqEgM=", - "pom": "sha256-pRCLLHNdZ7Zfh7f+77kxAUhCax4dAfHdY04zLB2mJUs=" - }, - "org/exbin/bined#bined-core/0.2.0": { - "jar": "sha256-V+URrCaEsKKGtEI5NrX6Itc2UJ/MqRLLgFmvYGKktAM=", - "pom": "sha256-Jl0xEBR+SbRNns8W4cQdbQMItCvteFcuhav7DPWQiwM=" - }, - "org/exbin/bined#bined-extended/0.2.0": { - "jar": "sha256-zSqJKG0pQ09mz7/mYXWT8CG8QE7xqOUqwpF8QtBhYA8=", - "pom": "sha256-zWZRTzYvH/3JLQPSf4dL+2hmD2lx+5d79jO4LLz1MLY=" - }, - "org/exbin/bined#bined-highlight-swing/0.2.0": { - "jar": "sha256-mInT2MV+iH3NP063uXwjAb5TKumnNnqZa7lv8nutGG8=", - "pom": "sha256-yS9O78KNIZ5Z1GsxQCimeidtrHwmMHOP1YybD81FznA=" - }, - "org/exbin/bined#bined-operation-swing/0.2.0": { - "jar": "sha256-RTyGSbiv+h2dTmC7ob/Y0gKa9/IWweTZhiBH3sWFQC0=", - "pom": "sha256-VX1ftIJE/Jr4ld421jJvS0f5t6gHDUMode6l/9bdTyc=" - }, - "org/exbin/bined#bined-operation/0.2.0": { - "jar": "sha256-rFVLd5DdXoFzEoGkohFvYk902VQNs5hq/AT07EQppag=", - "pom": "sha256-o1y6AYkmzfs0pveozWSz8idrPNDHU2Nr7O8CyD2PxU0=" - }, - "org/exbin/bined#bined-swing-extended/0.2.0": { - "jar": "sha256-FslY+vbzPtW+OytscgHfI1FHIdIl1X4CubCd1yyXIys=", - "pom": "sha256-h/WxZiFbKaoAZH2uVaC8P8b8SmcLpCqlHe3Djtz5YA8=" - }, - "org/exbin/bined#bined-swing/0.2.0": { - "jar": "sha256-9az+O66PgOCt3LGWTDqdRfjk7njp+6/z+bNIvAKA8NY=", - "pom": "sha256-EcPobxsauuBDTGvaia9bDEBHyNzGYEsfN6QK4UNs+ho=" - }, - "org/glassfish#glassfish-parent/10.0-b28": { - "pom": "sha256-2DdvCwd5g3hYi0THaFhNWgg2IC/r1bthQV69NHlUhJw=" - }, - "org/glassfish#javaee-api/10.0-b28": { - "pom": "sha256-iSXwgLFPb32MSS0nNzfJ8XlliH6T2e6jHUI7Dbkv1mU=" - }, - "org/glassfish#javax.xml.soap/10.0-b28": { - "jar": "sha256-DngfntIbAM+gZvD+wATSRGsRDOAATSMW5CDPEa8AF70=", - "pom": "sha256-Oxqk3Tss+B5WJo/d5jAG76V2FeDcfv7dYNwOlws8CuI=" - }, - "org/glassfish#pom/2": { - "pom": "sha256-vjuPfQ8bH3mTTBvDAd133tVZpj8H+cBiEM1LTslohi4=" - }, - "org/hamcrest#hamcrest-core/1.1": { - "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=", - "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM=" - }, - "org/hamcrest#hamcrest-core/1.3": { - "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", - "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" - }, - "org/hamcrest#hamcrest-parent/1.1": { - "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo=" - }, - "org/hamcrest#hamcrest-parent/1.3": { - "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" - }, - "org/jetbrains#annotations/20.1.0": { - "jar": "sha256-7cjj7JeWpfQcGuRLLTGFB+5qwSEvEh2T0zaZs9Cv9jg=", - "pom": "sha256-RKoM0kV47KB8dgMdQsQv+8rmHOwxMFdeIxlparBUgQQ=" - }, - "org/jetbrains#annotations/23.0.0": { - "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", - "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" - }, - "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { - "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", - "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.10": { - "jar": "sha256-GfEC7+lin46rxjhTrRXFM+R8R/kfygkoXFvehuWfkdQ=", - "pom": "sha256-EBHGO4julM3/XVlpNzB1WbxVA3tzPMAM5jzaPPrgqOs=" - }, - "org/jetbrains/kotlin#kotlin-stdlib/1.7.10": { - "jar": "sha256-53H+dCUKlD6PY0ZxMgH/HYy5XDpdGpGiK2Wp4E9qiQE=", - "pom": "sha256-bMDPWivALe4GDruQw1Nfw929ejurIQrOPhQqr4F2TYE=" - }, - "org/jetbrains/pty4j#pty4j/0.12.3": { - "jar": "sha256-j0VqkehguhKfPlwOlM6/WEmqN8pAEanXSYOaZjL6xrs=", - "module": "sha256-G7L2GjoEPAQaUDGEZOrzptK+J/JkNTeK/F1My2uZlb0=", - "pom": "sha256-GValtB7ec6dC0Tu8vBFZXaZdQJaAleM342qSi4vjbb4=" - }, - "org/jmdns#jmdns/3.5.5": { - "jar": "sha256-iUyFKyYAHjuxrQ9pFec3BqpZBjftXXMbZSoUYYZQRzc=", - "pom": "sha256-bQIQbpkKWGMuq2ujjSce09Gei6OubT8uM113G2FW8hY=" - }, - "org/junit#junit-bom/5.10.2": { - "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", - "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" - }, - "org/junit#junit-bom/5.7.1": { - "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", - "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" - }, - "org/mortbay/jetty#jetty-parent/7": { - "pom": "sha256-AXPY2/7SuKsqWza2CKnFCeoKP7tPrKZ85wZ2gMiVBmo=" - }, - "org/mortbay/jetty#jetty-util/6.1.14": { - "jar": "sha256-8mY5/R7P2Dpm+dilkyQvpavXW7R2TP2siLQHmpP+Mvk=", - "pom": "sha256-h1IR/PM+77cX+/94uqGmC+XJc/4gbP9HshlcUDN9hYQ=" - }, - "org/mortbay/jetty#jetty/6.1.14": { - "jar": "sha256-IwGVcKiM3lf3z572YuVvZssXnc9+KMvg0WKedk0Iw0M=", - "pom": "sha256-LYNk1QxMmFO2kNaGdQ5MnbRioQt/rfP0TpdOJJCtGRU=" - }, - "org/mortbay/jetty#jsp-2.1/6.1.14": { - "jar": "sha256-2VTa2Kpx8mmfNZAzPoybjY/B6ixZ12A1GTuP8q8F1j8=", - "pom": "sha256-OFFKit71HajPrD79tZosDfYiXBnUszHJy3bYeYXy+5Y=" - }, - "org/mortbay/jetty#jsp-api-2.1/6.1.14": { - "jar": "sha256-2+YHBuGi8+PjeFsofXi1J7b0GqY37M2k48OEF2w1pAU=", - "pom": "sha256-jWdSNsVPkhg4bzacfuxMSLNHS7Kh1vT89VYzLyoyVwk=" - }, - "org/mortbay/jetty#project/6.1.14": { - "pom": "sha256-3LefygsrOTGr0/WwJYLF0jyeu9LnoN2Mk+/j0a0++l4=" - }, - "org/mortbay/jetty#servlet-api-2.5/6.1.14": { - "jar": "sha256-DtM+4wUYZqOmMxl2zfUJijau/RbsH6LYNusGfjfUbUc=", - "pom": "sha256-i3Fd2/c7vaY0TCI8E5hnWSLkF7o5ntPH+NepSVnA/4E=" - }, - "org/osgi#org.osgi.dto/1.0.0": { - "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=", - "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw=" - }, - "org/osgi#org.osgi.framework/1.8.0": { - "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=", - "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM=" - }, - "org/osgi#org.osgi.resource/1.0.0": { - "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", - "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" - }, - "org/osgi#org.osgi.service.coordinator/1.0.2": { - "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=", - "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o=" - }, - "org/osgi#org.osgi.service.log/1.3.0": { - "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=", - "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos=" - }, - "org/osgi#org.osgi.service.repository/1.1.0": { - "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=", - "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk=" - }, - "org/osgi#org.osgi.service.resolver/1.1.1": { - "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", - "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" - }, - "org/osgi#org.osgi.util.function/1.2.0": { - "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", - "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" - }, - "org/osgi#org.osgi.util.promise/1.2.0": { - "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=", - "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY=" - }, - "org/osgi#org.osgi.util.tracker/1.5.4": { - "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=", - "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk=" - }, - "org/osgi#osgi.annotation/8.0.1": { - "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=", - "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM=" - }, - "org/osgi#osgi.core/8.0.0": { - "jar": "sha256-QcJNGH9nqq9HRfq3j9HaZt5/N92CWB27vJuolkW6AWY=", - "pom": "sha256-ZR92uim7Q5LTaupW99CwyC/EkXAk2eaoQ3dLulAV61M=" - }, - "org/ovirt/engine/api#java-sdk-parent/4.4.5": { - "pom": "sha256-0yDbSWA1kRnOQhG3+R1Y+regNqra7Uo+feiehoO/PIw=" - }, - "org/ovirt/engine/api#sdk/4.4.5": { - "jar": "sha256-ch6stVl0/BuFz+GfRtjgRgTUDYNr1lxxoKpHf/RLumI=", - "pom": "sha256-w6qSGYiYuDuLy3mWDXJSX+uMKiOI1lfjBw/iW8yZSCM=" - }, - "org/slf4j#slf4j-api/1.7.25": { - "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" - }, - "org/slf4j#slf4j-api/1.7.30": { - "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", - "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" - }, - "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", - "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" - }, - "org/slf4j#slf4j-parent/1.7.25": { - "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" - }, - "org/slf4j#slf4j-parent/1.7.30": { - "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" - }, - "org/slf4j#slf4j-parent/1.7.36": { - "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" - }, - "org/sonatype/oss#oss-parent/5": { - "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - }, - "org/testng#testng/6.11": { - "jar": "sha256-VdWJesCTOQEO7SBREkMJpxJ5iNgv8GNCKJJtUdo1QPY=", - "pom": "sha256-mLAN2VtnH6U7TZjnzR5+/I2CfNdrEPW0uZjk07XN9JE=" - }, - "org/tukaani#xz/1.9": { - "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", - "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" - }, - "org/unix4j#unix4j-base/0.6": { - "jar": "sha256-dOiHClT3oLNDIz6ZcSnyg9uvBIud6/H1aOalwH3LbYw=", - "pom": "sha256-4aXxzU2oD7pYfvCwWGO83MnDQ/GtWg+8YlTgs0J+40U=" - }, - "org/unix4j#unix4j-command/0.6": { - "jar": "sha256-UumRX7DzERvMtdoxvqVX/MeV7xH1bs6KrI5QJzELVjk=", - "pom": "sha256-X14lknDlCSul+cwDnBQpL69xh9FCHk9Y8/QXyuVQ/Ko=" - }, - "org/unix4j#unix4j-core/0.6": { - "pom": "sha256-1XgPLlf1TdsnKUGgOcblb3Xo7HG6/CvYeTzDcOgy9HM=" - }, - "org/unix4j#unix4j/0.6": { - "pom": "sha256-WDiqu1K7nH+Tu0GfQHWBJpMXKV9KrHMbtXvZSmKu4Uw=" - }, - "org/violetlib#jnr/11": { - "jar": "sha256-IQjDFWiGB4PxMJdEk1balFUEuSpir84hmFWAlLW5ZZ4=", - "pom": "sha256-TMlmvQeIgGZMQY00YpzUlOXvWTch92oyei8VgiDIaI4=" - }, - "org/violetlib#vappearances/3": { - "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=", - "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk=" - }, - "org/violetlib#vaqua/10": { - "jar": "sha256-e4ZgbF9Mdls2MoUwvdJ/nHmW0NK3a1ZjKFEAE8x4cxI=", - "pom": "sha256-ANTlWsGt0lnrbokL0oa3cQKjLtuXbou7qglQFLCztns=" - }, - "org/yaml#snakeyaml/1.17": { - "jar": "sha256-Vmazb520bwbdWhnXO7/ztYjVlpwPS4hI/eD17ISUMKU=", - "pom": "sha256-2sbaZNJ6+/QXByGGcQTLB3iRGMR9YjhXLP9F1mmNMbc=" - }, - "oro#oro/2.0.8": { - "jar": "sha256-4AzNrV3360P97kQjLvZGAr9jgHwtEzp76Dugn9Sa8m4=", - "pom": "sha256-mqnf6y6F4dXnkyyHFAaXzswrD63ZM9Z5/UIKLkODGoI=" - }, - "tomcat#jasper-compiler/5.5.12": { - "jar": "sha256-V2Z7FKEPkc7Y9uw4iBcIuJghH9D6ull8MS/R0cjGwKM=", - "pom": "sha256-eZ+lAPzpBrou6E+9mt409mN1p4oUgehMyuSgwdo+pWQ=" - }, - "tomcat#jasper-runtime/5.5.12": { - "jar": "sha256-EoqikuUM2Vbox7vakLfiINBECXdx7V1i671dNyU+vvQ=", - "pom": "sha256-Supxo2hAM7WFhsp6oMh6LOzgtN3LglNF8vOQz1lfYlA=" - }, - "xmlenc#xmlenc/0.52": { - "jar": "sha256-KCrhhfwv8n2ncUr5liiXwJz++vuIByIZxKL5xzYWwCY=", - "pom": "sha256-vSLwW83TfiJr9kJvIv73dI1y42TJ7xQAT3t7b4qC+EQ=" - }, - "xmlpull#xmlpull/1.1.3.1": { - "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", - "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" - } - }, - "https://repository.jboss.org/maven2/javax": { - "activation#activation/1.1.1": { - "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", - "pom": "sha256-D8ky5fICygzkukU/sdrMUoxhi76//h4igSYUrbcaU5Q=" - }, - "xml#jaxrpc-api/1.1": { - "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", - "pom": "sha256-UDMEHgq0M92KL9K+HpQ4k+qBYBN5ynMLdWYbfj5aIto=" - }, - "xml/soap#saaj-api/1.3": { - "jar": "sha256-02J4xJxQ8f5BwmRBSh9XKmV41US4yokFNZfsucqH9j4=", - "pom": "sha256-mVi9bmvcCAJ60U1ztgWICaUTidM0mUiv2d+N7CUu5vk=" - } - } -} diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix deleted file mode 100644 index 2f2528ff5bb9..000000000000 --- a/pkgs/applications/gis/gmt/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - curl, - Accelerate, - CoreGraphics, - CoreVideo, - fftwSinglePrec, - netcdf, - libxml2, - pcre, - gdal, - blas, - lapack, - glibc, - ghostscript, - dcw-gmt, - gshhg-gmt, -}: - -/* - The onus is on the user to also install: - - ffmpeg for webm or mp4 output - - graphicsmagick for gif output -*/ - -let - # Certainly not an ideal situation, See: - # https://github.com/NixOS/nixpkgs/pull/340707#issuecomment-2361894717 - netcdf' = netcdf.override { - libxml2 = libxml2.override { - enableHttp = true; - }; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "gmt"; - version = "6.5.0"; - src = fetchFromGitHub { - owner = "GenericMappingTools"; - repo = "gmt"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = - [ - curl - gdal - netcdf' - pcre - dcw-gmt - gshhg-gmt - ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ - Accelerate - CoreGraphics - CoreVideo - ] - else - [ - glibc - fftwSinglePrec - blas - lapack - ] - ); - - propagatedBuildInputs = [ - ghostscript - ]; - - cmakeFlags = - [ - "-DGMT_DOCDIR=share/doc/gmt" - "-DGMT_MANDIR=share/man" - "-DGMT_LIBDIR=lib" - "-DCOPY_GSHHG:BOOL=FALSE" - "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" - "-DCOPY_DCW:BOOL=FALSE" - "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" - "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" - "-DGMT_ENABLE_OPENMP:BOOL=TRUE" - "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" - "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid - ]; - - meta = { - homepage = "https://www.generic-mapping-tools.org"; - description = "Tools for manipulating geographic and cartesian data sets"; - longDescription = '' - GMT is an open-source collection of command-line tools for manipulating - geographic and Cartesian data sets (including filtering, trend fitting, - gridding, projecting, etc.) and producing high-quality illustrations - ranging from simple x–y plots via contour maps to artificially illuminated - surfaces and 3D perspective views. It supports many map projections and - transformations and includes supporting data such as coastlines, rivers, - and political boundaries and optionally country polygons. - ''; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl3Plus; - maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); - }; - -}) diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix deleted file mode 100644 index 202900983e14..000000000000 --- a/pkgs/applications/graphics/upscayl/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - appimageTools, - fetchurl, - lib, -}: let - pname = "upscayl"; - version = "2.11.5"; - - src = fetchurl { - url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; -in - appimageTools.wrapType2 { - inherit pname version src; - - extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ]; - - extraInstallCommands = '' - mkdir -p $out/share/{applications,pixmaps} - - cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "Free and Open Source AI Image Upscaler"; - homepage = "https://upscayl.github.io/"; - maintainers = with maintainers; [icy-thought]; - license = licenses.agpl3Plus; - platforms = platforms.linux; - mainProgram = "upscayl"; - }; - } diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix index 35df09c2032c..44a2c8c5c1d8 100644 --- a/pkgs/applications/graphics/xpano/default.nix +++ b/pkgs/applications/graphics/xpano/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xpano"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "krupkat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CgUiZHjWQSoAam2Itan3Zadt8+w6j9W5KGMZ5f6bHiQ="; + sha256 = "sha256-f2qoBpZ5lPBocPas8KMsY5bSYL20gO+ZHLz2R66qSig="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 8f3cb528722d..e99f4553b925 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -2,7 +2,7 @@ let pname = "notesnook"; - version = "3.0.16"; + version = "3.0.19"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-HywWk3MAWdRVaQyimlQJCFsgydXdE0VSLWliZT7f8w0="; - x86_64-darwin = "sha256-GgZVVt1Gm95/kyI/q99fZ9BIN+5kpxumcSJ9BexfARc="; - aarch64-darwin = "sha256-ldg+bVROm/XzACCmiMapMQf3f6le9FHzt18QcaH8TxA="; + x86_64-linux = "sha256-yCzREyFyGoAPXVVnNX6GUrr83oaPtoNOgZOOd6vJD1Q="; + x86_64-darwin = "sha256-WciEpt0vUuXS6YeZkbyFGqQaotXoZkWnkkn5B6/JXwE="; + aarch64-darwin = "sha256-iP3Xd/otYEVwU85U2dlFcX9QjDq2CbIqHmcDYVxzqzI="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix deleted file mode 100644 index 496644ff4d42..000000000000 --- a/pkgs/applications/misc/toot/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages, nixosTests }: - -python3Packages.buildPythonApplication rec { - pname = "toot"; - version = "0.42.0"; - - src = fetchFromGitHub { - owner = "ihabunek"; - repo = "toot"; - rev = "refs/tags/${version}"; - sha256 = "sha256-FxA/loJzb/DBI1vWC71IFqdFcwjwIezhBJCGNeBzRoU="; - }; - - nativeCheckInputs = with python3Packages; [ pytest ]; - - propagatedBuildInputs = with python3Packages; - [ - requests beautifulsoup4 future wcwidth - urwid urwidgets psycopg2 tomlkit click - ]; - - checkPhase = '' - py.test - ''; - - passthru.tests.toot = nixosTests.pleroma; - - meta = with lib; { - description = "Mastodon CLI interface"; - mainProgram = "toot"; - homepage = "https://github.com/ihabunek/toot"; - license = licenses.gpl3; - maintainers = [ maintainers.matthiasbeyer ]; - }; - -} diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index f654a96cb75d..f346b1148a30 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.6"; + version = "7.0.7"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-IYJPf/Egh8DJud4gcZmnWpwxsDA2aIx8ucF48KO1f40="; + hash = "sha256-JtCjYZTVMID8iwm5mbK1qDxASfQK0H72rmnHIlpyi4Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index ad1173be2ed1..276a5941b109 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -7,6 +7,9 @@ , yasm }: +let + version = "1.4.9"; +in (libsForQt5.callPackage ../telegram-desktop/default.nix { inherit stdenv; @@ -24,13 +27,23 @@ fetchSubmodules = true; }; + patches = (oldAttrs.patches or []) ++ [ + (fetchpatch { + url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; + decode = "base64 -d"; + stripLen = 1; + extraPrefix = "src/"; + hash = "sha256-goxnuRRbwcdfIk1jFaKGiKCTCYn2saEj7En1Iyglzko="; + }) + ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ]; }); withWebKitGTK = false; }).overrideAttrs { pname = "kotatogram-desktop"; - version = "1.4.9-unstable-2024-09-27"; + version = "${version}-unstable-2024-09-27"; src = fetchFromGitHub { owner = "kotatogram"; @@ -41,8 +54,6 @@ }; patches = [ - ./macos.patch - ./macos-opengl.patch ./macos-qt5.patch (fetchpatch { url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch"; @@ -59,10 +70,10 @@ It contains some useful (or purely cosmetic) features, but they could be unstable. A detailed list is available here: https://kotatogram.github.io/changes ''; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.all; homepage = "https://kotatogram.github.io"; - changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; + changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k${version}"; maintainers = with maintainers; [ ilya-fedin ]; mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch deleted file mode 100644 index e81bd53b440c..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp -index 655e7cf410..c356acbffe 100644 ---- a/Telegram/SourceFiles/media/view/media_view_pip.cpp -+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp -@@ -1333,7 +1333,7 @@ void Pip::setupStreaming() { - Ui::GL::ChosenRenderer Pip::chooseRenderer( - Ui::GL::Capabilities capabilities) { - const auto use = Platform::IsMac() -- ? true -+ ? false - : capabilities.transparency; - LOG(("OpenGL: %1 (PipPanel)").arg(Logs::b(use))); - if (use) { -Submodule Telegram/lib_ui contains modified content -diff --git a/Telegram/lib_ui/ui/gl/gl_detection.cpp b/Telegram/lib_ui/ui/gl/gl_detection.cpp -index 150eb8b..c7ce9f9 100644 ---- a/Telegram/lib_ui/ui/gl/gl_detection.cpp -+++ b/Telegram/lib_ui/ui/gl/gl_detection.cpp -@@ -236,7 +236,7 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) { - - Backend ChooseBackendDefault(Capabilities capabilities) { - const auto use = ::Platform::IsMac() -- ? true -+ ? false - : ::Platform::IsWindows() - ? capabilities.supported - : capabilities.transparency; -diff --git a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -index 7b29363..22c4fb3 100644 ---- a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -+++ b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm -@@ -16,7 +16,6 @@ - #include - #include - #include --#include - #include - - @interface WindowObserver : NSObject { -@@ -138,7 +137,6 @@ public: - - private: - void init(); -- void initOpenGL(); - void resolveWeakPointers(); - void revalidateWeakPointers() const; - void initCustomTitle(); -@@ -272,10 +270,6 @@ void WindowHelper::Private::enforceStyle() { - } - } - --void WindowHelper::Private::initOpenGL() { -- auto forceOpenGL = std::make_unique(_owner->window()); --} -- - void WindowHelper::Private::resolveWeakPointers() { - if (!_owner->window()->winId()) { - _owner->window()->createWinId(); -@@ -338,7 +332,6 @@ void WindowHelper::Private::initCustomTitle() { - } - - void WindowHelper::Private::init() { -- initOpenGL(); - resolveWeakPointers(); - initCustomTitle(); - } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch deleted file mode 100644 index 941e5f80526b..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch +++ /dev/null @@ -1,171 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -index ef544803e9..69c61b3139 100644 ---- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { - [window setTitleVisibility:NSWindowTitleHidden]; - [window setTitlebarAppearsTransparent:YES]; - [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; -+#if 0 - if (@available(macOS 12.0, *)) { - _data->topNotchSkip = [[window screen] safeAreaInsets].top; - } -+#endif - } - - void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -index 7ce90d3..dac3c2c 100644 ---- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; - - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; -+#if 0 - if (@available(macOS 12.0, *)) { - [center - addObserver: _observer -@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - name: NSProcessInfoPowerStateDidChangeNotification - object: nil]; - } -+#endif - [center - addObserver: _observer - selector: @selector(powerStateChanged:) -@@ -178,11 +180,13 @@ std::optional BatterySaving::enabled() const { - return std::nullopt; - } - NSProcessInfo *info = [NSProcessInfo processInfo]; -+#if 0 - if (@available(macOS 12.0, *)) { - if ([info isLowPowerModeEnabled]) { - return true; - } - } -+#endif - const auto state = DetectBatteryState(); - if (!state.has || !state.draining) { - return false; -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -index 7521c08..5e22da2 100644 ---- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); - AudioDeviceListChangedMonitor.registerEnvironment(this); - -+#if 0 - if (@available(macOS 14.0, *)) { - const auto weak = base::make_weak(this); - id block = [^(BOOL shouldBeMuted){ -@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - setInputMuteStateChangeHandler:block - error:nil]; - } -+#endif - } - - EnvironmentMac::~EnvironmentMac() { -@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { - } - - void EnvironmentMac::setCaptureMuted(bool muted) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (!_captureMuteNotification) { - const auto value = muted ? YES : NO; - [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; - } - } -+#endif - } - - void EnvironmentMac::captureMuteSubscribe() { -+#if 0 - if (@available(macOS 14.0, *)) { - id observer = [[InputMuteObserver alloc] init]; - [[[NSWorkspace sharedWorkspace] notificationCenter] -@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { - [observer release]; - }); - } -+#endif - } - - void EnvironmentMac::captureMuteUnsubscribe() { -@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { - void EnvironmentMac::setCaptureMuteTracker( - not_null tracker, - bool track) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (track) { - if (!_captureMuteTracker) { -@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( - } - } - } -+#endif - } - - std::unique_ptr CreateEnvironment( -Submodule Telegram/lib_webview contains modified content -diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -index e7808fc..34020f0 100644 ---- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -334,6 +334,7 @@ Instance::Instance(Config config) { - _handler = [[Handler alloc] initWithMessageHandler:config.messageHandler navigationStartHandler:config.navigationStartHandler navigationDoneHandler:config.navigationDoneHandler dialogHandler:config.dialogHandler dataRequested:handleDataRequest]; - _dataRequestHandler = std::move(config.dataRequestHandler); - [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; -+#if 0 - if (@available(macOS 14, *)) { - if (config.userDataToken != LegacyStorageIdToken().toStdString()) { - NSUUID *uuid = UuidFromToken(config.userDataToken); -@@ -341,10 +342,13 @@ Instance::Instance(Config config) { - [uuid release]; - } - } -+#endif - _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; -+#if 0 - if (@available(macOS 13.3, *)) { - _webview.inspectable = config.debug ? YES : NO; - } -+#endif - [_manager addScriptMessageHandler:_handler name:@"external"]; - [_webview setNavigationDelegate:_handler]; - [_webview setUIDelegate:_handler]; -@@ -700,10 +704,12 @@ void *Instance::winId() { - } - - void Instance::setOpaqueBg(QColor opaqueBg) { -+#if 0 - if (@available(macOS 12.0, *)) { - [_webview setValue: @NO forKey: @"drawsBackground"]; - [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; - } -+#endif - } - - void Instance::resizeToWindow() { -@@ -739,6 +745,7 @@ std::string GenerateStorageToken() { - } - - void ClearStorageDataByToken(const std::string &token) { -+#if 0 - if (@available(macOS 14, *)) { - if (!token.empty() && token != LegacyStorageIdToken().toStdString()) { - if (NSUUID *uuid = UuidFromToken(token)) { -@@ -754,6 +761,7 @@ void ClearStorageDataByToken(const std::string &token) { - } - } - } -+#endif - } - - } // namespace Webview diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 731042ac924a..f708b8a6246e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_4_1, makeWrapper }: +{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_4_1, makeBinaryWrapper }: stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; version = kotatogram-desktop.version; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; dontUnpack = true; installPhase = '' mkdir -p $out @@ -12,7 +12,8 @@ stdenv.mkDerivation { ''; postFixup = '' mkdir -p $out/bin - makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ + makeBinaryWrapper {${kotatogram-desktop},$out}/bin/${kotatogram-desktop.meta.mainProgram} \ + --inherit-argv0 \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_4_1 ]} ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index c4de1b979195..3f177b0fab17 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -6,7 +6,6 @@ , cmake , ninja , clang -, lld , python3 , wrapQtAppsHook , tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; } @@ -38,7 +37,7 @@ , glib-networking , webkitgtk_4_1 , libicns -, darwin +, apple-sdk_15 , nix-update-script }: @@ -61,10 +60,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-frz425V5eRulNVxCf457TWQAzU/f9/szD/sx3/LYQ2Y="; }; - patches = [ - ./macos.patch - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' @@ -98,8 +93,6 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ wrapGAppsHook3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld ]; buildInputs = [ @@ -130,45 +123,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ glib-networking webkitgtk_4_1 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Cocoa - CoreFoundation - CoreServices - CoreText - CoreGraphics - CoreMedia - OpenGL - AudioUnit - ApplicationServices - Foundation - AGL - Security - SystemConfiguration - Carbon - AudioToolbox - VideoToolbox - VideoDecodeAcceleration - AVFoundation - CoreAudio - CoreVideo - CoreMediaIO - QuartzCore - AppKit - CoreWLAN - WebKit - IOKit - GSS - MediaPlayer - IOSurface - Metal - NaturalLanguage - LocalAuthentication + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 libicns - ]); - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; + ]; cmakeFlags = [ # We're allowed to used the API ID of the Snap package: diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch deleted file mode 100644 index 37b13b6844f3..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -index ef544803e9..69c61b3139 100644 ---- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm -@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { - [window setTitleVisibility:NSWindowTitleHidden]; - [window setTitlebarAppearsTransparent:YES]; - [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; -+#if 0 - if (@available(macOS 12.0, *)) { - _data->topNotchSkip = [[window screen] safeAreaInsets].top; - } -+#endif - } - - void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -index 7ce90d3..dac3c2c 100644 ---- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm -@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; - - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; -+#if 0 - if (@available(macOS 12.0, *)) { - [center - addObserver: _observer -@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn changedCallback) { - name: NSProcessInfoPowerStateDidChangeNotification - object: nil]; - } -+#endif - [center - addObserver: _observer - selector: @selector(powerStateChanged:) -@@ -178,11 +180,13 @@ std::optional BatterySaving::enabled() const { - return std::nullopt; - } - NSProcessInfo *info = [NSProcessInfo processInfo]; -+#if 0 - if (@available(macOS 12.0, *)) { - if ([info isLowPowerModeEnabled]) { - return true; - } - } -+#endif - const auto state = DetectBatteryState(); - if (!state.has || !state.draining) { - return false; -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -index 7521c08..5e22da2 100644 ---- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm -@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); - AudioDeviceListChangedMonitor.registerEnvironment(this); - -+#if 0 - if (@available(macOS 14.0, *)) { - const auto weak = base::make_weak(this); - id block = [^(BOOL shouldBeMuted){ -@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null delegate) - setInputMuteStateChangeHandler:block - error:nil]; - } -+#endif - } - - EnvironmentMac::~EnvironmentMac() { -@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { - } - - void EnvironmentMac::setCaptureMuted(bool muted) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (!_captureMuteNotification) { - const auto value = muted ? YES : NO; - [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; - } - } -+#endif - } - - void EnvironmentMac::captureMuteSubscribe() { -+#if 0 - if (@available(macOS 14.0, *)) { - id observer = [[InputMuteObserver alloc] init]; - [[[NSWorkspace sharedWorkspace] notificationCenter] -@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { - [observer release]; - }); - } -+#endif - } - - void EnvironmentMac::captureMuteUnsubscribe() { -@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { - void EnvironmentMac::setCaptureMuteTracker( - not_null tracker, - bool track) { -+#if 0 - if (@available(macOS 14.0, *)) { - if (track) { - if (!_captureMuteTracker) { -@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( - } - } - } -+#endif - } - - std::unique_ptr CreateEnvironment( -Submodule Telegram/lib_webview contains modified content -diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -index 738e574..80ff5f0 100644 ---- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm -@@ -314,9 +314,11 @@ Instance::Instance(Config config) { - _dataRequestHandler = std::move(config.dataRequestHandler); - [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; - _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; -+#if 0 - if (@available(macOS 13.3, *)) { - _webview.inspectable = config.debug ? YES : NO; - } -+#endif - [_manager addScriptMessageHandler:_handler name:@"external"]; - [_webview setNavigationDelegate:_handler]; - [_webview setUIDelegate:_handler]; -@@ -658,10 +660,12 @@ void *Instance::winId() { - } - - void Instance::setOpaqueBg(QColor opaqueBg) { -+#if 0 - if (@available(macOS 12.0, *)) { - [_webview setValue: @NO forKey: @"drawsBackground"]; - [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; - } -+#endif - } - - void Instance::resizeToWindow() { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index a0847b98139e..92d1f2fe3c94 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, pkg-config, cmake, ninja, @@ -28,34 +27,22 @@ mesa, libdrm, libGL, - darwin, + apple-sdk_15, unstableGitUpdater, }: stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2024-08-04"; + version = "0-unstable-2024-10-28"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8"; - hash = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; + rev = "8198c4d8b91e22d68eb5c7327fd408e3b6abcc79"; + hash = "sha256-3sLa3Px0VWgRYqnnLlwLnx+WWnneqZyhQPrRMBriXQA="; fetchSubmodules = true; }; - patches = [ - # Remove usage of AVCodecContext::reordered_opaque - (fetchpatch2 { - name = "webrtc-ffmpeg-7.patch"; - url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "src/"; - hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU="; - }) - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \ @@ -102,26 +89,9 @@ stdenv.mkDerivation { libdrm libGL ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - OpenGL - Metal - MetalKit - CoreFoundation - ApplicationServices - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + ]; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index c083c1a8048a..6984d720b638 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - hash = "sha256-mhnlHnF23+VZvSPNuTYYUVcA6Md4y2AGqEuJphY1/IY="; + hash = "sha256-c5dy5dD5Eb/MVNCpLqIGNuafsrmgLjEfRfSxKVxu5wY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index b87752f0412b..10c5fda3c15c 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,26 +3,26 @@ , buildGoModule , stdenv , lib -, procps , fetchFromGitHub , nixosTests , autoSignDarwinBinariesHook +, nix-update-script }: let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.12"; + version = "1.28.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; - rev = "v${version}"; - hash = "sha256-/HPq71KkWUE0vG7qUBD3JON4N5KBkuRWc4SvX/JA2nQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-JW78n/3hssH600uXn4YLxcIJylPbSpEZICtKmqfqamI="; }; - vendorHash = "sha256-R5GlsCkfoMc5km+NaV+TNUlM3Ot1ARcXfEFimcZOLI4="; + vendorHash = "sha256-9/PfiOSCInduQXZ47KbrD3ca9O0Zt+TP7XoX+HjwQgs="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when @@ -43,7 +43,7 @@ let ( export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD go build build.go - go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto + go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto ) ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${version} build ${target} runHook postBuild @@ -57,8 +57,11 @@ let inherit postInstall; - passthru.tests = { - inherit (nixosTests) syncthing syncthing-init syncthing-relay; + passthru = { + tests = { + inherit (nixosTests) syncthing syncthing-init syncthing-relay; + }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index 50dc0613c743..711e9e94010a 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.6.0.0"; + version = "4.6.1.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-AwGRkgVbG2gA4K1JG0WPr4v18JHG5YzYUKdJ2EJZX+Y="; + sha256 = "sha256-jVrFhLgHPIcWFCP3FU+LxR+UE+lVRzE6WZuLfwdL708="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index d82438a31119..9028d3a80288 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -12,6 +12,7 @@ , tk , wrapGAppsHook3 , xz +, desktopToDarwinBundle }: stdenv.mkDerivation rec { @@ -23,7 +24,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-VKpFeI1tUq+2WcOu8zWq/eDvLImQp3cPjqpk5X8ic0Y="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; + nativeBuildInputs = [ + pkg-config wrapGAppsHook3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; @@ -42,6 +47,14 @@ stdenv.mkDerivation rec { "--enable-gtk3" ]; + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + mv $out/bin/.gtkwave-wrapped $out/Applications/GTKWave.app/Contents/MacOS/.gtkwave-wrapped + makeWrapper $out/Applications/GTKWave.app/Contents/MacOS/.gtkwave-wrapped $out/Applications/GTKWave.app/Contents/MacOS/GTKWave \ + --inherit-argv0 \ + "''${gappsWrapperArgs[@]}" + ln -sf $out/Applications/GTKWave.app/Contents/MacOS/GTKWave $out/bin/gtkwave + ''; + meta = { description = "VCD/Waveform viewer for Unix and Win32"; homepage = "https://gtkwave.sourceforge.net"; diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index cae21d7bba4b..05e9e6eb64f1 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -128,5 +128,6 @@ mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ trepetti ]; platforms = platforms.linux; + broken = true; # last successful build 2024-06-30 }; } diff --git a/pkgs/applications/version-management/git-sync/default.nix b/pkgs/applications/version-management/git-sync/default.nix index 01ac29cf8c56..1534cfb81c1e 100644 --- a/pkgs/applications/version-management/git-sync/default.nix +++ b/pkgs/applications/version-management/git-sync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-sync"; - version = "unstable-2022-03-20"; + version = "0-unstable-2024-02-15"; src = fetchFromGitHub { owner = "simonthum"; repo = "git-sync"; - rev = "8466b77a38b3d5e8b4ed9e3cb1b635e475eeb415"; - sha256 = "sha256-8rCwpmHV6wgFCLzPJOKzwN5mG8uD5KIlGFwcgQD+SK4="; + rev = "493b0155fb974b477b6ea623d6e41e13ddad8500"; + hash = "sha256-hsq+kpB+akjbFKBeHMsP8ibrtygEG2Yf2QW9vFFIano="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix deleted file mode 100644 index a195c51358ef..000000000000 --- a/pkgs/applications/version-management/tailor/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, python3 -, fetchurl -}: - -python3.pkgs.buildPythonApplication rec { - pname = "tailor"; - version = "0.9.37"; - - src = fetchurl { - url = "https://gitlab.com/ports1/tailor/-/archive/0.937/tailor-0.937.tar.gz"; - hash = "sha256-Bdf8ZCRsbCsFz1GRxyQxxndXSsm8oOL2738m9UxOTVc="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - future - ]; - - # AssertionError: Tailor Darcs repository not found! - doCheck = false; - - meta = with lib; { - description = "Tool to migrate changesets between various kinds of version control system"; - longDescription = '' - With its ability to "translate the history" from one VCS kind to another, - this tool makes it easier to keep the upstream changes merged in - a own branch of a product. - - Tailor is able to fetch the history from Arch, Bazaar, CVS, Darcs, Monotone, - Perforce or Subversion and rewrite it over Aegis, Bazaar, CVS, Darcs, Git, - Mercurial, Monotone and Subversion. - ''; - homepage = "https://gitlab.com/ports1/tailor"; - license = licenses.gpl1Plus; - platforms = platforms.unix; - mainProgram = "tailor"; - }; -} diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index faa623f37e29..f9e37e80d509 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.1.0"; + version = "7.1.0.1"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-I3dSGcPQVVhn4RO8CHtn3FG2dheSv4XiDO7w+MtTjRU="; + hash = "sha256-5tctuY2vYEfkkNVjprnUPJ/crwmMGCEdcRxUQR5EQxw="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 47b574d415dc..9461b311c8da 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.31.1"; + version = "1.31.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-0IPQsCLiL0Q15pq89qToMfw6mDwmMZroNBkTCfgqx6s="; + hash = "sha256-xTMQ7YVZ4tKQxaAsH9EVa7W2rTcxP//P3NUgYHojdmw="; }; vendorHash = null; diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index f80807cc1e41..7dcb9f0baf1b 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -97,7 +97,7 @@ let # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". # In nix, it is commonly set without containing these values, so we add them as fallback. # - # [1] + # [1] case ":$XDG_DATA_DIRS:" in *:/usr/local/share:*) ;; *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; diff --git a/pkgs/build-support/build-fhsenv-chroot/env.nix b/pkgs/build-support/build-fhsenv-chroot/env.nix index 105e2975f433..9f8bc07a94ad 100644 --- a/pkgs/build-support/build-fhsenv-chroot/env.nix +++ b/pkgs/build-support/build-fhsenv-chroot/env.nix @@ -67,7 +67,7 @@ let # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". # In nix, it is commonly set without containing these values, so we add them as fallback. # - # [1] + # [1] case ":$XDG_DATA_DIRS:" in *:/usr/local/share:*) ;; *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 9cae8204c6a8..10caac3a935a 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -3,7 +3,7 @@ # All possible values as defined by the spec, version 1.4. # Please keep in spec order for easier maintenance. # When adding a new value, don't forget to update the Version field below! -# See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html +# See https://specifications.freedesktop.org/desktop-entry-spec/latest lib.makeOverridable ({ name # The name of the desktop file , type ? "Application" # version is hardcoded diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 5b38f4376070..d7cab0e81a60 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -37,7 +37,7 @@ convertIconTheme() { local -ra scales=([1]="" [2]="@2") # Based loosely on the algorithm at: - # https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#icon_lookup + # https://specifications.freedesktop.org/icon-theme-spec/latest/#icon_lookup # Assumes threshold = 2 for ease of implementation. function findIcon() { local -r iconSize=$1 diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index b921efbf2dbc..5681c03a92b4 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -41,7 +41,6 @@ telegram-desktop.overrideAttrs (old: rec { homepage = "https://github.com/TDesktop-x64/tdesktop"; changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ clot27 ]; - mainProgram = "telegram-desktop"; - broken = stdenv.hostPlatform.isDarwin; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; }; }) diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/by-name/ab/abracadabra/package.nix similarity index 75% rename from pkgs/applications/radio/abracadabra/default.nix rename to pkgs/by-name/ab/abracadabra/package.nix index faede7f8d7f6..498a10e24807 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -3,12 +3,7 @@ stdenv, fetchFromGitHub, cmake, - wrapQtAppsHook, - qtbase, - qtmultimedia, - qttools, - qtpositioning, - qtlocation, + qt6, faad2, mpg123, portaudio, @@ -20,26 +15,26 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-oO8ef2VTw/gVNNU2JRXtEHEkJm7X7dypjZr0vZXCfH8="; + hash = "sha256-iHa41VmCrNGsj+6LeYIigwiBahQuTVr+bAo0kFmQ6dw="; }; nativeBuildInputs = [ cmake - wrapQtAppsHook - qttools + qt6.wrapQtAppsHook + qt6.qttools ]; buildInputs = [ - qtbase - qtmultimedia - qtlocation - qtpositioning + qt6.qtbase + qt6.qtmultimedia + qt6.qtlocation + qt6.qtpositioning faad2 mpg123 portaudio diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix index 49379db4a2c6..a8643ba1b6cf 100644 --- a/pkgs/by-name/ae/aerogramme/package.nix +++ b/pkgs/by-name/ae/aerogramme/package.nix @@ -50,5 +50,6 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ supinie ]; mainProgram = "aerogramme"; platforms = lib.platforms.linux; + broken = true; # https://github.com/rust-lang/rust/issues/129811 }; } diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index 2b2e9cc9dbbe..400cce650f94 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.60.0"; + version = "0.61.0"; in python3.pkgs.buildPythonApplication { pname = "aider-chat"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication { owner = "Aider-AI"; repo = "aider"; rev = "refs/tags/v${version}"; - hash = "sha256-0jAdUcGGJzxvTKY/56an0oLEghZHz6fdNLg8cPer1Qc="; + hash = "sha256-C1VMdLRb+FVN8zwWRa7RCkRxZgdUPNUfBdAjMi9efjQ="; }; pythonRelaxDeps = true; @@ -113,6 +113,13 @@ python3.pkgs.buildPythonApplication { wcwidth yarl zipp + + # Not listed in requirements + mixpanel + monotonic + posthog + propcache + python-dateutil ]; buildInputs = [ portaudio ]; @@ -151,6 +158,15 @@ python3.pkgs.buildPythonApplication { export AIDER_CHECK_UPDATE=false ''; + optional-dependencies = with python3.pkgs; { + playwright = [ + greenlet + playwright + pyee + typing-extensions + ]; + }; + meta = { description = "AI pair programming in your terminal"; homepage = "https://github.com/paul-gauthier/aider"; diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix new file mode 100644 index 000000000000..bc02fbf83729 --- /dev/null +++ b/pkgs/by-name/ba/baidupcs-go/package.nix @@ -0,0 +1,33 @@ +{ + buildGo122Module, + lib, + fetchFromGitHub, + versionCheckHook, +}: +buildGo122Module rec { + pname = "baidupcs-go"; + version = "3.9.5"; + src = fetchFromGitHub { + owner = "qjfoidnh"; + repo = "BaiduPCS-Go"; + rev = "v${version}"; + hash = "sha256-zNodRQzflOOB3hAeq4KbjRFlHQwknVy+4ucipUcoufY="; + }; + + vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc="; + doCheck = false; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + + meta = { + maintainers = with lib.maintainers; [ xddxdd ]; + description = "Baidu Netdisk commandline client, mimicking Linux shell file handling commands"; + homepage = "https://github.com/qjfoidnh/BaiduPCS-Go"; + license = lib.licenses.asl20; + mainProgram = "BaiduPCS-Go"; + }; +} diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix index 57357ea47c2b..bc85007b0c67 100644 --- a/pkgs/by-name/ca/catppuccin-cursors/package.nix +++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix @@ -40,7 +40,7 @@ let }; variantName = { palette, color }: palette + color; variants = lib.mapCartesianProduct variantName dimensions; - version = "1.0.0"; + version = "1.0.1"; in stdenvNoCC.mkDerivation { pname = "catppuccin-cursors"; @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation { owner = "catppuccin"; repo = "cursors"; rev = "v${version}"; - hash = "sha256-LZ2k8i4w68VW4YFmC659iMQsQyduHJOfyL8cLlXhUHo="; + hash = "sha256-l01L0UiE9bgUOMHhs74Bndarw2b6TaJGW/xU/8rfoAk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/by-name/dc/dcw-gmt/package.nix similarity index 87% rename from pkgs/applications/gis/gmt/dcw.nix rename to pkgs/by-name/dc/dcw-gmt/package.nix index 092e86edcb66..efa697b2926a 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/by-name/dc/dcw-gmt/package.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dcw-gmt"; version = "2.1.2"; src = fetchurl { - url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; + url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${finalAttrs.version}.tar.gz"; sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk="; }; @@ -29,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; -} +}) diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix new file mode 100644 index 000000000000..10d48b0fc4ce --- /dev/null +++ b/pkgs/by-name/de/deepsource/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + installShellFiles, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "deepsource"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "DeepSourceCorp"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-6uNb4cQVerrlW/eUkjmlO1i1YKYX3qaVdo0i5cczt+I="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + doCheck = true; + + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestReportKeyValueWorkflow" + "TestReportAnalyzerTypeWorkflow" + "TestReportKeyValueFileWorkflow" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + vendorHash = "sha256-SsMq4ngq3sSOL28ysHTxTF4CT9sIcCIW7yIhBxIPrNs="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd deepsource \ + --bash <($out/bin/deepsource completion bash) \ + --fish <($out/bin/deepsource completion fish) \ + --zsh <($out/bin/deepsource completion zsh) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { + description = "Command line interface to DeepSource, the code health platform"; + mainProgram = "deepsource"; + homepage = "https://github.com/DeepSourceCorp/cli"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nipeharefa ]; + }; +} diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index 1aac043fcf83..561d97debfa1 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -7,10 +7,10 @@ let appthreat-vulnerability-db = ( python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec { - version = "5.7.3"; + version = "5.7.8"; src = oldAttrs.src.override { rev = "refs/tags/v${version}"; - hash = "sha256-MrlgBUx3T2G46Pnah3obe5b4yKDzsAFVC/B7AHM0kZY="; + hash = "sha256-R00/a9+1NctVPi+EL7K65w/e88c9oSW5xXGgno+MCXo="; }; }) ); @@ -18,16 +18,18 @@ let in python3.pkgs.buildPythonApplication rec { pname = "dep-scan"; - version = "5.4.3"; + version = "5.4.8"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-m0vDsCetOSfScu1eprrGaDJ1VuXxuNFBitK8N5GtfSQ="; + hash = "sha256-QTvxKoqBxTb/xFaIHsYe3N+7ABJ6sDd2vVcjkMbm3xI="; }; + pythonRelaxDeps = [ "oras" ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/de/devtoolbox/package.nix b/pkgs/by-name/de/devtoolbox/package.nix new file mode 100644 index 000000000000..c058aa36e3ec --- /dev/null +++ b/pkgs/by-name/de/devtoolbox/package.nix @@ -0,0 +1,118 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + gtksourceview5, + webkitgtk_6_0, + gcr_4, + gdk-pixbuf, +}: +python3Packages.buildPythonApplication rec { + pname = "devtoolbox"; + version = "1.2"; + pyproject = false; # uses meson + + src = fetchFromGitHub { + owner = "aleiepure"; + repo = "devtoolbox"; + rev = "v${version}"; + hash = "sha256-tSH7H2Y/+8EpuM4+Fa0iL/pSJSVtFDXlO2w/xwpzps0="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + gtksourceview5 + webkitgtk_6_0 + gcr_4 + gdk-pixbuf + ]; + + dependencies = with python3Packages; [ + pygobject3 + ruamel-yaml + lxml + python-crontab + jwt + jsonschema + pytz + tzlocal + python-lorem + uuid6 + textstat + markdown2 + daltonlens + asn1crypto + qrcode + sqlparse + jsbeautifier + cssbeautifier + humanize + croniter + python-dateutil + rcssmin + rjsmin + ]; + + dontWrapGApps = true; + + # Contains an unusable devtoolbox-run-script + postInstall = '' + rm -r $out/devtoolbox + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "Development tools at your fingertips"; + longDescription = '' + If you're tired of endlessly looking online for the right + tool, or to find again that website of which you don't + recall the name to do a quick conversion, this is the + right app for you. This is a collection of powerful yet + simple-to-use tools and utilities to solve the most common + daily development problems: + - JSON to YAML converter and vice-versa + - CRON expressions parser + - Formatters for common languages + - Hash generators + - Regex tester + - Markdown Previewer + - Image converters + - Much more... + ''; + homepage = "https://github.com/aleiepure/devtoolbox"; + license = with lib.licenses; [ + gpl3Plus + cc0 + lgpl3Only + mit + unlicense + ]; + mainProgram = "devtoolbox"; + maintainers = with lib.maintainers; [ + aleksana + aucub + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix new file mode 100644 index 000000000000..807dffc8486b --- /dev/null +++ b/pkgs/by-name/di/diffnav/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + makeBinaryWrapper, + delta, +}: + +buildGoModule rec { + pname = "diffnav"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "dlvhdr"; + repo = "diffnav"; + rev = "refs/tags/v${version}"; + hash = "sha256-xZAi/Ky1RjOxjhQKHvozaPTqDPcrGfhMemGWzi7WyW4="; + }; + + vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + postInstall = '' + wrapProgram $out/bin/diffnav \ + --prefix PATH : ${lib.makeBinPath [ delta ]} + ''; + + meta = { + changelog = "https://github.com/dlvhdr/diffnav/releases/tag/${src.rev}"; + description = "Git diff pager based on delta but with a file tree, à la GitHub"; + homepage = "https://github.com/dlvhdr/diffnav"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ amesgen ]; + mainProgram = "diffnav"; + }; +} diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix new file mode 100644 index 000000000000..dcee3bbadd74 --- /dev/null +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -0,0 +1,113 @@ +{ + lib, + stdenv, + alsa-lib, + fetchFromGitHub, + fftwFloat, + freetype, + libGL, + libX11, + libXcursor, + libXext, + libXrender, + meson, + ninja, + pkg-config, +}: + +let + rpathLibs = [ + fftwFloat + ]; +in +stdenv.mkDerivation { + pname = "distrho-ports"; + version = "2021-03-15-unstable-2024-05-01"; + + src = fetchFromGitHub { + owner = "DISTRHO"; + repo = "DISTRHO-Ports"; + rev = "b3596e6a690eb0556e69e8b6d943fee2dfbb04fb"; + sha256 = "00fgqwayd20akww3n2imyqscmyrjyc9jj0ar13k9dhpaxqk2jxbf"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = rpathLibs ++ [ + alsa-lib + freetype + libGL + libX11 + libXcursor + libXext + libXrender + ]; + + env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; + + postFixup = '' + for file in \ + $out/lib/lv2/vitalium.lv2/vitalium.so \ + $out/lib/vst/vitalium.so \ + $out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so + do + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file + done + ''; + + meta = { + homepage = "http://distrho.sourceforge.net/ports"; + description = "Linux audio plugins and LV2 ports"; + longDescription = '' + Includes: + - arctican-function + - arctican-pilgrim + - dexed + - drowaudio-distortion + - drowaudio-distortionshaper + - drowaudio-flanger + - drowaudio-reverb + - drowaudio-tremolo + - drumsynth + - easySSP + - eqinox + - HiReSam + - juce-opl + - klangfalter + - LUFSMeter + - LUFSMeter-Multi + - luftikus + - obxd + - pitchedDelay + - refine + - stereosourceseparation + - swankyamp + - tal-dub-3 + - tal-filter + - tal-filter-2 + - tal-noisemaker + - tal-reverb + - tal-reverb-2 + - tal-reverb-3 + - tal-vocoder-2 + - temper + - vex + - vitalium + - wolpertinger + ''; + license = with lib.licenses; [ + gpl2Only + gpl3Only + gpl2Plus + lgpl2Plus + lgpl3Only + mit + ]; + maintainers = [ ]; + platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isLinux lib.systems.inspect.patterns.isx86; + }; +} diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index d23466447ecc..43d4377d614a 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -4,7 +4,6 @@ SDL2_image, SDL2_net, alsa-lib, - darwin, fetchFromGitHub, fetchpatch, fluidsynth, @@ -30,6 +29,8 @@ stdenv, testers, zlib-ng, + apple-sdk_15, + darwinMinVersionHook, }: stdenv.mkDerivation (finalAttrs: { @@ -81,14 +82,10 @@ stdenv.mkDerivation (finalAttrs: { zlib-ng ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AudioUnit - Carbon - Cocoa - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + (darwinMinVersionHook "10.15") # from https://www.dosbox-staging.org/releases/macos/ + ]; outputs = [ "out" "man" ]; diff --git a/pkgs/by-name/eg/eg25-manager/package.nix b/pkgs/by-name/eg/eg25-manager/package.nix index 35514cf558eb..f76b07173fc9 100644 --- a/pkgs/by-name/eg/eg25-manager/package.nix +++ b/pkgs/by-name/eg/eg25-manager/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eg25-manager"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitLab { owner = "mobian1"; repo = "eg25-manager"; rev = finalAttrs.version; - hash = "sha256-hOOYrEM+W7nHc6AQMYg6XQj4dgkLoBQe9S1F65TWPUI="; + hash = "sha256-Zna+JplmYrxPYsXToJ3vKOPzPMZYB3bEdfT8GIAHATs="; }; postPatch = '' diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index cee3ef9d13fc..f5be02e864cd 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -115,7 +115,7 @@ let buildInputs = [ sqlite ]; buildPlugins = [ beamPackages.pc ]; }; - p1_mysql = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; }; + p1_mysql = prev.p1_mysql.override { buildPlugins = [ beamPackages.pc ]; }; epam = prev.epam.override { buildInputs = [ pam ]; buildPlugins = [ beamPackages.pc ]; diff --git a/pkgs/by-name/em/ember-cli/package.json b/pkgs/by-name/em/ember-cli/package.json deleted file mode 100644 index 48cd3aa8543b..000000000000 --- a/pkgs/by-name/em/ember-cli/package.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "name": "ember-cli", - "version": "5.3.0", - "description": "Command line tool for developing ambitious ember.js apps", - "keywords": [ - "app", - "app-kit", - "blockchain", - "cli", - "ember", - "ember-app-kit", - "ember.js", - "kit" - ], - "homepage": "https://cli.emberjs.com/release/", - "bugs": { - "url": "https://github.com/ember-cli/ember-cli/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/ember-cli/ember-cli.git" - }, - "license": "MIT", - "author": "Stefan Penner, Robert Jackson and ember-cli contributors", - "main": "lib/cli/index.js", - "bin": { - "ember": "./bin/ember" - }, - "scripts": { - "docs": "yuidoc", - "lint": "eslint . --cache", - "prepack": "yarn docs", - "test": "node --unhandled-rejections=strict tests/runner", - "test:all": "node --unhandled-rejections=strict tests/runner all", - "test:cover": "nyc --all --reporter=text --reporter=lcov node tests/runner all", - "test:debug": "node --unhandled-rejections=strict debug tests/runner", - "test:slow": "node --unhandled-rejections=strict tests/runner slow" - }, - "dependencies": { - "@babel/core": "^7.22.10", - "@pnpm/find-workspace-dir": "^6.0.2", - "broccoli": "^3.5.2", - "broccoli-builder": "^0.18.14", - "broccoli-concat": "^4.2.5", - "broccoli-config-loader": "^1.0.1", - "broccoli-config-replace": "^1.1.2", - "broccoli-debug": "^0.6.5", - "broccoli-funnel": "^3.0.8", - "broccoli-funnel-reducer": "^1.0.0", - "broccoli-merge-trees": "^4.2.0", - "broccoli-middleware": "^2.1.1", - "broccoli-slow-trees": "^3.1.0", - "broccoli-source": "^3.0.1", - "broccoli-stew": "^3.0.0", - "calculate-cache-key-for-tree": "^2.0.0", - "capture-exit": "^2.0.0", - "chalk": "^4.1.2", - "ci-info": "^3.8.0", - "clean-base-url": "^1.0.0", - "compression": "^1.7.4", - "configstore": "^5.0.1", - "console-ui": "^3.1.2", - "core-object": "^3.1.5", - "dag-map": "^2.0.2", - "diff": "^5.1.0", - "ember-cli-is-package-missing": "^1.0.0", - "ember-cli-lodash-subset": "^2.0.1", - "ember-cli-normalize-entity-name": "^1.0.0", - "ember-cli-preprocess-registry": "^5.0.1", - "ember-cli-string-utils": "^1.1.0", - "ensure-posix-path": "^1.1.1", - "execa": "^5.1.1", - "exit": "^0.1.2", - "express": "^4.18.1", - "filesize": "^10.0.8", - "find-up": "^5.0.0", - "find-yarn-workspace-root": "^2.0.0", - "fixturify-project": "^2.1.1", - "fs-extra": "^11.1.1", - "fs-tree-diff": "^2.0.1", - "get-caller-file": "^2.0.5", - "git-repo-info": "^2.1.1", - "glob": "^8.1.0", - "heimdalljs": "^0.2.6", - "heimdalljs-fs-monitor": "^1.1.1", - "heimdalljs-graph": "^1.0.0", - "heimdalljs-logger": "^0.1.10", - "http-proxy": "^1.18.1", - "inflection": "^2.0.1", - "inquirer": "^9.1.5", - "is-git-url": "^1.0.0", - "is-language-code": "^3.1.0", - "isbinaryfile": "^5.0.0", - "leek": "0.0.24", - "lodash.template": "^4.5.0", - "markdown-it": "^13.0.1", - "markdown-it-terminal": "^0.4.0", - "minimatch": "^7.4.3", - "morgan": "^1.10.0", - "nopt": "^3.0.6", - "npm-package-arg": "^10.1.0", - "os-locale": "^5.0.0", - "p-defer": "^3.0.0", - "portfinder": "^1.0.32", - "promise-map-series": "^0.3.0", - "promise.hash.helper": "^1.0.8", - "quick-temp": "^0.1.8", - "remove-types": "^1.0.0", - "resolve": "^1.22.1", - "resolve-package-path": "^4.0.3", - "safe-stable-stringify": "^2.4.3", - "sane": "^5.0.1", - "semver": "^7.3.5", - "silent-error": "^1.1.1", - "sort-package-json": "^1.57.0", - "symlink-or-copy": "^1.3.1", - "temp": "0.9.4", - "testem": "^3.10.1", - "tiny-lr": "^2.0.0", - "tree-sync": "^2.1.0", - "uuid": "^9.0.0", - "walk-sync": "^3.0.0", - "watch-detector": "^1.0.2", - "workerpool": "^6.4.0", - "yam": "^1.0.0" - }, - "devDependencies": { - "@octokit/rest": "^19.0.7", - "broccoli-plugin": "^4.0.3", - "broccoli-test-helper": "^2.0.0", - "chai": "^4.3.7", - "chai-as-promised": "^7.1.1", - "chai-files": "^1.4.0", - "chai-jest-snapshot": "^2.0.0", - "ember-cli-blueprint-test-helpers": "^0.19.2", - "ember-cli-internal-test-helpers": "^0.9.1", - "eslint": "^8.44.0", - "eslint-config-prettier": "^8.9.0", - "eslint-plugin-chai-expect": "^3.0.0", - "eslint-plugin-mocha": "^10.1.0", - "eslint-plugin-n": "^16.0.1", - "eslint-plugin-prettier": "^4.2.1", - "fixturify": "^3.0.0", - "jsdom": "^21.1.1", - "latest-version": "^5.1.0", - "mocha": "^10.0.0", - "nock": "^13.3.0", - "nyc": "^15.1.0", - "prettier": "2.8.7", - "release-it": "^15.10.0", - "rimraf": "^3.0.2", - "strip-ansi": "^6.0.0", - "supertest": "^6.3.1", - "testdouble": "^3.18.0", - "tmp": "^0.2.1", - "websocket": "^1.0.32", - "which": "3.0.1", - "yuidoc-ember-cli-theme": "^1.0.4", - "yuidocjs": "0.10.2" - }, - "engines": { - "node": ">= 16" - }, - "publishConfig": { - "registry": "https://registry.npmjs.org" - }, - "release-it": { - "git": { - "tagName": "v${version}" - }, - "github": { - "draft": true, - "release": true, - "tokenRef": "GITHUB_AUTH" - } - }, - "trackingCode": "UA-49225444-1", - "volta": { - "node": "16.19.1", - "yarn": "1.22.19" - } -} diff --git a/pkgs/by-name/em/ember-cli/package.nix b/pkgs/by-name/em/ember-cli/package.nix index 86f627be950e..a80a6e56ae78 100644 --- a/pkgs/by-name/em/ember-cli/package.nix +++ b/pkgs/by-name/em/ember-cli/package.nix @@ -1,28 +1,36 @@ -{ lib -, mkYarnPackage -, fetchFromGitHub -, fetchYarnDeps +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnInstallHook, + nodejs, }: -let +stdenvNoCC.mkDerivation (finalAttrs: { pname = "ember-cli"; version = "5.3.0"; + src = fetchFromGitHub { owner = "ember-cli"; repo = "ember-cli"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-xkMsPE+iweIV14m4kE4ytEp4uHMJW6gr+n9oJblr4VQ="; }; -in -mkYarnPackage { - inherit pname version src; offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; + yarnLock = finalAttrs.src + "/yarn.lock"; hash = "sha256-QgT2JFvMupJo+pJc13n2lmHMZkROJRJWoozCho3E6+c="; }; - packageJSON = ./package.json; + strictDeps = true; + + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; meta = with lib; { homepage = "https://github.com/ember-cli/ember-cli"; @@ -32,4 +40,4 @@ mkYarnPackage { platforms = platforms.all; mainProgram = "ember"; }; -} +}) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 64f337f14b42..539f31d6f00d 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -14,14 +14,14 @@ }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.13.tar.xz" + "factorio_linux_2.0.14.tar.xz" ], - "name": "factorio_alpha_x64-2.0.13.tar.xz", + "name": "factorio_alpha_x64-2.0.14.tar.xz", "needsAuth": true, - "sha256": "25fc4c8b0c0b63d8024e1e76efda50e6f8348e967e03c2770eb8a867494b9c98", + "sha256": "8853ce1cdea0c142f78c3ebb3b7d51420f9eb28e9113f2be08a12d4e476dcadc", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.13/alpha/linux64", - "version": "2.0.13" + "url": "https://factorio.com/get-download/2.0.14/alpha/linux64", + "version": "2.0.14" } }, "demo": { @@ -62,14 +62,14 @@ }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.13.tar.xz" + "factorio-space-age_linux_2.0.14.tar.xz" ], - "name": "factorio_expansion_x64-2.0.13.tar.xz", + "name": "factorio_expansion_x64-2.0.14.tar.xz", "needsAuth": true, - "sha256": "5834dc11791aa24c0edc6ecfdd223f80af9c6842c39be0fb8c3b188463ec0f54", + "sha256": "7878444d65dc12815d7ce4d2c941441b8b7e05605e3f0bd69d45d02b3aa8f81a", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.13/expansion/linux64", - "version": "2.0.13" + "url": "https://factorio.com/get-download/2.0.14/expansion/linux64", + "version": "2.0.14" } }, "headless": { @@ -87,15 +87,15 @@ }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.13.tar.xz", - "factorio_headless_x64_2.0.13.tar.xz" + "factorio-headless_linux_2.0.14.tar.xz", + "factorio_headless_x64_2.0.14.tar.xz" ], - "name": "factorio_headless_x64-2.0.13.tar.xz", + "name": "factorio_headless_x64-2.0.14.tar.xz", "needsAuth": false, - "sha256": "27b36901a39e593adf28418c0286142c6c7a9f83d156963c7369bd405a25c7d1", + "sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.13/headless/linux64", - "version": "2.0.13" + "url": "https://factorio.com/get-download/2.0.14/headless/linux64", + "version": "2.0.14" } } } diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index fa590d9a3d1d..e7195db779c9 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -2,9 +2,9 @@ lib, stdenv, fetchFromGitHub, + apple-sdk_15, chafa, cmake, - darwin, dbus, dconf, ddcutil, @@ -23,15 +23,14 @@ nix-update-script, ocl-icd, opencl-headers, - overrideSDK, pcre, pcre2, pkg-config, python3, rpm, sqlite, - testers, util-linux, + versionCheckHook, vulkan-loader, wayland, xfce, @@ -43,10 +42,7 @@ waylandSupport ? true, x11Support ? true, }: -let - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; version = "2.28.0"; @@ -105,24 +101,10 @@ stdenv'.mkDerivation (finalAttrs: { xorg.libXext ] ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Apple80211 - AppKit - AVFoundation - Cocoa - CoreDisplay - CoreVideo - CoreWLAN - DisplayServices - IOBluetooth - MediaRemote - OpenCL - SystemConfiguration - moltenvk - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin ([ + apple-sdk_15 + moltenvk + ]); cmakeFlags = [ @@ -158,14 +140,11 @@ stdenv'.mkDerivation (finalAttrs: { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" ''; - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "fastfetch -v | cut -d '(' -f 1"; - version = "fastfetch ${finalAttrs.version}"; - }; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; meta = { description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool"; diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index d282c2f02483..dabcb321bb54 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-T9ecw+UHe/DM8TSDda140lxG3oaf/wf+TEySOz6tboA="; + hash = "sha256-9PZ0niX7VQzoJ6JE50NOU2es8PyBt7ECENvr2lDpb7Y="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix new file mode 100644 index 000000000000..84e7920a0bd1 --- /dev/null +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + SDL2, +}: +stdenv.mkDerivation rec { + pname = "fna3d"; + version = "24.11"; + + src = fetchFromGitHub { + owner = "FNA-XNA"; + repo = "FNA3D"; + rev = version; + fetchSubmodules = true; + hash = "sha256-NTVaPY39acSRibGQjLuh5ZBGC1Zep/rybVcOU0WrNIw="; + }; + + buildInputs = [ SDL2 ]; + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + install -Dm755 libFNA3D.so $out/lib/libFNA3D.so + ln -s libFNA3D.so $out/lib/libFNA3D.so.0 + ln -s libFNA3D.so $out/lib/libFNA3D.so.0.${version} + runHook postInstall + ''; + + meta = { + description = "Accuracy-focused XNA4 reimplementation for open platforms"; + homepage = "https://fna-xna.github.io/"; + license = lib.licenses.mspl; + platforms = lib.platforms.linux; + mainProgram = pname; + maintainers = with lib.maintainers; [ mrtnvgr ]; + }; +} diff --git a/pkgs/tools/security/fprintd/tod.nix b/pkgs/by-name/fp/fprintd-tod/package.nix similarity index 65% rename from pkgs/tools/security/fprintd/tod.nix rename to pkgs/by-name/fp/fprintd-tod/package.nix index 633985989b3a..bb34e1b88de2 100644 --- a/pkgs/tools/security/fprintd/tod.nix +++ b/pkgs/by-name/fp/fprintd-tod/package.nix @@ -1,11 +1,18 @@ -{ lib -, fetchFromGitLab -, fetchpatch -, fprintd -, libfprint-tod +{ + lib, + fetchFromGitLab, + fetchpatch, + libxml2, + fprintd, + libfprint-tod, + python3Packages, + libpam-wrapper, + gusb, + gobject-introspection, }: -(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: rec { +(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs ( + finalAttrs: previousAttrs: { pname = "fprintd-tod"; version = "1.90.9"; @@ -13,11 +20,24 @@ domain = "gitlab.freedesktop.org"; owner = "libfprint"; repo = "fprintd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg="; }; - patches = oldAttrs.patches or [] ++ [ + nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [ + libpam-wrapper + python3Packages.python + python3Packages.pycairo + python3Packages.dbus-python + python3Packages.python-dbusmock + python3Packages.pygobject3 + gusb + python3Packages.pypamtest + gobject-introspection + libxml2 # for xmllint + ]; + + patches = previousAttrs.patches or [ ] ++ [ (fetchpatch { name = "use-more-idiomatic-correct-embedded-shell-scripting"; url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch"; @@ -40,11 +60,13 @@ }) ]; - postPatch = oldAttrs.postPatch or "" + '' - # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming - mv src/device.xml src/net.reactivated.Fprint.Device.xml - mv src/manager.xml src/net.reactivated.Fprint.Manager.xml - ''; + postPatch = + previousAttrs.postPatch or "" + + '' + # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming + mv src/device.xml src/net.reactivated.Fprint.Device.xml + mv src/manager.xml src/net.reactivated.Fprint.Manager.xml + ''; meta = { homepage = "https://fprint.freedesktop.org/"; @@ -53,4 +75,5 @@ platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hmenke ]; }; - }) + } +) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/by-name/fp/fprintd/package.nix similarity index 76% rename from pkgs/tools/security/fprintd/default.nix rename to pkgs/by-name/fp/fprintd/package.nix index 71951b59a6db..aeddeebba167 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/by-name/fp/fprintd/package.nix @@ -1,37 +1,42 @@ -{ lib, stdenv -, fetchFromGitLab -, pkg-config -, gobject-introspection -, meson -, ninja -, perl -, gettext -, gtk-doc -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_412 -, glib -, gusb -, dbus -, polkit -, nss -, pam -, systemd -, libfprint -, python3 +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + gobject-introspection, + meson, + ninja, + perl, + gettext, + gtk-doc, + libxslt, + docbook-xsl-nons, + docbook_xml_dtd_412, + glib, + gusb, + dbus, + polkit, + nss, + pam, + systemd, + libfprint, + python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fprintd"; version = "1.94.4"; - outputs = [ "out" "devdoc" ]; + outputs = [ + "out" + "devdoc" + ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libfprint"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU="; + repo = "fprintd"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU="; }; nativeBuildInputs = [ @@ -41,6 +46,7 @@ stdenv.mkDerivation rec { perl # for pod2man gettext gtk-doc + python3 libxslt dbus docbook-xsl-nons @@ -81,11 +87,10 @@ stdenv.mkDerivation rec { # FIXME: Ugly hack for tests to find libpam_wrapper.so LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ]; - doCheck = true; - mesonCheckFlags = [ # PAM related checks are timing out - "--no-suite" "fprintd:TestPamFprintd" + "--no-suite" + "fprintd:TestPamFprintd" ]; patches = [ @@ -107,11 +112,11 @@ stdenv.mkDerivation rec { --replace "'G_DEBUG=fatal-criticals'," "" ''; - meta = with lib; { + meta = { homepage = "https://fprint.freedesktop.org/"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; }; -} +}) diff --git a/pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch b/pkgs/by-name/fp/fprintd/skip-test-test_removal_during_enroll.patch similarity index 100% rename from pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch rename to pkgs/by-name/fp/fprintd/skip-test-test_removal_during_enroll.patch diff --git a/pkgs/games/frozen-bubble/fix-compilation.patch b/pkgs/by-name/fr/frozen-bubble/fix-compilation.patch similarity index 100% rename from pkgs/games/frozen-bubble/fix-compilation.patch rename to pkgs/by-name/fr/frozen-bubble/fix-compilation.patch diff --git a/pkgs/by-name/fr/frozen-bubble/package.nix b/pkgs/by-name/fr/frozen-bubble/package.nix new file mode 100644 index 000000000000..40610b9c1ddb --- /dev/null +++ b/pkgs/by-name/fr/frozen-bubble/package.nix @@ -0,0 +1,74 @@ +{ + lib, + fetchurl, + perlPackages, + pkg-config, + SDL, + SDL_mixer, + SDL_Pango, + glib, + copyDesktopItems, + makeDesktopItem, + fetchpatch, +}: + +perlPackages.buildPerlModule { + pname = "frozen-bubble"; + version = "2.212"; + + src = fetchurl { + url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz"; + hash = "sha256-ch4E/2nFIzBgZWv79AAqoa6t2WyVNR8MV7uFtto1owU="; + }; + + patches = [ + ./fix-compilation.patch + (fetchpatch { + # https://github.com/kthakore/frozen-bubble/pull/82 + url = "https://github.com/kthakore/frozen-bubble/commit/1aacc67254a0aafd856086cc306e9f7b389c6bf4.patch?full_index=1"; + hash = "sha256-RqJ+/UFv4esKWZBk0fttsEXhPMislEBTAl2oj4pLAZY="; + }) + ]; + + nativeBuildInputs = [ + copyDesktopItems + pkg-config + ]; + + buildInputs = [ + glib + SDL + SDL_mixer + SDL_Pango + perlPackages.SDL + perlPackages.FileSlurp + ]; + + propagatedBuildInputs = with perlPackages; [ + AlienSDL + CompressBzip2 + FileShareDir + FileWhich + IPCSystemSimple + LocaleMaketextLexicon + ]; + + perlPreHook = "export LD=$CC"; + + desktopItems = [ + (makeDesktopItem { + name = "frozen-bubble"; + exec = "frozen-bubble"; + desktopName = "Frozen Bubble"; + genericName = "Frozen Bubble"; + comment = "Arcade/reflex colour matching game"; + categories = [ "Game" ]; + }) + ]; + + meta = { + description = "Puzzle with Bubbles"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ puckipedia ]; + }; +} diff --git a/pkgs/by-name/ga/garble/0001-Add-version-info.patch b/pkgs/by-name/ga/garble/0001-Add-version-info.patch new file mode 100644 index 000000000000..153ab8f4bf6d --- /dev/null +++ b/pkgs/by-name/ga/garble/0001-Add-version-info.patch @@ -0,0 +1,38 @@ +From e46a41faac008ede4acbeb18db5b3076eb206de5 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Sun, 3 Nov 2024 15:11:49 +0800 +Subject: [PATCH] Add version info + +--- + main.go | 1 + + testdata/script/help.txtar | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/main.go b/main.go +index 0de5a2f..1c830b1 100644 +--- a/main.go ++++ b/main.go +@@ -362,6 +362,7 @@ func mainErr(args []string) error { + // manually construct something like a pseudo-version. + // TODO: remove when this code is dead, hopefully in Go 1.22. + if mod.Version == "(devel)" { ++ mod.Version = "@version@" + var vcsTime time.Time + var vcsRevision string + for _, setting := range info.Settings { +diff --git a/testdata/script/help.txtar b/testdata/script/help.txtar +index 8f25260..859f492 100644 +--- a/testdata/script/help.txtar ++++ b/testdata/script/help.txtar +@@ -91,7 +91,7 @@ stderr 'directory not found' + # and to be able to use static VCS info, use an environment variable. + # First, test without the information, and then with it. + exec garble version +-stdout -count=1 'mvdan.cc/garble \(devel\)' ++stdout -count=1 'mvdan.cc/garble @version@' + stdout -count=1 'Build settings' + stdout -count=3 '-compiler|GOOS|GOARCH' + ! stdout 'vcs' +-- +2.46.1 + diff --git a/pkgs/by-name/ga/garble/package.nix b/pkgs/by-name/ga/garble/package.nix new file mode 100644 index 000000000000..a9f2c711cb66 --- /dev/null +++ b/pkgs/by-name/ga/garble/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + diffoscope, + git, + versionCheckHook, + replaceVars, + nix-update-script, +}: + +buildGoModule rec { + pname = "garble"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "burrowers"; + repo = "garble"; + rev = "refs/tags/v${version}"; + hash = "sha256-FtI5lAeqjRPN47iC46bcEsRLQb7mItw4svsnLkRpNxY="; + }; + + __darwinAllowLocalNetworking = true; + + ldflags = [ + "-buildid=00000000000000000000" # length=20 + ]; + + patches = [ + (replaceVars ./0001-Add-version-info.patch { + inherit version; + }) + ]; + + checkFlags = [ + "-skip" + "TestScript/gogarble" + ]; + + vendorHash = "sha256-mSdajYiMEg2ik0ocfmHK+XddEss1qLu6rDwzjocaaW0="; + + # Used for some of the tests. + nativeCheckInputs = [ + diffoscope + git + versionCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + export WORK=$(mktemp -d) + ''; + + # Several tests fail with + # FAIL: testdata/script/goenv.txtar:27: "$WORK/.temp 'quotes' and spaces" matches "garble|importcfg|cache\\.gob|\\.go" + doCheck = !stdenv.hostPlatform.isDarwin; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "version" ]; + doInstallCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Obfuscate Go code by wrapping the Go toolchain"; + homepage = "https://github.com/burrowers/garble/"; + maintainers = with lib.maintainers; [ + davhau + bot-wxt1221 + ]; + license = lib.licenses.bsd3; + mainProgram = "garble"; + }; +} diff --git a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix index 1760bea79abb..258762c2ad5d 100644 --- a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix @@ -14,14 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gepetto-viewer-corba"; - version = "5.8.0"; - pyproject = false; # CMake + version = "5.8.1"; src = fetchFromGitHub { owner = "gepetto"; repo = "gepetto-viewer-corba"; rev = "v${finalAttrs.version}"; - hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w="; + hash = "sha256-C7xrODoKCcyLPZr0+zZSZ/o5i5EeNsxCPXp2WrP28A4="; }; outputs = [ @@ -29,12 +28,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \ - --replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES} - ''; - buildInputs = [ libsForQt5.qtbase ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix index 8e87bb3b1891..9abddf1ac581 100644 --- a/pkgs/by-name/ge/gepetto-viewer/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer/package.nix @@ -4,7 +4,6 @@ darwin, doxygen, fetchFromGitHub, - fetchpatch, fontconfig, lib, jrl-cmakemodules, @@ -21,28 +20,15 @@ let gepetto-viewer = stdenv.mkDerivation (finalAttrs: { pname = "gepetto-viewer"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "gepetto"; repo = "gepetto-viewer"; rev = "v${finalAttrs.version}"; - hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8="; + hash = "sha256-kAQPi7bO48H0CZKz1bxfkvMiNy8RsXvRvpDK0KF7XLM="; }; - patches = [ - # fix use of CMAKE_INSTALL_BINDIR for $bin output - (fetchpatch { - url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch"; - hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs="; - }) - # fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output - (fetchpatch { - url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch"; - hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc="; - }) - ]; - cmakeFlags = [ (lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin)) (lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin)) diff --git a/pkgs/by-name/gh/ghbackup/package.nix b/pkgs/by-name/gh/ghbackup/package.nix new file mode 100644 index 000000000000..4bdacd3044eb --- /dev/null +++ b/pkgs/by-name/gh/ghbackup/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + makeWrapper, +}: + +buildGoModule rec { + pname = "ghbackup"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "qvl"; + repo = "ghbackup"; + rev = "v${version}"; + hash = "sha256-3LSe805VrbUGjqjnhTJD2KBVZ4rq+4Z3l4d0I1MrBMA="; + }; + + patches = [ ./patches/fix-next-page-logic.patch ]; + + postPatch = '' + go mod init qvl.io/ghbackup + ''; + + nativeBuildInputs = [ makeWrapper ]; + + vendorHash = null; + + postFixup = '' + wrapProgram $out/bin/${meta.mainProgram} \ + --prefix PATH : "${lib.makeBinPath [ git ]}" + ''; + + doCheck = false; # tests want to actually download from github + + meta = with lib; { + description = "Backup your GitHub repositories with a simple command-line application written in Go."; + homepage = "https://github.com/qvl/ghbackup"; + license = licenses.mit; + mainProgram = "ghbackup"; + maintainers = with maintainers; [ lenny ]; + }; +} diff --git a/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch b/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch new file mode 100644 index 000000000000..346807a3a6d0 --- /dev/null +++ b/pkgs/by-name/gh/ghbackup/patches/fix-next-page-logic.patch @@ -0,0 +1,66 @@ +From 9825efc51387fef14fdb184e7061b313a54fcb86 Mon Sep 17 00:00:00 2001 +From: Ronan Barrett +Date: Mon, 8 May 2023 15:54:39 +0200 +Subject: [PATCH 1/2] fix next page logic + +--- + ghbackup/fetch.go | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/ghbackup/fetch.go b/ghbackup/fetch.go +index 93cce1c..bcef8ad 100644 +--- a/ghbackup/fetch.go ++++ b/ghbackup/fetch.go +@@ -126,11 +126,17 @@ func getNextURL(header http.Header) string { + if len(parts) == 0 { + return "" + } +- firstLink := parts[0] +- if !strings.Contains(firstLink, "rel=\"next\"") { ++ var nextLink string ++ for _, v := range parts { ++ if strings.Contains(v, "rel=\"next\"") { ++ nextLink = strings.TrimSpace(v) ++ } ++ } ++ if nextLink == "" { + return "" + } +- parts = strings.Split(firstLink, ";") ++ ++ parts = strings.Split(nextLink, ";") + if len(parts) == 0 { + return "" + } +@@ -140,3 +146,4 @@ func getNextURL(header http.Header) string { + } + return urlInBrackets[1 : len(urlInBrackets)-1] + } ++ + +From 5f696939f668cd88c59c05fd8e0d6ad9f236dea5 Mon Sep 17 00:00:00 2001 +From: Ronan Barrett +Date: Mon, 8 May 2023 16:44:47 +0200 +Subject: [PATCH 2/2] add break + +--- + ghbackup/fetch.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ghbackup/fetch.go b/ghbackup/fetch.go +index bcef8ad..b045c38 100644 +--- a/ghbackup/fetch.go ++++ b/ghbackup/fetch.go +@@ -130,6 +130,7 @@ func getNextURL(header http.Header) string { + for _, v := range parts { + if strings.Contains(v, "rel=\"next\"") { + nextLink = strings.TrimSpace(v) ++ break + } + } + if nextLink == "" { +@@ -146,4 +147,3 @@ func getNextURL(header http.Header) string { + } + return urlInBrackets[1 : len(urlInBrackets)-1] + } +- diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix new file mode 100644 index 000000000000..381fd67aa4f1 --- /dev/null +++ b/pkgs/by-name/gm/gmt/package.nix @@ -0,0 +1,108 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + darwin, + fftwSinglePrec, + netcdf, + pcre, + gdal, + blas, + lapack, + ghostscript, + dcw-gmt, + gshhg-gmt, + libxml2, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "gmt"; + version = "6.5.0"; + + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "gmt"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; + }; + + nativeBuildInputs = [ cmake ]; + + env = { + NIX_LDFLAGS = "-lxml2 -L${lib.getLib (libxml2.override { enableHttp = true; })}/lib"; + NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration " + + lib.optionalString ( + stdenv.isDarwin + && lib.versionOlder (darwin.apple_sdk.MacOSX-SDK.version or darwin.apple_sdk.sdk.version) "13.3" + ) "-D__LAPACK_int=int"; + }; + + buildInputs = + [ + curl + gdal + netcdf + pcre + dcw-gmt + gshhg-gmt + ] + ++ ( + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; + [ + Accelerate + CoreGraphics + CoreVideo + ] + else + [ + fftwSinglePrec + blas + lapack + ] + ); + + propagatedBuildInputs = [ ghostscript ]; + + cmakeFlags = + [ + (lib.cmakeFeature "GMT_DOCDIR" "share/doc/gmt") + (lib.cmakeFeature "GMT_MANDIR" "share/man") + (lib.cmakeFeature "GMT_LIBDIR" "lib") + (lib.cmakeBool "COPY_GSHHG" false) + (lib.cmakeFeature "GSHHG_ROOT" "${gshhg-gmt.out}/share/gshhg-gmt") + (lib.cmakeBool "COPY_DCW" false) + (lib.cmakeFeature "DCW_ROOT" "${dcw-gmt.out}/share/dcw-gmt") + (lib.cmakeFeature "GDAL_ROOT" "${gdal.out}") + (lib.cmakeFeature "NETCDF_ROOT" "${netcdf.out}") + (lib.cmakeFeature "PCRE_ROOT" "${pcre.out}") + (lib.cmakeBool "GMT_INSTALL_TRADITIONAL_FOLDERNAMES" false) + (lib.cmakeBool "GMT_ENABLE_OPENMP" true) + (lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false) + (lib.cmakeFeature "LICENSE_RESTRICTED" "LGPL") + ] + ++ (lib.optionals (!stdenv.isDarwin) [ + (lib.cmakeFeature "FFTW3_ROOT" "${fftwSinglePrec.dev}") + (lib.cmakeFeature "LAPACK_LIBRARY" "${lib.getLib lapack}/lib/liblapack.so") + (lib.cmakeFeature "BLAS_LIBRARY" "${lib.getLib blas}/lib/libblas.so") + ]); + + meta = { + homepage = "https://www.generic-mapping-tools.org"; + description = "Tools for manipulating geographic and cartesian data sets"; + longDescription = '' + GMT is an open-source collection of command-line tools for manipulating + geographic and Cartesian data sets (including filtering, trend fitting, + gridding, projecting, etc.) and producing high-quality illustrations + ranging from simple x–y plots via contour maps to artificially illuminated + surfaces and 3D perspective views. It supports many map projections and + transformations and includes supporting data such as coastlines, rivers, + and political boundaries and optionally country polygons. + ''; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ tviti ]; + }; +}) diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index 0d19b6de7c91..233c0f2296ee 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -5,7 +5,6 @@ meson, ninja, gettext, - python3, pkg-config, gnome, glib, @@ -75,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: { # entry point to the wrapped binary we get back to a wrapped # binary. substituteInPlace "data/org.gnome.Maps.service.in" \ - --replace "Exec=@pkgdatadir@/@app-id@" \ - "Exec=$out/bin/gnome-maps" + --replace-fail "Exec=@pkgdatadir@/@app-id@" \ + "Exec=$out/bin/gnome-maps" ''; preCheck = '' @@ -97,6 +96,12 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/gnome-maps/libgnome-maps.so.0 ''; + preFixup = '' + substituteInPlace "$out/share/applications/org.gnome.Maps.desktop" \ + --replace-fail "Exec=gapplication launch org.gnome.Maps" \ + "Exec=gnome-maps" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-maps"; }; }; diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix index 52a8321c300e..8dda0c17d6bb 100644 --- a/pkgs/by-name/go/go-chromecast/package.nix +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -1,25 +1,24 @@ { lib, - buildGo122Module, + buildGoModule, fetchFromGitHub, installShellFiles, stdenvNoCC, versionCheckHook, }: -# "go test" fails with go 1.23 -buildGo122Module rec { +buildGoModule rec { pname = "go-chromecast"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "vishen"; repo = "go-chromecast"; rev = "refs/tags/v${version}"; - hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI="; + hash = "sha256-R1VGgustsKRoVZFiH2wuYRRSOolWIYq33H0DyQXHDvg="; }; - vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og="; + vendorHash = "sha256-EI37KPdNxPXdgmxvawTiRQ516dLxt5o0iYvGcAHXdUw="; CGO_ENABLED = 0; diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/by-name/gs/gshhg-gmt/package.nix similarity index 86% rename from pkgs/applications/gis/gmt/gshhg.nix rename to pkgs/by-name/gs/gshhg-gmt/package.nix index d51f1dbbcb5a..c17378d5ec1b 100644 --- a/pkgs/applications/gis/gmt/gshhg.nix +++ b/pkgs/by-name/gs/gshhg-gmt/package.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gshhg-gmt"; version = "2.3.7"; src = fetchurl { - url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${version}.tar.gz"; + url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${finalAttrs.version}.tar.gz"; sha256 = "9bb1a956fca0718c083bef842e625797535a00ce81f175df08b042c2a92cfe7f"; }; @@ -28,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; -} +}) diff --git a/pkgs/by-name/hy/hyprgui/package.nix b/pkgs/by-name/hy/hyprgui/package.nix new file mode 100644 index 000000000000..539dcf36ab72 --- /dev/null +++ b/pkgs/by-name/hy/hyprgui/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + glib, + pango, + cairo, + gtk4, + wrapGAppsHook4, +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprgui"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "hyprutils"; + repo = "hyprgui"; + rev = "refs/tags/v${version}"; + hash = "sha256-toHE+N18PGSp0HdR9tcVPYRdfNv20HQfS7U5fHeJ32s="; + }; + + cargoHash = "sha256-Vn059HCHwz0j6ujDVk+GNrHQ7PhqBFb3XfjKLSYlYKg="; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + buildInputs = [ + glib + cairo + pango + gtk4 + ]; + + postInstall = '' + install -Dm644 -t $out/usr/share/icons hyprgui.png + install -Dm644 -t $out/usr/share/applications hyprgui.desktop + ''; + + meta = { + description = "GUI for configuring Hyprland written in Rust"; + homepage = "https://github.com/hyprutils/hyprgui"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fccapria ]; + badPlatforms = lib.platforms.darwin; + mainProgram = "hyprgui"; + }; +} diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 05ce061e19ca..6265bd2dc005 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -10,18 +10,19 @@ wayland-scanner, hyprlang, sdbus-cpp_2, - systemd, + systemdLibs, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hypridle"; rev = "v${finalAttrs.version}"; - hash = "sha256-20a3pg94dyLFflbBIN+EYJ04nWfWldTfd2YmB/rcrqY="; + hash = "sha256-esE2L7+9CsmlSjTIHwU9VAhzvsFSMC3kO7EiutCPQpg="; }; nativeBuildInputs = [ @@ -34,17 +35,22 @@ stdenv.mkDerivation (finalAttrs: { hyprlang hyprutils sdbus-cpp_2 - systemd + systemdLibs wayland wayland-protocols ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Hyprland's idle daemon"; homepage = "https://github.com/hyprwm/hypridle"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ iogamaster + johnrtitor khaneliman ]; mainProgram = "hypridle"; diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix index 13f9920c23f5..522c451fd676 100644 --- a/pkgs/by-name/hy/hyprland-activewindow/package.nix +++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-activewindow"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "FieldOfClay"; repo = "hyprland-activewindow"; rev = "v${version}"; - hash = "sha256-2pIOZMBPqheqAz3YEvHP2ehLXhqIclOXXAFa5EXXZPk="; + hash = "sha256-oH3BsS0KqnNdYe7HWHlfRSiUJx+vC3IveN+mcEgwZLs="; }; - cargoHash = "sha256-5JhNBgP6VQX7TVPaFUGvknDWrn6F06Mm3mGfuajg9yQ="; + cargoHash = "sha256-B9ZOz4U6tvUfFzI5pOuhazTZJH89jpxwRc+tbfNEZAk="; meta = with lib; { description = "Multi-monitor-aware Hyprland workspace widget helper"; diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix index dd96593d5d18..6b925c199ddd 100644 --- a/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "FieldofClay"; repo = "hyprland-workspaces"; rev = "v${version}"; - hash = "sha256-cTIh/UwtVVAWdJEcwOxKmYHBA6XXAaAQz/yW0Xs0y1k="; + hash = "sha256-P+EJoZJqSlpMX1bWOkQYlKR577nTTe1luWKK5GS9Pn4="; }; - cargoHash = "sha256-NPphNQ2FLUrYLbquc2IzxuEjfmov+IPa1ixS6VGomPs="; + cargoHash = "sha256-vUlr12K/vYJE+HlSgulE2aSowU+pT9VPCaCp7Ix9ChM="; meta = with lib; { description = "Multi-monitor aware Hyprland workspace widget"; diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 66213718fd23..a018bee46c88 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -17,7 +17,7 @@ cacert, unzip, # runtime deps - jellyfin-ffmpeg, + jellyfin-ffmpeg, # Immich depends on the jellyfin customizations, see https://github.com/NixOS/nixpkgs/issues/351943 imagemagick, libraw, libheif, diff --git a/pkgs/by-name/ke/keycastr/package.nix b/pkgs/by-name/ke/keycastr/package.nix index 5eca502af147..8efa645b49aa 100644 --- a/pkgs/by-name/ke/keycastr/package.nix +++ b/pkgs/by-name/ke/keycastr/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keycastr"; - version = "0.9.18"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/keycastr/keycastr/releases/download/v${finalAttrs.version}/KeyCastr.app.zip"; - hash = "sha256-q12c/W0yGoVL+wx+T/gaevx2P0Xwcv0a0FMv7bKfUnE="; + hash = "sha256-Ea/QtYiM7J2Gc5T8M+WizSBrgmhJ+NW4ern2A58glUk="; }; sourceRoot = "."; diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 594a255bb989..e9b68742d681 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -8,6 +8,7 @@ libinput, libpng, librsvg, + libsfdo, libxcb, libxkbcommon, libxml2, @@ -17,6 +18,7 @@ pkg-config, scdoc, stdenv, + versionCheckHook, wayland, wayland-protocols, wayland-scanner, @@ -27,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-1PyPk6r/hXkC0EfOIeDqNGrrpvo616derD9u7i3XjkA="; + hash = "sha256-TXxdjMkzZQoCqkZBqus5eCBEhA/nvxNNXaNHUTGFQDQ="; }; outputs = [ @@ -58,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { libinput libpng librsvg + libsfdo libxcb libxkbcommon libxml2 @@ -69,10 +72,15 @@ stdenv.mkDerivation (finalAttrs: { xwayland ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + mesonFlags = [ (lib.mesonEnable "xwayland" true) ]; strictDeps = true; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + passthru = { providedSessions = [ "labwc" ]; }; @@ -80,9 +88,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/labwc/labwc"; description = "Wayland stacking compositor, inspired by Openbox"; + changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "labwc"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; inherit (wayland.meta) platforms; }; }) diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index ba57f5460ccd..452944aa9a75 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -1,6 +1,8 @@ { lib, fetchurl, + fetchpatch, + autoreconfHook, ncurses, pcre2, stdenv, @@ -22,6 +24,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg="; }; + patches = [ + (fetchpatch { + # Fix configure parameters --with-secure=no and --without-secure. + url = "https://github.com/gwsw/less/commit/8fff6c56bfc833528b31ebdaee871f65fbe342b1.patch"; + hash = "sha256-XV5XufivNWWLGeIpaP04YQPWcxIUKYYEINdT+eEx+WA="; + includes = [ + "configure.ac" + ]; + }) + ]; + + # Need `autoreconfHook` since we patch `configure.ac`. + # TODO: Remove the `configure.ac` patch and `autoreconfHook` next release + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ ncurses pcre2 diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/by-name/li/libfprint/package.nix similarity index 68% rename from pkgs/development/libraries/libfprint/default.nix rename to pkgs/by-name/li/libfprint/package.nix index 3c1b14eaf909..7e0894f6b97b 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/by-name/li/libfprint/package.nix @@ -1,32 +1,37 @@ -{ lib, stdenv -, fetchFromGitLab -, pkg-config -, meson -, python3 -, ninja -, gusb -, pixman -, glib -, nss -, gobject-introspection -, cairo -, libgudev -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + meson, + python3, + ninja, + gusb, + pixman, + glib, + nss, + gobject-introspection, + cairo, + libgudev, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfprint"; - version = "1.94.6"; - outputs = [ "out" "devdoc" ]; + version = "1.94.8"; + outputs = [ + "out" + "devdoc" + ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libfprint"; - repo = pname; - rev = "v${version}"; - hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8="; + repo = "libfprint"; + rev = "v${finalAttrs.version}"; + hash = "sha256-PZr4ZeVnuCKYfI8CKvRqBwalxsz9Ka17kSuLflwl7mE="; }; postPatch = '' @@ -82,11 +87,11 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://fprint.freedesktop.org/"; description = "Library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl21Only; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.lgpl21Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; }; -} +}) diff --git a/pkgs/by-name/li/libsfdo/package.nix b/pkgs/by-name/li/libsfdo/package.nix new file mode 100644 index 000000000000..2095b8a4efce --- /dev/null +++ b/pkgs/by-name/li/libsfdo/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + testers, + validatePkgConfig, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libsfdo"; + version = "0.1.3"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "vyivel"; + repo = "libsfdo"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-9jCfCIB07mmJ6aWQHvXaxYhEMNikUw/W1xrpmh6FKbo="; + }; + + strictDeps = true; + doCheck = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + validatePkgConfig + ]; + + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + + meta = { + description = "Collection of libraries which implement some of the freedesktop.org specifications"; + homepage = "https://gitlab.freedesktop.org/vyivel/libsfdo"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.zi3m5f ]; + pkgConfigModules = [ + "libsfdo-basedir" + "libsfdo-desktop-file" + "libsfdo-desktop" + "libsfdo-icon" + ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix new file mode 100644 index 000000000000..199ab79c169b --- /dev/null +++ b/pkgs/by-name/li/libsnark/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + openssl, + boost, + gmp, + withProcps ? false, + procps, +}: + +stdenv.mkDerivation { + pname = "libsnark"; + version = "20140603-unstable-2024-02-23"; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + openssl + boost + gmp + ] ++ lib.optional withProcps procps; + + cmakeFlags = + lib.optionals (!withProcps) [ "-DWITH_PROCPS=OFF" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ + "-DWITH_SUPERCOP=OFF" + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ]; + + src = fetchFromGitHub { + owner = "scipr-lab"; + repo = "libsnark"; + rev = "6c705e3135f585c222813654caedc86520fda1f6"; + hash = "sha256-5Gk24fwVaXBWEFmhTsN9Qm8x/Qpr1KjavI3staJidxQ="; + fetchSubmodules = true; + }; + + meta = { + broken = withProcps; # Despite procps having a valid pkg-config file, CMake doesn't seem to be able to find it. + description = "C++ library for zkSNARKs"; + homepage = "https://github.com/scipr-lab/libsnark"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 4b2e56deee8f..dec420e3fe52 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.58.0"; + version = "3.60.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-sWlD/n9Qjwiu/UfZrxRxwv2rc4XwRZN35fyjIriGZPY="; + hash = "sha256-sLs73356BaFbKtyQc4cTFm7Wp/UemH8J+tkajXAA0do="; }; strictDeps = true; @@ -54,10 +54,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/lms/main.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" - substituteInPlace src/tools/recommendation/LmsRecommendation.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" - substituteInPlace src/tools/db-generator/LmsDbGenerator.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" - substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + substituteInPlace src/libs/core/include/core/SystemPaths.hpp --replace-fail "/etc" "$out/share/lms" ''; postInstall = '' diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix index 804eecde7685..678d5ff9d064 100644 --- a/pkgs/by-name/ma/makima/package.nix +++ b/pkgs/by-name/ma/makima/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec{ pname = "makima"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "cyber-sushi"; repo = "makima"; rev = "v${version}"; - hash = "sha256-esZCFMeIRoafR7vQbnyf3Mo18trVZdIy9rvAvTHfrLA="; + hash = "sha256-cmn86ocN8DwxS9WpcHxWMjuFPAMmM60Q6jmyeBmdrPg="; }; - cargoHash = "sha256-NXiK+cimQaYpzY3WSHUlYUWcXOLWQ5TwGuZKh+OB+go="; + cargoHash = "sha256-/eM+clDZRlvfFa1eEwLo8CKEvnOq5CW19RNvbEbxVE8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/me/melodeon/package.nix b/pkgs/by-name/me/melodeon/package.nix index b7df31cebf79..9deee8e44707 100644 --- a/pkgs/by-name/me/melodeon/package.nix +++ b/pkgs/by-name/me/melodeon/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "melodeon"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "CDrummond"; repo = "melodeon"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-k74iJ3tmkMGUh4f538tjD7cv4ZXxm3x6M/d5HU25yPQ="; + hash = "sha256-CwJd77FAEcfCvxHeh3V1SIsgSam3S5WtpSLj9WrOOyI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index d5668ce5428a..77ca0a63f023 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "morewaita-icon-theme"; - version = "45"; + version = "47.1"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; - rev = "v${version}"; - hash = "sha256-UtwigqJjkin53Wg3PU14Rde6V42eKhmP26a3fDpbJ4Y="; + rev = "${version}"; + hash = "sha256-/ANzNQi+H2UzRlLrMBBMxEA/TGNpCwf8lNn6sHEKfQE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mu/mucommander/deps.json b/pkgs/by-name/mu/mucommander/deps.json new file mode 100644 index 000000000000..0e59cecc9375 --- /dev/null +++ b/pkgs/by-name/mu/mucommander/deps.json @@ -0,0 +1,1819 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains": { + "jediterm#jediterm-core/3.44": { + "jar": "sha256-Q/2Dc3iZNA/xep98U1lyHbJStLNihN8n9s4LqmzmAaM=", + "module": "sha256-67xQBnyqqFEYVDLmEyEBPI1Ytp23Sg+v7UB4cgmrObc=", + "pom": "sha256-U5/B6iPpNAxjy8RhgGbDAu76qqTQfWpKPYHrO7eyb4Y=" + }, + "jediterm#jediterm-ui/3.44": { + "jar": "sha256-ytRKdiuw4QmysGYckbDXfCLR1YTYRc/aEc0TgOz9miQ=", + "module": "sha256-1Sm+X5gRtwUTawDUZ0gT2ZkMh8L/UhF7A/B/2NaP7rM=", + "pom": "sha256-OqwtXLhLqTLfJ2nh2eUdXqSQMLt0+usdlDiltgbBnpQ=" + }, + "pty4j#purejavacomm/0.0.11.1": { + "jar": "sha256-McBIqGBX4HJyQpqibpBxPtvelq+XRzYvJ0cNjoajmKM=", + "pom": "sha256-x/2ePzjDduHwyb3HGm+NWKz6ytqK/sF99dbjjadR02s=" + } + }, + "https://plugins.gradle.org/m2": { + "com/athaydes/osgi-run#com.athaydes.osgi-run.gradle.plugin/1.6.0": { + "pom": "sha256-+xykaSPbBh7wPQYefKAvJmXT/HIz/B/NDrsFqpZPDLk=" + }, + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.4": { + "pom": "sha256-0kiTtasyoeS0aMK/2OoTMqA9qBFFhgpuz3e/bM6fE6c=" + }, + "edu/sc/seis/launch4j#launch4j/2.5.4": { + "jar": "sha256-ItJxFUklmcsCnJcoo1nKPuEHXuoMVNMCLP9l8CNB734=", + "module": "sha256-36qMMXxT12p0b8RM8T8onfxF/6dx1e9gRkinCOMv8bA=", + "pom": "sha256-x3C0urW9xQxP3xKUkCBdFmfYKEwGLK5wS7vGy2xXKv8=" + }, + "gradle/plugin/com/athaydes/gradle/osgi#osgi-run-core/1.6.0": { + "jar": "sha256-aL4xq5FzCujxcNdLADLLdjwNGLRrInpyGfcA3NXJIig=", + "pom": "sha256-WrXeDFsFM5qb4YtafXw/nW/ubTYi+uYoMmM3qvntAsc=" + }, + "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { + "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ant#ant/1.6.5": { + "jar": "sha256-8GpgHHGKfJJi10t+w7qtFMglhOiSNQibT4IdakTZ4eQ=", + "pom": "sha256-b83RPYGzLw7byJCBHS9z1HU7ZebkKe3QByxBYP4Hd0A=" + }, + "avalon-framework#avalon-framework-api/4.3": { + "jar": "sha256-/tYc754BBkWve1K2lMlYmv5TLKF/SOl3+xysa8A5UL4=", + "pom": "sha256-rIWI73kN92pgZnpBEagAqhv6c9iFiYu/q4htrwyOtwY=" + }, + "avalon-logkit#avalon-logkit/2.1": { + "jar": "sha256-XxE+SyULTHwh3T3aG7nkKgGwoBRTLjP8mnxzKr3Erpo=", + "pom": "sha256-7EPVfBpfHAORFIJgN67WhfuRZ17q7IXZ6h3MVgSJG6Y=" + }, + "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/6.4.0": { + "jar": "sha256-G9LIOa4YEoDsBrXCBRuE+sf1mZagUZQOGk24RtvG828=", + "pom": "sha256-677wPInYJxwp7I2b7oZWCG+D5M273AKTUtcBWk/mMNk=" + }, + "biz/aQute/bnd#biz.aQute.bnd.gradle/6.4.0": { + "jar": "sha256-lakUFc2tA0LJJb97sDgwVye9TU1+MSLScClC/zWbCTo=", + "pom": "sha256-IhATjNEm8dfAKe0waawigmXckZfw3XSjyESPKwoXIpQ=" + }, + "biz/aQute/bnd#biz.aQute.bnd.util/6.4.0": { + "jar": "sha256-ZbW9Sg+rFoEvGADJj/dKA483o4v+iZrzgu/tTv3B4+E=", + "pom": "sha256-o9QfkwNfFvSai1AFrNPQlrfzJoagUVMNmhiuzT25DCE=" + }, + "biz/aQute/bnd#biz.aQute.bndlib/6.4.0": { + "jar": "sha256-NXFFB0hy+dv2fmKfzSN+YVJwflddc130U1KC+fWI0tg=", + "pom": "sha256-6jk7yLU4PHFhu+XjqqjPvQCzZkR1GiI4VaTJAEumrZw=" + }, + "biz/aQute/bnd#biz.aQute.repository/6.4.0": { + "jar": "sha256-0k3V0QvZ5gZ2FlJzpq6NWsYS4d/Mm4w0kSCWeciBL/U=", + "pom": "sha256-++slSN+o3ttLLtBwWu6vImqbriDrDwJdxHuKb366iXo=" + }, + "biz/aQute/bnd#biz.aQute.resolve/6.4.0": { + "jar": "sha256-wxf5KC5I2FlOK5d0mYbS2WX7vaYMO4MModjDcS14p+g=", + "pom": "sha256-290Wg307M+k0i/9KhTgPuiee4UapzAI6Ch9zm2y0FY4=" + }, + "ch/qos/logback#logback-classic/1.2.3": { + "jar": "sha256-+1P4U55/y48JOlbhOBEgVuwdyAnrsCC1nYo2peusN+A=", + "pom": "sha256-oFHrGiVIuTyZq8qOtx1cddL/BpdmgpYDSBJLxJAaUxU=" + }, + "ch/qos/logback#logback-core/1.2.3": { + "jar": "sha256-WUbYN/5vlgwCpT7aemkm7MPHWLvdaapFPuQp+FghfyI=", + "pom": "sha256-301xgexRZVuqqrBnlxGA12gWQ93SdBOfDDB426FOl+A=" + }, + "ch/qos/logback#logback-core/1.4.0": { + "jar": "sha256-FOCaeJa+5u8uAFtI/FVg/iKZpXqCa8TB8cbUMALwUSw=", + "pom": "sha256-OQogrYWjQk0RPwyNj2ZNenc15gXEUwyuaxs/qz3EdQU=" + }, + "ch/qos/logback#logback-core/1.5.12": { + "pom": "sha256-q9tuWJh422jJrYYSyt8KIQm3hYd8ZGZnBafxaiTlouA=" + }, + "ch/qos/logback#logback-parent/1.2.3": { + "pom": "sha256-ec0CHa/HsCVdPN0/1wy6pjjfc5lXSaNI7oLEVjXqsmo=" + }, + "ch/qos/logback#logback-parent/1.4.0": { + "pom": "sha256-ybgE3cIX34pXkK2CP+5lVTGWzxnpVnn9Jc91LexG5Jo=" + }, + "ch/qos/logback#logback-parent/1.5.12": { + "pom": "sha256-5mDh8HDVA4UK4HUhcOBVzgLrb4KVb0wq816AFMPuWtU=" + }, + "ch/qos/logback/logback-core/maven-metadata": { + "xml": { + "groupId": "ch.qos.logback", + "lastUpdated": "20241025204506", + "release": "1.5.12" + } + }, + "ch/randelshofer#fastdoubleparser/0.8.0": { + "jar": "sha256-EP4oj9eiza9RdTMrc1Kfmr+P1U3P/zF9aWfAw1/7Ezs=", + "pom": "sha256-VWPl3UuwVHWfD4OFFgbZnSQm11wnNygUAnAF6S0cKqo=" + }, + "com/athaydes/osgiaas#osgiaas-cli-api/0.7": { + "jar": "sha256-/5g6U3a4GDCkAx8njhnvjSVd9MvFWDeaMUk/p0EGMMI=", + "pom": "sha256-LniyokqUSW72hNIUFWrGA0dLheNWLd1nW78X3PiJpLE=" + }, + "com/athaydes/osgiaas#osgiaas-cli-core/0.7": { + "jar": "sha256-+29PYDq4B/TjvN0XF7w9+GAcFlu7aY0pOuEvDogMIYU=", + "pom": "sha256-6dAawLpzKBVYwK74apiVGiC5PLnJUcdx44BPf+yWGgY=" + }, + "com/athaydes/osgiaas#osgiaas-common/0.7": { + "jar": "sha256-IAZKBz8SHtQkqOCKDUdjquTTQLK+alIGhjGz3Q4/uGw=", + "pom": "sha256-aN9UOc4DQls8eDzZ4qQTt96gJmIes2WReU5kgJXArK8=" + }, + "com/azure#azure-client-sdk-parent/1.7.0": { + "pom": "sha256-wefnVlRCMD/1TD6GNXTreh9pIR2EX6Q1/thCgxNL0Uo=" + }, + "com/azure#azure-core-http-netty/1.13.5": { + "jar": "sha256-t8qc2g5Ss9dIeypT++pyzPELBRbjz/LKC70WH7w587M=", + "pom": "sha256-8k0M8GyebhbrjdKrTP+jwtO5Tej/WbrhHagWvbX2omU=" + }, + "com/azure#azure-core/1.41.0": { + "jar": "sha256-4l36WpY+E1F+Y04xZmdkPI1V/JZxsgQs0P9EBVKPOfI=", + "pom": "sha256-NcSELoMrARfIV/GJksubh5zt4oeBG83gV383XCJhyMI=" + }, + "com/azure#azure-identity/1.9.2": { + "jar": "sha256-qjfuKsjQbS3LYHPxH1M5FmEcGRBmXOZDdxs2EKUers4=", + "pom": "sha256-EXBgdxY+sQ+NROkC3Z5b5BwefKRLtBoubvP8x9QeTwk=" + }, + "com/azure#azure-json/1.0.1": { + "jar": "sha256-KDw4/URqHRYk23N1VF2HVr/gavjMY3+FUYRkmfLsgow=", + "pom": "sha256-FTgCj66/3EghKzboi7i9edraT4Uv2MjM4BsoQFmwMRw=" + }, + "com/azure#azure-sdk-parent/1.6.0": { + "pom": "sha256-mDP57zl7whd1s4m+gWtWpomRiCIKJa0qQ4mwk2UDnJY=" + }, + "com/azure#azure-xml/1.0.0-beta.2": { + "jar": "sha256-1ZE+sclWldJBWR4FDxbcCyMugdS0AfpvnFZvRXe4roM=", + "pom": "sha256-G+9ukkm5tECQ6mczfm0mtgikmngJLGvgCVxSL64fg0k=" + }, + "com/beust#jcommander/1.82": { + "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=", + "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=", + "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM=" + }, + "com/dropbox/core#dropbox-core-sdk/7.0.0": { + "jar": "sha256-L6LLasLzL1lO/ffHn6hVOf6d8fCvyvnwP1cKlMmZE4c=", + "module": "sha256-si4Dd4nD+0ukio8ctHk/86ftF4FFnQ/CxZmMmSpZfqo=", + "pom": "sha256-IrYUPdZNJ/9S41KMkmXYsUeMhGEZE2lvBgK4n3E3DvE=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/43": { + "pom": "sha256-5VhcwcNwebLjgXqJl5RXNvFYgxhE1Z0OTTpFsnYR+SY=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml/jackson#jackson-base/2.10.0": { + "pom": "sha256-r5dC9EUhQ/GySYSfgioZ84drb40wyufDVeu0oopIPQ4=" + }, + "com/fasterxml/jackson#jackson-base/2.13.5": { + "pom": "sha256-8uQSGN1QuSzkmDxdLAQgndYc0eAPwSXjYAqp6vRQHeo=" + }, + "com/fasterxml/jackson#jackson-base/2.15.0": { + "pom": "sha256-UkKWvt4yGFrBEBLwfZJG44wZJTwrUT8c8oeZEho053A=" + }, + "com/fasterxml/jackson#jackson-bom/2.10.0": { + "pom": "sha256-LDGTpqe7yfycHmh8jwWtuWM7q8qAd6puqu4ZDYbhTVk=" + }, + "com/fasterxml/jackson#jackson-bom/2.13.5": { + "pom": "sha256-Cia280q5P5z6gBeYiMa/Ql8cF9zZwR22VhOTkw/bdGo=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.2": { + "pom": "sha256-mqIJuzI5HL9fG9Pn+hGQFnYWms0ZDZiWtcHod8mZ/rw=" + }, + "com/fasterxml/jackson#jackson-bom/2.15.0": { + "pom": "sha256-4AwuhiKc2Wh5RpGukO7hWwjE1PV0jJs0u0ItcTRG3ZU=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.0": { + "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8=" + }, + "com/fasterxml/jackson#jackson-parent/2.10": { + "pom": "sha256-pQ24CCnE+JfG0OfpVHLLtDsOvs4TWmjjnCe4pv4z5IE=" + }, + "com/fasterxml/jackson#jackson-parent/2.13": { + "pom": "sha256-K7qJl4Fyrx7/y00UPQmSGj8wgspNzxIrHe2Yv1WyrVc=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson#jackson-parent/2.15": { + "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.10.0": { + "jar": "sha256-d6CEYhl3SoJpvBs4zAApSQjTTnf4qdo02XZzmC91hT0=", + "pom": "sha256-FLGqxIj74H7Oqug/X8ppId8ETUX8hejG7DsW5zQ42tg=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.13.5": { + "jar": "sha256-gK6o7XIy21BAztSz+YLynalbs9gCND2/b9gszZjCHE8=", + "module": "sha256-V1RHbNv+Hc5wH/QUQ7FHQSL+5TEHgMnRbEoK/vlzvZQ=", + "pom": "sha256-RtVrd+RUf6R9Iq5EvJXgww76KFW56qsZ9TSfv+TAZMo=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.15.0": { + "jar": "sha256-ka3NPc9f2aFkmZNOdTaiPUVmkqAJPj1P1S8TjDk2NIw=", + "module": "sha256-vxVVouS7PyPbOR/EyN/GFX7GTow3ZYgUSiYPVBst4a4=", + "pom": "sha256-L4FZtEIZb6qg4TdOLSI0tX/uwysnYX+h1/XZqOC+Nyg=" + }, + "com/fasterxml/jackson/core#jackson-core/2.10.0": { + "jar": "sha256-aedpWx5Ag0+hJC/DKKQBBgeRHO03Bqt5q8dp1FEZdRM=", + "pom": "sha256-rZo5sYeQgaVlVuUCd2742RD5BHMfhlXFJoH/882kr54=" + }, + "com/fasterxml/jackson/core#jackson-core/2.13.5": { + "jar": "sha256-SPNqAlMR0EZK2N2kUSogx54nmpVQ9j8xedcx2USCR0s=", + "module": "sha256-YmbmBIr3l7vrRuWx8bmjgyONWSjUD/ExgZkEUgGsMtk=", + "pom": "sha256-rZGrYCXrSK4yYigMQu/rtXtw0lwAqwppxaPHyjqAeO4=" + }, + "com/fasterxml/jackson/core#jackson-core/2.15.0": { + "jar": "sha256-W0g/aPqd1qo32jfR953VxLlGQjj08GYKJCy2tccklQw=", + "module": "sha256-7h0Go46NRNgaLmpvVLfYZK5LL/cQ3fWKK9+4kfJxc4E=", + "pom": "sha256-Cjr13zbx8n4XZEgXpiQJuqJYZKNJOj0ogK1wCbDnA64=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.10.0": { + "jar": "sha256-jmxWbGf8YalsXfxKcdQw8lZXZXeOyabvIWxUYKmRG2A=", + "pom": "sha256-kAdHbEZ6U59DnFEiWw9s1MTiNNZ93pKaICEYZhAmkic=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.13.5": { + "jar": "sha256-X+2ySyNWSRgV0YJn9l2poh3WdBM0Wtd5XyIa+iXHiYQ=", + "module": "sha256-HQzgnWo05MaImApbbjp/xKrhFFid9Eqa7Jf2ERrYXfI=", + "pom": "sha256-rhoE1XeQ6usGKh+iIGOraM7JCgMLc94tiasFIfJGVr4=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.15.0": { + "jar": "sha256-AMWl1a5xrI6NW42mBoQeIlHIBjVZOctdUcTNxrZEoNw=", + "module": "sha256-oahCNG/envxI3bk4tE8e7r1EaGj1zXAxMmZToTLAb4M=", + "pom": "sha256-jDgNP+PcwpjQKHmKH5Lfwxgk/aBBFEryNi8fzzDueI8=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.13.5": { + "jar": "sha256-7xXO3d3FjfvWhra3/QhT7TKP8Ixii9SjlXNL7CDKhXs=", + "module": "sha256-xO6k314TZO0p8BDUoDffcWWydfDAIdkfb1q9isD5IKc=", + "pom": "sha256-niBiIkjdUnZ/9vd4Z5BdfmVSNEPm4ALmuAvDmoVHE54=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.15.0": { + "jar": "sha256-1d65LVlmio3grI2oGNXZwP37Tbay8dZqd5/jV/MQ1kg=", + "module": "sha256-nkeKUELDePkAYsbObhljySaYhK7DhLfz1xbspH1ZIME=", + "pom": "sha256-sakbDIxFfs4JpHeRkyoKlBxQNz5frahmiIESH4J75jA=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.13.5": { + "pom": "sha256-hg2LWRRPDSDOqtPIBztQbEKkrkjrpPu7El6fc+dj4fs=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.15.0": { + "pom": "sha256-GMM7hIDiDXY2SpvZyxoV/XUXVJDJ4NyxKitCIymmqCc=" + }, + "com/fifesoft#rsyntaxtextarea/3.5.0": { + "jar": "sha256-pCYtsfsa3RuRLnEg44RFKCbWTrdxQn2Pd0Jqp6ReGoU=", + "module": "sha256-GwhM5SvwzNTjv7dCWsD9byRym/DEskhJq44N0tJczFg=", + "pom": "sha256-vlhVxdk8V/ViDaP4tljkeaN8kCWasK5t4Wag/6R5tVc=" + }, + "com/formdev#flatlaf/1.0": { + "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", + "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", + "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" + }, + "com/formdev#flatlaf/2.2": { + "jar": "sha256-CRiJizWqeFWfPJiWsUKKlo58Zp1e6LBFm61Q4ZLks18=", + "module": "sha256-FVtOnXOuoXXbX9Cwp7zbDgUurJRXZkpS10bqR1aGzJU=", + "pom": "sha256-iDEsV9UfzoVt4O4wSl3U2LI7wNOICiteBGprhOofGTo=" + }, + "com/formdev#flatlaf/2.6": { + "jar": "sha256-aol8rBnE9IsiiEohp93L+kfH/aJm26aYBKb4R6uel8g=", + "module": "sha256-bI6NyWonUOIHu1jOAV6LV4fEZiOxCves4Hg1zz6c8uA=", + "pom": "sha256-LyBWRSdf3po/+KaqsTgf29k7T67QfiDqkCujsUaVSuQ=" + }, + "com/github/junrar#junrar/7.5.5": { + "jar": "sha256-4BuUlofipbTGgBHBcCql0syObEWGVqwskWWLac67G7M=", + "module": "sha256-MN6tDcEK8MzjOqrkn/l21sIvsbOImoZdOoXjfHKbogo=", + "pom": "sha256-eLkOtUPiaTa9zzpOq5cAazwdVk2b+9660FyMbAj4GYY=" + }, + "com/github/mwiede#jsch/0.2.10": { + "jar": "sha256-cX/gOLA7YG4J5nS60qw6e2qmQTEpHRzBxIn5nBqlY8o=", + "pom": "sha256-3TLAFA6lM8J5cp34jMLfYQQwLDT0e7M+yrLv0G3hU8E=" + }, + "com/github/pcorless/icepdf#icepdf-core/7.1.3": { + "jar": "sha256-XhWwX2/GNUqHLpXvcU9VbHlZZArXU+thAWwMDpZevEU=", + "pom": "sha256-xchpL8QmzK2SxF6xBShAEe/K7VSVtiaSM3x/NN2ov/g=" + }, + "com/github/pcorless/icepdf#icepdf-viewer/7.1.3": { + "jar": "sha256-6kQABjXgnLQouNwIe2hWWgHA1nFxDajcdWcT5Kbtbrs=", + "pom": "sha256-G4hXWQ5g8pl8qQfPIXA9RYi1jZYUzJEfcBDd9cl60aY=" + }, + "com/github/spotbugs#spotbugs-annotations/4.7.3": { + "jar": "sha256-wP0awuIqzdRpE6L/dFUbcfEkRXGZaIaYIEr0vz1DFl0=", + "module": "sha256-C85puO9wOJqNWr30ddFzAXe1CeQYZGP/2x1emmrVz/4=", + "pom": "sha256-NpAQoZC5Xi2aJi2OxRfexrZIeqGhuUaKKBY5SvS6J7Q=" + }, + "com/github/stephenc/jcip#jcip-annotations/1.0-1": { + "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", + "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" + }, + "com/google/android#annotations/4.1.1.4": { + "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", + "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" + }, + "com/google/api#api-common/2.12.0": { + "jar": "sha256-PRcoPEEmEnuZBnEhi+4KLnl8GrH+cQKRbCx8WNIJJZY=", + "pom": "sha256-CXwru4X0wVxbfF3HZwn28d8vp9mJnRFn/ImXJsrFss0=" + }, + "com/google/api#gapic-generator-java-bom/2.21.0": { + "pom": "sha256-yat2y3B7cpvKEcG2csC8Rm3+HNn8whVwNNkzLxdo7bo=" + }, + "com/google/api#gapic-generator-java-pom-parent/2.21.0": { + "pom": "sha256-VnHy90HoxMfV4JTQ2xy+0uZbY33KsFQmSJ268BImLLE=" + }, + "com/google/api#gax-bom/2.29.0": { + "pom": "sha256-XBa6jaP2ASSK5KhccDGy97o5e06qatdoZlSGaP9hn2E=" + }, + "com/google/api#gax-grpc/2.29.0": { + "jar": "sha256-fw2Bn/ll3cbzmmEe9LHyMENBAYkm33eFFe0EvfRHcTg=", + "pom": "sha256-YpEUH7lWvCzCRfQoK/oEJ7kIViWeL+VzD12y4x/6IqE=" + }, + "com/google/api#gax-httpjson/0.114.0": { + "jar": "sha256-pwanjb2VZAw1NbMy8nHUcVMnxqhnH4aqvhgwb1T/0ho=", + "pom": "sha256-FffanA4jix09ir3uV+EyYAxc2QwWoR7Ch2YJS07t/ww=" + }, + "com/google/api#gax-parent/2.29.0": { + "pom": "sha256-uu1P0cGgGcLmCPZoq5pd8JzoMlZG8I+FUA0CGt8fmwc=" + }, + "com/google/api#gax/2.29.0": { + "jar": "sha256-nzyCG2KvlkO5EMGxv2kGUGh0mRJ+4Lh60EQJ8beShe0=", + "pom": "sha256-dXjTQWNUZ4AciLYrP6fUyaAwcg9MlffP4khVNxLI128=" + }, + "com/google/api-client#google-api-client-bom/2.2.0": { + "pom": "sha256-8RtgZOZIf6TI7TEBOXsHnXbGrQB5r2+nDjoFglBfBYs=" + }, + "com/google/api-client#google-api-client-parent/2.0.0": { + "pom": "sha256-+RC/VDdkToiqHNYwkToFI1gvx5RK2bW9rP8sFYlk61o=" + }, + "com/google/api-client#google-api-client-parent/2.2.0": { + "pom": "sha256-kOYt+D6q2B1PW6yK8RF5wKrtsgO8xkiKKaD3XXccov8=" + }, + "com/google/api-client#google-api-client/2.0.0": { + "jar": "sha256-+vAvQHDE9ZHn0aWRFh2jvuLQjiu5xFeGRVWej1XPa3s=", + "pom": "sha256-jP8IwUzUQqvT/+GzJxgwSENWe/ef3dYshP9mhM9eNyQ=" + }, + "com/google/api-client#google-api-client/2.2.0": { + "jar": "sha256-WOyp+wqGk5Fon/yCizvQsZrHYEL/n6tIge3ff952kD8=", + "pom": "sha256-TRf5M7m2Wf0JAtun+CDhvmcsC1IVNjSpUMwf+7XSI/w=" + }, + "com/google/api/grpc#gapic-google-cloud-storage-v2/2.23.0-alpha": { + "jar": "sha256-mzZwsaFQ1Wf5BMm1rxfPuZd8W7HYzEwoDHx3F7H3hIQ=", + "pom": "sha256-uwToIdnCzIEngO0oGmQD7tW5R55ijY1iWTrU/TnOOuk=" + }, + "com/google/api/grpc#grpc-google-cloud-storage-v2/2.23.0-alpha": { + "jar": "sha256-4KnnWn+lrokVZnuKemtm1RPmTeFKruW2kshtB32hFcU=", + "pom": "sha256-u70CMNpfoXxwe1Vzs1A0SNw/sIpS+DAbuoXAwYVxBDc=" + }, + "com/google/api/grpc#proto-google-cloud-storage-v2/2.23.0-alpha": { + "jar": "sha256-jU+n4PaXjdCScbITDqH5WmVUSYtvTxV1JGQa+6eE/Sk=", + "pom": "sha256-LJrDR5T7r+Zg7m1x71Gkrn1pQ1NF4DGj1a0JkCAlsy0=" + }, + "com/google/api/grpc#proto-google-common-protos/2.20.0": { + "jar": "sha256-77Yg0RCbzf8/LJvy1SChjws5v9F9WF859ul+wnVpkxg=", + "pom": "sha256-0xsEHk8osgs3ZOkPDqbypb/TdqWAH35DSC4ueXXCXI4=" + }, + "com/google/api/grpc#proto-google-iam-v1/1.15.0": { + "jar": "sha256-Jq3Pe1NdWL4F9yFFQyHVPnCH/hGMZr+zyHrPajAYUpU=", + "pom": "sha256-5X4mSbLY0jGpxWxSSsDKtgxqBU2rVcnZFWCi2KOhx8E=" + }, + "com/google/apis#google-api-services-drive/v3-rev20220815-2.0.0": { + "jar": "sha256-W8MsCZfaoq2Q0Zj64ZAQAORn7z4q1HBZvhFliPs1ZjY=", + "pom": "sha256-Pg9xPufuHatcYGsxuC4ZPjt/5NW2nqp/onS9h8qEre8=" + }, + "com/google/apis#google-api-services-storage/v1-rev20230617-2.0.0": { + "jar": "sha256-Q0hLMrQQsrj/MqyasbicA5xyfC43Rl43XOKEbVqARkU=", + "pom": "sha256-OdEbFG/3/0hU4dRRUUUljwFgIIJyUeP4yt0TtYeHYYI=" + }, + "com/google/auth#google-auth-library-bom/1.17.0": { + "pom": "sha256-q189O6vBm1c/g8TmeZ44b9lzKDqbkNIn8rgrBl+9xY4=" + }, + "com/google/auth#google-auth-library-credentials/1.17.0": { + "jar": "sha256-XeNk7nqc6V2HFb8SS9sNlJ03ZJkU24RsxwBVhPunzk0=", + "pom": "sha256-eykzIvpbe9T74FQQzf4udTpy8hjjhgz8ppBh4DchaqE=" + }, + "com/google/auth#google-auth-library-oauth2-http/1.17.0": { + "jar": "sha256-uBSOGvDEGXrqcH0BZrTtcKdbju5yRr5+sCKKSDQJXnA=", + "pom": "sha256-t+/XqUPWEOCTfmQtuEir4tF+y6Kf+1AX0NZXko6BmNQ=" + }, + "com/google/auth#google-auth-library-parent/1.17.0": { + "pom": "sha256-1NeR/QXmN0n4NRQkqaXa6YuigG1ckiKMDA/ETcCfV+8=" + }, + "com/google/auto/value#auto-value-annotations/1.10.1": { + "jar": "sha256-pP4KIRkl6TioUQ10F2PuEXGhG/kx9Yke9NTuhPynK+I=", + "pom": "sha256-n7rMhpTRkE37TVrx5KVGD9ZMHKnQBJ0YFFQs0q0osEc=" + }, + "com/google/auto/value#auto-value-parent/1.10.1": { + "pom": "sha256-9y2jrhi84YuHRM1yM6qDSjLTvR4LRTsV9tujP3lzz+k=" + }, + "com/google/cloud#first-party-dependencies/3.11.0": { + "pom": "sha256-nN2Y625KV+jC1GnjnONRPbJQGaWNmY2X3es2OC4g+ig=" + }, + "com/google/cloud#google-cloud-core-bom/2.19.0": { + "pom": "sha256-R1d+AUcHWXUpQCzuCXVyw3B59osRrBhqURnVc8uroEE=" + }, + "com/google/cloud#google-cloud-core-grpc/2.19.0": { + "jar": "sha256-yDpYgn2A468XXxJVK+guLLbzo+A/1+RYlKYU0TzzQrU=", + "pom": "sha256-HJqvT/ynaiy/+YGgzdseKA9WaEkVv1z8vrK/yIv5YX8=" + }, + "com/google/cloud#google-cloud-core-http/2.19.0": { + "jar": "sha256-BAynBQHjPez+2d9+44HCc8btxSj07Zyz549vUFYKEMI=", + "pom": "sha256-gidJQIiur3uJzlCT2xgQfDjBzTzJJ4z43vQrmzM4M5I=" + }, + "com/google/cloud#google-cloud-core-parent/2.19.0": { + "pom": "sha256-ds6+05V6Z5s+YI9p/+oehGXyStNjDlmwd1zdJywhrP0=" + }, + "com/google/cloud#google-cloud-core/2.19.0": { + "jar": "sha256-1HR8ZJtsfgb/SfdfMByNsXu/SnK/lhk+Tkplwzu25jk=", + "pom": "sha256-3CToTf0yRgp35WVVOc5a53emz/2eHaod3bE0K1JKTZ4=" + }, + "com/google/cloud#google-cloud-shared-config/1.5.5": { + "pom": "sha256-mLz9fSHahIoeXpTp4VJG+eHoe1bJ54zxfJsSOG4jrnM=" + }, + "com/google/cloud#google-cloud-shared-config/1.5.6": { + "pom": "sha256-XtWUwTSjPrMih22HFNOiXb4kYV3kFa6HUkkNzZya7DM=" + }, + "com/google/cloud#google-cloud-shared-dependencies/3.11.0": { + "pom": "sha256-2zF4EnZoKP90h/U/sLxkVI9MSu2ppNj1jf7VBf64TVM=" + }, + "com/google/cloud#google-cloud-storage-parent/2.23.0": { + "pom": "sha256-03f/JUOdq3jk6q9gYh3wmr7usbBbS2r1PtSPn0pBDYs=" + }, + "com/google/cloud#google-cloud-storage/2.23.0": { + "jar": "sha256-lwD8xMevx+i+CbpHsooKzVsH79wqD9NVfpoDmBlrfc0=", + "pom": "sha256-9dLU2nyhmy3AhN8UUvcCUkHBRXj8567NCRGMkjpDpPw=" + }, + "com/google/cloud#third-party-dependencies/3.11.0": { + "pom": "sha256-GdHtxT8CJZACmw7UQK80zkx+CU0N4csD87ofw+JkeGs=" + }, + "com/google/code/findbugs#jsr305/1.3.9": { + "jar": "sha256-kFchoO6pCoFTSrt+5u9OouXmRfod7wpc2IQC3xtGye0=", + "pom": "sha256-/quRkTEcPXru8rZtYGSvyA09HVLZgPsHrkPHjJh7qTo=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.9.0": { + "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.9.0": { + "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", + "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" + }, + "com/google/errorprone#error_prone_annotations/2.11.0": { + "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", + "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" + }, + "com/google/errorprone#error_prone_annotations/2.18.0": { + "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=", + "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + }, + "com/google/errorprone#error_prone_parent/2.11.0": { + "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" + }, + "com/google/errorprone#error_prone_parent/2.18.0": { + "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-bom/31.1-jre": { + "pom": "sha256-oRnYiA5WquiLFvM8gFLk1uZJoi4Xjzkd7zsvsfShKeY=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/31.1-jre": { + "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" + }, + "com/google/guava#guava-parent/32.1.2-jre": { + "pom": "sha256-iOnLAHM1q1/bMUpuPJh3NOwjCMmgY/90fHRpGJ0Kkr8=" + }, + "com/google/guava#guava/31.1-jre": { + "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", + "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" + }, + "com/google/guava#guava/32.1.2-jre": { + "jar": "sha256-vGXep8/Z5NrPhBnYrw50FlWFfSeIW7NdlD1xh/w6j84=", + "module": "sha256-5Azwhc7QWrGPnJTnx7wZfhzbaVvJOa/DRKskwUFNbH4=", + "pom": "sha256-PyCFltceCDmyU6SQr0mjbvf9tFG+kKQqsd+els/TFmA=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/http-client#google-http-client-apache-v2/1.42.1": { + "jar": "sha256-i0lVds+VmtJvz90DzfeC+iF0EgxIxRX+cbcBSKlRwgo=", + "pom": "sha256-M0NK1qFkN7xZazUcAsMKU3vrK4v7+j6qcN8IDaJZfsY=" + }, + "com/google/http-client#google-http-client-apache-v2/1.43.1": { + "jar": "sha256-GLJai+1jCnuQIEtwIPciGf3aZDk1/KZAXm45N66Ss2E=", + "pom": "sha256-RNoyc7bYyQk4TpwvayCtTsToyVmYGgjCConScF/X1G0=" + }, + "com/google/http-client#google-http-client-appengine/1.43.1": { + "jar": "sha256-k3YkhKkyT4JEVbJNoMtpin40Z+Lkli7lQaFP8ZIsOog=", + "pom": "sha256-A/hib01jYL8WzTfzfTyiqXWT7xfSkisP/pTpgTPfPUo=" + }, + "com/google/http-client#google-http-client-bom/1.42.0": { + "pom": "sha256-mP9hZSXmP9BhMiFZAVOOI/9nrtuJNM0l3FkkjwzAU4w=" + }, + "com/google/http-client#google-http-client-bom/1.42.1": { + "pom": "sha256-5t0Lk5ba4pFnRDOT7p58BP0v0Q5W0PdLYa4lZoqNq4o=" + }, + "com/google/http-client#google-http-client-bom/1.42.3": { + "pom": "sha256-SllPSmi+keMqV7keI9plQGixLtIveYBfvNYiYfULR+w=" + }, + "com/google/http-client#google-http-client-bom/1.43.1": { + "pom": "sha256-eSc6FEsB1GX+f+tvJLN7Gfbv0mCOXvEviOY1sf3toEg=" + }, + "com/google/http-client#google-http-client-gson/1.42.1": { + "jar": "sha256-QJ6ODMsAY9H9oEQC7hfqWSmPHZL88/aWv+EpD5EJ2wE=", + "pom": "sha256-uXkojNI6XO2QQ7YDlF+wZywNciXelr/izn3TLBBtb/c=" + }, + "com/google/http-client#google-http-client-gson/1.43.1": { + "jar": "sha256-AXQG5RBaMxR6sTuve0kf9T2Z5UpeK2G3zNZR4WQilpg=", + "pom": "sha256-EqhE8wvEQ29kCX2xTYNt7vxshmldPFpetmi76P8OaUE=" + }, + "com/google/http-client#google-http-client-jackson2/1.43.1": { + "jar": "sha256-HUH6ED2kMtxJtBoyHv/D4v2nIqPciWqJ3Nw6TV/oIlU=", + "pom": "sha256-HuIU+V8PJoHgZMZU8Nd7UHvQ3aFt2IkISe1NVU6/trg=" + }, + "com/google/http-client#google-http-client-parent/1.42.1": { + "pom": "sha256-6xc8NOLKP7hwvV5pCJ8oPn0ifISs4UxPVko+cpYqUlA=" + }, + "com/google/http-client#google-http-client-parent/1.43.1": { + "pom": "sha256-fOZP1l2/NuZ5y+SUhU79JODdC/xXe1umLNCV5q8u6xM=" + }, + "com/google/http-client#google-http-client/1.42.1": { + "jar": "sha256-5cdHPnrTpa6KtEs4+9yygtdoQRS3RLuWiUGNYbewEQU=", + "pom": "sha256-HDyBoqVijXGQWl4TBRlz1OqxX1CIzxZXN1bBWRNySW0=" + }, + "com/google/http-client#google-http-client/1.43.1": { + "jar": "sha256-g043sK8s/oCyl75NalyP0MyrHQsT6bjXrJIejdLyUew=", + "pom": "sha256-21zBH3o7xj6nYyIPc6n1GO173MhAZ2Mt5VXeWQPtmPI=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/oauth-client#google-oauth-client-bom/1.34.1": { + "pom": "sha256-6WOBq0Zz9W3gDWxbRwwnsjFuZ4wr/8IK6ozfMqcuIT4=" + }, + "com/google/oauth-client#google-oauth-client-java6/1.34.1": { + "jar": "sha256-lwRiwuzGRVK0s4SFTTwPLP7rrANOchDhhz7m6AHpP1o=", + "pom": "sha256-zJKBseI64bHI6SBycx1ZVAy3AMY/ybZo1YcsOVrLjYM=" + }, + "com/google/oauth-client#google-oauth-client-jetty/1.34.1": { + "jar": "sha256-/wnm1DwYITDXGG8eLJMqpF+tK8Lkvd2OgXAtQYUqsV4=", + "pom": "sha256-0o5G3OUJmDmnNoQXPZ7sEPLxUdrbEOiYnbd514ZfgVE=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.34.1": { + "pom": "sha256-N4sHWGVenWD93gjaiF0Vg4BAvL34ivrXrtEK8Ve0QD8=" + }, + "com/google/oauth-client#google-oauth-client/1.34.1": { + "jar": "sha256-GT7fl676KLk8WJK9xZi6w0+kw5ZYgDAITykLFEDouYo=", + "pom": "sha256-yF9HUepssOHsTxEwM89Odhw6vabX9BDJ1qQmpUWrgps=" + }, + "com/google/protobuf#protobuf-bom/3.23.2": { + "pom": "sha256-loU/+3OF4oU3+uLBegaGRT2H38ixPJ3P3QqS0e7yPxw=" + }, + "com/google/protobuf#protobuf-java-util/3.23.2": { + "jar": "sha256-ZEl1t4DX6N5ULdoW1M6xV7QKUqi+VkUiHp/QJu8gSxM=", + "pom": "sha256-jXBQCvaL7cGh95eLuwX3swQ2ePVHa1ZZmcv7pHOISlI=" + }, + "com/google/protobuf#protobuf-java/3.23.2": { + "jar": "sha256-GKBX9eD4KNqpK3HBnfkfa8wqrQZ8os3WtWmAVcp7zs4=", + "pom": "sha256-tQSdHWWfBDzwspcNOVJwjoEU9HuikwQkZan68m1LE3k=" + }, + "com/google/protobuf#protobuf-parent/3.23.2": { + "pom": "sha256-kjOkIPNJLyzaTArVYRiN6VxSTs5pKSK1T+xQZ1JLbn4=" + }, + "com/google/re2j#re2j/1.7": { + "jar": "sha256-T2V69Rq4uwkJvMPrQIYtJhJa+MvPkqqrpZX+13+Ue8A=", + "pom": "sha256-i7C3rpQfVyzEnH0DFdpHf89wHFkZPJalqP4tWcCVepo=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.13": { + "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", + "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" + }, + "com/googlecode/json-simple#json-simple/1.1.1": { + "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", + "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" + }, + "com/googlecode/plist#dd-plist/1.23": { + "jar": "sha256-PXlPKAjQ6Qx+yIlljoQ/kqJEFL1N8Y7PnxR4cmrxI4w=", + "pom": "sha256-irwhpc7IBIMPGpXg6ePumjP+vuugYUoKC39r1Q2sNoM=" + }, + "com/ibm/icu#icu4j/59.2": { + "jar": "sha256-S+43qfIsCzNv6Km/6Lp+8XL6FBO+1Nfyb9Q1EQzIl5s=", + "pom": "sha256-rULdMCtmkeYiiWFf01Xd8XDArSvqYRG55SF1swkKmS0=" + }, + "com/jamesmurty/utils#java-xmlbuilder/1.1": { + "jar": "sha256-Ulf963GblQOfxs81ASUnk5hWsvLJ12PVk8wMtk6IqyQ=", + "pom": "sha256-CPvh/9g2Z7fusWo3U/WqwQ1aUqwt3Dvu/aqA9q3oSt4=" + }, + "com/microsoft/azure#msal4j-persistence-extension/1.2.0": { + "jar": "sha256-aNg3QZ702HCO07jIgdb8Isnt+BZ/TnAYtiG8od/XUyo=", + "pom": "sha256-gvbJWI44ai2Iq3QatIydFTlAVvgAkDyLdS3KLhmXkSU=" + }, + "com/microsoft/azure#msal4j/1.13.8": { + "jar": "sha256-LvoCWte4PkqqjaTAiFtg1NvoL5iwD1IE+AEsWz1IGQM=", + "pom": "sha256-+AIib1yfOX8KT1HF7z2GxVjwYgk34ajU6KMxP3Kw3ic=" + }, + "com/microsoft/graph#microsoft-graph-core/2.0.19": { + "jar": "sha256-9F69ueIXfOOw+3Tv/ECWE7KMbpCZEvrKpmiyOuY64Tw=", + "module": "sha256-7mGJwLNuXS1h8UN234DS+SPICLtgpPRN49fV400ksa0=", + "pom": "sha256-/bosQFOC5is3UmFaohhIF07ibVSc4tWxHhZRehWZsJQ=" + }, + "com/microsoft/graph#microsoft-graph/5.67.0": { + "jar": "sha256-XAlLePWp3FRZS+eQWN8iyufT7hEr1fItcDwOivnabAE=", + "module": "sha256-tQBfduI1BftIRwqowjWO8NfK8trpavzKQUdxhCjyU80=", + "pom": "sha256-hJHorlQ6aDgitjtwCaOGSdbHR3KwveDNe2bVliCYJOE=" + }, + "com/nimbusds#content-type/2.2": { + "jar": "sha256-cw8YFhlhReiCdQk8FH8ubaPD5UEges01A6GwYSm5vqk=", + "pom": "sha256-iznCFjD7tvBIqAflfjy/c17zDaPxHnAZ5muqa5fa8Gs=" + }, + "com/nimbusds#lang-tag/1.7": { + "jar": "sha256-6MHFlOJCW9vqLYYN5Vxptp/F1ZRURSRJoPCRPCpbijE=", + "pom": "sha256-gksNfeeCer/GpH5u+UsP+qE4/vOK8IxWon9dOhUiEZ4=" + }, + "com/nimbusds#nimbus-jose-jwt/9.30.2": { + "jar": "sha256-HF89lM09d9YXb4VPHHjrZYz7g++APw2lT7R59WFJce8=", + "pom": "sha256-wI/3srHtdUZS3KQqwWyaPGqG8bj2gKY92nDx636/2fQ=" + }, + "com/nimbusds#oauth2-oidc-sdk/10.7.1": { + "jar": "sha256-8DsrqKUBzIfhuQcQbbsuU7wrfP+DUtC6gmi2NvhVXdo=", + "pom": "sha256-uUig3Af6U7rd3OrxtihjiWzIpihNLBAh/AJ8/3mmMI8=" + }, + "com/squareup/okhttp3#okhttp/4.11.0": { + "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", + "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", + "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" + }, + "com/squareup/okio#okio-jvm/3.5.0": { + "jar": "sha256-qheG6VYytxb1qFokMm3NUWwkqSlIkwjRTZIvGP44TTg=", + "module": "sha256-pz6DPrY/7Q4Y8j+WtjQdsyiaMY/eznVjsGeBVigOE5I=", + "pom": "sha256-BxH2z8tQUo9Jmf1NlzVFiAwSq5kMzprY3mSZmCmtRss=" + }, + "com/squareup/okio#okio/3.2.0": { + "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", + "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "com/sun/activation#javax.activation/1.2.0": { + "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", + "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.19": { + "pom": "sha256-DUgSxOMREJtuOk5gZvgh10kZgTl25P6p5CfPNi8vBYM=" + }, + "com/thoughtworks/xstream#xstream/1.4.19": { + "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=", + "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34=" + }, + "com/twelvemonkeys#twelvemonkeys/3.11.0": { + "pom": "sha256-ELLAgOMiZw7tfeBiRNhMx8WVOSfuWvPdjESGVaOAW78=" + }, + "com/twelvemonkeys#twelvemonkeys/3.9.4": { + "pom": "sha256-gOzTBd8tVuolgm89azuQc6gopH6WUu8FZKOPHzt3VSc=" + }, + "com/twelvemonkeys/common#common-image/3.11.0": { + "jar": "sha256-Eh98YraQ0tUk6rzx8xrExnfBSPbDLXQpzMA6ZFFqr5M=", + "pom": "sha256-hY/Ng2sxCdCvls0v0+kjnlqrTneeS/o7VPgORp8q89U=" + }, + "com/twelvemonkeys/common#common-io/3.11.0": { + "jar": "sha256-mdLCffXUw84CSaPaoq1Jw5ZDo99lPAfL4igpiIklWMo=", + "pom": "sha256-5AuxgXc7Nc23kjFV8TbM2yg9+HZdRH+TQlFbNwlGfHE=" + }, + "com/twelvemonkeys/common#common-lang/3.11.0": { + "jar": "sha256-F7hKpUp7POYjD2FWfua6OTLL49AWRbBTh+0wcV07evo=", + "pom": "sha256-gkGjHq7rObaHS0h2amKKDOwrfzY8DvbCH7afao4JTvw=" + }, + "com/twelvemonkeys/common#common/3.11.0": { + "pom": "sha256-HjI1GeG/W9NRqeBIInSmPZ+SqtTGT8mRhl+3GGedUBQ=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.11.0": { + "jar": "sha256-qlGUZvr/VPXhKXNxhWerSrPD0UxcW+1/wO7tQjmkjrk=", + "pom": "sha256-d8uK45DuE/xJIu4NYsJiZHaHQteb9ecMqA64gWAhNyM=" + }, + "com/twelvemonkeys/imageio#imageio-jpeg/3.11.0": { + "jar": "sha256-QpHkgCWdoU8AUTiSgRL2s1rO/HKpVF6pjZl+hDxV2z4=", + "pom": "sha256-1zL4MhQY/ADaI1fEDNXlIL3evP+UAdd8+I+Bp2xjxhQ=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.11.0": { + "jar": "sha256-3j07qmCDbvYGmKf5vP2z4YAugUCh1TQtZmFS5qmR5ZY=", + "pom": "sha256-5FipFdep0DcdTYgyq90rP8Q2GKWj9/BFcRrL0FKMBK8=" + }, + "com/twelvemonkeys/imageio#imageio-psd/3.11.0": { + "jar": "sha256-akCfOParHTd/fFcU+OvAN+CVex8IjZwb1j7lPQWjoVo=", + "pom": "sha256-FQzNSOegAc61jrZg3FqGszM3dA+NhKa57QJaSoQxaaE=" + }, + "com/twelvemonkeys/imageio#imageio-tiff/3.11.0": { + "jar": "sha256-xEq8bYNS4rdXfquWKpS/CT+rftg3G9/dnJVd4y7NpRU=", + "pom": "sha256-/qrWPU1vaHuXMsWyRZ26lFtRnzSEloZypigWNX7ASW8=" + }, + "com/twelvemonkeys/imageio#imageio-tiff/3.9.4": { + "jar": "sha256-RfOfSeOnDS2yzlSTtpp4nYACwSKqTk5gTZv6LfQmyDw=", + "pom": "sha256-yS09aeR3Rl6A44DDllbGypQmFyD3Xdxd/HYl9KVaGFo=" + }, + "com/twelvemonkeys/imageio#imageio-webp/3.11.0": { + "jar": "sha256-dgoMoYgzlI/TCvs0UlxW9b/xk+d4PUhSILaODVQ8QUA=", + "pom": "sha256-E/tHQxNVJpNOwb3iLbn6kqQtxOWBX/SCEZs5knu3STU=" + }, + "com/twelvemonkeys/imageio#imageio/3.11.0": { + "pom": "sha256-VyQzrPzkVWEQr8x2N5AOyamDYJTMjtobIMDDuR/x24Q=" + }, + "com/twelvemonkeys/imageio#imageio/3.9.4": { + "pom": "sha256-q24dY2m5UtPiKwv8mmZYbKRhYX3oMEjDVQBp398INyo=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-cli#commons-cli/1.2": { + "jar": "sha256-582JUZVtNJtWi3zP1PWyUpqMET5nwysCj1L/2jcSWdk=", + "pom": "sha256-GPPpIHbgjC/eSDFwJQmOn2uqqF9pEutD8tfmjVcORWE=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-codec#commons-codec/1.17.1": { + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" + }, + "commons-codec#commons-codec/1.3": { + "jar": "sha256-G6/S7OLojbTN+DWn+PDeZfq1sRR5d6XcxZt8G4xvUIA=", + "pom": "sha256-0VfjQkTohN2R+gGSHKhDcuEfe7CP7bXUVsBnDCgFRjY=" + }, + "commons-codec#commons-codec/1.9": { + "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", + "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" + }, + "commons-codec/commons-codec/maven-metadata": { + "xml": { + "groupId": "commons-codec", + "lastUpdated": "20240715222428", + "release": "1.17.1" + } + }, + "commons-el#commons-el/1.0": { + "jar": "sha256-DWdVDsACK2U0U8dZ8GOmQ8L+ZLxI+qiyX5WiIOKiguI=", + "pom": "sha256-CvMQHgSH7l4LJ/6GusL2gvoSo6KSuzvRm58n1e2ArsQ=" + }, + "commons-httpclient#commons-httpclient/3.0.1": { + "pom": "sha256-prCLPpblcaY7vWHEYzsfRrA4Y1JQ1uYn3TSkSjYetB4=" + }, + "commons-httpclient#commons-httpclient/3.1": { + "jar": "sha256-29SVPQE+EOfBzDcBo+bM2MlQyJLwjYBPq/rCFwWTBEM=", + "pom": "sha256-ipsH1FjT5zAiHb7N+vpzU+wbq9O5TIQyJ8RxBKkMbWw=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "commons-logging#commons-logging/1.3.2": { + "jar": "sha256-a4WEJPUYAV8yv80Rg6Nz9Kgn1y0Ca2Ax2gyRzw6PNIk=", + "pom": "sha256-ZMFGqsSRjMPiHhMij1/kF4VZM7GBN0zML4me8eFWsm0=" + }, + "commons-net#commons-net/1.4.1": { + "jar": "sha256-BaNhHe35DQqz6O2D3sTuSSABSMCUJUN+uTSFYv3n2Dw=", + "pom": "sha256-1REvVdum8eRbaz00zlvhox9BBFkwbbksME/spDBP7Ko=" + }, + "commons-net#commons-net/3.8.0": { + "jar": "sha256-NSsLocZX2JMAY6m4OHj7cX3u8tKe4l0TlDvpvszGTUk=", + "pom": "sha256-WKIkqJs9YGMxCzm5riRAluoyPCMTH58YShS6d6CZ08k=" + }, + "eu/agno3/jcifs#jcifs-ng/2.1.7": { + "jar": "sha256-6mlza+XKjx9l8dputipQaz/iX/SY/0uO2eWdpFBGqRU=", + "pom": "sha256-QWCb9JaBLTeupRJrjd65GD0tRWCMZr6h0FvIDLpe7ZI=" + }, + "geronimo-spec#geronimo-spec-javamail/1.3.1-rc3": { + "jar": "sha256-2csVzW2TcROVzGxA9I3/XLhVvH93PC4LMLDg/U41zZE=", + "pom": "sha256-Dh0EUnPLYh/wfMrN03zjHThvUpKD+9rQQqzbKvH78X4=" + }, + "geronimo-spec#geronimo-spec-jms/1.1-rc4": { + "jar": "sha256-g66m8pdo+3frakJkwH/onqxYZfIC34jsvJQGl5AfGP8=", + "pom": "sha256-D00st0zeuSzp+/tOaC1AP6Uq0D7d/b9FTLdmyAN8Bl8=" + }, + "hsqldb#hsqldb/1.8.0.10": { + "jar": "sha256-sEs7OsKV1JfIcjDutPiIMnpaFbnDwVZ9sgKlHYOsnkE=", + "pom": "sha256-2QDYa4u/4/bugeqfIgbwd5Myu8pYjmo1/Rh4agoRkzE=" + }, + "io/fabric8#kubernetes-client-bom/5.12.4": { + "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" + }, + "io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "io/grpc#grpc-alts/1.56.0": { + "jar": "sha256-2frCakS4d6qyLe5LiwvDW6R6XrLRQ+NQ22a+Kwpv8wM=", + "pom": "sha256-msck0sjXjroiqFx3/F9Jebpww28gN+iOWm1xD8xAAc8=" + }, + "io/grpc#grpc-api/1.56.0": { + "jar": "sha256-+4MTRD1jQD2aZbcc/nGeDnF7Gr7w7ejF6OV77/4gIJM=", + "pom": "sha256-2kzQ9pL7nZwvuf00R4PLE5YLfWFupP9ZXf9O32g3kmw=" + }, + "io/grpc#grpc-auth/1.56.0": { + "jar": "sha256-Ce/udpLt0bI6IgCgzQhe8AMrxE5TrkJRhu5fZYAL+hg=", + "pom": "sha256-OrPE/5vl3bTW7g4k05eV7sejojGRw7DqgRCGHMacm+I=" + }, + "io/grpc#grpc-bom/1.55.1": { + "pom": "sha256-THNVmhbNzTol3h69FQRCaVKMh2oKn4nEAnF6ZJObXIY=" + }, + "io/grpc#grpc-bom/1.56.0": { + "pom": "sha256-fJq5/Zx2/5V14lXyBUsmWbK9d5SawR77BGft9b1gtP4=" + }, + "io/grpc#grpc-context/1.27.2": { + "jar": "sha256-vL+QVd/0U/1lCL18yioKotXwWanJS+7R9f2h3AFWB7g=", + "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg=" + }, + "io/grpc#grpc-context/1.56.0": { + "jar": "sha256-EZaZPyGQJMClH0XyvS9EjltmRikr63bo+2quSY5vOTs=", + "pom": "sha256-wU9Et0BIJNEftNJSVevEO3sTNwMGG0WzQ4FMmDC0xUA=" + }, + "io/grpc#grpc-core/1.56.0": { + "jar": "sha256-DxrDvDeEFtCw+Av5ApgI+Xj681/SAirS2L3WJ25upT4=", + "pom": "sha256-EZscdu7zInRKUpERfqBzJR4sHievipUtDDrBYyAIFmI=" + }, + "io/grpc#grpc-googleapis/1.56.0": { + "jar": "sha256-q3zxR05lSvARXJQM/X/1DiRPk/9HQYndd0YrnALNaSM=", + "pom": "sha256-OMe8XqZekM7U2XLK665eY05U47bijuYYXMqN1h67X4o=" + }, + "io/grpc#grpc-grpclb/1.56.0": { + "jar": "sha256-VwetRGMWIiiiZ6YXQrZgRHRBc2hQQ+xuHRl0yezqi6A=", + "pom": "sha256-l7UrJWBtEas1aqNFwNcbrHbZOyYobKNB/Nu5RjtNeAk=" + }, + "io/grpc#grpc-netty-shaded/1.56.0": { + "jar": "sha256-Wt41OEO2E79jZDEjvZzf61mjgykqz8eEyQxHBK0ZZtw=", + "pom": "sha256-I8R5eCgAITGKbc9KMM76HqMhIo/rdT88F77PMAk2Ce0=" + }, + "io/grpc#grpc-protobuf-lite/1.56.0": { + "jar": "sha256-81Rk7c3mpKB7WbXH3p4UIlNmUtgAL2yy0OznEXORF20=", + "pom": "sha256-iQJUlZ3EznqzScyixUFMS4CwAedlM3JA00+MQQFIkoE=" + }, + "io/grpc#grpc-protobuf/1.56.0": { + "jar": "sha256-1fLjM0WxmnSBWFixvYZ5lDodTF+u2I6f95LnSHXiOWY=", + "pom": "sha256-UVoukg3Hx0tQ6vghHswPloOKw8BAZ5yEpN7mTHrNyjg=" + }, + "io/grpc#grpc-rls/1.56.0": { + "jar": "sha256-Se3VvNgZ7GNZLC3Q69KH4SYaUI0RoxH/oJrOWcJsRH8=", + "pom": "sha256-+pYHQPzab+csBYmuaD3UgOTAWk1gIEMJVF9YDMZcgaw=" + }, + "io/grpc#grpc-services/1.56.0": { + "jar": "sha256-S024+5eC1i58a1idmaSlIpkKdA/1fl7/IKYM1ebv3H4=", + "pom": "sha256-4JyEX9qx7HwfXfn/EXHnl8YGx9yOkbZsw+QlbtZm8kE=" + }, + "io/grpc#grpc-stub/1.56.0": { + "jar": "sha256-SAjF9jIzst8sL9LOFLg4TOmwo2f3hC6TseW5uzQs2ww=", + "pom": "sha256-+vuE8JYro/SbifqRu3cBAnjqrw3lK0IdTqzIvwEQmkg=" + }, + "io/grpc#grpc-xds/1.56.0": { + "jar": "sha256-SZIL81LNp5o+9n9i/lJmV1IwkZtMRjZuvypJG6hernE=", + "pom": "sha256-MzyGTZ2587ZofESBFEKfl0vDXYRP4N1KMQx3y2FPecM=" + }, + "io/netty#netty-bom/4.1.104.Final": { + "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw=" + }, + "io/netty#netty-buffer/4.1.94.Final": { + "jar": "sha256-gGbufEn58p2pbuYvfLE77gIstLaOUUN7M9o7bQE5jxM=", + "pom": "sha256-wEfWyvzJXBniBS2nvifsWk9xsgKqQE3whQGTrZjw9Nw=" + }, + "io/netty#netty-codec-dns/4.1.93.Final": { + "jar": "sha256-EKJ4sZ1jk9Vjf3RQB8sm1H3RbUaImNzEpD4m05xs3Sk=", + "pom": "sha256-PxHNLCB0FVhNxGzw0H3qEb12cqgEZyA+AlxanLj/ST8=" + }, + "io/netty#netty-codec-http/4.1.94.Final": { + "jar": "sha256-GtpFgPaM0XpTT7PAM3CHBzIjp2y3cwTb5aGxnfPVPC8=", + "pom": "sha256-Yr5AyhOzsJs3mAv93Ia/bzBzLZlSMb9FSdo2K/8Jy2Q=" + }, + "io/netty#netty-codec-http2/4.1.94.Final": { + "jar": "sha256-j70ulavsYVW2DtPJwWAO1OF//j8FPNWkBnfYecCvlh8=", + "pom": "sha256-SNwm8n9RUgpei2uZEZAWNP70JQWbdFBVVdSVhKzpuAk=" + }, + "io/netty#netty-codec-socks/4.1.94.Final": { + "jar": "sha256-HAtO4LYjQC3Vu3j9Smm/gI2iUQUk9ImiSw88xY3tBG4=", + "pom": "sha256-M0YjOPOtd9Y1CklWvzSnBXunDYGe0pMy3kU8iMc6Uhc=" + }, + "io/netty#netty-codec/4.1.94.Final": { + "jar": "sha256-kSQ3dq1otNjjnq+57BFeG4+prs0UexLvFbtpFjlJgyg=", + "pom": "sha256-A5MvNUvFsGjvSHAmD0GMmwsKdtlYDDt7TrKm5iKyV0c=" + }, + "io/netty#netty-common/4.1.94.Final": { + "jar": "sha256-y42Eo+Y66pDQ16MzoC5QrHUdKwXbVXRdmBte/4k/ZHs=", + "pom": "sha256-rXG08enZZBfYFjTluaNyaZHNn0jVnbutI2/tWchYjSM=" + }, + "io/netty#netty-handler-proxy/4.1.94.Final": { + "jar": "sha256-N4c4v+uEyBIorl3iCflkyoeEn5pyDJFsd/fLpklLsew=", + "pom": "sha256-NgLruOowisrwT/IrXBzqYKNIGCVcp+lmBHR50eAhDbQ=" + }, + "io/netty#netty-handler/4.1.94.Final": { + "jar": "sha256-jlBxmpq4njPvhcXzbXgODXBWs/dosH0mHYe67XCU6zw=", + "pom": "sha256-Yq7ozQXp4OQdvbIqgtJWmvHuE3l4Unof/vU5SpEUxuM=" + }, + "io/netty#netty-parent/4.1.93.Final": { + "pom": "sha256-sQnLdvN1/tuKnvdaxYBjFw3rfqLd0CT0Zv723GXN/O4=" + }, + "io/netty#netty-parent/4.1.94.Final": { + "pom": "sha256-LZcCadTW8qkWJJc6UCzA6+qDVgvA0RFquNyqlF6DTc0=" + }, + "io/netty#netty-resolver-dns-classes-macos/4.1.93.Final": { + "jar": "sha256-+6jtDTlTjr80APk5V8DqinRnVQGcThUHawRZH7XYU3M=", + "pom": "sha256-abZMe18dLWPw+5hh1Ti1vyjEwm4VlfeIVFFI2jk5Yeg=" + }, + "io/netty#netty-resolver-dns-native-macos/4.1.93.Final": { + "pom": "sha256-kDD8h0sfi1ru11HdajbiUjwujvFh3PVx0wIce9Etyno=" + }, + "io/netty#netty-resolver-dns-native-macos/4.1.93.Final/osx-x86_64": { + "jar": "sha256-JpRFG7jjDxsZt4GULrZ+oP1ACv77kFg3MNuZaqzBuUg=" + }, + "io/netty#netty-resolver-dns/4.1.93.Final": { + "jar": "sha256-J0TMwbvWU8n2X1dkqyEfUcrlaqbC4iiIUKmt2cgFvlY=", + "pom": "sha256-36WAR5mCVjNf+gW3hgERMcRhX1f7HhqQ2FxChvP2BVE=" + }, + "io/netty#netty-resolver/4.1.94.Final": { + "jar": "sha256-vSbpvF6U4tOXSpP9+SFljv9PAzv9TFIIYHdgq1Qphhc=", + "pom": "sha256-4yzEsSRK3sAhxaa1K82+c0QXab8PYNFUkgs8A2BLhV0=" + }, + "io/netty#netty-tcnative-boringssl-static/2.0.61.Final": { + "jar": "sha256-tvl0lyxEzW+c7KvCVSkChvqsQLY5PGbDw8Dbf0Icwo4=", + "pom": "sha256-+AUaYg8cSH5pOuWHeS9udTOu6EZUzo7tklRJqme5h4M=" + }, + "io/netty#netty-tcnative-classes/2.0.61.Final": { + "jar": "sha256-m5cOzNhEv64XWly797+UiRiUrdBtbMvhq/IlDNZAgPY=", + "pom": "sha256-/OkkBPUJgHzfuaEih/Zlw+yJAiIMJwl7vcUvznUql20=" + }, + "io/netty#netty-tcnative-parent/2.0.61.Final": { + "pom": "sha256-flj/oEOq1khZmvTUONGwTghCycZRENP5a42WkJ7CDKo=" + }, + "io/netty#netty-transport-classes-epoll/4.1.94.Final": { + "jar": "sha256-nV1R60IIHW/BP03KaFXNMNCYpbHQsG1WRKE0K9HlCkQ=", + "pom": "sha256-mY8rEt2tSQS/GdWXHQSJcPMbfXdL4GRJygRCj9SXX64=" + }, + "io/netty#netty-transport-classes-kqueue/4.1.94.Final": { + "jar": "sha256-M5oGbpiOdw4DiTNIREbtam6sfDQdnvR26VSKFvlPyIY=", + "pom": "sha256-OAkgyGQEJb7eENPmpm1uheIUCd/0U4CherVt440wBjI=" + }, + "io/netty#netty-transport-native-epoll/4.1.94.Final": { + "pom": "sha256-C5NMNOLBwkW5YSxZfq4LiNWs8jhh1Z26EogU4tzhmIc=" + }, + "io/netty#netty-transport-native-epoll/4.1.94.Final/linux-x86_64": { + "jar": "sha256-4l4O80f3hQ5vPYpgMdZLDtsGug51Uzw27bNQ1N795fM=" + }, + "io/netty#netty-transport-native-kqueue/4.1.94.Final": { + "pom": "sha256-PnZdVS07cYHBEEkreO2yooN/FdDKLhGO1LUv2Xvf6PY=" + }, + "io/netty#netty-transport-native-kqueue/4.1.94.Final/osx-x86_64": { + "jar": "sha256-71vV+vjCqIRv/8Jq08qbq0Fi4Y8Z6P1fd9/GrSHtFpk=" + }, + "io/netty#netty-transport-native-unix-common/4.1.94.Final": { + "jar": "sha256-J9Df8c10MZAnm+ys+zcv5NRbJm7a+tnxxsAbBNACgOs=", + "pom": "sha256-Es2Go+zkcrOyy4ErZhZHPk3gT8nZzs3dZtLVtqNOhg0=" + }, + "io/netty#netty-transport/4.1.94.Final": { + "jar": "sha256-p1r6hMo1pQIlmRs55rYngYbmEveioMDpgd5SOqrFFqQ=", + "pom": "sha256-K2RhsxPlaRhBancyBv99ZM8QGmYssDoUKPBfnavkseo=" + }, + "io/opencensus#opencensus-api/0.31.1": { + "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=", + "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.1": { + "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=", + "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s=" + }, + "io/opencensus#opencensus-proto/0.2.0": { + "jar": "sha256-DBktRR6d106Ychsn0C8OK2vKRLUVY7Xavy4hH3o+vxM=", + "pom": "sha256-twh5B5IPyKgVNGhrLxorMxEnr5fwFau9s3hqUfP6HlI=" + }, + "io/perfmark#perfmark-api/0.26.0": { + "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=", + "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=", + "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto=" + }, + "io/projectreactor#reactor-core/3.4.30": { + "jar": "sha256-L4/TaePZZZMQCfDFvsY/HQFw7hEdJuCmdvW5QFC4q+o=", + "module": "sha256-xLtiq9sMJmiXV9THXFhVgGQumeTPFmDAaqt53DhSbq4=", + "pom": "sha256-HLISL4vG+ON0L4Xpm3xBFwifV4hzdJMIK0bZBCQguPE=" + }, + "io/projectreactor/netty#reactor-netty-core/1.0.33": { + "jar": "sha256-iFZCHPtcgfsR2Xo+9D/meJXVsGQceq/j5ddItL5tilk=", + "pom": "sha256-tazBTpaD1V30BWDe8/CDG9q21QhBZ/b1h6ooaRWeSuE=" + }, + "io/projectreactor/netty#reactor-netty-http/1.0.33": { + "jar": "sha256-7JB8UimBFZ5Fqjij1fEYPo5XJd7j/llOjyGzuP5b6is=", + "pom": "sha256-5frkQ0rlFQDP6PoFHuf425bf/oM05EhFmrQcX4mkOBQ=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/servlet#jakarta.servlet-api/6.1.0": { + "jar": "sha256-ijH0ZfNZO/I1FTGlyVIBTrg52pamBbWCW5PdVHFMSMQ=", + "pom": "sha256-G6+Lb6bQIYAwINCXDqQ/sH32beZskNKZohZ3Dwsz5K4=" + }, + "javax/activation#activation/1.1.1": { + "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", + "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A=" + }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" + }, + "javax/jws#javax.jws-api/1.1": { + "jar": "sha256-nyCrH+o/lXHtUqnZjjxlHMfATIpwmt3yODErYJh8byw=", + "pom": "sha256-2MBdp0oEuZfbN+I8xFBokVMZkJXfvn5eR9HMRJT1zXM=" + }, + "javax/servlet#servlet-api/2.3": { + "jar": "sha256-hHi5AtCBXtBm24YPsUzF1ARUjUtjSKuTC0YnD83eumg=", + "pom": "sha256-q7KUqPBkAY6iJqWtIXbqqdvxzeAppHgV/UpASdE3QWA=" + }, + "javax/xml#jaxrpc-api/1.1": { + "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", + "pom": "sha256-7l6D/wZZh4dIA7uRJ5r8zC8dP526odNX2f1X6Ls7xUY=" + }, + "javax/xml/bind#jaxb-api/2.2.9": { + "jar": "sha256-FmXRK8xopBjKJNOJ3OPFhs0W/J1XHfIdQkn/Hjj8uZI=", + "pom": "sha256-IfsrIZfYZypJLBrgGN18cxgwQeptHMmYSKSdYu7cHL0=" + }, + "javax/xml/soap#javax.xml.soap-api/1.3.5": { + "jar": "sha256-/Ne06NLZVpWtonmH3TXVJGgkiAHK3zpgPZaawpqZ3Yw=", + "pom": "sha256-a8CULqgG3xhh/DZ966JAKEXbh8nXcImhIPfoipqRIdU=" + }, + "javax/xml/ws#jaxws-api/2.2.12": { + "jar": "sha256-fnbOOvYwVFkrEUHe7THpb8SzhQK4bfSNU3bQALAwLJQ=", + "pom": "sha256-nlweszqLecaX7vPaFugWk9bBAsyq4q65UqaidYHfPco=" + }, + "jline#jline/2.14.2": { + "jar": "sha256-c3wEwqrwkAlyMygUYICvrnhp1AViWLQjg0pUeHkhOGw=", + "pom": "sha256-VOIz9HwTd6tBH7ZNJuMhULzZkEUTecWZUCeIeGO4p6c=" + }, + "junit#junit/4.10": { + "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=", + "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "junit#junit/4.5": { + "jar": "sha256-kjurxR22dfOSN3fDn/fYaOenbmmkU0C6Ts84zlMa3w4=", + "pom": "sha256-dS6JNTrcfSfLat1xKija1YKK5zDhAuusLTSa9uLvda4=" + }, + "log4j#log4j/1.2.11": { + "jar": "sha256-imvHhajlKpfqdtfiHlkVJiImacQmLte5Haqccvz2zQc=", + "pom": "sha256-aaVvjRwzjc+J7p7XWzm52qqVZCxbbRMxMZ2HxNZJblw=" + }, + "net/iharder#base64/2.3.8": { + "jar": "sha256-u/Qf2iKHelOPa8LVrQqjcqfd9KdWrzOGqgnT1O6oT38=", + "pom": "sha256-GztOxlWgmYGaS9QCKQBNP14Y0kz1Iy/rOS4faUoENzA=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/4": { + "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/jets3t#jets3t/0.7.1": { + "jar": "sha256-zzwEdXFHFoKn9Z31SAinFD14xrj2gmgJ7pWi+WN7fmA=", + "pom": "sha256-Ll4uq1m1a8DqquHRTgulO+6sYjvXK14c9UdcpcvR4Hs=" + }, + "net/java/dev/jets3t#jets3t/0.9.4": { + "jar": "sha256-oD8NJegQ7P8wE34NMUjRv5r9z2I1fr0bGvM49/YRW7s=", + "pom": "sha256-nqFHD161gt9fJa+pteIFPCy2GPJjlqG/IQ3m6T2XZGI=" + }, + "net/java/dev/jna#jna-platform/5.12.1": { + "jar": "sha256-jOlpEWyslb1hsHqNXgcXSzUuYzAUc8qscsOV48CEiNI=", + "pom": "sha256-wnn/o7UWjiIDCHIxxjiRmnzsdFgAaxzaZpWXR4YPtFc=" + }, + "net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, + "net/java/dev/jna#jna-platform/5.5.0": { + "jar": "sha256-JNgWIfgqwp/N2adBFgMfWQeiNDFY5hb0Vzu/okNK4NU=", + "pom": "sha256-EFaeNiLpdNPmYlW6hZI8El2E+iV+8lQ9isHGWNnrzRA=" + }, + "net/java/dev/jna#jna-platform/5.6.0": { + "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig=" + }, + "net/java/dev/jna#jna/5.12.1": { + "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=", + "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/java/dev/jna#jna/5.5.0": { + "jar": "sha256-swj66/5O1AnehBDgpjLRZLISawNfbqz/lo05CMr7TZ4=", + "pom": "sha256-pRrZTj90+Fo8362XU5KCkxZFJmn1iCA8e0nl+Beb5Tk=" + }, + "net/minidev#accessors-smart/2.4.9": { + "jar": "sha256-rM3Vx6xMSbFViQquof/KKpzNWCa1Yt2VqZ/BiHAD4DE=", + "pom": "sha256-/sBelw8jmtqEcfTqPwYRwDb7zHxD886qnl575vMhe7E=" + }, + "net/minidev#json-smart/2.4.10": { + "jar": "sha256-cMq16UiGMNxjGx/G5/pVDZXN3Rm6FNs5zsp8q/vU5a4=", + "pom": "sha256-qVnWK1dC8NmRu3zF15fvmHgT6U3pORcAzw2N9v0hOSs=" + }, + "net/sf/kosmosfs#kfs/0.3": { + "jar": "sha256-GAfL/7bIh2z0QLj310j/9JzqQN3S0EK7tiuuPIe6iEI=", + "pom": "sha256-vh1i+xebfsSFJ1HqBmd9ZgUt9fwBwur8eUUudaXBZfg=" + }, + "net/sf/launch4j#launch4j/3.14": { + "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" + }, + "net/sf/launch4j#launch4j/3.14/core": { + "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA=" + }, + "net/sf/launch4j#launch4j/3.14/workdir-linux64": { + "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": { + "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=", + "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE=" + }, + "org/ajoberstar/grgit#grgit-core/5.0.0": { + "jar": "sha256-euHeUDb2pP8sTyHULuJ53LvKcOYDpEtP6zBZK0eu8G8=", + "module": "sha256-fuADv+5+8bNRyxV2GAXUs5HI7CUAwxdax1o1MgM7KjU=", + "pom": "sha256-wmURBGMEd98+Iig8ChGyIiwm3184m+t2G2ACnGXiGpw=" + }, + "org/ajoberstar/grgit#grgit-gradle/5.0.0": { + "jar": "sha256-aa8WiXAg1WPHBtYBRNgBpnrSS2cd4GA5j8rJho7aPCw=", + "module": "sha256-RJ+Wog22yCYvNtpsLZWdEkJb3LY6ki6Ikit50KC+VJk=", + "pom": "sha256-D6nV84E9yjIz2f2rjUWtaJ7nQ+qPxJVUVYbK6Ufw0pY=" + }, + "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { + "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/17": { + "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-compress/1.20": { + "jar": "sha256-CutiXJSMaX6nsgUVbhEjY7We1eJVEhLNTkYL23LHwG4=", + "pom": "sha256-2VZ4469WsXx9ts/5ZF761etZvp88HKqvXwFG7fBGkdc=" + }, + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + }, + "org/apache/commons#commons-parent/11": { + "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" + }, + "org/apache/commons#commons-parent/32": { + "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, + "org/apache/commons#commons-vfs2-project/2.3": { + "pom": "sha256-esuoQCmKFoMHNgZkPcGX0+XwIoOrIMuUyLbjB18pU7E=" + }, + "org/apache/commons#commons-vfs2/2.3": { + "jar": "sha256-VtHuk/pi7VJzsUQDwZwAlV7vN5JgUwfksQa0GuXYOmY=", + "pom": "sha256-HAjXM3vPvbo1PJKIYKRlE8A95kp4mTCs1rwQIE4pHjY=" + }, + "org/apache/felix#felix-parent/2.1": { + "pom": "sha256-xVKlZDq0Z8MSJeB8tVsdwq5agR5WdIGnOiVKOJgThzY=" + }, + "org/apache/felix#felix-parent/4": { + "pom": "sha256-XM0w8s5e1T09oZGiPs71mxWw/Q5JSgGu60AmRBQn5Gg=" + }, + "org/apache/felix#felix-parent/6": { + "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU=" + }, + "org/apache/felix#org.apache.felix.framework/7.0.5": { + "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=", + "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk=" + }, + "org/apache/felix#org.apache.felix.main/7.0.5": { + "jar": "sha256-IIUtVR3jJ4BKU7IOUPL7v3e2KwP0JubpXnYG06WPjpg=", + "pom": "sha256-p5ct/DzTQrxR5G2PMD5avTzjDhgOi1cVLAnxiUpTLv0=" + }, + "org/apache/felix#org.apache.felix.scr/2.0.12": { + "jar": "sha256-jaF57ceJ4SYH+x7pCNuEkJkh6A4JO9Sdm648LCDsqQ0=", + "pom": "sha256-Tj7MhctREnNZO/4c7/RpZAkzjs0+2wvv05oie/2iZaI=" + }, + "org/apache/felix#org.apache.felix.shell/1.4.3": { + "jar": "sha256-xT4vgt58Qntj27+RG4uJA4b0qxI41s/olFsQ8B3YqgQ=", + "pom": "sha256-E3gqgSD8OX+Fxl5jdRrxQhrWjxbqQ9etxpjI9wDJUeY=" + }, + "org/apache/hadoop#hadoop-core/0.20.2": { + "jar": "sha256-NpnQfjXPWJgtIovrrzBz70z4Tg9PgtyRY2EYyrEy5PY=", + "pom": "sha256-8IygIDOByE19sy1x1giwIWt2NY8BBLLBcJ1uyCHs4A4=" + }, + "org/apache/httpcomponents#httpclient/4.5": { + "jar": "sha256-o8FVmR3h416FHoKKZ/iU0QEVjEEkzA8d9fEtJ8+kd3I=", + "pom": "sha256-KXbd8fDEATUubMf0kmbH+D/h+hEwhlB1Ik/DfJAr28s=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5": { + "pom": "sha256-VPLVLc8b3fp7AEvsk8fmDjLyU6Rkj9ee8t/gOL1KrhM=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.1": { + "pom": "sha256-QSBuBZ8samqOylrk4YC0C5P2+raJ65tcCTa3K2K3GNI=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.15": { + "pom": "sha256-YNQ3J6YXSATIrhf5PpzGMuR/PEEQpMVLn6/IzZqMpQk=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.1": { + "jar": "sha256-3ROQwX1A92D35RuyBSOo1j3raelLq+r1Z+t27NLK1CI=", + "pom": "sha256-uBpinKyR8Q4siiRfd0tvCIlQOerWifqITHj0csdSxIM=" + }, + "org/apache/httpcomponents#httpcore/4.4.15": { + "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=", + "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms=" + }, + "org/apache/httpcomponents#project/7": { + "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM=" + }, + "org/apache/logging#logging-parent/10.5.0": { + "pom": "sha256-ngk5zAKXfp/1KOdmBj4PMiTTbok7pMkh8JINtI86xqk=" + }, + "org/apache/logging/log4j#log4j-1.2-api/2.22.1": { + "jar": "sha256-mgJbJNffQl57IlkCdFRt+OsLBAzLOv84VvmiZvp4f9g=", + "pom": "sha256-W1sfYKOspQc8xMBTwEQlexBENzEaXGHgGCynDiZ2DUE=" + }, + "org/apache/logging/log4j#log4j-api/2.22.1": { + "jar": "sha256-XXvq5/8V2FFtZRcSHX8Sp5pqwYDfZLX87FXVviEFblM=", + "pom": "sha256-bVdUd3E5Sz7hj57T7/ohWXGeLzY0Ynhj0FAjup/Y4Ys=" + }, + "org/apache/logging/log4j#log4j-bom/2.22.1": { + "pom": "sha256-nxUjceNriy6m6yyb0YgnYAafNhgKbygXfmpIwoFMDyM=" + }, + "org/apache/logging/log4j#log4j-core/2.22.1": { + "jar": "sha256-RtzOysVWYj2OLOhkhJaCSoKVHROQYqTmEUiv8aJe0Y0=", + "pom": "sha256-HPf2SP7UPwv6wzKNk/yCPHSZB4/XkE4YtlSbsQeKnFI=" + }, + "org/apache/logging/log4j#log4j/2.22.1": { + "pom": "sha256-7Zibb7CaJW69TP3MIZaIuhw9beS087UUVC0WVj3CkJc=" + }, + "org/apache/pdfbox#fontbox/2.0.27": { + "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=", + "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY=" + }, + "org/apache/pdfbox#jbig2-imageio/3.0.4": { + "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=", + "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s=" + }, + "org/apache/pdfbox#pdfbox-parent/2.0.27": { + "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po=" + }, + "org/bouncycastle#bcpkix-jdk18on/1.76": { + "jar": "sha256-k1o4iFTDKfmm8ycI8wyQBF0vkSlPpocoEnMUXUz5g0o=", + "pom": "sha256-9iHsfqzNMj59L7yvD/2HIM9uqEKmXCvTDoMFiJEslG4=" + }, + "org/bouncycastle#bcprov-ext-jdk18on/1.76": { + "jar": "sha256-KdZsEtOSFaKlY1+GskU+D59vP+MvQtzlN4++A21ZX7Q=", + "pom": "sha256-cGnxBvIKBvQFHbfJZ0Q2f3GOHEtbpDyLVX3nkhO/yJ4=" + }, + "org/bouncycastle#bcprov-jdk15on/1.52": { + "jar": "sha256-DcTRgeTTR4k8LdvS5s1dcof8ZRwDZI+mSyNBxzZrF3M=", + "pom": "sha256-fko0x7Y9h5xc7EVOLkfrHmHicaWGcuflSGWfTyN0JQA=" + }, + "org/bouncycastle#bcprov-jdk15on/1.69": { + "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", + "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" + }, + "org/bouncycastle#bcprov-jdk18on/1.76": { + "jar": "sha256-/ahdd3qq4WgBWGCyOnfK2bjTodXJBP2odTE0J71WAXk=", + "pom": "sha256-FTAJWS07j4NJ+XuPFTi+8MgzQbAmkYojJ9rOIjNP/ug=" + }, + "org/bouncycastle#bcutil-jdk18on/1.76": { + "jar": "sha256-GmWtApWCI6PzE3O9cu6pQsr9Gxh3o+0LSSwkh+d8PCc=", + "pom": "sha256-3l7TyhGMaT0ZDFxG2J4DgLtdd6zYpDtRkEA+dkg/ge0=" + }, + "org/checkerframework#checker-qual/3.12.0": { + "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", + "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", + "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" + }, + "org/checkerframework#checker-qual/3.24.0": { + "jar": "sha256-2tGJ1OO0he3wI6niC7yEeDA9yM3clX5oij9ZTV5zu3s=", + "module": "sha256-EC7EgMhtWlEqb6BEgroCeX+kiwiSJ3cRBLgsRFGapDw=", + "pom": "sha256-70TDGulmr9RNMXge4m7zviQm1UITPeVC10lBGOagAjE=" + }, + "org/checkerframework#checker-qual/3.32.0": { + "jar": "sha256-tm4CXaCmv4Xwt/X9rcqDKjJ3H4WhLKwUAaPAzY/XPM0=", + "module": "sha256-zN7Nqhqu63g5UfanwY3Bk5XC4qXn93RQ1we41i6H3k8=", + "pom": "sha256-eVqIZSpu3vocMP26soASnkGDsaz5lKx0vkPz64qnfc8=" + }, + "org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + }, + "org/codehaus#codehaus-parent/3": { + "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" + }, + "org/codehaus/groovy#groovy-bom/3.0.19": { + "pom": "sha256-E+POc+1L+fxu4rVA2FVWh/astwf4SSOUFMgnfUMd7KE=" + }, + "org/codehaus/jackson#jackson-core-asl/1.9.13": { + "jar": "sha256-RAqctcqVshX5U9OiCmsaENofCbUpqd3qX4pJBd2rT1o=", + "pom": "sha256-95Xcr5QSdPZanVRaSSanQtCygttPLrGUADBgyvvv2QA=" + }, + "org/codehaus/jackson#jackson-mapper-asl/1.9.13": { + "jar": "sha256-dOegenby7breKTEqWi68z6AZEovAIezjhW12GX6b4MI=", + "pom": "sha256-MPLZHeJHhRcjaODaGKh5cQLHWZqJdmuhf+YzDCQMy/4=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.23": { + "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=", + "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.9": { + "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=", + "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.23": { + "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.9": { + "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs=" + }, + "org/codehaus/mojo#mojo-parent/28": { + "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc=" + }, + "org/codehaus/mojo#mojo-parent/74": { + "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.2": { + "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=", + "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jdt#core/3.1.1": { + "jar": "sha256-+eOc9zJrYNHTAW7ZD63ASfcdMSyXqpfLqvhR1jdnMLo=", + "pom": "sha256-thSFD4+KUKt1m1nJIZqv+xxbzz7yQMbE0eFjN/9ZJao=" + }, + "org/eclipse/jetty#jetty-bom/9.4.53.v20231009": { + "pom": "sha256-+vlzoZh0JmzQhlsCmeup8WfLsHB13U/tvj1hVjV+ndU=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.0.0.202111291000-r": { + "pom": "sha256-KlNYEM2GhoEaaT0au4sQGRE1bfRlhdxpD0TNNGx3vwU=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.0.0.202111291000-r": { + "jar": "sha256-NSkKqsxiVhMEzQLvjPpbKXqIAHVdfXQk5SlU/MUqEgM=", + "pom": "sha256-pRCLLHNdZ7Zfh7f+77kxAUhCax4dAfHdY04zLB2mJUs=" + }, + "org/exbin/auxiliary#binary_data-paged/0.2.1": { + "jar": "sha256-hrQsuJaXv56m0J6UYUjGil9nNRmZVBARar5RgiYiHgg=", + "pom": "sha256-hlRKJbEI0whPUNFB17aamkTAaevd2lptKraq3BsX/sM=" + }, + "org/exbin/auxiliary#binary_data/0.2.1": { + "jar": "sha256-KHLdfwFwKe7K4e+6WK/Y8TtZmfILLXpwC/+wGe3rIXU=", + "pom": "sha256-cKKzkvsi9Wu4nFtboqlVD1oR9W0Iw/49tGoVUz4qZgU=" + }, + "org/exbin/bined#bined-core/0.2.1": { + "jar": "sha256-V8Zi/yltzudxUW8z4Q64xqXrmxtirHLImlOOjYN/Qt4=", + "pom": "sha256-ArlTnv30BNGe0EAImfsW47RFSXIdRBPE3T8NJ4mHols=" + }, + "org/exbin/bined#bined-extended/0.2.1": { + "jar": "sha256-zI3bMximn51QCmBNdBxnrwtvxAf8D8zzH6decd10S8A=", + "pom": "sha256-Bw93++Ua68eldogvD/raSrnuw4m6na2TUPQpwbFgD1A=" + }, + "org/exbin/bined#bined-highlight-swing/0.2.1": { + "jar": "sha256-imLpd3jYhBi/6p7B+0xVAL4DBXZKttrRe3zRn120qkg=", + "pom": "sha256-+h9PY7ZMpk1f/aTppOv+H3jZPnHhRKgEOfaKOLNkm/A=" + }, + "org/exbin/bined#bined-operation-swing/0.2.1": { + "jar": "sha256-W86xnZdd+QwMBtLBCfrLNc3Pfc9f22tPRuL9ZpQxYaM=", + "pom": "sha256-Yd1YChfo99RriJR8mbBrITv8twmRmJZImgR1VmeKPOM=" + }, + "org/exbin/bined#bined-operation/0.2.1": { + "jar": "sha256-xwCLqoH5wDRYluFnxjgL8vFl6dZiLYKFkTtiGqNJKq4=", + "pom": "sha256-KcLNRZ0lASxfY6qlETPNE5oi/db6+QBLLf8QaD9ob9k=" + }, + "org/exbin/bined#bined-swing-extended/0.2.1": { + "jar": "sha256-pjSlaelSrdddQXoV/YobVFPuifBBaTc/+kMwO7VO1Ig=", + "pom": "sha256-CUHcanE/2Kuupq59YJDGmiV9sVzuNqpgcooDh9Ljv5g=" + }, + "org/exbin/bined#bined-swing/0.2.1": { + "jar": "sha256-uAI2FCXqNOP6XsoLiRLWjutzBcwsM6hU5fERpqE5e0Y=", + "pom": "sha256-VI8AQtjmm7ubBE9v3lsTrw6cHrcxwFFWuDP+Zt6n5AI=" + }, + "org/glassfish#glassfish-parent/10.0-b28": { + "pom": "sha256-2DdvCwd5g3hYi0THaFhNWgg2IC/r1bthQV69NHlUhJw=" + }, + "org/glassfish#javaee-api/10.0-b28": { + "pom": "sha256-iSXwgLFPb32MSS0nNzfJ8XlliH6T2e6jHUI7Dbkv1mU=" + }, + "org/glassfish#javax.xml.soap/10.0-b28": { + "jar": "sha256-DngfntIbAM+gZvD+wATSRGsRDOAATSMW5CDPEa8AF70=", + "pom": "sha256-Oxqk3Tss+B5WJo/d5jAG76V2FeDcfv7dYNwOlws8CuI=" + }, + "org/glassfish#pom/2": { + "pom": "sha256-vjuPfQ8bH3mTTBvDAd133tVZpj8H+cBiEM1LTslohi4=" + }, + "org/hamcrest#hamcrest-core/1.1": { + "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=", + "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.1": { + "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains#annotations/24.0.1": { + "jar": "sha256-YWZtvOfkLmyFtDwE/PuCk6Idy1WzyA6GknDOQsAaazU=", + "pom": "sha256-mb7eKcAzHBlS7uBL+ZeN5TWpDJfi3v/6XgCTNRcZJbA=" + }, + "org/jetbrains#annotations/25.0.0": { + "jar": "sha256-nAoVKCQNH3Mr/qwYLhJudurS5t+hV/GtjjyJGxkoFTg=", + "module": "sha256-fO4TLOY6T5RuLOK3fmFl2m7AMtSvGsJzGdGsCvUq0fk=", + "pom": "sha256-uuyLRILZFgoxmWGrhrBQdjKo5V1Uv/rX0rQkB6ri5pw=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.9.10": { + "jar": "sha256-ioNfUXY1UINmiv8O1u71s+sDDhDolnntPutwP9LVuQA=", + "pom": "sha256-6VNknBeNIuD+9U3JC3M/23UBAXJP5F1qnV+UsSmDEho=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": { + "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=", + "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=", + "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM=" + }, + "org/jetbrains/pty4j#pty4j/0.12.35": { + "jar": "sha256-XMlLTyWRkTerRDwdticVB9pZlESLGELOBynZBsFImwA=", + "module": "sha256-CfCYdYzRcrVP+iFYFC9pMi+ehIX7HnP7SaG1tBz9Fd4=", + "pom": "sha256-rLLO0RQLfMjrcTjsCWBMqoQScunRA1ARQXKXkpjDauw=" + }, + "org/jmdns#jmdns/3.5.5": { + "jar": "sha256-iUyFKyYAHjuxrQ9pFec3BqpZBjftXXMbZSoUYYZQRzc=", + "pom": "sha256-bQIQbpkKWGMuq2ujjSce09Gei6OubT8uM113G2FW8hY=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mortbay/jetty#jetty-parent/7": { + "pom": "sha256-AXPY2/7SuKsqWza2CKnFCeoKP7tPrKZ85wZ2gMiVBmo=" + }, + "org/mortbay/jetty#jetty-util/6.1.14": { + "jar": "sha256-8mY5/R7P2Dpm+dilkyQvpavXW7R2TP2siLQHmpP+Mvk=", + "pom": "sha256-h1IR/PM+77cX+/94uqGmC+XJc/4gbP9HshlcUDN9hYQ=" + }, + "org/mortbay/jetty#jetty/6.1.14": { + "jar": "sha256-IwGVcKiM3lf3z572YuVvZssXnc9+KMvg0WKedk0Iw0M=", + "pom": "sha256-LYNk1QxMmFO2kNaGdQ5MnbRioQt/rfP0TpdOJJCtGRU=" + }, + "org/mortbay/jetty#jsp-2.1/6.1.14": { + "jar": "sha256-2VTa2Kpx8mmfNZAzPoybjY/B6ixZ12A1GTuP8q8F1j8=", + "pom": "sha256-OFFKit71HajPrD79tZosDfYiXBnUszHJy3bYeYXy+5Y=" + }, + "org/mortbay/jetty#jsp-api-2.1/6.1.14": { + "jar": "sha256-2+YHBuGi8+PjeFsofXi1J7b0GqY37M2k48OEF2w1pAU=", + "pom": "sha256-jWdSNsVPkhg4bzacfuxMSLNHS7Kh1vT89VYzLyoyVwk=" + }, + "org/mortbay/jetty#project/6.1.14": { + "pom": "sha256-3LefygsrOTGr0/WwJYLF0jyeu9LnoN2Mk+/j0a0++l4=" + }, + "org/mortbay/jetty#servlet-api-2.5/6.1.14": { + "jar": "sha256-DtM+4wUYZqOmMxl2zfUJijau/RbsH6LYNusGfjfUbUc=", + "pom": "sha256-i3Fd2/c7vaY0TCI8E5hnWSLkF7o5ntPH+NepSVnA/4E=" + }, + "org/osgi#org.osgi.dto/1.0.0": { + "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=", + "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw=" + }, + "org/osgi#org.osgi.framework/1.8.0": { + "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=", + "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM=" + }, + "org/osgi#org.osgi.resource/1.0.0": { + "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", + "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" + }, + "org/osgi#org.osgi.service.coordinator/1.0.2": { + "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=", + "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o=" + }, + "org/osgi#org.osgi.service.log/1.3.0": { + "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=", + "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos=" + }, + "org/osgi#org.osgi.service.repository/1.1.0": { + "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=", + "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk=" + }, + "org/osgi#org.osgi.service.resolver/1.1.1": { + "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", + "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" + }, + "org/osgi#org.osgi.util.function/1.2.0": { + "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", + "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" + }, + "org/osgi#org.osgi.util.promise/1.2.0": { + "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=", + "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY=" + }, + "org/osgi#org.osgi.util.tracker/1.5.4": { + "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=", + "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk=" + }, + "org/osgi#osgi.annotation/8.0.1": { + "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=", + "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM=" + }, + "org/osgi#osgi.core/8.0.0": { + "jar": "sha256-QcJNGH9nqq9HRfq3j9HaZt5/N92CWB27vJuolkW6AWY=", + "pom": "sha256-ZR92uim7Q5LTaupW99CwyC/EkXAk2eaoQ3dLulAV61M=" + }, + "org/ovirt/engine/api#java-sdk-parent/4.4.5": { + "pom": "sha256-0yDbSWA1kRnOQhG3+R1Y+regNqra7Uo+feiehoO/PIw=" + }, + "org/ovirt/engine/api#sdk/4.4.5": { + "jar": "sha256-ch6stVl0/BuFz+GfRtjgRgTUDYNr1lxxoKpHf/RLumI=", + "pom": "sha256-w6qSGYiYuDuLy3mWDXJSX+uMKiOI1lfjBw/iW8yZSCM=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm/9.3": { + "jar": "sha256-EmM2m1ninJQ5GN4R1tYVLi7GCFzmPlcQUW+MZ9No5Lw=", + "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A=" + }, + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.9": { + "jar": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w=", + "pom": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U=" + }, + "org/slf4j#slf4j-bom/2.0.9": { + "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.9": { + "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/testng#testng/7.10.2": { + "jar": "sha256-Il/VZEfy5eQ52ztIOnnNnylPrZ81f4NSsS7mo0EeuxU=", + "module": "sha256-AOr53InkDueoM9nIgDjF3v94rH/DhNNyAsQlJwC46Bk=", + "pom": "sha256-1tUdZ4rUzT1bIoBmuguIZ3l28QrQNSH+MEM/JTJGFkc=" + }, + "org/threeten#threetenbp/1.6.8": { + "jar": "sha256-5LHrPZDDilTH8zhP2pV+C1vwtBtAZypErosDy2yHzgY=", + "pom": "sha256-ztMznYANG7wB7mct+A5NqHUgrgKXuarI+MS33aI+SwI=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "org/unix4j#unix4j-base/0.6": { + "jar": "sha256-dOiHClT3oLNDIz6ZcSnyg9uvBIud6/H1aOalwH3LbYw=", + "pom": "sha256-4aXxzU2oD7pYfvCwWGO83MnDQ/GtWg+8YlTgs0J+40U=" + }, + "org/unix4j#unix4j-command/0.6": { + "jar": "sha256-UumRX7DzERvMtdoxvqVX/MeV7xH1bs6KrI5QJzELVjk=", + "pom": "sha256-X14lknDlCSul+cwDnBQpL69xh9FCHk9Y8/QXyuVQ/Ko=" + }, + "org/unix4j#unix4j-core/0.6": { + "pom": "sha256-1XgPLlf1TdsnKUGgOcblb3Xo7HG6/CvYeTzDcOgy9HM=" + }, + "org/unix4j#unix4j/0.6": { + "pom": "sha256-WDiqu1K7nH+Tu0GfQHWBJpMXKV9KrHMbtXvZSmKu4Uw=" + }, + "org/violetlib#jnr/11": { + "jar": "sha256-IQjDFWiGB4PxMJdEk1balFUEuSpir84hmFWAlLW5ZZ4=", + "pom": "sha256-TMlmvQeIgGZMQY00YpzUlOXvWTch92oyei8VgiDIaI4=" + }, + "org/violetlib#vappearances/3": { + "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=", + "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk=" + }, + "org/violetlib#vaqua/10": { + "jar": "sha256-e4ZgbF9Mdls2MoUwvdJ/nHmW0NK3a1ZjKFEAE8x4cxI=", + "pom": "sha256-ANTlWsGt0lnrbokL0oa3cQKjLtuXbou7qglQFLCztns=" + }, + "org/webjars#jquery/3.7.1": { + "jar": "sha256-JiAW3TpVnfh67745KATpv2IHh8kgTAq4Ui1MIx6mUJc=", + "pom": "sha256-RnwtczAljAxt4ZrtKny/Bgo29MT1Jjf6wLNkMJqKpSA=" + }, + "oro#oro/2.0.8": { + "jar": "sha256-4AzNrV3360P97kQjLvZGAr9jgHwtEzp76Dugn9Sa8m4=", + "pom": "sha256-mqnf6y6F4dXnkyyHFAaXzswrD63ZM9Z5/UIKLkODGoI=" + }, + "servletapi#servletapi/2.3": { + "pom": "sha256-e71KE8Qp8H1NGyGrY9K8XTKTdeXqk9KGvzNJ8RCs4C8=" + }, + "tomcat#jasper-compiler/5.5.12": { + "jar": "sha256-V2Z7FKEPkc7Y9uw4iBcIuJghH9D6ull8MS/R0cjGwKM=", + "pom": "sha256-eZ+lAPzpBrou6E+9mt409mN1p4oUgehMyuSgwdo+pWQ=" + }, + "tomcat#jasper-runtime/5.5.12": { + "jar": "sha256-EoqikuUM2Vbox7vakLfiINBECXdx7V1i671dNyU+vvQ=", + "pom": "sha256-Supxo2hAM7WFhsp6oMh6LOzgtN3LglNF8vOQz1lfYlA=" + }, + "xmlenc#xmlenc/0.52": { + "jar": "sha256-KCrhhfwv8n2ncUr5liiXwJz++vuIByIZxKL5xzYWwCY=", + "pom": "sha256-vSLwW83TfiJr9kJvIv73dI1y42TJ7xQAT3t7b4qC+EQ=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + }, + "https://repository.jboss.org/maven2/javax": { + "activation#activation/1.1.1": { + "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", + "pom": "sha256-D8ky5fICygzkukU/sdrMUoxhi76//h4igSYUrbcaU5Q=" + }, + "xml#jaxrpc-api/1.1": { + "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", + "pom": "sha256-UDMEHgq0M92KL9K+HpQ4k+qBYBN5ynMLdWYbfj5aIto=" + }, + "xml/soap#saaj-api/1.3": { + "jar": "sha256-02J4xJxQ8f5BwmRBSh9XKmV41US4yokFNZfsucqH9j4=", + "pom": "sha256-mVi9bmvcCAJ60U1ztgWICaUTidM0mUiv2d+N7CUu5vk=" + } + }, + "https://www.mucommander.com": { + "maven/com/mucommander#sevenzipjbinding-all-platforms/16.02-2.01": { + "jar": "sha256-IQzUnNUHVyqjLGdKFm6VvtbihY7EHG9Tw8I0TcLiarI=", + "pom": "sha256-SL90Ej+qA1eGFy5dnzg1Zj7tFrDkvtIAI4RxMcc6n7k=" + } + } +} diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/by-name/mu/mucommander/package.nix similarity index 82% rename from pkgs/applications/file-managers/mucommander/default.nix rename to pkgs/by-name/mu/mucommander/package.nix index 0a6ca746caee..c97b2605e5b2 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/by-name/mu/mucommander/package.nix @@ -1,24 +1,22 @@ -{ lib -, stdenv -, fetchFromGitHub -, gradle_7 -, makeWrapper -, jdk -, gsettings-desktop-schemas +{ + lib, + stdenv, + fetchFromGitHub, + gradle, + makeWrapper, + jdk, + gsettings-desktop-schemas, }: -let - gradle = gradle_7; -in stdenv.mkDerivation (finalAttrs: { pname = "mucommander"; - version = "1.3.0-1"; + version = "1.5.2-1"; src = fetchFromGitHub { owner = "mucommander"; repo = "mucommander"; rev = finalAttrs.version; - sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw="; + sha256 = "sha256-J1paBXlAGe2eKMg4wvaXTzMIiSMFIJ1XIAaKrfOwQLc="; }; postPatch = '' @@ -28,7 +26,10 @@ stdenv.mkDerivation (finalAttrs: { --replace "revision = git.head().id" "revision = '${finalAttrs.version}'" ''; - nativeBuildInputs = [ gradle makeWrapper ]; + nativeBuildInputs = [ + gradle + makeWrapper + ]; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 2f2a54d36fca..1aaf189dc2c1 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -11,17 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "music-player"; - version = "0.2.0-alpha.14-unstable-2024-08-24"; + version = "0.2.0-alpha.14-unstable-2024-10-02"; src = fetchFromGitHub { owner = "tsirysndr"; repo = "music-player"; - # No patch for 0.2.0, diff patch has a big size, temporarily until the next release - rev = "cf01ae4d2dcf5c804559250f2c7f922d870ae26d"; - hash = "sha256-8C8uFnXSBalLD2MUgzzfg4ylvTVecyPJOSUri5jbvkM="; + rev = "cbf03c3f2f0f9baca831b08ec27d9b31438faa3d"; + hash = "sha256-BG0MU6IdFQX+C4BxTZlq5I7a4BQmUTvwAQALw5/UPBE="; }; - cargoHash = "sha256-JmyuA5p6/7jtNuOMWuAuspYYid+dGOeollIlS0DRCIE="; + cargoHash = "sha256-t/jdVTdmaJk8Sb43XEuVCKa4kSR+ZrIEmMQKWeVpB70="; nativeBuildInputs = [ @@ -40,11 +39,11 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.AudioUnit ]; - meta = with lib; { + meta = { description = "Extensible music player daemon written in Rust"; homepage = "https://github.com/tsirysndr/music-player"; changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "music-player"; }; diff --git a/pkgs/by-name/mv/mvt/package.nix b/pkgs/by-name/mv/mvt/package.nix new file mode 100644 index 000000000000..21659483fa3c --- /dev/null +++ b/pkgs/by-name/mv/mvt/package.nix @@ -0,0 +1,51 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mvt"; + pyproject = true; + version = "2.5.4"; + + src = fetchFromGitHub { + owner = "mvt-project"; + repo = "mvt"; + rev = "refs/tags/v${version}"; + hash = "sha256-xDUjyvOsiweRqibTe7V8I/ABeaahCoR/d5w23qixp9A"; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + adb-shell + appdirs + click + cryptography + libusb1 + iosbackup + packaging + pyahocorasick + pyyaml + requests + rich + simplejson + tld + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + pytest-mock + stix2 + ]; + + meta = { + description = "Tool to facilitate the consensual forensic analysis of Android and iOS devices"; + homepage = "https://docs.mvt.re/en/latest/"; + # https://github.com/mvt-project/mvt/blob/main/LICENSE + license = lib.licenses.unfree; + changelog = "https://github.com/mvt-project/mvt/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index 1c4d655efd4b..4e2128a3ef1b 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.4.2"; + version = "8.4.3"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-Vlenjchr8L8iJ+CwX43losRHqBahEv+ib6cAg7y+mBQ="; + hash = "sha256-eslWTEeAIvcwBf+Ju7QPZ7OB/AbVUYQWvf/sdeYluBg="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index 60d0c2b972a7..5f2eeb6492b2 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "oidc-agent"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "indigo-dc"; repo = pname; rev = "v${version}"; - hash = "sha256-OW0hCDVC+AqmXP1dQK/7lnXeG8RbXzFLbKLEvc/8spY="; + hash = "sha256-Vj/YoZpbiV8psU70i3SIKJM/qPQYuy96ogEhT8cG7RU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix index 03396d94b1a6..ddfa5723bbbb 100644 --- a/pkgs/by-name/pa/parallel-disk-usage/package.nix +++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "parallel-disk-usage"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "KSXGitHub"; repo = pname; rev = version; - hash = "sha256-2w+A2ZpmLPBSj9odGh8QWAadE6e2XPJmBZwl6ZT6bSc="; + hash = "sha256-BeTidzXcCSe2IEXHAPpG9ZZJV/l/g09gtlZ9JNOuvsw="; }; - cargoHash = "sha256-WwWNAF0iKFZJ8anvXUJwXo8xw5pCNVO7RcAMyA1R4wE="; + cargoHash = "sha256-rATv8Bg9g2vVyTWCjGPaBtvVgtqQCSs/RurvKmafG/8="; meta = with lib; { description = "Highly parallelized, blazing fast directory tree analyzer"; diff --git a/pkgs/by-name/pa/paup/package.nix b/pkgs/by-name/pa/paup-cli/package.nix similarity index 97% rename from pkgs/by-name/pa/paup/package.nix rename to pkgs/by-name/pa/paup-cli/package.nix index 62bb5206587a..12796245bced 100644 --- a/pkgs/by-name/pa/paup/package.nix +++ b/pkgs/by-name/pa/paup-cli/package.nix @@ -9,7 +9,7 @@ }: stdenvNoCC.mkDerivation { - pname = "paup"; + pname = "paup-cli"; version = "4.0a168"; src = fetchurl { diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 4ae7590aec37..e5da7fbc37ef 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.4.0"; + version = "2.4.1"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -16,12 +16,15 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-jK6ap/beiqAtZXVNqPB3zV8R2Kfc3LhqJBvFlWYIfb4="; + hash = "sha256-QONnIElYz8UjyLICSm2QGZME5jx+l2Zw4r7kwHW8YEM="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; propagatedBuildInputs = with python3Packages; [ aiofiles ]; + pythonRelaxDeps = [ + "aiofiles" + ]; postInstall = '' # file has shebang but cant be run due to a relative import, has proper entrypoint in /bin diff --git a/pkgs/by-name/re/recutils/package.nix b/pkgs/by-name/re/recutils/package.nix index e96375f6a0a4..61f6f60def04 100644 --- a/pkgs/by-name/re/recutils/package.nix +++ b/pkgs/by-name/re/recutils/package.nix @@ -4,6 +4,16 @@ , bc , check , curl + +, withEncryption ? true +, libgcrypt +, libgpg-error + +, withUuid ? true +, libuuid + +, withBashBuiltins ? true +, bash }: stdenv.mkDerivation rec { @@ -17,8 +27,20 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.cc.isClang "format"; + configureFlags = + lib.optionals withBashBuiltins [ + "--with-bash-headers=${bash.dev}/include/bash" + ]; + buildInputs = [ curl + ] ++ lib.optionals withEncryption [ + libgpg-error.dev + libgcrypt.dev + ] ++ lib.optionals withUuid [ + libuuid + ] ++ lib.optionals withBashBuiltins [ + bash.dev ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix new file mode 100644 index 000000000000..eecc8e3e57b0 --- /dev/null +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + riffdiff, + testers, +}: + +rustPlatform.buildRustPackage rec { + pname = "riffdiff"; + version = "3.3.6"; + + src = fetchFromGitHub { + owner = "walles"; + repo = "riff"; + rev = "refs/tags/${version}"; + hash = "sha256-qXFSO2VIPaGnB+5Wp/u0FTcKnpcMLxW6uNykKL681lU="; + }; + + cargoHash = "sha256-i6/wa2/ogyLwLBdIXqTYdJX9+SFf+p7Zm2j2Q3mje6w="; + + passthru = { + tests.version = testers.testVersion { package = riffdiff; }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Diff filter highlighting which line parts have changed"; + homepage = "https://github.com/walles/riff"; + changelog = "https://github.com/walles/riff/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + johnpyp + getchoo + ]; + mainProgram = "riff"; + }; +} diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index 0390df3e0519..225a5dfb1b8f 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "sby"; - version = "0.45"; + version = "0.46"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "sby"; rev = "yosys-${version}"; - hash = "sha256-HRQ5ZL0w3GLUySTFekE/T/VlxJLFIQQr0bW8l7rp/zs="; + hash = "sha256-LVfHSVMrAKImD1y6icQSSfOSt9khZfOKK+lXhxdvRb4="; }; nativeBuildInputs = [ bash ]; diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix index 56cc5ba18bb8..fee6a28bb4e5 100644 --- a/pkgs/by-name/sc/scitokens-cpp/package.nix +++ b/pkgs/by-name/sc/scitokens-cpp/package.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "scitokens-cpp"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "scitokens"; repo = "scitokens-cpp"; - rev = "v1.1.1"; - hash = "sha256-G3z9DYYWCNeA/rufNHQP3SwT5WS2AvUWm1rd8lx6XxA="; + rev = "v1.1.2"; + hash = "sha256-87mV1hyoUI/pWzRXaI051H3+FN5TXcachhgAPTtQYHg="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 4c9c443ee8d6..5fe138d19420 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-Fe84rggb539MJXkbJqQRemToTLyX61BbXtoDRUuds8k="; + hash = "sha256-FHkZqbbJTQz+gIOgpMiak9u4ZOY/7r+1+if74LHLw/c="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index e0e2a004e6d7..c6c83ca298cd 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -1,26 +1,14 @@ { lib, - overrideSDK, stdenv, - darwin, fetchFromGitHub, - testers, nix-update-script, + apple-sdk_15, + versionCheckHook, }: let inherit (stdenv.hostPlatform) system; - inherit (darwin.apple_sdk_11_0.frameworks) - AppKit - Carbon - CoreAudio - CoreWLAN - CoreVideo - DisplayServices - IOKit - MediaRemote - SkyLight - ; target = { @@ -28,10 +16,8 @@ let "x86_64-darwin" = "x86"; } .${system} or (throw "Unsupported system: ${system}"); - - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; version = "2.21.0"; @@ -43,15 +29,7 @@ stdenv'.mkDerivation (finalAttrs: { }; buildInputs = [ - AppKit - Carbon - CoreAudio - CoreWLAN - CoreVideo - DisplayServices - IOKit - MediaRemote - SkyLight + apple-sdk_15 ]; makeFlags = [ target ]; @@ -65,14 +43,11 @@ stdenv'.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - version = "sketchybar-v${finalAttrs.version}"; - }; + passthru.updateScript = nix-update-script { }; - updateScript = nix-update-script { }; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; meta = { description = "Highly customizable macOS status bar replacement"; diff --git a/pkgs/by-name/sl/slweb/package.nix b/pkgs/by-name/sl/slweb/package.nix index ceabcd001d1b..337d8a8e454d 100644 --- a/pkgs/by-name/sl/slweb/package.nix +++ b/pkgs/by-name/sl/slweb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "slweb"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromSourcehut { owner = "~strahinja"; repo = "slweb"; rev = "v${finalAttrs.version}"; - hash = "sha256-AJg8qgbNUKizU0uyTnq9EviIXOUuaGvQowLAyTWhGTY="; + hash = "sha256-TS87rFmK6IZbyj+11Oi/lHepa3MDebYILVLLLAgNEdc="; }; postPatch = '' diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock index e310f97d2622..3bc79f2f32b2 100644 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ b/pkgs/by-name/ta/tabby/Cargo.lock @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "aim-downloader" -version = "0.18.0" +version = "0.19.0" dependencies = [ "async-stream", "clap", @@ -1691,7 +1691,7 @@ dependencies = [ [[package]] name = "hash-ids" -version = "0.18.0" +version = "0.19.0" [[package]] name = "hashbrown" @@ -1875,7 +1875,7 @@ dependencies = [ [[package]] name = "http-api-bindings" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-openai", @@ -2538,7 +2538,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "llama-cpp-server" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-openai", @@ -3066,7 +3066,7 @@ dependencies = [ [[package]] name = "ollama-api-bindings" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-stream", @@ -4980,7 +4980,7 @@ dependencies = [ [[package]] name = "tabby" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "assert-json-diff", @@ -5030,7 +5030,7 @@ dependencies = [ [[package]] name = "tabby-common" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-trait", @@ -5058,7 +5058,7 @@ dependencies = [ [[package]] name = "tabby-crawler" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-stream", @@ -5077,7 +5077,7 @@ dependencies = [ [[package]] name = "tabby-db" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "assert_matches", @@ -5095,7 +5095,7 @@ dependencies = [ [[package]] name = "tabby-db-macros" -version = "0.18.0" +version = "0.19.0" dependencies = [ "quote", "syn 2.0.66", @@ -5103,10 +5103,11 @@ dependencies = [ [[package]] name = "tabby-download" -version = "0.18.0" +version = "0.19.0" dependencies = [ "aim-downloader", "anyhow", + "serial_test 3.1.1", "tabby-common", "tokio-retry", "tracing", @@ -5114,7 +5115,7 @@ dependencies = [ [[package]] name = "tabby-git" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "assert_matches", @@ -5135,7 +5136,7 @@ dependencies = [ [[package]] name = "tabby-index" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-stream", @@ -5177,7 +5178,7 @@ dependencies = [ [[package]] name = "tabby-index-cli" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "clap", @@ -5189,7 +5190,7 @@ dependencies = [ [[package]] name = "tabby-inference" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-openai", @@ -5206,7 +5207,7 @@ dependencies = [ [[package]] name = "tabby-schema" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "async-trait", @@ -5231,7 +5232,7 @@ dependencies = [ [[package]] name = "tabby-webserver" -version = "0.18.0" +version = "0.19.0" dependencies = [ "anyhow", "argon2", diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 03179482b4d8..725cbb669f66 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -13,17 +13,15 @@ llama-cpp, + apple-sdk_15, autoAddDriverRunpath, + versionCheckHook, + cudaSupport ? config.cudaSupport, - rocmSupport ? config.rocmSupport, - - darwin, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64, - # one of [ null "cpu" "rocm" "cuda" "metal" ]; acceleration ? null, - versionCheckHook, }: let @@ -33,7 +31,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.18.0"; + version = "0.19.0"; availableAccelerations = flatten [ (optional cudaSupport "cuda") @@ -106,19 +104,9 @@ let # TODO(ghthor): some of this can be removed darwinBuildInputs = [ llamaccpPackage ] - ++ optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Foundation - Accelerate - CoreVideo - CoreGraphics - ] - ++ optionals enableMetal [ - Metal - MetalKit - ] - ); + ++ optionals stdenv.hostPlatform.isDarwin ([ + apple-sdk_15 + ]); cudaBuildInputs = [ llamaccpPackage ]; rocmBuildInputs = [ llamaccpPackage ]; @@ -132,7 +120,7 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; rev = "refs/tags/v${version}"; - hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g="; + hash = "sha256-RK81gQ5IUzZ4HXJbKBr5bqayH0Xip6ZVAgdMwqP+kx8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ta/tartufo/package.nix b/pkgs/by-name/ta/tartufo/package.nix index 1ee23cf2516c..92cd656bd7e0 100644 --- a/pkgs/by-name/ta/tartufo/package.nix +++ b/pkgs/by-name/ta/tartufo/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "tartufo"; - version = "5.0.1"; + version = "5.0.2"; pyproject = true; src = fetchFromGitHub { owner = "godaddy"; repo = "tartufo"; rev = "refs/tags/v${version}"; - hash = "sha256-mwwenmSCxnzD2DLf1a/dsQjwJ2GetMgRGj/noqWJ/E0="; + hash = "sha256-s7gqGvOnie7lGlpW3wfd8igWfowxwg9mftRjiHnvedc="; }; pythonRelaxDeps = [ "tomlkit" ]; diff --git a/pkgs/by-name/to/toot/package.nix b/pkgs/by-name/to/toot/package.nix new file mode 100644 index 000000000000..0f1b5ce9ed1b --- /dev/null +++ b/pkgs/by-name/to/toot/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + nixosTests, +}: + +python3Packages.buildPythonApplication rec { + pname = "toot"; + version = "0.45.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ihabunek"; + repo = "toot"; + rev = "refs/tags/${version}"; + hash = "sha256-xBpqB81LSOq+eGVwEL6fAxBR8UXCduf5syzCdwydW4Q="; + }; + + nativeCheckInputs = with python3Packages; [ pytest ]; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3Packages; [ + requests + beautifulsoup4 + wcwidth + urwid + urwidgets + tomlkit + click + pillow + term-image + ]; + + checkPhase = '' + runHook preCheck + py.test + runHook postCheck + ''; + + passthru.tests.toot = nixosTests.pleroma; + + meta = { + description = "Mastodon CLI interface"; + mainProgram = "toot"; + homepage = "https://github.com/ihabunek/toot"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + matthiasbeyer + aleksana + ]; + }; +} diff --git a/pkgs/by-name/tu/tuisky/package.nix b/pkgs/by-name/tu/tuisky/package.nix new file mode 100644 index 000000000000..76a045ebd204 --- /dev/null +++ b/pkgs/by-name/tu/tuisky/package.nix @@ -0,0 +1,50 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "tuisky"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "sugyan"; + repo = "tuisky"; + rev = "refs/tags/v${version}"; + hash = "sha256-TsxERi+xxWk6SJwIxMgqiYCAUrDLzZXPL1xQCIXtUr0="; + }; + + cargoHash = "sha256-p6Yqg4HdkviuOuYMGEPXyySduiS47aPOshr5iXE+f+A="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "TUI client for bluesky"; + homepage = "https://github.com/sugyan/tuisky"; + changelog = "https://github.com/sugyan/tuisky/blob/${lib.removePrefix "refs/tags/" src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "tuisky"; + }; +} diff --git a/pkgs/by-name/ty/typstyle/Cargo.lock b/pkgs/by-name/ty/typstyle/Cargo.lock index 95e6754fefa7..e56057a5e1dc 100644 --- a/pkgs/by-name/ty/typstyle/Cargo.lock +++ b/pkgs/by-name/ty/typstyle/Cargo.lock @@ -3915,7 +3915,7 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.12.0" +version = "0.12.1" dependencies = [ "anyhow", "clap", diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index cbd73dfc8ef7..665bb01daf05 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -2,24 +2,19 @@ lib, rustPlatform, fetchFromGitHub, - pkg-config, - libgit2, - zlib, - stdenv, - darwin, nix-update-script, versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-jrhxOtaawZ2vCiK8BQ9G09HTC5F6cnEK/Ji567xYfXw="; + hash = "sha256-liGGnaUhi3/d4SxpiG/P1wp89brqUJaLyo9/KJvPf9I="; }; cargoLock = { @@ -29,22 +24,6 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = - [ - libgit2 - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - # Disabling tests requiring network access checkFlags = [ "--skip=e2e" diff --git a/pkgs/by-name/ue/uesave/package.nix b/pkgs/by-name/ue/uesave/package.nix new file mode 100644 index 000000000000..ce4d23fb138d --- /dev/null +++ b/pkgs/by-name/ue/uesave/package.nix @@ -0,0 +1,32 @@ +{ + fetchFromGitHub, + lib, + rustPlatform, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "uesave"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "trumank"; + repo = "uesave-rs"; + rev = "v${version}"; + hash = "sha256-9gOOSLejVfR1KJMhcNuKDkuTOvPC6sNG8xQOZlt8NxI="; + }; + + cargoHash = "sha256-U6RzSS2j6FK70OHlmWmHZZYT3UB0+Hi+uLofLy+XtGQ="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + + meta = { + maintainers = with lib.maintainers; [ xddxdd ]; + description = "Reading and writing Unreal Engine save files (commonly referred to as GVAS)"; + homepage = "https://github.com/trumank/uesave-rs"; + license = lib.licenses.mit; + mainProgram = "uesave"; + }; +} diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix new file mode 100644 index 000000000000..414a2eb1456b --- /dev/null +++ b/pkgs/by-name/up/upscayl/package.nix @@ -0,0 +1,54 @@ +{ + appimageTools, + fetchurl, + lib, + makeWrapper, +}: + +let + pname = "upscayl"; + version = "2.11.5"; + + src = fetchurl { + url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; + hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + nativeBuildInputs = [ + makeWrapper + ]; + + extraPkgs = pkgs: [ + pkgs.vulkan-headers + pkgs.vulkan-loader + ]; + + extraInstallCommands = '' + mkdir -p $out/share/{applications,pixmaps} + + cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' + + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + ''; + + meta = with lib; { + description = "Free and Open Source AI Image Upscaler"; + homepage = "https://upscayl.github.io/"; + maintainers = with maintainers; [ icy-thought ]; + license = licenses.agpl3Plus; + platforms = platforms.linux; + mainProgram = "upscayl"; + }; +} diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/by-name/va/valent/package.nix similarity index 70% rename from pkgs/applications/misc/valent/default.nix rename to pkgs/by-name/va/valent/package.nix index 2b3ad209759a..951ebb5a6069 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/by-name/va/valent/package.nix @@ -1,37 +1,38 @@ -{ lib -, stdenv -, fetchFromGitHub -, desktop-file-utils -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, vala -, evolution-data-server-gtk4 -, gdk-pixbuf -, glib -, glib-networking -, gnutls -, gst_all_1 -, json-glib -, libadwaita -, libpeas2 -, libphonenumber -, libportal-gtk4 -, pipewire -, pulseaudio -, tinysparql +{ + lib, + stdenv, + fetchFromGitHub, + desktop-file-utils, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + vala, + evolution-data-server-gtk4, + gdk-pixbuf, + glib, + glib-networking, + gnutls, + gst_all_1, + json-glib, + libadwaita, + libpeas2, + libphonenumber, + libportal-gtk4, + pipewire, + pulseaudio, + tinysparql, }: stdenv.mkDerivation (finalAttrs: { pname = "valent"; - version = "1.0.0.alpha.46"; + version = "1.0.0.alpha.46-unstable-2024-10-26"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "v${finalAttrs.version}"; - hash = "sha256-DpDHU1l8Pot0RwVR1rL9fIhMHo18eo7nTecnSa3hG2E="; + rev = "165a2791d4bf3e7dee69e3dd7885dbe4948265b9"; + hash = "sha256-7klvOvwyAg+Xno6zWo8UByjaS9OkOuCceuZcAIEgdyU="; fetchSubmodules = true; }; @@ -63,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - "-Dplugin_bluez=true" + (lib.mesonBool "plugin_bluez" true) ]; meta = { @@ -88,7 +89,11 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; + license = with lib.licenses; [ + gpl3Plus + cc0 + cc-by-sa-30 + ]; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index bfe935453489..aa43c93ba98e 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} - mv dist/mac*/Vesktop.App $out/Applications + mv dist/mac*/Vesktop.app $out/Applications/Vesktop.app '' + '' runHook postInstall diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 65845f5dc131..41db1bf4a379 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -27,19 +27,25 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ="; }; - buildInputs = [ - llvmPackages.libcxx - llvmPackages.libunwind - musl - xorg.libX11 - ]; + buildInputs = + [ + llvmPackages.libcxx + llvmPackages.libunwind + ] + ++ lib.optionals (stdenv.isLinux) [ + musl # not used, but requires extra work to remove + xorg.libX11 # for the clipboardy package + ]; - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - nodejs - pnpm_9.configHook - ]; + nativeBuildInputs = + [ + makeWrapper + nodejs + pnpm_9.configHook + ] + ++ lib.optionals (stdenv.isLinux) [ + autoPatchelfHook + ]; # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process # so I simply removed it @@ -91,10 +97,10 @@ stdenv.mkDerivation (finalAttrs: { ryand56 ]; mainProgram = "wrangler"; - # cpp is required for building workerd. - # workerd is used for some wrangler subcommands. - # non-linux platforms may experience errors - # on certain subcommands due to this issue. - platforms = [ "x86_64-linux" ]; + # Tunneling and other parts of wrangler, which require workerd won't run on + # other systems where precompiled binaries are not provided, but most + # commands are will still work everywhere. + # Potential improvements: build workerd from source instead. + inherit (nodejs.meta) platforms; }; }) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 90afc4ddbcbd..ce0533d0200d 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -12,7 +12,7 @@ let argset = { pname = "xonsh"; - version = "0.18.3"; + version = "0.18.4"; pyproject = true; # PyPI package ships incomplete tests @@ -20,7 +20,7 @@ let owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${argset.version}"; - hash = "sha256-MJTsYnuFENHLDDMIWcs0IRcBmWs4XyfDWDG7AY2P6cM="; + hash = "sha256-L5UwmwwM42E3l+sIBwXgMf/q5r22cUoRbE2cqM09bZA="; }; nativeBuildInputs = with pythonPackages; [ diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 20f071050dff..ca1ecd8f8bf9 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "twemoji-color-font"; - version = "15.0.3"; + version = "15.1.0"; # We fetch the prebuilt font because building it takes 1.5 hours on hydra. # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 src = fetchurl { url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-3mpcuQ3BaEyPmCMOrfWLA4XE9UkfbAgoIwF9nKHT7Ho="; + sha256 = "sha256-yKUwLuTkwhiM54Xt2ExQxhagf26Z/huRrsuk4ds0EpU="; }; dontBuild = true; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 19eec9d5db40..99c0b6a99a25 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-Y9lQr/viA3AaPUwHaidQtWIRuucBfNj1naUI77CaGv4="; + hash = "sha256-3yVEYGvIJKZwguIBGCbnoc3nrwzLW6RX6Tf+AYw85+Q="; }; strictDeps = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f265f86fb963..bd174babd549 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2781,18 +2781,32 @@ self: super: { postgrest = lib.pipe super.postgrest [ # 2023-12-20: New version needs extra dependencies (addBuildDepends [ self.extra self.fuzzyset_0_2_4 self.cache self.timeit ]) - # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580 + # 2022-12-02: Too strict bounds. doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { - version = "12.0.2"; + version = "12.0.3"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-fpGeL8R6hziEtIgHUMfWLF7JAjo3FDYQw3xPSeQH+to="; + hash = "sha256-peXM5/K034Phcy5vNhc5AT3/9oGXohVogFN9gRsSosY="; }; }) + # 2024-11-03: Needed for the patch below. Can be dropped after updating to 12.2+. + (appendPatches [ + (fetchpatch { + url = "https://github.com/PostgREST/postgrest/commit/d311fb17c46ad2ab9064c7aba1954d3500ef0e54.patch"; + hash = "sha256-O/bBm93V6GIPSB5dwhNUFgX3vXA01LPJapZQoeJmbIU="; + }) + ]) + # 2024-11-03: Fixes build on aarch64-darwin. Can be removed after updating to 13+. + (appendPatches [ + (fetchpatch { + url = "https://github.com/PostgREST/postgrest/commit/c045b261c4f7d2c2514e858120950be6b3ddfba8.patch"; + hash = "sha256-6SeteL5sb+/K1y3f9XL7yNzXDdD1KQp91RNP4kutSLE="; + }) + ]) ]; # Too strict bounds on hspec < 2.11 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 279fedc18701..53acd512a0ef 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -651,6 +651,8 @@ package-maintainers: - minio-hs - smtp-mail - pdftotext + wolfgangwalther: + - postgrest unsupported-platforms: Allure: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index aa47d771c7e3..d4fb631042f5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -246337,6 +246337,7 @@ self: { description = "REST API for any Postgres database"; license = lib.licenses.mit; mainProgram = "postgrest"; + maintainers = [ lib.maintainers.wolfgangwalther ]; }) {}; "postgrest-ws" = callPackage diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index b7f766825106..b0cf041a07b8 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "24.10"; + version = "24.11"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-BUR/zFYOaEoa4pUUgzIcrWrpDX4AP9cySIelralb/t0="; + sha256 = "sha256-fmJh2DZNAjqqTDFt5b2HZ5oeS7VkvPy1a8gr59OQSUo="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix deleted file mode 100644 index 54360cad4ed9..000000000000 --- a/pkgs/development/libraries/libsnark/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: - -stdenv.mkDerivation rec { - pname = "libsnark"; - version = "unstable-2018-01-15"; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; - - cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ] - ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ]; - - src = fetchFromGitHub { - rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; - owner = "scipr-lab"; - repo = "libsnark"; - sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; - fetchSubmodules = true; - }; - - meta = with lib; { - description = "C++ library for zkSNARKs"; - homepage = "https://github.com/scipr-lab/libsnark"; - license = licenses.mit; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index d8746f72f3b5..9e64441af558 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am ''; + CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration"; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index dbed519662fe..bb42421c96d8 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg="; }; + patches = [ + # Fix build with latest ffmpeg + # Backport of https://github.com/any1/neatvnc/commit/7e008743bf872598b4fcdb2a821041064ce5dd01 + # FIXME: remove in next update + ./fix-ffmpeg.patch + ]; + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch b/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch new file mode 100644 index 000000000000..f4839945d104 --- /dev/null +++ b/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch @@ -0,0 +1,13 @@ +diff --git a/src/h264-encoder.c b/src/h264-encoder.c +index 6ad0262..f4a4421 100644 +--- a/src/h264-encoder.c ++++ b/src/h264-encoder.c +@@ -547,7 +547,7 @@ struct h264_encoder* h264_encoder_create(uint32_t width, uint32_t height, + goto codec_context_failure; + + self->codec_ctx->hw_frames_ctx = +- av_buffer_ref(self->filter_out->inputs[0]->hw_frames_ctx); ++ av_buffer_ref(av_buffersink_get_hw_frames_ctx(self->filter_out)); + + AVDictionary *opts = NULL; + av_dict_set_int(&opts, "async_depth", 1, 0); diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 98129c5944d1..21372f8aea4c 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -18,6 +18,7 @@ # runtime , flatbuffers +, gflags , level-zero , libusb1 , libxml2 @@ -48,6 +49,7 @@ let python = python3Packages.python.withPackages (ps: with ps; [ cython + distutils pybind11 setuptools sphinx @@ -58,14 +60,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2024.2.0"; + version = "2024.4.1"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-HiKKvmqgbwW625An+Su0EOHqVrP18yvG2aOzrS0jWr4="; + hash = "sha256-v0PPGFUHCGNWdlTff40Ol2NvaYglb/+L/zZAQujk6lk="; }; outputs = [ @@ -117,6 +119,7 @@ stdenv.mkDerivation rec { # features (cmakeBool "ENABLE_INTEL_CPU" stdenv.hostPlatform.isx86_64) + (cmakeBool "ENABLE_INTEL_NPU" false) # undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' (cmakeBool "ENABLE_JS" false) (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) @@ -138,6 +141,7 @@ stdenv.mkDerivation rec { buildInputs = [ flatbuffers + gflags level-zero libusb1 libxml2 diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index a3a633af6c94..dd5375ef8d56 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.5.57"; + version = "1.6.30"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-ZBjv/Z98il8EMZe88fMKSi1YjeOZ8jEh7OxYDKUTMpY="; + sha256 = "sha256-2gzpQbaFLUox4EMo8RO3bwVjhsm239w5hv4Z0UuS1Qs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index bcbd29bcc963..ea8efbcad1b1 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -12,6 +12,7 @@ setuptools, # dependencies + huggingface-hub, numpy, packaging, psutil, @@ -30,14 +31,14 @@ buildPythonPackage rec { pname = "accelerate"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-XVJqyhDSUPQDHdaB6GDxHhuC6EWCSZNArjzyLpvhQHI="; + hash = "sha256-GBNe4zomy8dmfvYrk/9Q77Z6r+JJA+2dgAhJx2opqAc="; }; buildInputs = [ llvmPackages.openmp ]; @@ -45,6 +46,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ + huggingface-hub numpy packaging psutil @@ -113,6 +115,31 @@ buildPythonPackage rec { "test_init_trackers" "test_log" "test_log_with_tensor" + + # After enabling MPS in pytorch, these tests started failing + "test_accelerated_optimizer_step_was_skipped" + "test_auto_wrap_policy" + "test_autocast_kwargs" + "test_automatic_loading" + "test_backward_prefetch" + "test_can_resume_training" + "test_can_resume_training_checkpoints_relative_path" + "test_can_resume_training_with_folder" + "test_can_unwrap_model_fp16" + "test_checkpoint_deletion" + "test_cpu_offload" + "test_cpu_ram_efficient_loading" + "test_grad_scaler_kwargs" + "test_invalid_registration" + "test_map_location" + "test_mixed_precision" + "test_mixed_precision_buffer_autocast_override" + "test_project_dir" + "test_project_dir_with_config" + "test_sharding_strategy" + "test_state_dict_type" + "test_with_save_limit" + "test_with_scheduler" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # RuntimeError: torch_shm_manager: execl failed: Permission denied diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index c79904c5d05f..a3cdc57503be 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -6,38 +6,35 @@ fetchFromGitHub, pint, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "aiocomelit"; - version = "0.9.1"; + version = "0.10.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-3r9DyvzqtQ88VwKCghAC9nn5kXbBzbR8drTFTnWC/bM="; + hash = "sha256-5XyCc/OMFA99qwVjsVLCA4NedvcDBSSBzG8TvSg4sk0="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ aiohttp + colorlog pint ]; nativeCheckInputs = [ - colorlog + pytest-cov-stub pytestCheckHook ]; @@ -46,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to control Comelit Simplehome"; homepage = "https://github.com/chemelli74/aiocomelit"; - changelog = "https://github.com/chemelli74/aiocomelit/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/chemelli74/aiocomelit/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index f858eb07be9a..6bb934508214 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "atom"; - version = "0.10.5"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nucleic"; repo = "atom"; rev = "refs/tags/${version}"; - hash = "sha256-wRVmCyqMwDs1thnRXYH6z1a/qCubw8CVUhaEMqLtiSM="; + hash = "sha256-3Xk4CM8Cnkc0lIdjJUYs/6UTqqpPALrUa3DpKD40og8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index c6afff489d65..50b7f6602fe5 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "autarco"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-autarco"; rev = "refs/tags/v${version}"; - hash = "sha256-7Q6kvJxhds0myu3pMOLSCJKwoGPzHjNSo8H3ctgFvjM="; + hash = "sha256-zSqIEtQucrrAFEY7pBJ14Cevq8xbcGOheEmEE7Jd4qk="; }; pythonRelaxDeps = [ "orjson" ]; diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index eb38597a222f..feb21946c0ec 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bring-api"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "miaucl"; repo = "bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-eXT7H2GGNpSo58eK5f6b5eLWYgjxEV8iLgaVTpkt9EU="; + hash = "sha256-wPplw1yYJ5xR2CzhDXXjhMFJ7swGf2AARI4a1kE8MRw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix index 2ecb45c3a73a..f924a13dc253 100644 --- a/pkgs/development/python-modules/cronsim/default.nix +++ b/pkgs/development/python-modules/cronsim/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cronsim"; - version = "2.5"; + version = "2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cuu508"; repo = "cronsim"; rev = "refs/tags/${version}"; - hash = "sha256-TSVFkMCMmrMXaPJPPNjIML+z98i1iIYuKH7hHiZnJkg="; + hash = "sha256-WJ3v2cqAKZkXp1u8xJ0aFuyHPq0gn24DRxpnq5cH/90="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/daltonlens/default.nix b/pkgs/development/python-modules/daltonlens/default.nix new file mode 100644 index 000000000000..5410f4d2ab2e --- /dev/null +++ b/pkgs/development/python-modules/daltonlens/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + setuptools-git, + numpy, + pillow, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "daltonlens"; + version = "0.1.5"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-T7fXlRdFtcVw5WURPqZhCmulUi1ZnCfCXgcLtTHeNas="; + }; + + build-system = [ + setuptools + setuptools-git + ]; + + dependencies = [ + numpy + pillow + ]; + + pythonImportsCheck = [ + "daltonlens" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/" + ]; + + disabledTestPaths = [ + "tests/test_generate.py" + ]; + + meta = { + description = "R&D companion package for the desktop application DaltonLens"; + homepage = "https://github.com/DaltonLens/DaltonLens-Python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index e0b4b3907c37..78d31ec97224 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, httpx, poetry-core, + pytest-cov-stub, pytest-mock, pytest-vcr, pytestCheckHook, @@ -14,35 +15,29 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "7.0.0"; + version = "7.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "browniebroke"; repo = "deezer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-V4M6qRTa7XKbl962Z3y70+v3YCeW65VjeSIv/1Oxnws="; + hash = "sha256-d+cN6f6jw8D+noxyYl/TpDAkeTb8Krt+r0/Ai65cvdU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=deezer" "" - ''; - build-system = [ poetry-core ]; - dependencies = [ - httpx - tornado - ]; + dependencies = [ httpx ]; nativeCheckInputs = [ environs + pytest-cov-stub pytest-mock pytest-vcr pytestCheckHook + tornado ]; pythonImportsCheck = [ "deezer" ]; diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index 8cc15b7210c7..37336cddb4a7 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -7,12 +7,12 @@ pythonOlder, nix-update-script, setuptools, - paup, + paup-cli, paupIntegration ? false, }: let - paupPath = if paupIntegration then lib.getExe paup else "NONE"; + paupPath = if paupIntegration then lib.getExe paup-cli else "NONE"; in buildPythonPackage rec { pname = "dendropy"; diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 218db0fe558d..7197be7d2336 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -10,6 +10,7 @@ setuptools-changelog-shortener, setuptools, tomli, + nix-update-script, }: buildPythonPackage rec { @@ -41,6 +42,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "devpi_common" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/devpi/devpi"; description = "Utilities jointly used by devpi-server and devpi-client"; diff --git a/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix new file mode 100644 index 000000000000..55664730b5e7 --- /dev/null +++ b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + elasticsearch-dsl, + django, + pythonOlder, + elastic-transport, + setuptools, +}: + +buildPythonPackage rec { + pname = "django-elasticsearch-dsl"; + version = "8.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "django-es"; + repo = "django-elasticsearch-dsl"; + rev = "refs/tags/${version}"; + hash = "sha256-GizdFOM4UjI870XdE33D7uXHXkuv/bLYbyi9yyNjti8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + elasticsearch-dsl + elastic-transport + ]; + + # Tests require running Elasticsearch daemon + doCheck = false; + + pythonImportsCheck = [ "django_elasticsearch_dsl" ]; + + meta = { + description = "Wrapper around elasticsearch-dsl-py for Django models"; + homepage = "https://github.com/sabricot/django-elasticsearch-dsl"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 7778ecd9ca88..e84c2321aaee 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -65,9 +65,11 @@ buildPythonPackage rec { disabledTests = [ # KeyError and AssertionError + "test_annex_keys" + "test_batchjson_metadata" + "test_file_tree" "test_jsonprocess_annex_metadata_batch" "test_process_annex_metadata_batch" - "test_batchjson_metadata" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 4cd4dc257fda..73ece34efc16 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -39,6 +39,15 @@ buildPythonPackage rec { pytestCheckHook ]; + # including_default_value_fields was deprecated, the new version is called + # always_print_fields_with_no_presence + postPatch = '' + substituteInPlace "tests/unit/gapic/iot_v1/test_device_manager.py" \ + --replace-fail "including_default_value_fields" "always_print_fields_with_no_presence" + substituteInPlace "google/cloud/iot_v1/services/device_manager/transports/rest.py" \ + --replace-fail "including_default_value_fields" "always_print_fields_with_no_presence" + ''; + disabledTests = [ # requires credentials "test_list_device_registries" diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 034300b2b318..b6c427894587 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "6.1.3"; + version = "6.1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-ZMzgIRLwMXvJ+JIz3BUps7CTaV/MhfjZYqkEbgHQh+A="; + hash = "sha256-xW0PoWMLOtg6+0oqRJxhraNrkndvlbSzyActxjnvUmw="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index cc43f6d6dff2..1af2e93f7bc6 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-oXHAJ9rrNLJMJKO2MEGVuOq7tvEMdIJW7Tz+GYBjg88="; + hash = "sha256-6VnDtb08p5Zc5fQ4Ok4Dj/y1UDTGPXkYKb0zpaw4qWI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/iosbackup/default.nix b/pkgs/development/python-modules/iosbackup/default.nix new file mode 100644 index 000000000000..41904c36336c --- /dev/null +++ b/pkgs/development/python-modules/iosbackup/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + nskeyedunarchiver, + pycrypto, +}: + +buildPythonPackage rec { + pname = "iosbackup"; + version = "0.9.925"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "iOSbackup"; + hash = "sha256-M1Rakknls/qq3x7ngv5r3823D64N77oazuM2pl+T0co="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pycrypto + nskeyedunarchiver + ]; + + pythonImportsCheck = [ "iOSbackup" ]; + + meta = { + description = "Reads and extracts files from password-encrypted iOS backups"; + homepage = "https://github.com/avibrazil/iOSbackup"; + license = lib.licenses.lgpl2Only; + maintainers = with lib.maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/development/python-modules/lancedb/Cargo.lock b/pkgs/development/python-modules/lancedb/Cargo.lock index 9fd06f89770b..b3a01fc8f1df 100644 --- a/pkgs/development/python-modules/lancedb/Cargo.lock +++ b/pkgs/development/python-modules/lancedb/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -161,6 +161,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + [[package]] name = "arrow" version = "52.2.0" @@ -307,7 +313,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.5.0", + "indexmap 2.6.0", "lexical-core", "num", "serde", @@ -385,9 +391,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "flate2", "futures-core", @@ -447,7 +453,7 @@ dependencies = [ "derive_builder", "futures", "rand", - "reqwest 0.12.7", + "reqwest", "reqwest-eventsource", "secrecy", "serde", @@ -476,18 +482,18 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -519,15 +525,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.6" +version = "1.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" +checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6" dependencies = [ "aws-credential-types", "aws-runtime", @@ -593,9 +599,9 @@ dependencies = [ [[package]] name = "aws-sdk-dynamodb" -version = "1.45.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f" +checksum = "ab0ade000608877169533a54326badd6b5a707d2faf876cfc3976a7f9d7e5329" dependencies = [ "aws-credential-types", "aws-runtime", @@ -616,9 +622,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f7cb482caa5444d445c94417b9c74e49a849beb09ede4f2f4c3c15f8157387" +checksum = "e33590e8d45206fdc4273ded8a1f292bcceaadd513037aa790fc67b237bc30ee" dependencies = [ "aws-credential-types", "aws-runtime", @@ -638,9 +644,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.49.0" +version = "1.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e518950d4ac43508c8bfc2fe4e24b0752d99eab80134461d5e162dcda0214b55" +checksum = "e2f2a62020f3e06f9b352b2a23547f6e1d110b6bf1e18a6b588ae36114eaf6e2" dependencies = [ "ahash", "aws-credential-types", @@ -673,9 +679,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e" +checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb" dependencies = [ "aws-credential-types", "aws-runtime", @@ -695,9 +701,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364" +checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0" dependencies = [ "aws-credential-types", "aws-runtime", @@ -717,9 +723,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce" +checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765" dependencies = [ "aws-credential-types", "aws-runtime", @@ -852,9 +858,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" +checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -896,9 +902,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd", "bytes", @@ -1113,13 +1119,13 @@ dependencies = [ [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1130,9 +1136,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytes-utils" @@ -1162,7 +1168,7 @@ dependencies = [ "byteorder", "gemm", "half", - "memmap2 0.9.4", + "memmap2 0.9.5", "num-traits", "num_cpus", "rand", @@ -1232,9 +1238,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "jobserver", "libc", @@ -1586,7 +1592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1616,7 +1622,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1627,7 +1633,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1644,10 +1650,24 @@ dependencies = [ ] [[package]] -name = "datafusion" -version = "40.0.0" +name = "dashmap" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "datafusion" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" dependencies = [ "ahash", "arrow", @@ -1657,24 +1677,26 @@ dependencies = [ "async-trait", "bytes", "chrono", - "dashmap", + "dashmap 6.1.0", + "datafusion-catalog", "datafusion-common", "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", "datafusion-functions", "datafusion-functions-aggregate", - "datafusion-functions-array", + "datafusion-functions-nested", "datafusion-optimizer", "datafusion-physical-expr", "datafusion-physical-expr-common", + "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-sql", "futures", "glob", "half", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "num_cpus", @@ -1683,7 +1705,7 @@ dependencies = [ "paste", "pin-project-lite", "rand", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "tempfile", "tokio", "url", @@ -1691,10 +1713,24 @@ dependencies = [ ] [[package]] -name = "datafusion-common" -version = "40.0.0" +name = "datafusion-catalog" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367" +checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" +dependencies = [ + "arrow-schema", + "async-trait", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" dependencies = [ "ahash", "arrow", @@ -1708,27 +1744,27 @@ dependencies = [ "libc", "num_cpus", "object_store", - "sqlparser 0.47.0", + "sqlparser 0.49.0", ] [[package]] name = "datafusion-common-runtime" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352" +checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1" dependencies = [ "tokio", ] [[package]] name = "datafusion-execution" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" dependencies = [ "arrow", "chrono", - "dashmap", + "dashmap 6.1.0", "datafusion-common", "datafusion-expr", "futures", @@ -1743,9 +1779,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" dependencies = [ "ahash", "arrow", @@ -1755,18 +1791,19 @@ dependencies = [ "datafusion-common", "paste", "serde_json", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "strum", "strum_macros 0.26.4", ] [[package]] name = "datafusion-functions" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" +checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" dependencies = [ "arrow", + "arrow-buffer", "base64 0.22.1", "chrono", "datafusion-common", @@ -1784,9 +1821,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77" +checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" dependencies = [ "ahash", "arrow", @@ -1797,14 +1834,14 @@ dependencies = [ "datafusion-physical-expr-common", "log", "paste", - "sqlparser 0.47.0", + "sqlparser 0.49.0", ] [[package]] -name = "datafusion-functions-array" -version = "40.0.0" +name = "datafusion-functions-nested" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831" +checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" dependencies = [ "arrow", "arrow-array", @@ -1819,13 +1856,14 @@ dependencies = [ "itertools 0.12.1", "log", "paste", + "rand", ] [[package]] name = "datafusion-optimizer" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" dependencies = [ "arrow", "async-trait", @@ -1834,7 +1872,7 @@ dependencies = [ "datafusion-expr", "datafusion-physical-expr", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "paste", @@ -1843,9 +1881,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5" +checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" dependencies = [ "ahash", "arrow", @@ -1863,7 +1901,7 @@ dependencies = [ "half", "hashbrown 0.14.5", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "paste", @@ -1873,9 +1911,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" dependencies = [ "ahash", "arrow", @@ -1886,10 +1924,22 @@ dependencies = [ ] [[package]] -name = "datafusion-physical-plan" -version = "40.0.0" +name = "datafusion-physical-optimizer" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a" +checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" +dependencies = [ + "datafusion-common", + "datafusion-execution", + "datafusion-physical-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-physical-plan" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" dependencies = [ "ahash", "arrow", @@ -1909,7 +1959,7 @@ dependencies = [ "futures", "half", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "once_cell", @@ -1921,9 +1971,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889" +checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" dependencies = [ "arrow", "arrow-array", @@ -1932,7 +1982,7 @@ dependencies = [ "datafusion-expr", "log", "regex", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "strum", ] @@ -1984,38 +2034,38 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "derive_builder" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "derive_builder_macro" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2058,7 +2108,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2151,7 +2201,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2163,7 +2213,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2342,9 +2392,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -2356,6 +2406,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -2398,9 +2454,9 @@ dependencies = [ [[package]] name = "fsst" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26212c1db7eee3ec0808bd99107cf62ba4d3edd3489df601e2d0c73c5d739aec" +checksum = "6b1d2a2da56a2bf2dea67567e50c066c9323db26c78d9051b98e552b236f15fe" dependencies = [ "rand", ] @@ -2413,9 +2469,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2428,9 +2484,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2438,15 +2494,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2455,9 +2511,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2476,26 +2532,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-timer" @@ -2505,9 +2561,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2664,9 +2720,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -2697,7 +2753,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -2716,7 +2772,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -2754,6 +2810,17 @@ dependencies = [ "rayon", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "heck" version = "0.4.1" @@ -2883,9 +2950,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2969,7 +3036,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", @@ -2979,22 +3046,25 @@ dependencies = [ [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", - "hyper 0.14.30", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", ] [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -3005,7 +3075,6 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing", ] @@ -3021,9 +3090,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3071,12 +3140,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -3124,9 +3193,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -3217,18 +3286,18 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b" dependencies = [ "wasm-bindgen", ] [[package]] name = "lance" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a427160737dd74d2d4f566f3111027edc63927106541d173459d010209371c42" +checksum = "4c4a02330c306f5cdb4ae1f54f413f81710fe2bb8d0f09e10898f16ff28906ae" dependencies = [ "arrow", "arrow-arith", @@ -3246,7 +3315,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion", "datafusion-functions", "datafusion-physical-expr", @@ -3285,9 +3354,9 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f1cfebe08c64b1edabe9b6ccd6f8ea1bc6349d0870d47f2db8cdadf02ab8e2" +checksum = "164a8935b3b093f5e7a4935de8e115ac738d193bf3fe94aa0e9ea3a0f5f5c30d" dependencies = [ "arrow-array", "arrow-buffer", @@ -3303,9 +3372,9 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243aa2323dee6fcab6bb9bb3a21ae8f040c98a5de9bbfb7ab8484a036176185a" +checksum = "b02e4e248390e11b092e546fb1117d50b0d278b178b82d8438cda26eb65edd75" dependencies = [ "arrow-array", "arrow-buffer", @@ -3341,9 +3410,9 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a69d039f93a43477245b51a8f1ce58a1f41485f8ded946f53031a11ded8c97" +checksum = "e7a7597b224cf428762187f7b70d775b7e29d65b90c9df82e677de85e88f165a" dependencies = [ "arrow", "arrow-array", @@ -3368,10 +3437,11 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b713e49ce6039d0ca0f88e8ded66ee64d89c42f85107bc9e684fbff41386a65" +checksum = "b7cf8fa33073f9ad592638f522103eca150594e4648721e7c17a308334d9ccdd" dependencies = [ + "arrayref", "arrow", "arrow-arith", "arrow-array", @@ -3380,6 +3450,7 @@ dependencies = [ "arrow-data", "arrow-schema", "arrow-select", + "bytemuck", "bytes", "fsst", "futures", @@ -3390,10 +3461,12 @@ dependencies = [ "lance-core", "log", "num-traits", + "paste", "prost", "prost-build", "prost-types", "rand", + "seq-macro", "snafu", "tokio", "tracing", @@ -3402,9 +3475,9 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0eaebd40c77f8f06a0cbadcd07f9344aea616dcd4d8712f6cad81c2eda14d5" +checksum = "d21247b1f8579ebf0d7f938d930c0c89d2b35cd503fc3b94adfb8bf5eb40acc3" dependencies = [ "arrow-arith", "arrow-array", @@ -3438,9 +3511,9 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ad5a42b9a4909749ee62fc94c64d19259c2aadca7c8446f42ee8e9c7a097d3" +checksum = "fecf46eef5a2d4b1a44b2d01b98fb45e7923fe9471d8d2f907f485e12dddac4e" dependencies = [ "arrow", "arrow-array", @@ -3491,9 +3564,9 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f334f2c279f80f19803141cf7f98c6b82e6ace3c7f75c8740f1df7a73bb720" +checksum = "48071e1d45f4dda04d8660d6378a7e23825faae46b4717170dbf1fd0ba583e2c" dependencies = [ "arrow", "arrow-arith", @@ -3532,9 +3605,9 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa019770a0afb287360a4ea919cff482371ad43318607d1e797534c819bf356" +checksum = "5944b11e2fef3b992c5609eb20b6336de622f468c2ae4d40f746498f910551f5" dependencies = [ "arrow-array", "arrow-ord", @@ -3557,9 +3630,9 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fa39bede133d578431db3f77b0c2c63fcaff12a088000648014c27266830a2" +checksum = "98106c7a29e810cb08b943bc3039a706577183366ffc27a4933c3a12e3a8334c" dependencies = [ "arrow", "arrow-array", @@ -3598,9 +3671,9 @@ dependencies = [ [[package]] name = "lance-testing" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4eae0993cda6130cfd75d3d9d11830dd4ec8d4c66cf81def939837c419d4bc" +checksum = "4cdadadeae5c76fc70b0345ea2248f9ce4b7944d7b0df5db9385f7c0d30fcac6" dependencies = [ "arrow-array", "arrow-schema", @@ -3611,7 +3684,7 @@ dependencies = [ [[package]] name = "lancedb" -version = "0.10.0-beta.1" +version = "0.11.0-beta.1" dependencies = [ "arrow", "arrow-array", @@ -3632,10 +3705,13 @@ dependencies = [ "candle-nn", "candle-transformers", "chrono", + "datafusion-common", "datafusion-physical-plan", "futures", "half", "hf-hub", + "http 1.1.0", + "http-body 1.0.1", "lance", "lance-datafusion", "lance-encoding", @@ -3645,6 +3721,7 @@ dependencies = [ "lance-testing", "lazy_static", "log", + "moka", "num-traits", "object_store", "pin-project", @@ -3653,7 +3730,7 @@ dependencies = [ "rand", "random_word", "regex", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "serde_with", @@ -3668,7 +3745,7 @@ dependencies = [ [[package]] name = "lancedb-jni" -version = "0.4.18" +version = "0.10.0" dependencies = [ "arrow", "arrow-schema", @@ -3684,7 +3761,7 @@ dependencies = [ [[package]] name = "lancedb-node" -version = "0.10.0-beta.1" +version = "0.11.0-beta.1" dependencies = [ "arrow-array", "arrow-ipc", @@ -3709,7 +3786,7 @@ dependencies = [ [[package]] name = "lancedb-nodejs" -version = "0.0.0" +version = "0.11.0-beta.1" dependencies = [ "arrow-ipc", "futures", @@ -3722,13 +3799,12 @@ dependencies = [ [[package]] name = "lancedb-python" -version = "0.13.0" +version = "0.14.0" dependencies = [ "arrow", "env_logger 0.10.2", "futures", "lancedb", - "lzma-sys", "pin-project", "pyo3", "pyo3-asyncio-0-21", @@ -3814,9 +3890,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libloading" @@ -3884,27 +3960,27 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] name = "lz4" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a231296ca742e418c43660cb68e082486ff2538e8db432bc818580f3965025ed" +checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" dependencies = [ "lz4-sys", ] [[package]] name = "lz4-sys" -version = "1.11.0" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -3992,9 +4068,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", "stable_deref_trait", @@ -4104,7 +4180,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4143,9 +4219,9 @@ checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "napi" -version = "2.16.10" +version = "2.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04409e8c2d61995696e44d2181b79b68c1dd41f7e24a17cde60bbd9f54ddddef" +checksum = "53575dfa17f208dd1ce3a2da2da4659aae393b256a472f2738a8586a6c4107fd" dependencies = [ "bitflags 2.6.0", "ctor", @@ -4172,7 +4248,7 @@ dependencies = [ "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4187,7 +4263,7 @@ dependencies = [ "quote", "regex", "semver 1.0.23", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4394,7 +4470,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4405,9 +4481,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -4431,9 +4507,9 @@ dependencies = [ "percent-encoding", "quick-xml", "rand", - "reqwest 0.12.7", + "reqwest", "ring", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "serde", "serde_json", "snafu", @@ -4445,9 +4521,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oneshot" @@ -4500,7 +4576,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4628,7 +4704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.6.0", ] [[package]] @@ -4671,22 +4747,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4713,9 +4789,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "planus" @@ -4821,7 +4897,7 @@ dependencies = [ "comfy-table", "either", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "num-traits", "once_cell", "polars-arrow", @@ -4919,7 +4995,7 @@ dependencies = [ "either", "hashbrown 0.14.5", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "memchr", "num-traits", "polars-arrow", @@ -5063,11 +5139,11 @@ dependencies = [ "ahash", "bytemuck", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "num-traits", "once_cell", "polars-error", - "raw-cpuid 11.1.0", + "raw-cpuid 11.2.0", "rayon", "smartstring", "stacker", @@ -5093,9 +5169,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -5119,7 +5195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5133,9 +5209,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -5167,7 +5243,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.77", + "syn 2.0.79", "tempfile", ] @@ -5181,7 +5257,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5307,7 +5383,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5320,7 +5396,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config 0.21.2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5341,9 +5417,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -5360,7 +5436,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "socket2 0.5.7", "thiserror", "tokio", @@ -5377,7 +5453,7 @@ dependencies = [ "rand", "ring", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "slab", "thiserror", "tinyvec", @@ -5483,9 +5559,9 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.1.0" +version = "11.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" dependencies = [ "bitflags 2.6.0", ] @@ -5544,14 +5620,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -5569,9 +5645,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -5581,9 +5657,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -5598,60 +5674,20 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "async-compression", - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "reqwest" -version = "0.12.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" -dependencies = [ "base64 0.22.1", "bytes", + "encoding_rs", "futures-core", "futures-util", "h2 0.4.6", @@ -5660,25 +5696,29 @@ dependencies = [ "http-body-util", "hyper 1.4.1", "hyper-rustls 0.27.3", + "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", "mime_guess", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.13", - "rustls-native-certs 0.7.3", - "rustls-pemfile 2.1.3", + "rustls 0.23.14", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", + "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls 0.26.0", "tokio-util", "tower-service", @@ -5702,7 +5742,7 @@ dependencies = [ "mime", "nom", "pin-project-lite", - "reqwest 0.12.7", + "reqwest", "thiserror", ] @@ -5820,9 +5860,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "log", "once_cell", @@ -5845,19 +5885,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.3", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-native-certs" version = "0.8.0" @@ -5865,7 +5892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -5882,19 +5909,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -5950,9 +5976,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -6021,9 +6047,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -6076,7 +6102,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6114,15 +6140,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -6132,14 +6158,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6200,9 +6226,9 @@ dependencies = [ [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "siphasher" @@ -6341,9 +6367,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.47.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", "sqlparser_derive", @@ -6357,7 +6383,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6443,7 +6469,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6456,7 +6482,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6478,9 +6504,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -6498,12 +6524,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.1" @@ -6521,7 +6541,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6554,20 +6574,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -6604,7 +6624,7 @@ dependencies = [ "lru", "lz4_flex", "measure_time", - "memmap2 0.9.4", + "memmap2 0.9.5", "num_cpus", "once_cell", "oneshot", @@ -6740,9 +6760,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", @@ -6762,22 +6782,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6892,7 +6912,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6921,7 +6941,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "tokio", ] @@ -6958,36 +6978,15 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "toml_datetime", "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" @@ -7013,7 +7012,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7027,9 +7026,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" [[package]] name = "try-lock" @@ -7064,9 +7063,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -7076,9 +7075,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -7103,15 +7102,15 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode_categories" @@ -7142,7 +7141,7 @@ dependencies = [ "log", "native-tls", "once_cell", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "serde", "serde_json", @@ -7240,9 +7239,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887" dependencies = [ "cfg-if", "once_cell", @@ -7251,24 +7250,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d" dependencies = [ "cfg-if", "js-sys", @@ -7278,9 +7277,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7288,28 +7287,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -7320,9 +7319,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9" dependencies = [ "js-sys", "wasm-bindgen", @@ -7330,9 +7329,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -7633,23 +7632,13 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wyz" version = "0.5.1" @@ -7691,7 +7680,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] @@ -7713,7 +7702,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7733,7 +7722,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] @@ -7753,7 +7742,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "displaydoc", - "indexmap 2.5.0", + "indexmap 2.6.0", "num_enum", "thiserror", ] diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index e1dcbd2a1a22..950a67d1d334 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, darwin, libiconv, + openssl, pkg-config, protobuf, attrs, @@ -28,14 +29,14 @@ buildPythonPackage rec { pname = "lancedb"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lancedb"; rev = "refs/tags/python-v${version}"; - hash = "sha256-6E20WgyoEALdxmiOfgq89dCkqovvIMzc/wy+kvjDWwU="; + hash = "sha256-lw2tZ26Py6JUxuetaokJKnxOv/WoLK4spxssLKxvxJA="; }; buildAndTestSubdir = "python"; @@ -50,13 +51,14 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config + protobuf rustPlatform.cargoSetupHook ]; buildInputs = [ libiconv - protobuf + openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; @@ -96,14 +98,21 @@ buildPythonPackage rec { pytestFlagsArray = [ "-m 'not slow'" ]; - disabledTests = [ - # require tantivy which is not packaged in nixpkgs - "test_basic" + disabledTests = + [ + # require tantivy which is not packaged in nixpkgs + "test_basic" - # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' - # https://github.com/lancedb/lancedb/issues/1539 - "test_polars" - ]; + # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' + # https://github.com/lancedb/lancedb/issues/1539 + "test_polars" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fail with darwin sandbox + "test_async_remote_db" + "test_http_error" + "test_retry_error" + ]; disabledTestPaths = [ # touch the network diff --git a/pkgs/development/python-modules/librespot/default.nix b/pkgs/development/python-modules/librespot/default.nix index 628f2ab1922f..642b67cdac31 100644 --- a/pkgs/development/python-modules/librespot/default.nix +++ b/pkgs/development/python-modules/librespot/default.nix @@ -6,7 +6,9 @@ protobuf, pycryptodomex, pyogg, + pythonOlder, requests, + setuptools, websocket-client, zeroconf, }: @@ -14,7 +16,9 @@ buildPythonPackage rec { pname = "librespot"; version = "0.0.9"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "kokarare1212"; @@ -23,10 +27,13 @@ buildPythonPackage rec { hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM="; }; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + pythonRelaxDeps = true; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml protobuf pycryptodomex diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 466d750da078..89f32222a762 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.48.6"; + version = "1.51.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-7Or9rZGehejSYv0/5M7PNPNtoSt28DSHBiWXcJutD2I="; + hash = "sha256-jC5BiD4JFfsiyNOSlY6rH6l3Dk6AKKXJ8+Q6MTGYTpM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/medallion/default.nix b/pkgs/development/python-modules/medallion/default.nix new file mode 100644 index 000000000000..04972dc1eb06 --- /dev/null +++ b/pkgs/development/python-modules/medallion/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + flask, + flask-httpauth, + pytz, + six, + pymongo, +}: + +buildPythonPackage rec { + pname = "medallion"; + version = "3.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oasis-open"; + repo = "cti-taxii-server"; + rev = "refs/tags/v${version}"; + hash = "sha256-+fWifWi/XR6MSOLhWXn2CFpItVdkOpzQItlrZkjapAk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + flask + flask-httpauth + pymongo + pytz + six + ]; + + pythonImportsCheck = [ "medallion" ]; + + meta = with lib; { + description = "Minimal implementation of a TAXII 2.1 Server in Python"; + homepage = "https://medallion.readthedocs.io/en/latest/"; + changelog = "https://github.com/oasis-open/cti-taxii-server/blob/v${version}/CHANGES.txt"; + license = licenses.bsd3; + maintainers = with maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index b285141cf06a..e2bc68074ee4 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.5.3"; + version = "2.5.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-6U/oAVqzNsKFgNtQPzDovoWR23J0Ax0ssCIUjjRVeR4="; + hash = "sha256-A1C+xkQFjoEMKyz9S7T/GzZYrcznpi/9yjBmue1Ahu4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix index dc76a6d6ea09..c4d400cae107 100644 --- a/pkgs/development/python-modules/mobly/default.nix +++ b/pkgs/development/python-modules/mobly/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -47,6 +48,13 @@ buildPythonPackage rec { pytz ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # cannot access /usr/bin/pgrep from the sandbox + "test_stop_standing_subproc" + "test_stop_standing_subproc_and_descendants" + "test_stop_standing_subproc_without_pipe" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/pkgs/development/python-modules/nskeyedunarchiver/default.nix b/pkgs/development/python-modules/nskeyedunarchiver/default.nix new file mode 100644 index 000000000000..ed4e5ac35f5c --- /dev/null +++ b/pkgs/development/python-modules/nskeyedunarchiver/default.nix @@ -0,0 +1,29 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "nskeyedunarchiver"; + version = "1.2"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "NSKeyedUnArchiver"; + hash = "sha256-OZWPGH8ggYYKxeg6CGyft6ZM9Yx/43z7YylzXlQcTVg="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "NSKeyedUnArchiver" ]; + + meta = { + description = "Unserializes plist data into a usable Python dict"; + homepage = "https://github.com/avibrazil/NSKeyedUnArchiver"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index dec5ef583222..f81ba4f5ec4d 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "photutils"; - version = "2.0.0"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "photutils"; rev = "refs/tags/${version}"; - hash = "sha256-slrg1iByOhW1jiSG7nKHWj0ZSOP8v3LhCCr+DLLspKM="; + hash = "sha256-gXtC6O8rXBBa8VMuqxshnJieAahv3bCY2C1BXNmJxb4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix index 7aebaf432c00..a55d6d6740e6 100644 --- a/pkgs/development/python-modules/pillow-jpls/default.nix +++ b/pkgs/development/python-modules/pillow-jpls/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { pypaBuildFlags = [ "-C" - "cmake.args='--preset=sysdeps'" + "cmake.args=--preset=sysdeps" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix index 8b7c70dc79eb..ce5216428dd7 100644 --- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix +++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pulsectl-asyncio"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mhthies"; repo = "pulsectl-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-VmogNphVZNJSUKUqp7xADRl78Ooofhl1YYrtYz5MBYc="; + hash = "sha256-lHVLrkFdNM8Y4t6TcXYnX8sQ4COrW3vV2sTDWeI4xZU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index bfd0b7507f57..f9310c711e5f 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.15.1"; + version = "1.16.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-4f6LhQU9lxMEPIHszHQTL55bYD8gnoBzPXlV6v0i650="; + hash = "sha256-eymmeWuqFfyJ1EOsjVF3VBHZseWwbcQNRYxWyFdrSKI="; }; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/pylance/Cargo.lock b/pkgs/development/python-modules/pylance/Cargo.lock index 781104da1ac5..b0871f8c68c4 100644 --- a/pkgs/development/python-modules/pylance/Cargo.lock +++ b/pkgs/development/python-modules/pylance/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arc-swap" @@ -90,9 +90,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -150,7 +150,7 @@ dependencies = [ "chrono", "chrono-tz", "half", - "hashbrown", + "hashbrown 0.14.5", "num", ] @@ -347,9 +347,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "bzip2", "flate2", @@ -467,7 +467,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -504,13 +504,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -536,15 +536,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.6" +version = "1.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" +checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6" dependencies = [ "aws-credential-types", "aws-runtime", @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "aws-sdk-dynamodb" -version = "1.45.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f" +checksum = "ab0ade000608877169533a54326badd6b5a707d2faf876cfc3976a7f9d7e5329" dependencies = [ "aws-credential-types", "aws-runtime", @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e" +checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb" dependencies = [ "aws-credential-types", "aws-runtime", @@ -654,9 +654,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364" +checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0" dependencies = [ "aws-credential-types", "aws-runtime", @@ -676,9 +676,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce" +checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765" dependencies = [ "aws-credential-types", "aws-runtime", @@ -816,9 +816,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd", "bytes", @@ -1024,9 +1024,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytes-utils" @@ -1092,9 +1092,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "jobserver", "libc", @@ -1332,7 +1332,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1340,9 +1354,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e" +checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" dependencies = [ "ahash", "arrow", @@ -1354,24 +1368,26 @@ dependencies = [ "bytes", "bzip2", "chrono", - "dashmap", + "dashmap 6.1.0", + "datafusion-catalog", "datafusion-common", "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", "datafusion-functions", "datafusion-functions-aggregate", - "datafusion-functions-array", + "datafusion-functions-nested", "datafusion-optimizer", "datafusion-physical-expr", "datafusion-physical-expr-common", + "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-sql", "flate2", "futures", "glob", "half", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "itertools 0.12.1", "log", @@ -1393,10 +1409,24 @@ dependencies = [ ] [[package]] -name = "datafusion-common" -version = "40.0.0" +name = "datafusion-catalog" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367" +checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" +dependencies = [ + "arrow-schema", + "async-trait", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" dependencies = [ "ahash", "arrow", @@ -1405,7 +1435,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "hashbrown", + "hashbrown 0.14.5", "instant", "libc", "num_cpus", @@ -1416,26 +1446,26 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352" +checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1" dependencies = [ "tokio", ] [[package]] name = "datafusion-execution" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" dependencies = [ "arrow", "chrono", - "dashmap", + "dashmap 6.1.0", "datafusion-common", "datafusion-expr", "futures", - "hashbrown", + "hashbrown 0.14.5", "log", "object_store", "parking_lot", @@ -1446,9 +1476,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" dependencies = [ "ahash", "arrow", @@ -1465,11 +1495,12 @@ dependencies = [ [[package]] name = "datafusion-functions" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" +checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" dependencies = [ "arrow", + "arrow-buffer", "base64 0.22.1", "blake2", "blake3", @@ -1477,7 +1508,7 @@ dependencies = [ "datafusion-common", "datafusion-execution", "datafusion-expr", - "hashbrown", + "hashbrown 0.14.5", "hex", "itertools 0.12.1", "log", @@ -1491,9 +1522,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77" +checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" dependencies = [ "ahash", "arrow", @@ -1508,10 +1539,10 @@ dependencies = [ ] [[package]] -name = "datafusion-functions-array" -version = "40.0.0" +name = "datafusion-functions-nested" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831" +checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" dependencies = [ "arrow", "arrow-array", @@ -1526,13 +1557,14 @@ dependencies = [ "itertools 0.12.1", "log", "paste", + "rand", ] [[package]] name = "datafusion-optimizer" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" dependencies = [ "arrow", "async-trait", @@ -1540,7 +1572,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-physical-expr", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "itertools 0.12.1", "log", @@ -1550,9 +1582,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5" +checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" dependencies = [ "ahash", "arrow", @@ -1568,7 +1600,7 @@ dependencies = [ "datafusion-expr", "datafusion-physical-expr-common", "half", - "hashbrown", + "hashbrown 0.14.5", "hex", "indexmap", "itertools 0.12.1", @@ -1580,23 +1612,35 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" dependencies = [ "ahash", "arrow", "datafusion-common", "datafusion-expr", - "hashbrown", + "hashbrown 0.14.5", "rand", ] [[package]] -name = "datafusion-physical-plan" -version = "40.0.0" +name = "datafusion-physical-optimizer" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a" +checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" +dependencies = [ + "datafusion-common", + "datafusion-execution", + "datafusion-physical-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-physical-plan" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" dependencies = [ "ahash", "arrow", @@ -1615,7 +1659,7 @@ dependencies = [ "datafusion-physical-expr-common", "futures", "half", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "itertools 0.12.1", "log", @@ -1628,9 +1672,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889" +checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" dependencies = [ "arrow", "arrow-array", @@ -1645,9 +1689,9 @@ dependencies = [ [[package]] name = "datafusion-substrait" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434e52fbff22e6e04e6c787f603a6aba4961a7e249a29c743c5d4f609ec2dcef" +checksum = "bf0a0055aa98246c79f98f0d03df11f16cb7adc87818d02d4413e3f3cdadbbee" dependencies = [ "arrow-buffer", "async-recursion", @@ -1874,9 +1918,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -1909,7 +1953,7 @@ dependencies = [ [[package]] name = "fsst" -version = "0.17.0" +version = "0.18.2" dependencies = [ "rand", ] @@ -1922,9 +1966,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1937,9 +1981,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1947,15 +1991,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1964,9 +2008,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -1998,32 +2042,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2062,9 +2106,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -2143,6 +2187,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "heck" version = "0.4.1" @@ -2266,9 +2316,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2352,7 +2402,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", @@ -2362,9 +2412,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -2375,7 +2425,6 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing", ] @@ -2391,9 +2440,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2424,12 +2473,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -2475,9 +2524,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -2561,7 +2610,7 @@ dependencies = [ [[package]] name = "lance" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-arith", @@ -2579,7 +2628,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion", "datafusion-functions", "datafusion-physical-expr", @@ -2619,7 +2668,7 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-array", "arrow-buffer", @@ -2635,7 +2684,7 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-array", "arrow-buffer", @@ -2671,7 +2720,7 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -2697,7 +2746,7 @@ dependencies = [ [[package]] name = "lance-datagen" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -2712,8 +2761,9 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.17.0" +version = "0.18.2" dependencies = [ + "arrayref", "arrow", "arrow-arith", "arrow-array", @@ -2722,6 +2772,7 @@ dependencies = [ "arrow-data", "arrow-schema", "arrow-select", + "bytemuck", "bytes", "fsst", "futures", @@ -2732,10 +2783,12 @@ dependencies = [ "lance-core", "log", "num-traits", + "paste", "prost 0.12.6", "prost-build 0.12.6", "prost-types 0.12.6", "rand", + "seq-macro", "snafu", "tokio", "tracing", @@ -2744,7 +2797,7 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-arith", "arrow-array", @@ -2778,7 +2831,7 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -2829,7 +2882,7 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-arith", @@ -2868,7 +2921,7 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-array", "arrow-ord", @@ -2891,7 +2944,7 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -3006,9 +3059,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libm" @@ -3064,7 +3117,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -3130,9 +3183,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -3352,9 +3405,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -3380,7 +3433,7 @@ dependencies = [ "rand", "reqwest", "ring", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "serde", "serde_json", "snafu", @@ -3392,9 +3445,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oneshot" @@ -3494,7 +3547,7 @@ dependencies = [ "flate2", "futures", "half", - "hashbrown", + "hashbrown 0.14.5", "lz4_flex", "num", "num-bigint", @@ -3629,22 +3682,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3672,9 +3725,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "polling" @@ -3709,9 +3762,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -3745,7 +3798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3816,7 +3869,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.77", + "syn 2.0.79", "tempfile", ] @@ -3843,7 +3896,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3877,7 +3930,7 @@ dependencies = [ [[package]] name = "pylance" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -3964,7 +4017,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3977,7 +4030,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3998,9 +4051,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -4017,7 +4070,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "socket2 0.5.7", "thiserror", "tokio", @@ -4034,7 +4087,7 @@ dependencies = [ "rand", "ring", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "slab", "thiserror", "tinyvec", @@ -4155,9 +4208,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -4175,9 +4228,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -4187,9 +4240,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -4204,9 +4257,9 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "regress" @@ -4214,15 +4267,15 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", "memchr", ] [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", @@ -4243,9 +4296,9 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.13", - "rustls-native-certs 0.7.3", - "rustls-pemfile 2.1.3", + "rustls 0.23.14", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", @@ -4366,9 +4419,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "log", "once_cell", @@ -4391,19 +4444,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.3", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-native-certs" version = "0.8.0" @@ -4411,7 +4451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -4428,19 +4468,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -4486,9 +4525,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -4523,7 +4562,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4557,9 +4596,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -4597,7 +4636,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4608,7 +4647,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4632,7 +4671,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4805,9 +4844,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "sqlparser" -version = "0.47.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", "sqlparser_derive", @@ -4821,7 +4860,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4867,7 +4906,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4889,7 +4928,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "syn 2.0.77", + "syn 2.0.79", "typify", "walkdir", ] @@ -4913,9 +4952,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -5086,9 +5125,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -5103,9 +5142,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", @@ -5154,22 +5193,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5273,7 +5312,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5292,7 +5331,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "tokio", ] @@ -5321,27 +5360,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" @@ -5367,7 +5385,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5418,9 +5436,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" [[package]] name = "try-lock" @@ -5469,7 +5487,7 @@ dependencies = [ "semver", "serde", "serde_json", - "syn 2.0.77", + "syn 2.0.79", "thiserror", "unicode-ident", ] @@ -5487,7 +5505,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.77", + "syn 2.0.79", "typify-impl", ] @@ -5502,9 +5520,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -5514,24 +5532,24 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unindent" @@ -5561,7 +5579,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "url", "webpki-roots", @@ -5677,7 +5695,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -5711,7 +5729,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5724,9 +5742,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -5747,9 +5765,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -6037,7 +6055,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index d3c81344d2b9..1fba795132bf 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.17.0"; + version = "0.18.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; rev = "refs/tags/v${version}"; - hash = "sha256-E+29CbVNbzmrQnBZt0860IvL4xYZqzE+uzSuKDwgxzg="; + hash = "sha256-CIIZbeRrraTqWronkspDpBVP/Z4JVoaiS5iBIXfsZGg="; }; buildAndTestSubdir = "python"; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index c17df5386938..5a2ff7cd0cd9 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -4,44 +4,40 @@ fetchFromGitHub, setuptools, msgpack, + isPyPy, greenlet, pythonOlder, - isPyPy, + typing-extensions, }: buildPythonPackage rec { pname = "pynvim"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "neovim"; repo = "pynvim"; rev = "refs/tags/${version}"; - hash = "sha256-3LqgKENFzdfCjMlD6Xzv5W23yvIkNMUYo2+LlzKZ3cc="; + hash = "sha256-YVAWu+i2pElq8OhibSqh9ogk+xWDRCZT4niDF/oMnzY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace " + pytest_runner" "" - ''; + build-system = [ setuptools ]; - buildInputs = [ setuptools ]; - - propagatedBuildInputs = [ msgpack ] ++ lib.optionals (!isPyPy) [ greenlet ]; + dependencies = + [ msgpack ] + ++ lib.optionals (!isPyPy) [ greenlet ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; # Tests require pkgs.neovim which we cannot add because of circular dependency doCheck = false; pythonImportsCheck = [ "pynvim" ]; - meta = with lib; { + meta = { description = "Python client for Neovim"; homepage = "https://github.com/neovim/pynvim"; changelog = "https://github.com/neovim/pynvim/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 4392b3cb6012..a5b4d28b4a7d 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -18,14 +18,14 @@ in buildPythonPackage rec { pname = "pyscard"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "LudovicRousseau"; repo = "pyscard"; rev = "refs/tags/${version}"; - hash = "sha256-wlw2QL1vfhXba8ok/URcd9M+F7Sa+ZtekV1w5X24owE="; + hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0="; }; build-system = [ setuptools ]; @@ -37,36 +37,31 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postPatch = - if withApplePCSC then - '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' - else - '' - substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" - substituteInPlace smartcard/scard/winscarddll.c \ - --replace-fail "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; + '' + substituteInPlace pyproject.toml \ + --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]' + '' + + ( + if withApplePCSC then + '' + substituteInPlace src/smartcard/scard/winscarddll.c \ + --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' + else + '' + substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG" + substituteInPlace src/smartcard/scard/winscarddll.c \ + --replace-fail "libpcsclite.so.1" \ + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + '' + ); - preCheck = '' - # remove src module, so tests use the installed module instead - rm -r smartcard - ''; - - disabledTests = [ - # AssertionError - "test_hresult" - "test_low_level" - ]; - - meta = with lib; { + meta = { description = "Smartcard library for python"; homepage = "https://pyscard.sourceforge.io/"; changelog = "https://github.com/LudovicRousseau/pyscard/releases/tag/${version}"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ layus ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ layus ]; }; } diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 13e41ed77a5e..0e396cd4f85c 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytado"; - version = "0.17.6"; + version = "0.17.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; rev = "refs/tags/${version}"; - hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE="; + hash = "sha256-WpGznYNVpis1pM9PRXHnQVev3JW6baUT5J9iPxwd0Uk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 18a4f40289db..63032480164a 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -7,7 +7,6 @@ setuptools-scm, django-configurations, pytest, - pytest-xdist, pytestCheckHook, }: @@ -33,23 +32,18 @@ buildPythonPackage rec { nativeCheckInputs = [ django-configurations - pytest-xdist + # pytest-xidst causes random errors in the form of: django.db.utils.OperationalError: no such table: app_item pytestCheckHook ]; preCheck = '' # bring pytest_django_test module into PYTHONPATH - export PYTHONPATH="$(pwd):$PYTHONPATH" + export PYTHONPATH="$PWD:$PYTHONPATH" # test the lightweight sqlite flavor export DJANGO_SETTINGS_MODULE="pytest_django_test.settings_sqlite" ''; - disabledTests = [ - # AttributeError: type object 'TestLiveServer' has no attribute '_test_settings_before_run' - "test_settings_restored" - ]; - __darwinAllowLocalNetworking = true; meta = with lib; { @@ -57,5 +51,6 @@ buildPythonPackage rec { description = "Pytest plugin for testing of Django applications"; homepage = "https://pytest-django.readthedocs.org/en/latest/"; license = licenses.bsd3; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-lorem/default.nix b/pkgs/development/python-modules/python-lorem/default.nix new file mode 100644 index 000000000000..e60991c79357 --- /dev/null +++ b/pkgs/development/python-modules/python-lorem/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "python-lorem"; + version = "1.3.0.post3"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "python_lorem"; + hash = "sha256-Vw1TKheXg+AkhksnmWUfdIo+Jt7X7m1pS2f0Kfe8pv0="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "lorem" + ]; + + meta = { + description = "Pythonic lorem ipsum generator"; + homepage = "https://github.com/JarryShaw/lorem"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 19678c01938e..6c110d8fb35e 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.6.0"; + version = "2.7.0"; pyproject = true; disabled = isPy27; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xlTqUUF+tUIbULd1B8XR18Kxd7kl2TRKdbp0GoAfi4g="; + hash = "sha256-mxAl4GMyAWtvocc68Ac3z1+W13k9OOK7aQFfB7X0f9c="; }; build-system = [ diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index de3e2f377d88..0b4776b0f383 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.3.2"; + version = "3.3.3"; disabled = pythonOlder "3.8"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; - rev = "v${version}"; - hash = "sha256-1cWjOaL+STrHMux/fc+FaRVQIOMcseznNRcghsV+DtM="; + rev = "refs/tags/v${version}"; + hash = "sha256-gEatTTpRiqtDAn+JtoJuVHPYKmEkc5saw3hy4ZYZfX8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index 4f11691266b3..061394e5fc3f 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.5.2"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hamdanal"; repo = "rich-argparse"; rev = "refs/tags/v${version}"; - hash = "sha256-kHGNjVx3d+JSsN/BpNua2rGD5S5sBfJvh1NyqQnziBI="; + hash = "sha256-ae++npgZ8jZazwARwlPw73uhpQ8IT+7OekNl2vfu4Z0="; }; build-system = [ hatchling ]; @@ -28,11 +28,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # https://github.com/hamdanal/rich-argparse/issues/133 - "test_help_preview_generation" - ]; - pythonImportsCheck = [ "rich_argparse" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 3f17b45e2d20..d2ee15fa36b1 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -4,6 +4,7 @@ cargo, rustPlatform, rustc, + setuptools, setuptools-rust, numpy, fixtures, @@ -12,40 +13,50 @@ libiconv, stdenv, lib, + pytestCheckHook, }: buildPythonPackage rec { pname = "rustworkx"; - version = "0.14.2"; - format = "setuptools"; + version = "0.15.1"; + pyproject = true; src = fetchFromGitHub { owner = "Qiskit"; - repo = pname; + repo = "rustworkx"; rev = version; - hash = "sha256-gck5X6J4Yg5it/YCBsk/yZ5qXg/iwCEbyDIKfBTRxHM="; + hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-FNCa5pshcnsYpjlz6yDITe2k0cHLTybj3rF34qrsRVU="; + hash = "sha256-AgHfCKLna30WERAFGEs8yRxxZHwvLzR+/S+ivwKHXXE="; }; nativeBuildInputs = [ - setuptools-rust rustPlatform.cargoSetupHook cargo rustc ]; + build-system = [ + setuptools + setuptools-rust + ]; + buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - checkInputs = [ + nativeCheckInputs = [ fixtures networkx + pytestCheckHook testtools ]; + preCheck = '' + rm -r rustworkx + ''; + pythonImportsCheck = [ "rustworkx" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 7040e8d57256..159a2dc7090a 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -39,7 +39,7 @@ in buildPythonPackage rec { pname = "scalene"; - version = "1.5.45"; + version = "1.5.46"; pyproject = true; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "plasma-umass"; repo = "scalene"; rev = "v${version}"; - hash = "sha256-0DhoLsXv2tUEkynMkoA14pNxF6GGLe30bfUOii7+PYE="; + hash = "sha256-G+fX0D70aGOmXr/SqaBKkOz3CEHpGqClFFdTeOzRpaw="; }; patches = [ diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index e8fb3446dd95..2281fdcd60fd 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "sensorpush-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-etsrXJn6n9yL0vhiZNnTepCcau50X0t2wPrhZ9R7XL4="; + hash = "sha256-T2sjzQoWWRGAKiMDN29jZ7jZ5/i75qpNCiuVB7VEhJw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/sensoterra/default.nix b/pkgs/development/python-modules/sensoterra/default.nix new file mode 100644 index 000000000000..a592bd652fc3 --- /dev/null +++ b/pkgs/development/python-modules/sensoterra/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "sensoterra"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WfjTOns5OPU8+ufDeFdDGjURhBWUFfw/qRSHQazBL04="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + # Test require network access + doCheck = false; + + pythonImportsCheck = [ "sensoterra" ]; + + meta = { + description = "Query Sensoterra probes using the Customer API"; + homepage = "https://gitlab.com/sensoterra/public/python"; + changelog = "https://gitlab.com/sensoterra/public/python/-/blob/main/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix index cf5b9504012e..433858761261 100644 --- a/pkgs/development/python-modules/signxml/default.nix +++ b/pkgs/development/python-modules/signxml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "signxml"; - version = "3.2.2"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "XML-Security"; repo = "signxml"; rev = "refs/tags/v${version}"; - hash = "sha256-TlOIHYvx1o46nr/3qq45pgeOqmuyWaaTGvOS0Jwz1zs="; + hash = "sha256-ZpboU0N8dD03yHSboMpC+TJvp16StM45Qhn0Hv9+6fg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ certifi cryptography lxml diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix index 2e2640d4d71b..53be565a94ee 100644 --- a/pkgs/development/python-modules/spotifyaio/default.nix +++ b/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-R77bdJidZrsaQZjgCr7OLDab2NpJ10575j8rgmFjn2g="; + hash = "sha256-GSUIotR1uB+KjuVIjsJIIaUFfg9gJ8aIYm+aR8iJT9Y="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/stix2/default.nix b/pkgs/development/python-modules/stix2/default.nix new file mode 100644 index 000000000000..26622eea45b5 --- /dev/null +++ b/pkgs/development/python-modules/stix2/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + haversine, + medallion, + pytz, + rapidfuzz, + requests, + simplejson, + stix2-patterns, + taxii2-client, +}: + +buildPythonPackage rec { + pname = "stix2"; + version = "3.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oasis-open"; + repo = "cti-python-stix2"; + rev = "refs/tags/v${version}"; + hash = "sha256-1bILZUZgPOWmFWRu4p/fmgi4QPEE1lFQH9mxoWd/saI="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pytz + requests + simplejson + stix2-patterns + ]; + + nativeCheckInputs = [ + pytestCheckHook + haversine + medallion + rapidfuzz + taxii2-client + ]; + + disabledTests = [ + # flaky tests + "test_graph_equivalence_with_filesystem_source" + "test_graph_similarity_with_filesystem_source" + "test_object_similarity_prop_scores" + ]; + + pythonImportsCheck = [ "stix2" ]; + + meta = with lib; { + description = "Produce and consume STIX 2 JSON content"; + homepage = "https://stix2.readthedocs.io/en/latest/"; + changelog = "https://github.com/oasis-open/cti-python-stix2/blob/v${version}/CHANGELOG"; + license = licenses.bsd3; + maintainers = with maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix index 7fc432e3ea19..e806a6cc5895 100644 --- a/pkgs/development/python-modules/stringzilla/default.nix +++ b/pkgs/development/python-modules/stringzilla/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "stringzilla"; - version = "3.10.5"; + version = "3.10.7"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "stringzilla"; rev = "refs/tags/v${version}"; - hash = "sha256-E7w6s813OGCld/GRTHMbjVAReTGb37HlB687gP9N9FA="; + hash = "sha256-36W7/PL8nRty8cHuMoTr73tQ4uvtjkwP9lyzNLCuhv0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-36LN9AoAWA//pldmQZtKMrck4EoGUW9G2vzdsRw08SA="; + hash = "sha256-qa03Jd0MMtDwkp2E81MacRMbzD/O7E29BT0tc2OjLiY="; }; build-system = [ diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 9f9cca8b929d..093970206927 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, pillow, pytestCheckHook, pythonOlder, @@ -9,16 +10,20 @@ buildPythonPackage rec { pname = "svg.path"; - version = "6.2"; - format = "setuptools"; + version = "6.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-GiFZ+duJjfk8RjfP08yvfaH9Bz9Z+ppZUMc+RtSqGso="; + src = fetchFromGitHub { + owner = "regebro"; + repo = "svg.path"; + rev = "refs/tags/${version}"; + hash = "sha256-qes6cKw/Ok0WgcPO/NPuREVNUbnlhm82jF90dK7Ay8U="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pillow pytestCheckHook @@ -34,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "SVG path objects and parser"; homepage = "https://github.com/regebro/svg.path"; + changelog = "https://github.com/regebro/svg.path/blob/${version}/CHANGES.txt"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index 92a389512cad..6fd45eef85eb 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -3,30 +3,29 @@ buildPythonPackage, fetchFromGitHub, appdirs, - requests, click, - setuptools, + flit-core, pytestCheckHook, freezegun, }: buildPythonPackage rec { pname = "taxi"; - version = "6.2.0"; - format = "setuptools"; + version = "6.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "sephii"; repo = "taxi"; rev = version; - hash = "sha256-wtLlO/W+39kTPjb2U6c54bxWxAQB7CxGxBh8gur+RCQ="; + hash = "sha256-QB88RpgzrQy7DGeRdMHC2SV5Esp/r5LZtlaY5C8vJxw="; }; - propagatedBuildInputs = [ + build-system = [ flit-core ]; + + dependencies = [ appdirs - requests click - setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/textstat/default.nix b/pkgs/development/python-modules/textstat/default.nix new file mode 100644 index 000000000000..127c6f453a92 --- /dev/null +++ b/pkgs/development/python-modules/textstat/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pyphen, + pytestCheckHook, + pytest, +}: +buildPythonPackage rec { + version = "0.7.4"; + pname = "textstat"; + pyproject = true; + + src = fetchFromGitHub { + owner = "textstat"; + repo = "textstat"; + rev = version; + hash = "sha256-UOCWsIdoVGxmkro4kNBYNMYhA3kktngRDxKjo6o+GXY="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest + ]; + + dependencies = [ + setuptools + pyphen + ]; + + pythonImportsCheck = [ + "textstat" + ]; + + pytestFlagsArray = [ + "test.py" + ]; + + meta = { + description = "Python package to calculate readability statistics of a text object"; + homepage = "https://textstat.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 7e82256d3917..616afc78bcd4 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -4,21 +4,24 @@ fetchFromGitHub, pyperclip, urwid, + setuptools, }: buildPythonPackage rec { pname = "upass"; - version = "0.2.1"; - format = "setuptools"; + version = "0.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "Kwpolska"; repo = "upass"; rev = "v${version}"; - sha256 = "0bgplq07dmlld3lp6jag1w055glqislfgwwq2k7cb2bzjgvysdnj"; + hash = "sha256-IlNqPmDaRZ3yRV8O6YKjQkZ3fKNcFgzJHtIX0ADrOyU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyperclip urwid ]; diff --git a/pkgs/development/python-modules/uuid6/default.nix b/pkgs/development/python-modules/uuid6/default.nix new file mode 100644 index 000000000000..e8ca415443cb --- /dev/null +++ b/pkgs/development/python-modules/uuid6/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "uuid6"; + version = "2024.7.10"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LSnX9j9ZPKruoODQ3QrYEpycZjsp4ZvfiC6GS+3xj7A="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test/" + ]; + + disabledTestPaths = [ + "test/test_uuid6.py" + ]; + + pythonImportsCheck = [ + "uuid6" + ]; + + meta = { + description = "New time-based UUID formats which are suited for use as a database key"; + homepage = "https://github.com/oittaa/uuid6-python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix index 3021d3506f12..f5bbaddb6c34 100644 --- a/pkgs/development/python-modules/wadllib/default.nix +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -2,32 +2,35 @@ lib, buildPythonPackage, fetchPypi, - isPy3k, setuptools, lazr-uri, }: buildPythonPackage rec { pname = "wadllib"; - version = "1.3.9"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-wL4oM4myKP/ZPNru+44HDyLd98tcd+SMaMOWD98lmEQ="; + hash = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc="; }; - propagatedBuildInputs = [ - setuptools + build-system = [ setuptools ]; + + dependencies = [ lazr-uri ]; - doCheck = isPy3k; + pythonImportsCheck = [ "wadllib" ]; + + # pypi tarball has no tests + doCheck = false; meta = with lib; { description = "Navigate HTTP resources using WADL files as guides"; homepage = "https://launchpad.net/wadllib"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 69c7583c9eac..b23be6f21314 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -5,6 +5,7 @@ pythonOlder, fetchFromGitHub, which, + setuptools, # runtime dependencies numpy, torch, @@ -29,25 +30,27 @@ }: let inherit (torch) cudaCapabilities cudaPackages cudaSupport; - version = "0.0.23.post1"; + version = "0.0.28.post3"; in buildPythonPackage { pname = "xformers"; inherit version; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "xformers"; rev = "refs/tags/v${version}"; - hash = "sha256-AJXow8MmX4GxtEE2jJJ/ZIBr+3i+uS4cA6vofb390rY="; + hash = "sha256-23tnhCHK+Z0No8fqZxkgDFp2VIgXZR4jpM+pkb/vvmw="; fetchSubmodules = true; }; patches = [ ./0001-fix-allow-building-without-git.patch ]; + build-system = [ setuptools ]; + preBuild = '' cat << EOF > ./xformers/version.py # noqa: C801 @@ -81,7 +84,7 @@ buildPythonPackage { which ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); - propagatedBuildInputs = [ + dependencies = [ numpy torch ]; @@ -115,7 +118,7 @@ buildPythonPackage { ]; meta = with lib; { - description = "XFormers: A collection of composable Transformer building blocks"; + description = "Collection of composable Transformer building blocks"; homepage = "https://github.com/facebookresearch/xformers"; changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 90126ce1be2f..2120be04acc9 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -5,28 +5,33 @@ gevent, python, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "yappi"; - version = "1.6.3"; - format = "setuptools"; + version = "1.6.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sumerc"; - repo = pname; + repo = "yappi"; rev = "refs/tags/${version}"; - hash = "sha256-nkkm50/94iVYZdUBm7DZkNQsBqddO6unjP29ctf7dxo="; + hash = "sha256-3lGbFDu7sk83KrSHo6qZxHT2dxPWtT8yfXXQO1GbteU="; }; patches = [ ./tests.patch ]; + build-system = [ setuptools ]; + nativeCheckInputs = [ gevent ]; checkPhase = '' + runHook preCheck ${python.interpreter} run_tests.py + runHook postCheck ''; pythonImportsCheck = [ "yappi" ]; diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 3bf6ba1b7546..87cd9ffcee7f 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -5,10 +5,10 @@ fetchFromGitHub, pytestCheckHook, libxcrypt, - pythonOlder, gtest, pybind11, nlohmann_json, + setuptools, }: let @@ -21,16 +21,14 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "4.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "4.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "avast"; - repo = pname; + repo = "yaramod"; rev = "refs/tags/v${version}"; - hash = "sha256-YbsNFtDk5u5UyTsS1aGKUv/HWYxEwERinZ3G84/mC9o="; + hash = "sha256-EkGG3J84mTFnor1YX9B1TyjvW6mCCF/AH904DaVX+VU="; }; postPatch = '' @@ -48,12 +46,16 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake pog - gtest ]; - setupPyBuildFlags = [ "--with-unit-tests" ]; + build-system = [ setuptools ]; - checkInputs = [ pytestCheckHook ]; + env.ENV_YARAMOD_BUILD_WITH_UNIT_TESTS = true; + + nativeCheckInputs = [ + gtest + pytestCheckHook + ]; pytestFlagsArray = [ "tests/" ]; diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix index b8f054c27840..fbc7038a49de 100644 --- a/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/pkgs/development/python-modules/zipstream-ng/default.nix @@ -4,12 +4,13 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "zipstream-ng"; - version = "1.7.1"; - format = "setuptools"; + version = "1.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,11 @@ buildPythonPackage rec { owner = "pR0Ps"; repo = "zipstream-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-BYQse+DlyLUH9CofRfGrPUZjP7E8AP/wpirvJmSRfow="; + hash = "sha256-mmPxzml+gaVg2IQ/Gql+3ru0hHosbyX4WjLCMxD/MJw="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "zipstream" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index be3a8f85cb07..6b0b0a97b584 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -3,25 +3,41 @@ buildPythonPackage, pythonOlder, fetchPypi, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "zodbpickle"; - version = "4.1"; - format = "setuptools"; + version = "4.1.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-esg1awxi3HQA+b0mUyX2Fe7LJPFDWFnB4utEQ1ivt1c="; + hash = "sha256-38DJFe8Umd0GA5cPXBECxr1+t7asRkNLKabYQL8Cckg="; }; - # fails.. - doCheck = false; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; pythonImportsCheck = [ "zodbpickle" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + # fails.. + disabledTests = [ + "test_dump" + "test_dumps" + "test_load" + "test_loads" + ]; + meta = with lib; { description = "Fork of Python's pickle module to work with ZODB"; homepage = "https://github.com/zopefoundation/zodbpickle"; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index f8300db3c064..eb875a4bb220 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -4,6 +4,7 @@ buildGoModule, testers, bazel-watcher, + stdenv, }: buildGoModule rec { @@ -19,7 +20,8 @@ buildGoModule rec { vendorHash = "sha256-0I/bvuyosN55oNSMuom4C8rVjxneUaqV19l9OMiwWhU="; - CGO_ENABLED = "0"; + # The dependency github.com/fsnotify/fsevents requires CGO + CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0"; ldflags = [ "-s" "-X main.Version=${version}" @@ -28,7 +30,10 @@ buildGoModule rec { subPackages = [ "cmd/ibazel" ]; passthru = { - tests.version = testers.testVersion { package = bazel-watcher; }; + tests.version = testers.testVersion { + package = bazel-watcher; + command = "ibazel version"; + }; }; meta = with lib; { diff --git a/pkgs/development/tools/bloom/default.nix b/pkgs/development/tools/bloom/default.nix deleted file mode 100644 index e870371c0ebe..000000000000 --- a/pkgs/development/tools/bloom/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, yaml-cpp -, qtbase -, qtsvg -, wrapQtAppsHook -, qttools -, libusb1 -, php -, hidapi -, procps -}: - -stdenv.mkDerivation rec { - pname = "bloom"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "bloombloombloom"; - repo = "Bloom"; - rev = "v${version}"; - hash = "sha256-ZZfclZwxsCgApUII79bJVyT5V/dF9jm7l8ynRWCh0UU="; - }; - - nativeBuildInputs = [ - cmake - php - wrapQtAppsHook - ]; - - buildInputs = [ - hidapi - libusb1 - procps - qtbase - qtsvg - qttools - yaml-cpp - ]; - - postPatch = '' - sed -i 's|/usr|${placeholder "out"}|' cmake/Installing.cmake - ''; - - meta = { - description = "Debug interface for AVR-based embedded systems development on GNU/Linux"; - homepage = "https://bloom.oscillate.io/"; - license = lib.licenses.lgpl3Only; - maintainers = [ ]; - mainProgram = "bloom"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 15b74b0a43e0..03bd50489b69 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "2.7.1"; - srcHash = "sha256-x9eCBxrujIJ0kwN5jyn7FKu7uyN+pIBCVDLckhiUzmM="; + version = "2.7.2"; + srcHash = "sha256-p4PH/rRcswrKVO1uEykCa0wgrJvawp58oD6/kLRxoS4="; # The tarball contains vendored dependencies vendorHash = null; in diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index ccd57d05895c..d75c57300204 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.34"; + version = "0.8.35"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-Fmv6hq7t0ZrlWIbK8ahCXzgNI8Mg94nTmb9rgd5KEEY="; + hash = "sha256-JFHPwda1p3xIfbQqnl3tI7Z/LhAB1U2VtLvT2DlyQMo="; }; vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs="; diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix index b7ae5487d215..ed539899ba3d 100644 --- a/pkgs/development/tools/database/pgweb/default.nix +++ b/pkgs/development/tools/database/pgweb/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "pgweb"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "sosedoff"; repo = pname; rev = "v${version}"; - hash = "sha256-lQc1ELeH2i9tate47rdHxFnvjQQUdg1B0CXcr5YGC+g="; + hash = "sha256-gZK8+H3dBMzSVyE96E7byihKMR4+1YlVFZJtCTGUZwI="; }; postPatch = '' diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index b24300558958..ef2584ab99e9 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -5,17 +5,18 @@ glibcLocales, python3, fetchPypi, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { pname = "devpi-client"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; src = fetchPypi { - pname = "devpi_client"; + pname = "devpi-client"; inherit version; - hash = "sha256-NwbhrojxOJSpDvMk0MbAGCbjmS8z2g1ynW6zzgVvy/M="; + hash = "sha256-wUM2hFjDh4unvuah2bQY4uZZVxo4VmFPWNdriigmnXs="; }; build-system = with python3.pkgs; [ @@ -66,6 +67,8 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "devpi" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Client for devpi, a pypi index server and packaging meta tool"; homepage = "http://doc.devpi.net"; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index c1dfc4841931..e32f0702e2aa 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication +, gitUpdater , pythonOlder , aiohttp , appdirs @@ -29,7 +30,7 @@ buildPythonApplication rec { pname = "devpi-server"; - version = "6.10.0"; + version = "6.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +39,7 @@ buildPythonApplication rec { owner = "devpi"; repo = "devpi"; rev = "server-${version}"; - hash = "sha256-JqYWWItdAgtUtiYSqxUd40tT7ON4oHiDA4/3Uhb01b8="; + hash = "sha256-j8iILbptUw8DUE9lFpjDp/VYzdJzmOYqM/RCnkpWdcA="; }; sourceRoot = "${src.name}/server"; @@ -116,6 +117,11 @@ buildPythonApplication rec { }; }; + # devpi uses a monorepo for server,common,client and web + passthru.updateScript = gitUpdater { + rev-prefix = "server-"; + }; + meta = with lib;{ homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/development/tools/garble/default.nix deleted file mode 100644 index 0735e283d6db..000000000000 --- a/pkgs/development/tools/garble/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, buildGoModule -, fetchFromGitHub -, lib -, git -}: -buildGoModule rec { - pname = "garble"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "burrowers"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-f7coWG1CS4UL8GGqwADx5CvIk2sPONPlWW+JgRhFsb8="; - }; - - vendorHash = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4="; - - # Used for some of the tests. - nativeCheckInputs = [git]; - - preBuild = lib.optionalString (!stdenv.hostPlatform.isx86_64) '' - # The test assumex amd64 assembly - rm testdata/script/asm.txtar - ''; - - meta = { - description = "Obfuscate Go code by wrapping the Go toolchain"; - homepage = "https://github.com/burrowers/garble/"; - maintainers = with lib.maintainers; [ davhau ]; - license = lib.licenses.bsd3; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin - }; -} diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix index d01732da1212..ed65cd8ee86e 100644 --- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix +++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "beancount-language-server"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "polarmutex"; repo = "beancount-language-server"; rev = "v${version}"; - hash = "sha256-Z8Gc3QbnFGzF1mNjlbazz7OiDpQxY3HcaBKd32XjQCY="; + hash = "sha256-U23e32Xfa0j+U/CrCZzKjipaA0Yv5szbtTHJWWL52K4="; }; - cargoHash = "sha256-WMrh4toFqd+G30ZZxC+kT/Q07gn+3p80oKECASD48wc="; + cargoHash = "sha256-OvhG+O+uHHf7e9p3vibrPt9fuGzEqG+l3GGfNwoqXBU="; doInstallCheck = true; postInstallCheck = '' diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix index d71155bd6711..4e0fdaebdb33 100644 --- a/pkgs/development/tools/misc/pest-ide-tools/default.nix +++ b/pkgs/development/tools/misc/pest-ide-tools/default.nix @@ -3,8 +3,6 @@ , fetchFromGitHub , rustPlatform , nix-update-script -, pkg-config -, openssl , darwin }: @@ -19,10 +17,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -33,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "IDE support for Pest, via the LSP"; homepage = "https://pest.rs"; - license = with licenses; [ mit asl20 ]; + license = with licenses; [ asl20 ]; maintainers = with maintainers; [ nickhu ]; mainProgram = "pest-language-server"; }; diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix index 0287fd6f8bd8..039e54c1b130 100644 --- a/pkgs/development/tools/yamlfmt/default.nix +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -1,23 +1,29 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, yamlfmt }: +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + yamlfmt, +}: buildGoModule rec { pname = "yamlfmt"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "google"; - repo = pname; - rev = "v${version}"; - hash = "sha256-B1bRYG7ldewdyK8K2Yy5liQcEqv/3/67cQD8JKp8vQI="; + repo = "yamlfmt"; + rev = "refs/tags/v${version}"; + hash = "sha256-l9PtVaAKjtP9apTrKCkC1KDR0IXqLqinpj1onzSrPnI="; }; - vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; + vendorHash = "sha256-lsNldfacBoeTPyhkjyDZhI5YR+kDke0TarfG/KdjEOg="; ldflags = [ "-s" "-w" - "-X main.version=${version}" - "-X main.commit=${src.rev}" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" ]; passthru.tests.version = testers.testVersion { @@ -27,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Extensible command line tool or library to format yaml files"; homepage = "https://github.com/google/yamlfmt"; + changelog = "https://github.com/google/yamlfmt/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ sno2wman ]; mainProgram = "yamlfmt"; diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix deleted file mode 100644 index 72d0be794449..000000000000 --- a/pkgs/games/frozen-bubble/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, fetchurl, perlPackages, pkg-config, SDL, SDL_mixer, SDL_Pango, glib -, copyDesktopItems, makeDesktopItem -}: -perlPackages.buildPerlModule { - pname = "frozen-bubble"; - version = "2.212"; - - src = fetchurl { - url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz"; - sha256 = "721e04ff69c5233060656bfbf4002aa1aeadd96c95351f0c57bb85b6da35a305"; - }; - patches = [ ./fix-compilation.patch ]; - - nativeBuildInputs = [ copyDesktopItems pkg-config ]; - - buildInputs = [ glib SDL SDL_mixer SDL_Pango perlPackages.SDL perlPackages.FileSlurp ]; - propagatedBuildInputs = with perlPackages; [ AlienSDL CompressBzip2 FileShareDir FileWhich IPCSystemSimple LocaleMaketextLexicon ]; - - perlPreHook = "export LD=$CC"; - - desktopItems = [ - (makeDesktopItem { - name = "frozen-bubble"; - exec = "frozen-bubble"; - desktopName = "Frozen Bubble"; - genericName = "Frozen Bubble"; - comment = "Arcade/reflex colour matching game"; - categories = [ "Game" ]; - }) - ]; - - meta = { - description = "Puzzle with Bubbles"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ puckipedia ]; - }; -} diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 1ab5c8346f33..80dc2055e53b 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -855,7 +855,6 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = "--no-ask-password" "--pipe" "--quiet" - "--same-dir" "--service-type=exec" "--unit=nixos-rebuild-switch-to-configuration" "--wait" diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix index e073d5a01ff6..b714ac6cc67a 100644 --- a/pkgs/os-specific/linux/universal-pidff/default.nix +++ b/pkgs/os-specific/linux/universal-pidff/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "universal-pidff"; - version = "0.0.8"; + version = "0.0.10"; src = fetchFromGitHub { owner = "JacKeTUs"; repo = "universal-pidff"; rev = "refs/tags/${version}"; - hash = "sha256-DptLqyjfRCpkbyFAQI8sylyKu2XyZZGrSITva9vcXGQ="; + hash = "sha256-BViobWl+9ypTcQJWtZ9pbeU4cmHcFNZWlsmQUOO64Vc="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index 7c0a4f1ed1f5..6050af58466b 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -2,24 +2,15 @@ stdenv.mkDerivation rec { pname = "vendor-reset"; - version = "unstable-2021-02-16-${kernel.version}"; + version = "unstable-2024-04-16-${kernel.version}"; src = fetchFromGitHub { owner = "gnif"; repo = "vendor-reset"; - rev = "225a49a40941e350899e456366265cf82b87ad25"; - sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw="; + rev = "084881c6e9e11bdadaf05798e669568848e698a3"; + hash = "sha256-Klu2uysbF5tH7SqVl815DwR7W+Vx6PyVDDLwoMZiqBI="; }; - patches = [ - # Fix build with Linux 5.18. - # https://github.com/gnif/vendor-reset/pull/58 - (fetchpatch { - url = "https://github.com/gnif/vendor-reset/commit/5bbffcd6fee5348e8808bdbfcb5b21d455b02f55.patch"; - sha256 = "sha256-L1QxVpcZAVYiaMFCBfL2EJgeMyOR8sDa1UqF1QB3bns="; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix index c9a677b41dfc..dabe13b12621 100644 --- a/pkgs/servers/authelia/sources.nix +++ b/pkgs/servers/authelia/sources.nix @@ -1,14 +1,14 @@ { fetchFromGitHub }: rec { pname = "authelia"; - version = "4.38.15"; + version = "4.38.17"; src = fetchFromGitHub { owner = "authelia"; repo = "authelia"; rev = "v${version}"; - hash = "sha256-brgA485sst/jXjdhKrhQilreCYBhESro9j/63g8qQg4="; + hash = "sha256-JymfNe7Xoa2Hh219GtBjlyaGK+Jn8XWqrTnkY8377Ro="; }; - vendorHash = "sha256-kSuIyL+6ue8voTzHTfnAYr9q4hUzIv/lkRopGSFaLv8="; - pnpmDepsHash = "sha256-fufxoAL0z6bhRnBI4Gu61hBeUnyFYROmfResHJforfE="; + vendorHash = "sha256-q38jSX7jZO3Y4gn7dxq4NYLEfCUWVcUwmNfqT52AU/M="; + pnpmDepsHash = "sha256-jih+mFZKKOBUH0f2zzKN49VV6iUbMhVImFDWFYaZWWI="; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1a6dba594ece..07cc7ecb0e62 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3828,7 +3828,8 @@ zeroconf ]; "sensoterra" = ps: with ps; [ - ]; # missing inputs: sensoterra + sensoterra + ]; "sentry" = ps: with ps; [ sentry-sdk ]; @@ -5660,6 +5661,7 @@ "sensor" "sensorpro" "sensorpush" + "sensoterra" "sentry" "senz" "seventeentrack" diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index 4db100a94f9a..28aa6d3c84a4 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2024.10.4"; + version = "2024.11.1"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; rev = "refs/tags/${version}"; - hash = "sha256-EeFDUxZ7/W5Ng+d56mOCeRntga0uU55OQsaPWzM/bcY="; + hash = "sha256-AzzTJ1W1lwLkewanVC2HxC89Zg1OyLRJ2xPtHWXVr6c="; }; dependencies = [ pymodbus ]; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 2aeebb203b4b..ea0768433325 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -33,13 +33,13 @@ assert withHyperscan -> stdenv.hostPlatform.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-fsxeTgciZb0HqvRWoUjwe/mrRZPW23hOwx7PJBSlBSo="; + hash = "sha256-x0Mw2ug5H6BZI6LKOjFufYzGVxZIkgxXHeIX7Emsj8A="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index aa86bf6ef42b..e36ddf610741 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -69,6 +69,16 @@ "agpl" ] }, + "files_mindmap": { + "hash": "sha256-VsaJT3lsPqnCmgLYkkdLhyIRmi/CumEdezsvhra2NQk=", + "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.30/files_mindmap-0.0.30.tar.gz", + "version": "0.0.30", + "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.", + "homepage": "https://github.com/ACTom/files_mindmap", + "licenses": [ + "agpl" + ] + }, "forms": { "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=", "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz", @@ -140,8 +150,8 @@ ] }, "maps": { - "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", + "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -190,9 +200,9 @@ ] }, "onlyoffice": { - "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz", - "version": "9.4.0", + "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", + "version": "9.5.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index b1547ac6fe2a..c3f94e98759a 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -190,9 +190,9 @@ ] }, "onlyoffice": { - "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz", - "version": "9.4.0", + "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", + "version": "9.5.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index 3c87426cdd1f..817f954c833b 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -180,9 +180,9 @@ ] }, "onlyoffice": { - "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz", - "version": "9.4.0", + "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz", + "version": "9.5.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index b9c1d623164a..4ccbeb32eb04 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -8,6 +8,7 @@ , "end_to_end_encryption": "agpl3Plus" , "files_texteditor": "agpl3Plus" , "files_markdown": "agpl3Plus" +, "files_mindmap": "agpl3Plus" , "forms": "agpl3Plus" , "gpoddersync": "agpl3Only" , "groupfolders": "agpl3Plus" diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 420c923367d6..766c42c8b742 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -57,13 +57,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.34"; + version = "1.36.35"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - hash = "sha256-ClO1f0Aspz04C8wgQurtHWmwzu2f4RZ/1oGjPN8HQrw="; + hash = "sha256-0mpT3qjF8zlcsd6OlNIvrabDsz+oJPPy9Vn2TQSuHAI="; fetchSubmodules = true; }; diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 298584ce8d24..b2f3a85e439e 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -2,21 +2,22 @@ buildGoModule rec { pname = "aws-rotate-key"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Fullscreen"; repo = "aws-rotate-key"; rev = "v${version}"; - sha256 = "sha256-PZ7+GC4P4bkT+DWOhW70KkhUCUjn4gIG+OKoOBSc/8c="; + sha256 = "sha256-fYpgHHOw0k/8WLGhq+uVOvoF4Wff6wzTXuN8r4D+TmU="; }; - vendorHash = "sha256-Asfbv7avT+L8/WNQ6NS7gFcjA9MiTCu5PzsuA/PT6/k="; + vendorHash = "sha256-gXtTd7lU9m9rO1w7Fx8o/s45j63h6GtUZrjOzFI4Q/o="; ldflags = [ "-s" "-w" ]; passthru.tests.version = testers.testVersion { package = aws-rotate-key; + command = "AWS_SHARED_CREDENTIALS_FILE=/dev/null aws-rotate-key --version"; }; meta = with lib; { diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 4047c572fb80..57300e9798a3 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -205,6 +205,7 @@ pythonPackages.buildPythonApplication rec { rich jsonformatter libgravatar + setuptools ]; passthru.tests = { diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index 4a769dbf56cb..8a1f83ba6793 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sec"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "simple-evcorr"; repo = "sec"; rev = version; - sha256 = "sha256-s5xalQfZIrvj8EcLvN0swpYBgRhE1YUoPmQYVFB0lWA="; + sha256 = "sha256-iK2v/qCWw4jdSEpx6cwSB98n5iFmbCyJH0lIpUG8pAU="; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index ca8f8366f7f6..d23ec4af02ee 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { "CXX=${stdenv.cc.targetPrefix}c++" ] ++ lib.optionals useUasm [ "MY_ASM=uasm" ] + ++ lib.optionals (!useUasm && stdenv.hostPlatform.isx86) [ "USE_ASM=" ] # We need at minimum 10.13 here because of utimensat, however since # we need a bump anyway, let's set the same minimum version as the one in # aarch64-darwin so we don't need additional changes for it diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index f4c827d334b8..3f935568744f 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -26,7 +26,7 @@ let # Finds data files using the XDG Base Directory Specification - # See https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html + # See https://specifications.freedesktop.org/basedir-spec/latest find-xdg-data-files = writeScriptBin "find-xdg-data-files" '' #!${bash}/bin/sh IFS=: diff --git a/pkgs/tools/misc/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix index 39d936527dfa..a2e72db0f57a 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-09-10"; + version = "0-unstable-2024-10-24"; # 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 = "f2c0ecbe0d47d96f940e77f9def209e9c57d3962"; - sha256 = "sha256-aNzNh/YkWjnHiO+QWbJu2Y3kL/53kDvVn/8Ncz2kpFI="; + rev = "3d7a14165f9f5179bcd2a2a119ab4bbf9d81326c"; + sha256 = "sha256-fhT5xRq4VE8lOTJI470E2PPTSPSUHh90S17MdilFWAA="; }; nativeBuildInputs = [ @@ -51,6 +51,8 @@ python3.pkgs.buildPythonApplication rec { enableParallelBuilding = true; + __darwinAllowLocalNetworking = true; + preBuild = '' make -C firmware LIBFX2=${python3.pkgs.fx2}/share/libfx2 cp firmware/glasgow.ihex software/glasgow diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index f48aae8e6df5..cfe673bd58f6 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -11,14 +11,14 @@ lvm2 # lvs }: stdenv.mkDerivation rec { - version = "1.81"; + version = "1.83"; pname = "os-prober"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; rev = version; - sha256 = "sha256-3FXfGadIcmKp4qn6ZDcOSQHYsUNP2ObL1cJesNle+8A="; + sha256 = "sha256-cTufM82YE1L7d3kIOtncICInBPEw4o4NzQXB4uDrMKI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/tools/misc/tere/default.nix index 905c197cc732..cadf6ec59635 100644 --- a/pkgs/tools/misc/tere/default.nix +++ b/pkgs/tools/misc/tere/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-UWZWm6wDiQqUNcWV1nDUWXVhWgqoVUCDWz09cRkiPKg="; - nativeBuildInputs = [ + nativeCheckInputs = [ # ncurses provides the tput command needed for integration tests # https://github.com/mgunyho/tere/issues/93#issuecomment-2029624187 ncurses @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # Unexplained fail # https://github.com/NixOS/nixpkgs/pull/298527#issuecomment-2053758845 - "--skip=first_run_prompt_accept" + "--skip=first_run_prompt" ]; # NOTE: workaround for build fail on aarch64 diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index a9179fd4548f..1b37d7e2c65f 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.20.1"; + version = "2.20.2"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-ubMlCN7dGCKxBCFNzfnpaDzKCYUNwWwj/84gq/tbw9o="; + hash = "sha256-MwAet+UJ6BNEj6/NYN9HBxTGbw2CS2ASUJQrKtpoV1I="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-pz0a0w4SBPJVLWlZi6tsWysiJmwSzroF61nsFxg3R4g="; + vendorHash = "sha256-i9quHeAb8PCG1KQGKaOkxTxjImiuK6oMJcRI443/mkI="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 07e58a41e400..4d04cbb6274d 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -16,7 +16,6 @@ let atLeast210 = lib.versionAtLeast version "2.10pre"; atLeast213 = lib.versionAtLeast version "2.13pre"; atLeast214 = lib.versionAtLeast version "2.14pre"; - atLeast218 = lib.versionAtLeast version "2.18pre"; atLeast219 = lib.versionAtLeast version "2.19pre"; atLeast220 = lib.versionAtLeast version "2.20pre"; atLeast221 = lib.versionAtLeast version "2.21pre"; @@ -43,7 +42,6 @@ in , callPackage , coreutils , curl -, darwin , docbook_xsl_ns , docbook5 , editline @@ -160,8 +158,6 @@ self = stdenv.mkDerivation { libseccomp ] ++ lib.optionals withAWS [ aws-sdk-cpp - ] ++ lib.optional (atLeast218 && stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.libs.sandbox ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 377dbc43a288..1a3ac948c0b5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -175,88 +175,45 @@ in lib.makeExtensible (self: ({ }; nix_2_18 = common { - version = "2.18.8"; - hash = "sha256-0rHRifdjzzxMh/im8pRx6XoY62irDTDUes+Pn0CR65I="; + version = "2.18.9"; + hash = "sha256-RrOFlDGmRXcVRV2p2HqHGqvzGNyWoD0Dado/BNlJ1SI="; self_attribute_name = "nix_2_18"; - patches = [ - ./patches/2_18/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch - ./patches/2_18/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch - ./patches/2_18/0003-local-derivation-goal-Refactor.patch - ./patches/2_18/0004-local-derivation-goal-Move-builder-preparation-to-no.patch - ]; }; nix_2_19 = common { - version = "2.19.6"; - hash = "sha256-XT5xiwOLgXf+TdyOjbJVOl992wu9mBO25WXHoyli/Tk="; + version = "2.19.7"; + hash = "sha256-CkT1SNwRYYQdN2X4cTt1WX3YZfKZFWf7O1YTEo1APfc="; self_attribute_name = "nix_2_19"; - patches = [ - ./patches/2_19/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch - ./patches/2_19/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch - ./patches/2_19/0003-local-derivation-goal-Refactor.patch - ./patches/2_19/0004-local-derivation-goal-Move-builder-preparation-to-no.patch - ]; }; nix_2_20 = common { - version = "2.20.8"; - hash = "sha256-M2tkMtjKi8LDdNLsKi3IvD8oY/i3rtarjMpvhybS3WY="; + version = "2.20.9"; + hash = "sha256-b7smrbPLP/wcoBFCJ8j1UDNj0p4jiKT/6mNlDdlrOXA="; self_attribute_name = "nix_2_20"; - patches = [ - ./patches/2_20/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch - ./patches/2_20/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch - ./patches/2_20/0003-local-derivation-goal-Refactor.patch - ./patches/2_20/0004-local-derivation-goal-Move-builder-preparation-to-no.patch - ]; }; nix_2_21 = common { - version = "2.21.4"; - hash = "sha256-c6nVZ0pSrfhFX3eVKqayS+ioqyAGp3zG9ZPO5rkXFRQ="; + version = "2.21.5"; + hash = "sha256-/+TLpd6hvYMJFoeJvVZ+bZzjwY/jP6CxJRGmwKcXbI0="; self_attribute_name = "nix_2_21"; - patches = [ - ./patches/2_21/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch - ./patches/2_21/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch - ./patches/2_21/0003-local-derivation-goal-Refactor.patch - ./patches/2_21/0004-local-derivation-goal-Move-builder-preparation-to-no.patch - ]; }; nix_2_22 = common { - version = "2.22.3"; - hash = "sha256-l04csH5rTWsK7eXPWVxJBUVRPMZXllFoSkYFTq/i8WU="; + version = "2.22.4"; + hash = "sha256-JWjJzMA+CeyImMgP2dhSBHQW4CS8wg7fc2zQ4WdKuBo="; self_attribute_name = "nix_2_22"; - patches = [ - ./patches/2_22/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch - ./patches/2_22/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch - ./patches/2_22/0003-local-derivation-goal-Refactor.patch - ./patches/2_22/0004-local-derivation-goal-Move-builder-preparation-to-no.patch - ]; }; nix_2_23 = common { - version = "2.23.3"; - hash = "sha256-lAoLGVIhRFrfgv7wcyduEkyc83QKrtsfsq4of+WrBeg="; + version = "2.23.4"; + hash = "sha256-rugH4TUicHEdVfy3UuAobFIutqbuVco8Yg/z81g7clE="; self_attribute_name = "nix_2_23"; - patches = [ - ./patches/2_23/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch - ./patches/2_23/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch - ./patches/2_23/0003-local-derivation-goal-Refactor.patch - ./patches/2_23/0004-local-derivation-goal-Move-builder-preparation-to-no.patch - ]; }; nix_2_24 = (common { - version = "2.24.9"; - hash = "sha256-OwJByTdCz1t91ysBqynK+ifszkoIGEXUn6HE2t82+c8="; + version = "2.24.10"; + hash = "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko="; self_attribute_name = "nix_2_24"; - patches = [ - ./patches/2_24/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch - ./patches/2_24/0002-packaging-Add-darwin-lsandbox-in-meson.patch - ./patches/2_24/0003-local-derivation-goal-Print-sandbox-error-detail-on-.patch - ./patches/2_24/0004-local-derivation-goal-Refactor.patch - ./patches/2_24/0005-local-derivation-goal-Move-builder-preparation-to-no.patch - ]; }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: # @@ -270,21 +227,13 @@ in lib.makeExtensible (self: ({ git = (common rec { version = "2.25.0"; - suffix = "pre20240920_${lib.substring 0 8 src.rev}"; + suffix = "pre20241101_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "ca3fc1693b309ab6b8b0c09408a08d0055bf0363"; - hash = "sha256-Hp7dkx7zfB9a4l5QusXUob0b1T2qdZ23LFo5dcp3xrU="; + rev = "2e5759e3778c460efc5f7cfc4cb0b84827b5ffbe"; + hash = "sha256-E1Sp0JHtbD1CaGO3UbBH6QajCtOGqcrVfPSKL0n63yo="; }; - patches = [ - ./patches/git/0001-Fix-meson-build-on-darwin.patch - ./patches/git/0002-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch - ./patches/git/0003-packaging-Add-darwin-lsandbox-in-meson.patch - ./patches/git/0004-local-derivation-goal-Print-sandbox-error-detail-on-.patch - ./patches/git/0005-local-derivation-goal-Refactor.patch - ./patches/git/0006-local-derivation-goal-Move-builder-preparation-to-no.patch - ]; self_attribute_name = "git"; }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: diff --git a/pkgs/tools/package-management/nix/patches/2_18/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_18/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch deleted file mode 100644 index c13844f8bdd7..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_18/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch +++ /dev/null @@ -1,315 +0,0 @@ -From 3c4bc6929eb13cf648c54931a28797bb1c289052 Mon Sep 17 00:00:00 2001 -From: Puck Meerburg -Date: Fri, 1 Mar 2024 11:42:24 -0500 -Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on - macOS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - configure.ac | 6 +- - flake.nix | 1 + - src/libstore/build/local-derivation-goal.cc | 221 ++++++++++---------- - 3 files changed, 114 insertions(+), 114 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4e50d0913..44852ad79 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,13 +58,17 @@ AC_CHECK_TOOL([AR], [ar]) - AC_SYS_LARGEFILE - - --# Solaris-specific stuff. -+# OS-specific stuff. - AC_STRUCT_DIRENT_D_TYPE - case "$host_os" in - solaris*) - # Solaris requires -lsocket -lnsl for network functions - LDFLAGS="-lsocket -lnsl $LDFLAGS" - ;; -+ darwin*) -+ # Need to link to libsandbox. -+ LDFLAGS="-lsandbox $LDFLAGS" -+ ;; - esac - - -diff --git a/flake.nix b/flake.nix -index 6c9bef4d8..66ac1bfd8 100644 ---- a/flake.nix -+++ b/flake.nix -@@ -173,6 +173,7 @@ - boost - lowdown-nix - ] -+ ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.libs.sandbox] - ++ lib.optionals stdenv.isLinux [(libseccomp.overrideAttrs (_: rec { - version = "2.5.5"; - src = fetchurl { -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index 4d690beaf..fb83cfdc7 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -53,6 +53,10 @@ - #if __APPLE__ - #include - #include -+#include -+ -+/* This definition is undocumented but depended upon by all major browsers. */ -+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf); - #endif - - #include -@@ -2034,141 +2038,132 @@ void LocalDerivationGoal::runChild() - - std::string builder = "invalid"; - -- if (drv->isBuiltin()) { -- ; -- } - #if __APPLE__ -- else { -- /* This has to appear before import statements. */ -- std::string sandboxProfile = "(version 1)\n"; -- -- if (useChroot) { -- -- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -- PathSet ancestry; -- -- /* We build the ancestry before adding all inputPaths to the store because we know they'll -- all have the same parents (the store), and there might be lots of inputs. This isn't -- particularly efficient... I doubt it'll be a bottleneck in practice */ -- for (auto & i : dirsInChroot) { -- Path cur = i.first; -- while (cur.compare("/") != 0) { -- cur = dirOf(cur); -- ancestry.insert(cur); -- } -- } -+ /* This has to appear before import statements. */ -+ std::string sandboxProfile = "(version 1)\n"; - -- /* And we want the store in there regardless of how empty dirsInChroot. We include the innermost -- path component this time, since it's typically /nix/store and we care about that. */ -- Path cur = worker.store.storeDir; -+ if (useChroot) { -+ -+ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -+ PathSet ancestry; -+ -+ /* We build the ancestry before adding all inputPaths to the store because we know they'll -+ all have the same parents (the store), and there might be lots of inputs. This isn't -+ particularly efficient... I doubt it'll be a bottleneck in practice */ -+ for (auto & i : dirsInChroot) { -+ Path cur = i.first; - while (cur.compare("/") != 0) { -- ancestry.insert(cur); - cur = dirOf(cur); -+ ancestry.insert(cur); - } -+ } - -- /* Add all our input paths to the chroot */ -- for (auto & i : inputPaths) { -- auto p = worker.store.printStorePath(i); -- dirsInChroot[p] = p; -- } -- -- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -- if (settings.darwinLogSandboxViolations) { -- sandboxProfile += "(deny default)\n"; -- } else { -- sandboxProfile += "(deny default (with no-log))\n"; -- } -+ /* And we want the store in there regardless of how empty dirsInChroot. We include the innermost -+ path component this time, since it's typically /nix/store and we care about that. */ -+ Path cur = worker.store.storeDir; -+ while (cur.compare("/") != 0) { -+ ancestry.insert(cur); -+ cur = dirOf(cur); -+ } - -- sandboxProfile += -- #include "sandbox-defaults.sb" -- ; -+ /* Add all our input paths to the chroot */ -+ for (auto & i : inputPaths) { -+ auto p = worker.store.printStorePath(i); -+ dirsInChroot[p] = p; -+ } - -- if (!derivationType->isSandboxed()) -- sandboxProfile += -- #include "sandbox-network.sb" -- ; -- -- /* Add the output paths we'll use at build-time to the chroot */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & [_, path] : scratchOutputs) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); -- -- sandboxProfile += ")\n"; -- -- /* Our inputs (transitive dependencies and any impurities computed above) -- -- without file-write* allowed, access() incorrectly returns EPERM -- */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & i : dirsInChroot) { -- if (i.first != i.second.source) -- throw Error( -- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -- i.first, i.second.source); -- -- std::string path = i.first; -- struct stat st; -- if (lstat(path.c_str(), &st)) { -- if (i.second.optional && errno == ENOENT) -- continue; -- throw SysError("getting attributes of path '%s", path); -- } -- if (S_ISDIR(st.st_mode)) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -- else -- sandboxProfile += fmt("\t(literal \"%s\")\n", path); -- } -- sandboxProfile += ")\n"; -+ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -+ if (settings.darwinLogSandboxViolations) { -+ sandboxProfile += "(deny default)\n"; -+ } else { -+ sandboxProfile += "(deny default (with no-log))\n"; -+ } - -- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -- sandboxProfile += "(allow file-read*\n"; -- for (auto & i : ancestry) { -- sandboxProfile += fmt("\t(literal \"%s\")\n", i); -- } -- sandboxProfile += ")\n"; -+ sandboxProfile += -+ #include "sandbox-defaults.sb" -+ ; - -- sandboxProfile += additionalSandboxProfile; -- } else -+ if (!derivationType->isSandboxed()) - sandboxProfile += -- #include "sandbox-minimal.sb" -+ #include "sandbox-network.sb" - ; - -- debug("Generated sandbox profile:"); -- debug(sandboxProfile); -+ /* Add the output paths we'll use at build-time to the chroot */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & [_, path] : scratchOutputs) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); - -- Path sandboxFile = tmpDir + "/.sandbox.sb"; -+ sandboxProfile += ")\n"; - -- writeFile(sandboxFile, sandboxProfile); -+ /* Our inputs (transitive dependencies and any impurities computed above) - -- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ without file-write* allowed, access() incorrectly returns EPERM -+ */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & i : dirsInChroot) { -+ if (i.first != i.second.source) -+ throw Error( -+ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -+ i.first, i.second.source); - -- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -- to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */ -- Path globalTmpDir = canonPath(defaultTempDir(), true); -+ std::string path = i.first; -+ struct stat st; -+ if (lstat(path.c_str(), &st)) { -+ if (i.second.optional && errno == ENOENT) -+ continue; -+ throw SysError("getting attributes of path '%s", path); -+ } -+ if (S_ISDIR(st.st_mode)) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -+ else -+ sandboxProfile += fmt("\t(literal \"%s\")\n", path); -+ } -+ sandboxProfile += ")\n"; - -- /* They don't like trailing slashes on subpath directives */ -- while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -- globalTmpDir.pop_back(); -+ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -+ sandboxProfile += "(allow file-read*\n"; -+ for (auto & i : ancestry) { -+ sandboxProfile += fmt("\t(literal \"%s\")\n", i); -+ } -+ sandboxProfile += ")\n"; - -- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -- builder = "/usr/bin/sandbox-exec"; -- args.push_back("sandbox-exec"); -- args.push_back("-f"); -- args.push_back(sandboxFile); -- args.push_back("-D"); -- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir); -- if (allowLocalNetworking) { -- args.push_back("-D"); -- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1")); -- } -- args.push_back(drv->builder); -- } else { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -+ sandboxProfile += additionalSandboxProfile; -+ } else -+ sandboxProfile += -+ #include "sandbox-minimal.sb" -+ ; -+ -+ debug("Generated sandbox profile:"); -+ debug(sandboxProfile); -+ -+ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ -+ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -+ to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */ -+ Path globalTmpDir = canonPath(defaultTempDir(), true); -+ -+ /* They don't like trailing slashes on subpath directives */ -+ while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -+ globalTmpDir.pop_back(); -+ -+ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -+ Strings sandboxArgs; -+ sandboxArgs.push_back("_GLOBAL_TMP_DIR"); -+ sandboxArgs.push_back(globalTmpDir); -+ if (allowLocalNetworking) { -+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); -+ sandboxArgs.push_back("1"); -+ } -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -+ writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ _exit(1); - } - } -+ -+ builder = drv->builder; -+ args.push_back(std::string(baseNameOf(drv->builder))); - #else -- else { -+ if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_18/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_18/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch deleted file mode 100644 index a3bc4f05cdaf..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_18/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4ac099d6ab4b6851aeb8b7a1e37f5794716d5138 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:44:12 +0200 -Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on - darwin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index fb83cfdc7..d41d1c1e5 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2154,8 +2154,9 @@ void LocalDerivationGoal::runChild() - sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); - sandboxArgs.push_back("1"); - } -- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -- writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ char * sandbox_errbuf = nullptr; -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) { -+ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)")); - _exit(1); - } - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_18/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_18/0003-local-derivation-goal-Refactor.patch deleted file mode 100644 index 81997405a5f7..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_18/0003-local-derivation-goal-Refactor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6fe3a5e26def808b99856099d74aa3017ecf6d9d Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:50:27 +0200 -Subject: [PATCH 3/4] local-derivation-goal: Refactor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This works because the `builder` and `args` variables are only used -in the non-builtin code path. - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index d41d1c1e5..faecc403b 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2160,15 +2160,12 @@ void LocalDerivationGoal::runChild() - _exit(1); - } - } -+#endif - -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); --#else - if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --#endif - - for (auto & i : drv->args) - args.push_back(rewriteStrings(i, inputRewrites)); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_18/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_18/0004-local-derivation-goal-Move-builder-preparation-to-no.patch deleted file mode 100644 index 4a17ccedbdbd..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_18/0004-local-derivation-goal-Move-builder-preparation-to-no.patch +++ /dev/null @@ -1,75 +0,0 @@ -From d219faa93badcfc8134c81ba0d2b821775eb947c Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:57:00 +0200 -Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to - non-builtin code path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 25 +++++++++------------ - 1 file changed, 10 insertions(+), 15 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index faecc403b..23d5d5e3f 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2033,11 +2033,6 @@ void LocalDerivationGoal::runChild() - throw SysError("setuid failed"); - } - -- /* Fill in the arguments. */ -- Strings args; -- -- std::string builder = "invalid"; -- - #if __APPLE__ - /* This has to appear before import statements. */ - std::string sandboxProfile = "(version 1)\n"; -@@ -2162,14 +2157,6 @@ void LocalDerivationGoal::runChild() - } - #endif - -- if (!drv->isBuiltin()) { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -- } -- -- for (auto & i : drv->args) -- args.push_back(rewriteStrings(i, inputRewrites)); -- - /* Indicate that we managed to set up the build environment. */ - writeFull(STDERR_FILENO, std::string("\2\n")); - -@@ -2199,6 +2186,14 @@ void LocalDerivationGoal::runChild() - } - } - -+ // Now builder is not builtin -+ -+ Strings args; -+ args.push_back(std::string(baseNameOf(drv->builder))); -+ -+ for (auto & i : drv->args) -+ args.push_back(rewriteStrings(i, inputRewrites)); -+ - #if __APPLE__ - posix_spawnattr_t attrp; - -@@ -2220,9 +2215,9 @@ void LocalDerivationGoal::runChild() - posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL); - } - -- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #else -- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #endif - - throw SysError("executing '%1%'", drv->builder); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_19/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_19/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch deleted file mode 100644 index dfe091b48c7d..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_19/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch +++ /dev/null @@ -1,312 +0,0 @@ -From 172734f47a8062285cec0055133efcc45df03e54 Mon Sep 17 00:00:00 2001 -From: Puck Meerburg -Date: Fri, 1 Mar 2024 11:42:24 -0500 -Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on - macOS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - configure.ac | 6 +- - flake.nix | 1 + - src/libstore/build/local-derivation-goal.cc | 217 ++++++++++---------- - 3 files changed, 112 insertions(+), 112 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 281ba2c32..6d73804e2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,13 +58,17 @@ AC_CHECK_TOOL([AR], [ar]) - AC_SYS_LARGEFILE - - --# Solaris-specific stuff. -+# OS-specific stuff. - AC_STRUCT_DIRENT_D_TYPE - case "$host_os" in - solaris*) - # Solaris requires -lsocket -lnsl for network functions - LDFLAGS="-lsocket -lnsl $LDFLAGS" - ;; -+ darwin*) -+ # Need to link to libsandbox. -+ LDFLAGS="-lsandbox $LDFLAGS" -+ ;; - esac - - -diff --git a/flake.nix b/flake.nix -index 6deb09f22..98f9cc25f 100644 ---- a/flake.nix -+++ b/flake.nix -@@ -202,6 +202,7 @@ - libsodium - ] - ++ lib.optionals stdenv.isLinux [libseccomp] -+ ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.libs.sandbox] - ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid; - - checkDeps = [ -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index b6c7666e5..effd9c613 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -55,6 +55,10 @@ - #if __APPLE__ - #include - #include -+#include -+ -+/* This definition is undocumented but depended upon by all major browsers. */ -+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf); - #endif - - #include -@@ -2031,140 +2035,131 @@ void LocalDerivationGoal::runChild() - - std::string builder = "invalid"; - -- if (drv->isBuiltin()) { -- ; -- } - #if __APPLE__ -- else { -- /* This has to appear before import statements. */ -- std::string sandboxProfile = "(version 1)\n"; -- -- if (useChroot) { -- -- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -- PathSet ancestry; -- -- /* We build the ancestry before adding all inputPaths to the store because we know they'll -- all have the same parents (the store), and there might be lots of inputs. This isn't -- particularly efficient... I doubt it'll be a bottleneck in practice */ -- for (auto & i : pathsInChroot) { -- Path cur = i.first; -- while (cur.compare("/") != 0) { -- cur = dirOf(cur); -- ancestry.insert(cur); -- } -- } -+ /* This has to appear before import statements. */ -+ std::string sandboxProfile = "(version 1)\n"; - -- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -- path component this time, since it's typically /nix/store and we care about that. */ -- Path cur = worker.store.storeDir; -+ if (useChroot) { -+ -+ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -+ PathSet ancestry; -+ -+ /* We build the ancestry before adding all inputPaths to the store because we know they'll -+ all have the same parents (the store), and there might be lots of inputs. This isn't -+ particularly efficient... I doubt it'll be a bottleneck in practice */ -+ for (auto & i : pathsInChroot) { -+ Path cur = i.first; - while (cur.compare("/") != 0) { -- ancestry.insert(cur); - cur = dirOf(cur); -+ ancestry.insert(cur); - } -+ } - -- /* Add all our input paths to the chroot */ -- for (auto & i : inputPaths) { -- auto p = worker.store.printStorePath(i); -- pathsInChroot[p] = p; -- } -+ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -+ path component this time, since it's typically /nix/store and we care about that. */ -+ Path cur = worker.store.storeDir; -+ while (cur.compare("/") != 0) { -+ ancestry.insert(cur); -+ cur = dirOf(cur); -+ } - -- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -- if (settings.darwinLogSandboxViolations) { -- sandboxProfile += "(deny default)\n"; -- } else { -- sandboxProfile += "(deny default (with no-log))\n"; -- } -+ /* Add all our input paths to the chroot */ -+ for (auto & i : inputPaths) { -+ auto p = worker.store.printStorePath(i); -+ pathsInChroot[p] = p; -+ } -+ -+ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -+ if (settings.darwinLogSandboxViolations) { -+ sandboxProfile += "(deny default)\n"; -+ } else { -+ sandboxProfile += "(deny default (with no-log))\n"; -+ } - -+ sandboxProfile += -+ #include "sandbox-defaults.sb" -+ ; -+ -+ if (!derivationType->isSandboxed()) - sandboxProfile += -- #include "sandbox-defaults.sb" -+ #include "sandbox-network.sb" - ; - -- if (!derivationType->isSandboxed()) -- sandboxProfile += -- #include "sandbox-network.sb" -- ; -- -- /* Add the output paths we'll use at build-time to the chroot */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & [_, path] : scratchOutputs) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); -- -- sandboxProfile += ")\n"; -- -- /* Our inputs (transitive dependencies and any impurities computed above) -- -- without file-write* allowed, access() incorrectly returns EPERM -- */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & i : pathsInChroot) { -- if (i.first != i.second.source) -- throw Error( -- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -- i.first, i.second.source); -- -- std::string path = i.first; -- struct stat st; -- if (lstat(path.c_str(), &st)) { -- if (i.second.optional && errno == ENOENT) -- continue; -- throw SysError("getting attributes of path '%s", path); -- } -- if (S_ISDIR(st.st_mode)) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -- else -- sandboxProfile += fmt("\t(literal \"%s\")\n", path); -- } -- sandboxProfile += ")\n"; -+ /* Add the output paths we'll use at build-time to the chroot */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & [_, path] : scratchOutputs) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); - -- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -- sandboxProfile += "(allow file-read*\n"; -- for (auto & i : ancestry) { -- sandboxProfile += fmt("\t(literal \"%s\")\n", i); -- } -- sandboxProfile += ")\n"; -+ sandboxProfile += ")\n"; - -- sandboxProfile += additionalSandboxProfile; -- } else -- sandboxProfile += -- #include "sandbox-minimal.sb" -- ; -+ /* Our inputs (transitive dependencies and any impurities computed above) -+ -+ without file-write* allowed, access() incorrectly returns EPERM -+ */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & i : pathsInChroot) { -+ if (i.first != i.second.source) -+ throw Error( -+ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -+ i.first, i.second.source); -+ -+ std::string path = i.first; -+ struct stat st; -+ if (lstat(path.c_str(), &st)) { -+ if (i.second.optional && errno == ENOENT) -+ continue; -+ throw SysError("getting attributes of path '%s", path); -+ } -+ if (S_ISDIR(st.st_mode)) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -+ else -+ sandboxProfile += fmt("\t(literal \"%s\")\n", path); -+ } -+ sandboxProfile += ")\n"; - -- debug("Generated sandbox profile:"); -- debug(sandboxProfile); -+ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -+ sandboxProfile += "(allow file-read*\n"; -+ for (auto & i : ancestry) { -+ sandboxProfile += fmt("\t(literal \"%s\")\n", i); -+ } -+ sandboxProfile += ")\n"; - -- Path sandboxFile = tmpDir + "/.sandbox.sb"; -+ sandboxProfile += additionalSandboxProfile; -+ } else -+ sandboxProfile += -+ #include "sandbox-minimal.sb" -+ ; - -- writeFile(sandboxFile, sandboxProfile); -+ debug("Generated sandbox profile:"); -+ debug(sandboxProfile); - -- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); - -- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -- to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */ -- Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true); -+ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -+ to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */ -+ Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true); - -- /* They don't like trailing slashes on subpath directives */ -- if (globalTmpDir.back() == '/') globalTmpDir.pop_back(); -+ /* They don't like trailing slashes on subpath directives */ -+ if (globalTmpDir.back() == '/') globalTmpDir.pop_back(); - -- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -- builder = "/usr/bin/sandbox-exec"; -- args.push_back("sandbox-exec"); -- args.push_back("-f"); -- args.push_back(sandboxFile); -- args.push_back("-D"); -- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir); -- if (allowLocalNetworking) { -- args.push_back("-D"); -- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1")); -- } -- args.push_back(drv->builder); -- } else { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -+ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -+ Strings sandboxArgs; -+ sandboxArgs.push_back("_GLOBAL_TMP_DIR"); -+ sandboxArgs.push_back(globalTmpDir); -+ if (allowLocalNetworking) { -+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); -+ sandboxArgs.push_back("1"); -+ } -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -+ writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ _exit(1); - } - } -+ -+ builder = drv->builder; -+ args.push_back(std::string(baseNameOf(drv->builder))); - #else -- else { -+ if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_19/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_19/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch deleted file mode 100644 index 8378f739dd7e..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_19/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4a5018019e969537fdba36314fe5c19fe91828af Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:44:12 +0200 -Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on - darwin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index effd9c613..a67347b59 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2150,8 +2150,9 @@ void LocalDerivationGoal::runChild() - sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); - sandboxArgs.push_back("1"); - } -- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -- writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ char * sandbox_errbuf = nullptr; -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) { -+ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)")); - _exit(1); - } - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_19/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_19/0003-local-derivation-goal-Refactor.patch deleted file mode 100644 index f98d7069b554..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_19/0003-local-derivation-goal-Refactor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f9e5b3b52323fdcac4e21bfec4d03bd66ea6a503 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:50:27 +0200 -Subject: [PATCH 3/4] local-derivation-goal: Refactor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This works because the `builder` and `args` variables are only used -in the non-builtin code path. - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index a67347b59..eeb2635ee 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2156,15 +2156,12 @@ void LocalDerivationGoal::runChild() - _exit(1); - } - } -+#endif - -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); --#else - if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --#endif - - for (auto & i : drv->args) - args.push_back(rewriteStrings(i, inputRewrites)); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_19/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_19/0004-local-derivation-goal-Move-builder-preparation-to-no.patch deleted file mode 100644 index 523e0edea3d9..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_19/0004-local-derivation-goal-Move-builder-preparation-to-no.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 126a1fd3385175ac94ae4000a9798e0cafb3c168 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:57:00 +0200 -Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to - non-builtin code path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 25 +++++++++------------ - 1 file changed, 10 insertions(+), 15 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index eeb2635ee..e29330f0e 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2030,11 +2030,6 @@ void LocalDerivationGoal::runChild() - throw SysError("setuid failed"); - } - -- /* Fill in the arguments. */ -- Strings args; -- -- std::string builder = "invalid"; -- - #if __APPLE__ - /* This has to appear before import statements. */ - std::string sandboxProfile = "(version 1)\n"; -@@ -2158,14 +2153,6 @@ void LocalDerivationGoal::runChild() - } - #endif - -- if (!drv->isBuiltin()) { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -- } -- -- for (auto & i : drv->args) -- args.push_back(rewriteStrings(i, inputRewrites)); -- - /* Indicate that we managed to set up the build environment. */ - writeFull(STDERR_FILENO, std::string("\2\n")); - -@@ -2195,6 +2182,14 @@ void LocalDerivationGoal::runChild() - } - } - -+ // Now builder is not builtin -+ -+ Strings args; -+ args.push_back(std::string(baseNameOf(drv->builder))); -+ -+ for (auto & i : drv->args) -+ args.push_back(rewriteStrings(i, inputRewrites)); -+ - #if __APPLE__ - posix_spawnattr_t attrp; - -@@ -2216,9 +2211,9 @@ void LocalDerivationGoal::runChild() - posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL); - } - -- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #else -- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #endif - - throw SysError("executing '%1%'", drv->builder); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_20/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_20/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch deleted file mode 100644 index 6c5d8b785990..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_20/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch +++ /dev/null @@ -1,320 +0,0 @@ -From aa54b01af503644a393e4e4055c4ce2a23ce9139 Mon Sep 17 00:00:00 2001 -From: Puck Meerburg -Date: Fri, 1 Mar 2024 11:42:24 -0500 -Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on - macOS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - configure.ac | 6 +- - package.nix | 2 + - src/libstore/build/local-derivation-goal.cc | 217 ++++++++++---------- - 3 files changed, 113 insertions(+), 112 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8c29c1e62..8c524fd93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,13 +58,17 @@ AC_CHECK_TOOL([AR], [ar]) - AC_SYS_LARGEFILE - - --# Solaris-specific stuff. -+# OS-specific stuff. - AC_STRUCT_DIRENT_D_TYPE - case "$host_os" in - solaris*) - # Solaris requires -lsocket -lnsl for network functions - LDFLAGS="-lsocket -lnsl $LDFLAGS" - ;; -+ darwin*) -+ # Need to link to libsandbox. -+ LDFLAGS="-lsandbox $LDFLAGS" -+ ;; - esac - - -diff --git a/package.nix b/package.nix -index d1d14d10e..40283ffcf 100644 ---- a/package.nix -+++ b/package.nix -@@ -24,6 +24,7 @@ - , libgit2 - , libseccomp - , libsodium -+, darwin - , lowdown - , mdbook - , mdbook-linkcheck -@@ -233,6 +234,7 @@ in { - gtest - rapidcheck - ] ++ lib.optional stdenv.isLinux libseccomp -+ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox - ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid - # There have been issues building these dependencies - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index b8228bc11..9ab676429 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -57,6 +57,10 @@ - #if __APPLE__ - #include - #include -+#include -+ -+/* This definition is undocumented but depended upon by all major browsers. */ -+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf); - #endif - - #include -@@ -2023,140 +2027,131 @@ void LocalDerivationGoal::runChild() - - std::string builder = "invalid"; - -- if (drv->isBuiltin()) { -- ; -- } - #if __APPLE__ -- else { -- /* This has to appear before import statements. */ -- std::string sandboxProfile = "(version 1)\n"; -- -- if (useChroot) { -- -- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -- PathSet ancestry; -- -- /* We build the ancestry before adding all inputPaths to the store because we know they'll -- all have the same parents (the store), and there might be lots of inputs. This isn't -- particularly efficient... I doubt it'll be a bottleneck in practice */ -- for (auto & i : pathsInChroot) { -- Path cur = i.first; -- while (cur.compare("/") != 0) { -- cur = dirOf(cur); -- ancestry.insert(cur); -- } -- } -+ /* This has to appear before import statements. */ -+ std::string sandboxProfile = "(version 1)\n"; - -- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -- path component this time, since it's typically /nix/store and we care about that. */ -- Path cur = worker.store.storeDir; -+ if (useChroot) { -+ -+ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -+ PathSet ancestry; -+ -+ /* We build the ancestry before adding all inputPaths to the store because we know they'll -+ all have the same parents (the store), and there might be lots of inputs. This isn't -+ particularly efficient... I doubt it'll be a bottleneck in practice */ -+ for (auto & i : pathsInChroot) { -+ Path cur = i.first; - while (cur.compare("/") != 0) { -- ancestry.insert(cur); - cur = dirOf(cur); -+ ancestry.insert(cur); - } -+ } - -- /* Add all our input paths to the chroot */ -- for (auto & i : inputPaths) { -- auto p = worker.store.printStorePath(i); -- pathsInChroot[p] = p; -- } -+ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -+ path component this time, since it's typically /nix/store and we care about that. */ -+ Path cur = worker.store.storeDir; -+ while (cur.compare("/") != 0) { -+ ancestry.insert(cur); -+ cur = dirOf(cur); -+ } - -- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -- if (settings.darwinLogSandboxViolations) { -- sandboxProfile += "(deny default)\n"; -- } else { -- sandboxProfile += "(deny default (with no-log))\n"; -- } -+ /* Add all our input paths to the chroot */ -+ for (auto & i : inputPaths) { -+ auto p = worker.store.printStorePath(i); -+ pathsInChroot[p] = p; -+ } -+ -+ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -+ if (settings.darwinLogSandboxViolations) { -+ sandboxProfile += "(deny default)\n"; -+ } else { -+ sandboxProfile += "(deny default (with no-log))\n"; -+ } - -+ sandboxProfile += -+ #include "sandbox-defaults.sb" -+ ; -+ -+ if (!derivationType->isSandboxed()) - sandboxProfile += -- #include "sandbox-defaults.sb" -+ #include "sandbox-network.sb" - ; - -- if (!derivationType->isSandboxed()) -- sandboxProfile += -- #include "sandbox-network.sb" -- ; -- -- /* Add the output paths we'll use at build-time to the chroot */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & [_, path] : scratchOutputs) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); -- -- sandboxProfile += ")\n"; -- -- /* Our inputs (transitive dependencies and any impurities computed above) -- -- without file-write* allowed, access() incorrectly returns EPERM -- */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & i : pathsInChroot) { -- if (i.first != i.second.source) -- throw Error( -- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -- i.first, i.second.source); -- -- std::string path = i.first; -- struct stat st; -- if (lstat(path.c_str(), &st)) { -- if (i.second.optional && errno == ENOENT) -- continue; -- throw SysError("getting attributes of path '%s", path); -- } -- if (S_ISDIR(st.st_mode)) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -- else -- sandboxProfile += fmt("\t(literal \"%s\")\n", path); -- } -- sandboxProfile += ")\n"; -+ /* Add the output paths we'll use at build-time to the chroot */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & [_, path] : scratchOutputs) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); - -- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -- sandboxProfile += "(allow file-read*\n"; -- for (auto & i : ancestry) { -- sandboxProfile += fmt("\t(literal \"%s\")\n", i); -- } -- sandboxProfile += ")\n"; -+ sandboxProfile += ")\n"; - -- sandboxProfile += additionalSandboxProfile; -- } else -- sandboxProfile += -- #include "sandbox-minimal.sb" -- ; -+ /* Our inputs (transitive dependencies and any impurities computed above) -+ -+ without file-write* allowed, access() incorrectly returns EPERM -+ */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & i : pathsInChroot) { -+ if (i.first != i.second.source) -+ throw Error( -+ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -+ i.first, i.second.source); -+ -+ std::string path = i.first; -+ struct stat st; -+ if (lstat(path.c_str(), &st)) { -+ if (i.second.optional && errno == ENOENT) -+ continue; -+ throw SysError("getting attributes of path '%s", path); -+ } -+ if (S_ISDIR(st.st_mode)) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -+ else -+ sandboxProfile += fmt("\t(literal \"%s\")\n", path); -+ } -+ sandboxProfile += ")\n"; - -- debug("Generated sandbox profile:"); -- debug(sandboxProfile); -+ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -+ sandboxProfile += "(allow file-read*\n"; -+ for (auto & i : ancestry) { -+ sandboxProfile += fmt("\t(literal \"%s\")\n", i); -+ } -+ sandboxProfile += ")\n"; - -- Path sandboxFile = tmpDir + "/.sandbox.sb"; -+ sandboxProfile += additionalSandboxProfile; -+ } else -+ sandboxProfile += -+ #include "sandbox-minimal.sb" -+ ; - -- writeFile(sandboxFile, sandboxProfile); -+ debug("Generated sandbox profile:"); -+ debug(sandboxProfile); - -- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); - -- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -- to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */ -- Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true); -+ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -+ to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */ -+ Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true); - -- /* They don't like trailing slashes on subpath directives */ -- if (globalTmpDir.back() == '/') globalTmpDir.pop_back(); -+ /* They don't like trailing slashes on subpath directives */ -+ if (globalTmpDir.back() == '/') globalTmpDir.pop_back(); - -- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -- builder = "/usr/bin/sandbox-exec"; -- args.push_back("sandbox-exec"); -- args.push_back("-f"); -- args.push_back(sandboxFile); -- args.push_back("-D"); -- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir); -- if (allowLocalNetworking) { -- args.push_back("-D"); -- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1")); -- } -- args.push_back(drv->builder); -- } else { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -+ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -+ Strings sandboxArgs; -+ sandboxArgs.push_back("_GLOBAL_TMP_DIR"); -+ sandboxArgs.push_back(globalTmpDir); -+ if (allowLocalNetworking) { -+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); -+ sandboxArgs.push_back("1"); -+ } -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -+ writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ _exit(1); - } - } -+ -+ builder = drv->builder; -+ args.push_back(std::string(baseNameOf(drv->builder))); - #else -- else { -+ if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_20/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_20/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch deleted file mode 100644 index d644be6703e7..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_20/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b78e489f79165457b59faa2270fd89769d0fc17d Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:44:12 +0200 -Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on - darwin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index 9ab676429..8476e038e 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2142,8 +2142,9 @@ void LocalDerivationGoal::runChild() - sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); - sandboxArgs.push_back("1"); - } -- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -- writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ char * sandbox_errbuf = nullptr; -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) { -+ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)")); - _exit(1); - } - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_20/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_20/0003-local-derivation-goal-Refactor.patch deleted file mode 100644 index 05e8c5843ace..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_20/0003-local-derivation-goal-Refactor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From db6bcf3f7714929d5a21b655c5f8ccd2ddbdf7f2 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:50:27 +0200 -Subject: [PATCH 3/4] local-derivation-goal: Refactor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This works because the `builder` and `args` variables are only used -in the non-builtin code path. - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index 8476e038e..12b67df69 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2148,15 +2148,12 @@ void LocalDerivationGoal::runChild() - _exit(1); - } - } -+#endif - -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); --#else - if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --#endif - - for (auto & i : drv->args) - args.push_back(rewriteStrings(i, inputRewrites)); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_20/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_20/0004-local-derivation-goal-Move-builder-preparation-to-no.patch deleted file mode 100644 index 852940d3b711..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_20/0004-local-derivation-goal-Move-builder-preparation-to-no.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 55be7deee1471e77e3ad408c5e23842df0d5bc28 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:57:00 +0200 -Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to - non-builtin code path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 25 +++++++++------------ - 1 file changed, 10 insertions(+), 15 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index 12b67df69..ada86dbb8 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2022,11 +2022,6 @@ void LocalDerivationGoal::runChild() - throw SysError("setuid failed"); - } - -- /* Fill in the arguments. */ -- Strings args; -- -- std::string builder = "invalid"; -- - #if __APPLE__ - /* This has to appear before import statements. */ - std::string sandboxProfile = "(version 1)\n"; -@@ -2150,14 +2145,6 @@ void LocalDerivationGoal::runChild() - } - #endif - -- if (!drv->isBuiltin()) { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -- } -- -- for (auto & i : drv->args) -- args.push_back(rewriteStrings(i, inputRewrites)); -- - /* Indicate that we managed to set up the build environment. */ - writeFull(STDERR_FILENO, std::string("\2\n")); - -@@ -2187,6 +2174,14 @@ void LocalDerivationGoal::runChild() - } - } - -+ // Now builder is not builtin -+ -+ Strings args; -+ args.push_back(std::string(baseNameOf(drv->builder))); -+ -+ for (auto & i : drv->args) -+ args.push_back(rewriteStrings(i, inputRewrites)); -+ - #if __APPLE__ - posix_spawnattr_t attrp; - -@@ -2208,9 +2203,9 @@ void LocalDerivationGoal::runChild() - posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL); - } - -- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #else -- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #endif - - throw SysError("executing '%1%'", drv->builder); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_21/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_21/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch deleted file mode 100644 index d35d20896e6b..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_21/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch +++ /dev/null @@ -1,320 +0,0 @@ -From ae8a38d29cc0fbd6394acd72fdaaa62b3798f698 Mon Sep 17 00:00:00 2001 -From: Puck Meerburg -Date: Fri, 1 Mar 2024 11:42:24 -0500 -Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on - macOS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - configure.ac | 6 +- - package.nix | 2 + - src/libstore/build/local-derivation-goal.cc | 217 ++++++++++---------- - 3 files changed, 113 insertions(+), 112 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 676b145a5..f6fa35c81 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,13 +62,17 @@ AC_CHECK_TOOL([AR], [ar]) - AC_SYS_LARGEFILE - - --# Solaris-specific stuff. -+# OS-specific stuff. - AC_STRUCT_DIRENT_D_TYPE - case "$host_os" in - solaris*) - # Solaris requires -lsocket -lnsl for network functions - LDFLAGS="-lsocket -lnsl $LDFLAGS" - ;; -+ darwin*) -+ # Need to link to libsandbox. -+ LDFLAGS="-lsandbox $LDFLAGS" -+ ;; - esac - - -diff --git a/package.nix b/package.nix -index 7d9a39771..de2e1aff1 100644 ---- a/package.nix -+++ b/package.nix -@@ -25,6 +25,7 @@ - , libseccomp - , libsodium - , man -+, darwin - , lowdown - , mdbook - , mdbook-linkcheck -@@ -239,6 +240,7 @@ in { - gtest - rapidcheck - ] ++ lib.optional stdenv.isLinux libseccomp -+ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox - ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid - # There have been issues building these dependencies - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index 710304b67..c73b30b80 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -58,6 +58,10 @@ - #if __APPLE__ - #include - #include -+#include -+ -+/* This definition is undocumented but depended upon by all major browsers. */ -+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf); - #endif - - #include -@@ -2018,140 +2022,131 @@ void LocalDerivationGoal::runChild() - - std::string builder = "invalid"; - -- if (drv->isBuiltin()) { -- ; -- } - #if __APPLE__ -- else { -- /* This has to appear before import statements. */ -- std::string sandboxProfile = "(version 1)\n"; -- -- if (useChroot) { -- -- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -- PathSet ancestry; -- -- /* We build the ancestry before adding all inputPaths to the store because we know they'll -- all have the same parents (the store), and there might be lots of inputs. This isn't -- particularly efficient... I doubt it'll be a bottleneck in practice */ -- for (auto & i : pathsInChroot) { -- Path cur = i.first; -- while (cur.compare("/") != 0) { -- cur = dirOf(cur); -- ancestry.insert(cur); -- } -- } -+ /* This has to appear before import statements. */ -+ std::string sandboxProfile = "(version 1)\n"; - -- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -- path component this time, since it's typically /nix/store and we care about that. */ -- Path cur = worker.store.storeDir; -+ if (useChroot) { -+ -+ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -+ PathSet ancestry; -+ -+ /* We build the ancestry before adding all inputPaths to the store because we know they'll -+ all have the same parents (the store), and there might be lots of inputs. This isn't -+ particularly efficient... I doubt it'll be a bottleneck in practice */ -+ for (auto & i : pathsInChroot) { -+ Path cur = i.first; - while (cur.compare("/") != 0) { -- ancestry.insert(cur); - cur = dirOf(cur); -+ ancestry.insert(cur); - } -+ } - -- /* Add all our input paths to the chroot */ -- for (auto & i : inputPaths) { -- auto p = worker.store.printStorePath(i); -- pathsInChroot[p] = p; -- } -+ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -+ path component this time, since it's typically /nix/store and we care about that. */ -+ Path cur = worker.store.storeDir; -+ while (cur.compare("/") != 0) { -+ ancestry.insert(cur); -+ cur = dirOf(cur); -+ } - -- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -- if (settings.darwinLogSandboxViolations) { -- sandboxProfile += "(deny default)\n"; -- } else { -- sandboxProfile += "(deny default (with no-log))\n"; -- } -+ /* Add all our input paths to the chroot */ -+ for (auto & i : inputPaths) { -+ auto p = worker.store.printStorePath(i); -+ pathsInChroot[p] = p; -+ } -+ -+ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -+ if (settings.darwinLogSandboxViolations) { -+ sandboxProfile += "(deny default)\n"; -+ } else { -+ sandboxProfile += "(deny default (with no-log))\n"; -+ } - -+ sandboxProfile += -+ #include "sandbox-defaults.sb" -+ ; -+ -+ if (!derivationType->isSandboxed()) - sandboxProfile += -- #include "sandbox-defaults.sb" -+ #include "sandbox-network.sb" - ; - -- if (!derivationType->isSandboxed()) -- sandboxProfile += -- #include "sandbox-network.sb" -- ; -- -- /* Add the output paths we'll use at build-time to the chroot */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & [_, path] : scratchOutputs) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); -- -- sandboxProfile += ")\n"; -- -- /* Our inputs (transitive dependencies and any impurities computed above) -- -- without file-write* allowed, access() incorrectly returns EPERM -- */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & i : pathsInChroot) { -- if (i.first != i.second.source) -- throw Error( -- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -- i.first, i.second.source); -- -- std::string path = i.first; -- struct stat st; -- if (lstat(path.c_str(), &st)) { -- if (i.second.optional && errno == ENOENT) -- continue; -- throw SysError("getting attributes of path '%s", path); -- } -- if (S_ISDIR(st.st_mode)) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -- else -- sandboxProfile += fmt("\t(literal \"%s\")\n", path); -- } -- sandboxProfile += ")\n"; -+ /* Add the output paths we'll use at build-time to the chroot */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & [_, path] : scratchOutputs) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); - -- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -- sandboxProfile += "(allow file-read*\n"; -- for (auto & i : ancestry) { -- sandboxProfile += fmt("\t(literal \"%s\")\n", i); -- } -- sandboxProfile += ")\n"; -+ sandboxProfile += ")\n"; - -- sandboxProfile += additionalSandboxProfile; -- } else -- sandboxProfile += -- #include "sandbox-minimal.sb" -- ; -+ /* Our inputs (transitive dependencies and any impurities computed above) -+ -+ without file-write* allowed, access() incorrectly returns EPERM -+ */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & i : pathsInChroot) { -+ if (i.first != i.second.source) -+ throw Error( -+ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -+ i.first, i.second.source); -+ -+ std::string path = i.first; -+ struct stat st; -+ if (lstat(path.c_str(), &st)) { -+ if (i.second.optional && errno == ENOENT) -+ continue; -+ throw SysError("getting attributes of path '%s", path); -+ } -+ if (S_ISDIR(st.st_mode)) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -+ else -+ sandboxProfile += fmt("\t(literal \"%s\")\n", path); -+ } -+ sandboxProfile += ")\n"; - -- debug("Generated sandbox profile:"); -- debug(sandboxProfile); -+ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -+ sandboxProfile += "(allow file-read*\n"; -+ for (auto & i : ancestry) { -+ sandboxProfile += fmt("\t(literal \"%s\")\n", i); -+ } -+ sandboxProfile += ")\n"; - -- Path sandboxFile = tmpDir + "/.sandbox.sb"; -+ sandboxProfile += additionalSandboxProfile; -+ } else -+ sandboxProfile += -+ #include "sandbox-minimal.sb" -+ ; - -- writeFile(sandboxFile, sandboxProfile); -+ debug("Generated sandbox profile:"); -+ debug(sandboxProfile); - -- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); - -- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -- to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */ -- Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true); -+ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -+ to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */ -+ Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true); - -- /* They don't like trailing slashes on subpath directives */ -- if (globalTmpDir.back() == '/') globalTmpDir.pop_back(); -+ /* They don't like trailing slashes on subpath directives */ -+ if (globalTmpDir.back() == '/') globalTmpDir.pop_back(); - -- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -- builder = "/usr/bin/sandbox-exec"; -- args.push_back("sandbox-exec"); -- args.push_back("-f"); -- args.push_back(sandboxFile); -- args.push_back("-D"); -- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir); -- if (allowLocalNetworking) { -- args.push_back("-D"); -- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1")); -- } -- args.push_back(drv->builder); -- } else { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -+ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -+ Strings sandboxArgs; -+ sandboxArgs.push_back("_GLOBAL_TMP_DIR"); -+ sandboxArgs.push_back(globalTmpDir); -+ if (allowLocalNetworking) { -+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); -+ sandboxArgs.push_back("1"); -+ } -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -+ writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ _exit(1); - } - } -+ -+ builder = drv->builder; -+ args.push_back(std::string(baseNameOf(drv->builder))); - #else -- else { -+ if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_21/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_21/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch deleted file mode 100644 index 053d3eb672d9..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_21/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b429e96583e2d005c77df8c82261022397f20648 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:44:12 +0200 -Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on - darwin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index c73b30b80..e6f4c397d 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2137,8 +2137,9 @@ void LocalDerivationGoal::runChild() - sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); - sandboxArgs.push_back("1"); - } -- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -- writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ char * sandbox_errbuf = nullptr; -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) { -+ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)")); - _exit(1); - } - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_21/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_21/0003-local-derivation-goal-Refactor.patch deleted file mode 100644 index 97809a556b57..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_21/0003-local-derivation-goal-Refactor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 74b93c1edba00c2601e20b8acdcc78e29bd3f092 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:50:27 +0200 -Subject: [PATCH 3/4] local-derivation-goal: Refactor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This works because the `builder` and `args` variables are only used -in the non-builtin code path. - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index e6f4c397d..e81818fa8 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2143,15 +2143,12 @@ void LocalDerivationGoal::runChild() - _exit(1); - } - } -+#endif - -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); --#else - if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --#endif - - for (auto & i : drv->args) - args.push_back(rewriteStrings(i, inputRewrites)); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_21/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_21/0004-local-derivation-goal-Move-builder-preparation-to-no.patch deleted file mode 100644 index b2f3b2b7815c..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_21/0004-local-derivation-goal-Move-builder-preparation-to-no.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c8de35f74cbce58651c3b64ba66061040f546b9f Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:57:00 +0200 -Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to - non-builtin code path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - src/libstore/build/local-derivation-goal.cc | 25 +++++++++------------ - 1 file changed, 10 insertions(+), 15 deletions(-) - -diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index e81818fa8..078f1a5be 100644 ---- a/src/libstore/build/local-derivation-goal.cc -+++ b/src/libstore/build/local-derivation-goal.cc -@@ -2017,11 +2017,6 @@ void LocalDerivationGoal::runChild() - throw SysError("setuid failed"); - } - -- /* Fill in the arguments. */ -- Strings args; -- -- std::string builder = "invalid"; -- - #if __APPLE__ - /* This has to appear before import statements. */ - std::string sandboxProfile = "(version 1)\n"; -@@ -2145,14 +2140,6 @@ void LocalDerivationGoal::runChild() - } - #endif - -- if (!drv->isBuiltin()) { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -- } -- -- for (auto & i : drv->args) -- args.push_back(rewriteStrings(i, inputRewrites)); -- - /* Indicate that we managed to set up the build environment. */ - writeFull(STDERR_FILENO, std::string("\2\n")); - -@@ -2183,6 +2170,14 @@ void LocalDerivationGoal::runChild() - } - } - -+ // Now builder is not builtin -+ -+ Strings args; -+ args.push_back(std::string(baseNameOf(drv->builder))); -+ -+ for (auto & i : drv->args) -+ args.push_back(rewriteStrings(i, inputRewrites)); -+ - #if __APPLE__ - posix_spawnattr_t attrp; - -@@ -2204,9 +2199,9 @@ void LocalDerivationGoal::runChild() - posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL); - } - -- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #else -- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #endif - - throw SysError("executing '%1%'", drv->builder); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_22/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_22/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch deleted file mode 100644 index 72470dec5fd2..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_22/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch +++ /dev/null @@ -1,327 +0,0 @@ -From 8217054e3554ffd376f42fb0a65087a7af2ddfab Mon Sep 17 00:00:00 2001 -From: Puck Meerburg -Date: Fri, 1 Mar 2024 11:42:24 -0500 -Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on - macOS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - configure.ac | 6 +- - package.nix | 5 +- - .../unix/build/local-derivation-goal.cc | 223 +++++++++--------- - 3 files changed, 118 insertions(+), 116 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8f60bf4be..5e67e04be 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,13 +62,17 @@ AC_CHECK_TOOL([AR], [ar]) - AC_SYS_LARGEFILE - - --# Solaris-specific stuff. -+# OS-specific stuff. - AC_STRUCT_DIRENT_D_TYPE - case "$host_os" in - solaris*) - # Solaris requires -lsocket -lnsl for network functions - LDFLAGS="-lsocket -lnsl $LDFLAGS" - ;; -+ darwin*) -+ # Need to link to libsandbox. -+ LDFLAGS="-lsandbox $LDFLAGS" -+ ;; - esac - - -diff --git a/package.nix b/package.nix -index 59265f522..28be97400 100644 ---- a/package.nix -+++ b/package.nix -@@ -27,6 +27,7 @@ - , libseccomp - , libsodium - , man -+, darwin - , lowdown - , mdbook - , mdbook-linkcheck -@@ -249,7 +250,9 @@ in { - ] ++ lib.optionals buildUnitTests [ - gtest - rapidcheck -- ] ++ lib.optional stdenv.isLinux (libseccomp.overrideAttrs (_: rec { -+ ] -+ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox -+ ++ lib.optional stdenv.isLinux (libseccomp.overrideAttrs (_: rec { - version = "2.5.5"; - src = fetchurl { - url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index b8ccdf834..449d4b07c 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -58,6 +58,10 @@ - #if __APPLE__ - #include - #include -+#include -+ -+/* This definition is undocumented but depended upon by all major browsers. */ -+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf); - #endif - - #include -@@ -2026,141 +2030,132 @@ void LocalDerivationGoal::runChild() - - std::string builder = "invalid"; - -- if (drv->isBuiltin()) { -- ; -- } - #if __APPLE__ -- else { -- /* This has to appear before import statements. */ -- std::string sandboxProfile = "(version 1)\n"; -- -- if (useChroot) { -- -- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -- PathSet ancestry; -- -- /* We build the ancestry before adding all inputPaths to the store because we know they'll -- all have the same parents (the store), and there might be lots of inputs. This isn't -- particularly efficient... I doubt it'll be a bottleneck in practice */ -- for (auto & i : pathsInChroot) { -- Path cur = i.first; -- while (cur.compare("/") != 0) { -- cur = dirOf(cur); -- ancestry.insert(cur); -- } -- } -+ /* This has to appear before import statements. */ -+ std::string sandboxProfile = "(version 1)\n"; -+ -+ if (useChroot) { - -- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -- path component this time, since it's typically /nix/store and we care about that. */ -- Path cur = worker.store.storeDir; -+ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -+ PathSet ancestry; -+ -+ /* We build the ancestry before adding all inputPaths to the store because we know they'll -+ all have the same parents (the store), and there might be lots of inputs. This isn't -+ particularly efficient... I doubt it'll be a bottleneck in practice */ -+ for (auto & i : pathsInChroot) { -+ Path cur = i.first; - while (cur.compare("/") != 0) { -- ancestry.insert(cur); - cur = dirOf(cur); -+ ancestry.insert(cur); - } -+ } - -- /* Add all our input paths to the chroot */ -- for (auto & i : inputPaths) { -- auto p = worker.store.printStorePath(i); -- pathsInChroot[p] = p; -- } -- -- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -- if (settings.darwinLogSandboxViolations) { -- sandboxProfile += "(deny default)\n"; -- } else { -- sandboxProfile += "(deny default (with no-log))\n"; -- } -+ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -+ path component this time, since it's typically /nix/store and we care about that. */ -+ Path cur = worker.store.storeDir; -+ while (cur.compare("/") != 0) { -+ ancestry.insert(cur); -+ cur = dirOf(cur); -+ } - -- sandboxProfile += -- #include "sandbox-defaults.sb" -- ; -+ /* Add all our input paths to the chroot */ -+ for (auto & i : inputPaths) { -+ auto p = worker.store.printStorePath(i); -+ pathsInChroot[p] = p; -+ } - -- if (!derivationType->isSandboxed()) -- sandboxProfile += -- #include "sandbox-network.sb" -- ; -- -- /* Add the output paths we'll use at build-time to the chroot */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & [_, path] : scratchOutputs) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); -- -- sandboxProfile += ")\n"; -- -- /* Our inputs (transitive dependencies and any impurities computed above) -- -- without file-write* allowed, access() incorrectly returns EPERM -- */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & i : pathsInChroot) { -- if (i.first != i.second.source) -- throw Error( -- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -- i.first, i.second.source); -- -- std::string path = i.first; -- auto optSt = maybeLstat(path.c_str()); -- if (!optSt) { -- if (i.second.optional) -- continue; -- throw SysError("getting attributes of required path '%s", path); -- } -- if (S_ISDIR(optSt->st_mode)) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -- else -- sandboxProfile += fmt("\t(literal \"%s\")\n", path); -- } -- sandboxProfile += ")\n"; -+ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -+ if (settings.darwinLogSandboxViolations) { -+ sandboxProfile += "(deny default)\n"; -+ } else { -+ sandboxProfile += "(deny default (with no-log))\n"; -+ } - -- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -- sandboxProfile += "(allow file-read*\n"; -- for (auto & i : ancestry) { -- sandboxProfile += fmt("\t(literal \"%s\")\n", i); -- } -- sandboxProfile += ")\n"; -+ sandboxProfile += -+ #include "sandbox-defaults.sb" -+ ; - -- sandboxProfile += additionalSandboxProfile; -- } else -+ if (!derivationType->isSandboxed()) - sandboxProfile += -- #include "sandbox-minimal.sb" -+ #include "sandbox-network.sb" - ; - -- debug("Generated sandbox profile:"); -- debug(sandboxProfile); -- -- Path sandboxFile = tmpDir + "/.sandbox.sb"; -+ /* Add the output paths we'll use at build-time to the chroot */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & [_, path] : scratchOutputs) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); - -- writeFile(sandboxFile, sandboxProfile); -+ sandboxProfile += ")\n"; - -- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ /* Our inputs (transitive dependencies and any impurities computed above) - -- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -- to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */ -- Path globalTmpDir = canonPath(defaultTempDir(), true); -+ without file-write* allowed, access() incorrectly returns EPERM -+ */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & i : pathsInChroot) { -+ if (i.first != i.second.source) -+ throw Error( -+ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -+ i.first, i.second.source); -+ -+ std::string path = i.first; -+ auto optSt = maybeLstat(path.c_str()); -+ if (!optSt) { -+ if (i.second.optional) -+ continue; -+ throw SysError("getting attributes of required path '%s", path); -+ } -+ if (S_ISDIR(optSt->st_mode)) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -+ else -+ sandboxProfile += fmt("\t(literal \"%s\")\n", path); -+ } -+ sandboxProfile += ")\n"; - -- /* They don't like trailing slashes on subpath directives */ -- while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -- globalTmpDir.pop_back(); -+ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -+ sandboxProfile += "(allow file-read*\n"; -+ for (auto & i : ancestry) { -+ sandboxProfile += fmt("\t(literal \"%s\")\n", i); -+ } -+ sandboxProfile += ")\n"; - -- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -- builder = "/usr/bin/sandbox-exec"; -- args.push_back("sandbox-exec"); -- args.push_back("-f"); -- args.push_back(sandboxFile); -- args.push_back("-D"); -- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir); -- if (allowLocalNetworking) { -- args.push_back("-D"); -- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1")); -- } -- args.push_back(drv->builder); -- } else { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -+ sandboxProfile += additionalSandboxProfile; -+ } else -+ sandboxProfile += -+ #include "sandbox-minimal.sb" -+ ; -+ -+ debug("Generated sandbox profile:"); -+ debug(sandboxProfile); -+ -+ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ -+ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -+ to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */ -+ Path globalTmpDir = canonPath(defaultTempDir(), true); -+ -+ /* They don't like trailing slashes on subpath directives */ -+ while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -+ globalTmpDir.pop_back(); -+ -+ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -+ Strings sandboxArgs; -+ sandboxArgs.push_back("_GLOBAL_TMP_DIR"); -+ sandboxArgs.push_back(globalTmpDir); -+ if (allowLocalNetworking) { -+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); -+ sandboxArgs.push_back("1"); -+ } -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -+ writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ _exit(1); - } - } -+ -+ builder = drv->builder; -+ args.push_back(std::string(baseNameOf(drv->builder))); - #else -- else { -+ if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_22/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_22/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch deleted file mode 100644 index 6ac281e6316c..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_22/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f0677f190d0bd042c3a864508a5307b19a2c2d26 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:44:12 +0200 -Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on - darwin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/unix/build/local-derivation-goal.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index 449d4b07c..b74bd2e64 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2146,8 +2146,9 @@ void LocalDerivationGoal::runChild() - sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); - sandboxArgs.push_back("1"); - } -- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -- writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ char * sandbox_errbuf = nullptr; -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) { -+ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)")); - _exit(1); - } - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_22/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_22/0003-local-derivation-goal-Refactor.patch deleted file mode 100644 index dfb5add1978d..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_22/0003-local-derivation-goal-Refactor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1b39753f4d63465c709d18482945ce680b6f3f1e Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:50:27 +0200 -Subject: [PATCH 3/4] local-derivation-goal: Refactor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This works because the `builder` and `args` variables are only used -in the non-builtin code path. - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/unix/build/local-derivation-goal.cc | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index b74bd2e64..9b8b3c51b 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2152,15 +2152,12 @@ void LocalDerivationGoal::runChild() - _exit(1); - } - } -+#endif - -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); --#else - if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --#endif - - for (auto & i : drv->args) - args.push_back(rewriteStrings(i, inputRewrites)); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_22/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_22/0004-local-derivation-goal-Move-builder-preparation-to-no.patch deleted file mode 100644 index 8e200685dc73..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_22/0004-local-derivation-goal-Move-builder-preparation-to-no.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 9e198a75f76ac08f835975d4b2743e156616a219 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:57:00 +0200 -Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to - non-builtin code path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - .../unix/build/local-derivation-goal.cc | 25 ++++++++----------- - 1 file changed, 10 insertions(+), 15 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index 9b8b3c51b..08366712c 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2025,11 +2025,6 @@ void LocalDerivationGoal::runChild() - throw SysError("setuid failed"); - } - -- /* Fill in the arguments. */ -- Strings args; -- -- std::string builder = "invalid"; -- - #if __APPLE__ - /* This has to appear before import statements. */ - std::string sandboxProfile = "(version 1)\n"; -@@ -2154,14 +2149,6 @@ void LocalDerivationGoal::runChild() - } - #endif - -- if (!drv->isBuiltin()) { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -- } -- -- for (auto & i : drv->args) -- args.push_back(rewriteStrings(i, inputRewrites)); -- - /* Indicate that we managed to set up the build environment. */ - writeFull(STDERR_FILENO, std::string("\2\n")); - -@@ -2192,6 +2179,14 @@ void LocalDerivationGoal::runChild() - } - } - -+ // Now builder is not builtin -+ -+ Strings args; -+ args.push_back(std::string(baseNameOf(drv->builder))); -+ -+ for (auto & i : drv->args) -+ args.push_back(rewriteStrings(i, inputRewrites)); -+ - #if __APPLE__ - posix_spawnattr_t attrp; - -@@ -2213,9 +2208,9 @@ void LocalDerivationGoal::runChild() - posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL); - } - -- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #else -- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #endif - - throw SysError("executing '%1%'", drv->builder); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_23/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_23/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch deleted file mode 100644 index f309ff6818d4..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_23/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch +++ /dev/null @@ -1,323 +0,0 @@ -From 05994033d58e358ddafe51d1d04626eb76b8a192 Mon Sep 17 00:00:00 2001 -From: Puck Meerburg -Date: Fri, 1 Mar 2024 11:42:24 -0500 -Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on - macOS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - configure.ac | 6 +- - package.nix | 2 + - .../unix/build/local-derivation-goal.cc | 223 +++++++++--------- - 3 files changed, 116 insertions(+), 115 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 90a6d45d5..f98a0a5ea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,12 +62,16 @@ AC_CHECK_TOOL([AR], [ar]) - AC_SYS_LARGEFILE - - --# Solaris-specific stuff. -+# OS-specific stuff. - case "$host_os" in - solaris*) - # Solaris requires -lsocket -lnsl for network functions - LDFLAGS="-lsocket -lnsl $LDFLAGS" - ;; -+ darwin*) -+ # Need to link to libsandbox. -+ LDFLAGS="-lsandbox $LDFLAGS" -+ ;; - esac - - -diff --git a/package.nix b/package.nix -index cf1654c6a..1dfe7ab31 100644 ---- a/package.nix -+++ b/package.nix -@@ -27,6 +27,7 @@ - , libseccomp - , libsodium - , man -+, darwin - , lowdown - , mdbook - , mdbook-linkcheck -@@ -250,6 +251,7 @@ in { - gtest - rapidcheck - ] ++ lib.optional stdenv.isLinux libseccomp -+ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox - ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid - # There have been issues building these dependencies - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index ae9c715d6..878644fa5 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -58,6 +58,10 @@ - #if __APPLE__ - #include - #include -+#include -+ -+/* This definition is undocumented but depended upon by all major browsers. */ -+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf); - #endif - - #include -@@ -2017,141 +2021,132 @@ void LocalDerivationGoal::runChild() - - std::string builder = "invalid"; - -- if (drv->isBuiltin()) { -- ; -- } - #if __APPLE__ -- else { -- /* This has to appear before import statements. */ -- std::string sandboxProfile = "(version 1)\n"; -- -- if (useChroot) { -- -- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -- PathSet ancestry; -- -- /* We build the ancestry before adding all inputPaths to the store because we know they'll -- all have the same parents (the store), and there might be lots of inputs. This isn't -- particularly efficient... I doubt it'll be a bottleneck in practice */ -- for (auto & i : pathsInChroot) { -- Path cur = i.first; -- while (cur.compare("/") != 0) { -- cur = dirOf(cur); -- ancestry.insert(cur); -- } -- } -+ /* This has to appear before import statements. */ -+ std::string sandboxProfile = "(version 1)\n"; -+ -+ if (useChroot) { - -- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -- path component this time, since it's typically /nix/store and we care about that. */ -- Path cur = worker.store.storeDir; -+ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -+ PathSet ancestry; -+ -+ /* We build the ancestry before adding all inputPaths to the store because we know they'll -+ all have the same parents (the store), and there might be lots of inputs. This isn't -+ particularly efficient... I doubt it'll be a bottleneck in practice */ -+ for (auto & i : pathsInChroot) { -+ Path cur = i.first; - while (cur.compare("/") != 0) { -- ancestry.insert(cur); - cur = dirOf(cur); -+ ancestry.insert(cur); - } -+ } - -- /* Add all our input paths to the chroot */ -- for (auto & i : inputPaths) { -- auto p = worker.store.printStorePath(i); -- pathsInChroot[p] = p; -- } -- -- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -- if (settings.darwinLogSandboxViolations) { -- sandboxProfile += "(deny default)\n"; -- } else { -- sandboxProfile += "(deny default (with no-log))\n"; -- } -+ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -+ path component this time, since it's typically /nix/store and we care about that. */ -+ Path cur = worker.store.storeDir; -+ while (cur.compare("/") != 0) { -+ ancestry.insert(cur); -+ cur = dirOf(cur); -+ } - -- sandboxProfile += -- #include "sandbox-defaults.sb" -- ; -+ /* Add all our input paths to the chroot */ -+ for (auto & i : inputPaths) { -+ auto p = worker.store.printStorePath(i); -+ pathsInChroot[p] = p; -+ } - -- if (!derivationType->isSandboxed()) -- sandboxProfile += -- #include "sandbox-network.sb" -- ; -- -- /* Add the output paths we'll use at build-time to the chroot */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & [_, path] : scratchOutputs) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); -- -- sandboxProfile += ")\n"; -- -- /* Our inputs (transitive dependencies and any impurities computed above) -- -- without file-write* allowed, access() incorrectly returns EPERM -- */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & i : pathsInChroot) { -- if (i.first != i.second.source) -- throw Error( -- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -- i.first, i.second.source); -- -- std::string path = i.first; -- auto optSt = maybeLstat(path.c_str()); -- if (!optSt) { -- if (i.second.optional) -- continue; -- throw SysError("getting attributes of required path '%s", path); -- } -- if (S_ISDIR(optSt->st_mode)) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -- else -- sandboxProfile += fmt("\t(literal \"%s\")\n", path); -- } -- sandboxProfile += ")\n"; -+ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -+ if (settings.darwinLogSandboxViolations) { -+ sandboxProfile += "(deny default)\n"; -+ } else { -+ sandboxProfile += "(deny default (with no-log))\n"; -+ } - -- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -- sandboxProfile += "(allow file-read*\n"; -- for (auto & i : ancestry) { -- sandboxProfile += fmt("\t(literal \"%s\")\n", i); -- } -- sandboxProfile += ")\n"; -+ sandboxProfile += -+ #include "sandbox-defaults.sb" -+ ; - -- sandboxProfile += additionalSandboxProfile; -- } else -+ if (!derivationType->isSandboxed()) - sandboxProfile += -- #include "sandbox-minimal.sb" -+ #include "sandbox-network.sb" - ; - -- debug("Generated sandbox profile:"); -- debug(sandboxProfile); -- -- Path sandboxFile = tmpDir + "/.sandbox.sb"; -+ /* Add the output paths we'll use at build-time to the chroot */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & [_, path] : scratchOutputs) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); - -- writeFile(sandboxFile, sandboxProfile); -+ sandboxProfile += ")\n"; - -- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ /* Our inputs (transitive dependencies and any impurities computed above) - -- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -- to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */ -- Path globalTmpDir = canonPath(defaultTempDir(), true); -+ without file-write* allowed, access() incorrectly returns EPERM -+ */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & i : pathsInChroot) { -+ if (i.first != i.second.source) -+ throw Error( -+ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -+ i.first, i.second.source); -+ -+ std::string path = i.first; -+ auto optSt = maybeLstat(path.c_str()); -+ if (!optSt) { -+ if (i.second.optional) -+ continue; -+ throw SysError("getting attributes of required path '%s", path); -+ } -+ if (S_ISDIR(optSt->st_mode)) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -+ else -+ sandboxProfile += fmt("\t(literal \"%s\")\n", path); -+ } -+ sandboxProfile += ")\n"; - -- /* They don't like trailing slashes on subpath directives */ -- while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -- globalTmpDir.pop_back(); -+ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -+ sandboxProfile += "(allow file-read*\n"; -+ for (auto & i : ancestry) { -+ sandboxProfile += fmt("\t(literal \"%s\")\n", i); -+ } -+ sandboxProfile += ")\n"; - -- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -- builder = "/usr/bin/sandbox-exec"; -- args.push_back("sandbox-exec"); -- args.push_back("-f"); -- args.push_back(sandboxFile); -- args.push_back("-D"); -- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir); -- if (allowLocalNetworking) { -- args.push_back("-D"); -- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1")); -- } -- args.push_back(drv->builder); -- } else { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -+ sandboxProfile += additionalSandboxProfile; -+ } else -+ sandboxProfile += -+ #include "sandbox-minimal.sb" -+ ; -+ -+ debug("Generated sandbox profile:"); -+ debug(sandboxProfile); -+ -+ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ -+ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -+ to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */ -+ Path globalTmpDir = canonPath(defaultTempDir(), true); -+ -+ /* They don't like trailing slashes on subpath directives */ -+ while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -+ globalTmpDir.pop_back(); -+ -+ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -+ Strings sandboxArgs; -+ sandboxArgs.push_back("_GLOBAL_TMP_DIR"); -+ sandboxArgs.push_back(globalTmpDir); -+ if (allowLocalNetworking) { -+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); -+ sandboxArgs.push_back("1"); -+ } -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -+ writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ _exit(1); - } - } -+ -+ builder = drv->builder; -+ args.push_back(std::string(baseNameOf(drv->builder))); - #else -- else { -+ if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_23/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_23/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch deleted file mode 100644 index e264b4f1b4dc..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_23/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c43954ffac356b4168cbcfe2a67b4bad3f0dff5d Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:44:12 +0200 -Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on - darwin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/unix/build/local-derivation-goal.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index 878644fa5..0df1f0683 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2137,8 +2137,9 @@ void LocalDerivationGoal::runChild() - sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); - sandboxArgs.push_back("1"); - } -- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -- writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ char * sandbox_errbuf = nullptr; -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) { -+ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)")); - _exit(1); - } - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_23/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_23/0003-local-derivation-goal-Refactor.patch deleted file mode 100644 index 27c632b041dd..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_23/0003-local-derivation-goal-Refactor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 53b4bdcb8b0f114bea978cffbea325fd73f779b5 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:50:27 +0200 -Subject: [PATCH 3/4] local-derivation-goal: Refactor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This works because the `builder` and `args` variables are only used -in the non-builtin code path. - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/unix/build/local-derivation-goal.cc | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index 0df1f0683..9e67283c9 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2143,15 +2143,12 @@ void LocalDerivationGoal::runChild() - _exit(1); - } - } -+#endif - -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); --#else - if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --#endif - - for (auto & i : drv->args) - args.push_back(rewriteStrings(i, inputRewrites)); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_23/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_23/0004-local-derivation-goal-Move-builder-preparation-to-no.patch deleted file mode 100644 index 6ef5c8e48c4c..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_23/0004-local-derivation-goal-Move-builder-preparation-to-no.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 67b5c7004302cbd344f63ccd306673a9adec4520 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:57:00 +0200 -Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to - non-builtin code path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - .../unix/build/local-derivation-goal.cc | 25 ++++++++----------- - 1 file changed, 10 insertions(+), 15 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index 9e67283c9..1f4bafb56 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2016,11 +2016,6 @@ void LocalDerivationGoal::runChild() - throw SysError("setuid failed"); - } - -- /* Fill in the arguments. */ -- Strings args; -- -- std::string builder = "invalid"; -- - #if __APPLE__ - /* This has to appear before import statements. */ - std::string sandboxProfile = "(version 1)\n"; -@@ -2145,14 +2140,6 @@ void LocalDerivationGoal::runChild() - } - #endif - -- if (!drv->isBuiltin()) { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -- } -- -- for (auto & i : drv->args) -- args.push_back(rewriteStrings(i, inputRewrites)); -- - /* Indicate that we managed to set up the build environment. */ - writeFull(STDERR_FILENO, std::string("\2\n")); - -@@ -2183,6 +2170,14 @@ void LocalDerivationGoal::runChild() - } - } - -+ // Now builder is not builtin -+ -+ Strings args; -+ args.push_back(std::string(baseNameOf(drv->builder))); -+ -+ for (auto & i : drv->args) -+ args.push_back(rewriteStrings(i, inputRewrites)); -+ - #if __APPLE__ - posix_spawnattr_t attrp; - -@@ -2204,9 +2199,9 @@ void LocalDerivationGoal::runChild() - posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL); - } - -- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #else -- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #endif - - throw SysError("executing '%1%'", drv->builder); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_24/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_24/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch deleted file mode 100644 index 9c3d5f987da2..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_24/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch +++ /dev/null @@ -1,323 +0,0 @@ -From 170242cf0ca3e9fadbad2004126793634d56623e Mon Sep 17 00:00:00 2001 -From: Puck Meerburg -Date: Fri, 1 Mar 2024 11:42:24 -0500 -Subject: [PATCH 1/5] fix: Run all derivation builders inside the sandbox on - macOS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - configure.ac | 6 +- - package.nix | 2 + - .../unix/build/local-derivation-goal.cc | 223 +++++++++--------- - 3 files changed, 116 insertions(+), 115 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5c22ed176..dff35981b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,12 +62,16 @@ AC_CHECK_TOOL([AR], [ar]) - AC_SYS_LARGEFILE - - --# Solaris-specific stuff. -+# OS-specific stuff. - case "$host_os" in - solaris*) - # Solaris requires -lsocket -lnsl for network functions - LDFLAGS="-lsocket -lnsl $LDFLAGS" - ;; -+ darwin*) -+ # Need to link to libsandbox. -+ LDFLAGS="-lsandbox $LDFLAGS" -+ ;; - esac - - -diff --git a/package.nix b/package.nix -index a7c8923e8..fcd1e1898 100644 ---- a/package.nix -+++ b/package.nix -@@ -23,6 +23,7 @@ - , libseccomp - , libsodium - , man -+, darwin - , lowdown - , mdbook - , mdbook-linkcheck -@@ -235,6 +236,7 @@ in { - gtest - rapidcheck - ] ++ lib.optional stdenv.isLinux libseccomp -+ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox - ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid - # There have been issues building these dependencies - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index 54ca69580..7ce266122 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -58,6 +58,10 @@ - #if __APPLE__ - #include - #include -+#include -+ -+/* This definition is undocumented but depended upon by all major browsers. */ -+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf); - #endif - - #include -@@ -2039,141 +2043,132 @@ void LocalDerivationGoal::runChild() - - std::string builder = "invalid"; - -- if (drv->isBuiltin()) { -- ; -- } - #if __APPLE__ -- else { -- /* This has to appear before import statements. */ -- std::string sandboxProfile = "(version 1)\n"; -- -- if (useChroot) { -- -- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -- PathSet ancestry; -- -- /* We build the ancestry before adding all inputPaths to the store because we know they'll -- all have the same parents (the store), and there might be lots of inputs. This isn't -- particularly efficient... I doubt it'll be a bottleneck in practice */ -- for (auto & i : pathsInChroot) { -- Path cur = i.first; -- while (cur.compare("/") != 0) { -- cur = dirOf(cur); -- ancestry.insert(cur); -- } -- } -+ /* This has to appear before import statements. */ -+ std::string sandboxProfile = "(version 1)\n"; -+ -+ if (useChroot) { - -- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -- path component this time, since it's typically /nix/store and we care about that. */ -- Path cur = worker.store.storeDir; -+ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -+ PathSet ancestry; -+ -+ /* We build the ancestry before adding all inputPaths to the store because we know they'll -+ all have the same parents (the store), and there might be lots of inputs. This isn't -+ particularly efficient... I doubt it'll be a bottleneck in practice */ -+ for (auto & i : pathsInChroot) { -+ Path cur = i.first; - while (cur.compare("/") != 0) { -- ancestry.insert(cur); - cur = dirOf(cur); -+ ancestry.insert(cur); - } -+ } - -- /* Add all our input paths to the chroot */ -- for (auto & i : inputPaths) { -- auto p = worker.store.printStorePath(i); -- pathsInChroot[p] = p; -- } -- -- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -- if (settings.darwinLogSandboxViolations) { -- sandboxProfile += "(deny default)\n"; -- } else { -- sandboxProfile += "(deny default (with no-log))\n"; -- } -+ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -+ path component this time, since it's typically /nix/store and we care about that. */ -+ Path cur = worker.store.storeDir; -+ while (cur.compare("/") != 0) { -+ ancestry.insert(cur); -+ cur = dirOf(cur); -+ } - -- sandboxProfile += -- #include "sandbox-defaults.sb" -- ; -+ /* Add all our input paths to the chroot */ -+ for (auto & i : inputPaths) { -+ auto p = worker.store.printStorePath(i); -+ pathsInChroot[p] = p; -+ } - -- if (!derivationType->isSandboxed()) -- sandboxProfile += -- #include "sandbox-network.sb" -- ; -- -- /* Add the output paths we'll use at build-time to the chroot */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & [_, path] : scratchOutputs) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); -- -- sandboxProfile += ")\n"; -- -- /* Our inputs (transitive dependencies and any impurities computed above) -- -- without file-write* allowed, access() incorrectly returns EPERM -- */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & i : pathsInChroot) { -- if (i.first != i.second.source) -- throw Error( -- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -- i.first, i.second.source); -- -- std::string path = i.first; -- auto optSt = maybeLstat(path.c_str()); -- if (!optSt) { -- if (i.second.optional) -- continue; -- throw SysError("getting attributes of required path '%s", path); -- } -- if (S_ISDIR(optSt->st_mode)) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -- else -- sandboxProfile += fmt("\t(literal \"%s\")\n", path); -- } -- sandboxProfile += ")\n"; -+ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -+ if (settings.darwinLogSandboxViolations) { -+ sandboxProfile += "(deny default)\n"; -+ } else { -+ sandboxProfile += "(deny default (with no-log))\n"; -+ } - -- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -- sandboxProfile += "(allow file-read*\n"; -- for (auto & i : ancestry) { -- sandboxProfile += fmt("\t(literal \"%s\")\n", i); -- } -- sandboxProfile += ")\n"; -+ sandboxProfile += -+ #include "sandbox-defaults.sb" -+ ; - -- sandboxProfile += additionalSandboxProfile; -- } else -+ if (!derivationType->isSandboxed()) - sandboxProfile += -- #include "sandbox-minimal.sb" -+ #include "sandbox-network.sb" - ; - -- debug("Generated sandbox profile:"); -- debug(sandboxProfile); -- -- Path sandboxFile = tmpDir + "/.sandbox.sb"; -+ /* Add the output paths we'll use at build-time to the chroot */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & [_, path] : scratchOutputs) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); - -- writeFile(sandboxFile, sandboxProfile); -+ sandboxProfile += ")\n"; - -- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ /* Our inputs (transitive dependencies and any impurities computed above) - -- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -- to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */ -- Path globalTmpDir = canonPath(defaultTempDir(), true); -+ without file-write* allowed, access() incorrectly returns EPERM -+ */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & i : pathsInChroot) { -+ if (i.first != i.second.source) -+ throw Error( -+ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -+ i.first, i.second.source); -+ -+ std::string path = i.first; -+ auto optSt = maybeLstat(path.c_str()); -+ if (!optSt) { -+ if (i.second.optional) -+ continue; -+ throw SysError("getting attributes of required path '%s", path); -+ } -+ if (S_ISDIR(optSt->st_mode)) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -+ else -+ sandboxProfile += fmt("\t(literal \"%s\")\n", path); -+ } -+ sandboxProfile += ")\n"; - -- /* They don't like trailing slashes on subpath directives */ -- while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -- globalTmpDir.pop_back(); -+ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -+ sandboxProfile += "(allow file-read*\n"; -+ for (auto & i : ancestry) { -+ sandboxProfile += fmt("\t(literal \"%s\")\n", i); -+ } -+ sandboxProfile += ")\n"; - -- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -- builder = "/usr/bin/sandbox-exec"; -- args.push_back("sandbox-exec"); -- args.push_back("-f"); -- args.push_back(sandboxFile); -- args.push_back("-D"); -- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir); -- if (allowLocalNetworking) { -- args.push_back("-D"); -- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1")); -- } -- args.push_back(drv->builder); -- } else { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -+ sandboxProfile += additionalSandboxProfile; -+ } else -+ sandboxProfile += -+ #include "sandbox-minimal.sb" -+ ; -+ -+ debug("Generated sandbox profile:"); -+ debug(sandboxProfile); -+ -+ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ -+ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -+ to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */ -+ Path globalTmpDir = canonPath(defaultTempDir(), true); -+ -+ /* They don't like trailing slashes on subpath directives */ -+ while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -+ globalTmpDir.pop_back(); -+ -+ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -+ Strings sandboxArgs; -+ sandboxArgs.push_back("_GLOBAL_TMP_DIR"); -+ sandboxArgs.push_back(globalTmpDir); -+ if (allowLocalNetworking) { -+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); -+ sandboxArgs.push_back("1"); -+ } -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -+ writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ _exit(1); - } - } -+ -+ builder = drv->builder; -+ args.push_back(std::string(baseNameOf(drv->builder))); - #else -- else { -+ if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_24/0002-packaging-Add-darwin-lsandbox-in-meson.patch b/pkgs/tools/package-management/nix/patches/2_24/0002-packaging-Add-darwin-lsandbox-in-meson.patch deleted file mode 100644 index c709ea62354d..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_24/0002-packaging-Add-darwin-lsandbox-in-meson.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f8a1a149c73113e01c44b73ce9e1005575d52a9a Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:23:17 +0200 -Subject: [PATCH 2/5] packaging: Add darwin -lsandbox in meson -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - src/libstore/meson.build | 5 +++++ - src/libstore/package.nix | 2 ++ - 2 files changed, 7 insertions(+) - -diff --git a/src/libstore/meson.build b/src/libstore/meson.build -index 50b15e15d..b23c85061 100644 ---- a/src/libstore/meson.build -+++ b/src/libstore/meson.build -@@ -68,6 +68,11 @@ has_acl_support = cxx.has_header('sys/xattr.h') \ - and cxx.has_function('lremovexattr') - configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int()) - -+if host_machine.system() == 'darwin' -+ sandbox = cxx.find_library('sandbox') -+ deps_other += [sandbox] -+endif -+ - subdir('build-utils-meson/threads') - - boost = dependency( -diff --git a/src/libstore/package.nix b/src/libstore/package.nix -index 4582ba0d2..d98bac16d 100644 ---- a/src/libstore/package.nix -+++ b/src/libstore/package.nix -@@ -7,6 +7,7 @@ - , ninja - , pkg-config - , unixtools -+, darwin - - , nix-util - , boost -@@ -65,6 +66,7 @@ mkMesonDerivation (finalAttrs: { - sqlite - ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp - # There have been issues building these dependencies -+ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) - aws-sdk-cpp - ; --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_24/0003-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_24/0003-local-derivation-goal-Print-sandbox-error-detail-on-.patch deleted file mode 100644 index 2c984b6343db..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_24/0003-local-derivation-goal-Print-sandbox-error-detail-on-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ae7a2ea74136363c2f6ac6e624ea95da7abfafcc Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:44:12 +0200 -Subject: [PATCH 3/5] local-derivation-goal: Print sandbox error detail on - darwin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/unix/build/local-derivation-goal.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index 7ce266122..706771e8e 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2159,8 +2159,9 @@ void LocalDerivationGoal::runChild() - sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); - sandboxArgs.push_back("1"); - } -- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -- writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ char * sandbox_errbuf = nullptr; -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) { -+ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)")); - _exit(1); - } - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_24/0004-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_24/0004-local-derivation-goal-Refactor.patch deleted file mode 100644 index dbf54c5020c9..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_24/0004-local-derivation-goal-Refactor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 047ee50db2f660eb3f50fab8f7543ce95e814b7c Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:50:27 +0200 -Subject: [PATCH 4/5] local-derivation-goal: Refactor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This works because the `builder` and `args` variables are only used -in the non-builtin code path. - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/unix/build/local-derivation-goal.cc | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index 706771e8e..d9738a1ea 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2165,15 +2165,12 @@ void LocalDerivationGoal::runChild() - _exit(1); - } - } -+#endif - -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); --#else - if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --#endif - - for (auto & i : drv->args) - args.push_back(rewriteStrings(i, inputRewrites)); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/2_24/0005-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_24/0005-local-derivation-goal-Move-builder-preparation-to-no.patch deleted file mode 100644 index c4fc9b2c2117..000000000000 --- a/pkgs/tools/package-management/nix/patches/2_24/0005-local-derivation-goal-Move-builder-preparation-to-no.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 50f83e4bbd9107576399f94449ac9cb4e80d575e Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:57:00 +0200 -Subject: [PATCH 5/5] local-derivation-goal: Move builder preparation to - non-builtin code path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - .../unix/build/local-derivation-goal.cc | 25 ++++++++----------- - 1 file changed, 10 insertions(+), 15 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index d9738a1ea..2a09e3dd4 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2038,11 +2038,6 @@ void LocalDerivationGoal::runChild() - throw SysError("setuid failed"); - } - -- /* Fill in the arguments. */ -- Strings args; -- -- std::string builder = "invalid"; -- - #if __APPLE__ - /* This has to appear before import statements. */ - std::string sandboxProfile = "(version 1)\n"; -@@ -2167,14 +2162,6 @@ void LocalDerivationGoal::runChild() - } - #endif - -- if (!drv->isBuiltin()) { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -- } -- -- for (auto & i : drv->args) -- args.push_back(rewriteStrings(i, inputRewrites)); -- - /* Indicate that we managed to set up the build environment. */ - writeFull(STDERR_FILENO, std::string("\2\n")); - -@@ -2205,6 +2192,14 @@ void LocalDerivationGoal::runChild() - } - } - -+ // Now builder is not builtin -+ -+ Strings args; -+ args.push_back(std::string(baseNameOf(drv->builder))); -+ -+ for (auto & i : drv->args) -+ args.push_back(rewriteStrings(i, inputRewrites)); -+ - #if __APPLE__ - posix_spawnattr_t attrp; - -@@ -2226,9 +2221,9 @@ void LocalDerivationGoal::runChild() - posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL); - } - -- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #else -- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #endif - - throw SysError("executing '%1%'", drv->builder); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/git/0001-Fix-meson-build-on-darwin.patch b/pkgs/tools/package-management/nix/patches/git/0001-Fix-meson-build-on-darwin.patch deleted file mode 100644 index e03bed014561..000000000000 --- a/pkgs/tools/package-management/nix/patches/git/0001-Fix-meson-build-on-darwin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 766263d53ae69d70c5915426e6e8f58abd988226 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Tue, 22 Oct 2024 15:28:04 +0200 -Subject: [PATCH 1/6] Fix meson build on darwin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -std::stringbuf is defined in -Signed-off-by: Jörg Thalheim ---- - src/libutil/strings.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libutil/strings.cc b/src/libutil/strings.cc -index d1c9f700c..c221a43c6 100644 ---- a/src/libutil/strings.cc -+++ b/src/libutil/strings.cc -@@ -1,5 +1,6 @@ - #include - #include -+#include - - #include "strings-inline.hh" - #include "os-string.hh" --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/git/0002-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/git/0002-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch deleted file mode 100644 index 36218646f3b6..000000000000 --- a/pkgs/tools/package-management/nix/patches/git/0002-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch +++ /dev/null @@ -1,323 +0,0 @@ -From d2c880b03f58eb4fdd6d19eb3ffa4345a0477419 Mon Sep 17 00:00:00 2001 -From: Puck Meerburg -Date: Fri, 1 Mar 2024 11:42:24 -0500 -Subject: [PATCH 2/6] fix: Run all derivation builders inside the sandbox on - macOS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - configure.ac | 6 +- - package.nix | 2 + - .../unix/build/local-derivation-goal.cc | 223 +++++++++--------- - 3 files changed, 116 insertions(+), 115 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 198198dea..c7c9b3f4b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,12 +62,16 @@ AC_CHECK_TOOL([AR], [ar]) - AC_SYS_LARGEFILE - - --# Solaris-specific stuff. -+# OS-specific stuff. - case "$host_os" in - solaris*) - # Solaris requires -lsocket -lnsl for network functions - LDFLAGS="-lsocket -lnsl $LDFLAGS" - ;; -+ darwin*) -+ # Need to link to libsandbox. -+ LDFLAGS="-lsandbox $LDFLAGS" -+ ;; - esac - - -diff --git a/package.nix b/package.nix -index 00621d475..77f1de58c 100644 ---- a/package.nix -+++ b/package.nix -@@ -23,6 +23,7 @@ - , libseccomp - , libsodium - , man -+, darwin - , lowdown - , mdbook - , mdbook-linkcheck -@@ -232,6 +233,7 @@ in { - gtest - rapidcheck - ] ++ lib.optional stdenv.isLinux libseccomp -+ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox - ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid - # There have been issues building these dependencies - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index b4685b3a7..067755c0d 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -58,6 +58,10 @@ - #if __APPLE__ - #include - #include -+#include -+ -+/* This definition is undocumented but depended upon by all major browsers. */ -+extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf); - #endif - - #include -@@ -2088,141 +2092,132 @@ void LocalDerivationGoal::runChild() - - std::string builder = "invalid"; - -- if (drv->isBuiltin()) { -- ; -- } - #if __APPLE__ -- else { -- /* This has to appear before import statements. */ -- std::string sandboxProfile = "(version 1)\n"; -- -- if (useChroot) { -- -- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -- PathSet ancestry; -- -- /* We build the ancestry before adding all inputPaths to the store because we know they'll -- all have the same parents (the store), and there might be lots of inputs. This isn't -- particularly efficient... I doubt it'll be a bottleneck in practice */ -- for (auto & i : pathsInChroot) { -- Path cur = i.first; -- while (cur.compare("/") != 0) { -- cur = dirOf(cur); -- ancestry.insert(cur); -- } -- } -+ /* This has to appear before import statements. */ -+ std::string sandboxProfile = "(version 1)\n"; -+ -+ if (useChroot) { - -- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -- path component this time, since it's typically /nix/store and we care about that. */ -- Path cur = worker.store.storeDir; -+ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */ -+ PathSet ancestry; -+ -+ /* We build the ancestry before adding all inputPaths to the store because we know they'll -+ all have the same parents (the store), and there might be lots of inputs. This isn't -+ particularly efficient... I doubt it'll be a bottleneck in practice */ -+ for (auto & i : pathsInChroot) { -+ Path cur = i.first; - while (cur.compare("/") != 0) { -- ancestry.insert(cur); - cur = dirOf(cur); -+ ancestry.insert(cur); - } -+ } - -- /* Add all our input paths to the chroot */ -- for (auto & i : inputPaths) { -- auto p = worker.store.printStorePath(i); -- pathsInChroot[p] = p; -- } -- -- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -- if (settings.darwinLogSandboxViolations) { -- sandboxProfile += "(deny default)\n"; -- } else { -- sandboxProfile += "(deny default (with no-log))\n"; -- } -+ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost -+ path component this time, since it's typically /nix/store and we care about that. */ -+ Path cur = worker.store.storeDir; -+ while (cur.compare("/") != 0) { -+ ancestry.insert(cur); -+ cur = dirOf(cur); -+ } - -- sandboxProfile += -- #include "sandbox-defaults.sb" -- ; -+ /* Add all our input paths to the chroot */ -+ for (auto & i : inputPaths) { -+ auto p = worker.store.printStorePath(i); -+ pathsInChroot[p] = p; -+ } - -- if (!derivationType->isSandboxed()) -- sandboxProfile += -- #include "sandbox-network.sb" -- ; -- -- /* Add the output paths we'll use at build-time to the chroot */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & [_, path] : scratchOutputs) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); -- -- sandboxProfile += ")\n"; -- -- /* Our inputs (transitive dependencies and any impurities computed above) -- -- without file-write* allowed, access() incorrectly returns EPERM -- */ -- sandboxProfile += "(allow file-read* file-write* process-exec\n"; -- for (auto & i : pathsInChroot) { -- if (i.first != i.second.source) -- throw Error( -- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -- i.first, i.second.source); -- -- std::string path = i.first; -- auto optSt = maybeLstat(path.c_str()); -- if (!optSt) { -- if (i.second.optional) -- continue; -- throw SysError("getting attributes of required path '%s", path); -- } -- if (S_ISDIR(optSt->st_mode)) -- sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -- else -- sandboxProfile += fmt("\t(literal \"%s\")\n", path); -- } -- sandboxProfile += ")\n"; -+ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */ -+ if (settings.darwinLogSandboxViolations) { -+ sandboxProfile += "(deny default)\n"; -+ } else { -+ sandboxProfile += "(deny default (with no-log))\n"; -+ } - -- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -- sandboxProfile += "(allow file-read*\n"; -- for (auto & i : ancestry) { -- sandboxProfile += fmt("\t(literal \"%s\")\n", i); -- } -- sandboxProfile += ")\n"; -+ sandboxProfile += -+ #include "sandbox-defaults.sb" -+ ; - -- sandboxProfile += additionalSandboxProfile; -- } else -+ if (!derivationType->isSandboxed()) - sandboxProfile += -- #include "sandbox-minimal.sb" -+ #include "sandbox-network.sb" - ; - -- debug("Generated sandbox profile:"); -- debug(sandboxProfile); -- -- Path sandboxFile = tmpDir + "/.sandbox.sb"; -+ /* Add the output paths we'll use at build-time to the chroot */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & [_, path] : scratchOutputs) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path)); - -- writeFile(sandboxFile, sandboxProfile); -+ sandboxProfile += ")\n"; - -- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ /* Our inputs (transitive dependencies and any impurities computed above) - -- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -- to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */ -- Path globalTmpDir = canonPath(defaultTempDir(), true); -+ without file-write* allowed, access() incorrectly returns EPERM -+ */ -+ sandboxProfile += "(allow file-read* file-write* process-exec\n"; -+ for (auto & i : pathsInChroot) { -+ if (i.first != i.second.source) -+ throw Error( -+ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin", -+ i.first, i.second.source); -+ -+ std::string path = i.first; -+ auto optSt = maybeLstat(path.c_str()); -+ if (!optSt) { -+ if (i.second.optional) -+ continue; -+ throw SysError("getting attributes of required path '%s", path); -+ } -+ if (S_ISDIR(optSt->st_mode)) -+ sandboxProfile += fmt("\t(subpath \"%s\")\n", path); -+ else -+ sandboxProfile += fmt("\t(literal \"%s\")\n", path); -+ } -+ sandboxProfile += ")\n"; - -- /* They don't like trailing slashes on subpath directives */ -- while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -- globalTmpDir.pop_back(); -+ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */ -+ sandboxProfile += "(allow file-read*\n"; -+ for (auto & i : ancestry) { -+ sandboxProfile += fmt("\t(literal \"%s\")\n", i); -+ } -+ sandboxProfile += ")\n"; - -- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -- builder = "/usr/bin/sandbox-exec"; -- args.push_back("sandbox-exec"); -- args.push_back("-f"); -- args.push_back(sandboxFile); -- args.push_back("-D"); -- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir); -- if (allowLocalNetworking) { -- args.push_back("-D"); -- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1")); -- } -- args.push_back(drv->builder); -- } else { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -+ sandboxProfile += additionalSandboxProfile; -+ } else -+ sandboxProfile += -+ #include "sandbox-minimal.sb" -+ ; -+ -+ debug("Generated sandbox profile:"); -+ debug(sandboxProfile); -+ -+ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking"); -+ -+ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms -+ to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */ -+ Path globalTmpDir = canonPath(defaultTempDir(), true); -+ -+ /* They don't like trailing slashes on subpath directives */ -+ while (!globalTmpDir.empty() && globalTmpDir.back() == '/') -+ globalTmpDir.pop_back(); -+ -+ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") { -+ Strings sandboxArgs; -+ sandboxArgs.push_back("_GLOBAL_TMP_DIR"); -+ sandboxArgs.push_back(globalTmpDir); -+ if (allowLocalNetworking) { -+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); -+ sandboxArgs.push_back("1"); -+ } -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -+ writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ _exit(1); - } - } -+ -+ builder = drv->builder; -+ args.push_back(std::string(baseNameOf(drv->builder))); - #else -- else { -+ if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/git/0003-packaging-Add-darwin-lsandbox-in-meson.patch b/pkgs/tools/package-management/nix/patches/git/0003-packaging-Add-darwin-lsandbox-in-meson.patch deleted file mode 100644 index 0dfbd10ab1e8..000000000000 --- a/pkgs/tools/package-management/nix/patches/git/0003-packaging-Add-darwin-lsandbox-in-meson.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f7335530619f9b18d6cc249a297e4dca369101a5 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:23:17 +0200 -Subject: [PATCH 3/6] packaging: Add darwin -lsandbox in meson -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - src/libstore/meson.build | 5 +++++ - src/libstore/package.nix | 2 ++ - 2 files changed, 7 insertions(+) - -diff --git a/src/libstore/meson.build b/src/libstore/meson.build -index 6a6aabf97..c2aa5bff3 100644 ---- a/src/libstore/meson.build -+++ b/src/libstore/meson.build -@@ -69,6 +69,11 @@ has_acl_support = cxx.has_header('sys/xattr.h') \ - and cxx.has_function('lremovexattr') - configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int()) - -+if host_machine.system() == 'darwin' -+ sandbox = cxx.find_library('sandbox') -+ deps_other += [sandbox] -+endif -+ - subdir('build-utils-meson/threads') - - boost = dependency( -diff --git a/src/libstore/package.nix b/src/libstore/package.nix -index 9568462b5..f04e3b95f 100644 ---- a/src/libstore/package.nix -+++ b/src/libstore/package.nix -@@ -3,6 +3,7 @@ - , mkMesonLibrary - - , unixtools -+, darwin - - , nix-util - , boost -@@ -56,6 +57,7 @@ mkMesonLibrary (finalAttrs: { - sqlite - ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp - # There have been issues building these dependencies -+ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) - aws-sdk-cpp - ; --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/git/0004-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/git/0004-local-derivation-goal-Print-sandbox-error-detail-on-.patch deleted file mode 100644 index 4bff61efdf7f..000000000000 --- a/pkgs/tools/package-management/nix/patches/git/0004-local-derivation-goal-Print-sandbox-error-detail-on-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 14d09e0b55898ac22d4cdeade3bf6c4174052ffd Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:44:12 +0200 -Subject: [PATCH 4/6] local-derivation-goal: Print sandbox error detail on - darwin -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/unix/build/local-derivation-goal.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index 067755c0d..f34d68403 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2208,8 +2208,9 @@ void LocalDerivationGoal::runChild() - sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING"); - sandboxArgs.push_back("1"); - } -- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) { -- writeFull(STDERR_FILENO, "failed to configure sandbox\n"); -+ char * sandbox_errbuf = nullptr; -+ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) { -+ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)")); - _exit(1); - } - } --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/git/0005-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/git/0005-local-derivation-goal-Refactor.patch deleted file mode 100644 index cec9d67513ed..000000000000 --- a/pkgs/tools/package-management/nix/patches/git/0005-local-derivation-goal-Refactor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 06e27042e176b79561f50decb0fdf836b7bec3f5 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:50:27 +0200 -Subject: [PATCH 5/6] local-derivation-goal: Refactor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This works because the `builder` and `args` variables are only used -in the non-builtin code path. - -Co-Authored-By: Théophane Hufschmitt -Signed-off-by: Jörg Thalheim ---- - src/libstore/unix/build/local-derivation-goal.cc | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index f34d68403..f781a84c6 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2214,15 +2214,12 @@ void LocalDerivationGoal::runChild() - _exit(1); - } - } -+#endif - -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); --#else - if (!drv->isBuiltin()) { - builder = drv->builder; - args.push_back(std::string(baseNameOf(drv->builder))); - } --#endif - - for (auto & i : drv->args) - args.push_back(rewriteStrings(i, inputRewrites)); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/patches/git/0006-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/git/0006-local-derivation-goal-Move-builder-preparation-to-no.patch deleted file mode 100644 index 4e63db1f183e..000000000000 --- a/pkgs/tools/package-management/nix/patches/git/0006-local-derivation-goal-Move-builder-preparation-to-no.patch +++ /dev/null @@ -1,75 +0,0 @@ -From d1e0bae55afb3c3ef0bcad5d644b0e04da6279b3 Mon Sep 17 00:00:00 2001 -From: Robert Hensing -Date: Thu, 3 Oct 2024 12:57:00 +0200 -Subject: [PATCH 6/6] local-derivation-goal: Move builder preparation to - non-builtin code path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - .../unix/build/local-derivation-goal.cc | 25 ++++++++----------- - 1 file changed, 10 insertions(+), 15 deletions(-) - -diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc -index f781a84c6..dcfaadeef 100644 ---- a/src/libstore/unix/build/local-derivation-goal.cc -+++ b/src/libstore/unix/build/local-derivation-goal.cc -@@ -2087,11 +2087,6 @@ void LocalDerivationGoal::runChild() - throw SysError("setuid failed"); - } - -- /* Fill in the arguments. */ -- Strings args; -- -- std::string builder = "invalid"; -- - #if __APPLE__ - /* This has to appear before import statements. */ - std::string sandboxProfile = "(version 1)\n"; -@@ -2216,14 +2211,6 @@ void LocalDerivationGoal::runChild() - } - #endif - -- if (!drv->isBuiltin()) { -- builder = drv->builder; -- args.push_back(std::string(baseNameOf(drv->builder))); -- } -- -- for (auto & i : drv->args) -- args.push_back(rewriteStrings(i, inputRewrites)); -- - /* Indicate that we managed to set up the build environment. */ - writeFull(STDERR_FILENO, std::string("\2\n")); - -@@ -2254,6 +2241,14 @@ void LocalDerivationGoal::runChild() - } - } - -+ // Now builder is not builtin -+ -+ Strings args; -+ args.push_back(std::string(baseNameOf(drv->builder))); -+ -+ for (auto & i : drv->args) -+ args.push_back(rewriteStrings(i, inputRewrites)); -+ - #if __APPLE__ - posix_spawnattr_t attrp; - -@@ -2275,9 +2270,9 @@ void LocalDerivationGoal::runChild() - posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL); - } - -- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #else -- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); -+ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data()); - #endif - - throw SysError("executing '%1%'", drv->builder); --- -2.46.1 - diff --git a/pkgs/tools/package-management/nix/update-all.sh b/pkgs/tools/package-management/nix/update-all.sh new file mode 100755 index 000000000000..00a5bea82169 --- /dev/null +++ b/pkgs/tools/package-management/nix/update-all.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update jq + +set -xeuo pipefail + +SCRIPT_DIR=$(dirname "$(readlink -f "$0")") +NIXPKGS_DIR=$(readlink -f "$SCRIPT_DIR/../../../..") +cd "$NIXPKGS_DIR" + +nix_versions=$(nix eval --impure --json --expr "with import ./. { config.allowAliases = false; }; builtins.filter (name: builtins.match \"nix_.*\" name != null) (builtins.attrNames nixVersions)" | jq -r '.[]') +for name in $nix_versions; do + minor_version=${name#nix_*_} + if [[ "$name" = "nix_2_3" ]]; then # not maintained by the nix team + continue + fi + nix-update --override-filename "$SCRIPT_DIR/default.nix" --version-regex "(2\\.${minor_version}\..+)" --build --commit "nixVersions.$name" +done + +commit_json=$(curl -s https://api.github.com/repos/NixOS/nix/commits/master) # format: 2024-11-01T10:18:53Z +date_of_commit=$(echo "$commit_json" | jq -r '.commit.author.date') +suffix="pre$(date -d "$date_of_commit" +%Y%m%d)_" +sed -i -e "s|\"pre[0-9]\{8\}_|\"$suffix|g" "$SCRIPT_DIR/default.nix" +nix-update --override-filename "$SCRIPT_DIR/default.nix" --version branch --build --commit "nixVersions.git" diff --git a/pkgs/tools/security/bao/default.nix b/pkgs/tools/security/bao/default.nix index 5531b7c3323c..c36a1f34e96d 100644 --- a/pkgs/tools/security/bao/default.nix +++ b/pkgs/tools/security/bao/default.nix @@ -13,7 +13,12 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+MjfqIg/aKPWhzxbPJ0dnS4egCj50Ib7ob3zXUSBXRg="; }; - cargoHash = "sha256-SNsRN5XgchZq6/BZnMeahIqnkP4Jq6bZxbE5cDVpsQA="; + cargoPatches = [ + # https://github.com/oconnor663/bao/pull/55 + ./test-exe.patch + ]; + + cargoHash = "sha256-mmhTG3WXVjIKtaz2xP9aYI9GQNTbx4l3c6UgKSMgQJU="; meta = { description = "Implementation of BLAKE3 verified streaming"; diff --git a/pkgs/tools/security/bao/test-exe.patch b/pkgs/tools/security/bao/test-exe.patch new file mode 100644 index 000000000000..0dd08724b53a --- /dev/null +++ b/pkgs/tools/security/bao/test-exe.patch @@ -0,0 +1,40 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 2f66e42..34240e8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -26,6 +26,9 @@ path = "src/main.rs" + [dependencies.arrayref] + version = "0.3.5" + ++[dependencies.assert_cmd] ++version = "2.0.16" ++ + [dependencies.bao] + version = "0.12" + +diff --git a/tests/test.rs b/tests/test.rs +index f9427bd..48aabca 100644 +--- a/tests/test.rs ++++ b/tests/test.rs +@@ -1,8 +1,7 @@ + use duct::cmd; + use rand::prelude::*; +-use std::env::consts::EXE_EXTENSION; + use std::fs; +-use std::path::{Path, PathBuf}; ++use std::path::PathBuf; + use std::sync::Once; + use tempfile::tempdir; + +@@ -15,10 +14,7 @@ pub fn bao_exe() -> PathBuf { + .expect("build failed"); + }); + +- Path::new("target") +- .join("debug") +- .join("bao") +- .with_extension(EXE_EXTENSION) ++ assert_cmd::cargo::cargo_bin("bao") + } + + #[test] diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index 0ceafe655e6b..edb53c145578 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zx"; - version = "8.1.9"; + version = "8.2.0"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-vy53g6nG/krK1PsfIKEdok67ghf9Jm2xNMmZpU2N+A0="; + hash = "sha256-tu5arRnbIVEVkmLBrutW8rNIHN3joA87AYyO+Smmcug="; }; - npmDepsHash = "sha256-bKckzwvJNWDYkF1ZBwB9RpzJAVTIoAjoKK8D3V8RHmQ="; + npmDepsHash = "sha256-TEVEa0hvSRFp1ju1Ajer4u7mdf4y/N3ged8wuXzyy8A="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix deleted file mode 100644 index 481a75e1bd12..000000000000 --- a/pkgs/tools/text/riffdiff/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "riffdiff"; - version = "3.3.3"; - - src = fetchFromGitHub { - owner = "walles"; - repo = "riff"; - rev = version; - hash = "sha256-IdYQ8vD3ZIzqdNY4JtR8f2huV/DWOhV8FUn7tuRe7IQ="; - }; - - cargoHash = "sha256-1on4CTstEvjNLtk1RG6dcNl0XhaPYAy+U0DYn/aVzEg="; - - meta = with lib; { - description = "Diff filter highlighting which line parts have changed"; - homepage = "https://github.com/walles/riff"; - license = licenses.mit; - maintainers = with maintainers; [ johnpyp ]; - mainProgram = "riff"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 363aefcd2e53..29df06171745 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -149,6 +149,7 @@ mapAliases { (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15 blockbench-electron = blockbench; # Added 2024-03-16 + bloom = throw "'bloom' has been removed because it was unmaintained upstream."; # Added 2024-11-02 bmap-tools = bmaptool; # Added 2024-08-05 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 @@ -924,6 +925,7 @@ mapAliases { paperless-ng = paperless-ngx; # Added 2022-04-11 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 patchelfStable = patchelf; # Added 2024-01-25 + paup = paup-cli; # Added 2024-09-11 pcsctools = pcsc-tools; # Added 2023-12-07 pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02 @@ -1161,6 +1163,7 @@ mapAliases { ### T ### tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 + tailor = throw "'tailor' has been removed from nixpkgs, as it was unmaintained upstream."; # Added 2024-11-02 tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17 taskwarrior = lib.warn "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; taplo-cli = taplo; # Added 2022-07-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a559970b5de..b164b55004ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -341,8 +341,6 @@ with pkgs; blst = callPackage ../development/libraries/blst { }; - bloom = qt6Packages.callPackage ../development/tools/bloom { }; - bloodhound-py = with python3Packages; toPythonApplication bloodhound-py; bodyclose = callPackage ../development/tools/bodyclose { }; @@ -2756,8 +2754,6 @@ with pkgs; boost = boost185; }; - mucommander = callPackage ../applications/file-managers/mucommander { }; - nnn = callPackage ../applications/file-managers/nnn { }; noice = callPackage ../applications/file-managers/noice { }; @@ -2928,8 +2924,6 @@ with pkgs; twine = with python3Packages; toPythonApplication twine; - abracadabra = qt6Packages.callPackage ../applications/radio/abracadabra { }; - accelergy = callPackage ../applications/science/computer-architecture/accelergy { }; aldo = callPackage ../applications/radio/aldo { }; @@ -7588,10 +7582,6 @@ with pkgs; fpm = callPackage ../tools/package-management/fpm { }; - fprintd = callPackage ../tools/security/fprintd { }; - - fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { }; - ferdium = callPackage ../applications/networking/instant-messengers/ferdium { mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; }; @@ -18147,8 +18137,6 @@ with pkgs; riff = callPackage ../development/tools/misc/riff { }; - riffdiff = callPackage ../tools/text/riffdiff {}; - rman = callPackage ../development/tools/misc/rman { }; rnginline = with python3Packages; toPythonApplication rnginline; @@ -19455,8 +19443,6 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../development/tools/garble { }; - gcab = callPackage ../development/libraries/gcab { }; gcovr = with python3Packages; toPythonApplication gcovr; @@ -20680,8 +20666,6 @@ with pkgs; extraOnly = true; }; - libfprint = callPackage ../development/libraries/libfprint { }; - libfprint-tod = callPackage ../development/libraries/libfprint-tod { }; libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { }; @@ -21368,8 +21352,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; - libsnark = callPackage ../development/libraries/libsnark { }; - libsodium = callPackage ../development/libraries/libsodium { }; libsoup = callPackage ../development/libraries/libsoup { }; @@ -26460,8 +26442,6 @@ with pkgs; upower = callPackage ../os-specific/linux/upower { }; - upscayl = callPackage ../applications/graphics/upscayl { }; - usbguard = callPackage ../os-specific/linux/usbguard { }; usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { }; @@ -27757,15 +27737,6 @@ with pkgs; ### APPLICATIONS / GIS - gmt = callPackage ../applications/gis/gmt { - inherit (darwin.apple_sdk.frameworks) - Accelerate CoreGraphics CoreVideo; - }; - - gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; - - dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; - grass = callPackage ../applications/gis/grass { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; @@ -28545,8 +28516,6 @@ with pkgs; dirt = callPackage ../applications/audio/dirt { }; - distrho = callPackage ../applications/audio/distrho { }; - dit = callPackage ../applications/editors/dit { }; djvulibre = callPackage ../applications/misc/djvulibre { }; @@ -30231,11 +30200,7 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - stdenv = if stdenv.hostPlatform.isDarwin - then overrideSDK stdenv "11.0" - else stdenv; - }; + kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { }; @@ -32504,8 +32469,6 @@ with pkgs; tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs { }; - tailor = callPackage ../applications/version-management/tailor { }; - tailor-gui = callPackage ../os-specific/linux/tailor-gui { }; taizen = callPackage ../applications/misc/taizen { }; @@ -32546,7 +32509,7 @@ with pkgs; telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { stdenv = if stdenv.hostPlatform.isDarwin - then overrideSDK stdenv "11.0" + then llvmPackages_19.stdenv else stdenv; }; @@ -32730,8 +32693,6 @@ with pkgs; tony = libsForQt5.callPackage ../applications/audio/tony { }; - toot = callPackage ../applications/misc/toot { }; - toipe = callPackage ../applications/misc/toipe { }; toxiproxy = callPackage ../development/tools/toxiproxy { }; @@ -34440,8 +34401,6 @@ with pkgs; frogatto = callPackage ../games/frogatto { }; - frozen-bubble = callPackage ../games/frozen-bubble { }; - fsg = callPackage ../games/fsg { }; gambit-chess = callPackage ../games/gambit { }; @@ -37759,8 +37718,6 @@ with pkgs; unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; - valent = callPackage ../applications/misc/valent { }; - vault-medusa = callPackage ../tools/security/vault-medusa { }; vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 78175b359655..705d6014a23c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21379,14 +21379,14 @@ with self; { ProtocolHTTP2 = buildPerlModule { pname = "Protocol-HTTP2"; - version = "1.10"; - + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CR/CRUX/Protocol-HTTP2-1.10.tar.gz"; - hash = "sha256-wmoAWPtK+ul+S/DbxkGJ9nEURRXERH89y1l+zQOWpko="; + url = "mirror://cpan/authors/id/C/CR/CRUX/Protocol-HTTP2-1.11.tar.gz"; + hash = "sha256-Vp8Fsavpl7UHyCUVMMyB0e6WvZMsxoJTS2zkhlNQCRM="; }; buildInputs = [ AnyEvent ModuleBuildTiny NetSSLeay TestLeakTrace TestSharedFork TestTCP ]; meta = { + homepage = "https://github.com/vlet/p5-Protocol-HTTP2"; description = "HTTP/2 protocol implementation (RFC 7540)"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0307e5185a1d..6f4a454b8d14 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -650,8 +650,6 @@ in { name = "snmp"; buildInputs = [ net-snmp openssl ]; configureFlags = [ "--with-snmp" ]; - # net-snmp doesn't build on darwin. - meta.broken = (!stdenv.hostPlatform.isDarwin); doCheck = false; } { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e15b48dcb152..716f014cefe9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2844,6 +2844,8 @@ self: super: with self; { dalle-mini = callPackage ../development/python-modules/dalle-mini { }; + daltonlens = callPackage ../development/python-modules/daltonlens { }; + daphne = callPackage ../development/python-modules/daphne { }; daqp = callPackage ../development/python-modules/daqp { }; @@ -3388,6 +3390,8 @@ self: super: with self; { django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { }; + django-elasticsearch-dsl = callPackage ../development/python-modules/django-elasticsearch-dsl { }; + django-encrypted-model-fields = callPackage ../development/python-modules/django-encrypted-model-fields { }; django-environ = callPackage ../development/python-modules/django-environ { }; @@ -6237,6 +6241,8 @@ self: super: with self; { iopath = callPackage ../development/python-modules/iopath { }; + iosbackup = callPackage ../development/python-modules/iosbackup { }; + iotawattpy = callPackage ../development/python-modules/iotawattpy { }; iottycloud = callPackage ../development/python-modules/iottycloud { }; @@ -6905,7 +6911,9 @@ self: super: with self; { inherit (pkgs) lammps; }; - lancedb = callPackage ../development/python-modules/lancedb { }; + lancedb = callPackage ../development/python-modules/lancedb { + inherit (pkgs) protobuf; + }; langchain = callPackage ../development/python-modules/langchain { }; @@ -7845,6 +7853,8 @@ self: super: with self; { mechanize = callPackage ../development/python-modules/mechanize { }; + medallion = callPackage ../development/python-modules/medallion { }; + mediafile = callPackage ../development/python-modules/mediafile { }; mediafire-dl = callPackage ../development/python-modules/mediafire-dl { }; @@ -9131,6 +9141,8 @@ self: super: with self; { nsapi = callPackage ../development/python-modules/nsapi { }; + nskeyedunarchiver = callPackage ../development/python-modules/nskeyedunarchiver { }; + ntc-templates = callPackage ../development/python-modules/ntc-templates { }; ntplib = callPackage ../development/python-modules/ntplib { }; @@ -9199,6 +9211,8 @@ self: super: with self; { python-hcl2 = callPackage ../development/python-modules/python-hcl2 { }; + python-lorem = callPackage ../development/python-modules/python-lorem { }; + python-ndn = callPackage ../development/python-modules/python-ndn { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; @@ -14257,6 +14271,8 @@ self: super: with self; { sensorpush-ble = callPackage ../development/python-modules/sensorpush-ble { }; + sensoterra = callPackage ../development/python-modules/sensoterra { }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece; }; @@ -15151,6 +15167,8 @@ self: super: with self; { stim = callPackage ../development/python-modules/stim { }; + stix2 = callPackage ../development/python-modules/stix2 { }; + stix2-patterns = callPackage ../development/python-modules/stix2-patterns { }; stix2-validator = callPackage ../development/python-modules/stix2-validator { }; @@ -15624,6 +15642,8 @@ self: super: with self; { textparser = callPackage ../development/python-modules/textparser { }; + textstat = callPackage ../development/python-modules/textstat { }; + textual = callPackage ../development/python-modules/textual { }; textual-dev = callPackage ../development/python-modules/textual-dev { }; @@ -17234,6 +17254,8 @@ self: super: with self; { utils = callPackage ../development/python-modules/utils { }; + uuid6 = callPackage ../development/python-modules/uuid6 { }; + uv = toPythonModule (pkgs.uv.override { python3Packages = self; });