From d20d33daac3541ee289ebb5c9b46de644d0ae4d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 08:05:47 +0000 Subject: [PATCH 001/193] gnustep.gui: 0.30.0 -> 0.31.1 --- pkgs/desktops/gnustep/gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index c1e01f6f3705..498b120adea4 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.30.0"; + version = "0.31.1"; pname = "gnustep-gui"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-24hL4TeIY6izlhQUcxKI0nXITysAPfRrncRqsDm2zNk="; + sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo="; }; nativeBuildInputs = [ make wrapGNUstepAppsHook ]; From 6a4a325e33cb859e3fcce40bb41110eaa9107fad Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 10 Jun 2024 20:52:29 +0200 Subject: [PATCH 002/193] gnustep.back: 0.30.0 -> 0.31.0 --- pkgs/desktops/gnustep/back/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 247c20ed69f0..e4ec5d03010a 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnustep-back"; - version = "0.30.0"; + version = "0.31.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-HD4PLdkE573nPWqFwffUmcHw8VYIl5rLiPKWrbnwpCI="; + sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg="; }; nativeBuildInputs = [ make pkg-config wrapGNUstepAppsHook ]; From b3bef99d14e1f178bcf62188faade16d3f74274e Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 3 Jul 2024 12:38:05 +0200 Subject: [PATCH 003/193] onlyoffice: drop 7.2.0 version --- pkgs/by-name/on/onlyoffice-bin/package.nix | 224 +++++++++--------- .../on/onlyoffice-bin_latest/package.nix | 202 ---------------- .../on/onlyoffice-bin_latest/update.sh | 5 - pkgs/top-level/aliases.nix | 5 +- 4 files changed, 118 insertions(+), 318 deletions(-) delete mode 100644 pkgs/by-name/on/onlyoffice-bin_latest/package.nix delete mode 100644 pkgs/by-name/on/onlyoffice-bin_latest/update.sh diff --git a/pkgs/by-name/on/onlyoffice-bin/package.nix b/pkgs/by-name/on/onlyoffice-bin/package.nix index 4c9c0cd1e326..5156778b7e25 100644 --- a/pkgs/by-name/on/onlyoffice-bin/package.nix +++ b/pkgs/by-name/on/onlyoffice-bin/package.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, buildFHSEnv # Alphabetic ordering below , alsa-lib , at-spi2-atk @@ -24,6 +25,8 @@ , libudev0-shim , libdrm , makeWrapper +, mesa +, noto-fonts-cjk-sans , nspr , nss , pulseaudio @@ -52,18 +55,6 @@ let # TODO: Find out which of these fonts we'd be allowed to distribute along # with this package, or how to make this easier for users otherwise. - # Not using the `noto-fonts-cjk` package from nixpkgs, because it was - # reported that its `.ttc` file is not picked up by OnlyOffice, see: - # https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816 - noto-fonts-cjk = fetchurl { - url = - let - version = "v20201206-cjk"; - in - "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; - sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4="; - }; - runtimeLibs = lib.makeLibraryPath [ curl glibc @@ -72,115 +63,130 @@ let pulseaudio ]; -in -stdenv.mkDerivation rec { - pname = "onlyoffice-desktopeditors"; - version = "7.2.0"; - minor = null; - src = fetchurl { - url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-O9gC/b5/eZ1YImuXpEZOJhI1rzCNuFrm5IqablnYo9Y="; + derivation = stdenv.mkDerivation rec { + pname = "onlyoffice-desktopeditors"; + version = "8.1.0"; + minor = null; + src = fetchurl { + url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; + sha256 = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + wrapGAppsHook3 + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + atk + cairo + dbus + dconf + fontconfig + gdk-pixbuf + glib + gsettings-desktop-schemas + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk2 + gtk3 + libpulseaudio + libdrm + nspr + nss + mesa # libgbm + qt5.qtbase + qt5.qtdeclarative + qt5.qtsvg + qt5.qtwayland + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + ]; + + dontWrapQtApps = true; + + unpackPhase = '' + dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib,share} + + mv usr/bin/* $out/bin + mv usr/share/* $out/share/ + mv opt/onlyoffice/desktopeditors $out/share + + for f in $out/share/desktopeditors/asc-de-*.png; do + size=$(basename "$f" ".png" | cut -d"-" -f3) + res="''${size}x''${size}" + mkdir -pv "$out/share/icons/hicolor/$res/apps" + ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" + done; + + substituteInPlace $out/bin/onlyoffice-desktopeditors \ + --replace "/opt/onlyoffice/" "$out/share/" + + ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QT_QPA_PLATFORM "xcb" + # the bundled version of qt does not support wayland + ) + ''; }; - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - wrapGAppsHook3 +in + +# In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. +# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. +# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them +buildFHSEnv { + inherit (derivation) pname version; + + targetPkgs = pkgs': [ + curl + derivation + noto-fonts-cjk-sans ]; - buildInputs = [ - alsa-lib - at-spi2-atk - atk - cairo - dbus - dconf - fontconfig - gdk-pixbuf - glib - gsettings-desktop-schemas - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk2 - gtk3 - libpulseaudio - libdrm - nspr - nss - qt5.qtbase - qt5.qtdeclarative - qt5.qtsvg - qt5.qtwayland - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - ]; - - dontWrapQtApps = true; - - unpackPhase = '' - dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner - ''; - - preConfigure = '' - cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/ - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib,share} - - mv usr/bin/* $out/bin - mv usr/share/* $out/share/ - mv opt/onlyoffice/desktopeditors $out/share - - for f in $out/share/desktopeditors/asc-de-*.png; do - size=$(basename "$f" ".png" | cut -d"-" -f3) - res="''${size}x''${size}" - mkdir -pv "$out/share/icons/hicolor/$res/apps" - ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" - done; - - substituteInPlace $out/bin/onlyoffice-desktopeditors \ - --replace "/opt/onlyoffice/" "$out/share/" - - ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors + runScript = "/bin/onlyoffice-desktopeditors"; + extraInstallCommands = '' + mkdir -p $out/share + ln -s ${derivation}/share/icons $out/share + cp -r ${derivation}/share/applications $out/share substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ - --replace "/usr/bin/onlyoffice-desktopeditor" "$out/bin/DesktopEditor" - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ - --set QT_QPA_PLATFORM "xcb" - # the bundled version of qt does not support wayland - ) + --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" ''; passthru.updateScript = ./update.sh; meta = with lib; { description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; - longDescription = '' - The latest versions of OnlyOffice are currently broken on wlroots environments (e.g. Hyprland, Sway). - If you are using a different environment, you can get the latest version using `onlyoffice-bin_latest`. - ''; + mainProgram = "onlyoffice-desktopeditors"; homepage = "https://www.onlyoffice.com/"; downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; diff --git a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix deleted file mode 100644 index 726bda8df039..000000000000 --- a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ stdenv -, lib -, fetchurl -, buildFHSEnv - # Alphabetic ordering below -, alsa-lib -, at-spi2-atk -, atk -, autoPatchelfHook -, cairo -, curl -, dbus -, dconf -, dpkg -, fontconfig -, gcc-unwrapped -, gdk-pixbuf -, glib -, glibc -, gsettings-desktop-schemas -, gst_all_1 -, gtk2 -, gtk3 -, libpulseaudio -, libudev0-shim -, libdrm -, makeWrapper -, mesa -, noto-fonts-cjk-sans -, nspr -, nss -, pulseaudio -, qt5 -, wrapGAppsHook3 -, xkeyboard_config -, xorg -}: -let - - # Note on fonts: - # - # OnlyOffice does not distribute unfree fonts, but makes it easy to pick up - # any fonts you install. See: - # - # * https://helpcenter.onlyoffice.com/en/installation/docs-community-install-fonts-linux.aspx - # * https://www.onlyoffice.com/blog/2020/04/how-to-add-new-fonts-to-onlyoffice-desktop-editors/ - # - # As recommended there, you should download - # - # arial.ttf, calibri.ttf, cour.ttf, symbol.ttf, times.ttf, wingding.ttf - # - # into `~/.local/share/fonts/`, otherwise the default template fonts, and - # things like bullet points, will not look as expected. - - # TODO: Find out which of these fonts we'd be allowed to distribute along - # with this package, or how to make this easier for users otherwise. - - runtimeLibs = lib.makeLibraryPath [ - curl - glibc - gcc-unwrapped.lib - libudev0-shim - pulseaudio - ]; - - derivation = stdenv.mkDerivation rec { - pname = "onlyoffice-desktopeditors"; - version = "8.1.0"; - minor = null; - src = fetchurl { - url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - wrapGAppsHook3 - ]; - - buildInputs = [ - alsa-lib - at-spi2-atk - atk - cairo - dbus - dconf - fontconfig - gdk-pixbuf - glib - gsettings-desktop-schemas - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk2 - gtk3 - libpulseaudio - libdrm - nspr - nss - mesa # libgbm - qt5.qtbase - qt5.qtdeclarative - qt5.qtsvg - qt5.qtwayland - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - ]; - - dontWrapQtApps = true; - - unpackPhase = '' - dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib,share} - - mv usr/bin/* $out/bin - mv usr/share/* $out/share/ - mv opt/onlyoffice/desktopeditors $out/share - - for f in $out/share/desktopeditors/asc-de-*.png; do - size=$(basename "$f" ".png" | cut -d"-" -f3) - res="''${size}x''${size}" - mkdir -pv "$out/share/icons/hicolor/$res/apps" - ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" - done; - - substituteInPlace $out/bin/onlyoffice-desktopeditors \ - --replace "/opt/onlyoffice/" "$out/share/" - - ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ - --set QT_QPA_PLATFORM "xcb" - # the bundled version of qt does not support wayland - ) - ''; - }; - -in - -# In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. -# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. -# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them -buildFHSEnv { - inherit (derivation) pname version; - - targetPkgs = pkgs': [ - curl - derivation - noto-fonts-cjk-sans - ]; - - runScript = "/bin/onlyoffice-desktopeditors"; - - extraInstallCommands = '' - mkdir -p $out/share - ln -s ${derivation}/share/icons $out/share - cp -r ${derivation}/share/applications $out/share - substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ - --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" - ''; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; - mainProgram = "onlyoffice-desktopeditors"; - longDescription = '' - This version is broken on wlroots environments (e.g. Hyprland, Sway). - If you are using one of these environments, please use `onlyoffice-bin` instead. - ''; - homepage = "https://www.onlyoffice.com/"; - downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; - changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ nh2 gtrunsec ]; - }; -} diff --git a/pkgs/by-name/on/onlyoffice-bin_latest/update.sh b/pkgs/by-name/on/onlyoffice-bin_latest/update.sh deleted file mode 100644 index d7b0bc106fa2..000000000000 --- a/pkgs/by-name/on/onlyoffice-bin_latest/update.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts - -version="$(curl -sL "https://api.github.com/repos/ONLYOFFICE/DesktopEditors/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" -update-source-version onlyoffice-bin "$version" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4fecb5c991d..868f130a4406 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1025,8 +1025,9 @@ mapAliases ({ optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 orchis = orchis-theme; # Added 2021-06-09 oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 - onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been renamed to onlyoffice-bin"; # Added 2024-02-05 - onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been renamed to onlyoffice-bin_latest (and updated from 7.5.x)"; # Added 2024-02-05 + onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 + onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 + onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 osxfuse = macfuse-stubs; # Added 2021-03-20 oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 From 9507e176ae0af6ddcb32b08815a2ff34dbcf80ba Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 24 Apr 2024 19:14:18 +0200 Subject: [PATCH 004/193] resticprofile: init at 0.27.0 --- pkgs/by-name/re/resticprofile/package.nix | 91 +++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 pkgs/by-name/re/resticprofile/package.nix diff --git a/pkgs/by-name/re/resticprofile/package.nix b/pkgs/by-name/re/resticprofile/package.nix new file mode 100644 index 000000000000..2903a9987833 --- /dev/null +++ b/pkgs/by-name/re/resticprofile/package.nix @@ -0,0 +1,91 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + restic, + bash, + testers, + resticprofile, +}: + +buildGoModule rec { + pname = "resticprofile"; + version = "0.27.0"; + + src = fetchFromGitHub { + owner = "creativeprojects"; + repo = "resticprofile"; + rev = "refs/tags/v${version}"; + hash = "sha256-CUTDlSpP0ztr3sEKT0ppFnWx/bcVuY1oIKWJNZylDoM="; + }; + + postPatch = '' + substituteInPlace schedule_jobs.go \ + --replace-fail "os.Executable()" "\"$out/bin/resticprofile\", nil" + + substituteInPlace shell/command.go \ + --replace-fail '"bash"' '"${lib.getExe bash}"' + + substituteInPlace filesearch/filesearch.go \ + --replace-fail 'paths := getSearchBinaryLocations()' 'return "${lib.getExe restic}", nil; paths := getSearchBinaryLocations()' + + ''; + + vendorHash = "sha256-t2R5uNsliSn+rIvRM0vT6lQJY62DhhozXnONiCJ9CMc="; + + ldflags = [ + "-X main.commit=${src.rev}" + "-X main.date=unknown" + "-X main.builtBy=nixpkgs" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + preCheck = '' + rm battery_test.go # tries to get battery data + rm update_test.go # tries to use network + rm lock/lock_test.go # needs ping + rm preventsleep/caffeinate_test.go # tries to communicate with dbus + rm priority/ioprio_test.go # tries to set nice(2) IO priority + rm restic/downloader_test.go # tries to use network + rm schedule/schedule_test.go # tries to use systemctl + + # `config/path_test.go` expects `$HOME` to be the same as `~nixbld` which is `$NIX_BUILD_TOP` + export HOME="$NIX_BUILD_TOP" + # `util/tempdir_test.go` expects `$HOME/.cache` to exist + mkdir "$HOME/.cache" + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 $GOPATH/bin/resticprofile -t $out/bin + + installShellCompletion --cmd resticprofile \ + --bash <($out/bin/resticprofile generate --bash-completion) \ + --zsh <($out/bin/resticprofile generate --zsh-completion) + + runHook postInstall + ''; + + passthru = { + tests.version = testers.testVersion { + package = resticprofile; + command = "resticprofile version"; + }; + }; + + meta = { + changelog = "https://github.com/creativeprojects/resticprofile/releases/tag/v${version}"; + description = "Configuration profiles manager for restic backup"; + homepage = "https://creativeprojects.github.io/resticprofile/"; + license = with lib.licenses; [ + gpl3Only + lgpl3 # bash shell completion + ]; + mainProgram = "resticprofile"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} From d203ca98569fca1f9a0641a30cd9841b3b646c0a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 12 Jul 2024 22:15:48 +0200 Subject: [PATCH 005/193] gns3-gui: fix build by pinning python to 3.11, update sip --- pkgs/applications/networking/gns3/default.nix | 2 ++ pkgs/applications/networking/gns3/gui.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index b6838844afe4..8048b87409c1 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,10 +1,12 @@ { callPackage , libsForQt5 +, python311 }: let mkGui = args: callPackage (import ./gui.nix (args)) { inherit (libsForQt5) wrapQtAppsHook; + python3 = python311; }; mkServer = args: callPackage (import ./server.nix (args)) { }; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 895df8abfbc7..dfa92a444e0f 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -33,7 +33,8 @@ python3.pkgs.buildPythonApplication rec { psutil sentry-sdk setuptools - sip4 (pyqt5.override { withWebSockets = true; }) + sip + (pyqt5.override { withWebSockets = true; }) truststore qt5.qtwayland ] ++ lib.optionals (pythonOlder "3.9") [ From 08675bba98bb0dbc61ffacb3e90a627aa201881f Mon Sep 17 00:00:00 2001 From: Kartik Gokte Date: Wed, 17 Jul 2024 16:06:37 +0530 Subject: [PATCH 006/193] prometheus-pve-exporter: 3.2.4 -> 3.4.3 From version 3.2.5, the package's name was changed upstream to use underscores (_) instead of dashes (-). Even though `pname` was changed to reflect this, the nix package itself will still be referenced by `prometheus-pve-exporter`, thus maintaining compatibility. --- pkgs/servers/monitoring/prometheus/pve-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index aaf5f46b075e..7bc1d9280a64 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -5,12 +5,12 @@ }: python3.pkgs.buildPythonApplication rec { - pname = "prometheus-pve-exporter"; - version = "3.2.4"; + pname = "prometheus_pve_exporter"; + version = "3.4.3"; src = fetchPypi { inherit pname version; - hash = "sha256-C7agnOUdtd4YncAiaPQaZqBJ8DKZoM1Fa+dr1F4xYgI="; + hash = "sha256-5xvTUOwBj3N0hxLKfAlEq8y8snoDb92f7o7u7j0RdhY="; }; propagatedBuildInputs = with python3.pkgs; [ From dbba11e241d1c8dfc51b58cb7a501e74f9600748 Mon Sep 17 00:00:00 2001 From: Kartik Gokte Date: Wed, 17 Jul 2024 16:09:11 +0530 Subject: [PATCH 007/193] nixos/prometheus-pve-exporter: added new options introduced in v3.4.3 --- .../services/monitoring/prometheus/exporters/pve.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix index 8928577b6953..fa5852a4999d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix @@ -114,6 +114,13 @@ in Collect PVE onboot status ''; }; + replication = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE replication info + ''; + }; }; }; serviceOpts = { @@ -128,6 +135,7 @@ in --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \ --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \ --${optionalString (!cfg.collectors.config) "no-"}collector.config \ + --${optionalString (!cfg.collectors.replication) "no-"}collector.replication \ ${optionalString (cfg.server.keyFile != null) "--server.keyfile ${cfg.server.keyFile}"} \ ${optionalString (cfg.server.certFile != null) "--server.certfile ${cfg.server.certFile}"} \ --config.file %d/configFile \ From d2719ca4e11a036f9d67e0a02f4d011c3721f218 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 13:12:54 +0000 Subject: [PATCH 008/193] rocksdb: 9.3.1 -> 9.4.0 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index df0c670828a4..b8b30e585f6e 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.3.1"; + version = "9.4.0"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${finalAttrs.version}"; - hash = "sha256-bTUzh7ch14TDcm6GkfhA5I/qUVmUm+RE5d2HMZ3zaNc="; + hash = "sha256-eABOzOuaSMAipX8yuXDfZPTHDyIInyPzreE42MwAcYg="; }; patches = lib.optional (lib.versionAtLeast finalAttrs.version "6.29.3" && enableLiburing) ./fix-findliburing.patch; From 0aab376e3fe5bd09f06d03fcaf438a720f6f7e42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 00:59:28 +0000 Subject: [PATCH 009/193] trytond: 7.2.5 -> 7.2.6 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 78080fd1e9cb..8a2bdcfd5d8a 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.2.5"; + version = "7.2.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ph3S7lwilGMk9tXxmZDIglpLfGmGHV1Dhj4oA8FLjws="; + hash = "sha256-Vz1bYIwhvH8SHZnmv9ZuaoOnNe378gtIWK2UQDBQxas="; }; build-system = [ setuptools ]; From 065af07beb1bc481b1b55df194eb9bc0056f6b10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 02:12:12 +0000 Subject: [PATCH 010/193] python312Packages.asf-search: 7.1.3 -> 7.1.4 --- pkgs/development/python-modules/asf-search/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 1d54f0895933..f893d2297503 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "7.1.3"; + version = "7.1.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-4TiLncVxDxGB8YSgeEvXGb3kY2tjfYYmBAleJeaiPWU="; + hash = "sha256-l1FrhQ82+0g/ivm2K2yXJ5EZNDGM3Olcj1AxiQc8cZI="; }; pythonRelaxDeps = [ "tenacity" ]; From 12781bd953fca2c02ceb457e6ad606cd5b0739c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 05:58:49 +0000 Subject: [PATCH 011/193] python312Packages.wagtail: 6.1.2 -> 6.1.3 --- pkgs/development/python-modules/wagtail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index c1b509b924dd..6b01ac4147ff 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "6.1.2"; + version = "6.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/bgsbNb2rlwfeyMSFmlp2GAQFbZcuymtEg76xyfTmcE="; + hash = "sha256-j0kIqxtrljqKp6348OxzjNHcebmBbG1fWQGPYApAQ3g="; }; postPatch = '' From b60a7dae44a879e9c3f569eab37c252b050e9fba Mon Sep 17 00:00:00 2001 From: Kartik Gokte Date: Thu, 18 Jul 2024 17:33:27 +0530 Subject: [PATCH 012/193] grafanaPlugins.grafana-oncall-app: 1.7.1 -> 1.8.5 --- .../monitoring/grafana/plugins/grafana-oncall-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix index 893a46e87f78..a1d67c5283a5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -3,8 +3,8 @@ grafanaPlugin { pname = "grafana-oncall-app"; versionPrefix = "v"; - version = "1.7.1"; - zipHash = "sha256-G3QZq26fzv6sJ5j7QKdPPXhEj95iounZO+Ak8cXZDLc="; + version = "1.8.5"; + zipHash = "sha256-HuZYHPTWm0EPKQbmapALK2j+PzM+J7gcWM9w8vU2yI0="; meta = with lib; { description = "Developer-friendly incident response for Grafana"; license = licenses.agpl3Only; From 0938524f2330747e4f723284e63030cf52f27acc Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Thu, 18 Jul 2024 20:03:34 +0800 Subject: [PATCH 013/193] librime-octagram: init at 0-unstable-2024-02-05 --- pkgs/by-name/li/librime-octagram/package.nix | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/li/librime-octagram/package.nix diff --git a/pkgs/by-name/li/librime-octagram/package.nix b/pkgs/by-name/li/librime-octagram/package.nix new file mode 100644 index 000000000000..b1b96d5eea6c --- /dev/null +++ b/pkgs/by-name/li/librime-octagram/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: + +stdenvNoCC.mkDerivation { + pname = "librime-octagram"; + version = "0-unstable-2024-02-05"; + + src = fetchFromGitHub { + owner = "lotem"; + repo = "librime-octagram"; + rev = "bd12863f45fbbd5c7db06d5ec8be8987b10253bf"; + hash = "sha256-77g72tee4ahNcu3hfW1Okqr9z8Y6WrPgUhw316O72Ng="; + }; + + installPhase = '' + runHook preInstall + + mkdir $out + cp --archive --verbose * $out + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "RIME essay grammar plugin"; + homepage = "https://github.com/lotem/librime-octagram"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ azuwis ]; + }; +} From ec200dd8c6ab93d45f1fcab5b7b7b15f1458a7e1 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Thu, 18 Jul 2024 20:15:31 +0800 Subject: [PATCH 014/193] librime: enable librime-octagram plugin by default Follow ArchLinux[1] and Debian[2]. [1]: https://gitlab.archlinux.org/archlinux/packaging/packages/librime/-/blob/main/PKGBUILD [2]: https://packages.debian.org/bookworm/librime-plugin-octagram --- pkgs/development/libraries/librime/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 73c335d00e15..6ff2abb11de9 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - yaml-cpp, gtest, capnproto, pkg-config, librime-lua, plugins ? [ librime-lua ] }: + yaml-cpp, gtest, capnproto, pkg-config, librime-lua, librime-octagram, + plugins ? [ librime-lua librime-octagram ] }: let copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}"; From 8b654c0796a25bfe6c08ed5159e30cfd8d04d761 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 12:24:18 +0000 Subject: [PATCH 015/193] python312Packages.croniter: 2.0.5 -> 2.0.7 --- pkgs/development/python-modules/croniter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index b92c7cc2ecd3..00f59b7990e6 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "croniter"; - version = "2.0.5"; + version = "2.0.7"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8fjKCvZCEvvpmxvuEl7lobU6nBtDOWjYvKiBe3nSN/M="; + hash = "sha256-EEG5ErSx4DdRoJk1Mb7Pd4Ua5uizNMnHb/7/uPBV9T8="; }; nativeBuildInputs = [ setuptools ]; From 3a286acade4eedd44cf9ecf418d14ef65f279a71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 14:58:02 +0000 Subject: [PATCH 016/193] python312Packages.pyngrok: 7.1.6 -> 7.2.0 --- pkgs/development/python-modules/pyngrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 345f3cec3353..7082611f6716 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.1.6"; + version = "7.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-BcD8pjQJE2WKvdxiOgpTknrO2T4n/++AHSSBS8sYDqo="; + hash = "sha256-TkOvmy8hzu2NITeXAo/ogjAD8YW0l5Lk04MwI2XIFRU="; }; nativeBuildInputs = [ setuptools ]; From ab65220a1af24cc46a67021e624fce3f4c87ebfa Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Thu, 18 Jul 2024 19:25:04 +1000 Subject: [PATCH 017/193] regreet: add options for controlling theming --- nixos/modules/programs/regreet.nix | 87 ++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix index 0db1f59e5912..cec3e0bf5046 100644 --- a/nixos/modules/programs/regreet.nix +++ b/nixos/modules/programs/regreet.nix @@ -58,9 +58,96 @@ in modifiable properties. ''; }; + + theme = { + package = lib.mkPackageOption pkgs "gnome-themes-extra" { } // { + description = '' + The package that provides the theme given in the name option. + ''; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "Adwaita"; + description = '' + Name of the theme to use for regreet. + ''; + }; + }; + + iconTheme = { + package = lib.mkPackageOption pkgs "adwaita-icon-theme" { } // { + description = '' + The package that provides the icon theme given in the name option. + ''; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "Adwaita"; + description = '' + Name of the icon theme to use for regreet. + ''; + }; + }; + + font = { + package = lib.mkPackageOption pkgs "cantarell-fonts" { } // { + description = '' + The package that provides the font given in the name option. + ''; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "Cantarell"; + description = '' + Name of the font to use for regreet. + ''; + }; + + size = lib.mkOption { + type = lib.types.ints.positive; + default = 16; + description = '' + Size of the font to use for regreet. + ''; + }; + }; + + cursorTheme = { + package = lib.mkPackageOption pkgs "adwaita-icon-theme" { } // { + description = '' + The package that provides the cursor theme given in the name option. + ''; + }; + + name = lib.mkOption { + type = lib.types.str; + default = "Adwaita"; + description = '' + Name of the cursor theme to use for regreet. + ''; + }; + }; }; config = lib.mkIf cfg.enable { + environment.systemPackages = [ + cfg.theme.package + cfg.iconTheme.package + cfg.cursorTheme.package + ]; + + fonts.packages = [ cfg.font.package ]; + + programs.regreet.settings = { + cursor_theme_name = cfg.cursorTheme.name; + font_name = "${cfg.font.name} ${toString cfg.font.size}"; + icon_theme_name = cfg.iconTheme.name; + theme_name = cfg.theme.name; + }; + services.greetd = { enable = lib.mkDefault true; settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${lib.getExe cfg.package}"; From 30ad669869d106309fb8b93e610b74ad4983b814 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 18 Jul 2024 17:48:06 +0100 Subject: [PATCH 018/193] =?UTF-8?q?apacheKafka:=203.7.0=20=E2=86=92=203.7.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/apache-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 70445612115f..fd7cd084a60b 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,9 +3,9 @@ let versionMap = { "3_7" = { - kafkaVersion = "3.7.0"; + kafkaVersion = "3.7.1"; scalaVersion = "2.13"; - sha256 = "sha256-ZfJuWTe7t23+eN+0FnMN+n4zeLJ+E/0eIE8aEJm/r5w="; + sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k="; jre = jdk17_headless; }; "3_6" = { From 97930732dfc837d421a711fc722301d74491afaf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 18 Jul 2024 08:49:31 -0400 Subject: [PATCH 019/193] nodePackages.node2nix: use top-level cctools in generated files --- pkgs/development/node-packages/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 9e8d268f1cf6..ddff0ec6b2cf 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -196,6 +196,11 @@ final: prev: { url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch"; hash = "sha256-pe8Xm4mjPh9oKXugoMY6pRl8YYgtdw0sRXN+TienalU="; }) + # Use top-level cctools in generated files - PR svanderburg/node2nix#334 + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/31c308bba5f39ea0105f66b9f40dbe57fed7a292.patch"; + hash = "sha256-DdNRteonMvyffPh0uo0lUbsohKYnyqv0QcD9vjN6aXE="; + }) ]; in '' ${lib.concatStringsSep "\n" (map (patch: "patch -d $out/lib/node_modules/node2nix -p1 < ${patch}") patches)} From 1ede69682a830e8489ab54f2ef3fb0927c49f6e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 00:52:27 +0000 Subject: [PATCH 020/193] python312Packages.pyinstaller: 6.8.0 -> 6.9.0 --- pkgs/development/python-modules/pyinstaller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index 2c8fc65ebd28..c8b4d4697202 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pyinstaller"; - version = "6.8.0"; + version = "6.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-P0tlIPRCP+GbzC/WOrcjiFGuK9y8mPJbxdL5fMYgEuk="; + hash = "sha256-9KdcVS+swuKjcPHkIrlxteXNtAWP84zqAjWqIfwLN48="; }; From ee487ff8d6ec127204ba772d6ecf201fa5d9e839 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 15:50:52 +0000 Subject: [PATCH 021/193] python312Packages.uxsim: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/uxsim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index 675e92a1de31..f75a620ec5a1 100644 --- a/pkgs/development/python-modules/uxsim/default.nix +++ b/pkgs/development/python-modules/uxsim/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; rev = "refs/tags/v${version}"; - hash = "sha256-2lN2Cu0XXiYdLiE7phpGqhkBDjkmxLJt4ILb6ORWdCI="; + hash = "sha256-74iNsRtEmpE+i4FeKCXrqczdMP9u4mVt6eyF/4RXZfU="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; From 0ccd8ca2ef14994f78556c941ff62e49dec423ff Mon Sep 17 00:00:00 2001 From: Cottand Date: Sun, 2 Jun 2024 11:10:47 +0100 Subject: [PATCH 022/193] nomad, nomad_1_7, nomad_1_8: build with buildGo122Module --- pkgs/applications/networking/cluster/nomad/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index e170919495d3..e7d4eae7f63c 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , buildGo121Module +, buildGo122Module , fetchFromGitHub , nixosTests , installShellFiles @@ -81,7 +82,7 @@ rec { }; nomad_1_7 = generic { - buildGoModule = buildGo121Module; + buildGoModule = buildGo122Module; version = "1.7.7"; sha256 = "sha256-4nuRheidR6rIoytrnDQdIP69f+sBLJ3Ias5DvqVaLFc="; vendorHash = "sha256-ZuaD8iDsT+/eW0QUavf485R804Jtjl76NcQWYHA8QII="; @@ -93,7 +94,7 @@ rec { }; nomad_1_8 = generic { - buildGoModule = buildGo121Module; + buildGoModule = buildGo122Module; version = "1.8.0"; sha256 = "sha256-j/9wvnxYhv6h344904cO2Fi6pNeSV5IfcqS4mSjDqpo="; vendorHash = "sha256-jNdLLs/mfARl5Uk9RalwSDFLAKqIISEkek3l1wV8EYE="; From d1ac2412bc5e8bc212d4088e73b42599a111103a Mon Sep 17 00:00:00 2001 From: Cottand Date: Sat, 20 Jul 2024 19:46:33 +0100 Subject: [PATCH 023/193] nomad_1_8: 1.8.0 -> 1.8.2 --- pkgs/applications/networking/cluster/nomad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index e7d4eae7f63c..07225d762068 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -95,9 +95,9 @@ rec { nomad_1_8 = generic { buildGoModule = buildGo122Module; - version = "1.8.0"; - sha256 = "sha256-j/9wvnxYhv6h344904cO2Fi6pNeSV5IfcqS4mSjDqpo="; - vendorHash = "sha256-jNdLLs/mfARl5Uk9RalwSDFLAKqIISEkek3l1wV8EYE="; + version = "1.8.2"; + sha256 = "sha256-deVLC7yGgLHCauq+3h0Uu5ln5omoeV8/FkVtQM9CEXc="; + vendorHash = "sha256-Pr38tRzym8UFPZKs9367xOZJ9P5OHotwwClorcSgOys="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' From 6e52b035839be9fa4e333d9b47fe8fc0af5f611e Mon Sep 17 00:00:00 2001 From: Cottand Date: Sat, 20 Jul 2024 20:03:04 +0100 Subject: [PATCH 024/193] nomad_1_5: deprecate --- .../doc/manual/release-notes/rl-2411.section.md | 2 ++ .../networking/cluster/nomad/default.nix | 16 ++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 38168b312e41..af79b131b08b 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -138,6 +138,8 @@ before changing the package to `pkgs.stalwart-mail` in [`services.stalwart-mail.package`](#opt-services.stalwart-mail.package). +- The `nomad_1_5` package was dropped, as [it has reached end-of-life upstream](https://support.hashicorp.com/hc/en-us/articles/360021185113-Support-Period-and-End-of-Life-EOL-Policy). Evaluating it will throw an error. + - `androidndkPkgs` has been updated to `androidndkPkgs_26`. - Android NDK version 26 and SDK version 33 are now the default versions used for cross compilation to android. diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 07225d762068..66403998d835 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -45,6 +45,8 @@ let maintainers = with maintainers; [ rushmorem pradeepchhetri techknowlogick cottand ]; }; } // attrs'); + + throwUnsupportaed = version: "${version} is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; in rec { # Nomad never updates major go versions within a release series and is unsupported @@ -55,19 +57,9 @@ rec { nomad = nomad_1_7; - nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; + nomad_1_4 = throwUnsupportaed "nomad_1_4"; - nomad_1_5 = generic { - buildGoModule = buildGo121Module; - version = "1.5.15"; - sha256 = "sha256-OFmGOU+ObA0+BS48y0ZyyxR+VI5DYL39peVKcyVHgGI="; - vendorHash = "sha256-Ds94lB43cyMNyRJZti0mZDWGTtSdwY31dDijfAUxR0I="; - license = lib.licenses.mpl20; - passthru.tests.nomad = nixosTests.nomad; - preCheck = '' - export PATH="$PATH:$NIX_BUILD_TOP/go/bin" - ''; - }; + nomad_1_5 = throwUnsupportaed "nomad_1_5"; nomad_1_6 = generic { buildGoModule = buildGo121Module; From fc92a20d35d82be17863fbc7685c239f64d1949b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 20 Jul 2024 15:35:54 -0400 Subject: [PATCH 025/193] keycloak.plugins.keycloak-metrics-spi: 5.0.0 -> 6.0.0 Diff: https://github.com/aerogear/keycloak-metrics-spi/compare/refs/tags/5.0.0...6.0.0 --- .../keycloak/keycloak-metrics-spi/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index 82e6163491ba..a595dab70333 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -1,21 +1,21 @@ -{ maven, stdenv, lib, fetchFromGitHub }: +{ + maven, + lib, + fetchFromGitHub, +}: maven.buildMavenPackage rec { pname = "keycloak-metrics-spi"; - version = "5.0.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "aerogear"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iagXbsKsU4vNP9eg05bwXEo67iij3N2FF0BW50MjRGE="; + hash = "sha256-MMonBRau8FpfCqija6NEdvp4zJfEub2Kwk4MA7FYWHI="; }; - mvnHash = { - aarch64-linux = "sha256-zO79pRrY8TqrSK4bB8l4pl6834aFX2pidyk1j9Itz1E=`"; - x86_64-linux = "sha256-+ySBrQ9yQ5ZxuVUh/mnHNEmugru3n8x5VR/RYEDCLAo="; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system} for ${pname}"); - + mvnHash = "sha256-u+UAbKDqtlBEwrzh6LRgs8sZfMZ1u2TAluzOxsBrb/k="; installPhase = '' runHook preInstall @@ -23,11 +23,11 @@ maven.buildMavenPackage rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/aerogear/keycloak-metrics-spi"; description = "Keycloak Service Provider that adds a metrics endpoint"; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benley ]; + platforms = lib.platforms.linux; }; } From b7080d0dd70de97098a1102fc024112ed00e318f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 20 Jul 2024 15:39:58 -0400 Subject: [PATCH 026/193] Revert "nixos/keycloak: disable keycloak-metrics-spi in tests" This reverts commit 0360d42e20250ab6f0effccf9053e8a3d43ec74c. --- nixos/tests/keycloak.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 259f1340a22d..67b412c80961 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -44,6 +44,7 @@ let }; plugins = with config.services.keycloak.package.plugins; [ keycloak-discord + keycloak-metrics-spi ]; }; environment.systemPackages = with pkgs; [ @@ -121,6 +122,14 @@ let | jq -r '"Authorization: bearer " + .access_token' >admin_auth_header """) + # Register the metrics SPI + keycloak.succeed( + """${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt""", + """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password "$(<${adminPasswordFile})" """, + """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'""", + """curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'""" + ) + # Publish the realm, including a test OIDC client and user keycloak.succeed( "curl -sSf -H @admin_auth_header -X POST -H 'Content-Type: application/json' -d @${realmDataJson} '${frontendUrl}/admin/realms/'" From a3490e998e1207f58242b942b3d86833e6d0f8bf Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 20 Jul 2024 22:09:47 +0200 Subject: [PATCH 027/193] ghi: init at 1.2.1 --- pkgs/by-name/gh/ghi/gemset.nix | 199 ++++++++++++++++++++++++++++++++ pkgs/by-name/gh/ghi/package.nix | 45 ++++++++ 2 files changed, 244 insertions(+) create mode 100644 pkgs/by-name/gh/ghi/gemset.nix create mode 100644 pkgs/by-name/gh/ghi/package.nix diff --git a/pkgs/by-name/gh/ghi/gemset.nix b/pkgs/by-name/gh/ghi/gemset.nix new file mode 100644 index 000000000000..7f03d5a41e4b --- /dev/null +++ b/pkgs/by-name/gh/ghi/gemset.nix @@ -0,0 +1,199 @@ +{ + diff-lcs = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + docile = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; + type = "gem"; + }; + version = "1.4.0"; + }; + ghi = { + dependencies = ["pygments.rb"]; + groups = ["default"]; + platforms = []; + source = { + path = ./.; + type = "path"; + }; + version = "1.2.0"; + }; + hpricot = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z"; + type = "gem"; + }; + version = "0.8.6"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + type = "gem"; + }; + version = "2.3.0"; + }; + mustache = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l0p4wx15mi3wnamfv92ipkia4nsx8qi132c6g51jfdma3fiz2ch"; + type = "gem"; + }; + version = "1.1.1"; + }; + "pygments.rb" = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac"; + type = "gem"; + }; + version = "2.3.0"; + }; + rake = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rdiscount = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16srf8cr8ynlafyh6ls654b9a3bqgai8n3y86zzv9mcpvlk6k27g"; + type = "gem"; + }; + version = "2.2.0.2"; + }; + ronn = { + dependencies = ["hpricot" "mustache" "rdiscount"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2"; + type = "gem"; + }; + version = "0.7.3"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-support = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec_junit_formatter = { + dependencies = ["rspec-core"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sm4yj6149v4pisnizplh58ahaqri2v6p7gyzybqy1ql0zwignxy"; + type = "gem"; + }; + version = "0.3.0"; + }; + simplecov = { + dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + type = "gem"; + }; + version = "0.21.2"; + }; + simplecov-html = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; + type = "gem"; + }; + version = "0.12.3"; + }; + simplecov_json_formatter = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; + type = "gem"; + }; + version = "0.1.4"; + }; +} diff --git a/pkgs/by-name/gh/ghi/package.nix b/pkgs/by-name/gh/ghi/package.nix new file mode 100644 index 000000000000..5c17846aab75 --- /dev/null +++ b/pkgs/by-name/gh/ghi/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, bundlerEnv +, tree +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ghi"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "drazisil"; + repo = "ghi"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-3V1lxI4VhP0jC3VSWyNS327gOCKowbbLB6ae1idpFFI="; + }; + + env = bundlerEnv { + name = "ghi"; + + gemfile = "${finalAttrs.src}/Gemfile"; + lockfile = "${finalAttrs.src}/Gemfile.lock"; + gemset = ./gemset.nix; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ finalAttrs.env.wrappedRuby ]; + + installPhase = '' + mkdir -p $out/bin + + cp ghi $out/bin + ''; + + meta = { + description = "GitHub Issues on the command line"; + mainProgram = "ghi"; + homepage = "https://github.com/drazisil/ghi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient]; + }; +}) From 1725c6eb4aadbd911bee72afd47714d0cc4e53ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 23:53:40 +0000 Subject: [PATCH 028/193] python312Packages.curl-cffi: 0.7.0b4 -> 0.7.1 --- pkgs/development/python-modules/curl-cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 82a521898a63..28f8eb2da729 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "curl-cffi"; - version = "0.7.0b4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "yifeikong"; repo = "curl_cffi"; rev = "refs/tags/v${version}"; - hash = "sha256-txrJNUzswAPeH4Iazn0iKJI0Rqk0HHRoDrtTfDHKMoo="; + hash = "sha256-fVmZ5DKgkjnO1CPYVSa9qei26B0mXqZMtVGhtNGfEpY="; }; patches = [ ./use-system-libs.patch ]; From 2c7545d5330cb272b8b8e40380bb94b4687b1f7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 00:44:27 +0000 Subject: [PATCH 029/193] fetchmail: 6.4.38 -> 6.4.39 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index fb2548f26a95..a949d492b29f 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.38"; + version = "6.4.39"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-pstOqGOsYdJC/7LbVko5EjdhV40+QNcc57bykFvmCdk="; + sha256 = "sha256-dRCaHzB7U4FV+gX17ymOgpjLTerpWu0kwWs402/woYY="; }; buildInputs = [ openssl python3 ]; From d497b516d55246d3ad15f225982abd0583f7650d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 01:21:33 +0000 Subject: [PATCH 030/193] libgbinder: 1.1.39 -> 1.1.40 --- pkgs/development/libraries/libgbinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index cfdfd7482b42..34eea1047413 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.39"; + version = "1.1.40"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-O+Fg6NtWdBe0k+XhE/h62C1tvC6Y1BQZWva63sXJDfY="; + sha256 = "sha256-bv3UeL5xx28N/fSG1BeUSbbSvDaNgehpnx2OzIIaSXw="; }; outputs = [ "out" "dev" ]; From fd50c2b18b7ab83abe8b77efd9fecfd637b260e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 02:35:10 +0000 Subject: [PATCH 031/193] python312Packages.sphinx-autoapi: 3.1.2 -> 3.2.0 --- pkgs/development/python-modules/sphinx-autoapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index 6dba44b5cace..0baa5c7d6591 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinx_autoapi"; inherit version; - hash = "sha256-+l6xiPZ6454ZsufSUnx10GTg8Lmsf3ejVY7CbMtzHCY="; + hash = "sha256-+AWA/1DseoZA3J0MPEDqrNOnFbtyx6t4Dk5QTB0HWfs="; }; build-system = [ setuptools ]; From 407a07edd94c11a1a74fa6909f57a6dc8217e446 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 06:27:22 +0000 Subject: [PATCH 032/193] python312Packages.accelerate: 0.31.0 -> 0.32.0 --- pkgs/development/python-modules/accelerate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index fcee1327c2a2..dbf0cc5e5534 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.31.0"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-1iLTmSyZzOHGeAr2xBW4mebbq1FZdNfJb8blCtbSqsI="; + hash = "sha256-/Is5aKTYHxvgUJSkF7HxMbEA6dgn/y5F1B3D6qSCSaE="; }; buildInputs = [ llvmPackages.openmp ]; From 68fcdc3d40a420f2acee2f4b1c653c019cf1512e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 06:49:03 +0000 Subject: [PATCH 033/193] python312Packages.strawberry-graphql: 0.235.1 -> 0.236.0 --- .../development/python-modules/strawberry-graphql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index dba3b101142f..05a7f8fc4003 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.235.1"; + version = "0.236.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-jfV1/n5YbVn658PF7PTIWV17UwEglFjszZufb+yy5ug="; + hash = "sha256-k5BzU2VQ5r5nPduJL8DKQSOFYqfgFECtkkEzQB01sq4="; }; patches = [ From 9217791c26209574dd13b952987210650e9f8677 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Mon, 22 Jul 2024 07:47:11 +1200 Subject: [PATCH 034/193] ldc: expose ldcBootstrap in passthru --- pkgs/by-name/ld/ldc/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index f92d62430911..b73ec48b2a96 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -148,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; + passthru.ldcBootstrap = ldcBootstrap; passthru.tests = let ldc = finalAttrs.finalPackage; helloWorld = stdenv.mkDerivation (finalAttrs: { From a488e04020f2c4d4461711a0d90600ff5a817a3e Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Mon, 22 Jul 2024 07:47:11 +1200 Subject: [PATCH 035/193] ldc: bump to LLVM 18 --- pkgs/by-name/ld/ldc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index b73ec48b2a96..ca336db44d44 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , ninja -, llvm_17 +, llvm_18 , curl , tzdata , libconfig @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_17.dev makeWrapper ninja unzip + cmake ldcBootstrap lit lit.python llvm_18.dev makeWrapper ninja unzip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ From 6deb869a9760260b7093cd53c464f2caf0479ab6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jul 2024 08:55:40 +0000 Subject: [PATCH 036/193] python312Packages.qtile-extras: 0.27.0 -> 0.27.0.post1 --- pkgs/development/python-modules/qtile-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 6a55316e99c0..39da7959de59 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.27.0"; + version = "0.27.0.post1"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-2HpiUnFfGP3XNe6vFQyXMUxwqdXxFulm919t3o8a/ys="; + hash = "sha256-c5MCcpU6g95DMycSgOaUdpvPUtgVV/zUSdKVDbZWZGM="; }; build-system = [ setuptools-scm ]; From 151776fbfc90e1e474a1d10af9823f5c1bd7ebdd Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Jul 2024 13:10:42 -0400 Subject: [PATCH 037/193] gcc10: enable build on aarch64-darwin --- pkgs/development/compilers/gcc/default.nix | 2 +- pkgs/development/compilers/gcc/patches/default.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 5eb92fd701da..9746825b2321 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -451,7 +451,7 @@ pipe ((callFile ./common/builder.nix {}) ({ if (is8 && targetPlatform.isAvr) then [] else if !(is48 || is49) then [ "aarch64-darwin" ] else platforms.darwin; - } // optionalAttrs is11 { + } // optionalAttrs is10 { badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; }; } // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) { diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index b7da7eb925ee..f49f560b31ab 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -165,6 +165,12 @@ in url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff"; hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; }) ]; + "10" = [ (fetchpatch { + # There are no upstream release tags in https://github.com/iains/gcc-10-branch. + # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-10.5.0 + url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...a61e86820ed213edffa3bb246e9d263e3c7828d5.diff"; + hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk="; + }) ]; }.${majorVersion} or []) From 955ee92439b194c3ad897396feb8ba9d482f5734 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 22 Jul 2024 13:23:23 -0600 Subject: [PATCH 038/193] wrangler: add ryand56 to maintainers --- pkgs/by-name/wr/wrangler/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index a6c19c4125e9..339cf38d4cef 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ seanrmurphy dezren39 + ryand56 ]; mainProgram = "wrangler"; # cpp is required for building workerd. From 306a57f42ab5bc68c9e787c8d58858462aa03772 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jul 2024 20:30:15 +0000 Subject: [PATCH 039/193] python312Packages.conda: 24.5.0 -> 24.7.0 --- pkgs/development/python-modules/conda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index 18a0d4aaf67d..bf887f347bfb 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -27,7 +27,7 @@ }: buildPythonPackage rec { pname = "conda"; - version = "24.5.0"; + version = "24.7.0"; pyproject = true; src = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda"; rev = "refs/tags/${version}"; - hash = "sha256-DbgdTaCMWf0d3MLEMGoWxN3x37tAtoW8T7mm5279yqk="; + hash = "sha256-5Zj27rqULUThbLb5lbb4oynAYoqsDa0mTkNH9sLM3VU="; }; From a3341d6946cc2c1fe033a22f5b06d70e37aaaebe Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 21 Jul 2024 23:19:09 -0400 Subject: [PATCH 040/193] gcc12: update aarch64-darwin patch for GCC 12.4 --- pkgs/development/compilers/gcc/patches/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index f49f560b31ab..2a9d987e1c3b 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -156,8 +156,8 @@ in }) ]; "12" = [ (fetchurl { name = "gcc-12-darwin-aarch64-support.patch"; - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/f1188b90d610e2ed170b22512ff7435ba5c891e2/gcc/gcc-12.3.0.diff"; - sha256 = "sha256-naL5ZNiurqfDBiPSU8PTbTmLqj25B+vjjiqc4fAFgYs="; + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/1ed9eaea059f1677d27382c62f21462b476b37fe/gcc/gcc-12.4.0.diff"; + sha256 = "sha256-wOjpT79lps4TKG5/E761odhLGCphBIkCbOPiQg/D1Fw="; }) ]; "11" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. @@ -166,11 +166,11 @@ in hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; }) ]; "10" = [ (fetchpatch { - # There are no upstream release tags in https://github.com/iains/gcc-10-branch. - # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-10.5.0 - url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...a61e86820ed213edffa3bb246e9d263e3c7828d5.diff"; - hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk="; - }) ]; + # There are no upstream release tags in https://github.com/iains/gcc-10-branch. + # d04fe55 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-10.5.0 + url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...gcc-10-5Dr0-pre-0.diff"; + hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk="; + }) ]; }.${majorVersion} or []) From 0202a4096ca5c7db8326526b4618db83c6d0b3e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 00:42:36 +0000 Subject: [PATCH 041/193] openai: 1.35.14 -> 1.37.0 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 77ae8d099276..3085a7ea72b2 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.35.14"; + version = "1.37.0"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Kxaf5bOFvvX6qoCyCIyGaL8eDp3C7MXQdSziiCDrfRs="; + hash = "sha256-hvzXOMEBDYVhmAJQDKYLO6HZMoRbGPTkXfoHdjysvlQ="; }; build-system = [ From 8af1322dbec3c7bbe212d83bc4b5cb0b8142a230 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 00:42:58 +0000 Subject: [PATCH 042/193] cargo-tarpaulin: 0.30.0 -> 0.31.0 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 88968be7b40e..c39b6e56ef8f 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-RtkW2FDey049URmr0WGNYcz5sTZXIQ7dZL/OlIaKX20="; + hash = "sha256-4Qnmk9pHGFaRU/bcgrTKcuUJts0HQCcND836QLCX3Uo="; }; - cargoHash = "sha256-HBpEMjc2FQvFqvvcCtxHJBj2waFau77t+m+1ZfomguA="; + cargoHash = "sha256-riBvKGtOoN6eaJqVWbhOh1cSDDtlGUIV1xFFzVfPj4Y="; nativeBuildInputs = [ pkg-config From fea5949d9d9524f817f9a2d7f84bbbb8861b7975 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 03:41:35 +0000 Subject: [PATCH 043/193] docker-buildx: 0.16.0 -> 0.16.1 --- pkgs/applications/virtualization/docker/buildx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 896955c6385f..bfd3c84bafcc 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-pEPm4NtuJeoULmESIZfWVW4jzS1eC6hUb5/62Tjsv0I="; + hash = "sha256-pD4drDX9jS6X6S2q/GaxODL1zVG++xGerDQiioONHII="; }; doCheck = false; From deafd315372e60bf5f3ceff7b2edbb14c1d7e770 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 05:16:15 +0000 Subject: [PATCH 044/193] python312Packages.awswrangler: 3.8.0 -> 3.9.0 --- pkgs/development/python-modules/awswrangler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 12f4549bbe43..b2766add2dd6 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.8.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-2eF8WDhWfYgR3Ce/ehzCBtUdGUFzNmrTNfnatDpCg7Q="; + hash = "sha256-XhTRnQ2wsCD2jiiRFHDagmMB26lZ8Oj+tscgVypN0+c="; }; pythonRelaxDeps = [ "packaging" ]; From 750fc285bc04a05ded2410ed743837c73de32466 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 23 Jul 2024 13:44:21 +0200 Subject: [PATCH 045/193] python311Packages.lightning-utilities: 0.11.5 -> 0.11.6 Diff: https://github.com/Lightning-AI/utilities/compare/refs/tags/v0.11.5...v0.11.6 Changelog: https://github.com/Lightning-AI/utilities/releases/tag/v0.11.6 --- .../python-modules/lightning-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index c35d839b0600..393a965535e7 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.5"; + version = "0.11.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-Ia+NF9WHU1rJHV/j3tRiqudK3TJNEolNKShFfUehxHU="; + hash = "sha256-Bw28mLz9GaMucqP+EqR1F3OKLxDJiIVacrCBIV35G/I="; }; postPatch = '' From 60b1c879b2a20b83c44e8c5987c9c3b73ae58d30 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 11:44:59 +0100 Subject: [PATCH 046/193] digikam: reformat with `nixfmt-rfc-style` --- pkgs/by-name/di/digikam/package.nix | 180 +++++++++++++++------------- 1 file changed, 97 insertions(+), 83 deletions(-) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 8a83cf6583cc..c3c8a913cafd 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -1,43 +1,52 @@ -{ stdenv, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook3 +{ + stdenv, + config, + lib, + fetchurl, + cmake, + doxygen, + extra-cmake-modules, + wrapGAppsHook3, -# For `digitaglinktree` -, perl, sqlite + # For `digitaglinktree` + perl, + sqlite, -, libsForQt5 + libsForQt5, -, bison -, boost -, eigen -, exiv2 -, ffmpeg_4 -, flex -, graphviz -, imagemagick -, lcms2 -, lensfun -, libgphoto2 -, liblqr1 -, libusb1 -, libheif -, libGL -, libGLU -, opencv -, pcre -, x265 -, jasper + bison, + boost, + eigen, + exiv2, + ffmpeg_4, + flex, + graphviz, + imagemagick, + lcms2, + lensfun, + libgphoto2, + liblqr1, + libusb1, + libheif, + libGL, + libGLU, + opencv, + pcre, + x265, + jasper, -, bash -# For panorama and focus stacking -, enblend-enfuse -, hugin -, gnumake + bash, + # For panorama and focus stacking + enblend-enfuse, + hugin, + gnumake, -, cudaSupport ? config.cudaSupport -, cudaPackages ? {} + cudaSupport ? config.cudaSupport, + cudaPackages ? { }, }: stdenv.mkDerivation rec { - pname = "digikam"; + pname = "digikam"; version = "8.3.0"; src = fetchurl { @@ -56,60 +65,59 @@ stdenv.mkDerivation rec { libsForQt5.kdoctools libsForQt5.wrapQtAppsHook wrapGAppsHook3 - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_nvcc - ]); + ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); - buildInputs = [ - bison - boost - eigen - exiv2 - ffmpeg_4 - flex - graphviz - imagemagick - lcms2 - lensfun - libgphoto2 - libheif - liblqr1 - libusb1 - libGL - libGLU - opencv - pcre - x265 - jasper - ] ++ (with libsForQt5; [ - libkipi - libksane - libqtav + buildInputs = + [ + bison + boost + eigen + exiv2 + ffmpeg_4 + flex + graphviz + imagemagick + lcms2 + lensfun + libgphoto2 + libheif + liblqr1 + libusb1 + libGL + libGLU + opencv + pcre + x265 + jasper + ] + ++ (with libsForQt5; [ + libkipi + libksane + libqtav - qtbase - qtxmlpatterns - qtsvg - qtwebengine - qtnetworkauth + qtbase + qtxmlpatterns + qtsvg + qtwebengine + qtnetworkauth - akonadi-contacts - kcalendarcore - kconfigwidgets - kcoreaddons - kfilemetadata - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui + akonadi-contacts + kcalendarcore + kconfigwidgets + kcoreaddons + kfilemetadata + knotifications + knotifyconfig + ktextwidgets + kwidgetsaddons + kxmlgui - breeze-icons - marble - oxygen - threadweaver - ]) ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - ]); + breeze-icons + marble + oxygen + threadweaver + ]) + ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cudart ]); postPatch = '' substituteInPlace \ @@ -131,7 +139,13 @@ stdenv.mkDerivation rec { preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) + qtWrapperArgs+=(--prefix PATH : ${ + lib.makeBinPath [ + gnumake + hugin + enblend-enfuse + ] + }) qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/${pname}) substituteInPlace $out/bin/digitaglinktree \ --replace "/usr/bin/perl" "${perl}/bin/perl" \ From c363e27c573cd3fa374cc38a444194c08696a7ab Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 11:57:36 +0100 Subject: [PATCH 047/193] digikam: modernize --- pkgs/by-name/di/digikam/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index c3c8a913cafd..7d75b3c6388f 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -45,12 +45,12 @@ cudaPackages ? { }, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "digikam"; version = "8.3.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}-1.tar.xz"; + url = "mirror://kde/stable/digikam/${finalAttrs.version}/digiKam-${finalAttrs.version}-1.tar.xz"; hash = "sha256-BbFF/38vIAX6IbxXnBUqsjyBkbZ4/ylEyPBAbWud5tg="; }; @@ -146,18 +146,19 @@ stdenv.mkDerivation rec { enblend-enfuse ] }) - qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/${pname}) + qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/digikam) substituteInPlace $out/bin/digitaglinktree \ --replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" ''; - meta = with lib; { - description = "Photo Management Program"; - license = licenses.gpl2; - homepage = "https://www.digikam.org"; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + meta = { + description = "Photo management application"; + homepage = "https://www.digikam.org/"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + platforms = lib.platforms.linux; mainProgram = "digikam"; }; -} +}) From 282f3440bb8965669df136c05291fcf90b7915c2 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 14:36:34 +0100 Subject: [PATCH 048/193] digikam: drop libqtav dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This isn’t being used any more; on Qt 5 they use QtAVPlayer and on Qt 6 they use the Qt Multimedia module. --- pkgs/by-name/di/digikam/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 7d75b3c6388f..297fc12f7d4b 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { ++ (with libsForQt5; [ libkipi libksane - libqtav qtbase qtxmlpatterns From 94a39c9ace2906bfdc082f12a2f67496dac6cf55 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 11:58:53 +0100 Subject: [PATCH 049/193] digikam: 8.3.0 -> 8.4.0 Includes fixes for FFmpeg 7. --- pkgs/by-name/di/digikam/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 297fc12f7d4b..9a0e0e67de3f 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -2,8 +2,9 @@ stdenv, config, lib, - fetchurl, + fetchFromGitLab, cmake, + ninja, doxygen, extra-cmake-modules, wrapGAppsHook3, @@ -47,19 +48,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "digikam"; - version = "8.3.0"; + version = "8.4.0"; - src = fetchurl { - url = "mirror://kde/stable/digikam/${finalAttrs.version}/digiKam-${finalAttrs.version}-1.tar.xz"; - hash = "sha256-BbFF/38vIAX6IbxXnBUqsjyBkbZ4/ylEyPBAbWud5tg="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "graphics"; + repo = "digikam"; + rev = "v${finalAttrs.version}"; + hash = "sha256-GJYlxJkvFEXppVk0yC9ojszylfAGt3eBMAjNUu60XDY="; }; strictDeps = true; - depsBuildBuild = [ cmake ]; - nativeBuildInputs = [ cmake + ninja doxygen extra-cmake-modules libsForQt5.kdoctools @@ -154,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Photo management application"; homepage = "https://www.digikam.org/"; + changelog = "${finalAttrs.src.meta.homepage}-/blob/master/project/NEWS.${finalAttrs.version}"; sourceProvenance = [ lib.sourceTypes.fromSource ]; license = lib.licenses.gpl2Plus; maintainers = [ ]; From 77a2c73fa3716506d13f5888dc8a68413f7993f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 19:02:00 +0000 Subject: [PATCH 050/193] kcov: 42 -> 43 --- pkgs/development/tools/analysis/kcov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 473dc9d7a4bb..efb0bba4a1b2 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -17,13 +17,13 @@ let self = stdenv.mkDerivation rec { pname = "kcov"; - version = "42"; + version = "43"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "sha256-8/182RjuNuyFzSyCgyyximGaveDyhStwIQg29S5U/pI="; + sha256 = "sha256-hRJYuHNSXyRoUDBF/yIPXPcBBxZoTO5cgoB2tBhKPwY="; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; From 5ca94336fde213567be80b27f172e3b38a841a4c Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Jul 2024 14:56:48 +0100 Subject: [PATCH 051/193] digikam: use Qt 6 --- .../di/digikam/disable-tests-download.patch | 15 ++ pkgs/by-name/di/digikam/package.nix | 209 ++++++++++-------- 2 files changed, 137 insertions(+), 87 deletions(-) create mode 100644 pkgs/by-name/di/digikam/disable-tests-download.patch diff --git a/pkgs/by-name/di/digikam/disable-tests-download.patch b/pkgs/by-name/di/digikam/disable-tests-download.patch new file mode 100644 index 000000000000..7ec21b52eb4e --- /dev/null +++ b/pkgs/by-name/di/digikam/disable-tests-download.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43636fa9b9...e8da76c480 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -208,10 +208,6 @@ + # For CI runners to run tests, the following custom target serves to perform the download automatically. + # If the directory "test-data" has already been created, the target becomes a "no-op". + # +- add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/test-data +- COMMENT "Checkout unit-test data repository. Please wait..." +- COMMAND git +- ARGS clone https://invent.kde.org/graphics/digikam-test-data.git ${CMAKE_SOURCE_DIR}/test-data) + add_custom_target(test-data ALL DEPENDS ${CMAKE_SOURCE_DIR}/test-data) + + endif() diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 9a0e0e67de3f..1454eae6717a 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -3,49 +3,61 @@ config, lib, fetchFromGitLab, + fetchgit, + cmake, ninja, - doxygen, extra-cmake-modules, + flex, + bison, wrapGAppsHook3, + opencv, + libtiff, + libpng, + libjpeg, + libheif, + libjxl, + boost, + lcms2, + expat, + exiv2, + libxml2, + libxslt, + ffmpeg, + jasper, + eigen, + lensfun, + liblqr1, + libgphoto2, + libusb1, + imagemagick, + x265, + libGLX, + libGLU, + + kdePackages, + # For `digitaglinktree` perl, sqlite, - libsForQt5, - - bison, - boost, - eigen, - exiv2, - ffmpeg_4, - flex, - graphviz, - imagemagick, - lcms2, - lensfun, - libgphoto2, - liblqr1, - libusb1, - libheif, - libGL, - libGLU, - opencv, - pcre, - x265, - jasper, - - bash, + runtimeShell, # For panorama and focus stacking enblend-enfuse, hugin, gnumake, - - cudaSupport ? config.cudaSupport, - cudaPackages ? { }, }: +let + testData = fetchgit { + url = "https://invent.kde.org/graphics/digikam-test-data.git"; + rev = "d02dd20b23cc279792325a0f03d21688547a7a59"; + fetchLFS = true; + hash = "sha256-SvsmcniDRorwu9x9OLtHD9ftgquyoE5Kl8qDgqi1XdQ="; + }; +in + stdenv.mkDerivation (finalAttrs: { pname = "digikam"; version = "8.4.0"; @@ -58,85 +70,108 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-GJYlxJkvFEXppVk0yC9ojszylfAGt3eBMAjNUu60XDY="; }; + patches = [ ./disable-tests-download.patch ]; + strictDeps = true; nativeBuildInputs = [ cmake ninja - doxygen extra-cmake-modules - libsForQt5.kdoctools - libsForQt5.wrapQtAppsHook + flex + bison + kdePackages.wrapQtAppsHook wrapGAppsHook3 - ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); + ]; - buildInputs = - [ - bison - boost - eigen - exiv2 - ffmpeg_4 - flex - graphviz - imagemagick - lcms2 - lensfun - libgphoto2 - libheif - liblqr1 - libusb1 - libGL - libGLU - opencv - pcre - x265 - jasper - ] - ++ (with libsForQt5; [ - libkipi - libksane + # Based on , + # but it doesn’t have everything, so you also have to check the + # CMake files… + # + # We list non‐Qt dependencies first to override Qt’s propagated + # build inputs. - qtbase - qtxmlpatterns - qtsvg - qtwebengine - qtnetworkauth + buildInputs = [ + opencv + libtiff + libpng + # TODO: Figure out how on earth to get it to pick up libjpeg8 for + # lossy DNG support. + libjpeg + libheif + libjxl + boost + lcms2 + expat + exiv2 + libxml2 + libxslt + # Qt WebEngine uses and propagates FFmpeg, and if it’s a + # different version it causes linker warnings. + #ffmpeg + jasper + eigen + lensfun + liblqr1 + libgphoto2 + libusb1 + imagemagick + x265 + libGLX + libGLU - akonadi-contacts - kcalendarcore - kconfigwidgets - kcoreaddons - kfilemetadata - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui + kdePackages.qtbase + kdePackages.qtnetworkauth + kdePackages.qtscxml + kdePackages.qtsvg + kdePackages.qtwebengine + kdePackages.qt5compat + kdePackages.qtmultimedia - breeze-icons - marble - oxygen - threadweaver - ]) - ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cudart ]); + kdePackages.kconfig + kdePackages.kxmlgui + kdePackages.ki18n + kdePackages.kwindowsystem + kdePackages.kservice + kdePackages.solid + kdePackages.kcoreaddons + kdePackages.knotifyconfig + kdePackages.knotifications + kdePackages.threadweaver + kdePackages.kiconthemes + kdePackages.kfilemetadata + kdePackages.kcalendarcore + kdePackages.kio + kdePackages.sonnet + # libksane and akonadi-contacts do not yet work when building for + # Qt 6. + ]; + + checkInputs = [ kdePackages.qtdeclarative ]; + + postConfigure = lib.optionalString finalAttrs.doCheck '' + ln -s ${testData} $cmakeDir/test-data + ''; postPatch = '' substituteInPlace \ core/dplugins/bqm/custom/userscript/userscript.cpp \ core/utilities/import/backend/cameracontroller.cpp \ - --replace-fail \"/bin/bash\" \"${lib.getExe bash}\" + --replace-fail '"/bin/bash"' ${lib.escapeShellArg "\"${runtimeShell}\""} ''; cmakeFlags = [ - "-DENABLE_MYSQLSUPPORT=1" - "-DENABLE_INTERNALMYSQL=1" - "-DENABLE_MEDIAPLAYER=1" - "-DENABLE_QWEBENGINE=on" - "-DENABLE_APPSTYLES=on" - "-DCMAKE_CXX_FLAGS=-I${libsForQt5.libksane}/include/KF5" # fix `#include ` + (lib.cmakeBool "BUILD_WITH_QT6" true) + (lib.cmakeBool "ENABLE_KFILEMETADATASUPPORT" true) + #(lib.cmakeBool "ENABLE_AKONADICONTACTSUPPORT" true) + (lib.cmakeBool "ENABLE_MEDIAPLAYER" true) + (lib.cmakeBool "ENABLE_APPSTYLES" true) ]; + # Tests segfault for some reason… + # TODO: Get them working. + doCheck = false; + dontWrapGApps = true; preFixup = '' @@ -148,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { enblend-enfuse ] }) - qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/digikam) + qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${kdePackages.qtbase.qtPluginPrefix}/digikam) substituteInPlace $out/bin/digitaglinktree \ --replace "/usr/bin/perl" "${perl}/bin/perl" \ --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" From fee2b5c4dc9fb52ffc245be3bff8f8725c5f2ac5 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 14 Jul 2024 10:13:52 +0100 Subject: [PATCH 052/193] libsForQt5.libqtav: drop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Abandoned upstream, only works with old versions of FFmpeg, and the only reverse dependency (digiKam) hadn’t actually been using it in quite a while. --- .../development/libraries/libqtav/default.nix | 71 ------------------- pkgs/top-level/qt5-packages.nix | 2 - 2 files changed, 73 deletions(-) delete mode 100644 pkgs/development/libraries/libqtav/default.nix diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix deleted file mode 100644 index 17862e23b75b..000000000000 --- a/pkgs/development/libraries/libqtav/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ mkDerivation -, lib -, fetchFromGitHub -, extra-cmake-modules -, qtbase -, qtmultimedia -, qttools -, libGL -, libX11 -, libass -, openal -, ffmpeg_4 -, libuchardet -, alsa-lib -, libpulseaudio -, libva -}: - -mkDerivation rec { - pname = "libqtav"; - version = "unstable-2020-09-10"; - - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ - qtbase - qtmultimedia - libGL - libX11 - libass - openal - ffmpeg_4 - libuchardet - alsa-lib - libpulseaudio - libva - ]; - - src = fetchFromGitHub { - sha256 = "0qwrk40dihkbwmm7krz6qaqyn9v3qdjnd2k9b4s3a67x4403pib3"; - rev = "2a470d2a8d2fe22fae969bee5d594909a07b350a"; - repo = "QtAV"; - owner = "wang-bin"; - fetchSubmodules = true; - }; - - # Make sure libqtav finds its libGL dependency at both link and run time - # by adding libGL to rpath. Not sure why it wasn't done automatically like - # the other libraries as `libGL` is part of our `buildInputs`. - NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib"; - - cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - preFixup = '' - mkdir -p "$out/bin" - cp -a "./bin/"* "$out/bin" - ''; - - stripDebugList = [ "lib" "libexec" "bin" "qml" ]; - - meta = with lib; { - description = "Multimedia playback framework based on Qt + FFmpeg"; - #license = licenses.lgpl21; # For the libraries / headers only. - license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. - homepage = "http://www.qtav.org/"; - maintainers = [ maintainers.jraygauthier ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index f3ce480c9ac0..2b1ec20bfa7d 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -173,8 +173,6 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP libqofono = callPackage ../development/libraries/libqofono { }; - libqtav = callPackage ../development/libraries/libqtav { }; - libquotient = callPackage ../development/libraries/libquotient { }; libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; From 68d247f6cc454c31c40e452f9f663cf191cf75c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Jul 2024 22:39:45 +0200 Subject: [PATCH 053/193] python312Packages.types-requests: 2.32.0.20240622 -> 2.32.0.20240712 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 9fdcd16b0059..0e2954f89525 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.0.20240622"; + version = "2.32.0.20240712"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7V6KQS/MORWdYxk4XACdZChF8lDGOQJxj2Bc2Q+q3jE="; + hash = "sha256-kMB5/wXlSfa/UOAukQIQuYuP8evdGOGchzzSN3N8E1g="; }; build-system = [ setuptools ]; From 234a10137e901f8c0a679689ba4f624397bfe6a6 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Tue, 23 Jul 2024 15:50:06 -0600 Subject: [PATCH 054/193] wrangler: 3.62.0 -> 3.66.0 --- pkgs/by-name/wr/wrangler/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 339cf38d4cef..618dfdfb0277 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -12,18 +12,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "3.62.0"; + version = "3.66.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-/4iIkvSn85fkRggmIha2kRlW0MEwvzy0ZAmIb8+LpZQ="; + hash = "sha256-YY+wp9rmXDWeSvdMC6FQyuDf8XP3GhHeHuFe9q0uNng="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-aTTaiGXm1WYwmy+ljUC9yO3qtvN20SA+24T83dWYrI0="; + hash = "sha256-BjSpgkDYafnDb0SBdL3B6IYWT4EOqCAxdDm+Ev6QIgw="; }; buildInputs = [ From cca88a1f5d0a3a9a688ad2648a688c3b75605675 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 09:32:05 +0000 Subject: [PATCH 055/193] wasmer: 4.3.4 -> 4.3.5 --- pkgs/development/interpreters/wasmer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index bc58f89ea51c..2256851c3d2f 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lpWgitQAZ+voGNj3Bo2FjbjDXPRSb067rx3/bIX+C9Y="; + hash = "sha256-hEhU3o/SLHWV9zmgCtW+7K/2ev+oGAnrZmlyNtoeSV4="; }; - cargoHash = "sha256-1/krpq7+E2p70d/SlSj0vCHr/9w6SbO15OhfkQiWf2k="; + cargoHash = "sha256-xyR5pnwMGE5K4o7X0Q2JEervSgR5LK1vqpOa3Mm6xkU="; nativeBuildInputs = [ rustPlatform.bindgenHook From a97767f5a3a1c9c2e9add725a049c4f1aab1a53b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 10:15:40 +0000 Subject: [PATCH 056/193] python312Packages.rapidocr-onnxruntime: 1.3.22 -> 1.3.24 --- .../python-modules/rapidocr-onnxruntime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index aae91c7567e0..eef3e3b975ce 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -19,13 +19,13 @@ onnxruntime, }: let - version = "1.3.22"; + version = "1.3.24"; src = fetchFromGitHub { owner = "RapidAI"; repo = "RapidOCR"; - rev = "v${version}"; - hash = "sha256-8h4DFhnI9imr+bYQZdlrl8UKUdpwnGK+SGxLXSMmcag="; + rev = "refs/tags/v${version}"; + hash = "sha256-+iY+/IdOgsn+LPZQ4Kdzxuh31csQ7dyh5Zf552ne3N0="; }; models = fetchzip { From ce08539f0274a5d4c2be3962692e07c61753943b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 11:44:19 +0000 Subject: [PATCH 057/193] python312Packages.python-gitlab: 4.7.0 -> 4.8.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 571ce5d5148d..7eb173f6c4a4 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "4.7.0"; + version = "4.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_gitlab"; inherit version; - hash = "sha256-t5jN29nRZreVcebWyXVCl40KOV3lcWnHCX0JIQp2am0="; + hash = "sha256-wsTXsc1QPZBa/l38Dz9mGZNDYfdq6FXGzsmmZoZNN88="; }; nativeBuildInputs = [ setuptools ]; From d1e6569d988b08b736d82c0d21cb0bce6194d5c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 12:34:22 +0000 Subject: [PATCH 058/193] python312Packages.azure-mgmt-keyvault: 10.3.0 -> 10.3.1 --- .../python-modules/azure-mgmt-keyvault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index f0b12aed9cb0..b8d8aa9cae24 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "10.3.0"; + version = "10.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-GDtBZM8YaLjqfv6qmO2tfSpOFKm9l3woGLErdRUM0qI="; + hash = "sha256-NLkpVq773VccrloD9weOA32Ah7LADPpnSINdxzq7WjA="; }; propagatedBuildInputs = [ From b289dca6a6f4230053388625c0a405607d2dee40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 16:59:32 +0000 Subject: [PATCH 059/193] python312Packages.pyaml: 24.4.0 -> 24.7.0 --- pkgs/development/python-modules/pyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index cd640d600c57..56096db576e8 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyaml"; - version = "24.4.0"; + version = "24.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Dkg9kokBDnR6Ml3EMXG8w51lYt0d1HGejMfnyWyZ/OY="; + hash = "sha256-XQ/fnmgQNvsmOng9Apj8OvWApuKmzxozFP/EjcPZHMs="; }; nativeBuildInputs = [ setuptools ]; From 7bd60590b5b0f5464a001bc1145a5e3ad93afb78 Mon Sep 17 00:00:00 2001 From: Ali Afsharzadeh Date: Wed, 24 Jul 2024 21:53:14 +0330 Subject: [PATCH 060/193] docker-compose: 2.29.0 -> 2.29.1 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 7ab5852cd573..2b9d6e49451d 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.29.0"; + version = "2.29.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-nyfTVTxdByNccxRn3kyE+75dHWqIGl2PWkIoNo8O6DM="; + hash = "sha256-6GZtKfPBE9Wl6ccwU1OY+9rq+IZr2qpOB4Vlxidhisw="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-ACFHejd8EMh2/NfQBLj/DM9ewIgueFtHHFc81Skgkk4="; + vendorHash = "sha256-CkXCAqHOlSc3jHqVUYovT8YDnlCZewpLv3sC0ADgwL0="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From 1bf2468c335fd383cb4f32e66bb923771040d854 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 19:24:06 +0000 Subject: [PATCH 061/193] python312Packages.azure-storage-file-share: 12.16.0 -> 12.17.0 --- .../python-modules/azure-storage-file-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 1f47df6c9e73..12d69e33acb6 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.16.0"; + version = "12.17.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QS+35sPCj29yKvmBlapZQHqqMjI6+hOkoB9i0Lh3TrM="; + hash = "sha256-97LGz8G3y4AJelOx7S76nlRbSaKRQw02nNtJ+vvIQdY="; }; build-system = [ setuptools ]; From 8de15ca745a10887056841011774401925fb9b14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 19:35:53 +0000 Subject: [PATCH 062/193] python312Packages.peft: 0.11.1 -> 0.12.0 --- pkgs/development/python-modules/peft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 76eaac3b2df2..73a1d47855d3 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.11.1"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FV/S/N9wA+rUos/uQIzvPWmWCIFi8wi2Tt6jMzvYfYQ="; + hash = "sha256-7LYlqWiOPTvQyJgpUZeZ5Wl17RswhYyit0/MaHyN5Ak="; }; nativeBuildInputs = [ setuptools ]; From 36e98fab3be1dfad8bc461e5e6c14a9105d4950f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 19:57:35 +0000 Subject: [PATCH 063/193] python312Packages.azure-mgmt-netapp: 13.0.0 -> 13.1.0 --- pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 8a10fd41f108..8490dd288880 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "13.0.0"; + version = "13.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-R322hzij1kcnrwxMClOzta40cMnd4w6bGnp5+p2pMQ8="; + hash = "sha256-8JzJFZTplNGo74wBelP8Geo7+FQ7WYmAOAef4jv533M="; }; build-system = [ setuptools ]; From 43c36273b258aab84dc3e3bd26b42b997e38ae46 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Wed, 24 Jul 2024 22:05:24 +0200 Subject: [PATCH 064/193] nixos/radicle: fix support of absolute file paths for SSH keys --- nixos/modules/services/misc/radicle.nix | 12 +++++++----- nixos/tests/radicle.nix | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix index 69cac81ee65f..05bbac4cecf4 100644 --- a/nixos/modules/services/misc/radicle.nix +++ b/nixos/modules/services/misc/radicle.nix @@ -45,7 +45,7 @@ let { BindReadOnlyPaths = [ "${cfg.configFile}:${env.RAD_HOME}/config.json" - "${if isPath cfg.publicKeyFile then cfg.publicKeyFile else pkgs.writeText "radicle.pub" cfg.publicKeyFile}:${env.RAD_HOME}/keys/radicle.pub" + "${if types.path.check cfg.publicKey then cfg.publicKey else pkgs.writeText "radicle.pub" cfg.publicKey}:${env.RAD_HOME}/keys/radicle.pub" ]; KillMode = "process"; StateDirectory = [ "radicle" ]; @@ -119,19 +119,21 @@ in enable = mkEnableOption "Radicle Seed Node"; package = mkPackageOption pkgs "radicle-node" { }; privateKeyFile = mkOption { - type = with types; either path str; + type = types.path; description = '' - SSH private key generated by `rad auth`. + Absolute file path to an SSH private key, + usually generated by `rad auth`. If it contains a colon (`:`) the string before the colon is taken as the credential name and the string after as a path encrypted with `systemd-creds`. ''; }; - publicKeyFile = mkOption { + publicKey = mkOption { type = with types; either path str; description = '' - SSH public key generated by `rad auth`. + An SSH public key (as an absolute file path or directly as a string), + usually generated by `rad auth`. ''; }; node = { diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix index 2deff7487d80..b68cb7d716c2 100644 --- a/nixos/tests/radicle.nix +++ b/nixos/tests/radicle.nix @@ -66,7 +66,7 @@ in services.radicle = { enable = true; privateKeyFile = seed-ssh-keys.snakeOilEd25519PrivateKey; - publicKeyFile = seed-ssh-keys.snakeOilEd25519PublicKey; + publicKey = seed-ssh-keys.snakeOilEd25519PublicKey; node = { openFirewall = true; }; From e53abebca5ec2582f77d72fe02a0d02c7b3372c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 20:45:29 +0000 Subject: [PATCH 065/193] python312Packages.azure-storage-queue: 12.10.0 -> 12.11.0 --- .../python-modules/azure-storage-queue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 50f5d701138b..c6fcce00fddd 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.10.0"; + version = "12.11.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dnuj1czNtPcJdOXOYdFkx6t0cyz7K0Qd2HN2aaIRbag="; + hash = "sha256-Cox3eDnbpcUIJMrEivo8xWvgRPqkXKYbcmnrMZ6/AXE="; }; nativeBuildInputs = [ setuptools ]; From 48c9dc0357a106336a837e03c1cdb9def33307ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 20:54:17 +0000 Subject: [PATCH 066/193] python312Packages.plotly: 5.22.0 -> 5.23.0 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 98ade26c7694..7a29c75b5f10 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.22.0"; + version = "5.23.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-hZ/a29hrV3CuJGblQrdhskfRxrSdrtdluVu4xwY+dGk="; + hash = "sha256-ieV9ADoRYwOjTeZwCGI5E2fdVkIiq3H4Ux33Ann8AZM="; }; propagatedBuildInputs = [ From 1966b5dd5422b5c5611eb08a630970d870476e39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 22:18:23 +0000 Subject: [PATCH 067/193] sqlmap: 1.8.5 -> 1.8.7.post1 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 08a23ed4f273..239ac5a0149a 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.5"; + version = "1.8.7.post1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ADs0Tfd8iR1OSGkV7pFdRw0RDHbxk6Ztje1AvSIdWqI="; + hash = "sha256-rycF/D6knpOHlmTZBVysq9DMqCadwv1eq8vkuhpZ2hQ="; }; postPatch = '' From 562479786a12d4bb00effc8beae930f0a8d2a22e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 23:53:41 +0000 Subject: [PATCH 068/193] python312Packages.bokeh: 3.4.1 -> 3.5.0 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index faffe2d1749e..bdd5665f5922 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -47,14 +47,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.4.1"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-2CSWHkJlNnsHUM5YsH5WStC4PKZLM1UhzTQh6bnxDYk="; + hash = "sha256-Zeia3b6QDDevJaIFKuF0ttO6HvCMkf1att/XEuGEw5k="; }; src_test = fetchFromGitHub { From 1f091f9a7d1329bdec25e510e073a2bd219c8232 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 03:09:34 +0000 Subject: [PATCH 069/193] python312Packages.snowflake-connector-python: 3.11.0 -> 3.12.0 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index cfc61601b34d..736612551ccd 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.11.0"; + version = "3.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "snowflake_connector_python"; inherit version; - hash = "sha256-MWnAFKA+X1hVESYF45OJelUuVYlTxp8loC4zsZmIZNA="; + hash = "sha256-Mg4Lb4zYVW4ZyLhySckxcAI4spWDE6/HozEI1n2ofYI="; }; build-system = [ From a11dd660e6bd28a2ab3016bb0f78566f0033ec01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 10:46:36 +0000 Subject: [PATCH 070/193] openrefine: 3.8.1 -> 3.8.2 --- pkgs/applications/science/misc/openrefine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 60809a420b39..6d169db23b92 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -10,12 +10,12 @@ }: let - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-MnFwFJdKIU7D8GQgnDvCO+P8r8h1Se/wmbt/Z3EX+3Q="; + hash = "sha256-3KCO9ooYN8PPVirU2wh7wu4feHqugc3JSXWR2aWIanE="; }; npmPkg = buildNpmPackage { @@ -53,7 +53,7 @@ in maven.buildMavenPackage { mvnJdk = jdk; mvnParameters = "-pl !packaging"; - mvnHash = "sha256-FD4g0Mshz39N1h8MDAk907PhF5TguWTZ7AXKECHuhzQ="; + mvnHash = "sha256-AuZp+uq5bmb4gnzKvqXeTmBrsCT6qmJOrwtJq9iCkRQ="; nativeBuildInputs = [ makeWrapper ]; From 070be3aa078fd666e05f39bc6f30e30b2d17018a Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 25 Jul 2024 14:02:24 +0100 Subject: [PATCH 071/193] python311Packages.pandas-stubs: 2.2.0.240218 -> 2.2.2.240603, update/fix deps and tests --- .../python-modules/pandas-stubs/default.nix | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 322c3a39744a..843ae520be02 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -1,9 +1,20 @@ { lib, stdenv, - beautifulsoup4, buildPythonPackage, + pythonOlder, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + numpy, + types-pytz, + + # tests + pytestCheckHook, + beautifulsoup4, html5lib, jinja2, lxml, @@ -11,16 +22,12 @@ odfpy, openpyxl, pandas, - poetry-core, pyarrow, pyreadstat, - pytestCheckHook, - pythonOlder, scipy, sqlalchemy, tables, tabulate, - types-pytz, typing-extensions, xarray, xlsxwriter, @@ -28,7 +35,7 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.2.0.240218"; + version = "2.2.2.240603"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,17 +44,18 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-416vyaHcSfTfkSNKZ05edozfsMmNKcpOZAoPenCLFzQ="; + hash = "sha256-wJ7lN1+BGNqhwgPLmmpb3foX6rIEy3R62rOvu0mr8xs="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - pandas + dependencies = [ + numpy types-pytz ]; nativeCheckInputs = [ + pytestCheckHook beautifulsoup4 html5lib jinja2 @@ -55,9 +63,9 @@ buildPythonPackage rec { matplotlib odfpy openpyxl + pandas pyarrow pyreadstat - pytestCheckHook scipy sqlalchemy tables @@ -65,19 +73,28 @@ buildPythonPackage rec { typing-extensions xarray xlsxwriter + + # missing dependencies in nixpkgs + # python-calamine ]; disabledTests = [ - # AttributeErrors, missing dependencies, error and warning checks - "test_types_groupby" - "test_frame_groupby_resample" - "test_orc" - "test_all_read_without_lxml_dtype_backend" + # Missing dependencies, error and warning checks + "test_all_read_without_lxml_dtype_backend" # pyarrow.orc + "test_orc" # pyarrow.orc + "test_read_excel" # python-calamine + "test_plotting" # UserWarning: No artists with labels found to put in legend. + "test_spss" # FutureWarning: ChainedAssignmentError: behaviour will change in pandas 3.0! "test_show_version" ] ++ lib.optionals stdenv.isDarwin [ - "test_plotting" # Fatal Python error: Illegal instruction + "test_clipboard" # FileNotFoundError: [Errno 2] No such file or directory: 'pbcopy' + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Disable tests for types that are not supported on aarch64 in `numpy` < 2.0 + "test_astype_float" # `f16` and `float128` + "test_astype_complex" # `c32` and `complex256` ]; pythonImportsCheck = [ "pandas" ]; From e3e3eb56de95e3c7f353117635568b0db555b02d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 25 Jul 2024 13:17:21 +0000 Subject: [PATCH 072/193] xfce.xfce4-screenshooter: 1.10.6 -> 1.11.0 https://gitlab.xfce.org/apps/xfce4-screenshooter/-/compare/xfce4-screenshooter-1.10.6...xfce4-screenshooter-1.11.0 --- .../xfce/applications/xfce4-screenshooter/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 14c2244a760a..d26723aefdfd 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -8,7 +8,6 @@ , libXfixes , libXtst , libxml2 -, libsoup_3 , libxfce4ui , libxfce4util , wayland @@ -24,10 +23,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.10.6"; + version = "1.11.0"; odd-unstable = false; - sha256 = "sha256-g3wYIyJEnYCFhCs6YXzfEe5lnvIY8ACN/m7He+ww3mA="; + sha256 = "sha256-DMLGaDHmwDDHvOMev/QKvmDr6AQ6Qnzxf3YCbf0/nXg="; nativeBuildInputs = [ wayland-scanner @@ -41,7 +40,6 @@ mkXfceDerivation { libXfixes libXtst libxml2 - libsoup_3 libxfce4ui libxfce4util wayland From f95642da945def42d63ef6830da15c58c2def398 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 16:24:56 +0000 Subject: [PATCH 073/193] python312Packages.hcloud: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index e6439ea0f730..a97b3f055325 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Nf4rkVkXPEPPZ+xBCnfKfYeggBfhsgijnAIJzByR46A="; + hash = "sha256-cDyy2x1JINthvhuzQdwgMcykGrypnTkk4rJBk1WQ1HQ="; }; build-system = [ setuptools ]; From dde60413a8723b1b8bd3afd705eea23cc53ef030 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 11 Feb 2024 11:27:41 -0500 Subject: [PATCH 074/193] python312Packages.xarray-datatree: init at 0.0.14 --- .../xarray-datatree/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/xarray-datatree/default.nix diff --git a/pkgs/development/python-modules/xarray-datatree/default.nix b/pkgs/development/python-modules/xarray-datatree/default.nix new file mode 100644 index 000000000000..1d99f300cb7b --- /dev/null +++ b/pkgs/development/python-modules/xarray-datatree/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + check-manifest, + setuptools, + setuptools-scm, + packaging, + pytestCheckHook, + xarray, + zarr, +}: + +buildPythonPackage rec { + pname = "datatree"; + version = "0.0.14"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "xarray-contrib"; + repo = "datatree"; + rev = "refs/tags/v${version}"; + hash = "sha256-C6+WcHc2+sftJ5Yyh/9TTIHhAEwhAqSsSkaDwtq7J90="; + }; + + build-system = [ + check-manifest + setuptools + setuptools-scm + ]; + + dependencies = [ + packaging + xarray + ]; + + nativeCheckInputs = [ + pytestCheckHook + zarr + ]; + + pythonImportsCheck = [ "datatree" ]; + + disabledTests = [ + # output formatting issue, likely due to underlying library version difference: + "test_diff_node_data" + ]; + + meta = with lib; { + description = "Tree-like hierarchical data structure for xarray"; + homepage = "https://xarray-datatree.readthedocs.io"; + changelog = "https://github.com/xarray-contrib/datatree/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c5ac7cbb3fc..bfc66df8da2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17422,6 +17422,8 @@ self: super: with self; { xarray-dataclasses = callPackage ../development/python-modules/xarray-dataclasses { }; + xarray-datatree = callPackage ../development/python-modules/xarray-datatree { }; + xarray-einstats = callPackage ../development/python-modules/xarray-einstats { }; xattr = callPackage ../development/python-modules/xattr { }; From efc51bf1a1a155aa4c20e3548c3c0d12423a643e Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 25 Jul 2024 21:31:06 +0200 Subject: [PATCH 075/193] python311Packages.python-barbicanclient: init at 7.0.0 https://wiki.openstack.org/wiki/Barbican https://opendev.org/openstack/python-barbicanclient --- .../python-barbicanclient/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/python-barbicanclient/default.nix diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix new file mode 100644 index 000000000000..cefe9412e86e --- /dev/null +++ b/pkgs/development/python-modules/python-barbicanclient/default.nix @@ -0,0 +1,70 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitea, + keystoneauth1, + oslo-i18n, + oslo-serialization, + oslo-utils, + pbr, + pythonOlder, + requests-mock, + requests, + setuptools, + stestr, +}: + +buildPythonPackage rec { + pname = "python-barbicanclient"; + version = "7.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitea { + domain = "opendev.org"; + owner = "openstack"; + repo = "python-barbicanclient"; + rev = version; + hash = "sha256-odoYyBulOQkjUpymFyZgvI+DYmdHJY3PaG8hh2ms+/0="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + dependencies = [ + cliff + keystoneauth1 + oslo-i18n + oslo-serialization + oslo-utils + requests + ]; + + doCheck = true; + + nativeCheckInputs = [ + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "barbicanclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-barbicanclient"; + description = "Client library for OpenStack Barbican API"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2018bdc1ec2..df6f1212d1ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23433,6 +23433,7 @@ with pkgs; openslp = callPackage ../development/libraries/openslp { }; openstackclient = with python311Packages; toPythonApplication python-openstackclient; + barbicanclient = with python311Packages; toPythonApplication python-barbicanclient; glanceclient = with python311Packages; toPythonApplication python-glanceclient; heatclient = with python311Packages; toPythonApplication python-heatclient; ironicclient = with python311Packages; toPythonApplication python-ironicclient; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b31e805460b6..22124d056bfe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12571,6 +12571,8 @@ self: super: with self; { python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; + python-barbicanclient = callPackage ../development/python-modules/python-barbicanclient { }; + python-barcode = callPackage ../development/python-modules/python-barcode { }; python-baseconv = callPackage ../development/python-modules/python-baseconv { }; From 3bc8698d55e15cdf5a906076ce94c66dde1c01ff Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 11 Feb 2024 11:28:51 -0500 Subject: [PATCH 076/193] python312Packages.multiscale-spatial-image: init at 1.0.1 --- .../multiscale-spatial-image/default.nix | 81 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 83 insertions(+) create mode 100644 pkgs/development/python-modules/multiscale-spatial-image/default.nix diff --git a/pkgs/development/python-modules/multiscale-spatial-image/default.nix b/pkgs/development/python-modules/multiscale-spatial-image/default.nix new file mode 100644 index 000000000000..41b4a720fc50 --- /dev/null +++ b/pkgs/development/python-modules/multiscale-spatial-image/default.nix @@ -0,0 +1,81 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + hatchling, + dask, + numpy, + python-dateutil, + spatial-image, + xarray, + xarray-datatree, + zarr, + dask-image, + fsspec, + jsonschema, + nbmake, + pooch, + pytestCheckHook, + pytest-mypy, + urllib3, +}: + +buildPythonPackage rec { + pname = "multiscale-spatial-image"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "spatial-image"; + repo = "multiscale-spatial-image"; + rev = "refs/tags/v${version}"; + hash = "sha256-s/88N8IVkj+9MZYAtEJSpmmDdjIxf4S6U5gYr86Ikrw="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + dask + numpy + python-dateutil + spatial-image + xarray + xarray-datatree + zarr + ]; + + optional-dependencies = { + dask-image = [ dask-image ]; + #itk = [ + # itk-filtering # not in nixpkgs yet + #]; + test = [ + dask-image + fsspec + #ipfsspec # not in nixpkgs + #itk-filtering # not in nixpkgs + jsonschema + nbmake + pooch + pytest-mypy + urllib3 + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.test; + + doCheck = false; # all test files try to download data + + pythonImportsCheck = [ "multiscale_spatial_image" ]; + + meta = { + description = "Generate a multiscale, chunked, multi-dimensional spatial image data structure that can serialized to OME-NGFF"; + homepage = "https://github.com/spatial-image/multiscale-spatial-image"; + changelog = "https://github.com/spatial-image/multiscale-spatial-image/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bfc66df8da2a..79d8e8f52143 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8017,6 +8017,8 @@ self: super: with self; { multiprocess = callPackage ../development/python-modules/multiprocess { }; + multiscale-spatial-image = callPackage ../development/python-modules/multiscale-spatial-image { }; + multiset = callPackage ../development/python-modules/multiset { }; multitasking = callPackage ../development/python-modules/multitasking { }; From 8e2684a7f71f0168850f0d21d78352156184a3c5 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 25 Jul 2024 21:59:24 +0200 Subject: [PATCH 077/193] python311Packages.openstacksdk: 3.1.0 -> 3.3.0 https://github.com/openstack/openstacksdk/compare/3.1.0...3.3.0 --- .../python-modules/openstacksdk/default.nix | 11 +++++++---- .../development/python-modules/openstacksdk/tests.nix | 5 +++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 47809462a26d..afd98f1f61ed 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -16,21 +16,24 @@ pythonOlder, pyyaml, requestsexceptions, + setuptools, }: buildPythonPackage rec { pname = "openstacksdk"; - version = "3.1.0"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cH8V1+wHSrJDS5peGYT6yrAPgi0nL0wqXeDSKgnrec0="; + hash = "sha256-BghpDKN8pzMnsPo3YdF+ZTlb43/yALhzXY8kJ3tPSYA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ platformdirs cryptography dogpile-cache diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index 0b71fc111b8b..43633f98a038 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -54,6 +54,11 @@ buildPythonPackage { openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait + openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396 + openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForDelete.test_callback_without_progress + openstack.tests.unit.test_resource.TestWaitForDelete.test_status + openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found openstack.tests.unit.test_resource.TestWaitForStatus.test_callback openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute From 05621374d9f7001d870e1b2b6b01fc89f20a13f2 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Thu, 25 Jul 2024 22:15:43 +0200 Subject: [PATCH 078/193] linux_xanmod: 6.6.41 -> 6.6.42 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b90966d1e75f..6c8605b98306 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,8 +6,8 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.41"; - hash = "sha256-74bM7zKEo2wdCEygiWd+niGQm1abM6OIJ2C5CXdrIMY="; + version = "6.6.42"; + hash = "sha256-0YqvOObUHP2S8Jf1H+fzAZ+wOMoFt1BLxWilqt6ohVg="; variant = "lts"; }; From c468388470b94d1867cbc15e5ffeb24f8a301a49 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Thu, 25 Jul 2024 22:18:25 +0200 Subject: [PATCH 079/193] linux_xanmod_latest: 6.9.10 -> 6.9.11 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 6c8605b98306..ba5daf6887aa 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -12,8 +12,8 @@ let }; mainVariant = { - version = "6.9.10"; - hash = "sha256-SHYuEIfpykFNa7bPI0G7DDmBHsXBWYVOxcIS3ShZ6Rw="; + version = "6.9.11"; + hash = "sha256-c6Mkk37SFoC9hJfh/iQqyNzGJJjN0W28VLta/nayCgc="; variant = "main"; }; From ea3b1344d01a6b0a00ab96249b42b5e9a730e970 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 23:11:18 +0200 Subject: [PATCH 080/193] python312Packages.telfhash: drop nose dependency --- pkgs/development/python-modules/telfhash/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index 0aafd816d039..860c9becb6d0 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -6,7 +6,6 @@ packaging, pyelftools, tlsh, - nose, }: buildPythonPackage rec { pname = "telfhash"; @@ -34,11 +33,7 @@ buildPythonPackage rec { packaging ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; + doCheck = false; # no tests pythonImportsCheck = [ "telfhash" ]; From bb7a5dd5791401c434d83ceb81cf1eba4c1683f1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 4 Jul 2024 15:44:51 -0700 Subject: [PATCH 081/193] Remove buildPackages and test-pkgs from excluded-attrnames-at-any-depth --- pkgs/top-level/release-attrpaths-superset.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index e9b13437742a..7a2b04169f4d 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -75,11 +75,7 @@ let newScope = true; scope = true; pkgs = true; - test-pkgs = true; - - buildPackages = true; buildFreebsd = true; - callPackage = true; mkDerivation = true; overrideDerivation = true; From 48d1364929a0f3baa91f16f1fb94a619e8a696b5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 4 Jul 2024 15:47:45 -0700 Subject: [PATCH 082/193] Remove buildFreebsd from excluded-attrnames-at-any-depth --- pkgs/os-specific/bsd/freebsd/package-set.nix | 4 +++- pkgs/top-level/release-attrpaths-superset.nix | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/package-set.nix b/pkgs/os-specific/bsd/freebsd/package-set.nix index e9f45ed64c70..b222bc362f40 100644 --- a/pkgs/os-specific/bsd/freebsd/package-set.nix +++ b/pkgs/os-specific/bsd/freebsd/package-set.nix @@ -21,7 +21,9 @@ lib.packagesFromDirectoryRecursive { patches = ./patches + "/${self.versionData.revision}"; # Keep the crawled portion of Nixpkgs finite. - buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd; + buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd // { + __attrsFailEvaluation = true; + }; ports = fetchzip { url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index 7a2b04169f4d..913cf0e6d7bf 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -75,7 +75,6 @@ let newScope = true; scope = true; pkgs = true; - buildFreebsd = true; callPackage = true; mkDerivation = true; overrideDerivation = true; From 38ffd739cf6181c4ab1bed5789cf5a75c53c4148 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 4 Jul 2024 15:09:29 -0700 Subject: [PATCH 083/193] linuxPackages: remove __attrsFailEvaluation since the attrset evaluates --- nixos/tests/kernel-generic.nix | 2 +- pkgs/top-level/linux-kernels.nix | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index e22c7d735a23..f26038c443e2 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -23,7 +23,7 @@ let assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a") ''; }) args); - kernels = (removeAttrs pkgs.linuxKernel.vanillaPackages ["__attrsFailEvaluation"]) // { + kernels = pkgs.linuxKernel.vanillaPackages // { inherit (pkgs.linuxKernel.packages) linux_4_19_hardened linux_5_4_hardened diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 74566d1704f0..2854d32ef167 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -419,8 +419,7 @@ in { nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })) - // { __attrsFailEvaluation = true; }; + nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); nvidia_x11 = nvidiaPackages.stable; nvidia_x11_beta = nvidiaPackages.beta; @@ -631,7 +630,6 @@ in { linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8); linux_6_9 = recurseIntoAttrs (packagesFor kernels.linux_6_9); linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); - __attrsFailEvaluation = true; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 @@ -652,7 +650,6 @@ in { linux_rt_5_15 = packagesFor kernels.linux_rt_5_15; linux_rt_6_1 = packagesFor kernels.linux_rt_6_1; linux_rt_6_6 = packagesFor kernels.linux_rt_6_6; - __attrsFailEvaluation = true; }; rpiPackages = { @@ -660,7 +657,6 @@ in { linux_rpi2 = packagesFor kernels.linux_rpi2; linux_rpi3 = packagesFor kernels.linux_rpi3; linux_rpi4 = packagesFor kernels.linux_rpi4; - __attrsFailEvaluation = true; }; packages = recurseIntoAttrs (vanillaPackages // rtPackages // rpiPackages // { @@ -704,7 +700,7 @@ in { linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; - } // { __attrsFailEvaluation = true; }; + }; manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {}; From b3cb48b19b86def100586fb59df1638f72bc315e Mon Sep 17 00:00:00 2001 From: YvesStraten Date: Fri, 26 Jul 2024 09:04:54 +0800 Subject: [PATCH 084/193] skimpdf: 1.7.2 -> 1.7.3 --- pkgs/by-name/sk/skimpdf/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sk/skimpdf/package.nix b/pkgs/by-name/sk/skimpdf/package.nix index 0be793c9cb15..da7f2da2d6fe 100644 --- a/pkgs/by-name/sk/skimpdf/package.nix +++ b/pkgs/by-name/sk/skimpdf/package.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, undmg -, fetchurl +{ + stdenv, + lib, + undmg, + fetchurl, }: stdenv.mkDerivation rec { pname = "Skim"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { name = "Skim-${version}.dmg"; url = "mirror://sourceforge/project/skim-app/Skim/Skim-${version}/Skim-${version}.dmg"; - sha256 = "t/A3Bd7mQ8hFGdbpQou4ru9i5jX4HaYOXgMvfPAUEYc="; + hash = "sha256-AMHEzlipL0Bv68Gnyq040t4DQhPkQcmDixZ6Oo0Vobc="; }; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [undmg]; sourceRoot = "."; @@ -28,9 +29,9 @@ stdenv.mkDerivation rec { description = "Skim is a PDF reader and note-taker for OS X"; homepage = "https://skim-app.sourceforge.io/"; license = licenses.bsd0; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [binaryNativeCode]; mainProgram = "Skim.app"; - maintainers = with maintainers; [ YvesStraten ]; + maintainers = with maintainers; [YvesStraten]; platforms = platforms.darwin; }; } From 2678fe2aafb2b2059a3978390e8c5df1773b796f Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Tue, 23 Jul 2024 21:57:27 -0400 Subject: [PATCH 085/193] git-spice: init at 0.3.0 --- pkgs/by-name/gi/git-spice/package.nix | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/gi/git-spice/package.nix diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix new file mode 100644 index 000000000000..ca58ac578aed --- /dev/null +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + nix-update-script, +}: + +buildGoModule rec { + pname = "git-spice"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "abhinav"; + repo = "git-spice"; + rev = "refs/tags/v${version}"; + hash = "sha256-BYIq+12piA0WgfwVSB6P6CKC81icAY/P4/pv2ZMj5N8="; + }; + + vendorHash = "sha256-AIqy0OQsYRStbFLv2L8m4R0k1tr5fVM1FeMFn90yFoY="; + + subPackages = [ "." ]; + + nativeCheckInputs = [ git ]; + + buildInputs = [ git ]; + + ldflags = [ + "-s" + "-w" + "-X=main._version=${version}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Manage stacked Git branches"; + homepage = "https://abhinav.github.io/git-spice/"; + changelog = "https://github.com/abhinav/git-spice/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.vinnymeller ]; + mainProgram = "gs"; + }; +} From 53f1f531bc8a926684d6d4cd806c457cbf49e376 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 25 Jul 2024 22:18:25 -0400 Subject: [PATCH 086/193] libkrunfw: 4.0.0-unstable-2024-06-10 -> 4.2.0 Diff: https://github.com/containers/libkrunfw/compare/12236fa4caa42423ff3081b6179aa0a5f37c67c9...v4.2.0 --- pkgs/development/libraries/libkrunfw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 21b8918d75ec..ef9e43001198 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrunfw"; - version = "4.0.0-unstable-2024-06-10"; + version = "4.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "libkrunfw"; - rev = "12236fa4caa42423ff3081b6179aa0a5f37c67c9"; - hash = "sha256-Vcbg2zBVMQsiAQF/cEEIRMqppMBVGnqUBlDquGzRBsc="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-LaIyPk9QkxPFP169r6PqyBMpFujbQBlX77z63OqKGYc="; }; kernelSrc = fetchurl { From 403b0383425ac6a8145e6313781581817b823cd0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 25 Jul 2024 22:19:46 -0400 Subject: [PATCH 087/193] libkrun: 1.9.3 -> 1.9.4 Diff: https://github.com/containers/libkrun/compare/refs/tags/v1.9.3...v1.9.4 --- pkgs/development/libraries/libkrun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 30730d38a6f7..b08232605ce7 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrun"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-LIp2/794gbHPweBJcHCjbF0m+bJAs0SPF7WivW7fxLI="; + hash = "sha256-QzyNPThwbjPKANeZ4GAT9b4f8LTcjXnCiK+vzRkhM4c="; }; outputs = [ "out" "dev" ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; - hash = "sha256-g4ceYi16mjEgvWTAQEW8ShT/e5IKnlgLgk49Mg0N2fQ="; + hash = "sha256-33s62iOWYh1a8ETY/fbPRxvnj8dR4/UfG8mjFyWwz5k="; }; nativeBuildInputs = [ From 4ce6ffaa8a26a2f522e19a795f0fa571c5659689 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 05:28:08 +0200 Subject: [PATCH 088/193] fastfetch: 2.19.1 -> 2.20.0 --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 3508a5a113c5..d11bc1cc21eb 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.19.1"; + version = "2.20.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-3PXbuaB7QD2xgqaoVx+nRXsPmyoLC0f6Mv0EcNj5sJw="; + hash = "sha256-8N2BG9eTZpAvnc1wiG6p7GJSCPfZ+NTbz8kLGPRg5HU="; }; outputs = [ "out" "man" ]; From 693fa9bc2fed747360475f03bfecca8a534cfa76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 06:18:03 +0000 Subject: [PATCH 089/193] libcdada: 0.5.2 -> 0.6.0 --- pkgs/development/libraries/libcdada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/development/libraries/libcdada/default.nix index 5d1d295f74a8..8b1e4e0c7ab4 100644 --- a/pkgs/development/libraries/libcdada/default.nix +++ b/pkgs/development/libraries/libcdada/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libcdada"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - hash = "sha256-rrBmsXBatvaf/u/UVHpTm9YUo+gsQv1rtuprpRF/3kU="; + hash = "sha256-fgH4gl8Uq8mY9gxa968suU66VJYnFzpSLj4JGpJcJA4="; }; nativeBuildInputs = [ From 34c989194ec5fb73d87aeb8f22463c1416422a8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 06:18:14 +0000 Subject: [PATCH 090/193] pinentry-bemenu: 0.13.2 -> 0.14.0 --- pkgs/tools/security/pinentry-bemenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/tools/security/pinentry-bemenu/default.nix index 65e7a88bcfbb..e165fad36737 100644 --- a/pkgs/tools/security/pinentry-bemenu/default.nix +++ b/pkgs/tools/security/pinentry-bemenu/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pinentry-bemenu"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "t-8ch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m6P8/cCdGH2c9ne8aLrh6pUJ6Ekn+CNyEn3WlD2LhU8="; + sha256 = "sha256-kiGUCcQIS58XjE4r0yiK4hJ85Sg5wrtBqeSYcgUKAmo="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From ba86177a685727449e3c75909e3d5bbb67f58f6c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 26 Jul 2024 07:51:17 +0200 Subject: [PATCH 091/193] python3Packages.beziers: add update script --- pkgs/development/python-modules/beziers/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix index e132936a1c39..d668d34ac6ff 100644 --- a/pkgs/development/python-modules/beziers/default.nix +++ b/pkgs/development/python-modules/beziers/default.nix @@ -6,6 +6,7 @@ matplotlib, pyclipper, unittestCheckHook, + gitUpdater, }: buildPythonPackage rec { @@ -35,6 +36,8 @@ buildPythonPackage rec { "-v" ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + meta = with lib; { description = "Python library for manipulating Bezier curves and paths in fonts"; homepage = "https://github.com/simoncozens/beziers.py"; From 2da100fd0be2b260e1623e29cf6df0ccfe87bb4b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 26 Jul 2024 07:53:08 +0200 Subject: [PATCH 092/193] python3Packages.beziers: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/beziers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix index d668d34ac6ff..2af89a69c9fd 100644 --- a/pkgs/development/python-modules/beziers/default.nix +++ b/pkgs/development/python-modules/beziers/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "beziers"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; # PyPI doesn't have a proper source tarball, fetch from Github instead @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "simoncozens"; repo = "beziers.py"; rev = "v${version}"; - hash = "sha256-4014u7s47Tfdpa2Q9hKAoHg7Ebcs1/DVW5TpEmoh2bc="; + hash = "sha256-NjmWsRz/NPPwXPbiSaOeKJMrYmSyNTt5ikONyAljgvM="; }; propagatedBuildInputs = [ pyclipper ]; From 7fcafcff50fe8421a3ec1270c8265f9824658bc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 06:51:41 +0000 Subject: [PATCH 093/193] python312Packages.streamlit: 1.36.0 -> 1.37.0 --- pkgs/development/python-modules/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index c30512d1171d..52f4a122bc04 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.36.0"; + version = "1.37.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oSr58Othq1gy9DgzYlex7CDrKdjg4Ma0CnkRa6k5vJw="; + hash = "sha256-Rj73KLoh504FEi43BOivZEp727WCLigbja9KCkh2GHk="; }; nativeBuildInputs = [ From 961c43170ef57228c70c05fa35fedd539471c99e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 06:52:21 +0000 Subject: [PATCH 094/193] cozette: 1.24.1 -> 1.25.0 --- pkgs/data/fonts/cozette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 815024778772..ea4230d9526a 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.24.1"; + version = "1.25.0"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip"; - hash = "sha256-G3/m0g3pdPHUlSLnJhGIFem6UOyEf1VxjOvz/0E9Vr0="; + hash = "sha256-ybq72r2p/2e41jzcZ/KxQgib3VIET6PppyCsGAQVXD8="; }; installPhase = '' From 4035da7eab2610543ef9effd273436cd7e9dfe1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 07:15:29 +0000 Subject: [PATCH 095/193] process-compose: 1.6.1 -> 1.9.0 --- pkgs/applications/misc/process-compose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index dad288ef4759..a8889ae88115 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.6.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-yFKqdUlfiMQbx3yJLD5/BJ8pecg5NRr64+HbUwsEOE4="; + hash = "sha256-vZYPbvMt0z08KoN75w3v9Vu0NcpcSz8WpX1CJeO1YbU="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-c53Af0X/TUFsxpV4YE525uh+yLG/t2tSmQkr9ElziBM="; + vendorHash = "sha256-9tSNqdngkx2Tbb5m6UByu8Q+UYeWnwdGmm5De6ITw3k="; doCheck = false; From db232207fee11b770b9d53ce99412129ac1c2096 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 07:15:41 +0000 Subject: [PATCH 096/193] cargo-deny: 0.14.24 -> 0.15.0 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 7a88815b2c1d..b76b0a2f38ac 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.24"; + version = "0.15.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-pCgOT1czLTlL3u4mqhQroal9Z5FHxnBR0YLx3wqp7ps="; + hash = "sha256-utgafrYBm9UCHmvJtxEPHMjXZ0luFUUEDrgLO6i3CJg="; }; - cargoHash = "sha256-LCdP9i+LogdPVVCI4UIhqGRy6H3GTMpEwX2QOlXbo8Q="; + cargoHash = "sha256-XdBcFtt7LJq6um3QiX2VBQTIMVuOAqfpy0dY3GLIXmM="; nativeBuildInputs = [ pkg-config From c315b7bb99e22a8c94497fefd523de3c5d8e86fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 07:34:14 +0000 Subject: [PATCH 097/193] cargo-workspaces: 0.3.2 -> 0.3.5 --- pkgs/development/tools/rust/cargo-workspaces/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index 1bed092b1c42..289fb2fcd3db 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-workspaces"; - version = "0.3.2"; + version = "0.3.5"; src = fetchCrate { inherit pname version; - hash = "sha256-fSvs3dr8dO9n9WCiO1UFr29cp1pvKxL9faOvYnLG+wk="; + hash = "sha256-eNZOtbN3WH7/Y0RjXZCPRxC4Yv0kEtVSqMLsyznPGwU="; }; - cargoHash = "sha256-uB3iN7xt0+qEpRelZQ8uurj6Ve9t9sVTCuH6N4+tDh4="; + cargoHash = "sha256-B5Pc9nzMf9N6FTY1KZ+lj7/RSbJiK/ahotztoopzABk="; nativeBuildInputs = [ pkg-config From 246cf5bee73dc58dc813e79d1b5dd275dc007abf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 07:34:47 +0000 Subject: [PATCH 098/193] prometheus-fastly-exporter: 8.1.0 -> 9.0.0 --- pkgs/servers/monitoring/prometheus/fastly-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix index 84c990e4f704..277d2a96d32c 100644 --- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "fastly-exporter"; - version = "8.1.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "fastly"; repo = "fastly-exporter"; rev = "v${version}"; - hash = "sha256-SpYdcLPknI7ecZ2ef3kJ2nBkQ39vzjk1fNTdDaFZwO0="; + hash = "sha256-H7EaNQmgrRomIQo2xm2Qqkud0LMSYFshNv54lRdrEyw="; }; vendorHash = "sha256-k/n9muWFtTBv8PxMdevFBeTtAOIiCDrK3GoCGeMtBn4="; From 4f77fafd3a842e27e64b5da30bb189480b00c194 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 08:24:39 +0000 Subject: [PATCH 099/193] havn: 0.1.12 -> 0.1.13 --- pkgs/by-name/ha/havn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 81f0f37190fe..ed78d69b6b0d 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "havn"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; rev = "refs/tags/v${version}"; - hash = "sha256-BCg572435CdQMOldm3Ao4D+sDxbXUlDxMWmxa+aqTY0="; + hash = "sha256-z6505lMqNQ0FpMMRJwpOFodELfDeoIjrjG58mrfSvTY="; }; - cargoHash = "sha256-JaAlWiaOUoXSV6O4wmU7zCR5h5olO2zkB5WEGk2/ZdE="; + cargoHash = "sha256-RzfIu2apaFacSJz29UTaCKcC7Y81uxj1EerVyxZB50E="; checkFlags = [ # Skip tests that require network access From 8f509ee7483fb84985e5e26f2286650ca372872e Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 26 Jul 2024 03:02:00 -0600 Subject: [PATCH 100/193] freetube: 0.21.1 -> 0.21.2 --- pkgs/applications/video/freetube/default.nix | 27 +++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index d206aa67528a..ed8b702c6e32 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron, nixosTests }: +{ + stdenv, + lib, + fetchurl, + appimageTools, + makeWrapper, + electron, + nixosTests, +}: stdenv.mkDerivation rec { pname = "freetube"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-HAtOWa/2j8xIICz8BQcG9X4t5Wu+VjlpWUGcTVteeME="; + hash = "sha256-Mk8qHDiUs2Nd8APMR8q1wZhTtxyzRhBAeXew9ogC3nk="; }; passthru.tests = nixosTests.freetube; - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; dontUnpack = true; dontConfigure = true; @@ -42,11 +48,14 @@ stdenv.mkDerivation rec { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ''; - meta = with lib; { + meta = { description = "Open Source YouTube app for privacy"; homepage = "https://freetubeapp.io/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ryneeverett alyaeanyx ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + ryneeverett + alyaeanyx + ]; inherit (electron.meta) platforms; mainProgram = "freetube"; }; From a2e231bc7cebbd9532129b271b4d0977283535bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 09:37:35 +0000 Subject: [PATCH 101/193] chafa: 1.14.1 -> 1.14.2 --- pkgs/tools/misc/chafa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index a5c6cf8b6828..3a6270d19602 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.14.1"; + version = "1.14.2"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-25GVRZGrYcQ+uo+S45HvX4jrdHKnYuSkXHQUr9NHdyY="; + sha256 = "sha256-BK2QTlcns+e3LL3NgcVYk4an+j/x0btpKAuBZ+QIN+Q="; }; nativeBuildInputs = [ autoconf From b7b8b3a5043ef7901f3c05601ca2c3d940cbaa09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 09:40:33 +0000 Subject: [PATCH 102/193] release-plz: 0.3.74 -> 0.3.79 --- pkgs/by-name/re/release-plz/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 49c4703aabd7..25958a05d8c8 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.74"; + version = "0.3.79"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-6Cj23OlIVWnuJC4jpmd7o5L4pUSUkTycZbpu8CzSVM0="; + hash = "sha256-tI9/FtGxjKPIFg6L7pNeSx24G3FcfwOlIqcuF6wCTSU="; }; - cargoHash = "sha256-YAijOHu59BWIsS5cYFYbG4zGG0l+x9cqHfEGu3oL5l0="; + cargoHash = "sha256-UN3SkNNY8ovaT/eNb9JyF9KQWt8KG0TX9ztLjrAnPPo="; nativeBuildInputs = [ installShellFiles pkg-config perl ]; buildInputs = [ openssl ]; From 69c616a2e2e2b537b519a843b181568ee2d31832 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 10:58:54 +0000 Subject: [PATCH 103/193] cargo-mutants: 24.7.0 -> 24.7.1 --- pkgs/development/tools/rust/cargo-mutants/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index 1a54ba51a9a6..742000213879 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.7.0"; + version = "24.7.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-cDwNjPuXa6cpgGUDAAZVWZulcAYM6p5vUQrCs9njuUs="; + hash = "sha256-56IIMifv5epThXeWtQbNLwee1IQ52SPKik4hsHlnv6w="; }; - cargoHash = "sha256-6igY0LzjwPNmVxXTgj+RE5GpK/EyBRhv0yqHp15051s="; + cargoHash = "sha256-VRkhDgKunSUOz2/U4oC2t0YrDh5l48z4luevMazfj6o="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration From b0e17d66b1c15d1fdd5f52923af1ac9a7e0ce951 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 11:04:50 +0000 Subject: [PATCH 104/193] ktop: 0.3.6 -> 0.3.7 --- pkgs/applications/networking/cluster/ktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/ktop/default.nix b/pkgs/applications/networking/cluster/ktop/default.nix index 8c5c842fac30..5dce126d5057 100644 --- a/pkgs/applications/networking/cluster/ktop/default.nix +++ b/pkgs/applications/networking/cluster/ktop/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "ktop"; - version = "0.3.6"; + version = "0.3.7"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "vladimirvivien"; repo = pname; rev = "v${version}"; - hash = "sha256-nVZ1e/GKiJFTwuq5dPIzF4Jrv2DJ2wwWAiOn304hTA4="; + hash = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o="; }; vendorHash = "sha256-MLIcTHWo7lsqtAqH8naSvpS013t8KBVPRbch+CfeUNk="; From 934b6f08278fa31b2833b6c507eecab30bde6d97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 11:20:32 +0000 Subject: [PATCH 105/193] kubectl-ktop: 0.3.6 -> 0.3.7 --- pkgs/applications/networking/cluster/kubectl-ktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix index ab96d337ee96..eda9ee79f1f0 100644 --- a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectl-ktop"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "vladimirvivien"; repo = "ktop"; rev = "v${version}"; - sha256 = "sha256-nVZ1e/GKiJFTwuq5dPIzF4Jrv2DJ2wwWAiOn304hTA4="; + sha256 = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o="; }; vendorHash = "sha256-MLIcTHWo7lsqtAqH8naSvpS013t8KBVPRbch+CfeUNk="; From 8787151ce07a8e3f6321c901f81ec5fa9e4c0c0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 11:20:45 +0000 Subject: [PATCH 106/193] fedimint: 0.3.2 -> 0.3.3 --- pkgs/by-name/fe/fedimint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index 7fa50da3620b..0872a4b9a90e 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -24,16 +24,16 @@ let in buildRustPackage rec { pname = "fedimint"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "fedimint"; repo = "fedimint"; rev = "v${version}"; - hash = "sha256-FEzlNLo6X4zZQM3KEsf6wwJm4Uw6/8HJNZiM4jK2x2k="; + hash = "sha256-0SsIuMCdsZdYSRA1yT1axMe6+p+tIpXyN71V+1B7jYc="; }; - cargoHash = "sha256-lILETtCaPDAWgObNwHIfO/w6pqs0PkbqpDbjODRDOzw="; + cargoHash = "sha256-nQvEcgNOT04H5OgMHfN1713A4nbEaKK2KDx9E3qxcbM="; nativeBuildInputs = [ protobuf From e73ced37f5af48b55dd4698a7fce3f39c9b17cdf Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 13 Jul 2024 00:48:38 +0200 Subject: [PATCH 107/193] python312Packages.pandoc-latex-environment: init at 1.1.6.4 --- .../pandoc-latex-environment/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/pandoc-latex-environment/default.nix diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix new file mode 100644 index 000000000000..fef2811083d9 --- /dev/null +++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + poetry-dynamic-versioning, + panflute, + pytestCheckHook, + pandoc, +}: + +buildPythonPackage rec { + pname = "pandoc-latex-environment"; + version = "1.1.6.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chdemko"; + repo = "pandoc-latex-environment"; + rev = "refs/tags/${version}"; + hash = "sha256-DLuLFCKP5ip3duHlGAZnFip7GCDzWK91bka3DrknQSA="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + dependencies = [ panflute ]; + + pythonImportsCheck = [ "pandoc_latex_environment" ]; + nativeCheckInputs = [ + pytestCheckHook + pandoc + ]; + + meta = { + description = "Pandoc filter for adding LaTeX environment on specific div"; + homepage = "https://github.com/chdemko/pandoc-latex-environment"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3e6066cf77d..ed3842ee5a09 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9606,6 +9606,8 @@ self: super: with self; { pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + pandoc-latex-environment = callPackage ../development/python-modules/pandoc-latex-environment { }; + pandoc-xnos = callPackage ../development/python-modules/pandoc-xnos { }; pandocfilters = callPackage ../development/python-modules/pandocfilters { }; From 447b74eb74d57663de8208cc6b20fed85edd979d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 12:08:56 +0000 Subject: [PATCH 108/193] openjph: 0.14.2 -> 0.15.0 --- pkgs/by-name/op/openjph/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openjph/package.nix b/pkgs/by-name/op/openjph/package.nix index c19c18f17a45..5fcebb7af663 100644 --- a/pkgs/by-name/op/openjph/package.nix +++ b/pkgs/by-name/op/openjph/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openjph"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "aous72"; repo = "openjph"; rev = finalAttrs.version; - hash = "sha256-jksQfNcgw3LRzQlcsGpTAn6avmM3BsH6wGNTdX9khYY="; + hash = "sha256-v4rqBTS6rk5fgDQqvqPwFAYxLNxtsRhZuQsj+y3sE3o="; }; nativeBuildInputs = [ cmake validatePkgConfig ]; From 364a1634b077b77b2681dbbadf1536f006d7f6f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 12:18:26 +0000 Subject: [PATCH 109/193] far2l: 2.6.2 -> 2.6.3 --- pkgs/applications/misc/far2l/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index c356706151b1..f35df6a049f2 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "far2l"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-rX+r5l6dOKZPeiOIdWVPlux5yu5TsuRNCfv3PmNvJWI="; + sha256 = "sha256-iWZQpLe+shdepCVOHZDp7QEQoqelbHGRJh09KWb6aD0="; }; nativeBuildInputs = [ cmake ninja pkg-config m4 perl makeWrapper ]; From b71367cdda170dc2a7c5851c0afe180fd1c70086 Mon Sep 17 00:00:00 2001 From: Arseniy Zorin Date: Fri, 26 Jul 2024 15:39:09 +0300 Subject: [PATCH 110/193] pulumi-bin: 3.126.0 -> 3.127.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 178 +++++++++++++-------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index ce7d9351cad3..f65dcc465fdb 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,36 +1,36 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.126.0"; + version = "3.127.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-linux-x64.tar.gz"; - sha256 = "0icdrxg0n61npmwq9idzxrx9zncp3vnrw4q04b5y4h5w5b5sz9fv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-linux-x64.tar.gz"; + sha256 = "19ndjx7k7gqchqw6rh66c7jpxqxq49cx98r5kya0wgsdhm1ppnxi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-linux-amd64.tar.gz"; - sha256 = "1iyjviw3vqwan1gxwwwz4kgy1xm4gvr7iw0284176qmjy8pci2hk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-linux-amd64.tar.gz"; + sha256 = "0ihn2rn05c1ajs3kh6sk62qsd19a932z27061kym4810fdw3vqai"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-amd64.tar.gz"; sha256 = "0ra89zi6ka0d9szgd0i4vlzw5wzvg9da5pi1ns3bf7kwv0mrxdmc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.0-linux-amd64.tar.gz"; - sha256 = "1yh2k9yd6ygmmic11xzv4jvfyajwg1j5j1hbmfhp6pnsxc515akk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.1-linux-amd64.tar.gz"; + sha256 = "0vcps3pzl8dfcrsk2vc3qgqzjxfb2waq90jld7ap6glc882sr19d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.0-linux-amd64.tar.gz"; - sha256 = "1krglpjj5j3zxhvg7mrxbb98k2d3b5z8p8hqw7js59358g04766b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-linux-amd64.tar.gz"; + sha256 = "0792bjc3csjfv55pg9b6imwrasxz40g928jbackrvdl1c2pawpkn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-linux-amd64.tar.gz"; sha256 = "11kpczajnshx3ky6m8imsydxpw7a8k608bz3bhy9wd43x2gcg5qd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-linux-amd64.tar.gz"; - sha256 = "0fv5lqdak26dvka627j6ybr4mz1027pqgig0vabfifnrgbybk5ra"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-linux-amd64.tar.gz"; + sha256 = "15fc8i0y0xhq85p6vf68df2kavdzph769lzjrrmrayvlclblaiz2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-linux-amd64.tar.gz"; @@ -41,16 +41,16 @@ sha256 = "0yzv3xyijma1sxvilf1bgqcc3d0hdcx6pfpzw2s0fix7pi25qszn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-amd64.tar.gz"; - sha256 = "05vyz81a5z96k35hh8ky9bl6c505jfb6rxsc82qlfh8kx110p66l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-linux-amd64.tar.gz"; + sha256 = "02v61pqpsxj652937rm7fwdr0612cq157g8wxkah27cxyyyf6qzq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.34.0-linux-amd64.tar.gz"; - sha256 = "19g248srvghmzz5d6nk9awifmjfy1r45p0plv6zlg9iad0yfa471"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-linux-amd64.tar.gz"; + sha256 = "11rjl9ddg495awnslnd0q7cfc6x31mwzvcjz56xllgkxxryn8c1n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-amd64.tar.gz"; - sha256 = "1g6rzqsgak4801b2zzhq3ss6gkvkc8y7swpbm92sdbns71hxvw6w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-linux-amd64.tar.gz"; + sha256 = "0gb8yrsl7js41ffq993x5cibl3drgdjgaq3nl1xd72248b82pik4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-amd64.tar.gz"; @@ -61,8 +61,8 @@ sha256 = "1fsslwik687gqpcj3i5d1zv5jwcf2knkx2whn61bm0gir8wcl3iq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-linux-amd64.tar.gz"; - sha256 = "1sbscig80kf3k2w5j5934ld78w2760s97dn9cqnwf040wq3x2bqk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-amd64.tar.gz"; + sha256 = "1yszi5baiix59c0pbhs74s323v4my08dfcjsj3scdy98az65n5hm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; @@ -97,8 +97,8 @@ sha256 = "04bldr5h13gfpk19d4s74fvhskyzihi199af1rq0n7ks8mf43ig2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.23.0-linux-amd64.tar.gz"; - sha256 = "1nn0vj67034sg696x93pzvkai0kswy0gxrl5xp1vg89yw4x4mmji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-linux-amd64.tar.gz"; + sha256 = "00yhd0a5gic68q5b8xqk10xylnda0h2zrh7l7r6crjnb811n3myx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-amd64.tar.gz"; @@ -109,8 +109,8 @@ sha256 = "1vl57mjz23krcp7801q5v2vb64daxpyqpas57y8hxvi5np7qnpk4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.0.0-linux-amd64.tar.gz"; - sha256 = "195m7xxdzlwzglaz72iajdx13yr3j78x38z3ajbw7c89wvpp8p6l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-linux-amd64.tar.gz"; + sha256 = "1zh21cnnr3pfsraad0spv3nnds6pnad1xa3whms9qzdk62lrh0zh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-amd64.tar.gz"; @@ -163,32 +163,32 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-darwin-x64.tar.gz"; - sha256 = "08zmjayipsv7j713dy4pk3s6ixx4sqw5n99n6jqm2zr97jz8jknh"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-darwin-x64.tar.gz"; + sha256 = "0mvyjbvabgxqmv1bjfbiid31grzgcajflhqsmhi5nrdb72w0sq2d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-darwin-amd64.tar.gz"; - sha256 = "0qw32ya0xnrdg51spwbh6g9c6zgmy5xyb5y38h3v93ksc45d0kab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-darwin-amd64.tar.gz"; + sha256 = "148ksf36bfvl4xysw949yhixcc8q9lm945r03pb8rfrb04561fx2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-amd64.tar.gz"; sha256 = "1d1famsg3pg69300vl5rifjbcvf5linajgwn5hi3wiwrszk2fcg7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.0-darwin-amd64.tar.gz"; - sha256 = "1pkpxw36m0insgbg3whvs32q3lyvi1i8ihnc61hrcmvslhkfvzx2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.1-darwin-amd64.tar.gz"; + sha256 = "01bbbwczlakxb08p35s74rd5yqnk8z7580k146ib0l9xgzf0a811"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.0-darwin-amd64.tar.gz"; - sha256 = "02sg8gdlxf5dclgnjcjhmrgwn93ngy8rk9n0g02h2y4a1lz7a41a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-darwin-amd64.tar.gz"; + sha256 = "1b1fwvwxdiwk7cq4gf1ssjj294abx86j93q8rp1vqj1hfj75glyl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-darwin-amd64.tar.gz"; sha256 = "00p3b7m2rnp5w4nsh15w2s3hbhwv6wm2x30d8g939z07z6dxzq3s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-darwin-amd64.tar.gz"; - sha256 = "031x0yi2znc71drb13h1idn0x48z05ylygjlx7gcp3lci67p66lc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-darwin-amd64.tar.gz"; + sha256 = "0yqp5fajmlsxgsin6vrpikr49b5fxi1v6alw5ix2i04mv8fzs5i7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-darwin-amd64.tar.gz"; @@ -199,16 +199,16 @@ sha256 = "16vkx1cnfzwyzsk7f9f794p6mg1ny8g5qxiy0825gd0prf8dzdm5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-amd64.tar.gz"; - sha256 = "0blhx82diydpwbfr7grj2zxk29pvg0b2w2rawlv60mhc3dw6ixar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "1xranra0rkcnvahna4jrb091jy23sgk9ib92dbzl2gw26yj6x9gx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.34.0-darwin-amd64.tar.gz"; - sha256 = "0x0c41nrai2p7gim8aqq7jn601jy8s9f8835bzz8vnbgbj7ip6fw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-darwin-amd64.tar.gz"; + sha256 = "14h8dr3xs17lqjr9vxa63m2pwiqc0hd227f1n6x4vchb726h7iam"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-amd64.tar.gz"; - sha256 = "1gcv6ri58a4k8g7dzh0xvpmv1x6ndlihkmd5n2gza303i9c8466n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-darwin-amd64.tar.gz"; + sha256 = "0q9ycpaavrnzl3dh1wa9pi4acpr52s2f3plf3x9yx3l3jdqs8m76"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-amd64.tar.gz"; @@ -219,8 +219,8 @@ sha256 = "0lwwq0na0334ynddmpy1fy71js5f35i4ps3084z4cxzaz0amlnv1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-darwin-amd64.tar.gz"; - sha256 = "1viwf0afhmisxvz0dkmf79b3ncbba4xz9hp9h0h2866l05h9v5d0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-amd64.tar.gz"; + sha256 = "0w01z3kq1fm8nn48m3vx08ivsdqv991r8g22jd0gs2d70rqx2xms"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; @@ -255,8 +255,8 @@ sha256 = "0lnlahbrsccz6qhjrbrmgjh1dc2qvhr4rxhj0zbmvjmgch81cy1a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.23.0-darwin-amd64.tar.gz"; - sha256 = "0dbjrnz45vx7fw4lgx240d08h0xgzvzxxaqzli91ccag1lrb3b8b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-darwin-amd64.tar.gz"; + sha256 = "0jkns8pmq40y4lcdrh8vjlb5wzmcqfi9f5zyc08j907lhcbh1d6j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-amd64.tar.gz"; @@ -267,8 +267,8 @@ sha256 = "1a7gd4vbkvbmk2870xc2dgkq6dd4bvcmdcrkny51m2bcns94b2xl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "0f3xrcnn65yqpfrqkywa6blsxb501xjw2j3apb3351ii5dmmi31q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "1y3z2jlw5x1zmfljf25dy8a48arkk030qjc9isxzal6ij8v4ylml"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-amd64.tar.gz"; @@ -321,32 +321,32 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-linux-arm64.tar.gz"; - sha256 = "0h5fhiyqgs0zvmj72z5asmqyp1y3fmwd0vi3acx38ra65bnwd5yp"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-linux-arm64.tar.gz"; + sha256 = "1w7k6g8rch463hmgh1qymblikk9j5pcgl0scl422ffd3clqrl8zm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-linux-arm64.tar.gz"; - sha256 = "15f5zcnrz9p4fkmaj7cw7jgkhy38yyj9xh33qjcfk7k1qgxy8jf7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-linux-arm64.tar.gz"; + sha256 = "0rva2s47fgii2c3l52gmfnpf0fs8rw3w4prhz7afpv96s9m0qpjb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-arm64.tar.gz"; sha256 = "0zpcz79ca84lhccg2ivr442hr2gfmx7826rmw0ppnyi5cna1wvkr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.0-linux-arm64.tar.gz"; - sha256 = "1d4f6jy09aplg47qclkv9xgp7ilpsz8cxab8nfj9qgjhf6vq8bza"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.1-linux-arm64.tar.gz"; + sha256 = "0cs456c4hlasjzd7whnna5adv0x9y4q8jqjmrkb3ijnlyi1l24pv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.0-linux-arm64.tar.gz"; - sha256 = "0qd5kljm58xgig34gxnzfsfqihc50isxm9ynyjzf5sad7nlxq2j6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-linux-arm64.tar.gz"; + sha256 = "0jmvk7158384y512g9qycq7d9877rxzk1snwzbz0lfg4rqlw169p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-linux-arm64.tar.gz"; sha256 = "0kabsgjxhg8dlj0qa33mfsm90vsd9lzizw1a5sfmf9py7flcvn0y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-linux-arm64.tar.gz"; - sha256 = "1hvv63kmpn2277577i95wcdnzc4fy9dmp6jwmx8nv7ddh9fqw0ha"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-linux-arm64.tar.gz"; + sha256 = "0aihaakzb4cbrdp6xdqxidh08n7zwqgg1ncb57j841gilzf7ya1m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-linux-arm64.tar.gz"; @@ -357,16 +357,16 @@ sha256 = "0p16833m7igpz7b6p05clcf6qk5jj10iqrdm8wkdj7zv9q1v60hk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-arm64.tar.gz"; - sha256 = "1chrfqdiwx6lvylrih6zx7m1zkrmcb7lz0x1cb9hc0l5fy93rc63"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-linux-arm64.tar.gz"; + sha256 = "03rvhz2zbjdldlp3c1335cbp2b8c3y3p88czwsfy6dsd9hry8fsa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.34.0-linux-arm64.tar.gz"; - sha256 = "0111viyc9vsk408wpnyz4blxz977vdgmdb97q29ydm2lkbdzvib9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-linux-arm64.tar.gz"; + sha256 = "1kphr21na2rzspd4m2kh962mfbr6df23f0rfas3qdrd2nw7vh1rq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-arm64.tar.gz"; - sha256 = "0rmn667z8s4pndck24h82qp5fyshixvji736x6barlpiamy4lkhj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-linux-arm64.tar.gz"; + sha256 = "1zaxwkn4kg4nnns90dbx6dwdjw5mbbpm9h8wjcd41zhhbd4b3vld"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-arm64.tar.gz"; @@ -377,8 +377,8 @@ sha256 = "10asvq6ds4y9sfxy2lh81ldzxdr347nwvhphjzs3sb2pxrx9dksz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-linux-arm64.tar.gz"; - sha256 = "117a8xaj6n9hgr7r8brmwf3kmdlgd2xzmssai8nn5r9hq7r8z79f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-arm64.tar.gz"; + sha256 = "0x2nwvi1b13sj8n32ab7vw56ksa6n4bix11zz1b5cz4l0l9v00wf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; @@ -413,8 +413,8 @@ sha256 = "00mla8clf53jwdivd0magmzc0psm6ac3xps7xbx979aqd7lgxzv6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.23.0-linux-arm64.tar.gz"; - sha256 = "09fi0qhw9aw2wmz4bd4zns2s2cyq3ny0qjhv809ndy2c3az3kf6d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-linux-arm64.tar.gz"; + sha256 = "0ssj159b3vgr7gxi2b0fib7jlzn1g3gkr18wsaj1i55avmk9gm40"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-arm64.tar.gz"; @@ -425,8 +425,8 @@ sha256 = "0krvvhm842lkxa14xfpkk2b1namgxnk3y6n5lcvhsnswga10r2xq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.0.0-linux-arm64.tar.gz"; - sha256 = "0gg3f461j6ca31cnnlsn9nlnb63mhhr6rwkypa5wnvf38xsfbmf6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-linux-arm64.tar.gz"; + sha256 = "1mvx5hq5s4s6hvcjfk4ficdacz5ivrczr10d182n7hzai8nmq3c3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-arm64.tar.gz"; @@ -479,32 +479,32 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.126.0-darwin-arm64.tar.gz"; - sha256 = "07s197xz1mv3c3jj15q1hk31q4awf08m7q2s3kkhkqslq6c4ijyn"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-darwin-arm64.tar.gz"; + sha256 = "06sfzk8hm2lgfaj2k0br9w1z6yfa7pfxqvh4wp0c2gxq5vykjw2m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.18.0-darwin-arm64.tar.gz"; - sha256 = "0dgimn8pi53aml8zzwcirvqdjg7mm50lh9897p266zsfbzlp3i4r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-darwin-arm64.tar.gz"; + sha256 = "097wrym5h2x3bak28sflpslvfmzh2sw05hgaj3wslcmvvc0h1s5r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-arm64.tar.gz"; sha256 = "12954vrf9fjjynrzgj8qm34bl258v4fdvvzyi0m8wp92rsp4icjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.0-darwin-arm64.tar.gz"; - sha256 = "0p89svy3d28lkg89bsv0218a89fdmhhg432x2kpw3zfs5idamkgc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.59.1-darwin-arm64.tar.gz"; + sha256 = "1gpaz8nrx85mrhp03nn3m44q7ksg4irszzj62yyhckdj1jpfkahz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.0-darwin-arm64.tar.gz"; - sha256 = "1q4f25zb7ghdyxgwr658q7jf5qdzl0s3v1b91s32bz4lpy6cgjca"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-darwin-arm64.tar.gz"; + sha256 = "17mh63n9w45y320fjcafvcdic52zfmnvkd2fq193ppfx930lz1zc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-darwin-arm64.tar.gz"; sha256 = "1mmrvn31njs2sr9h6cj7m1ph2gh465qqx0pigvbidjfhl9ag2hrx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.45.2-darwin-arm64.tar.gz"; - sha256 = "1x4768mr61mf4kf4rfyg8ifgin4jwxm7s1i3gi7nbfwr8qlkh643"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-darwin-arm64.tar.gz"; + sha256 = "1rkavb9la0dmbd49hzwbg8sv5py1h3n88v4sf7y2fjb877xaq1ni"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-darwin-arm64.tar.gz"; @@ -515,16 +515,16 @@ sha256 = "13r7yzgj4lbsvsw9y1fxc5n6dhral0763ny8mahxhj3cl6mmxvi7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-arm64.tar.gz"; - sha256 = "1m53gzviimjcr3dl0pydafa6dl1r0q6ih1gwhm7lvgpll300wl1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-darwin-arm64.tar.gz"; + sha256 = "04wibkfpq76qhyy8kf0y89qkssapwgmkv56bspdxpydlnnwvn714"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.34.0-darwin-arm64.tar.gz"; - sha256 = "02vv8fy5x6i1fq5pvfcp7rcqqb9kqhar09swp5c8yzqz64kv1k28"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-darwin-arm64.tar.gz"; + sha256 = "10vr6vr9dna44g6qsrk5dkc7g03qq7v91x4js8hz20aql7qp68p7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-arm64.tar.gz"; - sha256 = "1wfiq9rzdzp8pa88g7dbgz644dih8f9f0apw6vfngjjsd2kj3k1c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-darwin-arm64.tar.gz"; + sha256 = "1w04f1w8f1ir1jfbkn6rmrpjj49k6ddw2nfx2617q2icmvaj3q7p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-arm64.tar.gz"; @@ -535,8 +535,8 @@ sha256 = "0gi776zhi37nrj37aalz5qmkyf2wihgq4jhm7h6qr5vgr7chld34"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-darwin-arm64.tar.gz"; - sha256 = "128wvq4qvyrgv2q07bpvf96c5vm0fm77x4dcycf0j89hq3rj09zy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-arm64.tar.gz"; + sha256 = "1zzb1v9fq6x23pc7ar1hna7hqnaqghss0rfx4viyhhah8659k3va"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; @@ -571,8 +571,8 @@ sha256 = "0qa07scjj7mjwqjmv260ansiy8qk3ch9bf50p33ig86599r4indp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.23.0-darwin-arm64.tar.gz"; - sha256 = "17hh4h4116mw93icvk7bybqz3cnf28b2rpqsy4jazq18aaj8wwxy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-darwin-arm64.tar.gz"; + sha256 = "1bv6k8d6h0bv8rdzf78szavd03gqa9x1j5s5zv3fngq404zs9nn0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-arm64.tar.gz"; @@ -583,8 +583,8 @@ sha256 = "0girslx186bif03hxkpsgs21g88sy2r1py05b2kqb67izcbh996v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.0.0-darwin-arm64.tar.gz"; - sha256 = "1ljqziijcdni2vgh55qb5sglb2vwzlkzvpbhxcjj6x3ap4ywiiyf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-darwin-arm64.tar.gz"; + sha256 = "007v4jacfg1i0skarsab918i8qwipgvklrsa6fqv4gwqjcz6y2lr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-arm64.tar.gz"; From d4047a8dfa92fabad9584e3e0bac1195861692a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 12:41:51 +0000 Subject: [PATCH 111/193] bottom: 0.9.6 -> 0.9.7 --- pkgs/tools/system/bottom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 160baf72636b..5c04bd8c7473 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - hash = "sha256-czOYEZevZD7GfExmqwB7vhLXl6+etag1PjZFA2G9aGA="; + hash = "sha256-WZf6BR0D7VDdRu9mCVd2dwPraQ8IYXQcgblwL5wqHYQ="; }; - cargoHash = "sha256-RDOGf1jujZikcRXRtL71BUGgmZyt7vQOTk1LkKpXDuo="; + cargoHash = "sha256-F0T9jbgfdu6rimIq+3ijYlkFRMkhuuQchy0o4xhCoXE="; nativeBuildInputs = [ installShellFiles ]; From 34bd07132d4d10f6a31c04878ca6f55f24b582ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 13:22:04 +0000 Subject: [PATCH 112/193] cryptpad: 2024.6.0 -> 2024.6.1 --- pkgs/by-name/cr/cryptpad/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix index f2137c19bac4..5362a96cda03 100644 --- a/pkgs/by-name/cr/cryptpad/package.nix +++ b/pkgs/by-name/cr/cryptpad/package.nix @@ -9,7 +9,7 @@ }: let - version = "2024.6.0"; + version = "2024.6.1"; # nix version of install-onlyoffice.sh # a later version could rebuild from sdkjs/web-apps as per # https://github.com/cryptpad/onlyoffice-builds/blob/main/build.sh @@ -68,10 +68,10 @@ buildNpmPackage { owner = "cryptpad"; repo = "cryptpad"; rev = version; - hash = "sha256-huIhhnjatkaVfm1zDeqi88EX/nAUBQ0onPNOwn7hrX4="; + hash = "sha256-qwyXpTY8Ds7R5687PVGZa/rlEyrAZjNzJ4+VQZpF8v0="; }; - npmDepsHash = "sha256-Oh1fBvP7OXC+VDiH3D+prHmi8pRrxld06n30sqw5apY="; + npmDepsHash = "sha256-GSTPsXqe/rxiDh5OW2t+ZY1YRNgRSDxkJ0pvcLIFtFw="; nativeBuildInputs = [ makeBinaryWrapper From 99e242bd6851028d08e96ccd075b9fe081d43149 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 13:22:41 +0000 Subject: [PATCH 113/193] downonspot: 0.5.0 -> 0.5.1 --- pkgs/by-name/do/downonspot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/downonspot/package.nix b/pkgs/by-name/do/downonspot/package.nix index 587201dd7923..5d115404c240 100644 --- a/pkgs/by-name/do/downonspot/package.nix +++ b/pkgs/by-name/do/downonspot/package.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "downonspot"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "oSumAtrIX"; repo = "DownOnSpot"; rev = "refs/tags/v${version}"; - hash = "sha256-PA11R/hVAmismayE8uU03P0eeNnrgpD2HxbMW0vlk3k="; + hash = "sha256-F0SW/qce7eEEDC4FQvO6eW9V4POkRK/WP8bMUBtzGIw="; }; # Use official public librespot version cargoPatches = [ ./Cargo.lock.patch ]; - cargoHash = "sha256-jdscYr4Emm2+mWXbxfhU1rp855tsGY5hrdJsDEfXeUo="; + cargoHash = "sha256-kLMV8jDadb2BryOqXGkiunQvZRjzjbVTh9Z+jHSSHbU="; nativeBuildInputs = [ pkg-config From 3618243045904671edb01be096fd072965f56ab3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 13:22:47 +0000 Subject: [PATCH 114/193] automatic-timezoned: 2.0.22 -> 2.0.25 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 4bdc6674e08b..f65553b39ce8 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.22"; + version = "2.0.25"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W1VfJiQHgYp3KzLaXYIJfvNRHKNZ7NxFr4WbBUtwh8k="; + sha256 = "sha256-+1MOGpk4nxYNtadjv88drubmHyEciiVWax7rdVWrjMY="; }; - cargoHash = "sha256-N9xQqMFd14tkRGYrRUvqg9Y6rqnWwukutD3nv61gKuc="; + cargoHash = "sha256-+n+3BEZ84pYzjBLxW0YEz15RhgRqyakdamMA77Z+BeI="; meta = with lib; { description = "Automatically update system timezone based on location"; From bae3aa0327234146499a25d44824b93cb8933616 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:21:30 +0800 Subject: [PATCH 115/193] pantheon.elementary-calendar: 7.0.0 -> 8.0.0 https://github.com/elementary/calendar/compare/7.0.0...8.0.0 --- .../pantheon/apps/elementary-calendar/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 24deffaa01ec..43a49528df08 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook3 , clutter @@ -24,20 +23,19 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "calendar"; rev = version; - sha256 = "sha256-qZvSzhLGr4Gg9DSJ638IQRLlPiZkbJUCJ7tZ8ZFZZ1E="; + sha256 = "sha256-gBQfrRSaw3TKcsSAQh/hcTpBoEQstGdLbppoZ1/Z1q8="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook3 ]; @@ -57,11 +55,6 @@ stdenv.mkDerivation rec { libportal-gtk3 ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; From 33316af5e5a78350ee7a6674c5aa9cb80f385a59 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:27:00 +0800 Subject: [PATCH 116/193] pantheon.elementary-settings-daemon: 1.3.1 -> 8.0.0 https://github.com/elementary/settings-daemon/compare/1.3.1...8.0.0 --- .../elementary-settings-daemon/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index ed9da1181514..d2780cdcfe65 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -5,31 +5,33 @@ , meson , ninja , pkg-config -, python3 , vala , accountsservice , dbus , desktop-file-utils , fwupd +, gdk-pixbuf , geoclue2 +, gexiv2 , glib , gobject-introspection , gtk3 , granite , libgee +, packagekit , systemd , wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "1.3.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-daemon"; rev = version; - sha256 = "sha256-mEmc9uLwUTObsP70P0G2vcRdQF6do/wMTQjvfLUU//o="; + sha256 = "sha256-e70OVdvyKzzF+W7epzj23/Q1lsJiSJd7z1fj41sWfWU="; }; nativeBuildInputs = [ @@ -38,7 +40,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook3 ]; @@ -47,19 +48,17 @@ stdenv.mkDerivation rec { accountsservice dbus fwupd + gdk-pixbuf geoclue2 + gexiv2 glib gtk3 granite libgee + packagekit systemd ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; From 0f0687f6b3c1fab69715f8d7ca8d65fefb777d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 21 Jul 2024 19:08:16 -0400 Subject: [PATCH 117/193] yt-dlp: move to by-name --- .../yt/yt-dlp/package.nix} | 21 ++++++------------- pkgs/top-level/all-packages.nix | 8 ++++--- pkgs/top-level/python-packages.nix | 14 ++++++------- 3 files changed, 17 insertions(+), 26 deletions(-) rename pkgs/{tools/misc/yt-dlp/default.nix => by-name/yt/yt-dlp/package.nix} (90%) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/by-name/yt/yt-dlp/package.nix similarity index 90% rename from pkgs/tools/misc/yt-dlp/default.nix rename to pkgs/by-name/yt/yt-dlp/package.nix index 4e88175b9aa7..eeb36b47145b 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -1,18 +1,9 @@ { lib -, buildPythonPackage +, python3Packages , fetchPypi -, brotli -, hatchling -, certifi -, ffmpeg +, ffmpeg-headless , rtmpdump , atomicparsley -, pycryptodomex -, websockets -, mutagen -, requests -, secretstorage -, urllib3 , atomicparsleySupport ? true , ffmpegSupport ? true , rtmpSupport ? true @@ -20,7 +11,7 @@ , update-python-libraries }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "yt-dlp"; # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported @@ -34,11 +25,11 @@ buildPythonPackage rec { hash = "sha256-dYeqJeI2z3sUvbk3i7//9RIC2QGwQgK+DPYsu1bTtSw="; }; - build-system = [ + build-system = with python3Packages; [ hatchling ]; - dependencies = [ + dependencies = with python3Packages; [ brotli certifi mutagen @@ -57,7 +48,7 @@ buildPythonPackage rec { let packagesToBinPath = [] ++ lib.optional atomicparsleySupport atomicparsley - ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional ffmpegSupport ffmpeg-headless ++ lib.optional rtmpSupport rtmpdump; in lib.optionals (packagesToBinPath != []) [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84cae899cd6d..7ac49103e572 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35306,9 +35306,11 @@ with pkgs; youki = callPackage ../applications/virtualization/youki { }; - yt-dlp = with python3Packages; toPythonApplication yt-dlp; - - yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light; + yt-dlp-light = yt-dlp.override { + atomicparsleySupport = false; + ffmpegSupport = false; + rtmpSupport = false; + }; youtube-viewer = perlPackages.WWWYoutubeViewer; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c5ac7cbb3fc..5cf2572e1b72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17628,15 +17628,13 @@ self: super: with self; { yoyo-migrations = callPackage ../development/python-modules/yoyo-migrations { }; - yt-dlp = callPackage ../tools/misc/yt-dlp { - ffmpeg = pkgs.ffmpeg-headless; - }; + yt-dlp = toPythonModule (pkgs.yt-dlp.override { + python3Packages = self; + }); - yt-dlp-light = callPackage ../tools/misc/yt-dlp { - atomicparsleySupport = false; - ffmpegSupport = false; - rtmpSupport = false; - }; + yt-dlp-light = toPythonModule (pkgs.yt-dlp-light.override { + python3Packages = self; + }); youtube-search = callPackage ../development/python-modules/youtube-search { }; From 9f13d0bce28f43075239e85ddef104718c9ac392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 21 Jul 2024 19:09:12 -0400 Subject: [PATCH 118/193] yt-dlp: add curl impersonation support --- pkgs/by-name/yt/yt-dlp/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index eeb36b47145b..f61baab5e190 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -32,6 +32,7 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ brotli certifi + curl-cffi mutagen pycryptodomex requests From 4de56f190b392c9584e9775227e450d4a599aeca Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:32:25 +0800 Subject: [PATCH 119/193] pantheon.elementary-screenshot: 6.0.4 -> 8.0.0 https://github.com/elementary/screenshot/compare/6.0.4...8.0.0 --- .../pantheon/apps/elementary-screenshot/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index f8ca0fe62cd7..9325f5740bcb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -6,7 +6,6 @@ , meson , ninja , vala -, python3 , desktop-file-utils , gtk3 , granite @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "elementary-screenshot"; - version = "6.0.4"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "screenshot"; rev = version; - sha256 = "sha256-xG67a19ySuYc5IXlEkaqhnDpDa2krF2y6PnhJkd/rOg="; + sha256 = "sha256-z7FP+OZYF/9YLXYCQF/ElihKjKHVfeHc38RHdPb2aIE="; }; nativeBuildInputs = [ @@ -32,7 +31,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook3 ]; @@ -45,11 +43,6 @@ stdenv.mkDerivation rec { libhandy ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; From 2980f5d17eaaf93fe2ba0e7ffca664acbcb352c1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:35:48 +0800 Subject: [PATCH 120/193] pantheon.elementary-music: 7.1.0 -> 8.0.0 https://github.com/elementary/music/compare/7.1.0...8.0.0 --- .../pantheon/apps/elementary-music/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 258ff8e2dadb..49cc2c2e42bc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook4 , elementary-gtk-theme @@ -14,24 +13,24 @@ , granite7 , gst_all_1 , gtk4 +, libadwaita }: stdenv.mkDerivation rec { pname = "elementary-music"; - version = "7.1.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "music"; rev = version; - sha256 = "sha256-L+E5gDtIgVkfmOIhzS7x8vtyMJYqx/UQpYMChrt2Tgo="; + sha256 = "sha256-pqOAeHTFWSoJqXE9UCUkVIy5T7EoYsieJ4PMU1oX9ko="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook4 ]; @@ -41,6 +40,7 @@ stdenv.mkDerivation rec { glib granite7 gtk4 + libadwaita ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-base @@ -49,11 +49,6 @@ stdenv.mkDerivation rec { gstreamer ]); - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # The GTK theme is hardcoded. From 5197abc1a2a1e1b366c55dc39d7dd94878f1641b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 14:01:35 +0000 Subject: [PATCH 121/193] faas-cli: 0.16.30 -> 0.16.31 --- pkgs/development/tools/faas-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 66f45af3a5ba..402074323e3a 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.30"; + version = "0.16.31"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-tk0ZptDT4qxJLv5sMAh1oF8yXiTsKbv3UiQM8f4ywMA="; + sha256 = "sha256-RvDrdgHzGGjJorm55ksMk+YqPdBgQyWs1IDaxqOYON8="; }; vendorHash = null; From e9b7cd7b7237160dd163e0901ceb1f31c5dff1f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 14:01:42 +0000 Subject: [PATCH 122/193] ginkgo: 2.19.0 -> 2.19.1 --- pkgs/development/tools/ginkgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index aefcaec12e17..52c49b853470 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.19.0"; + version = "2.19.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-+Kh+Pn0oEq/eDXE+vsYrSOqhSoeQoIueb6mVpT2bljc="; + sha256 = "sha256-U8oSROthoqZsEEk3EUkojyHcpR3WJgDYDTAg+/ggqE8="; }; - vendorHash = "sha256-ccqhuUL99dtIeiEM4hRdi0479I0cyf8pxSZz0G6Vm+w="; + vendorHash = "sha256-JQ1BayYPsp1VSEdGtRXI3NFZamHMLv/5C8G2gEY0qY0="; # integration tests expect more file changes # types tests are missing CodeLocation From 6f43c10be8e13be6a5f2247876a14070fd68304d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:40:02 +0800 Subject: [PATCH 123/193] pantheon.elementary-videos: 3.0.0 -> 8.0.0 https://github.com/elementary/videos/compare/3.0.0...8.0.0 Ported to GTK4. --- .../apps/elementary-videos/default.nix | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 7fb642ce7b7d..9b16c90e0c89 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,28 +1,30 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, pkg-config -, meson -, ninja -, vala -, gtk3 -, granite -, libgee -, libhandy -, gst_all_1 -, wrapGAppsHook3 +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook4, + gdk-pixbuf, + granite7, + gst_all_1, + gtk4, + libadwaita, + libgee, }: stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "3.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "videos"; rev = version; - sha256 = "sha256-O98478E3NlY2NYqjyy8mcXZ3lG+wIV+VrPzdzOp44yA="; + hash = "sha256-GfTYwnNZg8/cmJMzLDfYpulG7K4SMYK2H+SXtiS3TCg="; }; nativeBuildInputs = [ @@ -30,23 +32,24 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ - granite - gtk3 - libgee - libhandy - ] ++ (with gst_all_1; [ - gst-libav - gst-plugins-bad - gst-plugins-base + gdk-pixbuf + granite7 + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base # https://github.com/elementary/videos/issues/356 - (gst-plugins-good.override { gtkSupport = true; }) - gst-plugins-ugly - gstreamer - ]); + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) + gst_all_1.gst-plugins-rs # GTK 4 Sink + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk4 + libadwaita + libgee + ]; passthru = { updateScript = nix-update-script { }; From 87b7b8c7bdacc4921adb1d67d6c83efe9155f60d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 15:27:37 +0000 Subject: [PATCH 124/193] imsprog: 1.4.2 -> 1.4.3 --- pkgs/by-name/im/imsprog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index b356e7bdd5df..a8042eaef1fa 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imsprog"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bigbigmdm"; repo = "IMSProg"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-9ALiYTUnrdoRHfcyuz4nPzXFHL7pPkFUTBL2/v1atz0="; + hash = "sha256-FAvGGxw7qDuucAbyaq9gDhMvHL9mJCQApRzzQ7Kh0c8="; }; strictDeps = true; From cb567491b296af6b8a1221d9a5220b5826fc6031 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 15:30:09 +0000 Subject: [PATCH 125/193] nuclei-templates: 9.9.1 -> 9.9.2 --- pkgs/by-name/nu/nuclei-templates/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 0e6fe513d544..6e895ee70b47 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.9.1"; + version = "9.9.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-zD+mW7l7Wv6re8X6YztEnfwBYbMSLWZgbVpOpjZWNXM="; + hash = "sha256-PObtdRhj4KaQRHpSSGCZzhFXRYRAJ4mejkYi7SgOqyE="; }; installPhase = '' From f92355165f2edc6f718e622f97475e8639845e26 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 26 Jul 2024 17:53:05 +0200 Subject: [PATCH 126/193] python311Packages.transformers: 4.43.2 -> 4.43.3 Diff: https://github.com/huggingface/transformers/compare/v4.43.2...v4.43.3 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.43.3 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 976d3a0c2bc7..9a8c3bfda567 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.43.2"; + version = "4.43.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -68,7 +68,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-TOuwdmuHUW/RoYl7XYLjjBuz7nAuvJWigka2Bf7yNuQ="; + hash = "sha256-CMc+bI99/kN560X7qsXh1tSho0/V8iwJMy4TALambRE="; }; build-system = [ setuptools ]; From ec0dc6aec1c056fecd3e58191322ca2222c55245 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 15 Mar 2024 11:23:03 -0700 Subject: [PATCH 127/193] Avoid top-level `with ...;` in pkgs/development/node-packages/aliases.nix --- pkgs/development/node-packages/aliases.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 0bc7ec6c36b7..42ee799db75a 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -6,8 +6,6 @@ pkgs: lib: self: super: ### Use `./remove-attr.py [attrname]` in this directory to remove your alias ### from the `nodePackages` set without regenerating the entire file. -with self; - let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. @@ -113,7 +111,7 @@ mapAliases { inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 karma = pkgs.karma-runner; # added 2023-07-29 - leetcode-cli = vsc-leetcode-cli; # added 2023-08-31 + leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31 inherit (pkgs) lv_font_conv; # added 2024-06-28 manta = pkgs.node-manta; # Added 2023-05-06 inherit (pkgs) markdown-link-check; # added 2024-06-28 @@ -128,7 +126,7 @@ mapAliases { inherit (pkgs) nodemon; # added 2024-06-28 inherit (pkgs) npm-check-updates; # added 2023-08-22 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 - parcel-bundler = parcel; # added 2023-09-04 + parcel-bundler = self.parcel; # added 2023-09-04 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 inherit (pkgs) pnpm; # added 2024-06-26 From 02f1815436f5548392ace9693e28848ff79ecce7 Mon Sep 17 00:00:00 2001 From: Mynacol Date: Fri, 26 Jul 2024 18:18:29 +0200 Subject: [PATCH 128/193] libreoffice: Add meta.mainProgram So users can leverage `lib.getExe`. The expectation for the main program is the general libreoffice program, not specific binaries for e.g. Writer or Impress. --- pkgs/applications/office/libreoffice/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 8a3bde81ac98..8b063ad6c70e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -642,5 +642,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + mainProgram = "libreoffice"; }; }) From 1a367877db79dc81b8078b3df505b0707b8d3b3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 16:33:47 +0000 Subject: [PATCH 129/193] qlog: 0.37.1 -> 0.37.2 --- pkgs/applications/radio/qlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 1db81dab27ba..b8df78021495 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.37.1"; + version = "0.37.2"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-ZIgKyPRTzlk6N23SmDEPNM8vXXh0FizXb9/WqtbmSCU="; + hash = "sha256-cphbM9dl+Ls2i3H5QjOugW0nXqa9bp5LpcnE9ACjqWM="; fetchSubmodules = true; }; From 4f441c2408e1f59b81b433dbba89132dde720f77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 16:38:28 +0000 Subject: [PATCH 130/193] woodpecker-plugin-git: 2.5.1 -> 2.5.2 --- .../continuous-integration/woodpecker-plugin-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index 1008d32401d5..6c6fe743896a 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-vGJk9IfpuZp0FNLzojFiUGvOpj7EP4cr9ylIoUbddmY="; + hash = "sha256-61WjfeHc8Qyl3RqgafVe1/y8cBOnL8i/fHOAIP4RCdI="; }; vendorHash = "sha256-rUXi3oaawTJoGPmVxmdR1v2eh8BIvCBjxJBz3XRygEg="; From 52e5b77cf12601635396edbf676d67402c8ee431 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 10:17:41 -0700 Subject: [PATCH 131/193] pidginPackages: re-add recurseIntoAttrs This was erroneously removed in 3abc5f7093e5849eccc7e1ab82a48861c4ac4489 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a64931c538f..fc0b778bee5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33222,7 +33222,7 @@ with pkgs; picosnitch = callPackage ../tools/networking/picosnitch { }; - pidginPackages = callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }; + pidginPackages = recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }); inherit (pidginPackages) pidgin; From 93201c2d232a6c5c61474b8a0bad978757e2972a Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 13:20:38 -0400 Subject: [PATCH 132/193] python312Packages.pypass: Remove nose dependency --- .../python-modules/pypass/default.nix | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 3a2fc269ceda..911861a65151 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -8,11 +8,10 @@ git, gnugrep, gnupg, - nose, pbr, pexpect, pythonAtLeast, - pythonOlder, + pytestCheckHook, substituteAll, tree, xclip, @@ -55,26 +54,21 @@ buildPythonPackage rec { pexpect ]; - doCheck = pythonOlder "3.12"; - - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytestCheckHook ]; # Configuration so that the tests work preCheck = '' - HOME=$TEMP ${git}/bin/git config --global user.email "nix-builder@nixos.org" - HOME=$TEMP ${git}/bin/git config --global user.name "Nix Builder" - HOME=$TEMP ${git}/bin/git config --global pull.ff only - HOME=$TEMP make setup_gpg + export HOME=$(mktemp -d) + export GNUPGHOME=pypass/tests/gnupg + ${git}/bin/git config --global user.email "nix-builder@nixos.org" + ${git}/bin/git config --global user.name "Nix Builder" + ${git}/bin/git config --global pull.ff only + make setup_gpg ''; - # Run tests but exclude the test that uses clipboard as I wasn't able to make - # it work - probably the X clipboard just doesn't work in the build - # environment.. - checkPhase = '' - runHook preCheck - HOME=$TEMP GNUPGHOME=pypass/tests/gnupg nosetests -v --exclude=test_show_clip . - runHook postCheck - ''; + # Presumably this test needs the X clipboard, which we don't have + # as the test environment is non-graphical. + disabledTests = [ "test_show_clip" ]; meta = with lib; { broken = stdenv.isDarwin; From 38ba83534f09ad3bc44d85c18ae1447302e5fc7d Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 13:20:55 -0400 Subject: [PATCH 133/193] python312Packages.pypass: Modernize --- .../python-modules/pypass/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 911861a65151..784a5e213c3b 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -12,6 +12,7 @@ pexpect, pythonAtLeast, pytestCheckHook, + setuptools, substituteAll, tree, xclip, @@ -22,11 +23,11 @@ buildPythonPackage rec { pname = "pypass"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1nm4mj7pd7gz4ghic6b3wrnd1b59hd1f0axavdabfl79wy511l7r"; + hash = "sha256-+dAQiufpULdU26or4EKDqazQbOZjGRbhI/+ddo+spNo="; }; # Set absolute nix store paths to the executables that pypass uses @@ -46,9 +47,11 @@ buildPythonPackage rec { substituteInPlace requirements.txt --replace "enum34" "" ''; + build-system = [ setuptools ]; + nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ + dependencies = [ click colorama pexpect @@ -70,13 +73,13 @@ buildPythonPackage rec { # as the test environment is non-graphical. disabledTests = [ "test_show_clip" ]; - meta = with lib; { + meta = { broken = stdenv.isDarwin; description = "Password manager pass in Python"; mainProgram = "pypass"; homepage = "https://github.com/aviau/python-pass"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jluttine ]; }; } From a6f1107c90680034364384c705db52774b940a77 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Fri, 26 Jul 2024 19:48:47 +0200 Subject: [PATCH 134/193] starship: 1.19.0 -> 1.20.0 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 06944a40eb1e..f7abf34490da 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - hash = "sha256-3IO9hHuhzJsCHU/6BA5ylEKQI2ik6ZiRul/iO/vzii4="; + hash = "sha256-TJU/pojUE+uwyZlqzJ4ULt9r+3bZpetwfaXK8kBtEG8="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { cp docs/public/presets/toml/*.toml $presetdir ''; - cargoHash = "sha256-zX04gX40dFYsK+R6gafHNtDevzrWiGufMwrGfhqYVG0="; + cargoHash = "sha256-A4SipsaMjVkG7ImN1aK34ZGJxlPld9NE9IjffI0+eDA="; nativeCheckInputs = [ git ]; From 1201003125cf2dbc0600d71f8d638a15871e0672 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 17:48:52 +0000 Subject: [PATCH 135/193] symfony-cli: 5.9.1 -> 5.10.2 --- pkgs/by-name/sy/symfony-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 2d9a28bf1410..47ae24c60822 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.9.1"; - vendorHash = "sha256-oo4lLJTF44hBb8QaIMONj+2WRdDSlhImZaC/nniWAhs="; + version = "5.10.2"; + vendorHash = "sha256-WSZM/9inaFLlZIAwH3E8hWyRQaOvY8BJ6ECpbkqJN6g="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-uJbX1IzZtcXH7mZuqh2YZy9wYZHNWfUHRZ8Tlm5zEac="; + hash = "sha256-/fJ9Ovk2gXCIvvieCXxnI8gDjwrhQHJoF3Ia47dSdgQ="; leaveDotGit = true; postFetch = '' git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE From e8fd0cf3f66f928feb3fc5ef83d9ded5d14d7f4e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 26 Jul 2024 07:54:12 +0200 Subject: [PATCH 136/193] python3Packages.vfblib: init at 0.7.0 --- .../python-modules/vfblib/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/vfblib/default.nix diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix new file mode 100644 index 000000000000..81f0ac7c95fe --- /dev/null +++ b/pkgs/development/python-modules/vfblib/default.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + gitUpdater, + buildPythonPackage, + pytestCheckHook, + setuptools, + fonttools, + typing-extensions, + ufonormalizer, + ufolib2, + defcon, +}: + +buildPythonPackage rec { + pname = "vfblib"; + version = "0.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "LucasFonts"; + repo = "vfbLib"; + rev = "v${version}"; + hash = "sha256-1F7Em3qX5QKHaGDYVfEOHwYu3PxZUWboe67Hgitvebc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + fonttools + typing-extensions + ufonormalizer + ufolib2 + defcon + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "vfbLib" ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = with lib; { + description = "Converter and deserializer for FontLab Studio 5 VFB files"; + homepage = "https://github.com/LucasFonts/vfbLib"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c5ac7cbb3fc..71226ab320d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17027,6 +17027,8 @@ self: super: with self; { veryprettytable = callPackage ../development/python-modules/veryprettytable { }; + vfblib = callPackage ../development/python-modules/vfblib { }; + vg = callPackage ../development/python-modules/vg { }; vharfbuzz = callPackage ../development/python-modules/vharfbuzz { }; From 1c6d14cc7238517637b035286d34317504b02f14 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 26 Jul 2024 07:54:30 +0200 Subject: [PATCH 137/193] python3Packages.bablefont: fix building --- pkgs/development/python-modules/babelfont/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index afc75992a9a5..cc64639537e1 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -13,6 +13,7 @@ setuptools, setuptools-scm, ufolib2, + vfblib, }: buildPythonPackage rec { @@ -41,6 +42,7 @@ buildPythonPackage rec { openstep-plist orjson ufolib2 + vfblib ]; nativeCheckInputs = [ @@ -48,6 +50,15 @@ buildPythonPackage rec { pytestCheckHook ]; + # Want non exsiting test data + disabledTests = [ + "test_rename" + "test_rename_nested" + "test_rename_contextual" + ]; + + disabledTestPaths = [ "tests/test_glyphs3_roundtrip.py" ]; + meta = with lib; { description = "Python library to load, examine, and save fonts in a variety of formats"; mainProgram = "babelfont"; From df6e2c4311d2768a9d4b523148f52b9915d4a639 Mon Sep 17 00:00:00 2001 From: Fabian Freihube Date: Fri, 26 Jul 2024 14:35:34 +0200 Subject: [PATCH 138/193] xournalpp: fix missing icons that prevent start --- pkgs/applications/graphics/xournalpp/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 2c61584dae5a..3527f96bf5b9 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -6,6 +6,7 @@ , wrapGAppsHook3 , pkg-config +, adwaita-icon-theme , alsa-lib , binutils , glib @@ -63,6 +64,12 @@ stdenv.mkDerivation rec { buildFlags = [ "translations" ]; + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${adwaita-icon-theme}/share" + ) + ''; + meta = with lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; homepage = "https://xournalpp.github.io/"; From 3304ae4078f4e30af642deee8d0335b600cb77d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jul 2024 21:03:41 +0200 Subject: [PATCH 139/193] checkov: 3.2.207 -> 3.2.208 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.207...3.2.208 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.208 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 2186d82f5186..099e4f7c6026 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.207"; + version = "3.2.208"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-pqMzN7ON7Yv7IHlhW86DpJ0CGOmZum5by88+YA9bv24="; + hash = "sha256-bCaqwgFG/bHy9nWYKqiGMoeXvE9bTc5QZmtp3rDOkUk="; }; patches = [ ./flake8-compat-5.x.patch ]; From 9587ddd261329f6a90900233a3542efd5c32d4f0 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 26 Jul 2024 19:19:38 +0000 Subject: [PATCH 140/193] nixos/nix-channel: don't set `nix-path` (#327683) Otherwise, the empty path in `nix.conf` takes precedence over `NIX_PATH`, and by extension the `nix.nixPath` configuration option. Introduced in 61afc4d1662fe426f02b28e386f2e053f887b6d6. --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ nixos/modules/config/nix-channel.nix | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 6dd1fb04d3a7..4aaec6406458 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -291,6 +291,9 @@ {option}`services.gitlab-runner.services..authenticationTokenConfigFile` instead of the former {option}`services.gitlab-runner.services..registrationConfigFile` option. +- `nix.channel.enable = false` no longer implies `nix.settings.nix-path = []`. + Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overriden by the `NIX_PATH` configuration variable. + ## Detailed migration information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 6498ce6c469c..3cdd1d1b6366 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -94,8 +94,6 @@ in NIX_PATH = cfg.nixPath; }; - nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault ""); - systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [ ''f /root/.nix-channels - - - - ${config.system.defaultChannel} nixos\n'' ]; From d84a6a88308b06ae0affc01452def6d1a64c0ac2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jul 2024 21:23:52 +0200 Subject: [PATCH 141/193] python312Packages.tencentcloud-sdk-python: 3.0.1197 -> 3.0.1198 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1197...3.0.1198 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1198/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 81e6ce498402..77d8d069079b 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1197"; + version = "3.0.1198"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-8rTwnKhOPUYi62NBjYKZ3DLFgbKEejHyDCnWJsVUYQQ="; + hash = "sha256-Ee+pRRmjw319AkC12TOuBRdRkFDzKibexXspteQxsAw="; }; build-system = [ setuptools ]; From aab2e118931f9fd6bb7537640bdfe992ca974727 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jul 2024 21:24:33 +0200 Subject: [PATCH 142/193] python312Packages.boto3-stubs: 1.34.147 -> 1.34.149 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index bb464cf3e572..b68f49c2af5a 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.147"; + version = "1.34.149"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-Okg9KlWyRwKdbl4EACFTmENTwMGYgmB69+NwOKfOcrA="; + hash = "sha256-PetZsY/HPE++MyT8tSzDx9DMeJM41D4H4O/R7xvA2Yw="; }; build-system = [ setuptools ]; From c5b56451ae511df9a036a19bbd071aae19b7721a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 Jul 2024 21:24:45 +0200 Subject: [PATCH 143/193] python312Packages.botocore-stubs: 1.34.147 -> 1.34.149 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 705f6072b2ba..c749c865f59f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.147"; + version = "1.34.149"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-1px1txwv4UVrckZT9YatzVv2YP9tEE7LasXvtA/PNjs="; + hash = "sha256-DXtB2XIGpZV+vJXjP3qGXTOMRARTWqpaHTLNP6XR6og="; }; nativeBuildInputs = [ poetry-core ]; From ee537a1d185d265d138f9b57898c0aa4a5622729 Mon Sep 17 00:00:00 2001 From: Rafael Kraut <14234815+RafaelKr@users.noreply.github.com> Date: Fri, 26 Jul 2024 21:27:48 +0200 Subject: [PATCH 144/193] mailpit: implement `passthru.updateScript` (#324302) --- pkgs/servers/mail/mailpit/default.nix | 55 +++++++++++++------- pkgs/servers/mail/mailpit/source.nix | 6 +++ pkgs/servers/mail/mailpit/update.sh | 73 +++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 19 deletions(-) create mode 100644 pkgs/servers/mail/mailpit/source.nix create mode 100755 pkgs/servers/mail/mailpit/update.sh diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix index 273489107580..da62efd9f7a2 100644 --- a/pkgs/servers/mail/mailpit/default.nix +++ b/pkgs/servers/mail/mailpit/default.nix @@ -1,24 +1,29 @@ -{ lib -, stdenv -, buildGoModule -, nodejs -, python3 -, libtool -, npmHooks -, fetchFromGitHub -, fetchNpmDeps -, testers -, mailpit +{ + lib, + stdenv, + buildGoModule, + nodejs, + python3, + libtool, + npmHooks, + fetchFromGitHub, + fetchNpmDeps, + testers, + mailpit, }: let - version = "1.15.1"; + source = import ./source.nix; + + inherit (source) + version + vendorHash; src = fetchFromGitHub { owner = "axllent"; repo = "mailpit"; rev = "v${version}"; - hash = "sha256-5QEn4sEZgtoFrVonZsAtvzhEkxYGDEWwhJOxqwWQJTk="; + hash = source.hash; }; # Separate derivation, because if we mix this in buildGoModule, the separate @@ -30,7 +35,7 @@ let npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-5F68ia2V8mw4iPAjSoz0b8z1lplWtAg98BgDXYOmMKs="; + hash = source.npmDepsHash; }; env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { @@ -39,7 +44,12 @@ let NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; }; - nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ]; + nativeBuildInputs = [ + nodejs + python3 + libtool + npmHooks.npmConfigHook + ]; buildPhase = '' npm run package @@ -54,13 +64,15 @@ in buildGoModule { pname = "mailpit"; - inherit src version; - - vendorHash = "sha256-e2mlOwGDU5NlKZSstHMdTidSfhNeeY6cBgtW+W9nwV8="; + inherit src version vendorHash; CGO_ENABLED = 0; - ldflags = [ "-s" "-w" "-X github.com/axllent/mailpit/config.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/axllent/mailpit/config.Version=${version}" + ]; preBuild = '' cp -r ${ui} server/ui/dist @@ -71,6 +83,11 @@ buildGoModule { command = "mailpit version"; }; + passthru.updateScript = { + supportedFeatures = [ "commit" ]; + command = ./update.sh; + }; + meta = with lib; { description = "Email and SMTP testing tool with API for developers"; homepage = "https://github.com/axllent/mailpit"; diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix new file mode 100644 index 000000000000..d04d36e80489 --- /dev/null +++ b/pkgs/servers/mail/mailpit/source.nix @@ -0,0 +1,6 @@ +{ + version = "1.15.1"; + hash = "sha256-5QEn4sEZgtoFrVonZsAtvzhEkxYGDEWwhJOxqwWQJTk="; + npmDepsHash = "sha256-5F68ia2V8mw4iPAjSoz0b8z1lplWtAg98BgDXYOmMKs="; + vendorHash = "sha256-e2mlOwGDU5NlKZSstHMdTidSfhNeeY6cBgtW+W9nwV8="; +} diff --git a/pkgs/servers/mail/mailpit/update.sh b/pkgs/servers/mail/mailpit/update.sh new file mode 100755 index 000000000000..979cd11cda8a --- /dev/null +++ b/pkgs/servers/mail/mailpit/update.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix coreutils curl jq nix-prefetch-git prefetch-npm-deps + +set -euo pipefail + +OWNER=axllent +REPO=mailpit + +TARGET_TAG="$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/$OWNER/$REPO/releases/latest" | jq -r '.tag_name')" +TARGET_VERSION="$(echo "$TARGET_TAG" | sed -e 's/^v//')" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$TARGET_VERSION" ]]; then + # mailpit is up-to-date + if [[ -n "$UPDATE_NIX_ATTR_PATH" ]]; then + echo "[{}]"; + fi + + exit 0 +fi + +extractVendorHash() { + original="${1?original hash missing}" + result="$(nix-build -A mailpit.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + [ -z "$result" ] && { echo "$original"; } || { echo "$result"; } +} + +TMP="$(mktemp -d)" +trap 'rm -rf "$TMP"' exit + +NIXPKGS_MAILPIT_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ +VERSIONS_NIX="$NIXPKGS_MAILPIT_PATH/versions.nix" + +PREFETCH_JSON=$TMP/prefetch.json +nix-prefetch-git --rev "$TARGET_TAG" --url "https://github.com/$OWNER/$REPO" > "$PREFETCH_JSON" +PREFETCH_HASH="$(jq '.hash' -r < "$PREFETCH_JSON")" +PREFETCH_PATH="$(jq '.path' -r < "$PREFETCH_JSON")" +NPM_DEPS_HASH="$(prefetch-npm-deps $PREFETCH_PATH/package-lock.json)" + +FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + +cat > $VERSIONS_NIX <<-EOF +{ + version = "$TARGET_VERSION"; + hash = "$PREFETCH_HASH"; + npmDepsHash = "$NPM_DEPS_HASH"; + vendorHash = "$FAKE_HASH"; +} +EOF + +GO_HASH="$(nix-instantiate --eval -A mailpit.vendorHash | tr -d '"')" +VENDOR_HASH=$(extractVendorHash "$GO_HASH") + +cat > $VERSIONS_NIX <<-EOF +{ + version = "$TARGET_VERSION"; + hash = "$PREFETCH_HASH"; + npmDepsHash = "$NPM_DEPS_HASH"; + vendorHash = "$VENDOR_HASH"; +} +EOF + +if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then + exit 0 +fi + +cat <<-EOF +[{ + "attrPath": "$UPDATE_NIX_ATTR_PATH", + "oldVersion": "$UPDATE_NIX_OLD_VERSION", + "newVersion": "$TARGET_VERSION", + "files": ["$VERSIONS_NIX"] +}] +EOF From a5c855f0492013a47890b484ba5078fe6056e1e8 Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Fri, 26 Jul 2024 21:38:52 +0200 Subject: [PATCH 145/193] caido: 0.33.0 -> 0.39.0 (#328499) Co-authored-by: Sandro --- pkgs/by-name/ca/caido/package.nix | 102 ++++++++++++++++++++++-------- 1 file changed, 77 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index a9cfb7d460d8..97d3d5b99d3c 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -1,40 +1,92 @@ -{ lib -, fetchurl -, appimageTools -, makeWrapper +{ + lib, + stdenv, + fetchurl, + appimageTools, + makeWrapper, + autoPatchelfHook, + libgcc, + appVariants ? [ ], }: let pname = "caido"; - version = "0.33.0"; - src = fetchurl { + appVariantList = [ + "cli" + "desktop" + ]; + version = "0.39.0"; + cli = fetchurl { + url = "https://storage.googleapis.com/caido-releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; + hash = "sha256-I8UF2rzIKfpcrxyvDa4AReWDIHOKTCj3ERaWhG1xGG0="; + }; + desktop = fetchurl { url = "https://storage.googleapis.com/caido-releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-MUQ1tVcIpLrC2RKsWDqv8MBGaHfh56OxIC/ARArQjiU="; + hash = "sha256-KYQck2+YYPLJN3L6qchacjyVyyXR3nmJDTX5GPB4WvI="; + }; + appimageContents = appimageTools.extractType2 { + inherit pname version; + src = desktop; }; - appimageContents = appimageTools.extractType2 { inherit pname src version; }; -in appimageTools.wrapType2 { - inherit pname src version; + wrappedDesktop = appimageTools.wrapType2 { + src = desktop; + inherit pname version; - extraPkgs = pkgs: [ pkgs.libthai ]; + extraPkgs = pkgs: [ pkgs.libthai ]; - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications - install -m 444 -D ${appimageContents}/caido.png \ - $out/share/icons/hicolor/512x512/apps/caido.png - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/${pname} \ - --set WEBKIT_DISABLE_COMPOSITING_MODE 1 - ''; + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications + install -m 444 -D ${appimageContents}/caido.png \ + $out/share/icons/hicolor/512x512/apps/caido.png + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/caido \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ''; + }; - meta = with lib; { + wrappedCli = stdenv.mkDerivation { + src = cli; + inherit pname version; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ libgcc ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + install -m755 -D caido-cli $out/bin/caido-cli + ''; + }; + + meta = { description = "Lightweight web security auditing toolkit"; homepage = "https://caido.io/"; changelog = "https://github.com/caido/caido/releases/tag/v${version}"; - license = licenses.unfree; - maintainers = with maintainers; [ octodi ]; - mainProgram = "caido"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + octodi + d3vil0p3r + ]; platforms = [ "x86_64-linux" ]; }; -} + +in +lib.checkListOfEnum "${pname}: appVariants" appVariantList appVariants ( + if appVariants == [ "desktop" ] then + wrappedDesktop + else if appVariants == [ "cli" ] then + wrappedCli + else + stdenv.mkDerivation { + inherit pname version meta; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + ln -s ${wrappedDesktop}/bin/caido $out/bin/caido + ln -s ${wrappedCli}/bin/caido-cli $out/bin/caido-cli + ''; + } +) From ee732eb25c5fd211c37f9311eaaaafe71406d497 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 26 Jul 2024 23:47:27 +0400 Subject: [PATCH 146/193] agate: migrate to by-name --- .../gemini/agate/default.nix => by-name/ag/agate/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{servers/gemini/agate/default.nix => by-name/ag/agate/package.nix} (96%) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/by-name/ag/agate/package.nix similarity index 96% rename from pkgs/servers/gemini/agate/default.nix rename to pkgs/by-name/ag/agate/package.nix index 18667580a5fe..a15c7055cae5 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, rustPlatform, libiconv, - Security, + darwin, openssl, pkg-config, nix-update-script, @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv - Security + darwin.apple_sdk.frameworks.Security ]; doInstallCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a64931c538f..a531e38d4ee1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1598,10 +1598,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - agate = callPackage ../servers/gemini/agate { - inherit (darwin.apple_sdk.frameworks) Security; - }; - agi = callPackage ../tools/graphics/agi { }; agola = callPackage ../development/tools/continuous-integration/agola { }; From 4a00656438544e0d77a16ff8d9353c45ba4bbcf7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 26 Jul 2024 23:49:37 +0400 Subject: [PATCH 147/193] =?UTF-8?q?agate:=203.3.7=20=E2=86=92=203.3.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ag/agate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix index a15c7055cae5..90e2cf394a50 100644 --- a/pkgs/by-name/ag/agate/package.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.3.7"; + version = "3.3.8"; src = fetchFromGitHub { owner = "mbrubeck"; repo = "agate"; rev = "v${version}"; - hash = "sha256-pNfTgkl59NTRDH+w23P49MUWzIXh5ElnJitMEYfsBnc="; + hash = "sha256-HK4ZTpRe6dEvBnjZLisSGXJmD5gTPEnf6f/gN0AHUsI="; }; - cargoHash = "sha256-RuSvweZhPWS2C2lwncxWAW2XLQN6+bAslv3p4IwQ2BA="; + cargoHash = "sha256-yRCH4TRZ3m7ZG/NAEi1YDisSoad6FxCyojtXVvwbU9w="; nativeBuildInputs = [ pkg-config ]; From 17698703dd62c8a7e5e3eb5bf3e47fcd9b5c6fec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 19:50:11 +0000 Subject: [PATCH 148/193] phpunit: 11.2.7 -> 11.2.8 --- pkgs/by-name/ph/phpunit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 272a7d74e170..347f8e80a862 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -6,13 +6,13 @@ php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.2.7"; + version = "11.2.8"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-s/zfTW8a+E/FOuHg+oSpVZdxBdfIVL0RmvBBcI6zB9Y="; + hash = "sha256-f3xLLOLpbSbgYoGpJHvUpea+wOu2U3M6jxZy/Rxro20="; }; vendorHash = "sha256-Gjii3m8wWmZbozKnJW/n9+wQUupemIU8XjmlCuTtfxU="; From a39107357761c76a61bd083aa25c47e92577ff06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 20:10:09 +0000 Subject: [PATCH 149/193] discord-development: 0.0.23 -> 0.0.24 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index e639f2c4d023..0f14d131ac98 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -5,7 +5,7 @@ let stable = "0.0.60"; ptb = "0.0.95"; canary = "0.0.455"; - development = "0.0.23"; + development = "0.0.24"; } else { stable = "0.0.311"; ptb = "0.0.124"; @@ -29,7 +29,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-dLHfiWih2e0pFVglQgViZ3As+fCPIfWHIgl5Nv34Iug="; + hash = "sha256-rSlGL2BwtUxLJltSD2Ms94qmZ4kuX5i9jFqyYC30jyQ="; }; }; x86_64-darwin = { From 849cf137253f668d8544be3b0cb4e606be20134f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 10:44:13 -0700 Subject: [PATCH 150/193] web-devmode: call as package --- doc/shell.nix | 19 +++----- nixos/doc/manual/shell.nix | 19 +++----- pkgs/tools/nix/web-devmode.nix | 79 +++++++++++++++++++--------------- 3 files changed, 56 insertions(+), 61 deletions(-) diff --git a/doc/shell.nix b/doc/shell.nix index d71e3f3a709a..d0d05d7ee4c4 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -1,20 +1,13 @@ let pkgs = import ../. { - config = {}; - overlays = []; + config = { }; + overlays = [ ]; }; common = import ./common.nix; inherit (common) outputPath indexPath; - - web-devmode = import ../pkgs/tools/nix/web-devmode.nix { - inherit pkgs; - buildArgs = "./."; - open = "/${outputPath}/${indexPath}"; - }; in - pkgs.mkShell { - packages = [ - web-devmode - ]; - } +pkgs.callPackage ../pkgs/tools/nix/web-devmode.nix { + buildArgs = "./."; + open = "/${outputPath}/${indexPath}"; +} diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index 70500a12b037..7765358ddb32 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -1,20 +1,13 @@ let pkgs = import ../../.. { - config = {}; - overlays = []; + config = { }; + overlays = [ ]; }; common = import ./common.nix; inherit (common) outputPath indexPath; - - web-devmode = import ../../../pkgs/tools/nix/web-devmode.nix { - inherit pkgs; - buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; - open = "/${outputPath}/${indexPath}"; - }; in - pkgs.mkShell { - packages = [ - web-devmode - ]; - } +pkgs.callPackage ../../../pkgs/tools/nix/web-devmode.nix { + buildArgs = "../../release.nix -A manualHTML.${builtins.currentSystem}"; + open = "/${outputPath}/${indexPath}"; +} diff --git a/pkgs/tools/nix/web-devmode.nix b/pkgs/tools/nix/web-devmode.nix index 6ebdc31118f0..202fa23c2a27 100644 --- a/pkgs/tools/nix/web-devmode.nix +++ b/pkgs/tools/nix/web-devmode.nix @@ -1,13 +1,21 @@ { - pkgs, + lib, + findutils, + mkShell, + nodejs_latest, + parallel, + rsync, + watchexec, + writeShellScriptBin, # arguments to `nix-build`, e.g. `"foo.nix -A bar"` buildArgs, # what path to open a browser at open, -}: let - inherit (pkgs) lib; +}: +let + inherit (nodejs_latest.pkgs) live-server; - error_page = pkgs.writeShellScriptBin "error_page" '' + error_page = writeShellScriptBin "error_page" '' echo " @@ -30,7 +38,7 @@ # Using rsync here, instead of `cp`, to get as close to an atomic # directory copy operation as possible. `--delay-updates` should # also go towards that. - build_and_copy = pkgs.writeShellScriptBin "build_and_copy" '' + build_and_copy = writeShellScriptBin "build_and_copy" '' set -euxo pipefail set +e @@ -41,7 +49,7 @@ if [ $exit_status -eq 0 ]; then # setting permissions to be able to clean up - ${lib.getBin pkgs.rsync}/bin/rsync \ + ${lib.getBin rsync}/bin/rsync \ --recursive \ --chmod=u=rwX \ --delete-before \ @@ -53,7 +61,7 @@ ${lib.getBin error_page}/bin/error_page "$stderr" > $error_page_absolute set -x - ${lib.getBin pkgs.findutils}/bin/find $serve \ + ${lib.getBin findutils}/bin/find $serve \ -type f \ ! -name $error_page_relative \ -delete @@ -61,10 +69,10 @@ ''; # https://watchexec.github.io/ - watcher = pkgs.writeShellScriptBin "watcher" '' + watcher = writeShellScriptBin "watcher" '' set -euxo pipefail - ${lib.getBin pkgs.watchexec}/bin/watchexec \ + ${lib.getBin watchexec}/bin/watchexec \ --shell=none \ --restart \ --print-events \ @@ -74,10 +82,10 @@ # A Rust alternative to live-server exists, but it was not in nixpkgs. # `--no-css-inject`: without this it seems that only CSS is auto-reloaded. # https://www.npmjs.com/package/live-server - server = pkgs.writeShellScriptBin "server" '' + server = writeShellScriptBin "server" '' set -euxo pipefail - ${lib.getBin pkgs.nodePackages_latest.live-server}/bin/live-server \ + ${lib.getBin live-server}/bin/live-server \ --host=127.0.0.1 \ --verbose \ --no-css-inject \ @@ -86,32 +94,33 @@ $serve ''; - devmode = - pkgs.writeShellScriptBin "devmode" - '' - set -euxo pipefail + devmode = writeShellScriptBin "devmode" '' + set -euxo pipefail - function handle_exit { - rm -rf "$tmpdir" - } + function handle_exit { + rm -rf "$tmpdir" + } - tmpdir=$(mktemp -d) - trap handle_exit EXIT + tmpdir=$(mktemp -d) + trap handle_exit EXIT - export out_link="$tmpdir/result" - export serve="$tmpdir/serve" - mkdir $serve - export error_page_relative=error.html - export error_page_absolute=$serve/$error_page_relative - ${lib.getBin error_page}/bin/error_page "building …" > $error_page_absolute + export out_link="$tmpdir/result" + export serve="$tmpdir/serve" + mkdir $serve + export error_page_relative=error.html + export error_page_absolute=$serve/$error_page_relative + ${lib.getBin error_page}/bin/error_page "building …" > $error_page_absolute - ${lib.getBin pkgs.parallel}/bin/parallel \ - --will-cite \ - --line-buffer \ - --tagstr '{/}' \ - ::: \ - "${lib.getBin watcher}/bin/watcher" \ - "${lib.getBin server}/bin/server" - ''; + ${lib.getBin parallel}/bin/parallel \ + --will-cite \ + --line-buffer \ + --tagstr '{/}' \ + ::: \ + "${lib.getBin watcher}/bin/watcher" \ + "${lib.getBin server}/bin/server" + ''; in - devmode +mkShell { + name = "web-devmode"; + packages = [ devmode ]; +} From 87b8931d74d9e744a16a00503003a46584f03b4a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 10:50:26 -0700 Subject: [PATCH 151/193] doc: make ./doc-support/lib-function-docs.nix callPackage style Move `libsets` over to it, since it's the only user. Format with `nixfmt` since we're changing it so dramatically. --- doc/default.nix | 27 +----- doc/doc-support/lib-function-docs.nix | 115 +++++++++++++++++++++++--- 2 files changed, 108 insertions(+), 34 deletions(-) diff --git a/doc/default.nix b/doc/default.nix index 6492d78601c8..fe6fd477348b 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,34 +1,13 @@ { pkgs ? (import ./.. { }), nixpkgs ? { }}: let - inherit (pkgs) lib; + inherit (pkgs) lib callPackage; inherit (lib) hasPrefix removePrefix; fs = lib.fileset; common = import ./common.nix; - lib-docs = import ./doc-support/lib-function-docs.nix { - inherit pkgs nixpkgs; - libsets = [ - { name = "asserts"; description = "assertion functions"; } - { name = "attrsets"; description = "attribute set functions"; } - { name = "strings"; description = "string manipulation functions"; } - { name = "versions"; description = "version string functions"; } - { name = "trivial"; description = "miscellaneous functions"; } - { name = "fixedPoints"; baseName = "fixed-points"; description = "explicit recursion functions"; } - { name = "lists"; description = "list manipulation functions"; } - { name = "debug"; description = "debugging functions"; } - { name = "options"; description = "NixOS / nixpkgs option handling"; } - { name = "path"; description = "path functions"; } - { name = "filesystem"; description = "filesystem functions"; } - { name = "fileset"; description = "file set functions"; } - { name = "sources"; description = "source filtering functions"; } - { name = "cli"; description = "command-line serialization functions"; } - { name = "generators"; description = "functions that create file formats from nix data structures"; } - { name = "gvariant"; description = "GVariant formatted string serialization functions"; } - { name = "customisation"; description = "Functions to customise (derivation-related) functions, derivatons, or attribute sets"; } - { name = "meta"; description = "functions for derivation metadata"; } - { name = "derivations"; description = "miscellaneous derivation-specific functions"; } - ]; + lib-docs = callPackage ./doc-support/lib-function-docs.nix { + inherit nixpkgs; }; epub = pkgs.runCommand "manual.epub" { diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index 9e1fdedd2cb9..b1c197ae1627 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -1,23 +1,111 @@ # Generates the documentation for library functions via nixdoc. -{ pkgs, nixpkgs, libsets }: +{ + lib, + stdenvNoCC, + nixdoc, + nix, + nixpkgs ? { }, + libsets ? [ + { + name = "asserts"; + description = "assertion functions"; + } + { + name = "attrsets"; + description = "attribute set functions"; + } + { + name = "strings"; + description = "string manipulation functions"; + } + { + name = "versions"; + description = "version string functions"; + } + { + name = "trivial"; + description = "miscellaneous functions"; + } + { + name = "fixedPoints"; + baseName = "fixed-points"; + description = "explicit recursion functions"; + } + { + name = "lists"; + description = "list manipulation functions"; + } + { + name = "debug"; + description = "debugging functions"; + } + { + name = "options"; + description = "NixOS / nixpkgs option handling"; + } + { + name = "path"; + description = "path functions"; + } + { + name = "filesystem"; + description = "filesystem functions"; + } + { + name = "fileset"; + description = "file set functions"; + } + { + name = "sources"; + description = "source filtering functions"; + } + { + name = "cli"; + description = "command-line serialization functions"; + } + { + name = "generators"; + description = "functions that create file formats from nix data structures"; + } + { + name = "gvariant"; + description = "GVariant formatted string serialization functions"; + } + { + name = "customisation"; + description = "Functions to customise (derivation-related) functions, derivatons, or attribute sets"; + } + { + name = "meta"; + description = "functions for derivation metadata"; + } + { + name = "derivations"; + description = "miscellaneous derivation-specific functions"; + } + ], +}: -with pkgs; - -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "nixpkgs-lib-docs"; - src = pkgs.lib.fileset.toSource { + + src = lib.fileset.toSource { root = ../..; fileset = ../../lib; }; - buildInputs = [ nixdoc nix ]; + buildInputs = [ + nixdoc + nix + ]; + installPhase = '' export NIX_STATE_DIR=$(mktemp -d) nix-instantiate --eval --strict --json ${./lib-function-locations.nix} \ --arg nixpkgsPath "./." \ --argstr revision ${nixpkgs.rev or "master"} \ - --argstr libsetsJSON ${pkgs.lib.escapeShellArg (builtins.toJSON libsets)} \ + --argstr libsetsJSON ${lib.escapeShellArg (builtins.toJSON libsets)} \ > locations.json function docgen { @@ -39,9 +127,16 @@ stdenv.mkDerivation { ```{=include=} sections auto-id-prefix=auto-generated EOF - ${lib.concatMapStrings ({ name, baseName ? name, description }: '' - docgen ${name} ${baseName} ${lib.escapeShellArg description} - '') libsets} + ${lib.concatMapStrings ( + { + name, + baseName ? name, + description, + }: + '' + docgen ${name} ${baseName} ${lib.escapeShellArg description} + '' + ) libsets} echo '```' >> "$out/index.md" ''; From ee6a243ea4014753ee3606781c190c5836414d32 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 10:56:06 -0700 Subject: [PATCH 152/193] doc: extract epub manual stub into its own package --- doc/default.nix | 42 +------------------------------ doc/doc-support/epub.nix | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 41 deletions(-) create mode 100644 doc/doc-support/epub.nix diff --git a/doc/default.nix b/doc/default.nix index fe6fd477348b..7aa5760b02f7 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -10,47 +10,7 @@ let inherit nixpkgs; }; - epub = pkgs.runCommand "manual.epub" { - nativeBuildInputs = with pkgs; [ libxslt zip ]; - - epub = '' - - - Nixpkgs Manual - Version ${pkgs.lib.version} - - - Temporarily unavailable - - The Nixpkgs manual is currently not available in EPUB format, - please use the HTML manual - instead. - - - If you've used the EPUB manual in the past and it has been useful to you, please - let us know. - - - - ''; - - passAsFile = [ "epub" ]; - } '' - mkdir scratch - xsltproc \ - --param chapter.autolabel 0 \ - --nonet \ - --output scratch/ \ - ${pkgs.docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ - $epubPath - - echo "application/epub+zip" > mimetype - zip -0Xq -b "$TMPDIR" "$out" mimetype - cd scratch && zip -Xr9D -b "$TMPDIR" "$out" * - ''; + epub = callPackage ./doc-support/epub.nix { }; # NB: This file describes the Nixpkgs manual, which happens to use module # docs infra originally developed for NixOS. diff --git a/doc/doc-support/epub.nix b/doc/doc-support/epub.nix new file mode 100644 index 000000000000..b916d3579880 --- /dev/null +++ b/doc/doc-support/epub.nix @@ -0,0 +1,53 @@ +{ + lib, + runCommand, + docbook_xsl_ns, + libxslt, + zip, +}: +runCommand "manual.epub" + { + nativeBuildInputs = [ + libxslt + zip + ]; + + epub = '' + + + Nixpkgs Manual + Version ${lib.version} + + + Temporarily unavailable + + The Nixpkgs manual is currently not available in EPUB format, + please use the HTML manual + instead. + + + If you've used the EPUB manual in the past and it has been useful to you, please + let us know. + + + + ''; + + passAsFile = [ "epub" ]; + } + '' + mkdir scratch + xsltproc \ + --param chapter.autolabel 0 \ + --nonet \ + --output scratch/ \ + ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ + $epubPath + + echo "application/epub+zip" > mimetype + zip -0Xq -b "$TMPDIR" "$out" mimetype + cd scratch && zip -Xr9D -b "$TMPDIR" "$out" * + '' From eac67316dc522d9c2f4d46e791e97bb9ddddfd10 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 11:07:58 -0700 Subject: [PATCH 153/193] doc: extract optionsDoc into its own package --- doc/default.nix | 25 +++---------------------- doc/doc-support/options-doc.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 doc/doc-support/options-doc.nix diff --git a/doc/default.nix b/doc/default.nix index 7aa5760b02f7..c56920c482c9 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,7 +1,6 @@ { pkgs ? (import ./.. { }), nixpkgs ? { }}: let inherit (pkgs) lib callPackage; - inherit (lib) hasPrefix removePrefix; fs = lib.fileset; common = import ./common.nix; @@ -12,27 +11,9 @@ let epub = callPackage ./doc-support/epub.nix { }; - # NB: This file describes the Nixpkgs manual, which happens to use module - # docs infra originally developed for NixOS. - optionsDoc = pkgs.nixosOptionsDoc { - inherit (pkgs.lib.evalModules { - modules = [ ../pkgs/top-level/config.nix ]; - class = "nixpkgsConfig"; - }) options; - documentType = "none"; - transformOptions = opt: - opt // { - declarations = - map - (decl: - if hasPrefix (toString ../..) (toString decl) - then - let subpath = removePrefix "/" (removePrefix (toString ../.) (toString decl)); - in { url = "https://github.com/NixOS/nixpkgs/blob/master/${subpath}"; name = subpath; } - else decl) - opt.declarations; - }; - }; + # NB: This file describes the Nixpkgs manual, which happens to use module docs infra originally developed for NixOS. + optionsDoc = callPackage ./doc-support/options-doc.nix { }; + in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; diff --git a/doc/doc-support/options-doc.nix b/doc/doc-support/options-doc.nix new file mode 100644 index 000000000000..6405ef9efe6f --- /dev/null +++ b/doc/doc-support/options-doc.nix @@ -0,0 +1,27 @@ +{ lib, nixosOptionsDoc }: + +let + modules = lib.evalModules { + modules = [ ../../pkgs/top-level/config.nix ]; + class = "nixpkgsConfig"; + }; + + root = toString ../..; + + transformDeclaration = + decl: + let + declStr = toString decl; + subpath = lib.removePrefix "/" (lib.removePrefix root declStr); + in + assert lib.hasPrefix root declStr; + { + url = "https://github.com/NixOS/nixpkgs/blob/master/${subpath}"; + name = subpath; + }; +in +nixosOptionsDoc { + inherit (modules) options; + documentType = "none"; + transformOptions = opt: opt // { declarations = map transformDeclaration opt.declarations; }; +} From 2266280af7c3fd3d3248dbff4ac463efb6c435d8 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 11:21:15 -0700 Subject: [PATCH 154/193] doc: reshape python-interpreter-table.nix into a normal callPackage Before, it produced a string, not a derivation. --- doc/default.nix | 14 +++--- doc/doc-support/python-interpreter-table.nix | 53 ++++++++++---------- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/doc/default.nix b/doc/default.nix index c56920c482c9..6cbec54f7967 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -14,6 +14,8 @@ let # NB: This file describes the Nixpkgs manual, which happens to use module docs infra originally developed for NixOS. optionsDoc = callPackage ./doc-support/options-doc.nix { }; + pythonInterpreterTable = pkgs.callPackage ./doc-support/python-interpreter-table.nix {}; + in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; @@ -39,12 +41,9 @@ in pkgs.stdenv.mkDerivation { ln -s ${optionsDoc.optionsJSON}/share/doc/nixos/options.json ./config-options.json ''; - pythonInterpreterTable = pkgs.callPackage ./doc-support/python-interpreter-table.nix {}; - - passAsFile = [ "pythonInterpreterTable" ]; - buildPhase = '' - substituteInPlace ./languages-frameworks/python.section.md --subst-var-by python-interpreter-table "$(<"$pythonInterpreterTablePath")" + substituteInPlace ./languages-frameworks/python.section.md \ + --subst-var-by python-interpreter-table "$(<"${pythonInterpreterTable}")" cat \ ./functions/library.md.in \ @@ -92,7 +91,9 @@ in pkgs.stdenv.mkDerivation { echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products ''; - passthru.tests.manpage-urls = with pkgs; testers.invalidateFetcherByDrvHash + passthru = { + inherit pythonInterpreterTable; + tests.manpage-urls = with pkgs; testers.invalidateFetcherByDrvHash ({ name ? "manual_check-manpage-urls" , script , urlsFile @@ -113,4 +114,5 @@ in pkgs.stdenv.mkDerivation { script = ./tests/manpage-urls.py; urlsFile = ./manpage-urls.json; }; + }; } diff --git a/doc/doc-support/python-interpreter-table.nix b/doc/doc-support/python-interpreter-table.nix index 6f2b3422f672..ca80d7631703 100644 --- a/doc/doc-support/python-interpreter-table.nix +++ b/doc/doc-support/python-interpreter-table.nix @@ -1,14 +1,15 @@ -# For debugging, run in this directory: -# nix eval --impure --raw --expr 'import ./python-interpreter-table.nix {}' -{ pkgs ? (import ../.. { config = { }; overlays = []; }) }: +# To run this derivation, `nix-build -A nixpkgs-manual.pythonInterpreterTable` +{ + lib, + writeText, + pkgs, + pythonInterpreters, +}: let - lib = pkgs.lib; - inherit (lib.attrsets) attrNames filterAttrs; - inherit (lib.lists) elem filter map naturalSort reverseList; - inherit (lib.strings) concatStringsSep; - - isPythonInterpreter = name: - /* NB: Package names that don't follow the regular expression: + isPythonInterpreter = + name: + /* + NB: Package names that don't follow the regular expression: - `python-cosmopolitan` is not part of `pkgs.pythonInterpreters`. - `_prebuilt` interpreters are used for bootstrapping internally. - `python3Minimal` contains python packages, left behind conservatively. @@ -16,7 +17,8 @@ let */ (lib.strings.match "(pypy|python)([[:digit:]]*)" name) != null; - interpreterName = pname: + interpreterName = + pname: let cuteName = { cpython = "CPython"; @@ -26,16 +28,16 @@ let in "${cuteName.${interpreter.implementation}} ${interpreter.pythonVersion}"; - interpreters = reverseList (naturalSort ( - filter isPythonInterpreter (attrNames pkgs.pythonInterpreters) - )); + interpreters = lib.reverseList ( + lib.naturalSort (lib.filter isPythonInterpreter (lib.attrNames pythonInterpreters)) + ); - aliases = pname: - attrNames ( - filterAttrs (name: value: - isPythonInterpreter name - && name != pname - && interpreterName name == interpreterName pname + aliases = + pname: + lib.attrNames ( + lib.filterAttrs ( + name: value: + isPythonInterpreter name && name != pname && interpreterName name == interpreterName pname ) pkgs ); @@ -45,18 +47,17 @@ let interpreter = interpreterName pname; }) interpreters; - toMarkdown = data: + toMarkdown = + data: let line = package: '' - | ${package.pname} | ${join ", " package.aliases or [ ]} | ${package.interpreter} | + | ${package.pname} | ${lib.concatStringsSep ", " package.aliases or [ ]} | ${package.interpreter} | ''; in - join "" (map line data); - - join = lib.strings.concatStringsSep; + lib.concatStringsSep "" (map line data); in -'' +writeText "python-interpreter-table.md" '' | Package | Aliases | Interpeter | |---------|---------|------------| ${toMarkdown result} From 8bb7777aee22d012e05a44206202b73939e1dfac Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 11:28:06 -0700 Subject: [PATCH 155/193] doc: extract manpage-urls test into its own package --- doc/default.nix | 22 +--------------------- doc/tests/manpage-urls.nix | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 doc/tests/manpage-urls.nix diff --git a/doc/default.nix b/doc/default.nix index 6cbec54f7967..10c338e73b9f 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -93,26 +93,6 @@ in pkgs.stdenv.mkDerivation { passthru = { inherit pythonInterpreterTable; - tests.manpage-urls = with pkgs; testers.invalidateFetcherByDrvHash - ({ name ? "manual_check-manpage-urls" - , script - , urlsFile - }: runCommand name { - nativeBuildInputs = [ - cacert - (python3.withPackages (p: with p; [ - aiohttp - rich - structlog - ])) - ]; - outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; # Empty output - } '' - python3 ${script} ${urlsFile} - touch $out - '') { - script = ./tests/manpage-urls.py; - urlsFile = ./manpage-urls.json; - }; + tests.manpage-urls = callPackage ./tests/manpage-urls.nix { }; }; } diff --git a/doc/tests/manpage-urls.nix b/doc/tests/manpage-urls.nix new file mode 100644 index 000000000000..084fabdd0f3d --- /dev/null +++ b/doc/tests/manpage-urls.nix @@ -0,0 +1,31 @@ +{ + lib, + runCommand, + invalidateFetcherByDrvHash, + cacert, + python3, +}: + +invalidateFetcherByDrvHash ( + { + name ? "manual_check-manpage-urls", + script ? ./manpage-urls.py, + urlsFile ? ../manpage-urls.json, + }: + runCommand name + { + nativeBuildInputs = [ + cacert + (python3.withPackages (p: [ + p.aiohttp + p.rich + p.structlog + ])) + ]; + outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; # Empty output + } + '' + python3 ${script} ${urlsFile} + touch $out + '' +) { } From 4252286f210a6c3b2310e6736eb1ef59917c9c89 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 11:34:58 -0700 Subject: [PATCH 156/193] doc: extract nixpkgs-manual into its own package Also, use `finalAttrs` style and pass through all the helper derivations. --- doc/default.nix | 102 ++----------------------- doc/doc-support/epub.nix | 1 + doc/doc-support/lib-function-docs.nix | 2 +- doc/doc-support/options-doc.nix | 1 + doc/doc-support/package.nix | 103 ++++++++++++++++++++++++++ doc/tests/manpage-urls.nix | 1 + 6 files changed, 112 insertions(+), 98 deletions(-) create mode 100644 doc/doc-support/package.nix diff --git a/doc/default.nix b/doc/default.nix index 10c338e73b9f..669179141060 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,98 +1,6 @@ -{ pkgs ? (import ./.. { }), nixpkgs ? { }}: -let - inherit (pkgs) lib callPackage; - fs = lib.fileset; +{ + pkgs ? (import ./.. { }), + nixpkgs ? { }, +}: - common = import ./common.nix; - - lib-docs = callPackage ./doc-support/lib-function-docs.nix { - inherit nixpkgs; - }; - - epub = callPackage ./doc-support/epub.nix { }; - - # NB: This file describes the Nixpkgs manual, which happens to use module docs infra originally developed for NixOS. - optionsDoc = callPackage ./doc-support/options-doc.nix { }; - - pythonInterpreterTable = pkgs.callPackage ./doc-support/python-interpreter-table.nix {}; - -in pkgs.stdenv.mkDerivation { - name = "nixpkgs-manual"; - - nativeBuildInputs = with pkgs; [ - nixos-render-docs - ]; - - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - (fs.fileFilter (file: - file.hasExt "md" - || file.hasExt "md.in" - ) ./.) - ./style.css - ./anchor-use.js - ./anchor.min.js - ./manpage-urls.json - ]; - }; - - postPatch = '' - ln -s ${optionsDoc.optionsJSON}/share/doc/nixos/options.json ./config-options.json - ''; - - buildPhase = '' - substituteInPlace ./languages-frameworks/python.section.md \ - --subst-var-by python-interpreter-table "$(<"${pythonInterpreterTable}")" - - cat \ - ./functions/library.md.in \ - ${lib-docs}/index.md \ - > ./functions/library.md - substitute ./manual.md.in ./manual.md \ - --replace-fail '@MANUAL_VERSION@' '${pkgs.lib.version}' - - mkdir -p out/media - - mkdir -p out/highlightjs - cp -t out/highlightjs \ - ${pkgs.documentation-highlighter}/highlight.pack.js \ - ${pkgs.documentation-highlighter}/LICENSE \ - ${pkgs.documentation-highlighter}/mono-blue.css \ - ${pkgs.documentation-highlighter}/loader.js - - cp -t out ./style.css ./anchor.min.js ./anchor-use.js - - nixos-render-docs manual html \ - --manpage-urls ./manpage-urls.json \ - --revision ${pkgs.lib.trivial.revisionWithDefault (pkgs.rev or "master")} \ - --stylesheet style.css \ - --stylesheet highlightjs/mono-blue.css \ - --script ./highlightjs/highlight.pack.js \ - --script ./highlightjs/loader.js \ - --script ./anchor.min.js \ - --script ./anchor-use.js \ - --toc-depth 1 \ - --section-toc-depth 1 \ - manual.md \ - out/index.html - ''; - - installPhase = '' - dest="$out/${common.outputPath}" - mkdir -p "$(dirname "$dest")" - mv out "$dest" - mv "$dest/index.html" "$dest/${common.indexPath}" - - cp ${epub} "$dest/nixpkgs-manual.epub" - - mkdir -p $out/nix-support/ - echo "doc manual $dest ${common.indexPath}" >> $out/nix-support/hydra-build-products - echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products - ''; - - passthru = { - inherit pythonInterpreterTable; - tests.manpage-urls = callPackage ./tests/manpage-urls.nix { }; - }; -} +pkgs.callPackage ./doc-support/package.nix { inherit nixpkgs; } diff --git a/doc/doc-support/epub.nix b/doc/doc-support/epub.nix index b916d3579880..259207535a09 100644 --- a/doc/doc-support/epub.nix +++ b/doc/doc-support/epub.nix @@ -1,3 +1,4 @@ +# To run this derivation, `nix-build -A nixpkgs-manual.epub` { lib, runCommand, diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index b1c197ae1627..1ce052e4852f 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -1,5 +1,5 @@ # Generates the documentation for library functions via nixdoc. - +# To run this derivation, `nix-build -A nixpkgs-manual.lib-docs` { lib, stdenvNoCC, diff --git a/doc/doc-support/options-doc.nix b/doc/doc-support/options-doc.nix index 6405ef9efe6f..e1684d35700e 100644 --- a/doc/doc-support/options-doc.nix +++ b/doc/doc-support/options-doc.nix @@ -1,3 +1,4 @@ +# To run this derivation, `nix-build -A nixpkgs-manual.optionsDoc` { lib, nixosOptionsDoc }: let diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix new file mode 100644 index 000000000000..aa70184bf935 --- /dev/null +++ b/doc/doc-support/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenvNoCC, + callPackage, + documentation-highlighter, + nixos-render-docs, + nixpkgs ? { }, +}: + +let + common = import ../common.nix; +in + +stdenvNoCC.mkDerivation ( + finalAttrs: + let + inherit (finalAttrs.finalPackage.optionsDoc) optionsJSON; + inherit (finalAttrs.finalPackage) epub lib-docs pythonInterpreterTable; + in + { + name = "nixpkgs-manual"; + + nativeBuildInputs = [ nixos-render-docs ]; + + src = lib.fileset.toSource { + root = ../.; + fileset = lib.fileset.unions [ + (lib.fileset.fileFilter (file: file.hasExt "md" || file.hasExt "md.in") ../.) + ../style.css + ../anchor-use.js + ../anchor.min.js + ../manpage-urls.json + ]; + }; + + postPatch = '' + ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json + ''; + + buildPhase = '' + substituteInPlace ./languages-frameworks/python.section.md \ + --subst-var-by python-interpreter-table "$(<"${pythonInterpreterTable}")" + + cat \ + ./functions/library.md.in \ + ${lib-docs}/index.md \ + > ./functions/library.md + substitute ./manual.md.in ./manual.md \ + --replace-fail '@MANUAL_VERSION@' '${lib.version}' + + mkdir -p out/media + + mkdir -p out/highlightjs + cp -t out/highlightjs \ + ${documentation-highlighter}/highlight.pack.js \ + ${documentation-highlighter}/LICENSE \ + ${documentation-highlighter}/mono-blue.css \ + ${documentation-highlighter}/loader.js + + cp -t out ./style.css ./anchor.min.js ./anchor-use.js + + nixos-render-docs manual html \ + --manpage-urls ./manpage-urls.json \ + --revision ${lib.trivial.revisionWithDefault (nixpkgs.rev or "master")} \ + --stylesheet style.css \ + --stylesheet highlightjs/mono-blue.css \ + --script ./highlightjs/highlight.pack.js \ + --script ./highlightjs/loader.js \ + --script ./anchor.min.js \ + --script ./anchor-use.js \ + --toc-depth 1 \ + --section-toc-depth 1 \ + manual.md \ + out/index.html + ''; + + installPhase = '' + dest="$out/${common.outputPath}" + mkdir -p "$(dirname "$dest")" + mv out "$dest" + mv "$dest/index.html" "$dest/${common.indexPath}" + + cp ${epub} "$dest/nixpkgs-manual.epub" + + mkdir -p $out/nix-support/ + echo "doc manual $dest ${common.indexPath}" >> $out/nix-support/hydra-build-products + echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products + ''; + + passthru = { + lib-docs = callPackage ./lib-function-docs.nix { inherit nixpkgs; }; + + epub = callPackage ./epub.nix { }; + + # NB: This file describes the Nixpkgs manual, which happens to use module docs infra originally developed for NixOS. + optionsDoc = callPackage ./options-doc.nix { }; + + pythonInterpreterTable = callPackage ./python-interpreter-table.nix { }; + + tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; + }; + } +) diff --git a/doc/tests/manpage-urls.nix b/doc/tests/manpage-urls.nix index 084fabdd0f3d..0a3adec20655 100644 --- a/doc/tests/manpage-urls.nix +++ b/doc/tests/manpage-urls.nix @@ -1,3 +1,4 @@ +# To run this derivation, `nix-build -A nixpkgs-manual.tests.manpage-urls` { lib, runCommand, From b5dc82844f7d0bb2c9c38b9b696de68e6be23d8d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 11:45:25 -0700 Subject: [PATCH 157/193] nixpkgs-manual: init --- doc/default.nix | 2 +- doc/doc-support/epub.nix | 2 +- doc/doc-support/lib-function-docs.nix | 2 +- doc/doc-support/options-doc.nix | 2 +- doc/doc-support/package.nix | 4 +++- doc/doc-support/python-interpreter-table.nix | 2 +- doc/tests/manpage-urls.nix | 2 +- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/release.nix | 3 +-- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/default.nix b/doc/default.nix index 669179141060..2c9a0439feb5 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -3,4 +3,4 @@ nixpkgs ? { }, }: -pkgs.callPackage ./doc-support/package.nix { inherit nixpkgs; } +pkgs.nixpkgs-manual.override { inherit nixpkgs; } diff --git a/doc/doc-support/epub.nix b/doc/doc-support/epub.nix index 259207535a09..2b8d6b5f2470 100644 --- a/doc/doc-support/epub.nix +++ b/doc/doc-support/epub.nix @@ -1,4 +1,4 @@ -# To run this derivation, `nix-build -A nixpkgs-manual.epub` +# To build this derivation, run `nix-build -A nixpkgs-manual.epub` { lib, runCommand, diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index 1ce052e4852f..8c9673d887bf 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -1,5 +1,5 @@ # Generates the documentation for library functions via nixdoc. -# To run this derivation, `nix-build -A nixpkgs-manual.lib-docs` +# To build this derivation, run `nix-build -A nixpkgs-manual.lib-docs` { lib, stdenvNoCC, diff --git a/doc/doc-support/options-doc.nix b/doc/doc-support/options-doc.nix index e1684d35700e..aa24f16901c5 100644 --- a/doc/doc-support/options-doc.nix +++ b/doc/doc-support/options-doc.nix @@ -1,4 +1,4 @@ -# To run this derivation, `nix-build -A nixpkgs-manual.optionsDoc` +# To build this derivation, run `nix-build -A nixpkgs-manual.optionsDoc` { lib, nixosOptionsDoc }: let diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index aa70184bf935..c0213bad4c27 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -1,3 +1,6 @@ +# This file describes the Nixpkgs manual, which happens to use module docs infra originally +# developed for NixOS. To build this derivation, run `nix-build -A nixpkgs-manual`. +# { lib, stdenvNoCC, @@ -92,7 +95,6 @@ stdenvNoCC.mkDerivation ( epub = callPackage ./epub.nix { }; - # NB: This file describes the Nixpkgs manual, which happens to use module docs infra originally developed for NixOS. optionsDoc = callPackage ./options-doc.nix { }; pythonInterpreterTable = callPackage ./python-interpreter-table.nix { }; diff --git a/doc/doc-support/python-interpreter-table.nix b/doc/doc-support/python-interpreter-table.nix index ca80d7631703..f06609e363f2 100644 --- a/doc/doc-support/python-interpreter-table.nix +++ b/doc/doc-support/python-interpreter-table.nix @@ -1,4 +1,4 @@ -# To run this derivation, `nix-build -A nixpkgs-manual.pythonInterpreterTable` +# To build this derivation, run `nix-build -A nixpkgs-manual.pythonInterpreterTable` { lib, writeText, diff --git a/doc/tests/manpage-urls.nix b/doc/tests/manpage-urls.nix index 0a3adec20655..214c23616009 100644 --- a/doc/tests/manpage-urls.nix +++ b/doc/tests/manpage-urls.nix @@ -1,4 +1,4 @@ -# To run this derivation, `nix-build -A nixpkgs-manual.tests.manpage-urls` +# To build this derivation, run `nix-build -A nixpkgs-manual.tests.manpage-urls` { lib, runCommand, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d419ef217aa..192d22ed4e9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39140,6 +39140,8 @@ with pkgs; nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { }; + nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { }; + rnix-hashes = callPackage ../tools/nix/rnix-hashes { }; nixos-artwork = callPackage ../data/misc/nixos-artwork { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f79352bf3ffe..5800376c9153 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -77,9 +77,8 @@ let release-checks = import ./nixpkgs-basic-release-checks.nix { inherit pkgs nixpkgs supportedSystems; }; + manual = pkgs.nixpkgs-manual.override { inherit nixpkgs; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; - - manual = import ../../doc { inherit pkgs nixpkgs; }; lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; }; From eaa78111043c898f26e870668593299526ae5db1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 11:47:32 -0700 Subject: [PATCH 158/193] nixpkgs-manual: move shell to package --- doc/doc-support/package.nix | 5 +++++ doc/shell.nix | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index c0213bad4c27..ec9f524df436 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -99,6 +99,11 @@ stdenvNoCC.mkDerivation ( pythonInterpreterTable = callPackage ./python-interpreter-table.nix { }; + shell = callPackage ../../pkgs/tools/nix/web-devmode.nix { + buildArgs = "./."; + open = "/${common.outputPath}/${common.indexPath}"; + }; + tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; }; } diff --git a/doc/shell.nix b/doc/shell.nix index d0d05d7ee4c4..3aad697742b2 100644 --- a/doc/shell.nix +++ b/doc/shell.nix @@ -3,11 +3,5 @@ let config = { }; overlays = [ ]; }; - - common = import ./common.nix; - inherit (common) outputPath indexPath; in -pkgs.callPackage ../pkgs/tools/nix/web-devmode.nix { - buildArgs = "./."; - open = "/${outputPath}/${indexPath}"; -} +pkgs.nixpkgs-manual.shell From b846df0a2e241fb0b6e0e987af977f1238520574 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Jul 2024 11:50:12 -0700 Subject: [PATCH 159/193] nixpkgs-manual: inline common.nix --- doc/common.nix | 4 ---- doc/doc-support/package.nix | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 doc/common.nix diff --git a/doc/common.nix b/doc/common.nix deleted file mode 100644 index 56f723eb6bd7..000000000000 --- a/doc/common.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - outputPath = "share/doc/nixpkgs"; - indexPath = "manual.html"; -} diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index ec9f524df436..602cef59677e 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -10,10 +10,6 @@ nixpkgs ? { }, }: -let - common = import ../common.nix; -in - stdenvNoCC.mkDerivation ( finalAttrs: let @@ -78,15 +74,15 @@ stdenvNoCC.mkDerivation ( ''; installPhase = '' - dest="$out/${common.outputPath}" + dest="$out/share/doc/nixpkgs" mkdir -p "$(dirname "$dest")" mv out "$dest" - mv "$dest/index.html" "$dest/${common.indexPath}" + mv "$dest/index.html" "$dest/manual.html" cp ${epub} "$dest/nixpkgs-manual.epub" mkdir -p $out/nix-support/ - echo "doc manual $dest ${common.indexPath}" >> $out/nix-support/hydra-build-products + echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products ''; @@ -101,7 +97,7 @@ stdenvNoCC.mkDerivation ( shell = callPackage ../../pkgs/tools/nix/web-devmode.nix { buildArgs = "./."; - open = "/${common.outputPath}/${common.indexPath}"; + open = "/share/doc/nixpkgs/manual.html"; }; tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; From 61d0d004f84343bfffb9a631092b21e41adf6ded Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 20 Jul 2024 15:51:43 -0400 Subject: [PATCH 160/193] python312Packages.botorch: relax gpytorch version requirement and migrate to PEP517 lingo for dependencies. Co-Authored-By: Martin Weinelt --- pkgs/development/python-modules/botorch/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 129facf57de1..06f0922af4b1 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { hash = "sha256-YX/G46U09y/VZuWZhKY8zU0Y+bf0NKumzSGYUWvrq/0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm wheel ]; - propagatedBuildInputs = [ + dependenciess = [ gpytorch linear-operator multipledispatch @@ -41,9 +41,13 @@ buildPythonPackage rec { torch ]; - pythonRelaxDeps = [ "linear-operator" ]; + pythonRelaxDeps = [ + "gpytorch" + "linear-operator" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "botorch" ]; meta = with lib; { From b2df3187bcfc42f8ab398b3edd84bd3cd881096a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 20 Jul 2024 15:51:54 -0400 Subject: [PATCH 161/193] python312Packages.ax: relax botorch version requirement --- pkgs/development/python-modules/ax/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax/default.nix index dddcc6e1ebeb..7b3cc8f2b1c2 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax/default.nix @@ -49,6 +49,8 @@ buildPythonPackage rec { pyre-extensions ]; + env.ALLOW_BOTORCH_LATEST = "1"; + checkInputs = [ hypothesis mercurial From 99da0d648a6340ba3bcec0d0ceba169e7b752c51 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 26 Jul 2024 22:57:09 +0200 Subject: [PATCH 162/193] python311Packages.python-designateclient: init at 6.0.1 (#328506) --- .../python-designateclient/default.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/python-modules/python-designateclient/default.nix diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix new file mode 100644 index 000000000000..20cbf04e6ba2 --- /dev/null +++ b/pkgs/development/python-modules/python-designateclient/default.nix @@ -0,0 +1,74 @@ +{ + lib, + buildPythonPackage, + debtcollector, + fetchFromGitea, + jsonschema, + keystoneauth1, + osc-lib, + oslo-serialization, + oslo-utils, + oslotest, + pbr, + pythonOlder, + requests-mock, + requests, + setuptools, + stestr, +}: + +buildPythonPackage rec { + pname = "python-designateclient"; + version = "6.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitea { + domain = "opendev.org"; + owner = "openstack"; + repo = "python-designateclient"; + rev = version; + hash = "sha256-vuaouOA69REx+ZrzXjLGVz5Az1/d6x4WRT1h78xeebk="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + setuptools + ]; + + dependencies = [ + debtcollector + jsonschema + keystoneauth1 + osc-lib + oslo-serialization + oslo-utils + requests + ]; + + doCheck = true; + + nativeCheckInputs = [ + oslotest + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "designateclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-designateclient"; + description = "Client library for OpenStack Designate API"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82c0af581cb1..9314637af710 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12646,6 +12646,8 @@ self: super: with self; { python-decouple = callPackage ../development/python-modules/python-decouple { }; + python-designateclient = callPackage ../development/python-modules/python-designateclient { }; + pythondialog = callPackage ../development/python-modules/pythondialog { }; python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; From 18dc1231d4bc498ff6d330aefc5300efba8e068c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 26 Jul 2024 22:10:08 +0100 Subject: [PATCH 163/193] libvpx_1_8: remove --- pkgs/development/libraries/libvpx/1_8.nix | 185 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 186 deletions(-) delete mode 100644 pkgs/development/libraries/libvpx/1_8.nix diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix deleted file mode 100644 index 643dcb4d8f40..000000000000 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ /dev/null @@ -1,185 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl, yasm -, vp8DecoderSupport ? true # VP8 decoder -, vp8EncoderSupport ? true # VP8 encoder -, vp9DecoderSupport ? true # VP9 decoder -, vp9EncoderSupport ? true # VP9 encoder -, extraWarningsSupport ? false # emit non-fatal warnings -, werrorSupport ? false # treat warnings as errors (not available with all compilers) -, debugSupport ? false # debug mode -, gprofSupport ? false # gprof profiling instrumentation -, gcovSupport ? false # gcov coverage instrumentation -, sizeLimitSupport ? true # limit max size to allow in the decoder -, optimizationsSupport ? true # compiler optimization flags -, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime -, thumbSupport ? false # build arm assembly in thumb mode -, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) -, debugLibsSupport ? false # include debug version of each library -, postprocSupport ? true # postprocessing -, multithreadSupport ? true # multithreaded decoding & encoding -, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) -, spatialResamplingSupport ? true # spatial sampling (scaling) -, realtimeOnlySupport ? false # build for real-time encoding -, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding -, errorConcealmentSupport ? false # decoder conceals losses -, smallSupport ? false # favor smaller binary over speed -, postprocVisualizerSupport ? false # macro block/block level visualizers -, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests -, webmIOSupport ? true # input from and output to webm container -, libyuvSupport ? true # libyuv -, decodePerfTestsSupport ? false # build decoder perf tests with unit tests -, encodePerfTestsSupport ? false # build encoder perf tests with unit tests -, multiResEncodingSupport ? false # multiple-resolution encoding -, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising -, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range -, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 -# Experimental features -, experimentalSpatialSvcSupport ? false # Spatial scalable video coding -, experimentalFpMbStatsSupport ? false -, experimentalEmulateHardwareSupport ? false -}: - -let - inherit (stdenv) is64bit isMips isDarwin isCygwin; - inherit (lib) enableFeature optional optionals; -in - -assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; -assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; -/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. - Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, - but is only executed if spatialResamplingSupport is enabled */ -assert spatialResamplingSupport; -assert postprocVisualizerSupport -> postprocSupport; -assert unitTestsSupport -> curl != null && coreutils != null; -assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); -assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; - -stdenv.mkDerivation rec { - pname = "libvpx"; - version = "1.8.2"; - - src = fetchFromGitHub { - owner = "webmproject"; - repo = "libvpx"; - rev = "v${version}"; - sha256 = "0gyq4fkbd2fv7m1mm9xrvn6rk6f4jsmbv8bnlhingmnrvyncnmnr"; - }; - - patches = [ -# ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch - ]; - - postPatch = '' - patchShebangs --build \ - build/make/*.sh \ - build/make/*.pl \ - build/make/*.pm \ - test/*.sh \ - configure - ''; - - outputs = [ "bin" "dev" "out" ]; - setOutputFlags = false; - - configurePlatforms = []; - configureFlags = [ - (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") - (enableFeature vp8EncoderSupport "vp8-encoder") - (enableFeature vp8DecoderSupport "vp8-decoder") - (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9") - (enableFeature vp9EncoderSupport "vp9-encoder") - (enableFeature vp9DecoderSupport "vp9-decoder") - (enableFeature extraWarningsSupport "extra-warnings") - (enableFeature werrorSupport "werror") - "--disable-install-docs" - (enableFeature examplesSupport "install-bins") - "--enable-install-libs" - "--disable-install-srcs" - (enableFeature debugSupport "debug") - (enableFeature gprofSupport "gprof") - (enableFeature gcovSupport "gcov") - # Required to build shared libraries - (enableFeature (!isCygwin) "pic") - (enableFeature optimizationsSupport "optimizations") - (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") - (enableFeature thumbSupport "thumb") - "--enable-libs" - (enableFeature examplesSupport "examples") - "--disable-docs" - "--as=yasm" - # Limit default decoder max to WHXGA - (if sizeLimitSupport then "--size-limit=5120x3200" else null) - "--disable-codec-srcs" - (enableFeature debugLibsSupport "debug-libs") - (enableFeature isMips "dequant-tokens") - (enableFeature isMips "dc-recon") - (enableFeature postprocSupport "postproc") - (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") - (enableFeature multithreadSupport "multithread") - (enableFeature internalStatsSupport "internal-stats") - (enableFeature spatialResamplingSupport "spatial-resampling") - (enableFeature realtimeOnlySupport "realtime-only") - (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") - (enableFeature errorConcealmentSupport "error-concealment") - # Shared libraries are only supported on ELF platforms - (if isDarwin || isCygwin then - "--enable-static --disable-shared" - else - "--enable-shared") - (enableFeature smallSupport "small") - (enableFeature postprocVisualizerSupport "postproc-visualizer") - (enableFeature unitTestsSupport "unit-tests") - (enableFeature webmIOSupport "webm-io") - (enableFeature libyuvSupport "libyuv") - (enableFeature decodePerfTestsSupport "decode-perf-tests") - (enableFeature encodePerfTestsSupport "encode-perf-tests") - (enableFeature multiResEncodingSupport "multi-res-encoding") - (enableFeature temporalDenoisingSupport "temporal-denoising") - (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising") - (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking") - (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth") - (enableFeature (experimentalSpatialSvcSupport || - experimentalFpMbStatsSupport || - experimentalEmulateHardwareSupport) "experimental") - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--enable-external-build" - # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) - # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure - # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 - "--force-target=${stdenv.hostPlatform.config}${ - if stdenv.hostPlatform.isDarwin then - if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" - else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" - else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12" - else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11" - else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10" - else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" - else "8" - else ""}-gcc" - (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") - ] # Experimental features - ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" - ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" - ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; - - nativeBuildInputs = [ perl yasm ]; - - buildInputs = [ ] - ++ optionals unitTestsSupport [ coreutils curl ]; - - NIX_LDFLAGS = [ - "-lpthread" # fixes linker errors - ]; - - enableParallelBuilding = true; - - postInstall = ''moveToOutput bin "$bin" ''; - - meta = with lib; { - description = "WebM VP8/VP9 codec SDK"; - homepage = "https://www.webmproject.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9da1ade6c916..b1f936e5ffe8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -745,6 +745,7 @@ mapAliases ({ libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 libungif = giflib; # Added 2020-02-12 libusb = libusb1; # Added 2020-04-28 + libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26 libwnck3 = libwnck; libyamlcpp = yaml-cpp; # Added 2023-01-29 libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 187656fbb959..12e1da2889fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22711,7 +22711,6 @@ with pkgs; libviperfx = callPackage ../development/libraries/libviperfx { }; libvpx = callPackage ../development/libraries/libvpx { }; - libvpx_1_8 = callPackage ../development/libraries/libvpx/1_8.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { }; From 1f550850bb36afbce67c3069642033cc5740926d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 26 Jul 2024 17:27:48 -0400 Subject: [PATCH 164/193] python3Packages.ruff-api: add libiconv on Darwin --- pkgs/development/python-modules/ruff-api/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ruff-api/default.nix b/pkgs/development/python-modules/ruff-api/default.nix index 43170c431214..296006018edb 100644 --- a/pkgs/development/python-modules/ruff-api/default.nix +++ b/pkgs/development/python-modules/ruff-api/default.nix @@ -5,6 +5,7 @@ cargo, darwin, fetchFromGitHub, + libiconv, pythonOlder, rustc, rustPlatform, @@ -43,6 +44,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices + libiconv ]; # Tests have issues at the moment, check with next update From f695337c7b9b156e34cffc672a3440becc4ba95a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 21:37:24 +0000 Subject: [PATCH 165/193] pyright: 1.1.370 -> 1.1.373 --- pkgs/by-name/py/pyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 8d53e6cd0a38..f9d8679b2104 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.370"; + version = "1.1.373"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-IYQ6HUEaT3KjMcFeWal4Ru2A/Kxf7sAMZ1p48l9RQ2o="; + hash = "sha256-TMQ9ttWUDwf7Lp2JOwpIu4Bn3TbioXxkCPpEZiPDPyk="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-P57+FEyjsHXwZ3A91bfecCuXvkrrwqsRHMjV3oGt1Nw="; + npmDepsHash = "sha256-BsfhbfhjHIlip3IiOJewjVD6Eq4bgr+Yo81rvIrJr7E="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-tLRSGuJMKAKvTsmERI7SyQXamAJPi/h4P/wQEo4HdtY="; + npmDepsHash = "sha256-cZhNkQjO1dAghXNoVCF0NQEi9QjXci626Ck9PXntoYA="; postPatch = '' chmod +w ../../ From cef0a490120bf64c7f81a5a45705173c5bbf18d5 Mon Sep 17 00:00:00 2001 From: pcasaretto Date: Fri, 26 Jul 2024 18:42:38 -0300 Subject: [PATCH 166/193] hexfiend: add auto update script --- pkgs/os-specific/darwin/hexfiend/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/hexfiend/default.nix b/pkgs/os-specific/darwin/hexfiend/default.nix index df81d7882d00..2a5ec7a461c5 100644 --- a/pkgs/os-specific/darwin/hexfiend/default.nix +++ b/pkgs/os-specific/darwin/hexfiend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, undmg }: +{ stdenv, lib, fetchurl, undmg, nix-update-script }: let urlSuffix = version: if lib.versions.patch == 0 then @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { cp -R . "$out/Applications/Hex Fiend.app" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Open-source macOS hex editor"; homepage = "http://hexfiend.com/"; From 348bc2e4b54c2335d7bb7d67628c3f2d32275460 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 12 Jul 2024 22:53:46 +0200 Subject: [PATCH 167/193] python3Packages.pymee: init at 2.2.0 --- .../python-modules/pymee/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pymee/default.nix diff --git a/pkgs/development/python-modules/pymee/default.nix b/pkgs/development/python-modules/pymee/default.nix new file mode 100644 index 000000000000..7c07ff13e5fc --- /dev/null +++ b/pkgs/development/python-modules/pymee/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, + websockets, +}: + +buildPythonPackage rec { + pname = "pymee"; + version = "2.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "FreshlyBrewedCode"; + repo = "pymee"; + rev = "refs/tags/v${version}"; + hash = "sha256-4XKd0lZ6RAsG2zXjKMUeST6cNcg+SjT371gxLIhxkAA="; + }; + + build-system = [ setuptools ]; + dependencies = [ + aiohttp + websockets + ]; + + pythonImportsCheck = [ "pymee" ]; + + # no tests + doCheck = false; + + meta = { + description = "Python library to interact with homee"; + homepage = "https://github.com/FreshlyBrewedCode/pymee"; + changelog = "https://github.com/FreshlyBrewedCode/pymee/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3e6066cf77d..eb415435849e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11547,6 +11547,8 @@ self: super: with self; { pymedio = callPackage ../development/python-modules/pymedio { }; + pymee = callPackage ../development/python-modules/pymee { }; + pymeeus = callPackage ../development/python-modules/pymeeus { }; pymelcloud = callPackage ../development/python-modules/pymelcloud { }; From 65ca851437b4ff1e37a3601465a3b535d6936e90 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 14:12:44 -0400 Subject: [PATCH 168/193] python312Packages.citeproc-py: Remove nose dependency and re-enable tests --- pkgs/development/python-modules/citeproc-py/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index 3cdb2e6bafe2..cca965d34f94 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, fetchPypi, - nose, git, lxml, rnc2rng, + pytestCheckHook, }: buildPythonPackage rec { @@ -23,11 +23,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml ]; nativeCheckInputs = [ - nose git + pytestCheckHook ]; - checkPhase = "nosetests tests"; - doCheck = false; # seems to want a Git repository, but fetchgit with leaveDotGit also fails + pythonImportsCheck = [ "citeproc" ]; meta = with lib; { From fdc84b488f402f84850f6f74ff4966404ec032d6 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 14:15:29 -0400 Subject: [PATCH 169/193] python312Packages.citeproc-py: modernize --- .../python-modules/citeproc-py/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index cca965d34f94..6b0fed8e0fb8 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -6,21 +6,24 @@ lxml, rnc2rng, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "citeproc-py"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "d9e3a224f936fe2e5033b5d9ffdacab769cedb61d96c4e0cf2f0b488f1d24b4e"; + hash = "sha256-2eOiJPk2/i5QM7XZ/9rKt2nO22HZbE4M8vC0iPHSS04="; }; + build-system = [ setuptools ]; + buildInputs = [ rnc2rng ]; - propagatedBuildInputs = [ lxml ]; + dependencies = [ lxml ]; nativeCheckInputs = [ git @@ -29,11 +32,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "citeproc" ]; - meta = with lib; { - homepage = "https://github.com/brechtm/citeproc-py"; + meta = { + homepage = "https://github.com/citeproc-py/citeproc-py"; description = "Citation Style Language (CSL) parser for Python"; mainProgram = "csl_unsorted"; - license = licenses.bsd2; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From f8c5e1ea1ebd45b780a49b0b461e1fa476e488c1 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 13:06:45 -0400 Subject: [PATCH 170/193] python312Packages.xlwt: Remove nose dependency --- pkgs/development/python-modules/xlwt/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index 12dfb75ce341..d5d31d92f9cc 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -2,9 +2,9 @@ lib, buildPythonPackage, fetchPypi, - nose, setuptools, pythonOlder, + pytestCheckHook, }: buildPythonPackage rec { @@ -21,18 +21,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - # tests rely on nose, archived in 2020 - doCheck = pythonOlder "3.12"; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - runHook preCheck - - nosetests -v - - runHook postCheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "xlwt" ]; From b8954a889c2f2ec1f96324373f044fc1eae1e488 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 14:58:19 -0400 Subject: [PATCH 171/193] python312Packages.xlwt: 1.3.0 -> 1.3.0-unstable-2018-09-16 Updates to the latest commit of the now-archived repo, should have no breaking changes, per the suggestion in https://github.com/NixOS/nixpkgs/pull/330217#pullrequestreview-2202431845 --- .../python-modules/xlwt/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index d5d31d92f9cc..008566a6b2dd 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -1,38 +1,41 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, - pythonOlder, pytestCheckHook, + six, }: -buildPythonPackage rec { +buildPythonPackage { pname = "xlwt"; - version = "1.3.0"; + version = "1.3.0-unstable-2018-09-16"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-xZkScXqbKPGjwqmP1gdBAUsGsEOTbc7LwRPqqtoVbIg="; + src = fetchFromGitHub { + owner = "python-excel"; + repo = "xlwt"; + # Use last commit before archival + rev = "5a222d0315b6d3ce52a3cedd7c3e41309587c107"; + hash = "sha256-YKbqdimX1q+d7A9BSwuKl3SndQ+0eocz+m6xMAZeMQQ="; }; build-system = [ setuptools ]; + dependencies = [ six ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "xlwt" ]; - meta = with lib; { + meta = { description = "Library to create spreadsheet files compatible with MS"; homepage = "https://github.com/python-excel/xlwt"; - license = with licenses; [ + license = with lib.licenses; [ bsdOriginal bsd3 lgpl21Plus ]; - maintainers = with maintainers; [ ]; + maintainers = with lib.maintainers; [ pyrox0 ]; }; } From f5371064183aaf94dbb8619ac4a0e2cf767c2c43 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 17 Jul 2024 06:01:59 +0200 Subject: [PATCH 172/193] toolong: init at 1.4.0 --- pkgs/by-name/to/toolong/package.nix | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/to/toolong/package.nix diff --git a/pkgs/by-name/to/toolong/package.nix b/pkgs/by-name/to/toolong/package.nix new file mode 100644 index 000000000000..264aa4f7dfaf --- /dev/null +++ b/pkgs/by-name/to/toolong/package.nix @@ -0,0 +1,45 @@ +{ + lib, + python311Packages, + fetchFromGitHub, + testers, + toolong, +}: + +python311Packages.buildPythonApplication rec { + pname = "toolong"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Textualize"; + repo = "toolong"; + rev = "refs/tags/v${version}"; + hash = "sha256-Zd6j1BIrsLJqptg7BXb67qY3DaeHRHieWJoYYCDHaoc="; + }; + + build-system = [ python311Packages.poetry-core ]; + dependencies = with python311Packages; [ + click + textual + typing-extensions + ]; + + pythonRelaxDeps = [ "textual" ]; + + pythonImportsCheck = [ "toolong" ]; + doCheck = false; # no tests + + passthru.tests.version = testers.testVersion { + package = toolong; + command = "${lib.getExe toolong} --version"; + }; + + meta = with lib; { + description = "Terminal application to view, tail, merge, and search log files (plus JSONL)"; + license = licenses.mit; + homepage = "https://github.com/textualize/toolong"; + maintainers = with maintainers; [ sigmanificient ]; + mainProgram = "tl"; + }; +} From 2aee0cec37260bba0ee0eedca4ea4fb35ffef5f6 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 18:35:34 -0400 Subject: [PATCH 173/193] python312Packages.braintree: 4.14.0 -> 4.29.0 --- .../development/python-modules/braintree/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 7791004c1b6a..231c7354a005 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, pytestCheckHook, pythonOlder, requests, @@ -10,24 +9,21 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.14.0"; + version = "4.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; + owner = "braintree"; repo = "braintree_python"; rev = version; - hash = "sha256-qeqQX+qyy78sLe+46CA4D6VAxNHUVahS4LMYdGDzc2k="; + hash = "sha256-5MF8W2zUVvNiOnmszgJkMDmeYLZ6ppFHqmH6dmlCzQY="; }; propagatedBuildInputs = [ requests ]; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "braintree" ]; From d3dd5a36cc5a2ec3c3895ba6aaa12e4f32e57708 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 18:44:26 -0400 Subject: [PATCH 174/193] python312Packages.braintree: modernize and enable more tests --- .../python-modules/braintree/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 231c7354a005..854f1451c0b1 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -3,16 +3,14 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "braintree"; version = "4.29.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "braintree"; @@ -21,21 +19,25 @@ buildPythonPackage rec { hash = "sha256-5MF8W2zUVvNiOnmszgJkMDmeYLZ6ppFHqmH6dmlCzQY="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "braintree" ]; - disabledTestPaths = [ - # Don't test integrations - "tests/integration" + pytestFlagsArray = [ + "tests/" + "tests/fixtures" + "tests/unit" + "tests/integration/test_credentials_parser.py" ]; - meta = with lib; { + meta = { description = "Python library for integration with Braintree"; homepage = "https://github.com/braintree/braintree_python"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; } From e492adefbc460013aad16a74cb6222294ad5aeea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 10:06:55 +0000 Subject: [PATCH 175/193] python312Packages.datauri: 2.1.1 -> 2.2.0 --- pkgs/development/python-modules/datauri/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index 58fec0584968..4bf82cf464ca 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "datauri"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fcurella"; repo = "python-datauri"; rev = "refs/tags/v${version}"; - hash = "sha256-+R1J4IjJ+Vf/+V2kiZyIyAqTAgGLTMJjGePyVRuO5rs="; + hash = "sha256-9BCYC8PW44pB348kkH7aB1YqXXN1VNcBHphlN503M6g="; }; build-system = [ setuptools ]; @@ -34,11 +34,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "datauri" ]; - disabledTests = [ - # Test is incompatible with pydantic >=2 - "test_pydantic" - ]; - meta = with lib; { description = "Module for Data URI manipulation"; homepage = "https://github.com/fcurella/python-datauri"; From 0fe7950b9049f6eec15a3664b367b58ed4c2643a Mon Sep 17 00:00:00 2001 From: infinixbot Date: Fri, 26 Jul 2024 23:56:38 +0000 Subject: [PATCH 176/193] nixpkgs-check-by-name: 0.1.1 -> 0.1.2 https://github.com/NixOS/nixpkgs-check-by-name/releases/tag/0.1.2 --- pkgs/test/check-by-name/pinned-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/check-by-name/pinned-version.txt b/pkgs/test/check-by-name/pinned-version.txt index 17e51c385ea3..d917d3e26adc 100644 --- a/pkgs/test/check-by-name/pinned-version.txt +++ b/pkgs/test/check-by-name/pinned-version.txt @@ -1 +1 @@ -0.1.1 +0.1.2 From 3fafc1a39b8f52f51460b2b3fc009a41726ac5ba Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 27 Jul 2024 01:56:54 +0200 Subject: [PATCH 177/193] python312Packages.telfhash: migrate to pyproject --- pkgs/development/python-modules/telfhash/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index 860c9becb6d0..18b67b6bf502 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -6,11 +6,12 @@ packaging, pyelftools, tlsh, + setuptools, }: buildPythonPackage rec { pname = "telfhash"; version = "0.9.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "trendmicro"; @@ -22,11 +23,14 @@ buildPythonPackage rec { # The tlsh library's name is just "tlsh" postPatch = '' substituteInPlace requirements.txt \ - --replace "python-tlsh" "tlsh" \ - --replace "py-tlsh" "tlsh" + --replace-fail "python-tlsh" "tlsh" \ + --replace-fail "py-tlsh" "tlsh" \ + --replace-fail "nose>=1.3.7" "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ capstone pyelftools tlsh From eac58dca33ebbf70993a555927c076fe3b67bcdc Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 27 Jul 2024 01:59:48 +0200 Subject: [PATCH 178/193] Revert "Partially revert "build(deps): bump cachix/install-nix-action from 26 to 27"" This reverts commit 99069476cab34e84fea7e8786152fb34488db8e5. With the parent commit, https://github.com/NixOS/nixpkgs-check-by-name/issues/78 is fixed, so there's no problem related to the Nix version anymore. --- .github/workflows/check-by-name.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index 0c0727eba122..f9d1846c8798 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -94,7 +94,7 @@ jobs: base=$(mktemp -d) git worktree add "$base" "$(git rev-parse HEAD^1)" echo "base=$base" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 + - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 if: env.mergedSha - name: Fetching the pinned tool if: env.mergedSha From 435507519c28210d39891b8d091e41ef1a2fad77 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 00:36:58 +0200 Subject: [PATCH 179/193] python312Packages.sampledata: drop python312Package.sampledata: drop --- .../python-modules/sampledata/default.nix | 43 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/sampledata/default.nix diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix deleted file mode 100644 index 4583375eea00..000000000000 --- a/pkgs/development/python-modules/sampledata/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - pytz, - six, - versiontools, -}: - -buildPythonPackage rec { - pname = "sampledata"; - version = "0.3.7"; - format = "setuptools"; - - meta = { - description = "Sample Data generator for Python"; - homepage = "https://github.com/jespino/sampledata"; - license = lib.licenses.bsd3; - }; - - src = fetchPypi { - inherit pname version; - sha256 = "1kx2j49lag30d32zhzsr50gl5b949wa4lcdap2filg0d07picsdh"; - }; - - buildInputs = [ - nose - versiontools - ]; - propagatedBuildInputs = [ - pytz - six - ]; - - # ERROR: test_image_path_from_directory (tests.tests.TestImageHelpers) - # ERROR: test_image_stream (tests.tests.TestImageHelpers) - doCheck = false; - - checkPhase = '' - nosetests -e "TestImageHelpers" - ''; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1798f32356a7..181401067e81 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -517,6 +517,7 @@ mapAliases ({ ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 inherit (super.pkgs) ruff-lsp; # added 2023-06-23 runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03 + sampledata = throw "sampledata has been removed, it was unmaintained since 2017"; # added 2024-07-27 sapi-python-client = kbcstorage; # added 2022-04-20 scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9759073c4e6e..b4d443550155 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13880,8 +13880,6 @@ self: super: with self; { samarium = callPackage ../development/python-modules/samarium { }; - sampledata = callPackage ../development/python-modules/sampledata { }; - samplerate = callPackage ../development/python-modules/samplerate { inherit (pkgs) libsamplerate; }; From 67e13a134c47a4bfd0e2707fa8984b9fe5786b50 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 22:29:29 +0200 Subject: [PATCH 180/193] python312Packages.vxi11: drop nose dependency --- .../python-modules/vxi11/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index 0b3debdd5dd6..f68979cf2fea 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -2,7 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + pytestCheckHook, + fetchpatch2, }: buildPythonPackage rec { @@ -17,10 +18,23 @@ buildPythonPackage rec { sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn"; }; - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + patches = [ + # set of patches from python-ivi/python-vxi11#47 + + # Fix deprecation warning + (fetchpatch2 { + url = "https://github.com/python-ivi/python-vxi11/commit/00722b1b8810ac38bfb47e8c49437055b600dfff.patch?full_index=1"; + hash = "sha256-fZDhg578UY/Q/2li1EmL5WTPx1OUfyebzvvBVK/IyDU="; + }) + + # Removes nose dependency + (fetchpatch2 { + url = "https://github.com/python-ivi/python-vxi11/commit/a8ad324d645d6f7215f207f2cc2988dc49859698.patch?full_index=1"; + hash = "sha256-nkH6ww4jBypEmZeatEb8fpFTB7x/AMppeEmuH9a4v6I="; + }) + ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "VXI-11 driver for controlling instruments over Ethernet"; From d265ac739de52474f56e7170da47335d07c6f72e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 09:18:15 +0200 Subject: [PATCH 181/193] libgssglue: 0.4 -> 0.9 libgssglue: format with nixfmt-rfc-style --- .../libraries/libgssglue/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 0d01b05e223b..ef9b3d282156 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, fetchurl, libkrb5 }: +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + libkrb5, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgssglue"; - version = "0.4"; + version = "0.9"; - src = fetchurl { - url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${pname}-${version}.tar.gz"; - sha256 = "0fh475kxzlabwz30wz3bf7i8kfqiqzhfahayx3jj79rba1sily9z"; + src = fetchFromGitLab { + owner = "gsasl"; + repo = "libgssglue"; + rev = "tags/libgssglue-${finalAttrs.version}"; + hash = "sha256-p9dujLklv2ZC1YA1gKGCRJf9EvF3stv5v4Z/5m1nSeM="; }; + nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + touch ChangeLog + sed s:/etc/gssapi_mech.conf:$out/etc/gssapi_mech.conf: -i src/g_initialize.c ''; @@ -27,4 +39,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; }; -} +}) From f7df69b5b9d3b8698543d717918043aa6061c0be Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 22:40:38 +0200 Subject: [PATCH 182/193] python312Packages.unicode-slugify: drop nose dependency --- .../unicode-slugify/default.nix | 20 ++++-- .../use_pytest_instead_of_nose.patch | 69 +++++++++++++++++++ 2 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 47a91979bf43..32e7a66db70a 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, fetchPypi, - nose, + fetchpatch, + pytestCheckHook, six, unidecode, - unittestCheckHook, }: buildPythonPackage rec { @@ -18,15 +18,23 @@ buildPythonPackage rec { sha256 = "25f424258317e4cb41093e2953374b3af1f23097297664731cdb3ae46f6bd6c3"; }; + patches = [ + ./use_pytest_instead_of_nose.patch + # mozilla/unicode-slugify#41: Fix Python 3.12 SyntaxWarning + (fetchpatch { + url = "https://github.com/mozilla/unicode-slugify/commit/a18826f440d0b74e536f5e32ebdcf30e720f20d8.patch"; + hash = "sha256-B27psp0XI5GhoR0l5lFpUOh88hHzjJYzJS5PnIkfFws="; + }) + ]; + propagatedBuildInputs = [ six unidecode ]; - nativeCheckInputs = [ - nose - unittestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "slugify/tests.py" ]; meta = with lib; { description = "Generates unicode slugs"; diff --git a/pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch b/pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch new file mode 100644 index 000000000000..4aea175ffa4a --- /dev/null +++ b/pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch @@ -0,0 +1,69 @@ +diff --git a/slugify/tests.py b/slugify/tests.py +index 9f636c4..5562e87 100644 +--- a/slugify/tests.py ++++ b/slugify/tests.py +@@ -3,7 +3,7 @@ from __future__ import unicode_literals + + import six + import unittest +-from nose.tools import eq_, raises ++import pytest + + from slugify import slugify, smart_text, SLUG_OK + +@@ -13,31 +13,31 @@ def test_slugify(): + x = '-'.join([u, u]) + y = ' - '.join([u, u]) + +- @raises(ValueError) + def test_incoherent_ok_and_only_ascii_raises_an_error(): + """Checks that only_ascii=True with non ascii "ok" chars actually raises an error.""" +- slugify('angry smiley !', ok='è_é', only_ascii=True) ++ with pytest.raises(ValueError): ++ slugify('angry smiley !', ok='è_é', only_ascii=True) + + def check(x, y): +- eq_(slugify(x), y) ++ assert slugify(x) == y + + def check_only_ascii(x, y): +- eq_(slugify(x, only_ascii=True), y) ++ assert slugify(x, only_ascii=True) == y + + def check_only_ascii_capital(x, y): +- eq_(slugify(x, lower=False, only_ascii=True), y) ++ assert slugify(x, lower=False, only_ascii=True) == y + + def check_only_ascii_lower_nospaces(x, y): +- eq_(slugify(x, lower=True, spaces=False, only_ascii=True), y) ++ assert slugify(x, lower=True, spaces=False, only_ascii=True) == y + + def check_ok_chars(x, y): +- eq_(slugify(x, ok='-♰é_è'), y) ++ assert slugify(x, ok='-♰é_è') == y + + def check_empty_ok_chars(x, y): +- eq_(slugify(x, ok=''), y) ++ assert slugify(x, ok='') == y + + def check_limited_ok_chars_only_ascii(x, y): +- eq_(slugify(x, ok='-', only_ascii=True), y) ++ assert slugify(x, ok='-', only_ascii=True) == y + + s = [('xx x - "#$@ x', 'xx-x-x'), + ('Bän...g (bang)', 'bäng-bang'), +@@ -112,11 +112,11 @@ def test_slugify(): + + #Test custom space replacement + x, y = ('-☀- pretty waves under the sunset 😎', '--~pretty~waves~under~the~sunset') +- eq_(slugify(x, space_replacement='~'), y) ++ assert slugify(x, space_replacement='~') == y + + #Test default auto space replacement + x, y = ('-☀- pretty waves under the sunset 😎', 'pretty~waves~under~the~sunset') +- eq_(slugify(x, ok='~'), y) ++ assert slugify(x, ok='~') == y + + + class SmartTextTestCase(unittest.TestCase): + From 27bffc8cc2a116755172ebe32ecaba1f1f67586a Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 23:52:56 +0200 Subject: [PATCH 183/193] python312Packages.selectors2: drop --- .../python-modules/selectors2/default.nix | 43 ------------------- .../selectors2/mapping-import.patch | 14 ------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/development/python-modules/selectors2/default.nix delete mode 100644 pkgs/development/python-modules/selectors2/mapping-import.patch diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix deleted file mode 100644 index b2b79711c259..000000000000 --- a/pkgs/development/python-modules/selectors2/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - psutil, - mock, -}: - -buildPythonPackage rec { - version = "2.0.2"; - format = "setuptools"; - pname = "selectors2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1f1bbaac203a23fbc851dc1b5a6e92c50698cc8cefa5873eb5b89eef53d1d82b"; - }; - - patches = [ ./mapping-import.patch ]; - - nativeCheckInputs = [ - nose - psutil - mock - ]; - - checkPhase = '' - # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064 - # Trick to disable certain tests that depend on timing which - # will always fail on hydra - export TRAVIS="" - nosetests tests/test_selectors2.py \ - --exclude=test_above_fd_setsize - ''; - - meta = with lib; { - homepage = "https://www.github.com/SethMichaelLarson/selectors2"; - description = "Back-ported, durable, and portable selectors"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/selectors2/mapping-import.patch b/pkgs/development/python-modules/selectors2/mapping-import.patch deleted file mode 100644 index 64f74a5ce29b..000000000000 --- a/pkgs/development/python-modules/selectors2/mapping-import.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/selectors2.py b/selectors2.py -index 1625a30..c4a1231 100644 ---- a/selectors2.py -+++ b/selectors2.py -@@ -22,7 +22,8 @@ - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - # SOFTWARE. - --from collections import namedtuple, Mapping -+from collections import namedtuple -+from collections.abc import Mapping - import errno - import math - import platform diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1798f32356a7..de3494b68f62 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -521,6 +521,7 @@ mapAliases ({ scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23 + selectors2 = throw "selectors2 has been removed: archived by upstream."; # added 2024-07-27 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_dso = setuptools-dso; # added 2024-03-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c5ac7cbb3fc..1065d3ab38c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14044,8 +14044,6 @@ self: super: with self; { inherit (pkgs) cmake ninja; }; - selectors2 = callPackage ../development/python-modules/selectors2 { }; - selenium = callPackage ../development/python-modules/selenium { }; selenium-wire = callPackage ../development/python-modules/selenium-wire { }; From 0a23f138457e001a044d655740d576febc1ceaf4 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 05:07:01 +0200 Subject: [PATCH 184/193] python312Packages.yt-dlp-dearrow: init at 2023.01.01 --- .../python-modules/yt-dlp-dearrow/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/yt-dlp-dearrow/default.nix diff --git a/pkgs/development/python-modules/yt-dlp-dearrow/default.nix b/pkgs/development/python-modules/yt-dlp-dearrow/default.nix new file mode 100644 index 000000000000..ae182ce79a47 --- /dev/null +++ b/pkgs/development/python-modules/yt-dlp-dearrow/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage { + pname = "yt-dlp-dearrow"; + version = "2023.01.01-unstable-2024-01-13"; # setup.cfg + pyproject = true; + + src = fetchFromGitHub { + owner = "QuantumWarpCode"; + repo = "yt-dlp-dearrow"; + rev = "2e46eca7b2242d8c9765bf2d12f92270b694be64"; # no tags + hash = "sha256-Ubi1kn/1FqkuwnxToBuSsAfCYWiNCTl/EUD8eeG3MSY="; + }; + + build-system = [ setuptools ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "yt_dlp_plugins" ]; + + meta = { + description = "Post-processor plugin to use DeArrow video titles in YT-DLP"; + homepage = "https://github.com/QuantumWarpCode/yt-dlp-dearrow"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c5ac7cbb3fc..00a42d0f99c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17638,6 +17638,8 @@ self: super: with self; { rtmpSupport = false; }; + yt-dlp-dearrow = callPackage ../development/python-modules/yt-dlp-dearrow { }; + youtube-search = callPackage ../development/python-modules/youtube-search { }; youtube-search-python = callPackage ../development/python-modules/youtube-search-python { }; From fada29bff667770f2fbf64018c73e54d58cd09a1 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 22:17:29 +0200 Subject: [PATCH 185/193] python311Packages.pygogo: drop --- .../python-modules/pygogo/default.nix | 48 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/development/python-modules/pygogo/default.nix diff --git a/pkgs/development/python-modules/pygogo/default.nix b/pkgs/development/python-modules/pygogo/default.nix deleted file mode 100644 index 889e2c7b06c3..000000000000 --- a/pkgs/development/python-modules/pygogo/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - pythonOlder, - buildPythonPackage, - fetchFromGitHub, - pkutils, - # Check Inputs - nose, -}: - -buildPythonPackage rec { - pname = "pygogo"; - version = "0.13.2"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "reubano"; - repo = "pygogo"; - rev = "v${version}"; - sha256 = "19rdf4sjrm5lp1vq1bki21a9lrkzz8sgrfwgjdkq4sgy90hn1jn9"; - }; - - nativeBuildInputs = [ pkutils ]; - - nativeCheckInputs = [ nose ]; - - postPatch = '' - substituteInPlace dev-requirements.txt \ - --replace "pkutils>=1.0.0,<2.0.0" "pkutils>=1.0.0" - ''; - - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; - - pythonImportsCheck = [ "pygogo" ]; - - meta = with lib; { - description = "Python logging library"; - homepage = "https://github.com/reubano/pygogo/"; - license = licenses.mit; - maintainers = with maintainers; [ drewrisinger ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1798f32356a7..4a4b5d8d8bbe 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -381,6 +381,7 @@ mapAliases ({ pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10 pygame_sdl2 = pygame-sdl2; # added 2024-01-07 + pygogo = throw "pygogo has been removed, since it is abandoned and had no maintainer"; # added 2024-07-27 pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20 PyGithub = pygithub; # added 2023-02-19 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c5ac7cbb3fc..2ef2029200dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11388,8 +11388,6 @@ self: super: with self; { pygobject-stubs = callPackage ../development/python-modules/pygobject-stubs { }; - pygogo = callPackage ../development/python-modules/pygogo { }; - pygpgme = callPackage ../development/python-modules/pygpgme { }; pygraphviz = callPackage ../development/python-modules/pygraphviz { From 62e632d4308bf7a8e896a1af10e5a88db0d2f326 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 26 Jul 2024 18:29:59 -0400 Subject: [PATCH 186/193] python312Packages.cgroup-utils: remove nose dependency and modernize --- .../python-modules/cgroup-utils/default.nix | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 89b05b5f3408..17047a321389 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -2,25 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - pep8, - nose, + setuptools, }: buildPythonPackage rec { - version = "0.8"; - format = "setuptools"; pname = "cgroup-utils"; - - buildInputs = [ - pep8 - nose - ]; - # Pep8 tests fail... - doCheck = false; - - postPatch = '' - sed -i -e "/argparse/d" setup.py - ''; + version = "0.8"; + pyproject = true; src = fetchFromGitHub { owner = "peo3"; @@ -29,11 +17,25 @@ buildPythonPackage rec { sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq"; }; - meta = with lib; { + postPatch = '' + sed -i -e "/argparse/d" setup.py + ''; + + build-system = [ setuptools ]; + + # Upon running `from cgutils import cgroup`, it attempts to read a file in `/sys`. + # Due to the Nix build sandbox, this is disallowed, and so all possible tests fail, + # so we don't run them. Plain `import cgutils` works, so we run pythonImportsCheck below. + doCheck = false; + + pythonImportsCheck = [ "cgutils" ]; + + meta = { description = "Utility tools for control groups of Linux"; + homepage = "https://github.com/peo3/cgroup-utils"; mainProgram = "cgutil"; - maintainers = with maintainers; [ layus ]; - platforms = platforms.linux; - license = licenses.gpl2; + maintainers = with lib.maintainers; [ layus ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } From bd081b709bdb519477dfda87b741836096842227 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Jul 2024 21:10:37 +0200 Subject: [PATCH 187/193] python311Packages.yanc: drop --- .../python-modules/preggy/default.nix | 12 ++----- .../python-modules/yanc/default.nix | 34 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 pkgs/development/python-modules/yanc/default.nix diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index 5c4241a6477e..4281e6de0edf 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -4,8 +4,7 @@ fetchPypi, six, unidecode, - nose, - yanc, + pytestCheckHook, }: buildPythonPackage rec { @@ -17,20 +16,13 @@ buildPythonPackage rec { six unidecode ]; - nativeCheckInputs = [ - nose - yanc - ]; + nativeCheckInputs = [ pytestCheckHook ]; src = fetchPypi { inherit pname version; sha256 = "25ba803afde4f35ef543a60915ced2e634926235064df717c3cb3e4e3eb4670c"; }; - checkPhase = '' - nosetests . - ''; - meta = with lib; { description = "Assertion library for Python"; homepage = "http://heynemann.github.io/preggy/"; diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix deleted file mode 100644 index 30d0e302cd43..000000000000 --- a/pkgs/development/python-modules/yanc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - pythonOlder, - fetchPypi, - nose, -}: - -buildPythonPackage rec { - pname = "yanc"; - version = "0.3.3"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0z35bkk9phs40lf5061k1plhjdl5fskm0dmdikrsqi1bjihnxp8w"; - }; - - # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10 - doCheck = pythonOlder "3.5"; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests . - ''; - - meta = with lib; { - description = "Yet another nose colorer"; - homepage = "https://github.com/0compute/yanc"; - license = licenses.gpl3; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1798f32356a7..f6de98456025 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -613,6 +613,7 @@ mapAliases ({ xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 XlsxWriter = xlsxwriter; # added 2023-02-19 Yapsy = yapsy; # added 2023-02-19 + yanc = throw "yanc has been removed because it relies on nose"; # added 2024-07-27 z3 = z3-solver; # added 2023-12-03 zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c5ac7cbb3fc..471b28c8f03d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17564,8 +17564,6 @@ self: super: with self; { yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { }; - yanc = callPackage ../development/python-modules/yanc { }; - yangson = callPackage ../development/python-modules/yangson { }; yapf = callPackage ../development/python-modules/yapf { }; From 8210dab583fb2f26d4e1717ed23d0a291f3c6c89 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 27 Jul 2024 11:44:21 +0900 Subject: [PATCH 188/193] python312Packages.azure-mgmt-keyvault: refactor --- .../python-modules/azure-mgmt-keyvault/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index b8d8aa9cae24..4213abd86353 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -4,6 +4,7 @@ azure-mgmt-core, buildPythonPackage, fetchPypi, + setuptools, isodate, pythonOlder, }: @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; version = "10.3.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +21,9 @@ buildPythonPackage rec { hash = "sha256-NLkpVq773VccrloD9weOA32Ah7LADPpnSINdxzq7WjA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core isodate @@ -28,6 +31,8 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; + pythonImportsCheck = [ "azure.mgmt.keyvault" ]; + # Module has no tests doCheck = false; @@ -36,8 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-keyvault_${version}/sdk/keyvault/azure-mgmt-keyvault/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ - maxwilson - ]; + maintainers = with maintainers; [ maxwilson ]; }; } From 718bd3d7ce5fc13633992ddccb80f9fd897c308d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 27 Jul 2024 12:20:17 +0900 Subject: [PATCH 189/193] python312Packages.plotly: refactor --- .../python-modules/plotly/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 7a29c75b5f10..8c7751b766b5 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -2,29 +2,37 @@ lib, buildPythonPackage, fetchPypi, - pytz, - requests, - six, + setuptools, + packaging, tenacity, }: buildPythonPackage rec { pname = "plotly"; version = "5.23.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-ieV9ADoRYwOjTeZwCGI5E2fdVkIiq3H4Ux33Ann8AZM="; }; - propagatedBuildInputs = [ - pytz - requests - six + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "\"jupyterlab~=3.0;python_version>='3.6'\"," "" + ''; + + env.SKIP_NPM = true; + + build-system = [ setuptools ]; + + dependencies = [ + packaging tenacity ]; + pythonImportsCheck = [ "plotly" ]; + # No tests in archive doCheck = false; From 759ee151e75ee9aec951308f9a2305567cf048ac Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 27 Jul 2024 11:31:50 +0800 Subject: [PATCH 190/193] nixosTests.pantheon: Disable flaky test for closing multitasking view org.freedesktop.DBus.Error.NoReply sometimes. --- nixos/tests/pantheon.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index d2a4a009af53..9806a1e3052e 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -96,9 +96,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : cmd = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1" env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0" machine.succeed(f"su - ${user.name} -c '{env} {cmd}'") - machine.sleep(3) + machine.sleep(5) machine.screenshot("multitasking") - machine.succeed(f"su - ${user.name} -c '{env} {cmd}'") with subtest("Check if gala has ever coredumped"): machine.fail("coredumpctl --json=short | grep gala") From 860120afe4a56687e069af33f265beeb303de048 Mon Sep 17 00:00:00 2001 From: Shadaj Laddad Date: Fri, 26 Jul 2024 16:01:21 -0700 Subject: [PATCH 191/193] sapling: 0.2.202401116 -> 0.2.20240718 --- .../version-management/sapling/Cargo.lock | 2788 ++++++++++------- .../version-management/sapling/default.nix | 20 +- .../version-management/sapling/deps.json | 4 +- 3 files changed, 1737 insertions(+), 1075 deletions(-) diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index 7b3f1c7d58c4..ad2ee2de79d0 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -44,9 +44,9 @@ checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -110,47 +110,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -158,9 +159,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -173,15 +174,15 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -191,11 +192,10 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "assert-json-diff" -version = "1.1.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259cbe96513d2f1073027a259fc2ca917feb3026a5a8d984e3628e490255cc0" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "extend", "serde", "serde_json", ] @@ -208,9 +208,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.4.6" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "bzip2", @@ -265,13 +265,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -284,9 +284,12 @@ dependencies = [ [[package]] name = "atomic" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] [[package]] name = "atomicfile" @@ -314,7 +317,7 @@ dependencies = [ "anyhow", "chrono", "configmodel", - "indexmap 2.1.0", + "indexmap 2.2.6", "once_cell", "pem", "simple_asn1", @@ -327,21 +330,20 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backingstore" @@ -384,9 +386,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -409,6 +411,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bindag" version = "0.1.0" @@ -439,6 +447,7 @@ dependencies = [ "pycliparser", "pyconchparser", "pyconfigloader", + "pycontext", "pycopytrace", "pydag", "pydiffhelpers", @@ -447,17 +456,18 @@ dependencies = [ "pydrawdag", "pyeagerepo", "pyedenapi", - "pyedenclient", "pyerror", "pyexchange", "pyfail", "pyfs", + "pygitcompat", "pygitstore", "pyhgmetrics", "pyhgtime", "pyidentity", "pyindexedlog", "pyio", + "pyjournal", "pylinelog", "pylock", "pylz4", @@ -489,6 +499,7 @@ dependencies = [ "pywebview", "pyworker", "pyworkingcopy", + "pyworkingcopyclient", "pyxdiff", "pyzstd", "pyzstore", @@ -498,8 +509,8 @@ dependencies = [ name = "bindings-lib" version = "0.1.0" dependencies = [ + "commands", "cpython", - "hgcommands", ] [[package]] @@ -525,9 +536,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" @@ -564,7 +578,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -578,16 +592,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "constant_time_eq", - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", + "digest", ] [[package]] @@ -601,9 +606,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -612,9 +617,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -622,9 +627,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -641,9 +646,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -653,9 +664,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" dependencies = [ "serde", ] @@ -681,6 +692,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "cas-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "configmodel", + "types", +] + [[package]] name = "cassowary" version = "0.3.0" @@ -693,7 +714,7 @@ version = "0.1.0" dependencies = [ "anyhow", "configmodel", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_json", "thiserror", @@ -703,9 +724,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" dependencies = [ "jobserver", "libc", @@ -723,19 +744,29 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "checkout" version = "0.1.0" dependencies = [ "anyhow", + "async-runtime", "async-trait", "atexit", "configmodel", + "context", "crossbeam", + "dag", "edenfs-client", "fail", "fs-err", "hg-metrics", + "hook", "manifest", "manifest-tree", "minibytes", @@ -744,8 +775,7 @@ dependencies = [ "progress-model", "quickcheck", "repo", - "repolock", - "serde_json", + "serde", "spawn-ext", "status", "storemodel", @@ -759,20 +789,21 @@ dependencies = [ "util", "vfs", "walkdir", + "watchman_client", "workingcopy", ] [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -806,30 +837,30 @@ dependencies = [ "strsim 0.10.0", "termcolor", "terminal_size 0.2.6", - "textwrap 0.16.0", + "textwrap 0.16.1", "unicase", ] [[package]] name = "clap" -version = "4.4.18" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" dependencies = [ "clap_builder", - "clap_derive 4.4.7", + "clap_derive 4.5.11", ] [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", - "strsim 0.10.0", + "clap_lex 0.7.2", + "strsim 0.11.1", "terminal_size 0.3.0", "unicase", "unicode-width", @@ -850,14 +881,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -871,9 +902,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clidispatch" @@ -884,7 +915,10 @@ dependencies = [ "cliparser", "configloader", "configmodel", + "context", + "gitcompat", "hgplain", + "hook", "hostname 0.1.0", "identity", "indexedlog", @@ -928,7 +962,7 @@ version = "0.1.0" dependencies = [ "anyhow", "cpython", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "shlex", "thiserror", @@ -939,25 +973,465 @@ name = "clone" version = "0.1.0" dependencies = [ "anyhow", - "async-runtime", "checkout", "configmodel", - "manifest-tree", + "context", "repo", "tempfile", - "termlogger", "thiserror", "tracing", - "treestate", "types", "util", - "vfs", ] [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" + +[[package]] +name = "cmdclone" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "clidispatch", + "clone", + "cmdpy", + "cmdutil", + "configloader", + "configmodel", + "eagerepo", + "exchange", + "fail", + "hgplain", + "identity", + "metalog", + "migration", + "repo", + "repo_name", + "tracing", + "types", + "url", + "util", +] + +[[package]] +name = "cmdconfig" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "configloader", + "configmodel", + "formatter", + "minibytes", + "serde", +] + +[[package]] +name = "cmdconfigfile" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "cmdutil", + "identity", +] + +[[package]] +name = "cmddebugargs" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugcas" +version = "0.1.0" +dependencies = [ + "async-runtime", + "cas-client", + "clidispatch", + "cmdutil", + "manifest", + "repo", + "types", + "util", + "workingcopy", +] + +[[package]] +name = "cmddebugconfigtree" +version = "0.1.0" +dependencies = [ + "cmdutil", +] + +[[package]] +name = "cmddebugcurrentexe" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugdumpindexedlog" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "indexedlog", +] + +[[package]] +name = "cmddebugdumpinternalconfig" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", +] + +[[package]] +name = "cmddebugfsync" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "fsyncglob", + "repo", +] + +[[package]] +name = "cmddebughttp" +version = "0.1.0" +dependencies = [ + "async-runtime", + "clidispatch", + "cmdutil", + "edenapi", + "repo", +] + +[[package]] +name = "cmddebugmergestate" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "cmdutil", + "repo", + "repostate", + "workingcopy", +] + +[[package]] +name = "cmddebugmetrics" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "hg-metrics", + "repo", + "tracing", +] + +[[package]] +name = "cmddebugnetworkdoctor" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", + "network-doctor", +] + +[[package]] +name = "cmddebugpython" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugracyoutput" +version = "0.1.0" +dependencies = [ + "async-runtime", + "clidispatch", + "cliparser", + "cmdutil", + "progress-model", + "rand 0.8.5", +] + +[[package]] +name = "cmddebugrefreshconfig" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", + "repo-minimal-info", +] + +[[package]] +name = "cmddebugrevsets" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "cmdutil", + "repo", + "workingcopy", +] + +[[package]] +name = "cmddebugrunlog" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "repo", + "runlog", + "serde_json", +] + +[[package]] +name = "cmddebugscmstore" +version = "0.1.0" +dependencies = [ + "async-runtime", + "clidispatch", + "cmdutil", + "manifest", + "repo", + "revisionstore", + "serde", + "types", +] + +[[package]] +name = "cmddebugscmstorereplay" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "repo", + "revisionstore", + "types", +] + +[[package]] +name = "cmddebugsegmentclone" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "clidispatch", + "cliparser", + "cmdutil", + "dag", + "edenapi", + "identity", + "progress-model", +] + +[[package]] +name = "cmddebugsegmentgraph" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "cmdutil", + "dag", + "repo", +] + +[[package]] +name = "cmddebugsegmentpull" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "clidispatch", + "cliparser", + "cmdutil", + "dag", + "edenapi", + "repo", + "types", +] + +[[package]] +name = "cmddebugstore" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", + "repo", + "revisionstore", + "types", +] + +[[package]] +name = "cmddebugstructuredprogress" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "progress-model", +] + +[[package]] +name = "cmddebugtestcommand" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugtop" +version = "0.1.0" +dependencies = [ + "chrono", + "clidispatch", + "cliparser", + "cmdutil", + "comfy-table", + "debugtop", + "repo", + "runlog", +] + +[[package]] +name = "cmddebugwait" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "edenfs-client", + "repo", + "tracing", + "treestate", + "workingcopy", +] + +[[package]] +name = "cmdgoto" +version = "0.1.0" +dependencies = [ + "anyhow", + "checkout", + "clidispatch", + "cliparser", + "cmdutil", + "configmodel", + "fs-err", + "repo", + "repostate", + "tracing", + "util", + "workingcopy", +] + +[[package]] +name = "cmdpy" +version = "0.1.0" +dependencies = [ + "bindings", + "clidispatch", + "commandserver", + "configmodel", + "context", + "cpython", + "cpython_ext", + "libc", + "nodeipc", + "pycontext", + "pyio", + "pymodules", + "python3-sys", + "tracing", +] + +[[package]] +name = "cmdroot" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "repo", + "util", +] + +[[package]] +name = "cmdstatus" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "configloader", + "formatter", + "hgplain", + "pathmatcher", + "repo", + "serde", + "status", + "tracing", + "types", + "util", + "workingcopy", +] + +[[package]] +name = "cmdutil" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "configmodel", + "configset", + "formatter", + "hgplain", + "repo", + "termstyle", +] + +[[package]] +name = "cmdversion" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "identity", + "version", +] + +[[package]] +name = "cmdwhereami" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "repo", + "treestate", + "types", +] [[package]] name = "codegen" @@ -969,7 +1443,7 @@ dependencies = [ [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "quote", ] @@ -986,26 +1460,25 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colored" -version = "1.9.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" dependencies = [ - "is-terminal", "lazy_static", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "comfy-table" -version = "6.2.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ "crossterm", "strum", @@ -1013,6 +1486,86 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "commands" +version = "0.1.0" +dependencies = [ + "anyhow", + "atexit", + "blackbox", + "clidispatch", + "cmdclone", + "cmdconfig", + "cmdconfigfile", + "cmddebugargs", + "cmddebugcas", + "cmddebugconfigtree", + "cmddebugcurrentexe", + "cmddebugdumpindexedlog", + "cmddebugdumpinternalconfig", + "cmddebugfsync", + "cmddebughttp", + "cmddebugmergestate", + "cmddebugmetrics", + "cmddebugnetworkdoctor", + "cmddebugpython", + "cmddebugracyoutput", + "cmddebugrefreshconfig", + "cmddebugrevsets", + "cmddebugrunlog", + "cmddebugscmstore", + "cmddebugscmstorereplay", + "cmddebugsegmentclone", + "cmddebugsegmentgraph", + "cmddebugsegmentpull", + "cmddebugstore", + "cmddebugstructuredprogress", + "cmddebugtestcommand", + "cmddebugtop", + "cmddebugwait", + "cmdgoto", + "cmdpy", + "cmdroot", + "cmdstatus", + "cmdversion", + "cmdwhereami", + "commandserver", + "configloader", + "configmodel", + "constructors", + "ctrlc", + "fail", + "flate2", + "hg-http", + "hg-metrics", + "hgplain", + "hostname 0.3.1", + "identity", + "libc", + "metrics-render", + "mincode", + "nodeipc", + "parking_lot", + "procinfo", + "progress-model", + "progress-render", + "pycheckout", + "pytracing", + "pyworkingcopy", + "pyworkingcopyclient", + "repo", + "revisionstore", + "runlog", + "sampling", + "tracing", + "tracing-collector", + "tracing-reload", + "tracing-sampler", + "tracing-subscriber", + "version", + "zstd", +] + [[package]] name = "commandserver" version = "0.1.0" @@ -1030,7 +1583,6 @@ dependencies = [ "procutil", "serde", "spawn-ext", - "system-command", "tracing", "udsipc", "version", @@ -1059,6 +1611,28 @@ dependencies = [ "tokio", ] +[[package]] +name = "commits" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "commits-trait", + "dag", + "edenapi", + "factory", + "fs-err", + "futures 0.3.30", + "minibytes", + "parking_lot", + "revlogindex", + "storemodel", + "streams", + "tracing", + "types", + "zstore", +] + [[package]] name = "commits-git" version = "0.1.0" @@ -1113,11 +1687,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1125,67 +1699,46 @@ name = "config" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", "codegen_includer_proc_macro", - "config_types", - "const-cstr", "fbthrift", "futures 0.3.30", + "once_cell", "ref-cast", + "serde", + "serde_derive", "thiserror", "thrift_compiler", - "tracing", - "tracing-futures", ] [[package]] name = "config_thrift" version = "0.1.0" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + +[[package]] +name = "config_thrift_clients" +version = "0.1.0" dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", - "config_thrift_types", + "config_thrift", "const-cstr", "fbthrift", "futures 0.3.30", - "ref-cast", - "thiserror", "thrift_compiler", "tracing", - "tracing-futures", -] - -[[package]] -name = "config_thrift_types" -version = "0.1.0" -dependencies = [ - "anyhow", - "codegen_includer_proc_macro", - "fbthrift", - "futures 0.3.30", - "once_cell", - "ref-cast", - "serde", - "serde_derive", - "thiserror", - "thrift_compiler", -] - -[[package]] -name = "config_types" -version = "0.1.0" -dependencies = [ - "anyhow", - "codegen_includer_proc_macro", - "fbthrift", - "futures 0.3.30", - "once_cell", - "ref-cast", - "serde", - "serde_derive", - "thiserror", - "thrift_compiler", ] [[package]] @@ -1198,6 +1751,7 @@ dependencies = [ "configset", "dirs 2.0.2", "filetime", + "gitcompat", "hgplain", "hgtime", "hostcaps", @@ -1208,10 +1762,12 @@ dependencies = [ "minibytes", "once_cell", "regex", + "repo-minimal-info", "serde", "serde_json", - "serde_urlencoded 0.7.1", - "sha2 0.10.8", + "serde_urlencoded", + "sha2", + "spawn-ext", "staticconfig", "tempfile", "testutil", @@ -1232,6 +1788,7 @@ dependencies = [ "auto_impl", "minibytes", "thiserror", + "twox-hash", "util", ] @@ -1241,7 +1798,7 @@ version = "0.1.0" dependencies = [ "configmodel", "hgrc-parser", - "indexmap 2.1.0", + "indexmap 2.2.6", "minibytes", "tempfile", "tracing", @@ -1276,15 +1833,24 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" name = "constructors" version = "0.1.0" dependencies = [ + "commits", "commits-git", "eagerepo", "edenapi", "gitstore", - "hgcommits", "manifest-tree", "once_cell", ] +[[package]] +name = "context" +version = "0.1.0" +dependencies = [ + "configmodel", + "io", + "termlogger", +] + [[package]] name = "control-point" version = "0.1.0" @@ -1300,9 +1866,9 @@ dependencies = [ [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -1311,12 +1877,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -1335,7 +1901,6 @@ dependencies = [ "async-trait", "configmodel", "dag", - "git2", "hg-metrics", "lru-cache", "manifest", @@ -1380,9 +1945,9 @@ dependencies = [ [[package]] name = "cpython" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3052106c29da7390237bc2310c1928335733b286287754ea85e6093d2495280e" +checksum = "43b398a2c65baaf5892f10bb69b52508bf7a993380cc4ecd3785aaebb5c79389" dependencies = [ "libc", "num-traits", @@ -1423,9 +1988,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] @@ -1436,11 +2001,11 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "crossbeam-channel 0.5.11", + "crossbeam-channel 0.5.13", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1454,11 +2019,11 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1468,7 +2033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ "crossbeam-epoch", - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1477,7 +2042,7 @@ version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1486,7 +2051,7 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1501,23 +2066,20 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "crossterm_winapi", "libc", - "mio", "parking_lot", - "signal-hook 0.3.17", - "signal-hook-mio", "winapi 0.3.9", ] @@ -1547,7 +2109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" dependencies = [ "lab", - "phf 0.11.2", + "phf", ] [[package]] @@ -1562,34 +2124,34 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "windows-sys 0.52.0", ] [[package]] name = "curl" -version = "0.4.44" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.10", - "winapi 0.3.9", + "socket2 0.5.7", + "windows-sys 0.52.0", ] [[package]] name = "curl-sys" -version = "0.4.70+curl-8.5.0" +version = "0.4.73+curl-8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" +checksum = "450ab250ecf17227c39afb9a2dd9261dc0035cb80f2612472fc0c4aac2dcb84d" dependencies = [ "cc", "libc", @@ -1598,14 +2160,14 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "cxx" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de00f15a6fa069c99b88c5c78c4541d0e7899a33b86f7480e23df2431fce0bc" +checksum = "273dcfd3acd4e1e276af13ed2a43eea7001318823e7a726a6b3ed39b4acc0b82" dependencies = [ "cc", "cxxbridge-flags", @@ -1615,9 +2177,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a71e1e631fa2f2f5f92e8b0d860a00c198c6771623a6cefcc863e3554f0d8d6" +checksum = "d8b2766fbd92be34e9ed143898fce6c572dc009de39506ed6903e5a05b68914e" dependencies = [ "cc", "codespan-reporting", @@ -1625,24 +2187,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "cxxbridge-flags" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3fed61d56ba497c4efef9144dfdbaa25aa58f2f6b3a7cf441d4591c583745c" +checksum = "839fcd5e43464614ffaa989eaf1c139ef1f0c51672a1ed08023307fa1b909ccd" [[package]] name = "cxxbridge-macro" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8908e380a8efd42150c017b0cfa31509fc49b6d47f7cb6b33e93ffb8f4e3661e" +checksum = "4b2c1c1776b986979be68bb2285da855f8d8a35851a769fca8740df7c3d07877" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -1651,7 +2213,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "dag-types", "dev-logger", @@ -1660,7 +2222,7 @@ dependencies = [ "fs2", "futures 0.3.30", "indexedlog", - "indexmap 2.1.0", + "indexmap 2.2.6", "mincode", "minibytes", "nonblocking", @@ -1708,7 +2270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1755,28 +2317,13 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", "subtle", ] @@ -1825,10 +2372,10 @@ name = "drawdag" version = "0.1.0" [[package]] -name = "dtoa" -version = "0.4.8" +name = "dunce" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "eagerepo" @@ -1848,6 +2395,7 @@ dependencies = [ "manifest-tree", "metalog", "minibytes", + "mutationstore", "nonblocking", "parking_lot", "storemodel", @@ -1869,7 +2417,7 @@ dependencies = [ "pretty_assertions", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "structopt", ] @@ -1950,7 +2498,6 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "blake2", "blake3", "bytes", "dag-types", @@ -1965,7 +2512,6 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "sha2 0.10.8", "thiserror", "type_macros", "types", @@ -1980,6 +2526,7 @@ dependencies = [ "clientinfo", "fbthrift_socket", "fs-err", + "hg-metrics", "identity", "serde", "thrift-types", @@ -1997,6 +2544,7 @@ dependencies = [ "async-runtime", "cxx", "cxx-build", + "fbinit", "identity", "manifest", "once_cell", @@ -2004,14 +2552,16 @@ dependencies = [ "pathmatcher", "repo", "sparse", + "stats", + "tracing", "types", ] [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -2030,23 +2580,23 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "enum_dispatch" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2080,23 +2630,33 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.2" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" dependencies = [ "serde", + "typeid", ] [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "euclid" +version = "0.22.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +dependencies = [ + "num-traits", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -2109,27 +2669,15 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "commits", "dag", "edenapi", - "hgcommits", "metalog", "refencode", "tracing", "types", ] -[[package]] -name = "extend" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "factory" version = "0.1.0" @@ -2159,6 +2707,16 @@ dependencies = [ "regex", ] +[[package]] +name = "fancy-regex" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +dependencies = [ + "bit-set", + "regex", +] + [[package]] name = "faster-hex" version = "0.6.1" @@ -2176,33 +2734,14 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#1dd3544a29690edacb8da2910cd6e788a9f6c66b" -dependencies = [ - "anyhow", - "async-trait", - "codegen_includer_proc_macro", - "const-cstr", - "fb303_core_types", - "fbthrift", - "futures 0.3.30", - "ref-cast", - "thiserror", - "thrift_compiler", - "tracing", - "tracing-futures", -] - -[[package]] -name = "fb303_core_types" -version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#1dd3544a29690edacb8da2910cd6e788a9f6c66b" +source = "git+https://github.com/facebook/fb303.git?branch=main#0fdcfa63be9071ba9ba34c59b484417f2bb7564b" dependencies = [ "anyhow", "codegen_includer_proc_macro", @@ -2216,10 +2755,25 @@ dependencies = [ "thrift_compiler", ] +[[package]] +name = "fb303_core_clients" +version = "0.0.0" +source = "git+https://github.com/facebook/fb303.git?branch=main#0fdcfa63be9071ba9ba34c59b484417f2bb7564b" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "fb303_core", + "fbthrift", + "futures 0.3.30", + "thrift_compiler", + "tracing", +] + [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "fbinit_macros", "quickcheck", @@ -2228,17 +2782,17 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#f0eefaa2734bce13d861e0182b90a98d13250f17" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" dependencies = [ "anyhow", "async-trait", @@ -2249,7 +2803,7 @@ dependencies = [ "ghost", "num-derive", "num-traits", - "ordered-float", + "ordered-float 3.9.2", "panic-message", "serde_json", "thiserror", @@ -2258,17 +2812,17 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "byteorder", "bytes", - "tokio-util 0.7.10", + "tokio-util 0.7.11", ] [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "anyhow", "bytes", @@ -2278,14 +2832,14 @@ dependencies = [ "futures 0.3.30", "tokio", "tokio-tower", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tower-service", ] [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "tokio", ] @@ -2320,7 +2874,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] @@ -2338,9 +2892,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -2354,7 +2908,7 @@ checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2529,7 +3083,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2595,9 +3149,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2612,14 +3166,14 @@ checksum = "b0e085ded9f1267c32176b40921b9754c474f7dd96f7e808d4a982e48aa1e854" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" @@ -2636,6 +3190,21 @@ dependencies = [ "url", ] +[[package]] +name = "gitcompat" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "filetime", + "fs-err", + "identity", + "spawn-ext", + "tracing", + "treestate", + "types", +] + [[package]] name = "gitdag" version = "0.1.0" @@ -2645,6 +3214,7 @@ dependencies = [ "git2", "nonblocking", "parking_lot", + "phf", "tracing", ] @@ -2654,11 +3224,16 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "configmodel", "factory", "fs-err", "git2", + "gitcompat", "minibytes", + "progress-model", + "spawn-ext", "storemodel", + "tracing", "types", ] @@ -2677,16 +3252,16 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", "serde", ] [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2694,18 +3269,18 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", ] [[package]] name = "half" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" [[package]] name = "hashbrown" @@ -2724,11 +3299,11 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "allocator-api2", ] @@ -2747,6 +3322,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2758,9 +3339,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2791,114 +3372,6 @@ dependencies = [ "parking_lot", ] -[[package]] -name = "hgcommands" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-runtime", - "atexit", - "bindings", - "blackbox", - "checkout", - "chrono", - "clidispatch", - "cliparser", - "clone", - "comfy-table", - "commandserver", - "configloader", - "configmodel", - "constructors", - "cpython", - "cpython_ext", - "ctrlc", - "dag", - "debugtop", - "eagerepo", - "edenapi", - "edenfs-client", - "exchange", - "fail", - "flate2", - "formatter", - "fs-err", - "fsyncglob", - "hg-http", - "hg-metrics", - "hgplain", - "hgtime", - "hostname 0.3.1", - "identity", - "indexedlog", - "libc", - "metalog", - "metrics-render", - "migration", - "mincode", - "minibytes", - "network-doctor", - "nodeipc", - "parking_lot", - "pathmatcher", - "procinfo", - "progress-model", - "progress-render", - "pycheckout", - "pyconfigloader", - "pyedenclient", - "pyio", - "pymodules", - "python3-sys", - "pytracing", - "pyworkingcopy", - "rand 0.8.5", - "repo", - "repo_name", - "repostate", - "revisionstore", - "runlog", - "sampling", - "serde", - "serde_json", - "status", - "termstyle", - "tracing", - "tracing-collector", - "tracing-reload", - "tracing-sampler", - "tracing-subscriber", - "treestate", - "types", - "url", - "util", - "version", - "workingcopy", - "zstd", -] - -[[package]] -name = "hgcommits" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "commits-trait", - "dag", - "edenapi", - "factory", - "fs-err", - "futures 0.3.30", - "minibytes", - "parking_lot", - "revlogindex", - "storemodel", - "streams", - "tracing", - "types", - "zstore", -] - [[package]] name = "hgmain" version = "0.1.0" @@ -2906,10 +3379,10 @@ dependencies = [ "anyhow", "atexit", "clidispatch", + "commands", "configloader", "dirs 2.0.2", "encoding", - "hgcommands", "identity", "libc", "pyblackbox", @@ -2955,10 +3428,24 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "hook" +version = "0.1.0" +dependencies = [ + "anyhow", + "clientinfo", + "configmodel", + "identity", + "io", + "minibytes", + "spawn-ext", + "tracing", +] + [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "once_cell", ] @@ -2966,7 +3453,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2985,13 +3472,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.10", + "itoa", ] [[package]] @@ -3036,7 +3523,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", "url", "zstd", @@ -3044,9 +3531,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -3062,9 +3549,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3075,9 +3562,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.10", + "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -3113,9 +3600,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3146,17 +3633,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.3.0" @@ -3187,7 +3663,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -3244,29 +3720,30 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "rayon", "serde", ] [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", + "globset", "lazy_static", "linked-hash-map", "serde", "similar", - "yaml-rust", + "walkdir", ] [[package]] @@ -3278,9 +3755,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] @@ -3294,8 +3771,10 @@ dependencies = [ "once_cell", "parking_lot", "pipe", + "spawn-ext", "streampager", "terminal_size 0.3.0", + "termios", "termwiz", "time-interval", ] @@ -3306,7 +3785,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -3328,12 +3807,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.4", - "rustix 0.38.30", + "hermit-abi 0.3.9", + "libc", "windows-sys 0.52.0", ] @@ -3347,6 +3826,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.11.0" @@ -3358,30 +3843,35 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] +[[package]] +name = "journal" +version = "0.1.0" +dependencies = [ + "anyhow", + "hgtime", + "repolock", + "types", + "util", +] + [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3404,9 +3894,9 @@ checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazystr" @@ -3427,9 +3917,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" @@ -3447,9 +3937,9 @@ dependencies = [ [[package]] name = "libnghttp2-sys" -version = "0.1.9+1.58.0" +version = "0.1.10+1.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64" +checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135" dependencies = [ "cc", "libc", @@ -3457,13 +3947,12 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", - "redox_syscall", ] [[package]] @@ -3482,9 +3971,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.14" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -3492,15 +3981,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linelog" version = "0.1.0" @@ -3532,9 +4012,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "local-encoding" @@ -3549,9 +4029,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3559,20 +4039,20 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] [[package]] name = "lru" -version = "0.11.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -3597,14 +4077,24 @@ dependencies = [ [[package]] name = "lz4-sys" -version = "1.9.4" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" dependencies = [ "cc", "libc", ] +[[package]] +name = "mac_address" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8836fae9d0d4be2c8b4efcdd79e828a2faa058a90d005abf42f91cac5493a08e" +dependencies = [ + "nix 0.28.0", + "winapi 0.3.9", +] + [[package]] name = "manifest" version = "0.1.0" @@ -3612,7 +4102,6 @@ dependencies = [ "anyhow", "pathmatcher", "quickcheck", - "quickcheck_arbitrary_derive", "types", ] @@ -3661,17 +4150,11 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3690,18 +4173,18 @@ checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -3720,6 +4203,7 @@ dependencies = [ "quickcheck", "rand_chacha 0.3.1", "rand_core 0.6.4", + "refencode", "serde", "serde_json", "tempfile", @@ -3763,9 +4247,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -3806,24 +4290,30 @@ dependencies = [ ] [[package]] -name = "miniz_oxide" -version = "0.7.1" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3837,26 +4327,27 @@ dependencies = [ "identity", "libc", "serde", - "sha2 0.10.8", + "sha2", "toml", ] [[package]] name = "mockito" -version = "0.25.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3ae325bcceb48a24302ac57e1055f9173f5fd53be535603ea0ed41dea92db5" +checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e" dependencies = [ "assert-json-diff", "colored", - "difference", - "httparse", - "lazy_static", + "futures-core", + "hyper", "log", - "rand 0.7.3", + "rand 0.8.5", "regex", "serde_json", - "serde_urlencoded 0.6.1", + "serde_urlencoded", + "similar", + "tokio", ] [[package]] @@ -3879,7 +4370,7 @@ name = "mutationstore" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.4.2", + "bitflags 2.6.0", "dag", "drawdag", "futures 0.3.30", @@ -3893,11 +4384,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -3927,25 +4417,28 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", + "pin-utils", ] [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if 1.0.0", + "cfg_aliases", "libc", + "memoffset 0.9.1", ] [[package]] @@ -3980,12 +4473,12 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.3" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", - "version_check", + "minimal-lexical", ] [[package]] @@ -4007,15 +4500,20 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -4029,19 +4527,18 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -4052,24 +4549,24 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -4080,12 +4577,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "open" version = "4.2.0" @@ -4099,11 +4590,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4120,7 +4611,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -4131,9 +4622,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -4152,6 +4643,15 @@ dependencies = [ "serde", ] +[[package]] +name = "ordered-float" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-multimap" version = "0.3.1" @@ -4188,9 +4688,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4198,22 +4698,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -4244,8 +4744,8 @@ name = "pathmatcher" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.4.2", - "fancy-regex", + "bitflags 2.6.0", + "fancy-regex 0.10.0", "fs-err", "glob", "globset", @@ -4261,11 +4761,11 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "serde", ] @@ -4278,13 +4778,13 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "perthread" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" [[package]] name = "pest" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -4293,9 +4793,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd6ab1236bbdb3a49027e920e693192ebfe8913f6d60e294de57463a493cfde" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -4303,35 +4803,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "pest_meta" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ff62f5259e53b78d1af898941cdcdccfae7385cf7d793a6e55de5d05bb4b7d" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", - "sha2 0.10.8", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", + "sha2", ] [[package]] @@ -4341,7 +4832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.2", + "phf_shared", ] [[package]] @@ -4351,7 +4842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared 0.11.2", + "phf_shared", ] [[package]] @@ -4360,7 +4851,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.2", + "phf_shared", "rand 0.8.5", ] @@ -4371,19 +4862,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared 0.11.2", + "phf_shared", "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", + "syn 2.0.72", ] [[package]] @@ -4406,11 +4888,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "pin-project-internal 1.1.3", + "pin-project-internal 1.1.5", ] [[package]] @@ -4426,20 +4908,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4458,19 +4940,18 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", - "indexmap 2.1.0", - "line-wrap", + "base64 0.22.1", + "indexmap 2.2.6", "quick-xml", "serde", "time", @@ -4548,9 +5029,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4750,9 +5231,22 @@ dependencies = [ "configloader", "cpython", "cpython_ext", + "repo-minimal-info", "util", ] +[[package]] +name = "pycontext" +version = "0.1.0" +dependencies = [ + "configset", + "context", + "cpython", + "cpython_ext", + "io", + "pyconfigloader", +] + [[package]] name = "pycopytrace" version = "0.1.0" @@ -4763,9 +5257,8 @@ dependencies = [ "cpython", "cpython_ext", "dag", - "parking_lot", + "pypathmatcher", "storemodel", - "types", ] [[package]] @@ -4774,17 +5267,19 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "commits", + "configmodel", "cpython", "cpython_ext", "dag", "futures 0.3.30", - "hgcommits", "minibytes", "parking_lot", "pyedenapi", "pyio", "pymetalog", "storemodel", + "types", ] [[package]] @@ -4855,16 +5350,7 @@ dependencies = [ "pyconfigloader", "pyrevisionstore", "revisionstore", - "types", -] - -[[package]] -name = "pyedenclient" -version = "0.1.0" -dependencies = [ - "cpython", - "cpython_ext", - "edenfs-client", + "sha1", "types", ] @@ -4873,6 +5359,7 @@ name = "pyerror" version = "0.1.0" dependencies = [ "auth", + "checkout", "configmodel", "cpython", "cpython_ext", @@ -4921,14 +5408,28 @@ dependencies = [ "fsinfo", ] +[[package]] +name = "pygitcompat" +version = "0.1.0" +dependencies = [ + "configmodel", + "cpython", + "cpython_ext", + "gitcompat", + "pyprocess", + "types", +] + [[package]] name = "pygitstore" version = "0.1.0" dependencies = [ + "configmodel", "cpython", "cpython_ext", "gitstore", "storemodel", + "types", ] [[package]] @@ -4980,6 +5481,17 @@ dependencies = [ "termstyle", ] +[[package]] +name = "pyjournal" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "hgtime", + "journal", + "types", +] + [[package]] name = "pylinelog" version = "0.1.0" @@ -5039,6 +5551,7 @@ dependencies = [ "minibytes", "pybytes", "python-modules", + "tracing", ] [[package]] @@ -5165,7 +5678,9 @@ dependencies = [ name = "pyrepo" version = "0.1.0" dependencies = [ + "checkout", "configmodel", + "context", "cpython", "cpython_ext", "parking_lot", @@ -5179,6 +5694,7 @@ dependencies = [ "repo", "repolock", "revisionstore", + "types", "util", "workingcopy", ] @@ -5238,15 +5754,15 @@ version = "0.1.0" dependencies = [ "codegen", "once_cell", - "phf 0.11.2", + "phf", "zstdelta", ] [[package]] name = "python3-sys" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f8b50d72fb3015735aa403eebf19bbd72c093bfeeae24ee798be5f2f1aab52" +checksum = "0f53ef6740367a09718d2cd21ba15b0d7972342a38e554736bcee7773e45c9f5" dependencies = [ "libc", "regex", @@ -5352,20 +5868,29 @@ name = "pyworkingcopy" version = "0.1.0" dependencies = [ "anyhow", + "context", "cpython", "cpython_ext", "fs-err", - "io", "parking_lot", "pathmatcher", - "pyconfigloader", - "pyedenclient", "pypathmatcher", "pystatus", "pytreestate", + "pyworkingcopyclient", "repostate", "sparse", - "termlogger", + "types", + "workingcopy", +] + +[[package]] +name = "pyworkingcopyclient" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "edenfs-client", "types", "workingcopy", ] @@ -5401,9 +5926,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] @@ -5422,12 +5947,12 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "proc-macro2", "quickcheck", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -5443,9 +5968,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -5549,7 +6074,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "serde", ] @@ -5573,9 +6098,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -5588,7 +6113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -5610,34 +6135,43 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "getrandom 0.2.12", + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom 0.2.15", "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -5649,14 +6183,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -5681,13 +6215,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] @@ -5704,9 +6238,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "remove_dir_all" @@ -5721,7 +6255,7 @@ dependencies = [ name = "renderdag" version = "0.1.0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "dag", "itertools", "nonblocking", @@ -5750,6 +6284,7 @@ dependencies = [ "once_cell", "parking_lot", "refencode", + "repo-minimal-info", "repolock", "revisionstore", "revsets", @@ -5763,6 +6298,19 @@ dependencies = [ "workingcopy", ] +[[package]] +name = "repo-minimal-info" +version = "0.1.0" +dependencies = [ + "anyhow", + "fs-err", + "gitcompat", + "identity", + "phf", + "tempfile", + "util", +] + [[package]] name = "repo_name" version = "0.1.0" @@ -5780,6 +6328,7 @@ dependencies = [ "fs-err", "fs2", "parking_lot", + "progress-model", "tempfile", "thiserror", "tracing", @@ -5803,9 +6352,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", @@ -5834,12 +6383,13 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tower-service", "url", "wasm-bindgen", @@ -5877,6 +6427,7 @@ dependencies = [ "http", "http-client", "indexedlog", + "itertools", "lfs_protocol", "lz4-pyframe", "manifest-tree", @@ -5900,7 +6451,7 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "sha2 0.10.8", + "sha2", "stats", "storemodel", "tempfile", @@ -5956,6 +6507,7 @@ dependencies = [ "configmodel", "dag", "edenapi", + "hgplain", "metalog", "refencode", "thiserror", @@ -5963,18 +6515,40 @@ dependencies = [ "types", ] +[[package]] +name = "rewrite-macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "tree-pattern-match", +] + +[[package]] +name = "rich-cas-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cas-client", + "configmodel", + "fbinit", + "types", +] + [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.12", + "cfg-if 1.0.0", + "getrandom 0.2.15", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6009,9 +6583,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" @@ -6029,22 +6603,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -6085,21 +6659,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -6146,6 +6714,38 @@ dependencies = [ "toml", ] +[[package]] +name = "scope" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + +[[package]] +name = "scope_clients" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "scope", + "thrift_compiler", + "tracing", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -6170,11 +6770,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6183,9 +6783,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -6211,9 +6811,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -6224,8 +6824,8 @@ version = "0.1.0" [[package]] name = "serde_bser" -version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#d52738785ded4c290fb08adcb244e4c34ef1ffdd" +version = "0.4.0" +source = "git+https://github.com/facebook/watchman.git?branch=main#b53ca70cc37496cfd5924eacf2cef8a271ee6ae9" dependencies = [ "anyhow", "byteorder", @@ -6237,9 +6837,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] @@ -6256,13 +6856,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -6276,36 +6876,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "itoa 1.0.10", + "itoa", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde", - "url", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -6313,7 +6901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.10", + "itoa", "ryu", "serde", ] @@ -6326,27 +6914,14 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -6356,7 +6931,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -6368,6 +6943,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shell-escape" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" + [[package]] name = "shellexpand" version = "2.1.2" @@ -6379,19 +6960,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[package]] -name = "signal-hook" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" -dependencies = [ - "libc", - "signal-hook-registry", -] +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" @@ -6403,31 +6974,20 @@ dependencies = [ "signal-hook-registry", ] -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook 0.3.17", -] - [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] name = "similar" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simple_asn1" @@ -6478,9 +7038,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -6494,18 +7054,18 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "sorted_vector_map" -version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +version = "0.2.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "itertools", "quickcheck", @@ -6521,7 +7081,7 @@ dependencies = [ "once_cell", "pathmatcher", "regex", - "syncify", + "rewrite-macros", "thiserror", "tokio", "tracing", @@ -6534,6 +7094,7 @@ version = "0.1.0" dependencies = [ "libc", "tempfile", + "tracing", "winapi 0.3.9", ] @@ -6554,7 +7115,7 @@ name = "staticconfig" version = "0.1.0" dependencies = [ "configmodel", - "phf 0.11.2", + "phf", "staticconfig_macros", ] @@ -6563,13 +7124,13 @@ name = "staticconfig_macros" version = "0.1.0" dependencies = [ "hgrc-parser", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] name = "stats" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "fbinit", "futures 0.3.30", @@ -6583,7 +7144,7 @@ dependencies = [ [[package]] name = "stats_traits" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "auto_impl", "dashmap", @@ -6608,8 +7169,10 @@ dependencies = [ "edenapi_types", "factory", "futures 0.3.30", + "metalog", "minibytes", "once_cell", + "parking_lot", "serde", "types", ] @@ -6621,7 +7184,7 @@ dependencies = [ "bit-set", "dirs 2.0.2", "enum_dispatch", - "indexmap 2.1.0", + "indexmap 2.2.6", "lazy_static", "lru", "memmap2", @@ -6662,6 +7225,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "structopt" version = "0.3.26" @@ -6688,40 +7257,40 @@ dependencies = [ [[package]] name = "strum" -version = "0.24.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sval" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1604e9ab506f4805bc62d2868c6d20f23fa6ced4c7cfe695a1d20589ba5c63d0" +checksum = "53eb957fbc79a55306d5d25d87daf3627bc3800681491cda0709eef36c748bfe" [[package]] name = "sval_buffer" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2831b6451148d344f612016d4277348f7721b78a0869a145fd34ef8b06b3fa2e" +checksum = "96e860aef60e9cbf37888d4953a13445abf523c534640d1f6174d310917c410d" dependencies = [ "sval", "sval_ref", @@ -6729,40 +7298,40 @@ dependencies = [ [[package]] name = "sval_dynamic" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ac5832a23099a413ffd22e66f7e6248b9af4581b64c758ca591074be059fc" +checksum = "ea3f2b07929a1127d204ed7cb3905049381708245727680e9139dac317ed556f" dependencies = [ "sval", ] [[package]] name = "sval_fmt" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8474862431bac5ac7aee8a12597798e944df33f489c340e17e886767bda0c4e" +checksum = "c4e188677497de274a1367c4bda15bd2296de4070d91729aac8f0a09c1abf64d" dependencies = [ - "itoa 1.0.10", + "itoa", "ryu", "sval", ] [[package]] name = "sval_json" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f348030cc3d2a11eb534145600601f080cf16bf9ec0783efecd2883f14c21e" +checksum = "32f456c07dae652744781f2245d5e3b78e6a9ebad70790ac11eb15dbdbce5282" dependencies = [ - "itoa 1.0.10", + "itoa", "ryu", "sval", ] [[package]] name = "sval_nested" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6659c3f6be1e5e99dc7c518877f48a8a39088ace2504b046db789bd78ce5969d" +checksum = "886feb24709f0476baaebbf9ac10671a50163caa7e439d7a7beb7f6d81d0a6fb" dependencies = [ "sval", "sval_buffer", @@ -6771,18 +7340,18 @@ dependencies = [ [[package]] name = "sval_ref" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829ad319bd82d0da77be6f3d547623686c453502f8eebdeb466cfa987972bd28" +checksum = "be2e7fc517d778f44f8cb64140afa36010999565528d48985f55e64d45f369ce" dependencies = [ "sval", ] [[package]] name = "sval_serde" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9da6c3efaedf8b8c0861ec5343e8e8c51d838f326478623328bd8728b79bca" +checksum = "79bf66549a997ff35cd2114a27ac4b0c2843280f2cfa84b240d169ecaa0add46" dependencies = [ "serde", "sval", @@ -6802,9 +7371,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -6812,11 +7381,10 @@ dependencies = [ ] [[package]] -name = "syncify" -version = "0.1.0" -dependencies = [ - "tree-pattern-match", -] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "synstructure" @@ -6830,10 +7398,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "system-command" -version = "0.1.0" - [[package]] name = "system-configuration" version = "0.5.1" @@ -6867,14 +7431,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.30", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -6903,20 +7466,20 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "terminfo" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" +checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" dependencies = [ "dirs 4.0.0", "fnv", "nom", - "phf 0.11.2", + "phf", "phf_codegen", ] @@ -6952,15 +7515,15 @@ dependencies = [ [[package]] name = "termwiz" -version = "0.18.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e302bfaa2555ca7fb55eee19051ad43e510153b19cb880d6da5acb65a72ab9" +checksum = "5a75313e21da5d4406ea31402035b3b97aa74c04356bdfafa5d1043ab4e551d1" dependencies = [ "anyhow", - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.7", + "bitflags 2.6.0", "cassowary", - "cfg-if 1.0.0", + "fancy-regex 0.11.0", "filedescriptor 0.8.2", "finl_unicode", "fixedbitset", @@ -6970,18 +7533,18 @@ dependencies = [ "libc", "log", "memmem", - "nix 0.24.3", + "nix 0.26.4", "num-derive", "num-traits", - "ordered-float", + "ordered-float 4.2.1", "pest", "pest_derive", - "phf 0.10.1", - "regex", + "phf", "semver", - "sha2 0.9.9", - "signal-hook 0.1.17", + "sha2", + "signal-hook", "siphasher", + "tempfile", "terminfo", "termios", "thiserror", @@ -6989,8 +7552,10 @@ dependencies = [ "unicode-segmentation", "vtparse", "wezterm-bidi", + "wezterm-blob-leases", "wezterm-color-types", "wezterm-dynamic", + "wezterm-input-types", "winapi 0.3.9", ] @@ -7013,39 +7578,51 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "terminal_size 0.2.6", "unicode-width", ] +[[package]] +name = "thin-cas-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cas-client", + "configmodel", + "fbinit", + "types", +] + [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -7053,52 +7630,24 @@ dependencies = [ [[package]] name = "thrift" -version = "0.1.0" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" dependencies = [ "anyhow", - "async-trait", "codegen_includer_proc_macro", - "config_thrift", - "const-cstr", - "fb303_core", "fbthrift", "futures 0.3.30", + "once_cell", "ref-cast", - "sorted_vector_map", + "scope", + "serde", + "serde_derive", "thiserror", "thrift_compiler", - "thrift_types", - "tracing", - "tracing-futures", ] [[package]] -name = "thrift-types" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "config_thrift", - "fb303_core", - "fbthrift", - "futures 0.3.30", - "thiserror", - "thrift", -] - -[[package]] -name = "thrift_compiler" -version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" -dependencies = [ - "anyhow", - "clap 4.4.18", - "serde", - "which", -] - -[[package]] -name = "thrift_types" +name = "thrift" version = "0.1.0" dependencies = [ "anyhow", @@ -7113,18 +7662,85 @@ dependencies = [ "serde_derive", "sorted_vector_map", "thiserror", + "thrift 0.0.1+unstable", "thrift_compiler", ] +[[package]] +name = "thrift-types" +version = "0.1.0" +dependencies = [ + "anyhow", + "config", + "config_thrift", + "fb303_core", + "fbthrift", + "futures 0.3.30", + "thiserror", + "thrift 0.1.0", + "thrift_clients 0.1.0", +] + +[[package]] +name = "thrift_clients" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "scope", + "scope_clients", + "thrift 0.0.1+unstable", + "thrift_compiler", + "tracing", +] + +[[package]] +name = "thrift_clients" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "config_thrift", + "config_thrift_clients", + "const-cstr", + "fb303_core", + "fb303_core_clients", + "fbthrift", + "futures 0.3.30", + "thrift 0.0.1+unstable", + "thrift 0.1.0", + "thrift_clients 0.0.1+unstable", + "thrift_compiler", + "tracing", +] + +[[package]] +name = "thrift_compiler" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" +dependencies = [ + "anyhow", + "clap 4.5.11", + "dunce", + "serde", + "which", +] + [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.10", + "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -7144,10 +7760,11 @@ version = "0.1.0" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -7163,9 +7780,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7178,33 +7795,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -7229,14 +7845,14 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", ] [[package]] @@ -7249,7 +7865,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "pin-project 1.1.3", + "pin-project 1.1.5", "tokio", "tower", "tower-service", @@ -7259,7 +7875,7 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "async-io", "futures 0.3.30", @@ -7286,27 +7902,26 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "pin-project-lite", "slab", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c" dependencies = [ "serde", "serde_spanned", @@ -7316,20 +7931,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -7390,14 +8005,14 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "tracing-collector" version = "0.1.0" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "libc", "parking_lot", "serde", @@ -7417,18 +8032,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "futures 0.3.30", - "futures-task", - "pin-project 1.1.3", - "tracing", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -7507,11 +8110,10 @@ dependencies = [ [[package]] name = "tracing-test" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" +checksum = "557b891436fe0d5e0e363427fc7f217abf9ccd510d5136549847bdcbcd011d68" dependencies = [ - "lazy_static", "tracing-core", "tracing-subscriber", "tracing-test-macro", @@ -7519,18 +8121,20 @@ dependencies = [ [[package]] name = "tracing-test-macro" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" +checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ - "lazy_static", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "tree-pattern-match" version = "0.1.0" +dependencies = [ + "bitflags 2.6.0", +] [[package]] name = "treestate" @@ -7538,7 +8142,7 @@ version = "0.1.0" dependencies = [ "anyhow", "atomicfile", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "fs-err", "fs2", @@ -7549,7 +8153,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "repolock", - "sha2 0.10.8", + "sha2", "tempfile", "thiserror", "tracing", @@ -7586,6 +8190,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + [[package]] name = "typenum" version = "1.17.0" @@ -7597,8 +8207,13 @@ name = "types" version = "0.1.0" dependencies = [ "anyhow", + "assert_matches", + "base64 0.13.1", + "bitflags 2.6.0", + "blake3", "byteorder", "lazy_static", + "minibytes", "quickcheck", "quickcheck_arbitrary_derive", "rand 0.8.5", @@ -7626,7 +8241,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "tempfile", "winapi 0.3.9", ] @@ -7665,24 +8280,24 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -7695,7 +8310,7 @@ name = "unionconfig" version = "0.1.0" dependencies = [ "configmodel", - "indexmap 2.1.0", + "indexmap 2.2.6", "staticconfig", ] @@ -7707,9 +8322,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -7718,9 +8333,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" @@ -7731,12 +8346,12 @@ dependencies = [ "dirs 2.0.2", "fn-error-context", "fs2", - "hostname 0.3.1", "lazystr", "libc", "memmap2", "once_cell", "rand 0.8.5", + "shell-escape", "shellexpand", "tempfile", "thiserror", @@ -7746,12 +8361,12 @@ dependencies = [ [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "atomic", - "getrandom 0.2.12", + "getrandom 0.2.15", "serde", "sha1_smol", ] @@ -7764,9 +8379,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cdbaf5e132e593e9fc1de6a15bbec912395b11fb9719e061cf64f804524c503" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -7774,9 +8389,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92cad98b1b18d06b6f38b3cd04347a9d7a3a0111441a061f71377fb6740437e4" +checksum = "ccacf50c5cb077a9abb723c5bcb5e0754c1a433f1e1de89edc328e2760b6328b" dependencies = [ "erased-serde", "serde", @@ -7785,9 +8400,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc7271d6b3bf58dd2e610a601c0e159f271ffdb7fbb21517c40b52138d64f8e" +checksum = "1785bae486022dfb9703915d42287dcb284c1ee37bd1080eeba78cc04721285b" dependencies = [ "sval", "sval_buffer", @@ -7816,9 +8431,9 @@ version = "0.1.0" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vfs" @@ -7864,15 +8479,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -7900,10 +8515,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.90" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7911,24 +8532,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7938,9 +8559,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7948,28 +8569,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -7980,8 +8601,8 @@ dependencies = [ [[package]] name = "watchman_client" -version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#d52738785ded4c290fb08adcb244e4c34ef1ffdd" +version = "0.9.0" +source = "git+https://github.com/facebook/watchman.git?branch=main#b53ca70cc37496cfd5924eacf2cef8a271ee6ae9" dependencies = [ "anyhow", "bytes", @@ -7997,9 +8618,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -8007,9 +8628,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webview-app" @@ -8036,19 +8657,33 @@ dependencies = [ [[package]] name = "wezterm-bidi" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1560382cf39b0fa92473eae4d5b3772f88c63202cbf5a72c35db72ba99e66c36" +checksum = "0c0a6e355560527dd2d1cf7890652f4f09bb3433b6aadade4c9b5ed76de5f3ec" dependencies = [ "log", "wezterm-dynamic", ] [[package]] -name = "wezterm-color-types" -version = "0.2.0" +name = "wezterm-blob-leases" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6e7a483dd2785ba72705c51e8b1be18300302db2a78368dac9bc8773857777" +checksum = "8e5a5e0adf7eed68976410def849a4bdab6f6e9f6163f152de9cb89deea9e60b" +dependencies = [ + "getrandom 0.2.15", + "mac_address", + "once_cell", + "sha2", + "thiserror", + "uuid", +] + +[[package]] +name = "wezterm-color-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de81ef35c9010270d63772bebef2f2d6d1f2d20a983d27505ac850b8c4b4296" dependencies = [ "csscolorparser", "deltae", @@ -8058,12 +8693,12 @@ dependencies = [ [[package]] name = "wezterm-dynamic" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa" +checksum = "dfb128bacfa86734e07681fb6068e34c144698e84ee022d6e009145d1abb77b5" dependencies = [ "log", - "ordered-float", + "ordered-float 4.2.1", "strsim 0.10.0", "thiserror", "wezterm-dynamic-derive", @@ -8080,6 +8715,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "wezterm-input-types" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7012add459f951456ec9d6c7e6fc340b1ce15d6fc9629f8c42853412c029e57e" +dependencies = [ + "bitflags 1.3.2", + "euclid", + "lazy_static", + "wezterm-dynamic", +] + [[package]] name = "which" version = "4.4.2" @@ -8089,14 +8736,25 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.30", + "rustix 0.38.34", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", + "web-sys", ] [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -8128,11 +8786,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -8147,7 +8805,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -8165,7 +8823,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -8185,17 +8843,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -8206,9 +8865,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -8218,9 +8877,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -8230,9 +8889,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -8242,9 +8907,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -8254,9 +8919,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -8266,9 +8931,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -8278,15 +8943,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.34" +version = "0.6.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" dependencies = [ "memchr", ] @@ -8308,19 +8973,24 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "bitflags 2.4.2", + "bitflags 2.6.0", "configloader", "configmodel", + "context", "crossbeam", "edenfs-client", "fs-err", + "gitcompat", "hgtime", "identity", + "journal", "manifest", "manifest-tree", + "once_cell", "parking_lot", "pathmatcher", "progress-model", + "regex", "repolock", "repostate", "serde", @@ -8338,6 +9008,7 @@ dependencies = [ "util", "vfs", "watchman_client", + "whoami", ] [[package]] @@ -8355,15 +9026,6 @@ dependencies = [ "cc", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yansi" version = "0.5.1" @@ -8372,47 +9034,47 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 714cd4e67e2c..f1536e8c54b2 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -47,7 +47,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-uzev4x9jY6foop35z4dvUMIfjRtRqhNFDVFpagOosAc"; + hash = "sha256-4pOpJ91esTSH90MvvMu74CnlLULLUawqxcniUeqnLwA="; }; addonsSrc = "${src}/addons"; @@ -55,7 +55,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-3JFrVk78EiNVLLXkCFbuRnXwYHNfVv1pBPBS1yCHtPU"; + sha256 = "sha256-jCtrflwDrwql6rY1ff1eXLKdwmnXhg5bCJPlCczBCIk="; }; # Builds the NodeJS server that runs with `sl web` @@ -78,11 +78,11 @@ let yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress patchShebangs node_modules + patchShebangs isl/node_modules + + substituteInPlace build-tar.py \ + --replace-fail 'run(yarn + ["--cwd", src_join(), "install", "--prefer-offline"])' 'pass' - # TODO: build-tar.py tries to run 'yarn install'. We patched - # shebangs node_modules, so we don't want 'yarn install' - # changing files. We should disable the 'yarn install' in - # build-tar.py to be safe. ${python3Packages.python}/bin/python3 build-tar.py \ --output isl-dist.tar.xz \ --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' @@ -112,10 +112,10 @@ python3Packages.buildPythonApplication { lockFile = ./Cargo.lock; outputHashes = { "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-mzAqjM8qovZAd4ZF0GDuD0Ns/UztAO1pAJhukuKc5a0="; - "fb303_core-0.0.0" = "sha256-x8I0Lty+sRclpkNMqTMc29J46z/vMsVwOUS3EX7Shes="; - "fbthrift-0.0.1+unstable" = "sha256-yTS1wkh8tETZ4K43V0G+TbkN5jgSlXT0endDPBHa1Ps="; - "serde_bser-0.3.1" = "sha256-vvMCa6mlcr+xazxZVl2bcF8/r+ufzZmiQ79KofZGWrA="; + "cloned-0.1.0" = "sha256-2BaNR/pQmR7pHtRf6VBQLcZgLHbj2JCxeX4auAB0efU="; + "fb303_core-0.0.0" = "sha256-PDGdKjR6KPv1uH1JSTeoG5Rs0ZkmNJLqqSXtvV3RWic="; + "fbthrift-0.0.1+unstable" = "sha256-J4REXGuLjHyN3SHilSWhMoqpRcn1QnEtsTsZF4Z3feU="; + "serde_bser-0.4.0" = "sha256-Su1IP3NzQu/87p/+uQaG8JcICL9hit3OV1O9oFiACsQ="; }; }; postPatch = '' diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index adad0c94afbe..ed3c327ecfbd 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -1,5 +1,5 @@ { "links": [], - "version": "0.2.20240116-133042+8acecb66", - "versionHash": "11094621090461381576" + "version": "0.2.20240718-145624+f4e9df48", + "versionHash": "7014953821350190751" } From 7a85d2680e475a88c155cc5704f99400d23b0974 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 06:00:27 +0000 Subject: [PATCH 192/193] python312Packages.mkdocstrings: 0.25.1 -> 0.25.2 --- pkgs/development/python-modules/mkdocstrings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 011442e70f2a..b15b9a728d1f 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.25.1"; + version = "0.25.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-Z4mX6EXEFmNd/CNa39hN9mwJSv9OkqwEmWMzJ9r+EBM="; + hash = "sha256-720qF1t/xl2voOMtkOR7U3lFXia4nI0VirgEFHpb39k="; }; postPatch = '' From 8116f5caa2c6eac1efdf2c3163b1816a1eacc1a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 06:32:37 +0000 Subject: [PATCH 193/193] python312Packages.apprise: 1.8.0 -> 1.8.1 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index e079703d17a0..76396668aec9 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6PWM6/6ho09WnLTGiAmjF1voDsBvCi7Ec1IrkgIyEsU="; + hash = "sha256-CKIP5yZyt+kPeWnVuHnWV8Li2zhaiowQ9Uy6VlvyN/I="; }; nativeBuildInputs = [ installShellFiles ];