From ea8378fb8e5c5989b9d0980d89bc978ae6db2d87 Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 31 Oct 2023 18:30:28 +0000 Subject: [PATCH 001/233] thorium-browser: init at 120.0.6099.235 Co-authored-by: rgri --- pkgs/by-name/th/thorium-browser/package.nix | 173 ++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 pkgs/by-name/th/thorium-browser/package.nix diff --git a/pkgs/by-name/th/thorium-browser/package.nix b/pkgs/by-name/th/thorium-browser/package.nix new file mode 100644 index 000000000000..15d3d687ce57 --- /dev/null +++ b/pkgs/by-name/th/thorium-browser/package.nix @@ -0,0 +1,173 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + dpkg, + wrapGAppsHook, + alsa-lib, + at-spi2-atk, + at-spi2-core, + cairo, + cups, + curl, + dbus, + expat, + ffmpeg, + fontconfig, + freetype, + glib, + glibc, + gtk3, + gtk4, + libcanberra, + liberation_ttf, + libexif, + libglvnd, + libkrb5, + libnotify, + libpulseaudio, + libu2f-host, + libva, + libxkbcommon, + mesa, + nspr, + nss, + pango, + pciutils, + pipewire, + qt6, + speechd, + systemd, + udev, + _7zz, + vaapiVdpau, + vulkan-loader, + wayland, + wget, + xdg-utils, + xfce, + xorg, +}: +stdenv.mkDerivation rec { + pname = "thorium-browser"; + version = "120.0.6099.235"; + + src = fetchurl { + url = "https://github.com/Alex313031/thorium/releases/download/M${version}/thorium-browser_${version}_amd64.deb"; + hash = "sha256-UQqYXlkjXuZ3Vkcie0SNp4AMnBjemavW2G7dKGTxVAc="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + wrapGAppsHook + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + at-spi2-atk + at-spi2-core + cairo + cups + curl + dbus + expat + ffmpeg + fontconfig + freetype + glib + glibc + gtk3 + gtk4 + libcanberra + liberation_ttf + libexif + libglvnd + libkrb5 + libnotify + libpulseaudio + libu2f-host + libva + libxkbcommon + mesa + nspr + nss + qt6.qtbase + pango + pciutils + pipewire + speechd + udev + _7zz + vaapiVdpau + vulkan-loader + wayland + wget + xdg-utils + xfce.exo + xorg.libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXxf86vm + ]; + + # Needed to make the process get past zygote_linux fork()'ing + runtimeDependencies = [ + systemd + ]; + + autoPatchelfIgnoreMissingDeps = [ + "libQt5Widgets.so.5" + "libQt5Gui.so.5" + "libQt5Core.so.5" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -vr usr/* $out + cp -vr etc $out + cp -vr opt $out + ln -sf $out/opt/chromium.org/thorium/thorium-browser $out/bin/thorium-browser + substituteInPlace $out/share/applications/thorium-shell.desktop \ + --replace /usr/bin $out/bin \ + --replace /opt $out/opt + substituteInPlace $out/share/applications/thorium-browser.desktop \ + --replace /usr/bin $out/bin \ + --replace StartupWMClass=thorium StartupWMClass=thorium-browser \ + --replace Icon=thorium-browser Icon=$out/opt/chromium.org/thorium/product_logo_256.png + addAutoPatchelfSearchPath $out/chromium.org/thorium + addAutoPatchelfSearchPath $out/chromium.org/thorium/lib + substituteInPlace $out/opt/chromium.org/thorium/thorium-browser \ + --replace 'export LD_LIBRARY_PATH' "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${lib.makeLibraryPath buildInputs}:$out/chromium.org/thorium:$out/chromium.org/thorium/lib" + makeWrapper "$out/opt/chromium.org/thorium/thorium-browser" "$out/bin/thorium-browser" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + runHook postInstall + ''; + + postPatchMkspecs = '' + substituteInPlace $out/bin/..thorium-shell-wrapped-wrapped \ + --replace /opt $out/opt + ''; + + meta = with lib; { + description = "Compiler-optimized Chromium fork"; + homepage = "https://thorium.rocks"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ rgri ]; + license = licenses.bsd3; + platforms = ["x86_64-linux"]; + mainProgram = "thorium-browser"; + }; +} From 121ad0d115295571f00d5cc6af3ae800948dc334 Mon Sep 17 00:00:00 2001 From: Gaurav Choudhury Date: Thu, 27 Jun 2024 18:05:12 +0530 Subject: [PATCH 002/233] maintainers: add Celibistrial --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 337629c1ef37..91e3aa2198de 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3272,6 +3272,12 @@ githubId = 977929; name = "Cody Allen"; }; + Celibistrial = { + email = "ryan80222@gmail.com"; + github = "Celibistrial"; + githubId = 82810795; + name = "Gaurav Choudhury"; + }; centromere = { email = "nix@centromere.net"; github = "centromere"; From ba10aacec83edb0acf6f176a8041e09326ebaaf3 Mon Sep 17 00:00:00 2001 From: Gaurav Choudhury Date: Thu, 27 Jun 2024 18:06:00 +0530 Subject: [PATCH 003/233] nbfc-linux: init at 0.1.15 --- pkgs/by-name/nb/nbfc-linux/package.nix | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/nb/nbfc-linux/package.nix diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix new file mode 100644 index 000000000000..4e4e5bd4b374 --- /dev/null +++ b/pkgs/by-name/nb/nbfc-linux/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "nbfc-linux"; + version = "0.1.15"; + + src = fetchFromGitHub { + owner = "nbfc-linux"; + repo = "nbfc-linux"; + rev = "${finalAttrs.version}"; + hash = "sha256-+xYr2uIxfMaMAaHGvvA+0WPZjwj3wVAc34e1DWsJLqE="; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + configureFlags = [ + "--prefix=${placeholder "out"}" + "--sysconfdir=${placeholder "out"}/etc" + "--bindir=${placeholder "out"}/bin" + ]; + + meta = { + description = "C port of Stefan Hirschmann's NoteBook FanControl"; + longDescription = '' + nbfc-linux provides fan control service for notebooks + ''; + homepage = "https://github.com/nbfc-linux/nbfc-linux"; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.Celibistrial]; + mainProgram = "nbfc"; + platforms = lib.platforms.linux; + }; +}) From 6c6fb1480cf786d0c28f38b6cbf20a72ab2a6d5d Mon Sep 17 00:00:00 2001 From: Robin Lambertz Date: Mon, 22 Jul 2024 11:24:14 +0200 Subject: [PATCH 004/233] k9s: Use native DNS resolver Using the go resolver will result in problems when accessing a kube cluster behind a VPN on macOS. See https://github.com/derailed/k9s/issues/780 --- pkgs/applications/networking/cluster/k9s/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index c83566170d0f..8e91f641a7a3 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { "-X github.com/derailed/k9s/cmd.date=1970-01-01T00:00:00Z" ]; - tags = [ "netgo" ]; + tags = [ "netcgo" ]; proxyVendor = true; From dbad97cfa1f1b5c714a1d5b93f2536dfd96551e7 Mon Sep 17 00:00:00 2001 From: RAVENz46 Date: Tue, 9 Jul 2024 21:44:18 +0900 Subject: [PATCH 005/233] szyszka: Add desktop icon szyszka: resolve review szyszka: Fix --- pkgs/tools/misc/szyszka/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/misc/szyszka/default.nix b/pkgs/tools/misc/szyszka/default.nix index b1e68b327b24..980b37a910df 100644 --- a/pkgs/tools/misc/szyszka/default.nix +++ b/pkgs/tools/misc/szyszka/default.nix @@ -42,6 +42,18 @@ rustPlatform.buildRustPackage rec { Foundation ]); + postInstall = '' + install -m 444 \ + -D data/com.github.qarmin.szyszka.desktop \ + -t $out/share/applications + install -m 444 \ + -D data/com.github.qarmin.szyszka.metainfo.xml \ + -t $out/share/metainfo + install -m 444 \ + -D data/icons/com.github.qarmin.szyszka.svg \ + -t $out/share/icons/hicolor/scalable/apps + ''; + meta = with lib; { description = "Simple but powerful and fast bulk file renamer"; homepage = "https://github.com/qarmin/szyszka"; From 076390a47eb815acae05900d76e5dc7d3dbecaf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 15:44:04 +0000 Subject: [PATCH 006/233] resticprofile: 0.27.0 -> 0.27.1 --- pkgs/by-name/re/resticprofile/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/resticprofile/package.nix b/pkgs/by-name/re/resticprofile/package.nix index 2903a9987833..f1f158702694 100644 --- a/pkgs/by-name/re/resticprofile/package.nix +++ b/pkgs/by-name/re/resticprofile/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "resticprofile"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "creativeprojects"; repo = "resticprofile"; rev = "refs/tags/v${version}"; - hash = "sha256-CUTDlSpP0ztr3sEKT0ppFnWx/bcVuY1oIKWJNZylDoM="; + hash = "sha256-HHFeWsEO1KUzL5Y6Iwy7MylA//JYzY3h1EwKrUHfXpY="; }; postPatch = '' From 86576d96a894b7c605c2b5266a1b6777d3d84a47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 00:41:47 +0000 Subject: [PATCH 007/233] flashprint: 5.8.4 -> 5.8.6 --- pkgs/applications/misc/flashprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index 182e219d0e57..96f1db7df91b 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.8.4"; + version = "5.8.6"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-Gr76yG3Qz7bnbm5YerHbpb+yzqhw1LthUb4qIH03VQw="; + hash = "sha256-oi/nEdOjhbYf9IZmppfKiEmlNGXdc907LS2x8jUck+M="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; From 50ee8e365b90916278c4a62a6d0f37cdb330a80d Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Thu, 1 Aug 2024 17:12:42 +0200 Subject: [PATCH 008/233] coqPackages.gaia: 1.17 -> 2.2 --- pkgs/development/coq-modules/gaia/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index 715f5ec3d364..073352d1744a 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -9,10 +9,12 @@ mkCoqDerivation { release."1.14".sha256 = "sha256-wgeQC0fIN3PSmRY1K6/KTy+rJmqqxdo3Bhsz1vjVAes="; release."1.15".sha256 = "sha256:04zchnkvaq2mzpcilpspn5l947689gj3m0w20m0nd7w4drvlahnw"; release."1.17".sha256 = "sha256-2VzdopXgKS/wC5Rd1/Zlr12J5bSIGINFjG1nrMjDrGE="; + release."2.2".sha256 = "sha256-y8LlQg9d9rfPFjzS9Xu3BW/H3tPiOC+Eb/zwXJGW9d4="; releaseRev = (v: "v${v}"); inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.16" "8.20") (range "2.0" "2.2") ]; out = "2.2"; } { cases = [ (range "8.10" "8.18") (range "1.12.0" "1.18.0") ]; out = "1.17"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; From a06a5415bb107bb400d5887ab9a63a9d1f37bf10 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 31 Jul 2024 16:23:37 +0200 Subject: [PATCH 009/233] coqPackages.mathcomp: 1 -> 2 --- pkgs/development/coq-modules/mathcomp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 51accc11d249..32a3cac12fe7 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -20,12 +20,12 @@ let withDoc = single && (args.withDoc or false); defaultVersion = let inherit (lib.versions) range; in lib.switch coq.coq-version [ + { case = range "8.17" "8.20"; out = "2.2.0"; } + { case = range "8.17" "8.18"; out = "2.1.0"; } + { case = range "8.17" "8.18"; out = "2.0.0"; } { case = range "8.19" "8.20"; out = "1.19.0"; } { case = range "8.17" "8.18"; out = "1.18.0"; } { case = range "8.15" "8.18"; out = "1.17.0"; } - { case = range "8.16" "8.20"; out = "2.2.0"; } - { case = range "8.16" "8.18"; out = "2.1.0"; } - { case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; } { case = range "8.14" "8.16"; out = "1.15.0"; } { case = range "8.11" "8.15"; out = "1.14.0"; } From bd9880a4d5755217c19278968b83212a191932a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 17:04:27 +0000 Subject: [PATCH 010/233] webdav: 4.2.0 -> 5.1.0 --- pkgs/servers/webdav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index bcc80dd5ba53..9349b9abfe7b 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "webdav"; - version = "4.2.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "sha256-4rgDO1vItmmCRXRiO24MPa9IPzrsfzCWLH6hl6oKkxk="; + sha256 = "sha256-6hDMu3IgyQeRSxo1z3TAjrEH/XwdfHvoLVjyVwa0LdU="; }; - vendorHash = "sha256-az+EasmKitFPWD5JfKaSKZGok/n/dPmIv90RiL750KY="; + vendorHash = "sha256-LQePicQUm55c0lzVCF6au2v3BfXvGIJHNn2SpTQEjpU="; meta = with lib; { description = "Simple WebDAV server"; From 1e8936bd6221a4e76196033f04d392770b8f4a26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 16:59:49 +0000 Subject: [PATCH 011/233] zlint: 3.6.2 -> 3.6.3 --- pkgs/tools/security/zlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/zlint/default.nix b/pkgs/tools/security/zlint/default.nix index ee764fdadd80..18101f999589 100644 --- a/pkgs/tools/security/zlint/default.nix +++ b/pkgs/tools/security/zlint/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "zlint"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "zmap"; repo = "zlint"; rev = "v${version}"; - hash = "sha256-UwtWYDWbln64nE4KDV+gWIhhdbyvlrs0fM96otnfqfE="; + hash = "sha256-N199sSxe06nm0CInTYAuwRgoq7hN7IQpHz5ERUSpk3M="; }; modRoot = "v3"; - vendorHash = "sha256-LP7I7NY/Am6zWfVSvwJanCFwiLfcHKA3Fb9RIMD76a0="; + vendorHash = "sha256-RX7B9RyNmEO9grMR9Mqn1jXDH5sgT0QDvdhXgY1HYtQ="; postPatch = '' # Remove a package which is not declared in go.mod. From a59858e045cc765d2a7dc11695d5d650f7a8bc5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 22:16:09 +0200 Subject: [PATCH 012/233] zlint: refactor --- pkgs/tools/security/zlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/zlint/default.nix b/pkgs/tools/security/zlint/default.nix index 18101f999589..c6b4bdf04e55 100644 --- a/pkgs/tools/security/zlint/default.nix +++ b/pkgs/tools/security/zlint/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "zmap"; repo = "zlint"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-N199sSxe06nm0CInTYAuwRgoq7hN7IQpHz5ERUSpk3M="; }; @@ -32,7 +32,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X=main.version=${version}" ]; passthru.tests.version = testers.testVersion { From 01a2d2e402ec593397637379df8906e04c9b6596 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 4 Aug 2024 23:25:14 -0400 Subject: [PATCH 013/233] garnet: 1.0.16 -> 1.0.18 Diff: https://github.com/microsoft/garnet/compare/v1.0.16...v1.0.18 Changelog: https://github.com/microsoft/garnet/releases/tag/v1.0.18 --- pkgs/by-name/ga/garnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 4e038635492c..9fefa3ad331e 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule rec { pname = "garnet"; - version = "1.0.16"; + version = "1.0.18"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; rev = "v${version}"; - hash = "sha256-0c6iJMSB9ThJVookibZL5CoAhrVMtY6oHYn92nN0114="; + hash = "sha256-vKjFUa/f/nsBaBkxwIhtMox2qtbBzy+ipuqFHtLhbr4="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; From d91504af503edc6c35bef8ae2c41addbf9aefe71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Aug 2024 03:35:15 +0000 Subject: [PATCH 014/233] liquibase: 4.28.0 -> 4.29.1 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 742884fbacb0..1e8a7bbd31d6 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.28.0"; + version = "4.29.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-l90H6soEBqCeGuGbQH7qQqfpRMf0Vxkiv/znG0O3XOg="; + hash = "sha256-MFJP8cG+GqxGt3S8x+LVSI6yF8F06f+C8LrCRP65sRc="; }; nativeBuildInputs = [ makeWrapper ]; From 2c0b45de6bd922b0f50948321e7dce62c5c0f733 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Aug 2024 13:28:49 +0000 Subject: [PATCH 015/233] ndpi: 4.8 -> 4.10 --- pkgs/development/libraries/ndpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 23eb0945555e..7ede8a409c3b 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndpi"; - version = "4.8"; + version = "4.10"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-V3hRDQ141pbR5jJK2QlP7BF2CEbuzqIvo+iTx3EGhRY="; + hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc="; }; nativeBuildInputs = [ From 9df63d3f612caaf06cccad0ca1d1b9a3f6f2855e Mon Sep 17 00:00:00 2001 From: flokl Date: Mon, 5 Aug 2024 19:44:45 +0200 Subject: [PATCH 016/233] dockbarx: 1.0-beta2 -> 1.0-beta4 --- pkgs/applications/misc/dockbarx/default.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 815a482a216f..a3cccb9f859f 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -11,13 +11,13 @@ python3Packages.buildPythonApplication rec { pname = "dockbarx"; - version = "1.0-beta2"; + version = "1.0-beta4"; src = fetchFromGitHub { owner = "xuzhen"; repo = "dockbarx"; rev = version; - sha256 = "sha256-WMRTtprDHUbOOYVHshx7WpBlYshbiDjI12Rw3tQQuPI="; + sha256 = "sha256-J/5KpHptGzgRF1qIGrgjkRR3in5pE0ffkiYVTR3iZKY="; }; nativeBuildInputs = [ @@ -46,23 +46,6 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; - postPatch = '' - substituteInPlace setup.py \ - --replace /usr/ "" \ - --replace '"/", "usr", "share",' '"share",' - - for f in \ - dbx_preference \ - dockbarx/applets.py \ - dockbarx/dockbar.py \ - dockbarx/iconfactory.py \ - dockbarx/theme.py \ - mate_panel_applet/dockbarx_mate_applet - do - substituteInPlace $f --replace /usr/share/ $out/share/ - done - ''; - postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; From 4dbec93707bd859a52bc71808c6202bf0ebed223 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 21:33:23 +0000 Subject: [PATCH 017/233] kubectl-gadget: 0.30.0 -> 0.31.0 --- .../networking/cluster/kubectl-gadget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index c9bc3537ae3e..30e835ba2c0b 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-cMaOqybXzbAelhSfUal4kgQKwz/dEp/fVQ8SyjaaAZU="; + hash = "sha256-f93PdSA3OGiUUXSQn0aUP3o5xfvjiq/3L3Bz9k4OigI="; }; - vendorHash = "sha256-M2nco2qxutpxKv//o+h2LY0x5Tk6DWxFL383cpGVnkI="; + vendorHash = "sha256-lBfz0tzCWKEAAmpvjB2kUJ3aLjlzAjniIu/1aNE80Xg="; CGO_ENABLED = 0; From d5e5482fb4ead0861c524fb5f559dd4a00616551 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Wed, 7 Aug 2024 11:55:01 +0200 Subject: [PATCH 018/233] python3Packages.somweb: init at 1.2.1 --- .../python-modules/somweb/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/somweb/default.nix diff --git a/pkgs/development/python-modules/somweb/default.nix b/pkgs/development/python-modules/somweb/default.nix new file mode 100644 index 000000000000..7abe33c14bf3 --- /dev/null +++ b/pkgs/development/python-modules/somweb/default.nix @@ -0,0 +1,41 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "somweb"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "taarskog"; + repo = "pySOMweb"; + rev = "v${version}"; + hash = "sha256-cLKEKDCMK7lCtbmj2KbhgJUCZpPnPI5tZvO5L+ey8qI="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + requests + ]; + + pythonImportsCheck = [ "somweb" ]; + + doCheck = false; # no tests + + meta = with lib; { + changelog = "https://github.com/taarskog/pySOMweb/releases/tag/v${version}"; + description = "A client library to control garage door operators produced by SOMMER through their SOMweb device"; + homepage = "https://github.com/taarskog/pysomweb"; + license = licenses.mit; + maintainers = with maintainers; [ uvnikita ]; + mainProgram = "somweb"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aaf2f372f3e3..10732f8b37c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14584,6 +14584,8 @@ self: super: with self; { somfy-mylink-synergy = callPackage ../development/python-modules/somfy-mylink-synergy { }; + somweb = callPackage ../development/python-modules/somweb { }; + sonarr = callPackage ../development/python-modules/sonarr { }; sonos-websocket = callPackage ../development/python-modules/sonos-websocket { }; From 33fc5a846d144e9abd3f153bf39d520ff67acc33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Aug 2024 19:00:24 +0000 Subject: [PATCH 019/233] mov-cli: 4.4.7 -> 4.4.8 --- pkgs/by-name/mo/mov-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index ebc0f8938c4f..e840f9e56da9 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -8,7 +8,7 @@ let pname = "mov-cli"; - version = "4.4.7"; + version = "4.4.8"; in python3.pkgs.buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonPackage { owner = "mov-cli"; repo = "mov-cli"; rev = "refs/tags/${version}"; - hash = "sha256-wbzgTtRMDx9WpILzOGNvTrxj+wN6QzRCUNsc7PfwzJk="; + hash = "sha256-MpSwSYsHsrG7ceXXJnFMg1bgadOhe23eNVCNMxlY0pQ="; }; propagatedBuildInputs = with python3.pkgs; [ From 319cc0680108b51cfd4a4cb956bab8f0cd76bcdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Aug 2024 01:35:53 +0000 Subject: [PATCH 020/233] jsonnet-language-server: 0.13.1 -> 0.14.0 --- .../language-servers/jsonnet-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index 5da093b61bea..1e3a888b397d 100644 --- a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-4tJrEipVbiYQY0L9sDH0f/qT8WY7c3md/Bar/dST+VI="; + hash = "sha256-W9xfbZWM6KK8UTwP0SaeywIlUku0+64vjEyUFJFFS5M="; }; - vendorHash = "sha256-/mfwBHaouYN8JIxPz720/7MlMVh+5EEB+ocnYe4B020="; + vendorHash = "sha256-rh+b089fr+z0YzgvzivzELnSbNDiNczGCRwFrIYR250="; ldflags = [ "-s" From 83786becd070652880717c38c9b9af8d9d8b27db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Aug 2024 01:51:39 +0000 Subject: [PATCH 021/233] prometheus-lnd-exporter: 0.2.7 -> 0.2.8 --- pkgs/servers/monitoring/prometheus/lnd-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 707d59b78bfa..7181fbfe224d 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lndmon"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "lndmon"; rev = "v${version}"; - hash = "sha256-j9T60J7n9sya9/nN0Y6wsPDXN2h35pXxMdadsOkAMWI="; + hash = "sha256-PzmDotyuG8Fgkr6SlBWofqQamDG39v65fFjRUKjIWWM="; }; - vendorHash = "sha256-h9+/BOy1KFiqUUV35M548fDKFC3Q5mBaANuD7t1rpp8="; + vendorHash = "sha256-6wBA9OZcjGsbIgWzMXlcT2571sFvtYqIsHRfLAz/o60="; # Irrelevant tools dependencies. excludedPackages = [ "./tools" ]; From 2bca85a8d31191761b1285a0a1d44ef13eed4f15 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 9 Aug 2024 13:31:01 +0200 Subject: [PATCH 022/233] qt5.qtwebengine: fix darwin build for system ffmpeg 7 fix #332495 --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 68f3772a9976..1a63c9508c05 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -173,6 +173,10 @@ qtModule ({ # ld: fatal warning(s) induced error (-fatal_warnings) substituteInPlace src/3rdparty/chromium/build/config/compiler/BUILD.gn \ --replace "-Wl,-fatal_warnings" "" + + # Use system ffmpeg + echo "gn_args += use_system_ffmpeg=true" >> src/core/config/mac_osx.pri + echo "LIBS += -lavformat -lavcodec -lavutil" >> src/core/core_common.pri '') + postPatch; env = { From 5793fb5b9e2e6031a090649911e540597cf194de Mon Sep 17 00:00:00 2001 From: squalus Date: Sat, 10 Aug 2024 08:33:15 -0700 Subject: [PATCH 023/233] osquery: fix build Patch toolchain rpath manually instead of using autoPatchelfHook Workaround for #333710 Fixes #332533 --- pkgs/tools/system/osquery/default.nix | 4 +++- pkgs/tools/system/osquery/toolchain-bin.nix | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 4c9d5b54cb0f..8413c2e9f33a 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -6,6 +6,7 @@ , git , perl , python3 +, stdenv , stdenvNoCC , ninja , autoPatchelfHook @@ -13,6 +14,7 @@ , jq , removeReferencesTo , nixosTests +, file }: let @@ -50,7 +52,7 @@ let sha256 = opensslSha256; }; - toolchain = import ./toolchain-bin.nix { inherit autoPatchelfHook stdenvNoCC lib fetchzip; }; + toolchain = import ./toolchain-bin.nix { inherit stdenv lib fetchzip file; }; in diff --git a/pkgs/tools/system/osquery/toolchain-bin.nix b/pkgs/tools/system/osquery/toolchain-bin.nix index d23b3ca1867c..dd1ff9264d3c 100644 --- a/pkgs/tools/system/osquery/toolchain-bin.nix +++ b/pkgs/tools/system/osquery/toolchain-bin.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, autoPatchelfHook, fetchzip }: +{ stdenv, lib, fetchzip, file }: let version = "1.1.0"; @@ -16,21 +16,32 @@ let in -stdenvNoCC.mkDerivation { +stdenv.mkDerivation { name = "osquery-toolchain-bin"; inherit version; - src = fetchzip dist.${stdenvNoCC.hostPlatform.system}; + src = fetchzip dist.${stdenv.hostPlatform.system}; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ file ]; installPhase = '' mkdir $out cp -r * $out ''; + # autoPatchelfHook cannot be used here because of https://github.com/NixOS/nixpkgs/issues/333710 + postFixup = '' + read -r interpreter < "$NIX_BINTOOLS"/nix-support/dynamic-linker + for file in $(find "$out"/usr/bin -type f -executable); do + if [[ $(file "$file") == *ELF*dynamically* ]]; then + patchelf --interpreter "$interpreter" "$file" + patchelf --set-rpath "$out/usr/lib" "$file" + fi + done + ''; + meta = with lib; { description = "A LLVM-based toolchain for Linux designed to build a portable osquery"; homepage = "https://github.com/osquery/osquery-toolchain"; From fd1f078fea05b1b197a3ede8d0c832f2359aa6cd Mon Sep 17 00:00:00 2001 From: Michael Lohmann Date: Sat, 10 Aug 2024 22:36:49 +0200 Subject: [PATCH 024/233] nixos-rebuild: remove list-generations piping into $PAGER In https://github.com/NixOS/nixpkgs/issues/333734 it was noticed that executing the list-generations with sudo would fail. The reason was, that the variable $PAGER was set, but empty. ${PAGER:cat} only has the default of cat if PAGER is unset, but it will not default to cat if the variable is empty instead. One way of fixing this would have been to change it to ${PAGER:-cat}, but since a pager requires pressing an additional key to exit, it is a bit annoying in the first place, so it was removed instead. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 39b7f865b669..a73ab0646c15 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -729,8 +729,7 @@ EOF .nixosVersion, .kernelVersion, .configurationRevision, (.specialisations | join(" ")) ] | @tsv' | - column --separator $'\t' --table --table-columns "Generation,Build-date,NixOS version,Kernel,Configuration Revision,Specialisation" | - ${PAGER:cat} + column --separator $'\t' --table --table-columns "Generation,Build-date,NixOS version,Kernel,Configuration Revision,Specialisation" else jq --slurp . fi From 08bc3e37361739fc53a6930a18786a5078c7cbd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Aug 2024 19:10:50 +0000 Subject: [PATCH 025/233] trippy: 0.10.0 -> 0.11.0 --- pkgs/tools/networking/trippy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/trippy/default.nix b/pkgs/tools/networking/trippy/default.nix index 95e85c60bc4b..22aa10cc84a2 100644 --- a/pkgs/tools/networking/trippy/default.nix +++ b/pkgs/tools/networking/trippy/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "trippy"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "fujiapple852"; repo = "trippy"; rev = version; - hash = "sha256-IKGtnWRjrVof+2cq41TPfjhFrkn10yhY6j63dYwTzPA="; + hash = "sha256-ArSIeu3u+TUy18rzJvhq0+/qvi5xPZmtQ7rPpwaEx9g="; }; - cargoHash = "sha256-OCbrg1uSot0uNFx7uSlN5Bh6bl34ng9xO6lo9wks6nY="; + cargoHash = "sha256-h1NQQFjtlpQuyTz7AHuAPUe1GxR0Q2yKzow8XB9375U="; meta = with lib; { description = "Network diagnostic tool"; From 7db4805efb6c1002b3fed61e97ff859a4370cfa9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Aug 2024 01:41:12 +0000 Subject: [PATCH 026/233] urbit: 3.0 -> 3.1 --- pkgs/misc/urbit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 611d9ec622d1..aa78c949e5c0 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "3.0"; + version = "3.1"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-ip35d9YgwFEkNb+1h+8WYBgUm+QlckvHhlAT69TpeYg="; - aarch64-linux = "sha256-3TkK9YyFtEMpRjG/iKvxctD8pYRh0bWgH+3QWh++r5U="; - x86_64-darwin = "sha256-bvDZBSQmsXmJA2ZekWPr6krB0KzCFFly8KUqT5mVK1A="; - aarch64-darwin = "sha256-UybuCXpE/xwg4YmR3rpZiFTs1KQYAttpEjF/Fz+UD00="; + x86_64-linux = "sha256-51Zgv9QANQVMk/dc7/heYmCNfeu4k7mrYNke1/oz/94="; + aarch64-linux = "sha256-Tdn/ve9iCjsY/b39TZ7ErHV14mIAHdtmycgUPIzRihQ="; + x86_64-darwin = "sha256-y/FQIVcEn6dLWXPztC34+7+5eDMO7Xcx25D2+0p7Mxk="; + aarch64-darwin = "sha256-YJGRZlpTdm1x4P+GnZiKC1411tcEX+Jdnm+iyxUlsU0="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; From 7c5f71bad4416c3d4bd5721b5ef180f6ad0bdce2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 07:33:00 +0000 Subject: [PATCH 027/233] opengrok: 1.13.9 -> 1.13.19 --- pkgs/development/tools/misc/opengrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 8bde12db6257..94a111b2baef 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.9"; + version = "1.13.19"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-EG0C1ebVlh01DLBnEFZxOzxTiCSByBy2OW9IP8wSlbE="; + hash = "sha256-TRBKyEMoaus8wndTnS6lAtEDdzHKK2oSbWv9dZYcOZU="; }; nativeBuildInputs = [ makeWrapper ]; From eaa6a1ef0dc126f47066e921cd226f9833873e74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 11:06:01 +0000 Subject: [PATCH 028/233] gotenberg: 8.8.1 -> 8.9.1 --- pkgs/by-name/go/gotenberg/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index 40cb1e185bbd..e0b900a5a1b9 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -22,16 +22,16 @@ let in buildGoModule rec { pname = "gotenberg"; - version = "8.8.1"; + version = "8.9.1"; src = fetchFromGitHub { owner = "gotenberg"; repo = "gotenberg"; rev = "refs/tags/v${version}"; - hash = "sha256-vXrSPu/iY6JsOvPKDRdg6TnUjNV7X5GEb5l9bk4lSpY="; + hash = "sha256-y54DtOYIzFAk05TvXFcLdStfAXim3sVHBkW+R8CrtMM="; }; - vendorHash = "sha256-Hxava/dRQ2TFWrg7fIvRkp3NW61QWmWNEQiBP71wlR8="; + vendorHash = "sha256-BYcdqZ8TNEG6popRt+Dg5xW5Q7RmYvdlV+niUNenRG0="; postPatch = '' find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \; From b356a808fdd5f2b891e3711f5324079d8e738ff3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 7 May 2024 15:10:30 +0200 Subject: [PATCH 029/233] build-support/php: copy v1 into v2 --- .../builders/v2/build-composer-project.nix | 108 +++++++++++++++ .../builders/v2/build-composer-repository.nix | 118 ++++++++++++++++ .../v2/hooks/composer-install-hook.sh | 126 ++++++++++++++++++ .../v2/hooks/composer-repository-hook.sh | 91 +++++++++++++ .../php/builders/v2/hooks/default.nix | 45 +++++++ .../builders/v2/hooks/php-script-utils.bash | 88 ++++++++++++ 6 files changed, 576 insertions(+) create mode 100644 pkgs/build-support/php/builders/v2/build-composer-project.nix create mode 100644 pkgs/build-support/php/builders/v2/build-composer-repository.nix create mode 100644 pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh create mode 100644 pkgs/build-support/php/builders/v2/hooks/composer-repository-hook.sh create mode 100644 pkgs/build-support/php/builders/v2/hooks/default.nix create mode 100644 pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash diff --git a/pkgs/build-support/php/builders/v2/build-composer-project.nix b/pkgs/build-support/php/builders/v2/build-composer-project.nix new file mode 100644 index 000000000000..698391ad1603 --- /dev/null +++ b/pkgs/build-support/php/builders/v2/build-composer-project.nix @@ -0,0 +1,108 @@ +{ + nix-update-script, + stdenvNoCC, + lib, + php, +}: + +let + buildComposerProjectOverride = + finalAttrs: previousAttrs: + + let + phpDrv = finalAttrs.php or php; + composer = finalAttrs.composer or phpDrv.packages.composer-local-repo-plugin; + in + { + composerLock = previousAttrs.composerLock or null; + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ + composer + phpDrv + phpDrv.composerHooks.composerInstallHook + ]; + + buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ phpDrv ]; + + patches = previousAttrs.patches or [ ]; + strictDeps = previousAttrs.strictDeps or true; + + # Should we keep these empty phases? + configurePhase = + previousAttrs.configurePhase or '' + runHook preConfigure + + runHook postConfigure + ''; + + buildPhase = + previousAttrs.buildPhase or '' + runHook preBuild + + runHook postBuild + ''; + + doCheck = previousAttrs.doCheck or true; + checkPhase = + previousAttrs.checkPhase or '' + runHook preCheck + + runHook postCheck + ''; + + installPhase = + previousAttrs.installPhase or '' + runHook preInstall + + runHook postInstall + ''; + + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = + previousAttrs.installCheckPhase or '' + runHook preInstallCheck + + runHook postInstallCheck + ''; + + composerRepository = + previousAttrs.composerRepository or (phpDrv.mkComposerRepository { + inherit composer; + inherit (finalAttrs) + patches + pname + src + vendorHash + version + ; + + composerLock = previousAttrs.composerLock or null; + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + }); + + # Projects providing a lockfile from upstream can be automatically updated. + passthru = previousAttrs.passthru or { } // { + updateScript = + previousAttrs.passthru.updateScript + or (if finalAttrs.composerRepository.composerLock == null then nix-update-script { } else null); + }; + + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_DISABLE_NETWORK = "1"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + }; + + meta = previousAttrs.meta or { } // { + platforms = lib.platforms.all; + }; + }; +in +args: (stdenvNoCC.mkDerivation args).overrideAttrs buildComposerProjectOverride diff --git a/pkgs/build-support/php/builders/v2/build-composer-repository.nix b/pkgs/build-support/php/builders/v2/build-composer-repository.nix new file mode 100644 index 000000000000..037d8bdeb3eb --- /dev/null +++ b/pkgs/build-support/php/builders/v2/build-composer-repository.nix @@ -0,0 +1,118 @@ +{ + stdenvNoCC, + lib, + php, +}: + +let + mkComposerRepositoryOverride = + /* + We cannot destruct finalAttrs since the attrset below is used to construct it + and Nix currently does not support lazy attribute names. + { + php ? null, + composer ? null, + composerLock ? "composer.lock", + src, + vendorHash, + ... + }@finalAttrs: + */ + finalAttrs: previousAttrs: + + let + phpDrv = finalAttrs.php or php; + composer = finalAttrs.composer or phpDrv.packages.composer-local-repo-plugin; + in + assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); + assert ( + lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument." + ); + assert (lib.assertMsg (previousAttrs ? version) "mkComposerRepository expects version argument."); + assert (lib.assertMsg (previousAttrs ? pname) "mkComposerRepository expects pname argument."); + assert ( + lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument." + ); + assert ( + lib.assertMsg ( + previousAttrs ? composerNoPlugins + ) "mkComposerRepository expects composerNoPlugins argument." + ); + assert ( + lib.assertMsg ( + previousAttrs ? composerNoScripts + ) "mkComposerRepository expects composerNoScripts argument." + ); + { + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + + name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository"; + + # See https://github.com/NixOS/nix/issues/6660 + dontPatchShebangs = previousAttrs.dontPatchShebangs or true; + + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ + composer + phpDrv + phpDrv.composerHooks.composerRepositoryHook + ]; + + buildInputs = previousAttrs.buildInputs or [ ]; + + strictDeps = previousAttrs.strictDeps or true; + + # Should we keep these empty phases? + configurePhase = + previousAttrs.configurePhase or '' + runHook preConfigure + + runHook postConfigure + ''; + + buildPhase = + previousAttrs.buildPhase or '' + runHook preBuild + + runHook postBuild + ''; + + doCheck = previousAttrs.doCheck or true; + checkPhase = + previousAttrs.checkPhase or '' + runHook preCheck + + runHook postCheck + ''; + + installPhase = + previousAttrs.installPhase or '' + runHook preInstall + + runHook postInstall + ''; + + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = + previousAttrs.installCheckPhase or '' + runHook preInstallCheck + + runHook postInstallCheck + ''; + + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + COMPOSER_HTACCESS_PROTECT = "0"; + COMPOSER_DISABLE_NETWORK = "0"; + }; + + outputHashMode = "recursive"; + outputHashAlgo = + if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; + outputHash = finalAttrs.vendorHash or ""; + }; +in +args: (stdenvNoCC.mkDerivation args).overrideAttrs mkComposerRepositoryOverride diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh new file mode 100644 index 000000000000..44e87d06d3a5 --- /dev/null +++ b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh @@ -0,0 +1,126 @@ +declare composerRepository +declare version +declare composerNoDev +declare composerNoPlugins +declare composerNoScripts + +preConfigureHooks+=(composerInstallConfigureHook) +preBuildHooks+=(composerInstallBuildHook) +preCheckHooks+=(composerInstallCheckHook) +preInstallHooks+=(composerInstallInstallHook) + +source @phpScriptUtils@ + +composerInstallConfigureHook() { + echo "Executing composerInstallConfigureHook" + + if [[ ! -e "${composerRepository}" ]]; then + echo "No local composer repository found." + exit 1 + fi + + if [[ -e "$composerLock" ]]; then + cp "$composerLock" composer.lock + fi + + if [[ ! -f "composer.lock" ]]; then + setComposeRootVersion + + composer \ + --no-install \ + --no-interaction \ + --no-progress \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + update + + mkdir -p $out + cp composer.lock $out/ + + echo + echo -e "\e[31mERROR: No composer.lock found\e[0m" + echo + echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m' + echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m" + echo + echo -e '\e[31mTo fix the issue:\e[0m' + echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m" + echo -e "\e[31m cp $out/composer.lock \e[0m" + echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m' + echo -e '\e[31m composerLock = ./composer.lock;\e[0m' + echo + + exit 1 + fi + + echo "Validating consistency between composer.lock and ${composerRepository}/composer.lock" + if ! @cmp@ -s "composer.lock" "${composerRepository}/composer.lock"; then + echo + echo -e "\e[31mERROR: vendorHash is out of date\e[0m" + echo + echo -e "\e[31mcomposer.lock is not the same in $composerRepository\e[0m" + echo + echo -e "\e[31mTo fix the issue:\e[0m" + echo -e '\e[31m1. Set vendorHash to an empty string: `vendorHash = "";`\e[0m' + echo -e '\e[31m2. Build the derivation and wait for it to fail with a hash mismatch\e[0m' + echo -e '\e[31m3. Copy the "got: sha256-..." value back into the vendorHash field\e[0m' + echo -e '\e[31m You should have: vendorHash = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=";\e[0m' + echo + + exit 1 + fi + + chmod +w composer.json composer.lock + + echo "Finished composerInstallConfigureHook" +} + +composerInstallBuildHook() { + echo "Executing composerInstallBuildHook" + + setComposeRootVersion + + # Since this file cannot be generated in the composer-repository-hook.sh + # because the file contains hardcoded nix store paths, we generate it here. + composer build-local-repo-lock -m "${composerRepository}" . + + echo "Finished composerInstallBuildHook" +} + +composerInstallCheckHook() { + echo "Executing composerInstallCheckHook" + + checkComposerValidate + + echo "Finished composerInstallCheckHook" +} + +composerInstallInstallHook() { + echo "Executing composerInstallInstallHook" + + setComposeRootVersion + + # Finally, run `composer install` to install the dependencies and generate + # the autoloader. + composer \ + --no-interaction \ + --no-progress \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + install + + # Copy the relevant files only in the store. + mkdir -p "$out"/share/php/"${pname}" + cp -r . "$out"/share/php/"${pname}"/ + + # Create symlinks for the binaries. + jq -r -c 'try (.bin[] | select(test(".bat$")? | not) )' composer.json | while read -r bin; do + echo -e "\e[32mCreating symlink ${bin}...\e[0m" + mkdir -p "$out"/bin + ln -s "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")" + done + + echo "Finished composerInstallInstallHook" +} diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-repository-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-repository-hook.sh new file mode 100644 index 000000000000..ec9777541fc0 --- /dev/null +++ b/pkgs/build-support/php/builders/v2/hooks/composer-repository-hook.sh @@ -0,0 +1,91 @@ +declare composerLock +declare version +declare composerNoDev +declare composerNoPlugins +declare composerNoScripts +declare composerStrictValidation + +preConfigureHooks+=(composerRepositoryConfigureHook) +preBuildHooks+=(composerRepositoryBuildHook) +preCheckHooks+=(composerRepositoryCheckHook) +preInstallHooks+=(composerRepositoryInstallHook) + +source @phpScriptUtils@ + +composerRepositoryConfigureHook() { + echo "Executing composerRepositoryConfigureHook" + + if [[ -e "$composerLock" ]]; then + cp $composerLock composer.lock + fi + + if [[ ! -f "composer.lock" ]]; then + setComposeRootVersion + + composer \ + --no-install \ + --no-interaction \ + --no-progress \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + update + + mkdir -p $out + cp composer.lock $out/ + + echo + echo -e "\e[31mERROR: No composer.lock found\e[0m" + echo + echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m' + echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m" + echo + echo -e '\e[31mTo fix the issue:\e[0m' + echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m" + echo -e "\e[31m cp $out/composer.lock \e[0m" + echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m' + echo -e '\e[31m composerLock = ./composer.lock;\e[0m' + echo + + exit 1 + fi + + echo "Finished composerRepositoryConfigureHook" +} + +composerRepositoryBuildHook() { + echo "Executing composerRepositoryBuildHook" + + mkdir -p repository + + setComposeRootVersion + + # Build the local composer repository + # The command 'build-local-repo' is provided by the Composer plugin + # nix-community/composer-local-repo-plugin. + composer build-local-repo-lock ${composerNoDev:+--no-dev} -r repository + + echo "Finished composerRepositoryBuildHook" +} + +composerRepositoryCheckHook() { + echo "Executing composerRepositoryCheckHook" + + checkComposerValidate + + echo "Finished composerRepositoryCheckHook" +} + +composerRepositoryInstallHook() { + echo "Executing composerRepositoryInstallHook" + + mkdir -p $out + + cp -ar repository/. $out/ + + # Copy the composer.lock files to the output directory, to be able to validate consistency with + # the src composer.lock file where this fixed-output derivation is used + cp composer.lock $out/ + + echo "Finished composerRepositoryInstallHook" +} diff --git a/pkgs/build-support/php/builders/v2/hooks/default.nix b/pkgs/build-support/php/builders/v2/hooks/default.nix new file mode 100644 index 000000000000..4c0ba1b18801 --- /dev/null +++ b/pkgs/build-support/php/builders/v2/hooks/default.nix @@ -0,0 +1,45 @@ +{ + lib, + makeSetupHook, + jq, + writeShellApplication, + moreutils, + cacert, + buildPackages, +}: + +let + php-script-utils = writeShellApplication { + name = "php-script-utils"; + runtimeInputs = [ jq ]; + text = builtins.readFile ./php-script-utils.bash; + }; +in +{ + composerRepositoryHook = makeSetupHook { + name = "composer-repository-hook.sh"; + propagatedBuildInputs = [ + jq + moreutils + cacert + ]; + substitutions = { + phpScriptUtils = lib.getExe php-script-utils; + }; + } ./composer-repository-hook.sh; + + composerInstallHook = makeSetupHook { + name = "composer-install-hook.sh"; + propagatedBuildInputs = [ + jq + moreutils + cacert + ]; + substitutions = { + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; + phpScriptUtils = lib.getExe php-script-utils; + }; + } ./composer-install-hook.sh; +} diff --git a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash new file mode 100644 index 000000000000..65c0a3b410f6 --- /dev/null +++ b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash @@ -0,0 +1,88 @@ +declare version +declare composerStrictValidation +declare composerGlobal + +setComposeRootVersion() { + set +e # Disable exit on error + + if [[ -v version ]]; then + echo -e "\e[32mSetting COMPOSER_ROOT_VERSION to $version\e[0m" + export COMPOSER_ROOT_VERSION=$version + fi + + set -e +} + +checkComposerValidate() { + setComposeRootVersion + + if [ "1" == "${composerGlobal-}" ]; then + global="global"; + else + global=""; + fi + + command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock" + if ! $command; then + if [ "1" == "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.json is valid.\e[0m' + echo + echo -e '\e[31mTo address the issue efficiently, follow one of these steps:\e[0m' + echo -e '\e[31m 1. File an issue in the project'\''s issue tracker with detailed information, and apply any available remote patches as a temporary solution '\('with fetchpatch'\)'.\e[0m' + echo -e '\e[31m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.json is valid.\e[0m' + echo + echo -e '\e[33mTo address the issue efficiently, follow one of these steps:\e[0m' + echo -e '\e[33m 1. File an issue in the project'\''s issue tracker with detailed information, and apply any available remote patches as a temporary solution with '\('with fetchpatch'\)'.\e[0m' + echo -e '\e[33m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi + + command="composer ${global} validate --strict --no-ansi --no-interaction --quiet --no-check-all --check-lock" + if ! $command; then + if [ "1" == "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + echo -e '\e[31mThis often indicates an issue with the upstream project, which can typically be resolved by reporting the issue to the relevant project maintainers.\e[0m' + echo + echo -e '\e[31mTo address the issue efficiently, follow one of these steps:\e[0m' + echo -e '\e[31m 1. File an issue in the project'\''s issue tracker with detailed information '\('run '\''composer update --lock --no-install'\'' to fix the issue'\)', and apply any available remote patches as a temporary solution with '\('with fetchpatch'\)'.\e[0m' + echo -e '\e[31m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + echo -e '\e[33mThis often indicates an issue with the upstream project, which can typically be resolved by reporting the issue to the relevant project maintainers.\e[0m' + echo + echo -e '\e[33mTo address the issue efficiently, follow one of these steps:\e[0m' + echo -e '\e[33m 1. File an issue in the project'\''s issue tracker with detailed information '\('run '\''composer update --lock --no-install'\'' to fix the issue'\)', and apply any available remote patches as a temporary solution with '\('with fetchpatch'\)'.\e[0m' + echo -e '\e[33m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi +} From 65c0e4ebf6907c7382b60d087a69805b139193f4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 7 May 2024 15:17:48 +0200 Subject: [PATCH 030/233] build-support/php: implement v2 --- pkgs/build-support/php/builders/default.nix | 6 ++ .../builders/v2/build-composer-project.nix | 10 +-- ...pository.nix => build-composer-vendor.nix} | 31 +++----- .../v2/hooks/composer-install-hook.sh | 55 +++------------ ...sitory-hook.sh => composer-vendor-hook.sh} | 70 +++++++++---------- .../php/builders/v2/hooks/default.nix | 6 +- .../builders/v2/hooks/php-script-utils.bash | 2 - pkgs/development/interpreters/php/generic.nix | 2 +- pkgs/top-level/php-packages.nix | 5 ++ 9 files changed, 73 insertions(+), 114 deletions(-) rename pkgs/build-support/php/builders/v2/{build-composer-repository.nix => build-composer-vendor.nix} (70%) rename pkgs/build-support/php/builders/v2/hooks/{composer-repository-hook.sh => composer-vendor-hook.sh} (50%) diff --git a/pkgs/build-support/php/builders/default.nix b/pkgs/build-support/php/builders/default.nix index ea9bb3350435..d8d60ad6da1e 100644 --- a/pkgs/build-support/php/builders/default.nix +++ b/pkgs/build-support/php/builders/default.nix @@ -6,4 +6,10 @@ mkComposerRepository = callPackage ./v1/build-composer-repository.nix { }; composerHooks = callPackages ./v1/hooks { }; }; + + v2 = { + buildComposerProject = callPackage ./v2/build-composer-project.nix { }; + mkComposerVendor = callPackage ./v2/build-composer-vendor.nix { }; + composerHooks = callPackages ./v2/hooks { }; + }; } diff --git a/pkgs/build-support/php/builders/v2/build-composer-project.nix b/pkgs/build-support/php/builders/v2/build-composer-project.nix index 698391ad1603..6013225e7c59 100644 --- a/pkgs/build-support/php/builders/v2/build-composer-project.nix +++ b/pkgs/build-support/php/builders/v2/build-composer-project.nix @@ -11,7 +11,7 @@ let let phpDrv = finalAttrs.php or php; - composer = finalAttrs.composer or phpDrv.packages.composer-local-repo-plugin; + composer = finalAttrs.composer or phpDrv.packages.composer; in { composerLock = previousAttrs.composerLock or null; @@ -23,7 +23,7 @@ let nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ composer phpDrv - phpDrv.composerHooks.composerInstallHook + phpDrv.composerHooks2.composerInstallHook ]; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ phpDrv ]; @@ -69,8 +69,8 @@ let runHook postInstallCheck ''; - composerRepository = - previousAttrs.composerRepository or (phpDrv.mkComposerRepository { + composerVendor = + previousAttrs.composerVendor or (phpDrv.mkComposerVendor { inherit composer; inherit (finalAttrs) patches @@ -91,7 +91,7 @@ let passthru = previousAttrs.passthru or { } // { updateScript = previousAttrs.passthru.updateScript - or (if finalAttrs.composerRepository.composerLock == null then nix-update-script { } else null); + or (if finalAttrs.composerVendor.composerLock == null then nix-update-script { } else null); }; env = { diff --git a/pkgs/build-support/php/builders/v2/build-composer-repository.nix b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix similarity index 70% rename from pkgs/build-support/php/builders/v2/build-composer-repository.nix rename to pkgs/build-support/php/builders/v2/build-composer-vendor.nix index 037d8bdeb3eb..b68e16e6cc1a 100644 --- a/pkgs/build-support/php/builders/v2/build-composer-repository.nix +++ b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix @@ -5,7 +5,7 @@ }: let - mkComposerRepositoryOverride = + mkComposerVendorOverride = /* We cannot destruct finalAttrs since the attrset below is used to construct it and Nix currently does not support lazy attribute names. @@ -22,27 +22,12 @@ let let phpDrv = finalAttrs.php or php; - composer = finalAttrs.composer or phpDrv.packages.composer-local-repo-plugin; + composer = finalAttrs.composer or phpDrv.packages.composer; in - assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); - assert ( - lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument." - ); - assert (lib.assertMsg (previousAttrs ? version) "mkComposerRepository expects version argument."); - assert (lib.assertMsg (previousAttrs ? pname) "mkComposerRepository expects pname argument."); - assert ( - lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument." - ); - assert ( - lib.assertMsg ( - previousAttrs ? composerNoPlugins - ) "mkComposerRepository expects composerNoPlugins argument." - ); - assert ( - lib.assertMsg ( - previousAttrs ? composerNoScripts - ) "mkComposerRepository expects composerNoScripts argument." - ); + assert (lib.assertMsg (previousAttrs ? src) "mkComposerVendor expects src argument."); + assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerVendor expects vendorHash argument."); + assert (lib.assertMsg (previousAttrs ? version) "mkComposerVendor expects version argument."); + assert (lib.assertMsg (previousAttrs ? pname) "mkComposerVendor expects pname argument."); { composerNoDev = previousAttrs.composerNoDev or true; composerNoPlugins = previousAttrs.composerNoPlugins or true; @@ -57,7 +42,7 @@ let nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ composer phpDrv - phpDrv.composerHooks.composerRepositoryHook + phpDrv.composerHooks2.composerVendorHook ]; buildInputs = previousAttrs.buildInputs or [ ]; @@ -115,4 +100,4 @@ let outputHash = finalAttrs.vendorHash or ""; }; in -args: (stdenvNoCC.mkDerivation args).overrideAttrs mkComposerRepositoryOverride +args: (stdenvNoCC.mkDerivation args).overrideAttrs mkComposerVendorOverride diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh index 44e87d06d3a5..7cc176058b50 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh @@ -1,4 +1,4 @@ -declare composerRepository +declare composerVendor declare version declare composerNoDev declare composerNoPlugins @@ -14,29 +14,27 @@ source @phpScriptUtils@ composerInstallConfigureHook() { echo "Executing composerInstallConfigureHook" - if [[ ! -e "${composerRepository}" ]]; then - echo "No local composer repository found." + setComposeRootVersion + + if [[ ! -e "${composerVendor}" ]]; then + echo "No local composer vendor found." exit 1 fi - if [[ -e "$composerLock" ]]; then - cp "$composerLock" composer.lock - fi + install -Dm644 ${composerVendor}/composer.{json,lock} . if [[ ! -f "composer.lock" ]]; then - setComposeRootVersion - composer \ --no-install \ --no-interaction \ --no-progress \ + --optimize-autoloader \ ${composerNoDev:+--no-dev} \ ${composerNoPlugins:+--no-plugins} \ ${composerNoScripts:+--no-scripts} \ update - mkdir -p $out - cp composer.lock $out/ + install -Dm644 composer.lock -t $out/ echo echo -e "\e[31mERROR: No composer.lock found\e[0m" @@ -54,24 +52,7 @@ composerInstallConfigureHook() { exit 1 fi - echo "Validating consistency between composer.lock and ${composerRepository}/composer.lock" - if ! @cmp@ -s "composer.lock" "${composerRepository}/composer.lock"; then - echo - echo -e "\e[31mERROR: vendorHash is out of date\e[0m" - echo - echo -e "\e[31mcomposer.lock is not the same in $composerRepository\e[0m" - echo - echo -e "\e[31mTo fix the issue:\e[0m" - echo -e '\e[31m1. Set vendorHash to an empty string: `vendorHash = "";`\e[0m' - echo -e '\e[31m2. Build the derivation and wait for it to fail with a hash mismatch\e[0m' - echo -e '\e[31m3. Copy the "got: sha256-..." value back into the vendorHash field\e[0m' - echo -e '\e[31m You should have: vendorHash = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=";\e[0m' - echo - - exit 1 - fi - - chmod +w composer.json composer.lock + chmod +w composer.{json,lock} echo "Finished composerInstallConfigureHook" } @@ -79,12 +60,6 @@ composerInstallConfigureHook() { composerInstallBuildHook() { echo "Executing composerInstallBuildHook" - setComposeRootVersion - - # Since this file cannot be generated in the composer-repository-hook.sh - # because the file contains hardcoded nix store paths, we generate it here. - composer build-local-repo-lock -m "${composerRepository}" . - echo "Finished composerInstallBuildHook" } @@ -99,17 +74,7 @@ composerInstallCheckHook() { composerInstallInstallHook() { echo "Executing composerInstallInstallHook" - setComposeRootVersion - - # Finally, run `composer install` to install the dependencies and generate - # the autoloader. - composer \ - --no-interaction \ - --no-progress \ - ${composerNoDev:+--no-dev} \ - ${composerNoPlugins:+--no-plugins} \ - ${composerNoScripts:+--no-scripts} \ - install + cp -ar ${composerVendor}/* . # Copy the relevant files only in the store. mkdir -p "$out"/share/php/"${pname}" diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-repository-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh similarity index 50% rename from pkgs/build-support/php/builders/v2/hooks/composer-repository-hook.sh rename to pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index ec9777541fc0..7a14e544ae0d 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-repository-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -5,34 +5,35 @@ declare composerNoPlugins declare composerNoScripts declare composerStrictValidation -preConfigureHooks+=(composerRepositoryConfigureHook) -preBuildHooks+=(composerRepositoryBuildHook) -preCheckHooks+=(composerRepositoryCheckHook) -preInstallHooks+=(composerRepositoryInstallHook) +preConfigureHooks+=(composerVendorConfigureHook) +preBuildHooks+=(composerVendorBuildHook) +preCheckHooks+=(composerVendorCheckHook) +preInstallHooks+=(composerVendorInstallHook) source @phpScriptUtils@ -composerRepositoryConfigureHook() { - echo "Executing composerRepositoryConfigureHook" +composerVendorConfigureHook() { + echo "Executing composerVendorConfigureHook" + + setComposeRootVersion if [[ -e "$composerLock" ]]; then - cp $composerLock composer.lock + echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m" + install -Dm644 $composerLock ./composer.lock fi if [[ ! -f "composer.lock" ]]; then - setComposeRootVersion - composer \ --no-install \ --no-interaction \ --no-progress \ + --optimize-autoloader \ ${composerNoDev:+--no-dev} \ ${composerNoPlugins:+--no-plugins} \ ${composerNoScripts:+--no-scripts} \ update - mkdir -p $out - cp composer.lock $out/ + install -Dm644 composer.lock -t $out/ echo echo -e "\e[31mERROR: No composer.lock found\e[0m" @@ -50,42 +51,41 @@ composerRepositoryConfigureHook() { exit 1 fi - echo "Finished composerRepositoryConfigureHook" + chmod +w composer.{json,lock} + + echo "Finished composerVendorConfigureHook" } -composerRepositoryBuildHook() { - echo "Executing composerRepositoryBuildHook" +composerVendorBuildHook() { + echo "Executing composerVendorBuildHook" - mkdir -p repository + composer \ + --apcu-autoloader \ + --apcu-autoloader-prefix="$(jq -r -c 'try ."content-hash"' < composer.lock)" \ + --no-interaction \ + --no-progress \ + --optimize-autoloader \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + install - setComposeRootVersion - - # Build the local composer repository - # The command 'build-local-repo' is provided by the Composer plugin - # nix-community/composer-local-repo-plugin. - composer build-local-repo-lock ${composerNoDev:+--no-dev} -r repository - - echo "Finished composerRepositoryBuildHook" + echo "Finished composerVendorBuildHook" } -composerRepositoryCheckHook() { - echo "Executing composerRepositoryCheckHook" +composerVendorCheckHook() { + echo "Executing composerVendorCheckHook" checkComposerValidate - echo "Finished composerRepositoryCheckHook" + echo "Finished composerVendorCheckHook" } -composerRepositoryInstallHook() { - echo "Executing composerRepositoryInstallHook" +composerVendorInstallHook() { + echo "Executing composerVendorInstallHook" mkdir -p $out + cp -ar composer.{json,lock} $(composer config vendor-dir) $out/ - cp -ar repository/. $out/ - - # Copy the composer.lock files to the output directory, to be able to validate consistency with - # the src composer.lock file where this fixed-output derivation is used - cp composer.lock $out/ - - echo "Finished composerRepositoryInstallHook" + echo "Finished composerVendorInstallHook" } diff --git a/pkgs/build-support/php/builders/v2/hooks/default.nix b/pkgs/build-support/php/builders/v2/hooks/default.nix index 4c0ba1b18801..e4d6dcd8ffc7 100644 --- a/pkgs/build-support/php/builders/v2/hooks/default.nix +++ b/pkgs/build-support/php/builders/v2/hooks/default.nix @@ -16,8 +16,8 @@ let }; in { - composerRepositoryHook = makeSetupHook { - name = "composer-repository-hook.sh"; + composerVendorHook = makeSetupHook { + name = "composer-vendor-hook.sh"; propagatedBuildInputs = [ jq moreutils @@ -26,7 +26,7 @@ in substitutions = { phpScriptUtils = lib.getExe php-script-utils; }; - } ./composer-repository-hook.sh; + } ./composer-vendor-hook.sh; composerInstallHook = makeSetupHook { name = "composer-install-hook.sh"; diff --git a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash index 65c0a3b410f6..3e8299bf15d3 100644 --- a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash @@ -14,8 +14,6 @@ setComposeRootVersion() { } checkComposerValidate() { - setComposeRootVersion - if [ "1" == "${composerGlobal-}" ]; then global="global"; else diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 69716f05b6da..8146df5037a3 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -164,7 +164,7 @@ let nixos = lib.recurseIntoAttrs nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; package = tests.php; }; - inherit (php-packages) extensions buildPecl mkComposerRepository buildComposerProject buildComposerWithPlugin composerHooks mkExtension; + inherit (php-packages) extensions buildPecl mkComposerRepository mkComposerVendor buildComposerProject buildComposerProject2 buildComposerWithPlugin composerHooks composerHooks2 mkExtension; packages = php-packages.tools; meta = php.meta // { outputsToInstall = [ "out" ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 093c47147877..610b3994f1c1 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -58,6 +58,11 @@ in { inherit (builders.v1) buildComposerProject buildComposerWithPlugin composerHooks mkComposerRepository; + # Next version of the builder + buildComposerProject2 = builders.v2.buildComposerProject; + composerHooks2 = builders.v2.composerHooks; + mkComposerVendor = builders.v2.mkComposerVendor; + # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. mkDerivation = origArgs: From 9734fe62434afe7b73bc13b6d618de23e7915d75 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 7 May 2024 15:18:11 +0200 Subject: [PATCH 031/233] phpunit: switch to `buildComposerProject2` --- 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 258e76c3fed8..55d6064f5dbf 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -4,7 +4,7 @@ , php }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; version = "11.3.1"; @@ -15,7 +15,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-uTH5LlXabhsu86Te/oNnIrvq88MhAqYbVTyKEaPtTuU="; }; - vendorHash = "sha256-hAIuAX3cBxs+mubgS/RlJ+QELvFoV35nAVDmkcaOddY="; + vendorHash = "sha256-cOy5kipPr73LbxmQAsqqR0GfegQp1ARrbqei2zi5JHc="; passthru.updateScript = nix-update-script { }; From 8890dd5fb5db143944d96f55125d5afedf5663a9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 7 May 2024 15:18:33 +0200 Subject: [PATCH 032/233] php.packages.psalm: switch to `buildComposerProject2` --- .../php-packages/psalm/composer.lock | 542 +++++++++--------- .../php-packages/psalm/default.nix | 6 +- 2 files changed, 283 insertions(+), 265 deletions(-) diff --git a/pkgs/development/php-packages/psalm/composer.lock b/pkgs/development/php-packages/psalm/composer.lock index 782901f11bd0..3b53cd6fc603 100644 --- a/pkgs/development/php-packages/psalm/composer.lock +++ b/pkgs/development/php-packages/psalm/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "amphp/amp", - "version": "v2.6.2", + "version": "v2.6.4", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", "shasum": "" }, "require": { @@ -29,8 +29,8 @@ "ext-json": "*", "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^7 | ^8 | ^9", - "psalm/phar": "^3.11@dev", - "react/promise": "^2" + "react/promise": "^2", + "vimeo/psalm": "^3.12" }, "type": "library", "extra": { @@ -85,7 +85,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.2" + "source": "https://github.com/amphp/amp/tree/v2.6.4" }, "funding": [ { @@ -93,20 +93,20 @@ "type": "github" } ], - "time": "2022-02-20T17:52:18+00:00" + "time": "2024-03-21T18:52:26+00:00" }, { "name": "amphp/byte-stream", - "version": "v1.8.1", + "version": "v1.8.2", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc", + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc", "shasum": "" }, "require": { @@ -122,11 +122,6 @@ "psalm/phar": "^3.11.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "files": [ "lib/functions.php" @@ -150,7 +145,7 @@ } ], "description": "A stream abstraction to make working with non-blocking I/O simple.", - "homepage": "http://amphp.org/byte-stream", + "homepage": "https://amphp.org/byte-stream", "keywords": [ "amp", "amphp", @@ -160,9 +155,8 @@ "stream" ], "support": { - "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/byte-stream/issues", - "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + "source": "https://github.com/amphp/byte-stream/tree/v1.8.2" }, "funding": [ { @@ -170,20 +164,20 @@ "type": "github" } ], - "time": "2021-03-30T17:13:30+00:00" + "time": "2024-04-13T18:00:56+00:00" }, { "name": "composer/pcre", - "version": "3.1.1", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", "shasum": "" }, "require": { @@ -225,7 +219,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.1" + "source": "https://github.com/composer/pcre/tree/3.1.3" }, "funding": [ { @@ -241,7 +235,7 @@ "type": "tidelift" } ], - "time": "2023-10-11T07:11:09+00:00" + "time": "2024-03-19T10:26:25+00:00" }, { "name": "composer/semver", @@ -326,16 +320,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255", + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255", "shasum": "" }, "require": { @@ -346,7 +340,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -370,9 +364,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.4" }, "funding": [ { @@ -388,7 +382,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-03-26T18:29:49+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -689,21 +683,21 @@ }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v4.19.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", @@ -739,9 +733,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-03-17T08:10:35+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -798,28 +792,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", + "version": "5.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "reference": "298d2febfe79d03fe714eb871d5538da55205b1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a", + "reference": "298d2febfe79d03fe714eb871d5538da55205b1a", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.1", "ext-filter": "*", - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", + "phpdocumentor/type-resolver": "^1.7", + "phpstan/phpdoc-parser": "^1.7", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" + "mockery/mockery": "~1.3.5", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-webmozart-assert": "^1.2", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^5.13" }, "type": "library", "extra": { @@ -843,15 +844,15 @@ }, { "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "email": "opensource@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0" }, - "time": "2021-10-19T17:43:47+00:00" + "time": "2024-04-09T21:13:58+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -913,16 +914,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.26.0", + "version": "1.28.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" + "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", "shasum": "" }, "require": { @@ -954,9 +955,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" }, - "time": "2024-02-23T16:05:55+00:00" + "time": "2024-04-03T18:51:33+00:00" }, { "name": "psr/container", @@ -1063,16 +1064,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -1117,7 +1118,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" }, "funding": [ { @@ -1125,20 +1126,20 @@ "type": "github" } ], - "time": "2023-05-07T05:35:17+00:00" + "time": "2024-03-02T06:30:58+00:00" }, { "name": "spatie/array-to-xml", - "version": "3.2.3", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab" + "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/c95fd4db94ec199f798d4b5b4a81757bd20d88ab", - "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f56b220fe2db1ade4c88098d83413ebdfc3bf876", + "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876", "shasum": "" }, "require": { @@ -1151,6 +1152,11 @@ "spatie/pest-plugin-snapshots": "^1.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, "autoload": { "psr-4": { "Spatie\\ArrayToXml\\": "src" @@ -1176,7 +1182,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.2.3" + "source": "https://github.com/spatie/array-to-xml/tree/3.3.0" }, "funding": [ { @@ -1188,20 +1194,20 @@ "type": "github" } ], - "time": "2024-02-07T10:39:02+00:00" + "time": "2024-05-01T10:20:27+00:00" }, { "name": "symfony/console", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", + "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", "shasum": "" }, "require": { @@ -1266,7 +1272,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.4" + "source": "https://github.com/symfony/console/tree/v6.4.7" }, "funding": [ { @@ -1282,20 +1288,20 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:10+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -1304,7 +1310,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1333,7 +1339,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -1349,26 +1355,27 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/filesystem", - "version": "v6.4.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" + "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", - "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/78dde75f8f6dbbca4ec436a4b0087f7af02076d4", + "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4", "shasum": "" }, "require": { "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8" + "symfony/polyfill-mbstring": "~1.8", + "symfony/process": "^5.4|^6.4" }, "type": "library", "autoload": { @@ -1396,7 +1403,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.3" + "source": "https://github.com/symfony/filesystem/tree/v6.4.7" }, "funding": [ { @@ -1412,7 +1419,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1733,22 +1740,84 @@ "time": "2024-01-29T20:11:03+00:00" }, { - "name": "symfony/service-contracts", - "version": "v3.4.1", + "name": "symfony/process", + "version": "v6.4.7", "source": { "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + "url": "https://github.com/symfony/process.git", + "reference": "cdb1c81c145fd5aa9b0038bab694035020943381" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "url": "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381", + "reference": "cdb1c81c145fd5aa9b0038bab694035020943381", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Executes commands in sub-processes", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v6.4.7" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:22:46+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^1.1|^2.0" + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -1756,7 +1825,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1796,7 +1865,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { @@ -1812,20 +1881,20 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/string", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", - "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69", + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69", "shasum": "" }, "require": { @@ -1882,7 +1951,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.4" + "source": "https://github.com/symfony/string/tree/v6.4.7" }, "funding": [ { @@ -1898,7 +1967,7 @@ "type": "tidelift" } ], - "time": "2024-02-01T13:16:41+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "webmozart/assert", @@ -2075,16 +2144,16 @@ }, { "name": "brianium/paratest", - "version": "v6.11.0", + "version": "v6.11.1", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "8083a421cee7dad847ee7c464529043ba30de380" + "reference": "78e297a969049ca7cc370e80ff5e102921ef39a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/8083a421cee7dad847ee7c464529043ba30de380", - "reference": "8083a421cee7dad847ee7c464529043ba30de380", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/78e297a969049ca7cc370e80ff5e102921ef39a3", + "reference": "78e297a969049ca7cc370e80ff5e102921ef39a3", "shasum": "" }, "require": { @@ -2151,7 +2220,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v6.11.0" + "source": "https://github.com/paratestphp/paratest/tree/v6.11.1" }, "funding": [ { @@ -2163,7 +2232,7 @@ "type": "paypal" } ], - "time": "2023-10-31T09:13:57+00:00" + "time": "2024-03-13T06:54:29+00:00" }, { "name": "composer/package-versions-deprecated", @@ -2492,16 +2561,16 @@ }, { "name": "jean85/pretty-package-versions", - "version": "2.0.5", + "version": "2.0.6", "source": { "type": "git", "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af" + "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af", - "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/f9fdd29ad8e6d024f52678b570e5593759b550b4", + "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4", "shasum": "" }, "require": { @@ -2509,9 +2578,9 @@ "php": "^7.1|^8.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.17", + "friendsofphp/php-cs-fixer": "^3.2", "jean85/composer-provided-replaced-stub-package": "^1.0", - "phpstan/phpstan": "^0.12.66", + "phpstan/phpstan": "^1.4", "phpunit/phpunit": "^7.5|^8.5|^9.4", "vimeo/psalm": "^4.3" }, @@ -2545,22 +2614,22 @@ ], "support": { "issues": "https://github.com/Jean85/pretty-package-versions/issues", - "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.5" + "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.6" }, - "time": "2021-10-08T21:21:46+00:00" + "time": "2024-03-08T09:58:59+00:00" }, { "name": "mockery/mockery", - "version": "1.6.7", + "version": "1.6.11", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06" + "reference": "81a161d0b135df89951abd52296adf97deb0723d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", - "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", + "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d", + "reference": "81a161d0b135df89951abd52296adf97deb0723d", "shasum": "" }, "require": { @@ -2572,8 +2641,8 @@ "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.6.10", - "symplify/easy-coding-standard": "^12.0.8" + "phpunit/phpunit": "^8.5 || ^9.6.17", + "symplify/easy-coding-standard": "^12.1.14" }, "type": "library", "autoload": { @@ -2630,7 +2699,7 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2023-12-10T02:24:34+00:00" + "time": "2024-03-21T18:34:15+00:00" }, { "name": "myclabs/deep-copy", @@ -2766,20 +2835,21 @@ }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -2820,9 +2890,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -2877,16 +2953,16 @@ }, { "name": "php-parallel-lint/php-parallel-lint", - "version": "v1.3.2", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de" + "reference": "6db563514f27e19595a19f45a4bf757b6401194e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6483c9832e71973ed29cf71bd6b3f4fde438a9de", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6db563514f27e19595a19f45a4bf757b6401194e", + "reference": "6db563514f27e19595a19f45a4bf757b6401194e", "shasum": "" }, "require": { @@ -2924,26 +3000,30 @@ "email": "ahoj@jakubonderka.cz" } ], - "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "description": "This tool checks the syntax of PHP files about 20x faster than serial check.", "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", + "keywords": [ + "lint", + "static analysis" + ], "support": { "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", - "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.2" + "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.4.0" }, - "time": "2022-02-21T12:50:22+00:00" + "time": "2024-03-27T12:14:49+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.30", + "version": "9.2.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", "shasum": "" }, "require": { @@ -3000,7 +3080,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" }, "funding": [ { @@ -3008,7 +3088,7 @@ "type": "github" } ], - "time": "2023-12-22T06:47:57+00:00" + "time": "2024-03-02T06:37:42+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3253,16 +3333,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.17", + "version": "9.6.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd" + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd", - "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", "shasum": "" }, "require": { @@ -3336,7 +3416,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" }, "funding": [ { @@ -3352,7 +3432,7 @@ "type": "tidelift" } ], - "time": "2024-02-23T13:14:51+00:00" + "time": "2024-04-05T04:35:58+00:00" }, { "name": "psalm/plugin-mockery", @@ -3473,16 +3553,16 @@ }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", "shasum": "" }, "require": { @@ -3517,7 +3597,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" }, "funding": [ { @@ -3525,7 +3605,7 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2024-03-02T06:27:43+00:00" }, { "name": "sebastian/code-unit", @@ -3834,16 +3914,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", "shasum": "" }, "require": { @@ -3899,7 +3979,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" }, "funding": [ { @@ -3907,20 +3987,20 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2024-03-02T06:33:00+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.6", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bde739e7565280bda77be70044ac1047bc007e34" + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", - "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", "shasum": "" }, "require": { @@ -3963,7 +4043,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" }, "funding": [ { @@ -3971,7 +4051,7 @@ "type": "github" } ], - "time": "2023-08-02T09:26:13+00:00" + "time": "2024-03-02T06:35:11+00:00" }, { "name": "sebastian/lines-of-code", @@ -4207,16 +4287,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -4228,7 +4308,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -4249,8 +4329,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -4258,7 +4337,7 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", @@ -4371,32 +4450,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.14.1", + "version": "8.15.0", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926" + "reference": "7d1d957421618a3803b593ec31ace470177d7817" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/fea1fd6f137cc84f9cba0ae30d549615dbc6a926", - "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817", + "reference": "7d1d957421618a3803b593ec31ace470177d7817", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", "php": "^7.2 || ^8.0", "phpstan/phpdoc-parser": "^1.23.1", - "squizlabs/php_codesniffer": "^3.7.1" + "squizlabs/php_codesniffer": "^3.9.0" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.10.37", + "phpstan/phpstan": "1.10.60", "phpstan/phpstan-deprecation-rules": "1.1.4", - "phpstan/phpstan-phpunit": "1.3.14", - "phpstan/phpstan-strict-rules": "1.5.1", - "phpunit/phpunit": "8.5.21|9.6.8|10.3.5" + "phpstan/phpstan-phpunit": "1.3.16", + "phpstan/phpstan-strict-rules": "1.5.2", + "phpunit/phpunit": "8.5.21|9.6.8|10.5.11" }, "type": "phpcodesniffer-standard", "extra": { @@ -4420,7 +4499,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.14.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.15.0" }, "funding": [ { @@ -4432,20 +4511,20 @@ "type": "tidelift" } ], - "time": "2023-10-08T07:28:08+00:00" + "time": "2024-03-09T15:20:58+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.0", + "version": "3.9.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", "shasum": "" }, "require": { @@ -4512,81 +4591,20 @@ "type": "open_collective" } ], - "time": "2024-02-16T15:06:51+00:00" - }, - { - "name": "symfony/process", - "version": "v6.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "710e27879e9be3395de2b98da3f52a946039f297" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", - "reference": "710e27879e9be3395de2b98da3f52a946039f297", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Executes commands in sub-processes", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/process/tree/v6.4.4" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-02-20T12:31:00+00:00" + "time": "2024-04-23T20:25:34+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -4615,7 +4633,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -4623,7 +4641,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" } ], "aliases": [], diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index ead6c98ed5d8..3fac6d4cfd89 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -4,7 +4,7 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "psalm"; version = "5.22.2"; @@ -12,13 +12,13 @@ php.buildComposerProject (finalAttrs: { owner = "vimeo"; repo = "psalm"; rev = finalAttrs.version; - hash = "sha256-M8Ds3PQGphK8lQciWNdxWkMN35q8vdaNTWTrP1WXTeg="; + hash = "sha256-27CdDg6DDgGTx+V+oso2keCyXLDrHwAYcegrxvgotgQ="; }; # Missing `composer.lock` from the repository. # Issue open at https://github.com/vimeo/psalm/issues/10446 composerLock = ./composer.lock; - vendorHash = "sha256-AgvAaHcCYosS3yRrp9EFdqTjg6NzQRCr8ELSza9DvZ8="; + vendorHash = "sha256-d7+GJ/Tc03tPhCPVXhYKvkkhVkcrBlIMA7vjMqTaX3c="; meta = { changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}"; From 012319af4650f44ad5230be9ff709d8e3ba2fe7d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 May 2024 13:22:16 +0200 Subject: [PATCH 033/233] php.packages.psalm: 5.22.2 -> 5.25.0 --- .../php-packages/psalm/composer.lock | 425 +++++++++--------- .../php-packages/psalm/default.nix | 6 +- 2 files changed, 221 insertions(+), 210 deletions(-) diff --git a/pkgs/development/php-packages/psalm/composer.lock b/pkgs/development/php-packages/psalm/composer.lock index 3b53cd6fc603..e83e9154b272 100644 --- a/pkgs/development/php-packages/psalm/composer.lock +++ b/pkgs/development/php-packages/psalm/composer.lock @@ -168,30 +168,38 @@ }, { "name": "composer/pcre", - "version": "3.1.3", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" + "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", - "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90", + "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, + "conflict": { + "phpstan/phpstan": "<1.11.8" + }, "require-dev": { - "phpstan/phpstan": "^1.3", + "phpstan/phpstan": "^1.11.8", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" + "phpunit/phpunit": "^8 || ^9" }, "type": "library", "extra": { "branch-alias": { "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { @@ -219,7 +227,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.3" + "source": "https://github.com/composer/pcre/tree/3.2.0" }, "funding": [ { @@ -235,20 +243,20 @@ "type": "tidelift" } ], - "time": "2024-03-19T10:26:25+00:00" + "time": "2024-07-25T09:36:02+00:00" }, { "name": "composer/semver", - "version": "3.4.0", + "version": "3.4.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6", + "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6", "shasum": "" }, "require": { @@ -300,7 +308,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" + "source": "https://github.com/composer/semver/tree/3.4.2" }, "funding": [ { @@ -316,20 +324,20 @@ "type": "tidelift" } ], - "time": "2023-08-31T09:50:34+00:00" + "time": "2024-07-12T11:35:52+00:00" }, { "name": "composer/xdebug-handler", - "version": "3.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255" + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255", - "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", "shasum": "" }, "require": { @@ -366,7 +374,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.4" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" }, "funding": [ { @@ -382,7 +390,7 @@ "type": "tidelift" } ], - "time": "2024-03-26T18:29:49+00:00" + "time": "2024-05-06T16:37:16+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -792,16 +800,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.0", + "version": "5.4.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a" + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", "shasum": "" }, "require": { @@ -850,9 +858,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" }, - "time": "2024-04-09T21:13:58+00:00" + "time": "2024-05-21T05:55:05+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -914,16 +922,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.28.0", + "version": "1.29.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", "shasum": "" }, "require": { @@ -955,9 +963,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" }, - "time": "2024-04-03T18:51:33+00:00" + "time": "2024-05-31T08:52:43+00:00" }, { "name": "psr/container", @@ -1198,47 +1206,46 @@ }, { "name": "symfony/console", - "version": "v6.4.7", + "version": "v7.1.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f" + "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", - "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", + "url": "https://api.github.com/repos/symfony/console/zipball/cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9", + "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", + "php": ">=8.2", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0|^7.0" + "symfony/string": "^6.4|^7.0" }, "conflict": { - "symfony/dependency-injection": "<5.4", - "symfony/dotenv": "<5.4", - "symfony/event-dispatcher": "<5.4", - "symfony/lock": "<5.4", - "symfony/process": "<5.4" + "symfony/dependency-injection": "<6.4", + "symfony/dotenv": "<6.4", + "symfony/event-dispatcher": "<6.4", + "symfony/lock": "<6.4", + "symfony/process": "<6.4" }, "provide": { "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/event-dispatcher": "^6.4|^7.0", "symfony/http-foundation": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0", - "symfony/lock": "^5.4|^6.0|^7.0", - "symfony/messenger": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "symfony/stopwatch": "^5.4|^6.0|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" + "symfony/lock": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/stopwatch": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1272,7 +1279,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.7" + "source": "https://github.com/symfony/console/tree/v7.1.3" }, "funding": [ { @@ -1288,7 +1295,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-07-26T12:41:01+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1359,23 +1366,25 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.7", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4" + "reference": "92a91985250c251de9b947a14bb2c9390b1a562c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/78dde75f8f6dbbca4ec436a4b0087f7af02076d4", - "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c", + "reference": "92a91985250c251de9b947a14bb2c9390b1a562c", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/process": "^5.4|^6.4" + "symfony/polyfill-mbstring": "~1.8" + }, + "require-dev": { + "symfony/process": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1403,7 +1412,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.7" + "source": "https://github.com/symfony/filesystem/tree/v7.1.2" }, "funding": [ { @@ -1419,20 +1428,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-06-28T10:03:55+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "0424dff1c58f028c451efff2045f5d92410bd540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", + "reference": "0424dff1c58f028c451efff2045f5d92410bd540", "shasum": "" }, "require": { @@ -1482,7 +1491,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" }, "funding": [ { @@ -1498,20 +1507,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", "shasum": "" }, "require": { @@ -1560,7 +1569,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" }, "funding": [ { @@ -1576,20 +1585,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", "shasum": "" }, "require": { @@ -1641,7 +1650,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" }, "funding": [ { @@ -1657,20 +1666,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", "shasum": "" }, "require": { @@ -1721,7 +1730,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" }, "funding": [ { @@ -1737,68 +1746,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/process", - "version": "v6.4.7", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "cdb1c81c145fd5aa9b0038bab694035020943381" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381", - "reference": "cdb1c81c145fd5aa9b0038bab694035020943381", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Executes commands in sub-processes", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/process/tree/v6.4.7" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/service-contracts", @@ -1885,20 +1833,20 @@ }, { "name": "symfony/string", - "version": "v6.4.7", + "version": "v7.1.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69" + "reference": "ea272a882be7f20cad58d5d78c215001617b7f07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69", - "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69", + "url": "https://api.github.com/repos/symfony/string/zipball/ea272a882be7f20cad58d5d78c215001617b7f07", + "reference": "ea272a882be7f20cad58d5d78c215001617b7f07", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", @@ -1908,11 +1856,12 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0|^7.0", - "symfony/http-client": "^5.4|^6.0|^7.0", - "symfony/intl": "^6.2|^7.0", + "symfony/emoji": "^7.1", + "symfony/error-handler": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0|^7.0" + "symfony/var-exporter": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -1951,7 +1900,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.7" + "source": "https://github.com/symfony/string/tree/v7.1.3" }, "funding": [ { @@ -1967,7 +1916,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:22:46+00:00" + "time": "2024-07-22T10:25:37+00:00" }, { "name": "webmozart/assert", @@ -2387,16 +2336,16 @@ }, { "name": "dg/bypass-finals", - "version": "v1.6.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/dg/bypass-finals.git", - "reference": "efe2fe04bae9f0de271dd462afc049067889e6d1" + "reference": "86b00f0d900c7e15d3341e687e0df89e8c2d4632" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dg/bypass-finals/zipball/efe2fe04bae9f0de271dd462afc049067889e6d1", - "reference": "efe2fe04bae9f0de271dd462afc049067889e6d1", + "url": "https://api.github.com/repos/dg/bypass-finals/zipball/86b00f0d900c7e15d3341e687e0df89e8c2d4632", + "reference": "86b00f0d900c7e15d3341e687e0df89e8c2d4632", "shasum": "" }, "require": { @@ -2415,8 +2364,8 @@ "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "GPL-2.0-only", + "GPL-3.0-only" ], "authors": [ { @@ -2434,9 +2383,9 @@ ], "support": { "issues": "https://github.com/dg/bypass-finals/issues", - "source": "https://github.com/dg/bypass-finals/tree/v1.6.0" + "source": "https://github.com/dg/bypass-finals/tree/v1.8.0" }, - "time": "2023-11-19T22:19:30+00:00" + "time": "2024-07-02T22:24:43+00:00" }, { "name": "doctrine/instantiator", @@ -2620,16 +2569,16 @@ }, { "name": "mockery/mockery", - "version": "1.6.11", + "version": "1.6.12", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "81a161d0b135df89951abd52296adf97deb0723d" + "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d", - "reference": "81a161d0b135df89951abd52296adf97deb0723d", + "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699", + "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699", "shasum": "" }, "require": { @@ -2699,20 +2648,20 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2024-03-21T18:34:15+00:00" + "time": "2024-05-16T03:13:13+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -2720,11 +2669,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -2750,7 +2700,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -2758,7 +2708,7 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "nunomaduro/mock-final-classes", @@ -3333,45 +3283,45 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.19", + "version": "9.6.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" + "reference": "49d7820565836236411f5dc002d16dd689cde42f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49d7820565836236411f5dc002d16dd689cde42f", + "reference": "49d7820565836236411f5dc002d16dd689cde42f", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1 || ^2", + "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", - "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-code-coverage": "^9.2.31", + "phpunit/php-file-iterator": "^3.0.6", "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -3416,7 +3366,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.20" }, "funding": [ { @@ -3432,7 +3382,7 @@ "type": "tidelift" } ], - "time": "2024-04-05T04:35:58+00:00" + "time": "2024-07-10T11:45:39+00:00" }, { "name": "psalm/plugin-mockery", @@ -4515,16 +4465,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.2", + "version": "3.10.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" + "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", - "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", "shasum": "" }, "require": { @@ -4591,7 +4541,68 @@ "type": "open_collective" } ], - "time": "2024-04-23T20:25:34+00:00" + "time": "2024-07-21T23:26:44+00:00" + }, + { + "name": "symfony/process", + "version": "v7.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/7f2f542c668ad6c313dc4a5e9c3321f733197eca", + "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca", + "shasum": "" + }, + "require": { + "php": ">=8.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Executes commands in sub-processes", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v7.1.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-07-26T12:44:47+00:00" }, { "name": "theseer/tokenizer", diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 3fac6d4cfd89..f00ceab3f274 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -6,19 +6,19 @@ php.buildComposerProject2 (finalAttrs: { pname = "psalm"; - version = "5.22.2"; + version = "5.25.0"; src = fetchFromGitHub { owner = "vimeo"; repo = "psalm"; rev = finalAttrs.version; - hash = "sha256-27CdDg6DDgGTx+V+oso2keCyXLDrHwAYcegrxvgotgQ="; + hash = "sha256-ecORCwTnTKzy/pgfODu9W9I/5xL+8Fo4OgZ5LsYDYLQ="; }; # Missing `composer.lock` from the repository. # Issue open at https://github.com/vimeo/psalm/issues/10446 composerLock = ./composer.lock; - vendorHash = "sha256-d7+GJ/Tc03tPhCPVXhYKvkkhVkcrBlIMA7vjMqTaX3c="; + vendorHash = "sha256-8SsGwKeE4b9sRD2STRMjWW50UVy9x8HZsZhT0sIC/Cg="; meta = { changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}"; From 56ab77b1c4de33c65c9907b342064b318c89c13b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 7 May 2024 15:18:41 +0200 Subject: [PATCH 034/233] php.packages.psysh: 0.11.21 -> 0.12.4 We can't upgrade without switching to `buildComposerProject2`. --- .../php-packages/psysh/composer.lock | 929 ------------------ .../php-packages/psysh/default.nix | 42 +- 2 files changed, 36 insertions(+), 935 deletions(-) delete mode 100644 pkgs/development/php-packages/psysh/composer.lock diff --git a/pkgs/development/php-packages/psysh/composer.lock b/pkgs/development/php-packages/psysh/composer.lock deleted file mode 100644 index 94dbc6383e4a..000000000000 --- a/pkgs/development/php-packages/psysh/composer.lock +++ /dev/null @@ -1,929 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "90272fdd8203a2aef4218d76aca6b2e9", - "packages": [ - { - "name": "nikic/php-parser", - "version": "v4.17.1", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.0" - }, - "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.9-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" - }, - "time": "2023-08-13T19:53:39+00:00" - }, - { - "name": "psr/container", - "version": "2.0.2", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", - "shasum": "" - }, - "require": { - "php": ">=7.4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/2.0.2" - }, - "time": "2021-11-05T16:47:00+00:00" - }, - { - "name": "symfony/console", - "version": "v6.3.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0" - }, - "conflict": { - "symfony/dependency-injection": "<5.4", - "symfony/dotenv": "<5.4", - "symfony/event-dispatcher": "<5.4", - "symfony/lock": "<5.4", - "symfony/process": "<5.4" - }, - "provide": { - "psr/log-implementation": "1.0|2.0|3.0" - }, - "require-dev": { - "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Eases the creation of beautiful and testable command line interfaces", - "homepage": "https://symfony.com", - "keywords": [ - "cli", - "command-line", - "console", - "terminal" - ], - "support": { - "source": "https://github.com/symfony/console/tree/v6.3.4" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-08-16T10:10:12+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v3.3.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-05-23T14:45:45+00:00" - }, - { - "name": "symfony/polyfill-ctype", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-ctype": "*" - }, - "suggest": { - "ext-ctype": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-01-26T09:26:14+00:00" - }, - { - "name": "symfony/polyfill-intl-grapheme", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "875e90aeea2777b6f135677f618529449334a612" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", - "reference": "875e90aeea2777b6f135677f618529449334a612", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's grapheme_* functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "grapheme", - "intl", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-01-26T09:26:14+00:00" - }, - { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-01-26T09:26:14+00:00" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-mbstring": "*" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-07-28T09:04:16+00:00" - }, - { - "name": "symfony/service-contracts", - "version": "v3.3.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "psr/container": "^2.0" - }, - "conflict": { - "ext-psr": "<1.1|>=2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Service\\": "" - }, - "exclude-from-classmap": [ - "/Test/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to writing services", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.3.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-05-23T14:45:45+00:00" - }, - { - "name": "symfony/string", - "version": "v6.3.5", - "source": { - "type": "git", - "url": "https://github.com/symfony/string.git", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.0", - "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/translation-contracts": "<2.5" - }, - "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", - "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0" - }, - "type": "library", - "autoload": { - "files": [ - "Resources/functions.php" - ], - "psr-4": { - "Symfony\\Component\\String\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", - "homepage": "https://symfony.com", - "keywords": [ - "grapheme", - "i18n", - "string", - "unicode", - "utf-8", - "utf8" - ], - "support": { - "source": "https://github.com/symfony/string/tree/v6.3.5" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-09-18T10:38:32+00:00" - }, - { - "name": "symfony/var-dumper", - "version": "v6.3.5", - "source": { - "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3d9999376be5fea8de47752837a3e1d1c5f69ef5", - "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/console": "<5.4" - }, - "require-dev": { - "ext-iconv": "*", - "symfony/console": "^5.4|^6.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/uid": "^5.4|^6.0", - "twig/twig": "^2.13|^3.0.4" - }, - "bin": [ - "Resources/bin/var-dump-server" - ], - "type": "library", - "autoload": { - "files": [ - "Resources/functions/dump.php" - ], - "psr-4": { - "Symfony\\Component\\VarDumper\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides mechanisms for walking through any arbitrary PHP variable", - "homepage": "https://symfony.com", - "keywords": [ - "debug", - "dump" - ], - "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.3.5" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-09-12T10:11:35+00:00" - } - ], - "packages-dev": [ - { - "name": "bamarni/composer-bin-plugin", - "version": "1.8.2", - "source": { - "type": "git", - "url": "https://github.com/bamarni/composer-bin-plugin.git", - "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880", - "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^2.0", - "php": "^7.2.5 || ^8.0" - }, - "require-dev": { - "composer/composer": "^2.0", - "ext-json": "*", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", - "phpunit/phpunit": "^8.5 || ^9.5", - "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", - "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", - "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0" - }, - "type": "composer-plugin", - "extra": { - "class": "Bamarni\\Composer\\Bin\\BamarniBinPlugin" - }, - "autoload": { - "psr-4": { - "Bamarni\\Composer\\Bin\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "No conflicts for your bin dependencies", - "keywords": [ - "composer", - "conflict", - "dependency", - "executable", - "isolation", - "tool" - ], - "support": { - "issues": "https://github.com/bamarni/composer-bin-plugin/issues", - "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.2" - }, - "time": "2022-10-31T08:38:03+00:00" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": "^8.0 || ^7.0.8", - "ext-json": "*", - "ext-tokenizer": "*" - }, - "platform-dev": [], - "plugin-api-version": "2.6.0" -} diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index 6bcb55ebb712..e30fc51cfd8b 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -1,22 +1,52 @@ { fetchFromGitHub, + fetchurl, lib, php, }: -php.buildComposerProject (finalAttrs: { +let pname = "psysh"; - version = "0.11.21"; + version = "0.12.4"; src = fetchFromGitHub { owner = "bobthecow"; repo = "psysh"; - rev = "v${finalAttrs.version}"; - hash = "sha256-YuBn4mrgOzGeMGfGcyZySAISmQdv3WRGn91PRozyxdI="; + rev = "v${version}"; + hash = "sha256-Zvo0QWHkQhYD9OeT8cgTo2AW5tClzQfwdohSUd8pRBQ="; }; - composerLock = ./composer.lock; - vendorHash = "sha256-FZFeO7UiVssxTf0JX6wdjrAE+jucYnfQJA1eOng39lQ="; + composerLock = fetchurl { + name = "composer.lock"; + url = "https://github.com/bobthecow/psysh/releases/download/v${version}/composer-v${version}.lock"; + hash = "sha256-ur6mzla3uXeFL6aEHAPdpxGdvcgzOgTLW/CKPbNqeCg="; + }; +in +php.buildComposerProject2 (finalAttrs: { + inherit + pname + version + composerLock + src + ; + + composerVendor = php.mkComposerVendor { + inherit + src + version + pname + composerLock + ; + + preBuild = '' + composer config platform.php 7.4 + composer require --no-update symfony/polyfill-iconv:1.29 symfony/polyfill-mbstring:1.29 + composer require --no-update --dev roave/security-advisories:dev-latest + composer update --lock --no-install + ''; + + vendorHash = "sha256-mW276lzOTCY68EnvSVR+tD+gh3Y61GrWchVJHDZ4dpg="; + }; meta = { changelog = "https://github.com/bobthecow/psysh/releases/tag/v${finalAttrs.version}"; From a9585cafb96fcb21cee4c2e7a8321c63be0253fc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 15 May 2024 12:34:35 +0200 Subject: [PATCH 035/233] n98-magerun2: switch to `buildComposerProject2` --- pkgs/by-name/n9/n98-magerun2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index a11c15d20453..8701ae75de43 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -4,7 +4,7 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "n98-magerun2"; version = "7.4.0"; @@ -15,7 +15,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-OPvyZ0r7Zt4PC+rmRtBm9EkbaE4PeovnUHrhzXUqT8E="; }; - vendorHash = "sha256-HSkcYbDQPK1ByG8Euq9YqzK0jqjKrWO+0R4ungFDOIY="; + vendorHash = "sha256-E2V5ARNCmGOmGGctfcjpW49cxFBcWyJEodBNjHhKQ+w="; meta = { changelog = "https://magerun.net/category/magerun/"; From 35ab61e8e8969c240cd1fbf7476c433f6146202c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 May 2024 13:03:41 +0200 Subject: [PATCH 036/233] php.packages.phpstan: switch to `buildComposerProject2` --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index ddddfd7a87f5..06636953beea 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -4,7 +4,7 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; version = "1.11.8"; @@ -15,7 +15,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-wF2OqJ0kg+wEjSq8mAyF5em5RAqjyXqKFkdAjxOrePM="; }; - vendorHash = "sha256-8WJg3zfPk0tFU5GZvjnqG8iS4p9oOoBWDX0jYhQ1AXw="; + vendorHash = "sha256-NLaOxWMhTViv7OfXE5b7NTeL/jD7Fvbx/1ihGlRJCws="; composerStrictValidation = false; meta = { From d90ff2a850124a19a0df6ce87f9b7feaa2bf930a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 May 2024 13:06:05 +0200 Subject: [PATCH 037/233] php.packages.grumphp: switch to `buildComposerProject2` --- pkgs/development/php-packages/grumphp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index e8506e9e008c..0ae7c520a6bd 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -4,7 +4,7 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "grumphp"; version = "2.6.0"; @@ -15,7 +15,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-W4LNzdgWxXDPL46/C8SX99lpRMp/xL5q5v6vX3H80XU="; }; - vendorHash = "sha256-bpIG3P1BdsYNI59xANaihmjsT7WDKiss3mhi/brA0Mc="; + vendorHash = "sha256-hi6selMMu5UDdMHiyhlXPd/B1BdM/ht+3EAM4Oa5LNU="; meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; From 2baf32a43e6b115d76cd402dc9511d6897e9e902 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 17:49:13 +0000 Subject: [PATCH 038/233] vacuum-go: 0.12.0 -> 0.12.1 --- pkgs/by-name/va/vacuum-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index bbf81d4864f4..b1ca9c285fb7 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vacuum-go"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error rev = "refs/tags/v${version}"; - hash = "sha256-yfwAIcFDnhhPy71WpjNst4S7fn3V6UzkdtSYlr3zmEE="; + hash = "sha256-uNmjb1fj9bMawvNgITxu/RIZeLEn8JzIpFbSMrsmFIQ="; }; vendorHash = "sha256-Yxzj3IAYp6C7qLbV2RV4lWZRDSheauZXvd+p5B5Y3qA="; From 51d0ec5f05b574ac66ae4abb6bba66b66fbda870 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:59:00 +0200 Subject: [PATCH 039/233] python312Packages.msal: 1.29.0 -> 1.30.0 Changelog: https://github.com/AzureAD/microsoft-authentication-library-for-python/releases/tag/1.30.0 --- pkgs/development/python-modules/msal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index cf03f7a027bb..839994e95189 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.29.0"; + version = "1.30.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-j2cl8Jl1JVP5sv6EEl4qXr5HtJ+S6syjPr7dOp66riU="; + hash = "sha256-tL8AhQCS5GUVfYFO+iShj3iChMmkeUkQJNYpAwheovs="; }; nativeBuildInputs = [ setuptools ]; From d4ddd14755d8e8282a18a603854710e6b12f4382 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:59:48 +0200 Subject: [PATCH 040/233] python312Packages.msal: refactor --- pkgs/development/python-modules/msal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 839994e95189..7fa2d3fccf0e 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -21,9 +21,9 @@ buildPythonPackage rec { hash = "sha256-tL8AhQCS5GUVfYFO+iShj3iChMmkeUkQJNYpAwheovs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography pyjwt requests From 0bebb66dbf75a5c4a552aa2737c6b75e2f208495 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 23:00:21 +0200 Subject: [PATCH 041/233] python312Packages.msal-extensions: 1.1.0 -> 1.2.0 Diff: https://github.com/AzureAD/microsoft-authentication-extensions-for-python/compare/refs/tags/1.1.0...1.2.0 Changelog: https://github.com/AzureAD/microsoft-authentication-extensions-for-python/releases/tag/1.2.0 --- pkgs/development/python-modules/msal-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index 7d2cfd7a7023..f4d21bfb8d8f 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "msal-extensions"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "AzureAD"; repo = "microsoft-authentication-extensions-for-python"; rev = "refs/tags/${version}"; - hash = "sha256-ScInTvOgFxP5mgep5FRu6YZHPTtXhrcZGFE7Wdvcm4c="; + hash = "sha256-javYE1XDW1yrMZ/BLqIu/pUXChlBZlACctbD2RfWuis="; }; nativeBuildInputs = [ setuptools ]; From b3fd68140a4d5d5f83c996690c141768e4112827 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 23:00:52 +0200 Subject: [PATCH 042/233] python312Packages.msal-extensions: refactor --- pkgs/development/python-modules/msal-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index f4d21bfb8d8f..3efc69addf32 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -22,9 +22,9 @@ buildPythonPackage rec { hash = "sha256-javYE1XDW1yrMZ/BLqIu/pUXChlBZlACctbD2RfWuis="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ msal portalocker ]; From e0af60030b0775d97ad90bdc4dece34ef669c569 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 12:23:54 +0000 Subject: [PATCH 043/233] beeper-bridge-manager: 0.12.0 -> 0.12.1 --- pkgs/by-name/be/beeper-bridge-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index 17030eb6ccd9..96057b2a49ab 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bbctl"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "beeper"; repo = "bridge-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-xaBLI5Y7PxHbmlwD72AKNrgnz3D+3WVhb2GJr5cmyfs="; + hash = "sha256-MAve7ZNS20XBJ7Qp3mehznli04+MS7RiVWW1txdf19U="; }; - vendorHash = "sha256-VnqihTEGfrLxRfuscrWWBbhZ/tr8BhVnCd+FKblW5gI="; + vendorHash = "sha256-uz4pao8Y/Sb3fffi9d0lbWQEUMohbthA6t6k6PfQz2M="; meta = { description = "Tool for running self-hosted bridges with the Beeper Matrix server. "; From 0c4e5c66a1f1203f7b3e50b136b0d289a3e1ed0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 13:18:46 +0000 Subject: [PATCH 044/233] python312Packages.aiortm: 0.8.17 -> 0.8.18 --- pkgs/development/python-modules/aiortm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 1dcc44c1d408..bb75c7d70dc8 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.8.17"; + version = "0.8.18"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-iZYzERIJslbvmW+4yeHQvXt1EEyZcSR6+qYdpo9EmAg="; + hash = "sha256-tQfTIbLOUNM5dFvQcz07D8Le+ZWUS60YGHaNyf5MK+0="; }; postPatch = '' From 422d853079c4a33223444e990c4842e87ce2165c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Aug 2024 01:09:14 +0200 Subject: [PATCH 045/233] liboop: drop fix liboop: drop --- nixos/modules/rename.nix | 1 + pkgs/development/libraries/liboop/default.nix | 18 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/liboop/default.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index df6090e41d7d..628da0d5567a 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -37,6 +37,7 @@ in The xow package was removed from nixpkgs. Upstream has deprecated the project and users are urged to switch to xone. '') + (mkRemovedOptionModule [ "networking" "liboop" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.") diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix deleted file mode 100644 index 7a5d38db0d36..000000000000 --- a/pkgs/development/libraries/liboop/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation { - pname = "liboop"; - version = "1.0"; - - src = fetchurl { - url = "http://download.ofb.net/liboop/liboop.tar.gz"; - sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c"; - }; - - meta = { - description = "Event loop library"; - homepage = "http://liboop.ofb.net/"; - license = "LGPL"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9c57df4f68d6..f7141ba74865 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -766,6 +766,7 @@ mapAliases ({ libjpeg_drop = libjpeg_original; # Added 2020-06-05 liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 + liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libquotient = libsForQt5.libquotient; # Added 2023-11-11 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af96e0487b56..4b8cbe849bdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22081,8 +22081,6 @@ with pkgs; libomxil-bellagio = callPackage ../development/libraries/libomxil-bellagio { }; - liboop = callPackage ../development/libraries/liboop { }; - libopenaptx = callPackage ../development/libraries/libopenaptx { }; libopenglrecorder = callPackage ../development/libraries/libopenglrecorder { }; From 94bd59582d1408348dfcb15fcc6709fd4af16e14 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 14 Aug 2024 20:49:46 -0400 Subject: [PATCH 046/233] telegram-desktop.tg_owt: 0-unstable-2024-08-02 -> 0-unstable-2024-08-04 Diff: https://github.com/desktop-app/tg_owt/compare/c425281150317753d7bc5182c6572abe20f9a784...dc17143230b5519f3c1a8da0079e00566bd4c5a8 --- .../instant-messengers/telegram/telegram-desktop/tg_owt.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 20ec6f33c200..64541fc79e97 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2024-08-02"; + version = "0-unstable-2024-08-04"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "c425281150317753d7bc5182c6572abe20f9a784"; - sha256 = "sha256-EHQyGE2S2F2UqNl7VDb38pcdv3amm8lGqWZds5ZoHRE="; + rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8"; + sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; fetchSubmodules = true; }; From 05f5d395cbf275f05a02a1ce7f8d874a81982628 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 14 Aug 2024 20:52:03 -0400 Subject: [PATCH 047/233] telegram-desktop: 5.3.2 -> 5.4.0 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.3.2...v5.4.0 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.4.0 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 15fe94878fc7..ed35b9c5823d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.3.2"; + version = "5.4.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-fTXZdos0iIHmgWCKOU+B3tpxzLsUUtqx92Od75OdZH8="; + hash = "sha256-D8ujmAlCz7TPIO+lVJURO2xO73BdCuTtckCWpvbGxEg="; }; patches = [ From fd5f2f5eb22c7d04cf88838ea232d0a7d6791e36 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 17 Aug 2024 15:39:01 -0400 Subject: [PATCH 048/233] telegram-desktop: 5.4.0 -> 5.4.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.4.0...v5.4.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.4.1 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index ed35b9c5823d..4dfe20e94892 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-D8ujmAlCz7TPIO+lVJURO2xO73BdCuTtckCWpvbGxEg="; + hash = "sha256-AWu0LH6DH/omcIsgIBHQIg1uCKN9Ly6EVj4U9QxoSlg="; }; patches = [ From 891e6fd75a10cc029141a62e92e0061975ca4585 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 26 Apr 2024 15:46:27 +0200 Subject: [PATCH 049/233] librealsense: 2.54.2 -> 2.55.1 Diff: https://github.com/IntelRealSense/librealsense/compare/v2.54.2...v2.55.1 --- .../libraries/librealsense/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 527f61b60393..4f0532de4ed6 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,9 +2,9 @@ , config , lib , fetchFromGitHub -, fetchpatch , cmake , libusb1 +, nlohmann_json , ninja , pkg-config , gcc @@ -23,7 +23,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.54.2"; + version = "2.55.1"; outputs = [ "out" "dev" ]; @@ -31,12 +31,13 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EbnIHnsUgsqN/SVv4m9H7K8gfwni+u82+M55QBstAGI="; + sha256 = "sha256-MNHvfWk58WRtu6Xysfvn+lx8J1+HlNw5AmmgaTAzuok="; }; buildInputs = [ libusb1 gcc.cc.lib + nlohmann_json ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit ++ lib.optionals enablePython (with pythonPackages; [ python pybind11 ]) ++ lib.optionals enableGUI [ mesa gtk3 glfw libGLU curl ]; @@ -44,14 +45,16 @@ stdenv.mkDerivation rec { patches = [ ./py_pybind11_no_external_download.patch ./install-presets.patch - # https://github.com/IntelRealSense/librealsense/pull/11917 - (fetchpatch { - name = "fix-gcc13-missing-cstdint.patch"; - url = "https://github.com/IntelRealSense/librealsense/commit/b59b13671658910fc453a4a6bbd61f13ba6e83cc.patch"; - hash = "sha256-zaW8HG8rfsApI5S/3x+x9Fx8xhyTIPNn/fJVFtkmlEA="; - }) ]; + postPatch = '' + # use nixpkgs nlohmann_json instead of fetching it + substituteInPlace third-party/CMakeLists.txt \ + --replace-fail \ + 'include(CMake/external_json.cmake)' \ + 'find_package(nlohmann_json 3.11.3 REQUIRED)' + ''; + nativeBuildInputs = [ cmake ninja From 98a6160ab97959600ef689176eea572f348c54c1 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 18 Aug 2024 02:04:15 +0200 Subject: [PATCH 050/233] librealsense: unbreak cuda --- pkgs/development/libraries/librealsense/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 4f0532de4ed6..0e0bfc51cb42 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libusb1 gcc.cc.lib nlohmann_json - ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] ++ lib.optionals enablePython (with pythonPackages; [ python pybind11 ]) ++ lib.optionals enableGUI [ mesa gtk3 glfw libGLU curl ]; @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { cmake ninja pkg-config + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc ]; cmakeFlags = [ From fb046fbc20753ed28d26c3ec98732b8c883dbc6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 03:26:49 +0000 Subject: [PATCH 051/233] zxtune: 5061 -> 5071 --- pkgs/by-name/zx/zxtune/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix index 11a283a4eb2b..dfa2fd658abd 100644 --- a/pkgs/by-name/zx/zxtune/package.nix +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -43,7 +43,7 @@ let ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase); in stdenv.mkDerivation rec { pname = "zxtune"; - version = "5061"; + version = "5071"; outputs = [ "out" ]; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { owner = "zxtune"; repo = "zxtune"; rev = "r${version}"; - hash = "sha256-KhGxVq0dDvsAMdnr/MRiVbw6mhl/3Vv7D+NSb+fDhgk="; + hash = "sha256-qb06c0/Td6/6U033uYUkFq5JhCqlWCx6IhQ//PMeGUY="; }; passthru.updateScript = nix-update-script { From 50f5dd8917ff8e2e2aebc59e0e74bed35c78e7eb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 18 Aug 2024 12:09:11 +0800 Subject: [PATCH 052/233] mate.engrampa: 1.28.1 -> 1.28.2 https://github.com/mate-desktop/engrampa/compare/v1.28.1...v1.28.2 --- pkgs/desktops/mate/engrampa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 2f0404f88fba..dd4bfe0ef968 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.28.1"; + version = "1.28.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nFxMm8+LCO6qjydVONJLTJVQidWK7AMx6JwCuE2FOGo="; + hash = "sha256-Hpl3wjdFv4hDo38xUXHZr5eBSglxrqw9d08BdlCsCe8="; }; nativeBuildInputs = [ From df2bfebf33a8f467585d640d2c6f74e09ed64523 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 18 Aug 2024 14:15:15 +0300 Subject: [PATCH 053/233] lammps: don't use with lib in meta --- .../science/molecular-dynamics/lammps/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index b881d339300c..0288664dca3b 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/share/vim-plugins/lammps $out/share/nvim/site ''; - meta = with lib; { + meta = { description = "Classical Molecular Dynamics simulation code"; longDescription = '' LAMMPS is a classical molecular dynamics simulation code designed to @@ -109,13 +109,16 @@ stdenv.mkDerivation (finalAttrs: { under the terms of the GNU Public License (GPL). ''; homepage = "https://www.lammps.org"; - license = licenses.gpl2Only; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; # compiling lammps with 64 bit support blas and lapack might cause runtime # segfaults. In anycase both blas and lapack should have the same #bits # support. broken = (blas.isILP64 && lapack.isILP64); - maintainers = [ maintainers.costrouc maintainers.doronbehar ]; + maintainers = with lib.maintainers; [ + costrouc + doronbehar + ]; mainProgram = "lmp"; }; }) From 03d44579fba974e35f694e4c34242024e3900e7d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 18 Aug 2024 14:32:29 +0300 Subject: [PATCH 054/233] lammps: build shared libs --- pkgs/applications/science/molecular-dynamics/lammps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 0288664dca3b..56db78963239 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { inherit extraBuildInputs; }; cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) ] ++ (builtins.map (p: "-DPKG_${p}=ON") (builtins.attrNames (lib.filterAttrs (n: v: v) packages))) ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags) From f573aaedbb11e60be8483ba468d19dbf85fefd88 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 18 Aug 2024 14:32:48 +0300 Subject: [PATCH 055/233] lammps: use lib.cmakeBool for packages cmakeFlags --- pkgs/applications/science/molecular-dynamics/lammps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 56db78963239..2474998450cb 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" true) ] - ++ (builtins.map (p: "-DPKG_${p}=ON") (builtins.attrNames (lib.filterAttrs (n: v: v) packages))) + ++ (lib.mapAttrsToList (n: v: lib.cmakeBool "PKG_${n}" v) packages) ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags) ; From 2a01c732f5253d5f38c6a7d983d195097972609b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 12:34:37 +0000 Subject: [PATCH 056/233] _7zz: 24.07 -> 24.08 --- pkgs/tools/archivers/7zz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 3408ce8c08d1..3e8a2e628578 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "7zz"; - version = "24.07"; + version = "24.08"; src = fetchzip { url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz"; hash = { - free = "sha256-D41Sf437WYRQMdVW7hwcnZI0UG67IJsTTMfxlpkk36M="; - unfree = "sha256-iKCs893IFG0I6a2kpUe0qiuCX+YUxIgMIBRykc9XYjA="; + free = "sha256-2lv2Z4rrjmawD6aI8TmrACgo62StD720WQWOa0/u7KE="; + unfree = "sha256-f6hibHeTlF6RRnFiC7tOZ/A+IQdjhIrxYq6JrDVhnYI="; }.${if enableUnfree then "unfree" else "free"}; stripRoot = false; # remove the unRAR related code from the src drv From c5bc9942ad9bbb56604cbe585ff12af3908e1e58 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 18 Aug 2024 14:33:43 +0300 Subject: [PATCH 057/233] python31{2,1}Packages.lammps: init at 2Aug2023_update3 --- .../python-modules/lammps/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/lammps/default.nix diff --git a/pkgs/development/python-modules/lammps/default.nix b/pkgs/development/python-modules/lammps/default.nix new file mode 100644 index 000000000000..b9e0f45402d0 --- /dev/null +++ b/pkgs/development/python-modules/lammps/default.nix @@ -0,0 +1,46 @@ +{ + lib, + lammps, + stdenv, + buildPythonPackage, +}: + +let + LAMMPS_SHARED_LIB = "${lib.getLib lammps}/lib/liblammps${stdenv.hostPlatform.extensions.library}"; +in +buildPythonPackage { + inherit (lammps) pname version src; + + env = { + inherit LAMMPS_SHARED_LIB; + }; + preConfigure = '' + cd python + # Upstream assumes that the shared library is located in the same directory + # as the core.py file. We want to separate the shared library (built by + # cmake) and the Python library, so we perform this substitution: + substituteInPlace lammps/core.py \ + --replace-fail \ + "from inspect import getsourcefile" \ + "getsourcefile = lambda f: \"${LAMMPS_SHARED_LIB}\"" + ''; + + pythonImportsCheck = [ + "lammps" + "lammps.pylammps" + ]; + + # We could potentially run other examples, but some of them are so old that + # they don't run with nowadays' LAMMPS. This one is simple enough and recent + # enough and it works. + checkPhase = '' + python examples/mc.py examples/in.mc + ''; + + meta = { + description = "Python Bindings for LAMMPS"; + homepage = "https://docs.lammps.org/Python_head.html"; + inherit (lammps.meta) license; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa07ea66ecf5..7ba3da58a970 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6734,6 +6734,10 @@ self: super: with self; { lakeside = callPackage ../development/python-modules/lakeside { }; + lammps = callPackage ../development/python-modules/lammps { + inherit (pkgs) lammps; + }; + lancedb = callPackage ../development/python-modules/lancedb { }; langchain = callPackage ../development/python-modules/langchain { }; From 8e98705b81096aa22321780b13a5b1112b429167 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 18 Aug 2024 23:22:15 +0900 Subject: [PATCH 058/233] textlint: fix build on aarch64-linux --- pkgs/by-name/te/textlint/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/textlint/package.nix b/pkgs/by-name/te/textlint/package.nix index aca6801769ba..3be970698e05 100644 --- a/pkgs/by-name/te/textlint/package.nix +++ b/pkgs/by-name/te/textlint/package.nix @@ -1,10 +1,12 @@ { lib, + stdenv, buildNpmPackage, fetchFromGitHub, autoconf, automake, makeWrapper, + python311, runCommand, textlint, textlint-plugin-latex2e, @@ -44,10 +46,16 @@ buildNpmPackage rec { npmDepsHash = "sha256-FnDKPLhf9OxwRrrBJgejp4X13FGEI317yTgI3tA5cX8="; - nativeBuildInputs = [ - autoconf - automake - ]; + nativeBuildInputs = + [ + autoconf + automake + ] + ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # File "/build/source/node_modules/node-gyp/gyp/gyp_main.py", line 42, in + # npm error ModuleNotFoundError: No module named 'distutils' + python311 + ]; installPhase = '' runHook preInstall From f6f5249ab30d3a8cd68ed6335913842a5b9b7bb4 Mon Sep 17 00:00:00 2001 From: DDoSolitary Date: Sun, 18 Aug 2024 03:42:08 +0800 Subject: [PATCH 059/233] _64gram: 1.1.31 -> 1.1.34 and disable self update --- pkgs/by-name/_6/_64gram/package.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index c28477659b49..e10414204a2d 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , telegram-desktop , nix-update-script }: telegram-desktop.overrideAttrs (old: rec { pname = "64gram"; - version = "1.1.31"; + version = "1.1.34"; src = fetchFromGitHub { owner = "TDesktop-x64"; @@ -15,9 +16,21 @@ telegram-desktop.overrideAttrs (old: rec { rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-xYCousLXV9TeQjDNiXkEMbTiiuusLc7Ib2xHkMYBD1M="; + hash = "sha256-DbHbhkInZi8B/0fvbCWutN4noEv7MZ+C5Eg7g+89Moo="; }; + patches = (old.patches or []) ++ [ + (fetchpatch { + url = "https://github.com/TDesktop-x64/tdesktop/commit/c996ccc1561aed089c8b596f6ab3844335bbf1df.patch"; + revert = true; + hash = "sha256-Hz7BXl5z4owe31l9Je3QOXT8FAyKcbsXsKjGfCmXhzE="; + }) + ]; + + cmakeFlags = (old.cmakeFlags or []) ++ [ + (lib.cmakeBool "disable_autoupdate" true) + ]; + passthru.updateScript = nix-update-script {}; meta = with lib; { From 9ba89a14d9ef50588779b133cc19da83b6753ca7 Mon Sep 17 00:00:00 2001 From: LilleAila Date: Fri, 19 Jul 2024 13:44:36 +0200 Subject: [PATCH 060/233] sway-scratch: init at 0.2.1 --- pkgs/by-name/sw/sway-scratch/package.nix | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/sw/sway-scratch/package.nix diff --git a/pkgs/by-name/sw/sway-scratch/package.nix b/pkgs/by-name/sw/sway-scratch/package.nix new file mode 100644 index 000000000000..210a08de811e --- /dev/null +++ b/pkgs/by-name/sw/sway-scratch/package.nix @@ -0,0 +1,31 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "sway-scratch"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "aokellermann"; + repo = "sway-scratch"; + rev = "v${version}"; + hash = "sha256-1N/33XtkEWamgQYNDyZgSSaaGD+2HtbseEpQgrAz3CU="; + }; + + cargoHash = "sha256-Z+ls6OCrDkmfxRTD+DOQhr7p183RRhXaXm8a/mWBixw="; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Automatically starting named scratchpads for sway"; + homepage = "https://github.com/aokellermann/sway-scratch"; + license = licenses.mit; + maintainers = with maintainers; [ LilleAila ]; + mainProgram = "sway-scratch"; + platforms = lib.platforms.linux; + }; +} From 0a1ac7786829ee041106d21a6cccbc2edf15940f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 18 Aug 2024 18:50:28 +0100 Subject: [PATCH 061/233] diffoscope: 275 -> 276 Changes: https://diffoscope.org/news/diffoscope-276-released/ --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 7c20981b9651..293893dddd56 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -102,11 +102,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "275"; + version = "276"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-mVbCsOPR0gm+93AG2p/W/TIOZItHSTOs40Q9uTiokEY="; + hash = "sha256-Tfl8WZRcarcf59fhUclM6NF6NWO7SgzdLrWEBhk88+Y="; }; outputs = [ From a8b4b275e858375b86d2f0a0e7ce98372d36a787 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 18:18:52 +0000 Subject: [PATCH 062/233] webex: 44.5.0.29672 -> 44.8.0.30404 --- .../networking/instant-messengers/webex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index 979a6abd7f3c..3a03bef180a9 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "44.5.0.29672"; + version = "44.8.0.30404"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240521091053/Webex_ubuntu.7z"; - sha256 = "e155c280d15f2db4b5e638f244319dbec938d6de267f2fed1b4ba2b55fbb8a9b"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240806164911/Webex_ubuntu.7z"; + sha256 = "770067b495fcc3b376d77de65371f4196d0f1a0d718b84928d24aa6ea752d29b"; }; nativeBuildInputs = [ From 85bcb27f4eec367f6716aaacf717868948408d3f Mon Sep 17 00:00:00 2001 From: Vladyslav Pekker Date: Sun, 18 Aug 2024 15:28:56 -0300 Subject: [PATCH 063/233] bloop: 1.6.0 -> 2.0.0 --- pkgs/development/tools/build-managers/bloop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 6a47218ae33f..5a97ad797f91 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.6.0"; + version = "2.0.0"; platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.isLinux && stdenv.isx86_64 then "sha256-f7ZmjDO8L3hcYkaxiwf5BBD44hBiBhNovylM4B308bI=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-xXkWQ9dMZrSXZHrU1YxTxfDwGEj9y8/ARlypUNLnloo=" + if stdenv.isLinux && stdenv.isx86_64 then "sha256-SnDXAkNu//Dn24FaQcACEBEJODlrhvpQ8uNbge99nGA=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-MfenrNbL1UBC4t/0w9MTDI+kz2HKv7xJcmA57qBbMFw=" else throw "unsupported platform"; }; From 718275f83c549cf8e80333b92ef1964af8ee172b Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 18 Aug 2024 21:40:03 +0200 Subject: [PATCH 064/233] portfolio: fix crash at startup --- pkgs/by-name/po/portfolio/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 3f65974c9d3a..6142aa26813a 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -1,15 +1,15 @@ { - lib, - stdenv, autoPatchelfHook, fetchurl, + glib, glib-networking, - glibc, - gcc-unwrapped, gtk3, - openjdk17, + lib, libsecret, makeDesktopItem, + openjdk17, + stdenvNoCC, + swt, webkitgtk, wrapGAppsHook3, gitUpdater, @@ -25,11 +25,15 @@ let }; runtimeLibs = lib.makeLibraryPath [ + glib + glib-networking gtk3 + libsecret + swt webkitgtk ]; in -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "PortfolioPerformance"; version = "0.70.3"; @@ -43,12 +47,8 @@ stdenv.mkDerivation rec { wrapGAppsHook3 ]; - buildInputs = [ - gcc-unwrapped - glib-networking - glibc - libsecret - ]; + dontConfigure = true; + dontBuild = true; installPhase = '' mkdir -p $out/portfolio @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --prefix CLASSPATH : "${swt}/jars/swt.jar" \ --prefix PATH : ${openjdk17}/bin # Create desktop item From 4c059d484ed368b9aa232753d68d3faf45883fa7 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 18 Aug 2024 22:44:25 +0200 Subject: [PATCH 065/233] miniflux: 2.1.4 -> 2.2.0 https://github.com/miniflux/v2/releases/tag/2.2.0 diff: https://github.com/miniflux/v2/compare/2.1.4...2.2.0 --- pkgs/servers/miniflux/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index f29e46c2a455..9e0e854435c8 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,25 +2,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.1.4"; + version = "2.2.0"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; rev = "refs/tags/${version}"; - hash = "sha256-1EH8KtKdAssxLk0IyhJsbrFU1obDTvmaGtFyLVlnOdQ="; + hash = "sha256-JE0sHxmvLGvbgOqH5f7OONAvP93dJLWLAbgTnlNHGHE="; }; - patches = [ - (fetchpatch2 { - # Fix panic during YouTube channel feed discovery - name = "miniflux-pr2742.patch"; - url = "https://github.com/miniflux/v2/commit/79ea9e28b5a8c09f4d1dcbf31b661fb5f8e85e6a.patch"; - hash = "sha256-BZPv83QsJ6iJs12FLALfTN//VZL/BfGkXs3Pzn9cGeU="; - }) - ]; - - vendorHash = "sha256-kr2qCKuwp6Fpr0zEjggqk4Mff3V9pxGLU71lRhdRrW8="; + vendorHash = "sha256-Y5FcKmvYMN9Q9/VpP8IWclFXt7gl61UiyPJ+Rdmlito="; nativeBuildInputs = [ installShellFiles ]; From a6fc8b8bf570257e4cdb37c0b4a440c2272ce1dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 21:37:57 +0000 Subject: [PATCH 066/233] lefthook: 1.7.12 -> 1.7.14 --- pkgs/by-name/le/lefthook/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index f8933e0763d5..947fbaace104 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.7.12"; + version = "1.7.14"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-lPjxd3a97abPUJxazgL+BQmGOMqF9RlP/6qEgjS5aXw="; + hash = "sha256-yGxEeNn6YnzivvQW+HXMAkSaKZ5mmAflyDlNYfjqguc="; }; vendorHash = "sha256-YrBFcRQoqZPe/USZj3oJK5KR7y0LimCVGS9w4uNMG6M="; From 8152fcd22a31949429e4f3d91b8c57687bbdf2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sun, 18 Aug 2024 18:15:23 -0400 Subject: [PATCH 067/233] quickfix: format --- .../libraries/quickfix/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/development/libraries/quickfix/default.nix index 6644b9885c25..29fc8fffd104 100644 --- a/pkgs/development/libraries/quickfix/default.nix +++ b/pkgs/development/libraries/quickfix/default.nix @@ -1,13 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + autoconf, + automake, + libtool, +}: stdenv.mkDerivation rec { pname = "quickfix"; version = "1.15.1"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = "quickfix"; + repo = "quickfix"; + rev = "v${version}"; sha256 = "1fgpwgvyw992mbiawgza34427aakn5zrik3sjld0i924a9d17qwg"; }; @@ -21,7 +29,11 @@ stdenv.mkDerivation rec { ]; # autoreconfHook does not work - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ + autoconf + automake + libtool + ]; enableParallelBuilding = true; From 98c68a8b3bd39886988a9e56467b95b33cf0a608 Mon Sep 17 00:00:00 2001 From: Jan Stranik Date: Thu, 8 Aug 2024 00:55:38 -0400 Subject: [PATCH 068/233] quickfix: fix build on Darwin --- pkgs/development/libraries/quickfix/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/development/libraries/quickfix/default.nix index 29fc8fffd104..af1efc62557b 100644 --- a/pkgs/development/libraries/quickfix/default.nix +++ b/pkgs/development/libraries/quickfix/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = '' + substituteInPlace bootstrap --replace-fail glibtoolize libtoolize + ''; + preConfigure = '' ./bootstrap ''; From f88424f5d8ae28bc589a005a83ddcadd596ab5ec Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:38:39 +0300 Subject: [PATCH 069/233] karabiner-elements: format with nixfmt-rfc-style --- .../darwin/karabiner-elements/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index 367f7bc0ad44..b2e7d1235bb3 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, cpio, xar, undmg }: +{ + lib, + stdenv, + fetchurl, + cpio, + xar, + undmg, +}: stdenv.mkDerivation rec { pname = "karabiner-elements"; @@ -9,9 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-gmJwoht/Tfm5qMecmq1N6PSAIfWOqsvuHU8VDJY8bLw="; }; - outputs = [ "out" "driver" ]; + outputs = [ + "out" + "driver" + ]; - nativeBuildInputs = [ cpio xar undmg ]; + nativeBuildInputs = [ + cpio + xar + undmg + ]; unpackPhase = '' undmg $src From fa35b059552c02693c57321383eb9f3673a5feec Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:40:45 +0300 Subject: [PATCH 070/233] karabiner-elements: refactor meta --- pkgs/os-specific/darwin/karabiner-elements/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index b2e7d1235bb3..1d2d6834e0ed 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -56,11 +56,12 @@ stdenv.mkDerivation rec { passthru.updateScript = ./updater.sh; - meta = with lib; { - description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Sierra (10.12) or later"; + meta = { + changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${version}"; + description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Ventura (13) or later"; homepage = "https://karabiner-elements.pqrs.org/"; - platforms = platforms.darwin; + license = lib.licenses.unlicense; maintainers = [ ]; - license = licenses.unlicense; + platforms = lib.platforms.darwin; }; } From b941404ab94f4a96545957c2655caaf5b1ce591b Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:42:21 +0300 Subject: [PATCH 071/233] karabiner-elements: simplify updateScript --- .../darwin/karabiner-elements/default.nix | 3 ++- .../darwin/karabiner-elements/updater.sh | 13 ------------- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100755 pkgs/os-specific/darwin/karabiner-elements/updater.sh diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index 1d2d6834e0ed..d9c6360226dc 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -5,6 +5,7 @@ cpio, xar, undmg, + nix-update-script, }: stdenv.mkDerivation rec { @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { cp "$out/Library/Application Support/org.pqrs/Karabiner-Elements/package-version" "$out/Library/Application Support/org.pqrs/Karabiner-Elements/version" ''; - passthru.updateScript = ./updater.sh; + passthru.updateScript = nix-update-script { }; meta = { changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${version}"; diff --git a/pkgs/os-specific/darwin/karabiner-elements/updater.sh b/pkgs/os-specific/darwin/karabiner-elements/updater.sh deleted file mode 100755 index eb0dd7b9ce5c..000000000000 --- a/pkgs/os-specific/darwin/karabiner-elements/updater.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts -set -eo pipefail - -new_version="$(curl -s "https://api.github.com/repos/pqrs-org/Karabiner-Elements/releases/latest" | jq -r '.tag_name | ltrimstr("v")')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" - -if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date!" - exit 0 -fi - -update-source-version karabiner-elements "${new_version}" From e5aa8e21821e0591434db3ab6281569d86ebef30 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:43:30 +0300 Subject: [PATCH 072/233] karabiner-elements: switch to finalAttrs pattern --- pkgs/os-specific/darwin/karabiner-elements/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index d9c6360226dc..ac8eac4ab623 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -8,12 +8,12 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "karabiner-elements"; version = "14.13.0"; src = fetchurl { - url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${version}/Karabiner-Elements-${version}.dmg"; + url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${finalAttrs.version}/Karabiner-Elements-${finalAttrs.version}.dmg"; sha256 = "sha256-gmJwoht/Tfm5qMecmq1N6PSAIfWOqsvuHU8VDJY8bLw="; }; @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${version}"; + changelog = "https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v${finalAttrs.version}"; description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Ventura (13) or later"; homepage = "https://karabiner-elements.pqrs.org/"; license = lib.licenses.unlicense; maintainers = [ ]; platforms = lib.platforms.darwin; }; -} +}) From ea09687d5fa113ff6bdaba5e79850d99334664bd Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 19 Aug 2024 01:45:54 +0300 Subject: [PATCH 073/233] karabiner-elements: 14.13.0 -> 15.0.0 Changelog: https://github.com/pqrs-org/Karabiner-Elements/releases/tag/v15.0.0 Diff: https://github.com/pqrs-org/Karabiner-Elements/compare/v14.13.0...v15.0.0 --- pkgs/os-specific/darwin/karabiner-elements/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index ac8eac4ab623..5239bc73b842 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "karabiner-elements"; - version = "14.13.0"; + version = "15.0.0"; src = fetchurl { url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${finalAttrs.version}/Karabiner-Elements-${finalAttrs.version}.dmg"; - sha256 = "sha256-gmJwoht/Tfm5qMecmq1N6PSAIfWOqsvuHU8VDJY8bLw="; + hash = "sha256-xWCsbkP9cVnDjWFTgWl5KrR7wEpcQYM4Md99pTI/l14="; }; outputs = [ From 9c1be92c509a4f7fac2d8fbd036fcbe56a3bed99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 00:32:49 +0000 Subject: [PATCH 074/233] openfga: 1.5.8 -> 1.5.9 --- pkgs/by-name/op/openfga/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index 191b002af864..a1f4d8cf2e92 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.5.8"; + version = "1.5.9"; in buildGoModule { @@ -17,7 +17,7 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-cogfwd2rFYl/UKjw1pnsL9D77IHn+5ulvMU+7WU2670="; + hash = "sha256-btk7I1jHWJfV1KgWpPXbKbn1f/2MnLrqA0HuHD3fSQc="; }; vendorHash = "sha256-rU45E9yEh7a1MrbnzFFuNeMpfbODO2O7tqEaiv7CA9Y="; From 800c7426a07048a6541651cd0aac32f2e5e7d485 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 01:05:16 +0000 Subject: [PATCH 075/233] cargo-shear: 1.1.1 -> 1.1.2 --- pkgs/by-name/ca/cargo-shear/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 88b8a4b9fc3a..9ff861190d04 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.1"; + version = "1.1.2"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-4HGI0G3fOzj787fXyUMt4XK4KMtrilOJUw1DqRpUoYY="; + hash = "sha256-JnQrQBx9VuXI0wj1mMLfl15lxC85f1kUBucgC3Q8F0c="; }; - cargoHash = "sha256-sQiWd8onSJMo7+ouCPye7IaGzYp0N3rMC4PZv+/DPt4="; + cargoHash = "sha256-iFcW9REkEolrDDbEwoepUSO79OgUdsLUhSkk12y4yxk="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; From 8ab167a8c8edf631638920a91071337951663bca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 01:45:18 +0000 Subject: [PATCH 076/233] prometheus-influxdb-exporter: 0.11.5 -> 0.11.7 --- pkgs/servers/monitoring/prometheus/influxdb-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 3f4bcb6646e2..640c09a7c00c 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "influxdb_exporter"; - version = "0.11.5"; + version = "0.11.7"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "influxdb_exporter"; - hash = "sha256-5jKwUuM3JL0zzXFesXTUBNMkA7bhd37BhqxZ/RzG20Q="; + hash = "sha256-gaUBRDGbHvHH+Ll1fmOaYEVRAqy2q5HoTyty2PGTwBE="; }; - vendorHash = "sha256-VQ8MkzT8caPR1gpLXvNzWD5/pO0IKw8d+bT8gohAiJo="; + vendorHash = "sha256-47ru0rzLl4/O0UOGqCojH+vqd4TS1S2Hk6zmSzrXriw="; ldflags = [ "-s" From dd3c115d03553b62dd060d71a9f579470d9780b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 01:45:38 +0000 Subject: [PATCH 077/233] maskromtool: 2024-07-14 -> 2024-08-18 --- pkgs/tools/graphics/maskromtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/tools/graphics/maskromtool/default.nix index b98652ce00b1..0d9395886f0c 100644 --- a/pkgs/tools/graphics/maskromtool/default.nix +++ b/pkgs/tools/graphics/maskromtool/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "maskromtool"; - version = "2024-07-14"; + version = "2024-08-18"; src = fetchFromGitHub { owner = "travisgoodspeed"; repo = "maskromtool"; rev = "v${version}"; - hash = "sha256-BPmjoD7LnY6RhLKBhq3oP3w6LXl+FrG+fLWYd4Wstno="; + hash = "sha256-iuCjAAVEKVwJuAgKITwkXGhKau2DVWhFQLPjp28tjIo="; }; buildInputs = [ From 3ce5bb51f2f9e4ad979e0e45fab857be72e1d657 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 01:45:54 +0000 Subject: [PATCH 078/233] ocamlPackages.ezjsonm-encoding: 2.0.0 -> 2.1.0 --- pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix b/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix index ec81d52da687..3a5b047903ad 100644 --- a/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ezjsonm-encoding"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/lthms/ezjsonm-encoding/releases/download/${version}/ezjsonm-encoding-${version}.tbz"; - hash = "sha256-e5OPcbbQLr16ANFNZ5i10LjlHgwcRTCYhyvOhVk22yI="; + hash = "sha256-qR8Nn3pL1K33qTBLkElaqsTjLjudtI8IMe0GEK08qW4="; }; propagatedBuildInputs = [ ezjsonm ]; From c364b16672a250486fd60969c809115af0998ec4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 01:46:08 +0000 Subject: [PATCH 079/233] libdwarf-lite: 0.10.1 -> 0.11.0 --- pkgs/by-name/li/libdwarf-lite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdwarf-lite/package.nix b/pkgs/by-name/li/libdwarf-lite/package.nix index 25ea4593de2f..e8bf9bfee696 100644 --- a/pkgs/by-name/li/libdwarf-lite/package.nix +++ b/pkgs/by-name/li/libdwarf-lite/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libdwarf-lite"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "jeremy-rifkin"; repo = "libdwarf-lite"; rev = "v${finalAttrs.version}"; - hash = "sha256-ouhYapiqBFPJwoUIyiuEtsezF2wR63WZL7VwvnDExoU="; + hash = "sha256-S2KDfWqqdQfK5+eQny2X5k0A5u9npkQ8OFRLBmTulao="; }; outputs = [ From b9e65c8006da809356ee93b14490b2dffd4173af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 01:59:44 +0000 Subject: [PATCH 080/233] prometheus-statsd-exporter: 0.26.1 -> 0.27.1 --- pkgs/servers/monitoring/prometheus/statsd-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 4c13824f44aa..bfb194bda543 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.26.1"; + version = "0.27.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "statsd_exporter"; rev = "v${version}"; - hash = "sha256-hKwbC56Z6tMolLnYB5G7iSLZoM+cWCh5lPzWiFkOd6E="; + hash = "sha256-aOwb1oL4eS3sdVXJXbPKHaao/xLGe1HZ5EJgQ6AAFnk="; }; ldflags = @@ -26,7 +26,7 @@ buildGoModule rec { "-X ${t}.BuildDate=unknown" ]; - vendorHash = "sha256-UcdRcHZUJ3XHZNqYXSboaor5WRVPYfilEvRWZjA1YNc="; + vendorHash = "sha256-cP7dMkLWITRz87vU13B168iUIBbozOGNTXNV+m2CbMU="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; From a9ae7e6838e069012e39af6e2470ccbf62836377 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 02:02:36 +0000 Subject: [PATCH 081/233] prometheus-graphite-exporter: 0.15.1 -> 0.15.2 --- pkgs/servers/monitoring/prometheus/graphite-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix index a8bc0dcfd657..68a2c0d57b29 100644 --- a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "graphite-exporter"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "prometheus"; repo = "graphite_exporter"; rev = "v${version}"; - hash = "sha256-KBqLPKd8XP7PbjHJu1DIQ2ir+Lyk7LEBaNjJCr91LP8="; + hash = "sha256-GiXg4FkEDveKI3JPRJ5bYmdfmcum5abN70ESwH0S7EA="; }; - vendorHash = "sha256-he2bmcTNkuKRsNGkn1IkhtOe+Eo/5RLWLYlNFWLo/As="; + vendorHash = "sha256-SXxjCXWJcVAyTjH77ga1pFdudUjQfDJCD78fiDlw9Y0="; checkFlags = let From c2d1d1383af67190f41f78fe9686ef8ba4ce7ddb Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 17 Aug 2024 09:16:46 -0700 Subject: [PATCH 082/233] manifold: init at 2.5.1-unstable-2024-08-18 --- pkgs/by-name/ma/manifold/package.nix | 53 ++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pkgs/by-name/ma/manifold/package.nix diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix new file mode 100644 index 000000000000..822feef1debf --- /dev/null +++ b/pkgs/by-name/ma/manifold/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + clipper2, + gtest, + glm, + tbb_2021_11, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "manifold"; + version = "2.5.1-unstable-2024-08-18"; + + src = fetchFromGitHub { + owner = "elalish"; + repo = "manifold"; + rev = "74e15b1574ebe6ae01d1fd2cffbe75aeeb7b8fab"; + hash = "sha256-T/uaiHNJvk16XobjJlVbawKJ2ktFaCtI63kTFc6Z5Fc="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + gtest + glm + tbb_2021_11 + clipper2 + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_SHARED_LIBS=ON" + "-DMANIFOLD_TEST=ON" + "-DMANIFOLD_PAR=TBB" + ]; + + doCheck = true; + checkPhase = '' + test/manifold_test + ''; + + meta = { + description = "Geometry library for topological robustness"; + homepage = "https://github.com/elalish/manifold"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + hzeller + pca006132 + ]; + }; +}) From 952a596ab833312231c5ff3b88c424ed85efe31b Mon Sep 17 00:00:00 2001 From: Brian Lee Date: Sun, 18 Aug 2024 19:24:18 -0700 Subject: [PATCH 083/233] add maintainer: bleetube --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d4acdd127c67..994a41cf13cc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2702,6 +2702,14 @@ githubId = 5700358; name = "Thomas Blank"; }; + bleetube = { + email = "git@blee.tube"; + matrix = "@blee:satstack.cloud"; + name = "Brian Lee"; + github = "bleetube"; + githubId = 77934086; + keys = [ { fingerprint = "4CA3 48F6 8FE1 1777 8EDA 3860 B9A2 C1B0 25EC 2C55"; } ]; + }; blinry = { name = "blinry"; email = "mail@blinry.org"; From a4e933bdee2f456fb523649cc972b47547645ef0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 02:48:02 +0000 Subject: [PATCH 084/233] sarasa-gothic: 1.0.18 -> 1.0.19 --- pkgs/by-name/sa/sarasa-gothic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index 3c0c177a88b0..63fb75031560 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-rZoKeVpLOn6Q+lq/SIV958M1JTIpIbvmjgF+o4zh1sE="; + hash = "sha256-zqDVRgWlRND9a2ketlXE4f/Voa1tSYpnCotPGFWqcl8="; }; sourceRoot = "."; From 2f681f12303cb7656401f574e6151a463977eee7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 02:54:32 +0000 Subject: [PATCH 085/233] tenv: 3.0.0 -> 3.1.0 --- pkgs/by-name/te/tenv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index 9883449ab1c8..c2c7c21321c2 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tenv"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-h380ZkVZS2NOTJvaxfqd2O5WEai0raFENqJQACC1Qtg="; + hash = "sha256-nZhJgkXP4ZdVp244bdOswwEOTeH/HopFrQN/A0L+W/k="; }; - vendorHash = "sha256-BHr8n7GJmNV3kDYqVjpjGVNctIGsWh/UzAh0u8WSESs="; + vendorHash = "sha256-yhGqKuHHiSW6exPuKGFzeDO9GEc/S8XGkGNhPM1gXgQ="; # Tests disabled for requiring network access to release.hashicorp.com doCheck = false; From b79285900b76077d2af1d77f4e9ae0938c73e1f5 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 19 Aug 2024 08:29:18 +0200 Subject: [PATCH 086/233] gofumpt: 0.6.0 -> 0.7.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/go/gofumpt/package.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/go/gofumpt/package.nix b/pkgs/by-name/go/gofumpt/package.nix index f2b0875a3e6c..697ab47010fe 100644 --- a/pkgs/by-name/go/gofumpt/package.nix +++ b/pkgs/by-name/go/gofumpt/package.nix @@ -1,29 +1,29 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, nix-update-script -, testers -, gofumpt +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + testers, + gofumpt, }: buildGoModule rec { pname = "gofumpt"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; rev = "v${version}"; - hash = "sha256-94aaLqoalFredkxaSPgJEnFtKw7GmkkL5N+I8ws9zxY="; + hash = "sha256-mJM0uKztX0OUQvynnxeKL9yft7X/Eh28ERg8SbZC5Ws="; }; - vendorHash = "sha256-q8+Blzab9TLTRY2/KncIlVp53+K6YWzg1D0SS7FPM9I="; + vendorHash = "sha256-kJysyxROvB0eMAHbvNF+VXatEicn4ln2Vqkzp7GDWAQ="; CGO_ENABLED = "0"; ldflags = [ "-s" - "-w" "-X main.version=v${version}" ]; @@ -45,7 +45,10 @@ buildGoModule rec { homepage = "https://github.com/mvdan/gofumpt"; changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ rvolosatovs katexochen ]; + maintainers = with maintainers; [ + rvolosatovs + katexochen + ]; mainProgram = "gofumpt"; }; } From e2cad22427c25164d308803f0f20c4508939a9e3 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 19 Aug 2024 10:10:54 +0200 Subject: [PATCH 087/233] dsda-doom: 0.28.0 -> 0.28.1 --- pkgs/by-name/ds/dsda-doom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index 9e2add99d634..056766b79b41 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "dsda-doom"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "kraflab"; repo = "dsda-doom"; rev = "v${version}"; - hash = "sha256-4oVQcZ/GOYc9lXMgb3xMXg9ZNB9rYBosbf09cXge6MI="; + hash = "sha256-X2v9eKiIYX4Zi3C1hbUoW4mceRVa6sxpBsP4Npyo4hM="; }; sourceRoot = "${src.name}/prboom2"; From 4fd2c198e34abc687f969f2bc52a10866812f1bb Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 19 Aug 2024 10:37:09 +0200 Subject: [PATCH 088/233] dsda-doom: cleanup --- pkgs/by-name/ds/dsda-doom/package.nix | 65 ++++++++++++--------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index 056766b79b41..a4f7384637fe 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, SDL2 -, SDL2_mixer -, SDL2_image -, fluidsynth -, soundfont-fluid -, portmidi -, dumb -, libvorbis -, libmad -, libGLU -, libzip +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + SDL2, + SDL2_mixer, + SDL2_image, + fluidsynth, + portmidi, + dumb, + libvorbis, + libmad, + libGLU, + libzip, + alsa-lib, }: stdenv.mkDerivation rec { @@ -28,36 +29,28 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/prboom2"; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - SDL2 - SDL2_mixer - SDL2_image - fluidsynth - portmidi + alsa-lib dumb - libvorbis - libmad + fluidsynth libGLU + libmad + libvorbis libzip + portmidi + SDL2 + SDL2_image + SDL2_mixer ]; - # Fixes impure path to soundfont - prePatch = '' - substituteInPlace src/m_misc.c --replace \ - "/usr/share/sounds/sf3/default-GM.sf3" \ - "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2" - ''; - - meta = with lib; { + meta = { homepage = "https://github.com/kraflab/dsda-doom"; description = "Advanced Doom source port with a focus on speedrunning, successor of PrBoom+"; mainProgram = "dsda-doom"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.Gliczy ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Gliczy ]; }; } From 66c27851b83f1bfa553f003324722d0ede0b8127 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 19 Aug 2024 10:38:50 +0200 Subject: [PATCH 089/233] zeal: fix build against Qt 6.7.2 Signed-off-by: Sefa Eyeoglu --- pkgs/data/documentation/zeal/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 6cd429071acb..856f9ad58ca4 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , extra-cmake-modules +, fetchpatch2 , pkg-config , qtbase , qtimageformats @@ -30,6 +31,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-918hWy5be5mHINLbFJPiE29wlL1kRUD4MS3AjML/6fs="; }; + patches = [ + # https://github.com/zealdocs/zeal/pull/1644 + (fetchpatch2 { + name = "fix-qtconcurrent-component.patch"; + url = "https://github.com/zealdocs/zeal/commit/c432a0ac22b59ed44bdcec8819c030d993177883.patch"; + hash = "sha256-DW7rBRMnXm7r+jps1/3RTXA1PpwEUCprW9qrHMRii84="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules From cd077fee963272681ed549f3313789b9983a2690 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 16 Aug 2024 22:36:36 +0200 Subject: [PATCH 090/233] python312Packages.openai: 1.39.0 -> 1.40.8 --- pkgs/development/python-modules/openai/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 39344e65cd5d..c8dbfdf7816b 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -8,11 +8,13 @@ fetchFromGitHub, hatch-fancy-pypi-readme, hatchling, + jiter, httpx, numpy, pandas, pandas-stubs, pydantic, + inline-snapshot, pytest-asyncio, pytest-mock, pytestCheckHook, @@ -25,7 +27,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.39.0"; + version = "1.40.8"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +36,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-jOtJu5Luvwnel2GLBjZHDP3MuXTWXFZKYHQfdmyEyTs="; + hash = "sha256-T9TdZWPC8exIY7FoLQkz+QfzWFT5BxCBHxP9SXQeT0I="; }; build-system = [ @@ -43,6 +45,7 @@ buildPythonPackage rec { ]; dependencies = [ + jiter httpx pydantic typing-extensions @@ -63,6 +66,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "openai" ]; nativeCheckInputs = [ + inline-snapshot pytestCheckHook pytest-asyncio pytest-mock From 5ae444326911f1f3d555d3ca7280d5975164ddb8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 14 Aug 2024 20:27:41 +0000 Subject: [PATCH 091/233] python312Packages.langchain-community: 0.2.7 -> 0.2.12 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-community==0.2.7...langchain-community==0.2.12 Changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-community==0.2.12 --- .../python-modules/langchain-community/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 78150a083a16..9bb38f66f7b4 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.2.7"; + version = "0.2.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-community==${version}"; - hash = "sha256-r0YSJkYPcwjHyw1xST5Zrgg9USjN9GOsvhV97imSFCQ="; + hash = "sha256-HsKWGiWA6uKmRQOMw3efXkjwbBuvDHhf5waNvnvBdG4="; }; sourceRoot = "${src.name}/libs/community"; @@ -58,7 +58,6 @@ buildPythonPackage rec { langchain-core langchain langsmith - numpy pyyaml requests sqlalchemy @@ -67,6 +66,7 @@ buildPythonPackage rec { optional-dependencies = { cli = [ typer ]; + numpy = [ numpy ]; }; pythonImportsCheck = [ "langchain_community" ]; From e0794de53a4ccb7112c6d427c392515ac483b659 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 09:41:05 +0000 Subject: [PATCH 092/233] silverbullet: 0.9.0 -> 0.9.2 --- pkgs/by-name/si/silverbullet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/silverbullet/package.nix b/pkgs/by-name/si/silverbullet/package.nix index b7e6e8967e02..cd66ed474f7f 100644 --- a/pkgs/by-name/si/silverbullet/package.nix +++ b/pkgs/by-name/si/silverbullet/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "silverbullet"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet.js"; - hash = "sha256-EoDq85jrEU6akBYrrpO+ddkp+3fF18ePjVEdQ2a18BM="; + hash = "sha256-USk15jzTLcy+t8IzLEAySRZJMlIompugIpqAJTcoxho="; }; dontUnpack = true; From 25549408ab22177c1772b06e1e14915a642630ae Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 19 Aug 2024 11:50:59 +0200 Subject: [PATCH 093/233] palemoon-bin: 33.2.1 -> 33.3.0 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 49f6656c01ff..aeeb03d8d028 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.2.1"; + version = "33.3.0"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-GUizOnsjEq2UuRaBgjmsQLHuqnCt/MHFBb8lTHcwJOM="; + hash = "sha256-9JZzwWe40M6nJkzeUqNDPXMfDGBnLRDSLL5kE2sNzCs="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-RBEqBJNttuyMpeaC5scSY8Q2meZjgdeS2pppQ1n53uY="; + hash = "sha256-K3PC1EDZeDyJUPhfvqTlqyMM07GmiWlUdYiNnSZuesw="; }; }; From b2306ddcb8e2cf8d052f5cc57177203727d940d0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 19 Aug 2024 11:57:12 +0200 Subject: [PATCH 094/233] process-cpp: 3.0.1-unstable-2024-03-14 -> 3.0.2 --- pkgs/by-name/pr/process-cpp/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pr/process-cpp/package.nix b/pkgs/by-name/pr/process-cpp/package.nix index 2a04e385c325..8b6ac5676c43 100644 --- a/pkgs/by-name/pr/process-cpp/package.nix +++ b/pkgs/by-name/pr/process-cpp/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitLab , testers -, unstableGitUpdater +, gitUpdater , cmake , coreutils , boost @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "process-cpp"; - version = "3.0.1-unstable-2024-03-14"; + version = "3.0.2"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "ubports"; repo = "development/core/lib-cpp/process-cpp"; - rev = "7b0a829abcbcdd25d949e5f9e2c26bb985a58b31"; - hash = "sha256-Az+lSJ7uVR4pAWvOeah5vFtIPb12eKp0nAFF1qsHZXA="; + rev = finalAttrs.version; + hash = "sha256-UCNmD5Ea2wnEwG9gkt88TaX0vfS4SCaIOPRMeNFx80Y="; }; outputs = [ @@ -64,15 +64,15 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - updateScript = unstableGitUpdater { }; + updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Simple convenience library for handling processes in C++11"; homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp"; - license = with licenses; [ gpl3Only lgpl3Only ]; - maintainers = with maintainers; [ onny OPNA2608 ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl3Only lgpl3Only ]; + maintainers = with lib.maintainers; [ onny OPNA2608 ]; + platforms = lib.platforms.linux; pkgConfigModules = [ "process-cpp" ]; }; }) From 29058a4be2bb175873e86c5c8451de079c7d966c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 19 Aug 2024 11:57:56 +0200 Subject: [PATCH 095/233] process-cpp: nixfmt --- pkgs/by-name/pr/process-cpp/package.nix | 43 +++++++++++++------------ 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/pr/process-cpp/package.nix b/pkgs/by-name/pr/process-cpp/package.nix index 8b6ac5676c43..eb9638e74ab1 100644 --- a/pkgs/by-name/pr/process-cpp/package.nix +++ b/pkgs/by-name/pr/process-cpp/package.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitLab -, testers -, gitUpdater -, cmake -, coreutils -, boost -, gtest -, lomiri -, properties-cpp -, pkg-config +{ + lib, + stdenv, + fetchFromGitLab, + testers, + gitUpdater, + cmake, + coreutils, + boost, + gtest, + lomiri, + properties-cpp, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { @@ -52,13 +53,9 @@ stdenv.mkDerivation (finalAttrs: { properties-cpp ]; - checkInputs = [ - gtest - ]; + checkInputs = [ gtest ]; - cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) - ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -70,8 +67,14 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple convenience library for handling processes in C++11"; homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp"; - license = with lib.licenses; [ gpl3Only lgpl3Only ]; - maintainers = with lib.maintainers; [ onny OPNA2608 ]; + license = with lib.licenses; [ + gpl3Only + lgpl3Only + ]; + maintainers = with lib.maintainers; [ + onny + OPNA2608 + ]; platforms = lib.platforms.linux; pkgConfigModules = [ "process-cpp" ]; }; From 85f5b4310cee5404cd7bf86caf1454b487c223b7 Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Mon, 19 Aug 2024 11:40:26 +0200 Subject: [PATCH 096/233] cockroachdb-bin: remove neosimsim from meta.maintainers --- pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix index 594cdc1a36b2..7fbaff27d947 100644 --- a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix +++ b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix @@ -41,6 +41,6 @@ buildFHSEnv { description = "Scalable, survivable, strongly-consistent SQL database"; license = licenses.bsl11; platforms = [ "aarch64-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ rushmorem thoughtpolice neosimsim ]; + maintainers = with maintainers; [ rushmorem thoughtpolice ]; }; } From cf4ffe3dcbf31b1e66d2fdba1edc8b5fa71c6ffc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 12:04:30 +0000 Subject: [PATCH 097/233] neocmakelsp: 0.7.9 -> 0.8.1 --- .../tools/language-servers/neocmakelsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index 9bab7acfc809..f58a1595f4a5 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.7.9"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-vxdXW74XRZONmLURGEHnyg4Z71uvD6/JzxVqkNqyxdo="; + hash = "sha256-SDSqYfnHI6nFJrLUDApYR1nfGdcPdPihrb54gNIRkLU="; }; - cargoHash = "sha256-otEpfykVTJ0DH9n3kO4G/BO2VD6RGp9N6/UX6UAs2jU="; + cargoHash = "sha256-Rlu2m+pbaU+EunQ7pthYPSRZo1yVF/+L114WxCv3l9c="; meta = with lib; { description = "CMake lsp based on tower-lsp and treesitter"; From f3c94988cd60d8bba9b442bbee22f269263c4802 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:57:27 +0200 Subject: [PATCH 098/233] labctl: 0.0.22 -> 0.0.22-unstable-2024-05-10 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../la/labctl/package.nix} | 25 ++++++------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 19 deletions(-) rename pkgs/{tools/networking/labctl/default.nix => by-name/la/labctl/package.nix} (63%) diff --git a/pkgs/tools/networking/labctl/default.nix b/pkgs/by-name/la/labctl/package.nix similarity index 63% rename from pkgs/tools/networking/labctl/default.nix rename to pkgs/by-name/la/labctl/package.nix index 89c84e4f1832..231d0984b207 100644 --- a/pkgs/tools/networking/labctl/default.nix +++ b/pkgs/by-name/la/labctl/package.nix @@ -1,30 +1,21 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, fetchpatch -, installShellFiles +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, }: buildGoModule rec { pname = "labctl"; - version = "0.0.22"; + version = "0.0.22-unstable-2024-05-10"; src = fetchFromGitHub { owner = "labctl"; repo = "labctl"; - rev = "v${version}"; - hash = "sha256-84t7qhLafNyPLgHmFQUsizEn6Us44dDTercGEm9lup4="; + rev = "1a8b11402def10819d36b9f7f44e82612ef22674"; + hash = "sha256-px5jrfllo6teJaNrqIQVyqMwArCw625xSVM7V/xW/IA="; }; - patches = [ - # Fix build failure with Go 1.21 by updating go4.org/unsafe/assume-no-moving-gc - # See https://github.com/labctl/labctl/pull/4 - (fetchpatch { - url = "https://github.com/labctl/labctl/commit/615d05e94b991362beddce71c7ee34eae7fc93ff.patch"; - hash = "sha256-4JrXSsg8rfuH6i8XyLd/qO6AibkRMDBIpfT8r1yS75c="; - }) - ]; - nativeBuildInputs = [ installShellFiles ]; vendorHash = "sha256-Ycr/IZckIFysS9Goes58hhgh96UMRHjYWfWlQU23mXk="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aba3cf0100fc..6b86c8cc8234 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2459,8 +2459,6 @@ with pkgs; lab = callPackage ../applications/version-management/lab { }; - labctl = callPackage ../tools/networking/labctl { }; - legit = callPackage ../applications/version-management/legit { }; legit-web = callPackage ../applications/version-management/legit-web { }; From a2e3831d1d7c613c2afe639f35d8483edaa619a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Mon, 19 Aug 2024 16:02:09 +0200 Subject: [PATCH 099/233] swc: 0.91.69 -> 0.91.369 --- pkgs/development/tools/swc/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/swc/default.nix b/pkgs/development/tools/swc/default.nix index d93b4c4ec845..b9ed6d05d6f4 100644 --- a/pkgs/development/tools/swc/default.nix +++ b/pkgs/development/tools/swc/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "swc"; - version = "0.91.69"; + version = "0.91.369"; env = { # swc depends on nightly features @@ -15,12 +15,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { pname = "swc_cli"; inherit version; - hash = "sha256-8zbxE1qkEWeSYt2L5PElZeJPRuK4Yiooy8xDmCD/PYw="; + hash = "sha256-6n6zHMV87h1kmjzEmdE86/toHI99q2HO1EEGHUE9sg8="; }; - cargoHash = "sha256-kRsRUOvDMRci3bN5NfhiLCWojNkSuLz3K4BfKfGYc7g="; - - buildFeatures = [ "swc_core/plugin_transform_host_native" ]; + cargoHash = "sha256-/Ku0W+L2mqVYDSkd2zRqM7UhHueXya4zjewp/xO/XlQ"; meta = with lib; { description = "Rust-based platform for the Web"; From 91add64d006858d6c0522c7db93096e268cdfbf1 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 19 Aug 2024 16:26:54 +0200 Subject: [PATCH 100/233] workflows/check-nix-format: Better `nix-shell` message As [suggested](https://github.com/NixOS/nixpkgs/pull/334286#issuecomment-2286131096) by @nh2 --- .github/workflows/check-nix-format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 614de43832a5..96a1a0971555 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -83,7 +83,7 @@ jobs: if (( "${#unformattedFiles[@]}" > 0 )); then echo "Some new/changed Nix files are not properly formatted" - echo "Please run the following in \`nix-shell\`:" + echo "Please go to the Nixpkgs root directory, run \`nix-shell\`, then:" echo "nixfmt ${unformattedFiles[*]@Q}" exit 1 fi From 84c49afaaaa997662d819fbf998475803db4bbcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 14:34:35 +0000 Subject: [PATCH 101/233] keycloak: 25.0.2 -> 25.0.4 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index bc97af7d3fae..69aa61b92bf4 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "25.0.2"; + version = "25.0.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-DYuK1W8dXI/UUB+9HzMnjiJdpJulS3QuIpmr3AA4OLo="; + hash = "sha256-Pj8+0bfYnHhkYIDQkePpsmbYb6MN4BI+2VLLdZv3C1Q="; }; nativeBuildInputs = [ makeWrapper jre ]; From 42fdc711cc3b453693d8dc3b794fb259e1ca043c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 14:34:42 +0000 Subject: [PATCH 102/233] ludusavi: 0.24.3 -> 0.25.0 --- pkgs/applications/backup/ludusavi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index a295994808e5..62a6ac58b7b4 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -23,16 +23,16 @@ rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.24.3"; + version = "0.25.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-FtLLj5uFcKuRTCSsSuyj0XGzFMVWQvVk4dTmBCmzfNs="; + hash = "sha256-GjecssOc5xVni73uNRQ/GaZmIdM9r09I8GpPK+jwoAY="; }; - cargoHash = "sha256-xC6HiXt8cfrDtno9IrOe8SP7WBL79paLI223fjxPsbg="; + cargoHash = "sha256-9QaQjb7bdDl4NWKbV+dfu9BgFU8NO3CZEvKSXujMUtI="; nativeBuildInputs = [ cmake From ebb3cf3ba916f819cecccc9a83a12a8a00813f07 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Mon, 19 Aug 2024 15:49:21 +0100 Subject: [PATCH 103/233] swiftlint: 0.55.1 -> 0.56.1 --- pkgs/by-name/sw/swiftlint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index aa6c641e3241..defd4f4ffc3c 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "swiftlint"; - version = "0.55.1"; + version = "0.56.1"; src = fetchurl { url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"; - hash = "sha256-Tmhw30CJaVQlcYnHjzmwrDpugHgR2/ihHIV8M+O2zwI="; + hash = "sha256-EEOEKwZsLOdSdf24uj1oN6uyY4Ox+HIkClXIJ1d+wpk="; }; dontPatch = true; From bea41b9a25b85b77b453ed4046949970e04e90bc Mon Sep 17 00:00:00 2001 From: t4ccer Date: Mon, 19 Aug 2024 09:16:59 -0600 Subject: [PATCH 104/233] buttermanager: 2.5.1 -> 2.5.2 --- pkgs/by-name/bu/buttermanager/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buttermanager/package.nix b/pkgs/by-name/bu/buttermanager/package.nix index 80c3dd4e3084..8127703d0e01 100644 --- a/pkgs/by-name/bu/buttermanager/package.nix +++ b/pkgs/by-name/bu/buttermanager/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "buttermanager"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; src = fetchFromGitHub { owner = "egara"; repo = "buttermanager"; rev = version; - hash = "sha256-MLYJt7OMYlTFk8FCAlZJ1RGlFFXKfeAthWGp4JN+PfY="; + hash = "sha256-/U5IVJvYCw/YzBWjQ949YP9uoxsTNRJ5FO7rrI6Cvhs="; }; propagatedBuildInputs = with python3Packages; [ From 83c6f0d2f181e6bf95d4319625f36757b0ad1dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 19 Aug 2024 17:18:52 +0200 Subject: [PATCH 105/233] dbeaver-bin: 24.1.4 -> 24.1.5 --- pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index dc1fe369c50d..d741337c78b3 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.1.4"; + version = "24.1.5"; src = let @@ -28,10 +28,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-xO9hQxiEtZJyoO3PQrNPuLPBj8iGF9tvpHkj9Z8oMMc="; - aarch64-linux = "sha256-4dkR0DR/e+gkMytFGNS5gJ/Eo6ih2pacYMR3LdLMv/E="; - x86_64-darwin = "sha256-LUlw7PMP1NpqIJ3qwY3ft+8gsQP8Cu6YqkaiH5Z5qZw="; - aarch64-darwin = "sha256-+7SkO6gv8kn4z9ccY5HIfLjnpsv89MBYil3H2zpQSZs="; + x86_64-linux = "sha256-FdrQDQ+2nsZp44+sARXT89/ZXlkl/OGej1JuezXGgU4="; + aarch64-linux = "sha256-oNP0ntsQ79ckNXuQ3TeVf9ooGzwCq7WXI0TbjTLC5DI="; + x86_64-darwin = "sha256-YcmMZPigykA9vNEF32NzCQWMWPt1GM7VaWGSAZp/1YM="; + aarch64-darwin = "sha256-tz+Ap/YZJbc+obCLqq2b2HgRUORWkaOHVGEEJtwEJXo="; }; in fetchurl { From e26d0a24b8cc69000f96ceb085b70b84f78b94c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 16:03:22 +0000 Subject: [PATCH 106/233] syn2mas: 0.9.0 -> 0.10.0 --- pkgs/by-name/sy/syn2mas/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix index 38e78d4bf92b..5143a9c8f128 100644 --- a/pkgs/by-name/sy/syn2mas/package.nix +++ b/pkgs/by-name/sy/syn2mas/package.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "syn2mas"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-authentication-service"; rev = "v${version}"; - hash = "sha256-e5JlkcSJ44iE+pVnGQpGiSNahxUcIFeaPyOjp9E3eD0="; + hash = "sha256-cZJ9ibBtxVBBVCBTGhtfM6lQTFvgUnO1WPO1WmDGuks="; }; sourceRoot = "${src.name}/tools/syn2mas"; - npmDepsHash = "sha256-47tFcKgzH/2WEX99rs7F79TXBXjqVwEumg5aLkx86Fw="; + npmDepsHash = "sha256-Dk/aSkCbuHiZN5H/f692/Yef+f5SJDSXuSMbePkU66g="; dontBuild = true; From a87ddf5f7d87d18af850ed3d015c4134a654e6ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 16:10:11 +0000 Subject: [PATCH 107/233] seaweedfs: 3.71 -> 3.72 --- pkgs/applications/networking/seaweedfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index c506f7f9b7e3..5586fbbdba41 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.71"; + version = "3.72"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-urYpcFZtZCEQ6nGcDJ2gq+HYnMcEencVn/jxt0HUl/U="; + hash = "sha256-5ANhRknN8EOUw+Ifsd2zCKDpDeoWJzUuwGMDMkZOwls="; }; - vendorHash = "sha256-2YvIK0wIwCELcaBUZN2SbTngdFO717YY+83NSIzae0w="; + vendorHash = "sha256-3CrWrv8kXnbZUcaI2CG/x7MUWlR14OLbjen5FbljTEI="; subPackages = [ "weed" ]; From 1bb54f39c2a1730a47e4355891f443e74d46f6be Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 19 Aug 2024 12:46:25 -0400 Subject: [PATCH 108/233] python312Packages.pyzx: init at 0.8.0 --- .../python-modules/pyzx/default.nix | 67 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/pyzx/default.nix diff --git a/pkgs/development/python-modules/pyzx/default.nix b/pkgs/development/python-modules/pyzx/default.nix new file mode 100644 index 000000000000..a391f26a3139 --- /dev/null +++ b/pkgs/development/python-modules/pyzx/default.nix @@ -0,0 +1,67 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + pythonRelaxDepsHook, + pytestCheckHook, + setuptools, + ipywidgets, + lark, + numpy, + pyperclip, + tqdm, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "pyzx"; + version = "0.8.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "zxcalc"; + repo = "pyzx"; + rev = "refs/tags/v${version}"; + hash = "sha256-4yc4P2v2L/F/A1A9z41ow2KA0aUA+3SJyC+wyMWzhwM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + ipywidgets + lark + numpy + pyperclip + tqdm + typing-extensions + ]; + + pythonRelaxDeps = [ "ipywidgets" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + # too expensive, and print results instead of reporting failures: + "tests/long_scalar_test.py" + "tests/long_test.py" + ]; + + pythonImportsCheck = [ + "pyzx" + "pyzx.circuit" + "pyzx.graph" + "pyzx.routing" + "pyzx.local_search" + "pyzx.scripts" + ]; + + meta = { + description = "Library for quantum circuit rewriting and optimisation using the ZX-calculus"; + homepage = "https://github.com/zxcalc/pyzx"; + changelog = "https://github.com/zxcalc/pyzx/blob/${src.rev}/CHANGELOG.md"; + 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 5134f53d3b4c..1c9e91ccedf5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13312,6 +13312,8 @@ self: super: with self; { pyzmq = callPackage ../development/python-modules/pyzmq { }; + pyzx = callPackage ../development/python-modules/pyzx { }; + qbittorrent-api = callPackage ../development/python-modules/qbittorrent-api { }; qasync = callPackage ../development/python-modules/qasync { }; From e9690f6295300636a36f57498c197bf34b494307 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Mon, 19 Aug 2024 17:59:24 +0100 Subject: [PATCH 109/233] widelands: darwin support --- pkgs/games/widelands/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 0be50f2b8be1..11e6db9c687e 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -24,6 +24,7 @@ , libSM , libICE , libXext +, darwin }: stdenv.mkDerivation rec { @@ -71,16 +72,19 @@ stdenv.mkDerivation rec { asio libSM # XXX: these should be propagated by SDL2? libICE - libXext - ]; + ] + ++ lib.optional stdenv.isLinux libXext + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + ]); - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' install -Dm444 -t $out/share/applications ../xdg/org.widelands.Widelands.desktop for s in 16 32 48 64 128; do install -Dm444 ../data/images/logos/wl-ico-''${s}.png $out/share/icons/hicolor/''${s}x''${s}/org.widelands.Widelands.png done - + '' + '' installManPage ../xdg/widelands.6 ''; @@ -96,7 +100,7 @@ stdenv.mkDerivation rec { mainProgram = "widelands"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin jcumming ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; hydraPlatforms = [ ]; }; } From 568b0cfe1bbb44d527cfffe1ea6782756f8f6af0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 17:21:03 +0000 Subject: [PATCH 110/233] storj-uplink: 1.109.2 -> 1.110.3 --- pkgs/applications/networking/sync/storj-uplink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index ff1613b8b2e1..171b547ece4a 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.109.2"; + version = "1.110.3"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-IVT3BWyDijhpt+bMn7u2f2JiGc0onAjbajHMzzbVt20="; + hash = "sha256-hVgFr5fnoSZumNkImMIEbKCu7nIAT72bMi3wnsn95tc="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-+m7XOpKzg0clbRh2Rpi8JqhLoJLJsA7tT3g6FkmoVc4="; + vendorHash = "sha256-iXOL7YtSXTmLMS3nDvuUy2puWK83gbtVmrzD17C9JxU="; ldflags = [ "-s" "-w" ]; From ef69e580f110b419b837040ac961bbc2b13cd2de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 19 Aug 2024 10:59:42 -0700 Subject: [PATCH 111/233] redisinsight: fix build --- pkgs/development/tools/redisinsight/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/redisinsight/default.nix b/pkgs/development/tools/redisinsight/default.nix index 4395bc7a040e..1ea9f69241a6 100644 --- a/pkgs/development/tools/redisinsight/default.nix +++ b/pkgs/development/tools/redisinsight/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { fixup-yarn-lock nodejs makeWrapper - python3 + (python3.withPackages (ps: [ ps.setuptools ])) nest-cli libsass pkg-config From 8d974586d7dcf01643dc999c6a9c56c83a3a0dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 19 Aug 2024 11:02:05 -0700 Subject: [PATCH 112/233] threema-desktop: fix build --- .../networking/instant-messengers/threema-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 2f71df5cef5a..25878085a30f 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -32,7 +32,7 @@ let npmBuildScript = "dist"; nativeBuildInputs = [ - python3 # Used by gyp + (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp ]; patches = [ From 4ba32492acae23d4965d9c3d40e40db7f1ab3439 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Mon, 19 Aug 2024 21:21:51 +0300 Subject: [PATCH 113/233] webcord-vencord: electron_29 -> electron_30 --- 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 b3213f4a8bee..4122ef35cda1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34595,7 +34595,7 @@ with pkgs; webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_30; }; - webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_29; }; + webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_30; }; webex = callPackage ../applications/networking/instant-messengers/webex { }; From 36a456f157f26e4be15070e4a8101e1da14e61bf Mon Sep 17 00:00:00 2001 From: Litchi Pi Date: Mon, 19 Aug 2024 20:45:05 +0200 Subject: [PATCH 114/233] mealie: fix relative path in code handling backup Signed-off-by: Litchi Pi --- pkgs/by-name/me/mealie/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 7cce5d54a650..5e49a9031a2d 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -112,6 +112,9 @@ pythonpkgs.buildPythonApplication rec { substituteInPlace mealie/db/init_db.py \ --replace-fail 'PROJECT_DIR = ' "PROJECT_DIR = Path('$out') #" + + substituteInPlace mealie/services/backups_v2/alchemy_exporter.py \ + --replace-fail '"script_location", path.join(PROJECT_DIR, "alembic")' '"script_location", "${src}/alembic"' ''; postInstall = let From f80fe495344e9c3b49c3d2d0d57141016201ab3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 19 Aug 2024 12:49:54 -0700 Subject: [PATCH 115/233] librewolf-unwrapped: 129.0.1 -> 129.0.1-1 --- .../networking/browsers/librewolf/src.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index cdaafe04f786..8fae46898abc 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "129.0-1", + "packageVersion": "129.0.1-1", "source": { - "rev": "129.0-1", - "sha256": "13wb54avaz2jsb5bz2jp3wn5bpraxfnvc2m93djzcacc8fd5fbwp" + "rev": "129.0.1-1", + "sha256": "0pvv3v23q31hdjvqi1f3cqfyjrb8dbrrbfwxj2wacak1g0mzbxf4" }, "settings": { - "rev": "0d126722d7e10bb7fa81f473450484c778928b39", - "sha256": "00i7j67nlfs8p9y2sylz4z4rylwhs98rd0idjpg0al0zga4jv7im" + "rev": "cbcf862e283669b49ecdf985d2d747eca9f4a794", + "sha256": "0aisg6l8xhk32wp8d9n532zgkk1nr4y4nsvqa9v8943g6vm4abb7" }, "firefox": { - "version": "129.0", - "sha512": "e406d00dc53c66a1ee6b56e7001efcdd8b323caa3676d66d874d39a99f44ac7cebf4c60d76b5d239ebcf834a75cecabf801a74a1d08a97a66ea5e8ec6c8f7c5b" + "version": "129.0.1", + "sha512": "27c463e8277994c62bab85cf0e2f0cea16a9b272694b61fa56a6b3bd7c70d6481774288386094836a54df54c1b1144d61be67f4f5eac418c05479d452221c027" } } From 0d48fd069d180b817ff6717c1d812dbc1dd571a3 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Mon, 19 Aug 2024 14:46:03 -0500 Subject: [PATCH 116/233] micropython: use Nix make infra and build in parallel --- pkgs/development/interpreters/micropython/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 25097e087606..a5c5d431a9ea 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -23,12 +23,9 @@ stdenv.mkDerivation rec { buildInputs = [ libffi readline ]; - buildPhase = '' - runHook preBuild - make -C mpy-cross - make -C ports/unix - runHook postBuild - ''; + makeFlags = [ "-C" "ports/unix" ]; # also builds mpy-cross + + enableParallelBuilding = true; doCheck = true; From bff7c05b3b2b1ffc82ba1b072f2c3a3ff691fa4f Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Mon, 19 Aug 2024 14:54:35 -0500 Subject: [PATCH 117/233] micropython: reduce source size to within Hydra limit Uncompressed NAR goes from ~3.3G to ~970M. --- .../interpreters/micropython/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index a5c5d431a9ea..52e2134d71cb 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -15,10 +15,21 @@ stdenv.mkDerivation rec { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - hash = "sha256-sfJohmsqq5FumUoVE8x3yWv12DiCJJXae62br0j+190="; + hash = "sha256-coUFIepbCRuz+766E7VCTQLm0oWB1CTO20ATriC86dc="; fetchSubmodules = true; + + # remove unused libaries from rp2 port's SDK. we leave this and the other + # ports around for users who want to override makeFlags flags to build them. + # https://github.com/micropython/micropython/blob/a61c446c0b34e82aeb54b9770250d267656f2b7f/ports/rp2/CMakeLists.txt#L17-L22 + # + # shrinks uncompressed NAR by ~2.4G (though it is still large). there + # doesn't seem to be a way to avoid fetching them in the first place. + postFetch = '' + rm -rf $out/lib/pico-sdk/lib/{tinyusb,lwip,btstack} + ''; }; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libffi readline ]; From 3fe54abcd1465d26d0508865872f6ad1b9c2d93f Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Mon, 19 Aug 2024 14:56:16 -0500 Subject: [PATCH 118/233] micropython: fix tests on darwin --- pkgs/development/interpreters/micropython/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 52e2134d71cb..98ef61f82195 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -40,8 +40,10 @@ stdenv.mkDerivation rec { doCheck = true; + __darwinAllowLocalNetworking = true; # needed for select_poll_eintr test + skippedTests = " -e select_poll_fd" - + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback" + + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback -e float_parse -e float_parse_doubleproc" + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse" ; From 4bed78b1f2f56408fe45759c6bdc0e12953fc52f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 19 Aug 2024 13:17:07 -0700 Subject: [PATCH 119/233] python312Packages.craft-application: unpin pygit2 --- .../development/python-modules/craft-application/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 7f986dd9fd1f..04c488586c9e 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -45,7 +45,10 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - pythonRelaxDeps = [ "requests" ]; + pythonRelaxDeps = [ + "pygit2" + "requests" + ]; dependencies = [ craft-archives From e6690e0e4550a6b93ac7b95fa75f092d3dd5b153 Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Mon, 19 Aug 2024 14:49:34 -0600 Subject: [PATCH 120/233] lubelogger: Add lyndeno as maintainer --- pkgs/by-name/lu/lubelogger/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 77a7e83760a3..06282b8cf589 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -37,7 +37,7 @@ buildDotnetModule rec { homepage = "https://lubelogger.com"; changelog = "https://github.com/hargata/lubelog/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ samasaur ]; + maintainers = with maintainers; [ samasaur lyndeno ]; mainProgram = "CarCareTracker"; platforms = platforms.all; }; From 917bb8ae5404879542d4c409091b1102637dc761 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 22:06:07 +0000 Subject: [PATCH 121/233] buf: 1.36.0 -> 1.37.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 8c54682ca676..b4742dbd1088 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-Y3rcp/bSbPHCocq1gy9ytzwF10+vOUMX4hBAw4dJpHI="; + hash = "sha256-LqDF093SjAa1HdvebbMI4Mp47VzAaZ0OcecmI/m+1j8="; }; - vendorHash = "sha256-TrAisrKBM8beccya0o8WO4AatKsPiXzeR46213ZBi38="; + vendorHash = "sha256-A7bkIyQ6KA5iudcmffzxc2d0d6Exy74s5OEeUW42e2o="; patches = [ # Skip a test that requires networking to be available to work. From 8e4956af0679b9dabafdc1293ffb9cab8fce7644 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 22:34:45 +0000 Subject: [PATCH 122/233] python312Packages.osxphotos: 0.68.4 -> 0.68.5 --- pkgs/development/python-modules/osxphotos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index 697d5af92e8a..118e59dc8279 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "osxphotos"; - version = "0.68.4"; + version = "0.68.5"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "osxphotos"; rev = "refs/tags/v${version}"; - hash = "sha256-bafEZ+6ck+LOm6eS+IjI6GFYh3OHpLUWrg0zJ4eb9Mg="; + hash = "sha256-JhtbbtiCxIGurRAFvk7UP9qzyXw1CCaGlyLHGs/G/uE="; }; build-system = [ setuptools ]; From 828e75bcab130d02012567f7de9f11eb39f2e5ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 22:34:48 +0000 Subject: [PATCH 123/233] broot: 1.41.1 -> 1.42.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 820cec6c0796..16c6e7520548 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.41.1"; + version = "1.42.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-MUwW9b5rXErjNBvF+O3zA/OlSl0Zy8pTRJLNMWSY8jo="; + hash = "sha256-Lv521aC9uIsuAdEEt7TteK/XbgQ1GsH6AA7hSOBsTBI="; }; - cargoHash = "sha256-GaYQqFRUJZ4Mpe+DKD+KmhrgK5I/DkJTJaA/PDifXbo="; + cargoHash = "sha256-jhgnTXeq/7S2Iy8YVHmS/F7zbYSX6W/iXFJzz8SPeV0="; nativeBuildInputs = [ installShellFiles From 906d209ebca9bd5581350189752e15b7bf18a719 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Tue, 20 Aug 2024 08:06:59 +0900 Subject: [PATCH 124/233] samrewritten: format with nixfmt Signed-off-by: Ludovico Piero --- pkgs/by-name/sa/samrewritten/package.nix | 25 ++++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index cbdc4b010a6d..0d0a06ee92a3 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, unstableGitUpdater -, curl -, gtkmm3 -, glibmm -, gnutls -, yajl -, pkg-config +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + curl, + gtkmm3, + glibmm, + gnutls, + yajl, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "samrewritten"; @@ -23,9 +24,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl From 164aa338a4c2458aacc5d10c921ffa5e71aa4799 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 19 Aug 2024 16:14:50 -0700 Subject: [PATCH 125/233] zoom-us: 6.1.6 -> 6.1.10 --- .../instant-messengers/zoom-us/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 45b8330c2464..a5cf1a8b39c2 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.1.6.37851"; - versions.x86_64-darwin = "6.1.6.37851"; - versions.x86_64-linux = "6.1.6.1013"; + versions.aarch64-darwin = "6.1.10.38818"; + versions.x86_64-darwin = "6.1.10.38818"; + versions.x86_64-linux = "6.1.10.1400"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-wsatsfVQElWXMZKZOVeqVBBE7ZRXx54OpA82ZzpymUI="; + hash = "sha256-E8r0bctM5whwEMppzO9hR3W+k+BmrV0gVx+J02KYmuk="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-BTLEfVFrUQbb+LpGP93hMqGFWhKM3tBdKxDKe8GkhiA="; + hash = "sha256-HMSBV/B/nTkcU8src6Wdz8uZnz455guSAMGm5ha7mIA="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-mvCJft0suOxnwTkWWuH9OYKHwTMWx61ct10P5Q/EVBM="; + hash = "sha256-c3WywWmblz9Wg3RMtovCBcR/mYyaWkmuoCqqGvHBxwo="; }; }; @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' # Desktop File substituteInPlace $out/share/applications/Zoom.desktop \ - --replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" + --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" for i in aomhost zopen zoom ZoomLauncher; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i From 3ed98a2d682d85e8ccd15e22ad122870d9e64099 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 20 Aug 2024 02:06:35 +0200 Subject: [PATCH 126/233] evcc: 0.130.0 -> 0.130.1 https://github.com/evcc-io/evcc/releases/tag/0.130.1 --- pkgs/servers/home-automation/evcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index a081451bfa32..289a9220a948 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGo123Module rec { pname = "evcc"; - version = "0.130.0"; + version = "0.130.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-+B2OQOf7BgYzJKvX9cu6SkIzfkD9z3Dk4pfVJmhTQzg="; + hash = "sha256-DFMQavUHu5sagtseHWDSmQ/KrAsdfyHGTluC7v1LtWM="; }; vendorHash = "sha256-Oj5+bmhlZHyOfcJf10EK8mvJauIWk88k0qj2NBkRvFQ="; From f043f52ffc7ec7ffe7a97f55d1ad8cc6dbae7eeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 00:15:08 +0000 Subject: [PATCH 127/233] cnquery: 11.16.1 -> 11.17.0 --- pkgs/tools/security/cnquery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index 0659a6e2dce2..20a67ebfc718 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.16.1"; + version = "11.17.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-MtO1R4uBmFpNgvG0jFU1Q/1J1sBk0JG9SvzTw8mgi1w="; + hash = "sha256-UgaWhvP73H+gfUJLP1aNnnunQtMpeaCmUZW+yq8Tzw4="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-kUYGXZZktfFSvOblxNefwcYVNE4uDZM52YaTQMZxOmU="; + vendorHash = "sha256-BT9Mkm8n14m3FB8LXCso2tBX5mE4RYwA2RtkznXuKLs="; ldflags = [ "-w" From 5fe634d9cd9af709e60cac8576fd6742b542d9e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 00:20:39 +0000 Subject: [PATCH 128/233] arkade: 0.11.19 -> 0.11.20 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 6836fd02006d..43e1899fe38a 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.19"; + version = "0.11.20"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-Vhldn9CMxC/5qPFN+ohydHuMsrHjpBuFkP4khf+OQds="; + hash = "sha256-xjJbO+42PUuRb4vMSKscTf2DEDekSwEF/v2QwKeBtvI="; }; CGO_ENABLED = 0; From 78b1309ad43695533da8934ff147d4ae087e96d6 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 31 May 2024 16:25:21 +0200 Subject: [PATCH 129/233] nixos/tests/qtile: test extraPackages and qtile-extras --- nixos/tests/all-tests.nix | 2 +- nixos/tests/qtile/add-widget.patch | 19 ++++++++++++++++ nixos/tests/qtile/config.nix | 24 ++++++++++++++++++++ nixos/tests/{qtile.nix => qtile/default.nix} | 19 ++++++++++++---- 4 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 nixos/tests/qtile/add-widget.patch create mode 100644 nixos/tests/qtile/config.nix rename nixos/tests/{qtile.nix => qtile/default.nix} (57%) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 60f7adcac189..83538fb3bc07 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -827,7 +827,7 @@ in { qgis = handleTest ./qgis.nix { qgisPackage = pkgs.qgis; }; qgis-ltr = handleTest ./qgis.nix { qgisPackage = pkgs.qgis-ltr; }; qownnotes = handleTest ./qownnotes.nix {}; - qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile.nix {}; + qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile/default.nix {}; quake3 = handleTest ./quake3.nix {}; quicktun = handleTest ./quicktun.nix {}; quickwit = handleTest ./quickwit.nix {}; diff --git a/nixos/tests/qtile/add-widget.patch b/nixos/tests/qtile/add-widget.patch new file mode 100644 index 000000000000..622ba35a1999 --- /dev/null +++ b/nixos/tests/qtile/add-widget.patch @@ -0,0 +1,19 @@ +--- a/config.py 2024-05-31 14:49:23.852287845 +0200 ++++ b/config.py 2024-05-31 14:51:00.935182266 +0200 +@@ -29,6 +29,8 @@ + from libqtile.lazy import lazy + from libqtile.utils import guess_terminal + ++from qtile_extras import widget ++ + mod = "mod4" + terminal = guess_terminal() + +@@ -162,6 +164,7 @@ + # NB Systray is incompatible with Wayland, consider using StatusNotifier instead + # widget.StatusNotifier(), + widget.Systray(), ++ widget.AnalogueClock(), + widget.Clock(format="%Y-%m-%d %a %I:%M %p"), + widget.QuickExit(), + ], diff --git a/nixos/tests/qtile/config.nix b/nixos/tests/qtile/config.nix new file mode 100644 index 000000000000..2536b9e2a8ae --- /dev/null +++ b/nixos/tests/qtile/config.nix @@ -0,0 +1,24 @@ +{ stdenvNoCC, fetchurl }: +stdenvNoCC.mkDerivation { + name = "qtile-config"; + version = "0.0.1"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/qtile/qtile/v0.28.1/libqtile/resources/default_config.py"; + hash = "sha256-Y5W277CWVNSi4BdgEW/f7Px/MMjnN9W9TDqdOncVwPc="; + }; + + prePatch = '' + cp $src config.py + ''; + + patches = [ ./add-widget.patch ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out + cp config.py $out/config.py + ''; +} diff --git a/nixos/tests/qtile.nix b/nixos/tests/qtile/default.nix similarity index 57% rename from nixos/tests/qtile.nix rename to nixos/tests/qtile/default.nix index 96afaa342c52..718063fa8bb5 100644 --- a/nixos/tests/qtile.nix +++ b/nixos/tests/qtile/default.nix @@ -1,15 +1,26 @@ -import ./make-test-python.nix ({ lib, ...} : { +import ../make-test-python.nix ({ lib, ...} : { name = "qtile"; meta = { maintainers = with lib.maintainers; [ sigmanificient ]; }; - nodes.machine = { pkgs, lib, ... }: { - imports = [ ./common/x11.nix ./common/user-account.nix ]; + nodes.machine = { pkgs, lib, ... }: let + # We create a custom Qtile configuration file that adds a widget from + # qtile-extras to the bar. This ensure that the qtile-extras package + # also works, and that extraPackages behave as expected. + + config-deriv = pkgs.callPackage ./config.nix { }; + in { + imports = [ ../common/x11.nix ../common/user-account.nix ]; test-support.displayManager.auto.user = "alice"; - services.xserver.windowManager.qtile.enable = true; + services.xserver.windowManager.qtile = { + enable = true; + configFile = "${config-deriv}/config.py"; + extraPackages = ps: [ ps.qtile-extras ]; + }; + services.displayManager.defaultSession = lib.mkForce "qtile"; environment.systemPackages = [ pkgs.kitty ]; From 0f1ab3b9a7f5b0fb73d0be246015eb01392549d4 Mon Sep 17 00:00:00 2001 From: Reed Riley Date: Sat, 17 Aug 2024 14:49:46 -0700 Subject: [PATCH 130/233] bcachefs-tools: 1.9.4 -> 1.11.0 --- pkgs/by-name/bc/bcachefs-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index d755b2aaf785..0ea0c06ea167 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.9.4"; + version = "1.11.0"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-qPnlSl1s9QWkODqbrfzIVFLXtDVEmTOihBlDmvHoknY="; + hash = "sha256-L2eIYdQnnmKNI8QWSy8nk4GzJ8jv+qt98gqdzcJH31Q="; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; - hash = "sha256-ufzxFEgeOaOcZKEPx7kT64Pj2oz6m35exqXQlKxXGb4="; + hash = "sha256-Ol3wKdxKYJWDC/JREOfVSQRNnWVano7qilMRvqrLsgA=="; }; makeFlags = [ From 9635ec4e5c03e666d7e99d0b9bc447a1e6c974fc Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 13 Jul 2024 04:15:17 +0200 Subject: [PATCH 131/233] python312Packages.aerosandbox: init at 4.2.5 --- .../python-modules/aerosandbox/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/aerosandbox/default.nix diff --git a/pkgs/development/python-modules/aerosandbox/default.nix b/pkgs/development/python-modules/aerosandbox/default.nix new file mode 100644 index 000000000000..f108219b6b08 --- /dev/null +++ b/pkgs/development/python-modules/aerosandbox/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + numpy, + scipy, + pandas, + matplotlib, + seaborn, + tqdm, + sortedcontainers, + dill, + casadi, +}: + +buildPythonPackage rec { + pname = "aerosandbox"; + version = "4.2.5"; + format = "wheel"; + + src = fetchPypi { + pname = "AeroSandbox"; + inherit version format; + + python = "py3"; + dist = "py3"; + hash = "sha256-9WxeXmcOZpKpNn8r6REudQlDRXavym52tvKajYJIfXA="; + }; + + build-system = [ setuptools ]; + dependencies = [ + numpy + scipy + pandas + matplotlib + seaborn + tqdm + sortedcontainers + dill + casadi + ]; + + pythonImportsCheck = [ "aerosandbox" ]; + + meta = { + description = "Aircraft design optimization made fast through modern automatic differentiation"; + homepage = "https://peterdsharpe.github.io/AeroSandbox"; + 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 602d2fcb8acc..adbda63981c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -101,6 +101,8 @@ self: super: with self; { aeppl = callPackage ../development/python-modules/aeppl { }; + aerosandbox = callPackage ../development/python-modules/aerosandbox { }; + aesara = callPackage ../development/python-modules/aesara { }; aesedb = callPackage ../development/python-modules/aesedb { }; From 493fd6555261b2743866fc521ec057df65633be4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 01:24:55 +0000 Subject: [PATCH 132/233] asdf-vm: 0.14.0 -> 0.14.1 --- pkgs/tools/misc/asdf-vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/asdf-vm/default.nix b/pkgs/tools/misc/asdf-vm/default.nix index c9b7f27c42b0..024d70d5c7cb 100644 --- a/pkgs/tools/misc/asdf-vm/default.nix +++ b/pkgs/tools/misc/asdf-vm/default.nix @@ -37,13 +37,13 @@ ${asdfReshimFile} ''; in stdenv.mkDerivation rec { pname = "asdf-vm"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "asdf-vm"; repo = "asdf"; rev = "v${version}"; - sha256 = "sha256-DmwKzW0oHjokMxj2RMT4iogurEMKeAcl7MWlPTOqMmg="; + sha256 = "sha256-1dacsAoZVwoQv8+V4FrjRLa7awLIZchlhkuET0wTO7w="; }; nativeBuildInputs = [ From d74e99d9820136adb65200eedd55a8b7e5ff4c70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 01:26:29 +0000 Subject: [PATCH 133/233] b3sum: 1.5.3 -> 1.5.4 --- pkgs/by-name/b3/b3sum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix index 1a2580bd1d9f..a2ba961b2039 100644 --- a/pkgs/by-name/b3/b3sum/package.nix +++ b/pkgs/by-name/b3/b3sum/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.5.3"; + version = "1.5.4"; src = fetchCrate { inherit version pname; - hash = "sha256-wyr5LuFn3yRPJCyNfLT1Vgn6Sz1U4VNo0nppJrqE7IY="; + hash = "sha256-+aC6yyQ9IcdliYqteB/UTMqwGNCWW0LZWYfMxnaPMm0="; }; - cargoHash = "sha256-v2sQKZ0DG08MDLho8fQ8O7fiNu+kxZB1sPNMgF5W2HA="; + cargoHash = "sha256-2E6SU4fMHj0NCIMrn0YNfkllZrFwCLn1wGJfzBPqtKQ="; meta = { description = "BLAKE3 cryptographic hash function"; From e3ac2227f1447a259f5c02ae621c909dc0e04eb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 01:38:01 +0000 Subject: [PATCH 134/233] cargo-about: 0.6.3 -> 0.6.4 --- pkgs/development/tools/rust/cargo-about/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 512f176e5686..ee7da1db8890 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-J86tX/g3FW7fM24WVTZ8Afwu9hzXrac3qgYPcvUo8z4="; + sha256 = "sha256-KFTG4FmmEji+0yNTwrunqOQuaU+qUcu1Vg7ZqoeUy4c="; }; - cargoHash = "sha256-Uyki5iDv5eKKcGZOZQwpNYe6jELg3zUNY5LzFKUfzXY="; + cargoHash = "sha256-bCw30ooQdSMRD3oM9BeUt9sJe5v+ketO73FjEypNy9s="; nativeBuildInputs = [ pkg-config ]; From ac4629828845be7a72fb94b32d586589adc5cc1f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 13 Jul 2024 04:15:48 +0200 Subject: [PATCH 135/233] python312Packages.neurafoil: init at 0.2.3 --- .../python-modules/neuralfoil/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/neuralfoil/default.nix diff --git a/pkgs/development/python-modules/neuralfoil/default.nix b/pkgs/development/python-modules/neuralfoil/default.nix new file mode 100644 index 000000000000..f217b740e17e --- /dev/null +++ b/pkgs/development/python-modules/neuralfoil/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + numpy, + aerosandbox, + pytestCheckHook, +}: + +buildPythonPackage { + pname = "neuralfoil"; + version = "0.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "peterdsharpe"; + repo = "NeuralFoil"; + rev = "46cda4041134d1b1794d3a81761d8d3e63f20855"; + hash = "sha256-kbPHPJh8xcIdPYIiaxwYqpfcnYzzDD6F0tG3flR0j3M="; + }; + + build-system = [ setuptools ]; + dependencies = [ + numpy + aerosandbox + ]; + + pythonImportsCheck = [ "neuralfoil" ]; + + nativeBuildInputs = [ pytestCheckHook ]; + + meta = { + description = "Airfoil aerodynamics analysis tool using physics-informed machine learning, in pure Python/NumPy"; + homepage = "https://github.com/peterdsharpe/NeuralFoil"; + 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 adbda63981c4..af519225b952 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9098,6 +9098,8 @@ self: super: with self; { networkx = callPackage ../development/python-modules/networkx { }; + neuralfoil = callPackage ../development/python-modules/neuralfoil { }; + neuron-full = pkgs.neuron-full.override { python3 = python; }; neuronpy = toPythonModule neuron-full; From 361ee3ed55198e2ef318918742b33a512882d9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 19 Aug 2024 22:19:20 -0400 Subject: [PATCH 136/233] quickfix: mark as broken on aarch64 --- pkgs/development/libraries/quickfix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/development/libraries/quickfix/default.nix index af1efc62557b..0c327d0d5e59 100644 --- a/pkgs/development/libraries/quickfix/default.nix +++ b/pkgs/development/libraries/quickfix/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { homepage = "http://www.quickfixengine.org"; license = licenses.free; # similar to BSD 4-clause maintainers = with maintainers; [ bhipple ]; + broken = stdenv.isAarch64; }; } From 85a6ff509f7c257b032c1e7336dc3e4ee0bd7ecb Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Tue, 20 Aug 2024 08:10:07 +0900 Subject: [PATCH 137/233] samrewritten: fix `.desktop` file Signed-off-by: Ludovico Piero --- pkgs/by-name/sa/samrewritten/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index 0d0a06ee92a3..d689a1feb089 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -34,6 +34,11 @@ stdenv.mkDerivation (finalAttrs: { yajl ]; + postInstall = '' + substituteInPlace $out/share/applications/samrewritten.desktop \ + --replace-fail "Exec=/usr/bin/samrewritten" "Exec=samrewritten" + ''; + passthru.updateScript = unstableGitUpdater { }; meta = { From 28be6339254c0cadfd39c36f9a6846be5946301e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 02:41:58 +0000 Subject: [PATCH 138/233] pet: 0.8.4 -> 0.9.0 --- pkgs/development/tools/pet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index bf4b4f0e633d..6446c475f355 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pet"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; rev = "v${version}"; - sha256 = "sha256-XFizQxegyMIAUEKT8/kzWyC4TWICMUE7SuHQsTNpK4w="; + sha256 = "sha256-h6e7X93uU/rdTrCz5xJcNtpDbzcF/2Z186b4dHkp9jM="; }; - vendorHash = "sha256-XvSg7EhFdK7wt1Eei56pj/emiE4qsVJkOpgPNsnDNc4="; + vendorHash = "sha256-hf2I5xHloqcXDlC8frxtCiQx2PlTmKmyd1mrzF2UdDo="; ldflags = [ "-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}" From edcc3f5c8a2bd08209a629174caf6149559a8594 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 02:42:30 +0000 Subject: [PATCH 139/233] lscolors: 0.18.0 -> 0.19.0 --- pkgs/applications/misc/lscolors/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 2778db3ca8b2..263ac29eaed2 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.18.0"; + version = "0.19.0"; src = fetchCrate { inherit version pname; - hash = "sha256-m9S8fG0c+67/msdWaN8noazEdsdLk1aswUJ+8hkjhxo="; + hash = "sha256-9xYWjpeXg646JEW7faRLE1Au6LRVU6QQ7zfAwmYffT0="; }; - cargoHash = "sha256-6d/v89Yqn9FioWQTb5513kPbO9lnzBxaubfcdCzwUP4="; + cargoHash = "sha256-gtcznStbuYWcBPKZ/hdH15cwRQL0+Q0fZHe+YW5Rek0="; buildFeatures = [ "nu-ansi-term" ]; From e5b72667f5930a4cb46e2ed3a90f0493ec4d1c7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 03:14:58 +0000 Subject: [PATCH 140/233] python312Packages.awswrangler: 3.9.0 -> 3.9.1 --- 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 6ad84623a681..3f770c272c55 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.9.0"; + version = "3.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-XhTRnQ2wsCD2jiiRFHDagmMB26lZ8Oj+tscgVypN0+c="; + hash = "sha256-k+jQj/EajjjvvXZJd8c/3vtaGrQJedbYSDIzel0Sp44="; }; pythonRelaxDeps = [ "packaging" ]; From 354dc1e807230951a7ce13a12763f203475c703c Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 20 Aug 2024 08:45:29 +0530 Subject: [PATCH 141/233] tailscale: 1.70.0 -> 1.72.0 Changes: https://tailscale.com/changelog#2024-08-19 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 3d06f3e79ad5..6536d7a32778 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -15,7 +15,7 @@ }: let - version = "1.70.0"; + version = "1.72.0"; in buildGoModule { pname = "tailscale"; @@ -25,7 +25,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-rB/zaJavA3OH1HK7Rfpta/QmQzi0xsEYTvW5JzzTAlI="; + hash = "sha256-PFXXd5ToBbvuGl+u4nEAHy1F696lxHD3PrPJ3Tpb+eg="; }; patches = [ @@ -37,7 +37,7 @@ buildGoModule { }) ]; - vendorHash = "sha256-NtNjH2Vo1Leh98VIOkpyALErhC+6H5BE/uaPkwlejoo="; + vendorHash = "sha256-M5e5dE1gGW3ly94r3SxCsBmVwbBmhVtaVDW691vxG/8="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; From 9b8d0ec90e0c87d44b39625a8c2ef58553d76d42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 03:55:56 +0000 Subject: [PATCH 142/233] python312Packages.pyeapi: 1.0.2 -> 1.0.4 --- pkgs/development/python-modules/pyeapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index a7063c55e7ae..97b46eb63c33 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyeapi"; - version = "1.0.2"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arista-eosplus"; repo = "pyeapi"; - rev = "refs/tags/v${version}"; - hash = "sha256-GZBoCoAqij54rZezRDF/ihJDQ5T6FFyDSRXGV3//avQ="; + rev = "refs/tags/v.${version}"; + hash = "sha256-KDtL+ed9t9QoHVSVR2RQ+1Pll6CJuPrCamNem3keZRo="; }; patches = [ From 2ccdb31638030d1d31b2f2bfea829d3475534736 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 04:01:59 +0000 Subject: [PATCH 143/233] spdx-license-list-data: 3.24.0 -> 3.25.0 --- pkgs/data/misc/spdx-license-list-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 134a2581bd20..84ec81af9517 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.24.0"; + version = "3.25.0"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - hash = "sha256-G7xRxHakkDphzMydxqfKEDLUp5ay2JwAtWhTTYiK+IM="; + hash = "sha256-0UmeSwIWEYWyGkoVqh6cKv6lx+7fjBpDanr6yo3DN0s="; }; # List of file formats to package. From 068a963c8103e8f520bdc77ad8b0fcdab25dc5f3 Mon Sep 17 00:00:00 2001 From: Gordon-BP Date: Tue, 20 Aug 2024 12:07:22 +0800 Subject: [PATCH 144/233] maintainers: add gordon-bp --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c8a054597e5a..205d21a6dfd9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7677,6 +7677,12 @@ githubId = 1621335; name = "Andrew Trachenko"; }; + gordon-bp = { + email = "gordy@hanakano.com"; + github = "Gordon-BP"; + githubId = 77560236; + name = "Gordon Clark"; + }; gotcha = { email = "gotcha@bubblenet.be"; github = "gotcha"; From 6b4c53fe0f9731d914f34e9829e970781c43a69d Mon Sep 17 00:00:00 2001 From: Gordon-BP Date: Tue, 20 Aug 2024 12:10:30 +0800 Subject: [PATCH 145/233] python3Packages.oschmod: init at 0.3.12 --- .../python-modules/oschmod/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/oschmod/default.nix diff --git a/pkgs/development/python-modules/oschmod/default.nix b/pkgs/development/python-modules/oschmod/default.nix new file mode 100644 index 000000000000..18a30b5c31aa --- /dev/null +++ b/pkgs/development/python-modules/oschmod/default.nix @@ -0,0 +1,25 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "oschmod"; + version = "0.3.12"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-vsmSFvMWFe5lOypch8rPtOS2GEwOn3HaGGMA2srpdPM="; + }; + build-system = [ setuptools ]; + + meta = { + description = "Change file permissions on Windows, macOS, and Linux"; + homepage = "https://github.com/yakdriver/oschmod"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ gordon-bp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 602d2fcb8acc..8ccbd811177a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9689,6 +9689,8 @@ self: super: with self; { osc-sdk-python = callPackage ../development/python-modules/osc-sdk-python { }; + oschmod = callPackage ../development/python-modules/oschmod { }; + oscpy = callPackage ../development/python-modules/oscpy { }; oscrypto = callPackage ../development/python-modules/oscrypto { }; From 8b6c05209fb9637377ab55be7e22f4056e885c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 19 Aug 2024 18:27:18 +0200 Subject: [PATCH 146/233] qdiskinfo: 0.2 -> 0.3 Release notes: https://github.com/edisionnano/QDiskInfo/releases/tag/0.3 --- pkgs/by-name/qd/qdiskinfo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix index 7c66fbd0a78a..41ad61351127 100644 --- a/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "QDiskInfo"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "edisionnano"; repo = "QDiskInfo"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-YLNpQOmh/exBJDuYRUEvzNv/El4x+PttEoj+aCur9wg="; + hash = "sha256-0zF3Nc5K8+K68HOSy30ieYvYP9/oSkTe0+cp0hVo9Gs="; }; nativeBuildInputs = [ From b82482e8a45bdc6c9bfcfbaf169df66519a0f237 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 05:25:07 +0000 Subject: [PATCH 147/233] python312Packages.holidays: 0.54 -> 0.55 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index a289f7d77d1a..df4237a8e9a6 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.54"; + version = "0.55"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-/mpbNuCnADuguI1v8cpYUdhBN8DjhjklCDVmMOsRvkM="; + hash = "sha256-4TJgXY0n7UMr5dGuhfE7WqPCgEBfvb0QUxJNYdaAOLE="; }; build-system = [ From 446b726b8116b30eca7ae67085647a96702263d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 05:25:35 +0000 Subject: [PATCH 148/233] python312Packages.hcloud: 2.2.0 -> 2.2.1 --- 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 3f8191b156e9..f3e0ae54c4ab 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.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NlEpnSmNY8rcfCJVgKqufCmEMSp4UBr5Po2rh1V8OrA="; + hash = "sha256-3Bcvj+VkIdoU2AiGtbkgwrqwgb8RjHMqQxjBf03iWG4="; }; build-system = [ setuptools ]; From bf1d3265673d6c45f63267ea95286f15309378ac Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Mon, 19 Aug 2024 23:29:54 -0600 Subject: [PATCH 149/233] lubelogger: Remove samasaur1 from maintainers --- pkgs/by-name/lu/lubelogger/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 06282b8cf589..39e137046703 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -37,7 +37,7 @@ buildDotnetModule rec { homepage = "https://lubelogger.com"; changelog = "https://github.com/hargata/lubelog/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ samasaur lyndeno ]; + maintainers = with maintainers; [ lyndeno ]; mainProgram = "CarCareTracker"; platforms = platforms.all; }; From 9ca830ce5699eb911659ea9f111cf693e8316fcf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 Aug 2024 07:36:32 +0200 Subject: [PATCH 150/233] python312Packages.mizani: 0.12.0 -> 0.12.1 Diff: https://github.com/has2k1/mizani/compare/refs/tags/v0.12.0...v0.12.1 Changelog: https://github.com/has2k1/mizani/releases/tag/v0.12.1 --- pkgs/development/python-modules/mizani/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 9c58ad4d5527..dd134c9d4c1d 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.12.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-NQu1vzISMa0UnnSqU8ypp3pc3n6MUI1j5nYUPU14r9U="; + hash = "sha256-a/+yZ7oUZG0fKgBUMwIf3XHUjac8Gsh3AosDVuUVoJU="; }; build-system = [ setuptools-scm ]; From 035f2b8506043eec7bd15c5e2c9da871faf68700 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 05:46:50 +0000 Subject: [PATCH 151/233] transifex-cli: 1.6.15 -> 1.6.16 --- pkgs/applications/misc/transifex-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/applications/misc/transifex-cli/default.nix index 3f517699376e..72324c3d1c49 100644 --- a/pkgs/applications/misc/transifex-cli/default.nix +++ b/pkgs/applications/misc/transifex-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.15"; + version = "1.6.16"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-NW3vPjXfusBQKDbH8DnU/LMyOP2qkzArD7RYjJ1IQvM="; + sha256 = "sha256-4TYuWNpw1tc3igKe4ld6pN35W070fekCaxpHGb/ekuY="; }; vendorHash = "sha256-3gi2ysIb5256CdmtX38oIfeDwNCQojK+YB9aEm8H01Q="; From 519ff460c82bcbe18af6be5bd1a90ce1d2c5f467 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 06:07:53 +0000 Subject: [PATCH 152/233] terragrunt: 0.66.4 -> 0.66.8 --- pkgs/by-name/te/terragrunt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 34fb73d8ae79..f482a04b7bba 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.66.4"; + version = "0.66.8"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k3SbK1u/w4YS3AKjBM5LCwn+dSt3hoLxvKRpeKTkuW4="; + hash = "sha256-GDRduJMTPWhUo1dv6sFaEYj3dFUwkHg8D/QebyeOBK4="; }; nativeBuildInputs = [ go-mockery ]; @@ -21,7 +21,7 @@ buildGoModule rec { make generate-mocks ''; - vendorHash = "sha256-VAkTOnmq1HUMA1sCgpvbEBBZyaO1Hx0h1rTIyDY/qXA="; + vendorHash = "sha256-Hg+9Zfv8IQpJEtLh5QHm6HLgn/RTlf723dePD4481fM="; doCheck = false; From 9813b1c29df8330e6122a12b1988ac6f143d3da1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 14 Aug 2024 20:19:31 +0000 Subject: [PATCH 153/233] python312Packages.langchain-core: 0.2.21 -> 0.2.33 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-core==0.2.21...langchain-core==0.2.33 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.2.33 --- .../python-modules/langchain-core/default.nix | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 8e32b2f3f6d7..737fbb47d4b5 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.2.21"; + version = "0.2.33"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-8qEN03iimGLnhg6TdpPal+MXBZJ/QHJKwjxRF96abBw="; + hash = "sha256-vM3FY9E8PeC8LHP4QCTM1ggFynI+PscF7pv7CMaSZlU="; }; sourceRoot = "${src.name}/libs/core"; @@ -52,11 +52,14 @@ buildPythonPackage rec { jsonpatch langsmith packaging - pydantic pyyaml tenacity ]; + optional-dependencies = { + pydantic = [ pydantic ]; + }; + pythonImportsCheck = [ "langchain_core" ]; nativeCheckInputs = [ @@ -86,15 +89,22 @@ buildPythonPackage rec { ''; }; - disabledTests = [ - # flaky, sometimes fail to strip uuid from AIMessageChunk before comparing to test value - "test_map_stream" - ] - ++ lib.optionals stdenv.isDarwin [ - # Langchain-core the following tests due to the test comparing execution time with magic values. - "test_queue_for_streaming_via_sync_call" - "test_same_event_loop" - ]; + disabledTests = + [ + # flaky, sometimes fail to strip uuid from AIMessageChunk before comparing to test value + "test_map_stream" + # Compares with machine-specific timings + "test_rate_limit_invoke" + "test_rate_limit_stream" + ] + ++ lib.optionals stdenv.isDarwin [ + # Langchain-core the following tests due to the test comparing execution time with magic values. + "test_queue_for_streaming_via_sync_call" + "test_same_event_loop" + # Comparisons with magic numbers + "test_rate_limit_ainvoke" + "test_rate_limit_astream" + ]; meta = { description = "Building applications with LLMs through composability"; From 208b7bb36e8e0d9b14d412b32431ba7ea7e7b9fc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 14 Aug 2024 20:27:07 +0000 Subject: [PATCH 154/233] python312Packages.langchain: 0.2.9 -> 0.2.14 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain==0.2.9...langchain==0.2.14 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.2.14 --- pkgs/development/python-modules/langchain/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 8475a6bbbce5..249e1d74fdd7 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.2.9"; + version = "0.2.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain==${version}"; - hash = "sha256-HSr1watEDC28SZTsJWbXGrZsQd0O/wgxmj7pTsxMBOA="; + hash = "sha256-dgXcZu7dtmwlXp8dzHSNfbBnK7RWvrSwqYELm1fczzc="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -54,7 +54,6 @@ buildPythonPackage rec { langchain-core langchain-text-splitters langsmith - numpy pydantic pyyaml requests @@ -62,6 +61,10 @@ buildPythonPackage rec { tenacity ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + optional-dependencies = { + numpy = [ numpy ]; + }; + nativeCheckInputs = [ freezegun lark From 06a929946ca8729ae62bb69d9089fe5e1937cf05 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 16 Aug 2024 22:37:51 +0200 Subject: [PATCH 155/233] python312Packages.langchain-openai: 0.1.17 -> 0.1.22 --- pkgs/development/python-modules/langchain-openai/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 58eecb2a9f2a..8f09f326ece8 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.1.17"; + version = "0.1.22"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-openai==${version}"; - hash = "sha256-ELD1KXCVx3SmiJodagtOHgBGKdjRWiRVCCNYcL63eCY="; + hash = "sha256-5UAijSTfQ6nQxdZvKHl2o01wDW6+Jphf38V+dAs7Ffk="; }; sourceRoot = "${src.name}/libs/partners/openai"; @@ -48,7 +48,6 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ - langchain langchain-core openai tiktoken From e687a395ab7872379bb996887cbfa288952d4b24 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 16 Aug 2024 22:53:06 +0200 Subject: [PATCH 156/233] python312Packages.langchain-aws: init at 0.1.16 --- .../python-modules/langchain-aws/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/langchain-aws/default.nix diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix new file mode 100644 index 000000000000..29f0c2d5d644 --- /dev/null +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + boto3, + langchain-core, + numpy, + poetry-core, + pytestCheckHook, + pytest-asyncio, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "langchain-aws"; + version = "0.1.16"; + pyproject = true; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain-aws"; + rev = "refs/tags/v${version}"; + hash = "sha256-WICv4tD9abTLO6mp/gZ4dgYVWmLMdUHgkwpZPd+u+Ek="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--snapshot-warn-unused" "" \ + --replace-fail "--cov=langchain_aws" "" + + ln -s ${langchain-core.src}/libs/standard-tests/langchain_standard_tests ./langchain_standard_tests + ''; + + sourceRoot = "${src.name}/libs/aws"; + + build-system = [ poetry-core ]; + + dependencies = [ + boto3 + langchain-core + numpy + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + pythonImportsCheck = [ "langchain_aws" ]; + + meta = { + changelog = "https://github.com/langchain-ai/langchain-aws/releases/tag/v${version}"; + description = "Build LangChain application on AWS"; + homepage = "https://github.com/langchain-ai/langchain-aws/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + drupol + natsukium + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5134f53d3b4c..9667f6652a82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6740,6 +6740,8 @@ self: super: with self; { langchain = callPackage ../development/python-modules/langchain { }; + langchain-aws = callPackage ../development/python-modules/langchain-aws { }; + langchain-azure-dynamic-sessions = callPackage ../development/python-modules/langchain-azure-dynamic-sessions { }; langchain-chroma = callPackage ../development/python-modules/langchain-chroma { }; From 2266ba0ce093d16672d2c74cc149d98fc2a08215 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 16 Aug 2024 22:53:38 +0200 Subject: [PATCH 157/233] python312Packages.langchain-mongodb: 0.1.6 -> 0.1.8 --- pkgs/development/python-modules/langchain-mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index 360fa099f937..9edd6e571784 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langchain-mongodb"; - version = "0.1.6"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-mongodb==${version}"; - hash = "sha256-p/cdWFPc2Oi5aRmjj1oAixM6aDKw0TbyzMdP4h2acG4="; + hash = "sha256-fjSvn9O/CrKBexcwuILXFR7AGx/tZtGDWjA0L6XV4Hk="; }; sourceRoot = "${src.name}/libs/partners/mongodb"; From e411b4d397c2a16273c1696c89706f9800e3bf53 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 18 Aug 2024 10:08:57 +0200 Subject: [PATCH 158/233] python312Packages.langgraph-checkpoint-sqlite: init at 1.0.0 --- .../langgraph-checkpoint-sqlite/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix new file mode 100644 index 000000000000..323faf5ffb1b --- /dev/null +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + langgraph-checkpoint, + aiosqlite, + pytest-asyncio, + pytestCheckHook, + langgraph-sdk, + poetry-core, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "langgraph-checkpoint-sqlite"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langgraph"; + rev = "refs/tags/checkpointsqlite==${version}"; + hash = "sha256-TUiZOf34jhs+nkeTsprtTdoVqDt7kZd8NxYLKX4l0kQ="; + }; + + sourceRoot = "${src.name}/libs/checkpoint-sqlite"; + + build-system = [ poetry-core ]; + + dependencies = [ + aiosqlite + langgraph-checkpoint + ]; + + pythonImportsCheck = [ "langgraph.checkpoint.sqlite" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + passthru = { + updateScript = langgraph-sdk.updateScript; + }; + + meta = { + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointsqlite==${version}"; + description = "Library with a SQLite implementation of LangGraph checkpoint saver"; + homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-sqlite"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + drupol + sarahec + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9667f6652a82..e237b7703fae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6766,6 +6766,8 @@ self: super: with self; { langgraph = callPackage ../development/python-modules/langgraph { }; + langgraph-checkpoint-sqlite = callPackage ../development/python-modules/langgraph-checkpoint-sqlite { }; + langgraph-cli = callPackage ../development/python-modules/langgraph-cli { }; langgraph-sdk = callPackage ../development/python-modules/langgraph-sdk { }; From 3ff378e5d9faf547822b4034f73145ea33c6268d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 18 Aug 2024 10:09:23 +0200 Subject: [PATCH 159/233] python312Packages.langgraph-checkpoint-postgres: init at 1.0.3 --- .../langgraph-checkpoint-postgres/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix new file mode 100644 index 000000000000..a3e9d63d6213 --- /dev/null +++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + langgraph-checkpoint, + orjson, + psycopg, + langgraph-sdk, + poetry-core, + pythonOlder, + postgresql, + postgresqlTestHook, + pytestCheckHook, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "langgraph-checkpoint-postgres"; + version = "1.0.3"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langgraph"; + rev = "refs/tags/checkpointpostgres==${version}"; + hash = "sha256-U7Bymo+Nj82kwjxN33W2MT10jv+lioZUxIKUt8Yxh/s="; + }; + + postgresqlTestSetupPost = '' + substituteInPlace tests/conftest.py \ + --replace-fail "DEFAULT_URI = \"postgres://postgres:postgres@localhost:5441/postgres?sslmode=disable\"" "DEFAULT_URI = \"postgres:///$PGDATABASE\"" + ''; + + sourceRoot = "${src.name}/libs/checkpoint-postgres"; + + build-system = [ poetry-core ]; + + dependencies = [ + langgraph-checkpoint + orjson + psycopg + ]; + + pythonImportsCheck = [ "langgraph.checkpoint.postgres" ]; + + nativeCheckInputs = [ + postgresql + postgresqlTestHook + pytest-asyncio + pytestCheckHook + ]; + + passthru = { + updateScript = langgraph-sdk.updateScript; + }; + + meta = { + description = "Library with a Postgres implementation of LangGraph checkpoint saver"; + homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-postgres"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointpostgres==${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + drupol + sarahec + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e237b7703fae..9a9f3e0e5550 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6766,6 +6766,8 @@ self: super: with self; { langgraph = callPackage ../development/python-modules/langgraph { }; + langgraph-checkpoint-postgres = callPackage ../development/python-modules/langgraph-checkpoint-postgres { }; + langgraph-checkpoint-sqlite = callPackage ../development/python-modules/langgraph-checkpoint-sqlite { }; langgraph-cli = callPackage ../development/python-modules/langgraph-cli { }; From ffc8e10d0894448e9fb035ad84fb383861b92d62 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 18 Aug 2024 10:09:46 +0200 Subject: [PATCH 160/233] python312Packages.langgraph-checkpoint: init at 1.0.3 --- .../langgraph-checkpoint/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/langgraph-checkpoint/default.nix diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix new file mode 100644 index 000000000000..77b3ba34826e --- /dev/null +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + dataclasses-json, + fetchFromGitHub, + langchain-core, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "langgraph-checkpoint"; + version = "1.0.3"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langgraph"; + rev = "refs/tags/checkpoint==${version}"; + hash = "sha256-5JP9f2uHNo71btQ96sBPlS7JPqo35C3VEMeHN1cJSro="; + }; + + sourceRoot = "${src.name}/libs/checkpoint"; + + build-system = [ poetry-core ]; + + dependencies = [ langchain-core ]; + + pythonImportsCheck = [ "langgraph.checkpoint" ]; + + nativeCheckInputs = [ + dataclasses-json + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==${version}"; + description = "Library with base interfaces for LangGraph checkpoint savers"; + homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + drupol + sarahec + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a9f3e0e5550..12e3e85f722f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6766,6 +6766,8 @@ self: super: with self; { langgraph = callPackage ../development/python-modules/langgraph { }; + langgraph-checkpoint = callPackage ../development/python-modules/langgraph-checkpoint { }; + langgraph-checkpoint-postgres = callPackage ../development/python-modules/langgraph-checkpoint-postgres { }; langgraph-checkpoint-sqlite = callPackage ../development/python-modules/langgraph-checkpoint-sqlite { }; From 583552a0583081865f64a0df0eccdf6064d13cc2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 18 Aug 2024 10:10:07 +0200 Subject: [PATCH 161/233] python312Packages.langgraph: 0.1.9 -> 0.2.4 --- .../python-modules/langgraph/default.nix | 44 ++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 7a0c6756f419..712e90a602c1 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -8,36 +8,51 @@ httpx, langchain-core, langgraph-sdk, + langgraph-checkpoint, + langgraph-checkpoint-postgres, + langgraph-checkpoint-sqlite, + psycopg, langsmith, poetry-core, pydantic, pytest-asyncio, pytest-mock, + pytest-repeat, pytest-xdist, pytestCheckHook, pythonOlder, syrupy, + postgresql, + postgresqlTestHook, }: buildPythonPackage rec { pname = "langgraph"; - version = "0.1.9"; + version = "0.2.4"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/${version}"; - hash = "sha256-sBjSfKzcILkHgvo8g/NHC+/yUjQSyZB/8xaSCY3rPDs="; + hash = "sha256-jUBaWXrHCXAph8EGEJnH7lbKIyjQ8oPt4eDMyIkbURo="; }; + postgresqlTestSetupPost = '' + substituteInPlace tests/conftest.py \ + --replace-fail "DEFAULT_POSTGRES_URI = \"postgres://postgres:postgres@localhost:5442/\"" "DEFAULT_POSTGRES_URI = \"postgres:///$PGDATABASE\"" + ''; + sourceRoot = "${src.name}/libs/langgraph"; build-system = [ poetry-core ]; - dependencies = [ langchain-core ]; + dependencies = [ + langchain-core + langgraph-checkpoint + ]; pythonImportsCheck = [ "langgraph" ]; @@ -46,19 +61,36 @@ buildPythonPackage rec { dataclasses-json grandalf httpx + langgraph-checkpoint-postgres + langgraph-checkpoint-sqlite langsmith + psycopg pydantic pytest-asyncio pytest-mock + pytest-repeat pytest-xdist pytestCheckHook syrupy + postgresql + postgresqlTestHook ]; - pytestFlagsArray = [ "--snapshot-update" ]; - disabledTests = [ "test_doesnt_warn_valid_schema" # test is flaky due to pydantic error on the exception + # Disabling tests that requires to create new random databases + "test_cancel_graph_astream" + "test_cancel_graph_astream_events_v2" + "test_channel_values" + "test_fork_always_re_runs_nodes" + "test_interruption_without_state_updates" + "test_interruption_without_state_updates_async" + "test_invoke_two_processes_in_out_interrupt" + "test_nested_graph_interrupts" + "test_no_modifier_async" + "test_no_modifier" + "test_pending_writes_resume" + "test_remove_message_via_state_update" ]; passthru = { From 13ed39cccd5985282aec7432599f8b1d49b0c2ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Aug 2024 08:50:47 +0200 Subject: [PATCH 162/233] python312Packages.xknx: 3.1.0 -> 3.1.1 Diff: https://github.com/XKNX/xknx/compare/refs/tags/3.1.0...3.1.1 Changelog: https://github.com/XKNX/xknx/releases/tag/3.1.1 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 878fbfdc76d1..cc04d6611f99 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknx"; rev = "refs/tags/${version}"; - hash = "sha256-JoJvEE21BubAmPm97fk9mbCkkn1dWkZO/uLd6C0DkUQ="; + hash = "sha256-mlY9jPB3Sme9iajh5kWGf+8MHI0vMUilHe8W7AwmuCo="; }; build-system = [ setuptools ]; From f8cfbec69ffe17c991673413695c33450013e705 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Aug 2024 09:02:32 +0200 Subject: [PATCH 163/233] python312Packages.pygitguardian: 1.15.2 -> 1.16.0 Diff: https://github.com/GitGuardian/py-gitguardian/compare/refs/tags/v1.15.2...v1.16.0 Changelog: https://github.com/GitGuardian/py-gitguardian/blob/v1.16.0/CHANGELOG.md --- pkgs/development/python-modules/pygitguardian/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 715c455c3cab..2b674559b604 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.15.2"; + version = "1.16.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-jmjlNGyGYsiwQ0qi8KiSUI38J4n1ZTzqxzY9Bn9OdqY="; + hash = "sha256-2yuYu02Nd9B3UfzrM0p19hDM5HmvigBf48gu+ZSO0kU="; }; pythonRelaxDeps = [ @@ -69,6 +69,8 @@ buildPythonPackage rec { "test_quota_overview" "test_rate_limit" "test_read_metadata_bad_response" + "test_read_metadata_no_remediation_message" + "test_read_metadata_remediation_message" "test_sca_client_scan_diff" "test_sca_scan_all_with_params" "test_sca_scan_directory_invalid_tar" From a71ed3386ca7bb026fff851498402fbd3fc88a90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Aug 2024 09:04:33 +0200 Subject: [PATCH 164/233] checkov: 3.2.231 -> 3.2.233 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.231...3.2.233 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.233 --- 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 b70419186a0d..650e1149bcf1 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.231"; + version = "3.2.233"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-bj35Dc0aAiN21vgmldZNLFpgPCzvHOlW8B9Q5n96mhs="; + hash = "sha256-n0n/SfxJMjtVIsKXTgp5kzTcMoQf9L8xmDzZ7kwoVsI="; }; patches = [ ./flake8-compat-5.x.patch ]; From efd23314812c1c629e5277f9d2f30adb3465ca08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Aug 2024 09:06:12 +0200 Subject: [PATCH 165/233] python312Packages.tencentcloud-sdk-python: 3.0.1214 -> 3.0.1215 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1214...3.0.1215 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1215/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 f77909d98315..16e1b3760f7b 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.1214"; + version = "3.0.1215"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-0PnB+4PF+XRlfVi4MD4aqvror/hH3eekdw252kf2z+M="; + hash = "sha256-D8vRn5FKa9eD+M2bqfp/DIionUgF/3Zyv2Xuh1spthk="; }; build-system = [ setuptools ]; From 2999500015af8b2b6c6f5f05c490dabad25c3134 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 07:15:50 +0000 Subject: [PATCH 166/233] bruno: 1.24.0 -> 1.25.0 --- pkgs/by-name/br/bruno/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 3a62debde824..9c2dafc1aeae 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -26,13 +26,13 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-+rnZid+2E3xP6GTHKXki+MeRuoU8gAB34/MVyKu9oEQ="; + hash = "sha256-TXEe0ICrkljxfnvW1wv/e1BB7J6p/KW3JklCvYyjqSs="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json From 708ee78a76fb2cae140b4f4565521050a7ae1d24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 07:16:06 +0000 Subject: [PATCH 167/233] albert: 0.25.0 -> 0.26.0 --- pkgs/applications/misc/albert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index ba33c8baa85b..6baa2bac220d 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - hash = "sha256-eowsQhaS9RGfsw157HahENuWUWtwkwyPNSFw135MW0c="; + hash = "sha256-OdRx8fev0weXgSMEUhSm7aESN2W3BVnJpgtrlEUo+L0="; fetchSubmodules = true; }; From 2e7a16dd56c4c76e8aa9cc573283033147d1ff8c Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 11 Aug 2024 15:31:55 +0200 Subject: [PATCH 168/233] electron-source: fix update script for electron >=31 Co-authored-by: Yureka --- pkgs/development/tools/electron/update.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index 962ca0e34073..022306a2bacf 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -58,7 +58,7 @@ subprocess.check_call( "--out", depot_tools_checkout.name, "--rev", - "7a69b031d58081d51c9e8e89557b343bba8518b1", + "452fe3be37f78fbecefa1b4b0d359531bcd70d0d" ] ) sys.path.append(depot_tools_checkout.name) @@ -104,15 +104,15 @@ class Repo: ) deps_file = self.get_file("DEPS") - evaluated = gclient_eval.Parse(deps_file, filename="DEPS") + evaluated = gclient_eval.Parse(deps_file, vars_override=repo_vars, filename="DEPS") - repo_vars = dict(evaluated["vars"]) | repo_vars + repo_vars = dict(evaluated.get("vars", {})) | repo_vars prefix = f"{path}/" if evaluated.get("use_relative_paths", False) else "" self.deps = { prefix + dep_name: repo_from_dep(dep) - for dep_name, dep in evaluated["deps"].items() + for dep_name, dep in evaluated.get("deps", {}).items() if ( gclient_eval.EvaluateCondition(dep["condition"], repo_vars) if "condition" in dep @@ -467,8 +467,14 @@ def get_electron_info(major_version: str) -> Tuple[str, str, GitHubRepo]: electron_repo: GitHubRepo = GitHubRepo("electron", "electron", rev) electron_repo.get_deps( { - f"checkout_{platform}": platform == "linux" + **{ + f"checkout_{platform}": platform == "linux" or platform == "x64" or platform == "arm64" or platform == "arm" for platform in ["ios", "chromeos", "android", "mac", "win", "linux"] + }, + **{ + f"checkout_{arch}": True + for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64"] + }, }, "src/electron", ) From f74c08133353cc7cac1bf462680f810d54f6c9d1 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 11 Aug 2024 15:34:51 +0200 Subject: [PATCH 169/233] electron-source.electron_31: init at 31.4.0 - Changelog: https://github.com/electron/electron/releases/tag/v31.0.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v31.0.0...v31.4.0 Co-authored-by: Yureka --- pkgs/development/tools/electron/common.nix | 7 +- pkgs/development/tools/electron/info.json | 941 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 948 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index dbd97b898249..1e863827710d 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -169,12 +169,17 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { enable_cet_shadow_stack = false; is_cfi = false; use_qt = false; - use_perfetto_client_library = false; v8_builtins_profiling_log_file = ""; enable_dangling_raw_ptr_checks = false; dawn_use_built_dxc = false; v8_enable_private_mapping_fork_optimization = true; v8_expose_public_symbols = true; + } // lib.optionalAttrs (lib.versionOlder info.version "31") { + use_perfetto_client_library = false; + } // lib.optionalAttrs (lib.versionAtLeast info.version "31") { + enable_dangling_raw_ptr_feature_flag = false; + clang_unsafe_buffers_paths = ""; + enterprise_cloud_content_analysis = false; } // { # other diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 12c24e175e31..fe876d275783 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1820,5 +1820,946 @@ "modules": "123", "node": "20.15.1", "version": "30.3.1" + }, + "31": { + "chrome": "126.0.6478.234", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw=", + "rev": "df98b86690c83b81aedc909ded18857296406159", + "url": "https://gn.googlesource.com/gn", + "version": "2024-05-13" + } + }, + "version": "126.0.6478.234" + }, + "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=", + "deps": { + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-lepGVhzXrBAY5YWwobe18FroRiOD/Q9f8QqazHDmvTY=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "126.0.6478.234", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-OSt8vyB1nPLMJaL47ouvS/R+VRxMixEL74TwrdDpJro=", + "rev": "b623150ede7e61bf949bd203b400f28012298274", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-pio5G9ATJHsM4ygKkDhmAbpZecS8p1AQUJ7LHavMq6I=", + "owner": "electron", + "repo": "electron", + "rev": "v31.4.0" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-viNzIM0zITYLVIdxjqqOhZcJZQiNLeZbPXBt12fGxAw=", + "rev": "ee237e96f18ef123af9992f74645a8a0ce9ef6ef", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "src/testing/libfuzzer/fuzzers/wasm_corpus": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=", + "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", + "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" + }, + "src/third_party/accessibility_test_framework/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", + "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", + "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-npgkeMJGP/VBgU13RBVihRziyD3GHXPR5kIgarIE7Yw=", + "rev": "efca5c3874f331bb1a82ed913f5691af7ff99d82", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jpcUpskkhZ1uj+mKI+nNrrBg2Yk9SxWwLiTqDDqdzxM=", + "rev": "9d7b4c3d553331e316321942e2eb8413e4081c79", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-o/9lOnPR6vT0pkqWgenfyh9nI5Qoxyd030MNTfcoRSc=", + "rev": "76bfcccb6418239183df55111f2f24782d9f3680", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7GkqH4hgTVmISjUy/Km/X28tBSsiMs3JRnDmol1zaag=", + "rev": "8bd72cfb219344308ee857bcbe65a27fe91acfe8", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+G7BcdtU8AeNMY4NLQgKpgF28/CS9FIjf+vaOd+Wf6o=", + "rev": "2db0eb3f96a5756298dcd7f9319e56a98585bd10", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qAIXZ1jZous0Un0jVkOQ66nA2525NziV3Lbso2/+Z1Y=", + "rev": "76788faa4ef163081f82273bfca7fae8a734b971", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-A/mJDWPo2SijDiar3hleWOx0mZg7HxtdN9sjgsmiO60=", + "rev": "923a565b97768d3a51047c3f384f6a0d17990192", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5XL7nKQPfzRNdtaQTtEG/syvQBdoVZhrNcyKAHu72Sg=", + "rev": "1545704ff52cfb5119f3693c9a9e971594e9cb43", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=", + "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-eshoHmGiu5k0XE/A1SWf7OvBj7/YD9JNSZgoyGzGcLA=", + "rev": "3c8b1533ac03dd6531ab6e7b9245d488f13a82a5", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crabbyavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-MNHqTBfQAV0WsoZzjHVa8F7o1OUuc8O3OOln+UKT58c=", + "rev": "ef17807890f60bee1398a752d53204c369076aca", + "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ht/hkX4Nr0VfHq/dovI/CHgPRPpGflUz9KiZywh0MXg=", + "rev": "1985ff9dfd894b5cd958163bf9f4fde8716acbb4", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-p/eew0EIxSQOWuvEmzrk9BnDIps5y6R/cBR54sHhfcc=", + "rev": "8d58ca6b357e6827660dc26ca777c798f4426c2e", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4gQn5y/Z6ccYA/0VjIQfMpFMkEuPA78jyCgZ+FpmsFs=", + "rev": "acbea986f40578f43c88239c78c797f61842e642", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AA2bcrsW1xFspyl5TqYUJeAwKM06rWTNtXr/uMVIJmw=", + "rev": "006ca01d387ac6652825d6cce1a57b2de67dbf8d", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7pYn8KbOAxAG5+OPNXNiW8aCUNxE55BgR67fNO6MaSI=", + "rev": "c9815acd5a88ae4853cd25f7cb8f2face7cace28", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mwAZuGP2dIW1pup11wokABoE5xcicSNhFbz/TXfYGII=", + "rev": "9463ce9cd8d9b02b98edb746431c0bbcf9654ae4", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "rev": "62e175ef9fae75335575964c845a302447c012c7", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oc7Dt++zGJzpyueP3qMzI9YVA50MjFy6uIqO4eklYb4=", + "rev": "4629efe685b7b8db08e1c7aa2cafd1e9e5769ac2", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "src/third_party/dawn/third_party/webgpu-headers": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xQ+yqHyyxqCvZsX0nl8Thyc3MKRS3SRRhTaLLErcgfM=", + "rev": "aef5e428a1fdab2ea770581ae7c95d8779984e0a", + "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JNF2y81hdi0Q6BY+w00uf1iPbP/cq/N+uuOC+a2nPbg=", + "rev": "28ece72a5d752a5e36e62124979b18530e610f6b", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-IWKu2u06tUcLKZlvleCiZ63e6hYtsrnMNVNj9N07aLI=", + "rev": "c963f0c7472f41d9d4c3335fffdab4f9b8da25bb", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Q/5UIBdgoS0cIWPnlg41+8Wy4Z6B2cBqSqGfj5rNdII=", + "rev": "e16d70bd4e9cdebd2fbdae63b1a4d86493fbbde6", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=", + "owner": "nodejs", + "repo": "node", + "rev": "v20.16.0" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/engflow-reclient-configs": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", + "owner": "EngFlow", + "repo": "reclient-configs", + "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fr18LL/xX23t9TIn3q8jWdV9Y6coepbGsO3vJVdDW6k=", + "rev": "a59c3edffa54a77b8d7b268ef527da541076ca6a", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hFmeeCoUrsMsq3ARBKQCgITuotRCD0ro/feJpF/85Rk=", + "rev": "092f84b6141055bfab609b6b2666b724eee2e130", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XT1DKfSFKK5Rp1fttm/aHOVBmUWD+wvcOfD+OYgEJpI=", + "rev": "c696275eaffec33796b5ca8755614fd9fec0a6a7", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", + "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZFWYp9nD4kp/dYQm3SQXjej2do8QgWZMiV9Y4nTDcEY=", + "rev": "a46424228f0998a72c715f32e18dca8a7a764c1f", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xMUZYJ0cTCvc9q4q0ZhfFOf2Yb1tHOQfPLrDMEf/YvA=", + "rev": "34584108adea9bb274f71cee34fc091f89d7b2d5", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=", + "rev": "344117638c8ff7e239044fd0fa7085839fc03021", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-OCJ62/IGZI9QCJu/eiytdNE/5keiaf2hbLEM3vmUbNI=", + "rev": "33af80a883ddc33d9c0fac0a5b4578301efb18de", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=", + "rev": "155015f4bec434ecc2f94621665844218f05ce51", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XQDU7A+43ywikpEt/fLNFnZ/wbU/vUEbm/K55qg180I=", + "rev": "98f2494518c2dbb9c488e83e507b070ea5910e95", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/instrumented_libs": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SGEB74fK9e0WWT77ZNISE9fVlXGGPvZMBUsQ3XD+DsA=", + "rev": "0172d67d98df2d30bd2241959d0e9569ada25abe", + "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zlzMsP86/BvcvfoZxdajZUZCvW/8nUvIkRuTdYXnUf8=", + "rev": "77665fee933b409dd94e35b0c216645f845b9fd9", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2vUxV4C9MrXVPgdSZjkEJ3YO9kkdwR0G5pgGZ+E+/60=", + "rev": "5d97130f0820dbc97738f5480e2dd00865a35744", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", + "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ocJqlENHw19VpkFxKwHneGw3aNh56nt+/JeopxLj2M8=", + "rev": "e3b94d0e5b86883fd77696bf10dc33ba250ba99b", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-71aEsBTsJl7XkH5y1s99eH3WpjVk+O1mHLtZE6dSIjQ=", + "rev": "a37a3aa431f132b02a58656f13984d51098330a2", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=", + "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", + "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XOPiDAOHpWyCiXI+fi1CAie0Zaj4v14m9Kc8+jbzpUY=", + "rev": "7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/4/Trextb4F9UMDVrg4uG9QZl6S0H9FiwnL+2S5+ZpE=", + "rev": "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R7AMqzNV92dnNsPV1mECVsi1dKh+0W8mo24NcPyMn0c=", + "rev": "108f5128e2969451f77b1523ce30bebe545cdd58", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=", + "rev": "845d5476a866141ba35ac133f856fa62f0b7445f", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=", + "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", + "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", + "rev": "f477acb1049f5e043904b87b825c5915084a9a29", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oz+yloV78xpY71JzWKLEcJNmYT4QYh0IzNXdJwKc8mU=", + "rev": "f26d25ed0106bd8946f8bb380bb67fb552e7390d", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FOawpIr8sXw3VNgYXCw5+NxFexE+lNVni7flp+BMJXA=", + "rev": "97d0a7fd9e51669930f8376e069599acc1c2de2e", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/buildtools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=", + "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jhDbR0COFpErzHiWD66rcQRWqmf3IgqBU4/aklUEDG4=", + "rev": "ecbab85b3c5285b971b9801c7e197284dca5d144", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kqpwwf/havZpzxBjJFWNcPnGqvu7KSC6DE3xBbdiK9Q=", + "rev": "6aaa8a1fb15659d1b68179e20993e969d9f500f8", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "src/third_party/protobuf-javascript/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=", + "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", + "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+xqIFlDDx0FjHt82Gj/7UVKz8KCaTvhTg4Pg/MKwu8w=", + "rev": "f31c2c6f380331ddc862e37c7dea0bcf440b29dc", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=", + "rev": "c08ec529fc91722bde519628d9449258082eb847", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-MmguxmkiZkICHvx76J2bHM6BaXQh9vzWNRQExa5PScg=", + "rev": "be621ea04206d8fae23952783d1d588d6ce0d9b3", + "url": "https://skia.googlesource.com/skia.git" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", + "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NyYVUWJTfZ069Po70vgOssJEGXdoFgdrxg1IhYNtXPA=", + "rev": "1ee793e63351333e2089d4b272e15574502ff0c2", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-z4bu4cohPSBV8qluLBQau/C65GC+OGWq6bBeMR/TCFA=", + "rev": "da334852e70510d259bfa8cbaa7c5412966b2f41", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-k846rWmLlNmnQxZHPzaFHDv5xu3AQt+9ynQIor4fFfw=", + "rev": "1187fe26a8a52029b23e0832356989ab44a540c3", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EU8/UkMiD8TAlXjzg0bqn7DRijSm+y0W+7fpaP/gDkI=", + "rev": "f1dcf238ad742f936794809f28b0ad0511b6585b", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "src/third_party/vulkan-deps/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/2t8GbVf+GnOK8p+KFKXyWc26SEAD+UxPCGuhqZsRpg=", + "rev": "b3e9bdbe1656b37611585e0a1523678f089bc31e", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "src/third_party/vulkan-deps/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/vulkan-deps/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+svEwPqaUxZeg/JF9DYfwx0N1g9eTzHkIEyW5rZ1DaA=", + "rev": "49a1fceb9b1d087f3c25ad5ec077bb0e46231297", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/vulkan-deps/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+HKyvortwE3LT1T+vwfhLWOjBu4QUIj0mSuRK/WhFqI=", + "rev": "199038f10cbe56bf7cbfeb5472eb0a25af2f09f5", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "src/third_party/vulkan-deps/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bbILp733ddwEStJB0nr+cyAV8Px0kie7rLQ4eS7kUoI=", + "rev": "5677bafb820e476441e9e1f745371b72133407d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "src/third_party/vulkan-deps/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-8N0xdcT2BtjECOMytAkkydbYCIYsJZ9JnQMt1fq1Iso=", + "rev": "eb8c7b071a449be3d1331e0961c8fdd0a78efca9", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "src/third_party/vulkan-deps/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6Pu0oSqrCIUCQUlYEqaNsQt583fipG+3SYXtM4oa9RE=", + "rev": "df8e710224f563a04b7db2680f72d31619c4b259", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-QAYYpIH82F1OaUsTFCgBDHMWAdWpaTBMLvNgK+QRMBQ=", + "rev": "358a107a6ff284906dcccbabe5b0183c03fd85b6", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ysOCZ3XKVt0bhtF0J20cbumFTXzk3qqgfZFjA9qU/9s=", + "rev": "944660e342cfafb6c318d11731751d9a291434d4", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5gWBte8oiuXM01StvyXFAsxFwuQZHjZT/LZ6l0mvrwI=", + "rev": "c7e9c4f5d396cda4051e49b15d7d0e4f91e4efac", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Cxu9+Kzw2t1BDfuGzNobaraT4eJcSPO7jvnHpuUANoo=", + "rev": "31577177454b89db37ceabd94e1640d398adbc87", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=", + "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-POFEg+sjEvogLgu0tGpMHFiMy244QBJInr+Ix2MgtYs=", + "rev": "762a3dfb42095c6084da99b630eea6bef9dc1db8", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zSB7M1YbAdQaBJzJVJKkE+ZPdqiJRPPBCOoZk+IH3Yo=", + "rev": "a18e38fed2307edd6382760213fa3ddf199fa181", + "url": "https://webrtc.googlesource.com/src.git" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-DFASq5yiHHrda3iAIJ6spcw12HQfwsVJs37XsxIcers=", + "rev": "e73fb4a03f658fd48cc10c8a7cf48fe7eeab9114", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-B/zsEY8mUV86xzf6fOclTdjBFBD+ErkjYAmTNn2r+18=", + "rev": "ff7a151f2e6c009b657d9f798c2d9962b0e3feb5", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WitoqX3tFf3ty0pXaoGAtKV7Jr0cAZ/m+MxET4kpMzQ=", + "rev": "65b1674f955694c83b9a3e579c23ae0ea35258db", + "url": "https://chromium.googlesource.com/v8/v8.git" + } + }, + "electron_yarn_hash": "12pcq3zzx6627igdfd5bgyismz9n21093smpd43c4aall2mn6194", + "modules": "125", + "node": "20.16.0", + "version": "31.4.0" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4ae14bc6a8c..470294952bf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17458,6 +17458,7 @@ with pkgs; electron_28 = electron_28-bin; electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; + electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; electron = electron_30; electron-bin = electron_30-bin; electron-chromedriver = electron-chromedriver_30; From a057f765d46665e84d38f866ebbfe567dfbd6186 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 11 Aug 2024 15:36:54 +0200 Subject: [PATCH 170/233] electron_31-bin: init at 31.4.0 - Changelog: https://github.com/electron/electron/releases/tag/v31.0.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v31.0.0...v31.4.0 Co-authored-by: Yureka --- pkgs/development/tools/electron/binary/info.json | 11 +++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 0c7b5efaf7fb..787abe30ef57 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -53,5 +53,16 @@ "x86_64-linux": "94d7470d9dae2dd2376612c804068ea6514e5efe342de8946f49f93bf0ed50de" }, "version": "30.3.1" + }, + "31": { + "hashes": { + "aarch64-darwin": "4cd04f75e97f6cdfee1d166c7756b9a3c7341e51a7b12255c37bd46fa5a45da5", + "aarch64-linux": "37fbede76b30bad461cbfa3efec8aef07a34f6991c71c50a69ac489623413098", + "armv7l-linux": "7a6cba2d78ef3ff776d9482121f9b2400370da23b3065bfdafc4cd83c8bbe423", + "headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv", + "x86_64-darwin": "e177e9846bfe63eefea3ecd6a889e9865e1fba21b93179a0cde08bd7c94796ee", + "x86_64-linux": "9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7" + }, + "version": "31.4.0" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 470294952bf9..59a9a6229174 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17446,7 +17446,8 @@ with pkgs; electron_27-bin electron_28-bin electron_29-bin - electron_30-bin; + electron_30-bin + electron_31-bin; inherit (callPackages ../development/tools/electron/chromedriver { }) electron-chromedriver_29 From 080e1c111c95668c34941627126a4e19fc9d216b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 11 Aug 2024 15:38:34 +0200 Subject: [PATCH 171/233] electron-chromedriver_31: 31.3.0 -> 31.4.0 Co-authored-by: Yureka --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 2a5d1f400cda..cbaf2f88922d 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -23,13 +23,13 @@ }, "31": { "hashes": { - "aarch64-darwin": "b2e85d41607d09d7645ca58c0243c8f00e15dcbe32f4ceeab9566235eadc7143", - "aarch64-linux": "8ab96b6db830746a026b9eb4233ff51577b1880f5595a65aa38edd593e700f7e", - "armv7l-linux": "e9cdc7e9d055a90932c2c739112bf89f85afe3125f72b8ae1ddb0eab3edcace2", - "headers": "0bjhrhv9310kwl7q2klr7awwgjiwfhiycm59c5kzgh7wj221ll1v", - "x86_64-darwin": "5b2b7426c735a4979acb4e341256ab2342b85e3bf42b9da0ba9780d21f0bda6b", - "x86_64-linux": "9feeaac10629f79334ef14a668f653b2fda09fbf0fa1019c3a58d7e1d79c1d1a" + "aarch64-darwin": "bca203c7705e56baa5c7c2f972dd3a606ee80589514a3d83283960b67bad446c", + "aarch64-linux": "a040723dc5c7860527f2718e5b3aaf43d219e35ae391a3338c7a85de2d08afb7", + "armv7l-linux": "64306c594ad37c94e2562d3fe4832667191321f90ec797e41ceae4640da26289", + "headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv", + "x86_64-darwin": "47a04768ed44c4f4128d1fe90818b58cbef6da63b1112acaf2bbb7c20d22ad7d", + "x86_64-linux": "61225378c9a6097974638c241730db60230c9d774a2c7242aa9f001299bccf4b" }, - "version": "31.3.0" + "version": "31.4.0" } } From e6fc8d9f2000680d4034c7ce932edc70d7703162 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 11 Aug 2024 15:39:14 +0200 Subject: [PATCH 172/233] electron: bump default version to v31 Co-authored-by: Yureka --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59a9a6229174..71a0a680d312 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17460,9 +17460,9 @@ with pkgs; electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; - electron = electron_30; - electron-bin = electron_30-bin; - electron-chromedriver = electron-chromedriver_30; + electron = electron_31; + electron-bin = electron_31-bin; + electron-chromedriver = electron-chromedriver_31; autobuild = callPackage ../development/tools/misc/autobuild { }; From d5ccd64fd562fa53b55d4bce6505740f3829fd9c Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sun, 11 Aug 2024 16:20:02 +0200 Subject: [PATCH 173/233] electron-bin: update maintainers Last contributions were in 2018 and 2015. Update list to de-facto maintainers. --- pkgs/development/tools/electron/binary/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index a11baed163da..d90183bd7bc4 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -37,7 +37,7 @@ let homepage = "https://github.com/electron/electron"; license = licenses.mit; mainProgram = "electron"; - maintainers = with maintainers; [ travisbhartwell manveru ]; + maintainers = with maintainers; [ yayayayaka teutat3s ]; platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; From 376b7ca7e3c4b192fd4a8e9a4d9d82bf77573d72 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:13:48 +0200 Subject: [PATCH 174/233] element-desktop: use electron version 31 Upstream switched to electron 31 in version 1.11.70 https://github.com/element-hq/element-desktop/commit/597f3562e4d470dc029a841cbb73759cc18ba5f7 --- 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 71a0a680d312..33afb98cf049 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4948,7 +4948,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_30; + electron = electron_31; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh From 8e000894dae3e6451877acee142f5f14071d6a7c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 19 Aug 2024 14:23:47 +0300 Subject: [PATCH 175/233] aquamarine: fix build This tries to load wayland.xml from wayland-client.pc, but it's installed alongside wayland-scanner. --- ...nd.xml-is-in-wayland-scanner-pkgdata.patch | 37 +++++++++++++++++++ pkgs/by-name/aq/aquamarine/package.nix | 5 +++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch diff --git a/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch b/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch new file mode 100644 index 000000000000..dbce9fe936f1 --- /dev/null +++ b/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch @@ -0,0 +1,37 @@ +From 735130758ee6fca74115ca4ec89c6d0dd26777eb Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Mon, 19 Aug 2024 14:17:37 +0300 +Subject: [PATCH] CMakeLists: wayland.xml is in wayland-scanner pkgdatadir + +See https://gitlab.freedesktop.org/wayland/wayland/-/blob/6c4a695045155583a99f3fbce7bb745f79c2e726/meson.build#L129-136 +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc4db31..a61e375 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,8 +71,8 @@ endif() + # Protocols + pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) + message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}") +-pkg_get_variable(WAYLAND_CLIENT_DIR wayland-client pkgdatadir) +-message(STATUS "Found wayland-client at ${WAYLAND_CLIENT_DIR}") ++pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir) ++message(STATUS "Found wayland-scanner pkgdatadir at ${WAYLAND_SCANNER_PKGDATA_DIR}") + + function(protocolNew protoPath protoName external) + if(external) +@@ -94,7 +94,7 @@ function(protocolWayland) + OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp + ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp + COMMAND hyprwayland-scanner --wayland-enums --client +- ${WAYLAND_CLIENT_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/ ++ ${WAYLAND_SCANNER_PKGDATA_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/ + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + target_sources(aquamarine PRIVATE protocols/wayland.cpp protocols/wayland.hpp) + endfunction() +-- +2.45.2 + diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index da7bb52a9dd6..6c8290f4d721 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -19,6 +19,7 @@ udev, wayland, wayland-protocols, + wayland-scanner, }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; @@ -31,6 +32,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1RYuBS/CQhtyIeXrLDvGWJhuVG1kiQMG+aYaBkoGnEU="; }; + # https://github.com/hyprwm/aquamarine/pull/55 + patches = [ ./CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch ]; + nativeBuildInputs = [ cmake hyprwayland-scanner @@ -51,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { udev wayland wayland-protocols + wayland-scanner ]; strictDeps = true; From 25327c029e7dcf433f0386d5ab9728bed53ce484 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 21:53:56 +0000 Subject: [PATCH 176/233] aquamarine: 0.3.1 -> 0.3.3 fix changelog link --- ...nd.xml-is-in-wayland-scanner-pkgdata.patch | 37 ------------------- pkgs/by-name/aq/aquamarine/package.nix | 9 ++--- 2 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch diff --git a/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch b/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch deleted file mode 100644 index dbce9fe936f1..000000000000 --- a/pkgs/by-name/aq/aquamarine/CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 735130758ee6fca74115ca4ec89c6d0dd26777eb Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Mon, 19 Aug 2024 14:17:37 +0300 -Subject: [PATCH] CMakeLists: wayland.xml is in wayland-scanner pkgdatadir - -See https://gitlab.freedesktop.org/wayland/wayland/-/blob/6c4a695045155583a99f3fbce7bb745f79c2e726/meson.build#L129-136 ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc4db31..a61e375 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -71,8 +71,8 @@ endif() - # Protocols - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) - message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}") --pkg_get_variable(WAYLAND_CLIENT_DIR wayland-client pkgdatadir) --message(STATUS "Found wayland-client at ${WAYLAND_CLIENT_DIR}") -+pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir) -+message(STATUS "Found wayland-scanner pkgdatadir at ${WAYLAND_SCANNER_PKGDATA_DIR}") - - function(protocolNew protoPath protoName external) - if(external) -@@ -94,7 +94,7 @@ function(protocolWayland) - OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp - ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp - COMMAND hyprwayland-scanner --wayland-enums --client -- ${WAYLAND_CLIENT_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/ -+ ${WAYLAND_SCANNER_PKGDATA_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/ - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) - target_sources(aquamarine PRIVATE protocols/wayland.cpp protocols/wayland.hpp) - endfunction() --- -2.45.2 - diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 6c8290f4d721..0bc91bde511b 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -23,18 +23,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; rev = "v${finalAttrs.version}"; - hash = "sha256-1RYuBS/CQhtyIeXrLDvGWJhuVG1kiQMG+aYaBkoGnEU="; + hash = "sha256-zushuLkBblDZGVo2qbiMTJ51LSkqYJpje/R2dvfec1U="; }; - # https://github.com/hyprwm/aquamarine/pull/55 - patches = [ ./CMakeLists-wayland.xml-is-in-wayland-scanner-pkgdata.patch ]; - nativeBuildInputs = [ cmake hyprwayland-scanner @@ -70,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/hyprwm/aquamarine/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/hyprwm/aquamarine/releases/tag/v${finalAttrs.version}"; description = "A very light linux rendering backend library"; homepage = "https://github.com/hyprwm/aquamarine"; license = lib.licenses.bsd3; From 441304966497cd81ac6e86edd7f4d4c641ccfa7e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 20 Aug 2024 10:05:13 +0200 Subject: [PATCH 177/233] python312Packages.wxpython: fix build Co-authored-by: Jeremy Fleischman --- pkgs/development/python-modules/wxpython/4.2.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 1ead7d38d20b..8ad524a17c9b 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, setuptools, - pythonAtLeast, fetchPypi, substituteAll, @@ -15,6 +14,7 @@ python, sip, which, + buildPackages, # runtime cairo, @@ -44,7 +44,6 @@ buildPythonPackage rec { pname = "wxpython"; version = "4.2.1"; format = "other"; - disabled = pythonAtLeast "3.12"; src = fetchPypi { pname = "wxPython"; @@ -61,6 +60,13 @@ buildPythonPackage rec { }) ]; + # https://github.com/wxWidgets/Phoenix/issues/2575 + postPatch = '' + ln -s ${lib.getExe buildPackages.waf} bin/waf + substituteInPlace build.py \ + --replace-fail "distutils.dep_util" "setuptools.modified" + ''; + nativeBuildInputs = [ attrdict pkg-config @@ -103,6 +109,7 @@ buildPythonPackage rec { export DOXYGEN=${doxygen}/bin/doxygen export PATH="${wxGTK}/bin:$PATH" export SDL_CONFIG="${SDL.dev}/bin/sdl-config" + export WAF=$PWD/bin/waf ${python.pythonOnBuildForHost.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py From 2b733abd8300f0525972b6c83a26722aec90ed0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 08:34:31 +0000 Subject: [PATCH 178/233] trealla: 2.55.19 -> 2.55.22 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 149f3b3080d6..f1e6e5ffd38c 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.55.19"; + version = "2.55.22"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-QIyJnr6Kq4t9rRq7K552bVKzYrepw919hPkdkKfxb0s="; + hash = "sha256-qrOVirSJKLF3fzUoD5lxxtj0Uv67WgxEsdG/GNVLZvk="; }; postPatch = '' From f4917d2893765f95e8e0e14656bb907a93b5db0a Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 20 Aug 2024 06:14:37 +0200 Subject: [PATCH 179/233] pkgsStatic.python312: fix build --- pkgs/development/interpreters/python/cpython/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index dd569db15358..828f729a735a 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -455,6 +455,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { "ac_cv_func_lchmod=no" ] ++ optionals static [ "LDFLAGS=-static" + "MODULE_BUILDTYPE=static" + ] ++ optionals (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isMusl) [ + # dlopen is a no-op in static musl builds, and since we build everything without -fPIC it's better not to pretend. + "ac_cv_func_dlopen=no" ]; preConfigure = '' From 4a463f1c60d9e37f34b93a02b713a948c3d833b2 Mon Sep 17 00:00:00 2001 From: justanotherariel Date: Tue, 20 Aug 2024 10:52:29 +0200 Subject: [PATCH 180/233] morgen: electron_29 -> electron_30 --- 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 9775674b0f0f..90cdba1d5d9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10411,7 +10411,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_29; + electron = electron_30; }; mosh = callPackage ../tools/networking/mosh { }; From 8ce923e5c28bd5142e3d2970dcc53801bdfd8ad5 Mon Sep 17 00:00:00 2001 From: Gordon-BP Date: Tue, 20 Aug 2024 17:06:59 +0800 Subject: [PATCH 181/233] azure-cli-extensions.ssh: init at 2.0.5 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index a1f495cd2f9e..f81e61ea2ec9 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -60,6 +60,22 @@ meta.maintainers = with lib.maintainers; [ obreitwi ]; }; + ssh = mkAzExtension rec { + pname = "ssh"; + version = "2.0.5"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/ssh-${version}-py3-none-any.whl"; + sha256 = "80c98b10d7bf1ce4005b7694aedd05c47355456775ba6125308be65fb0fefc93"; + description = "SSH into Azure VMs using RBAC and AAD OpenSSH Certificates"; + propagatedBuildInputs = ( + with python3Packages; + [ + oras + oschmod + ] + ); + meta.maintainers = with lib.maintainers; [ gordon-bp ]; + }; + storage-preview = mkAzExtension rec { pname = "storage-preview"; version = "1.0.0b2"; From acf70fe8d2ebfc68d6751c84a3d6a60cf32c09dd Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 18 Aug 2024 18:51:07 +0800 Subject: [PATCH 182/233] wastebin: 2.4.3 -> 2.5.0 --- pkgs/by-name/wa/wastebin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 53f58c5caf39..cdc5feb24b80 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "wastebin"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "matze"; repo = "wastebin"; rev = version; - hash = "sha256-5L9ug/OOvobic3bYjz8KUkQdnaVmAb2ltXCCiZkVHOg="; + hash = "sha256-abqVjjV1RK9F8xo23Ir8jqoo9jqSe/Kra1IJNHadqXs="; }; - cargoHash = "sha256-KbYbsV3+xhGFgcKrdLMiQ5+1meePjXYMD9PltlO+QMA="; + cargoHash = "sha256-D/a+aEK4Usa4HFOKCxCIy9bHabH5tmBdFRRRQ7aKs/I="; nativeBuildInputs = [ pkg-config From 7a4b2649f02153bb50309226d7d565c9701d774f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 04:31:55 +0000 Subject: [PATCH 183/233] tar2ext4: 0.12.5 -> 0.12.6 --- pkgs/tools/filesystems/tar2ext4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index eaa6005c7c63..30ab2663a645 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-BK70SPZdNptJ3MXMgkMkf6oLZEKeLCMKqOZrK1KP2YE="; + sha256 = "sha256-bgYF1CY5LVZz9dVFjLSMqb8k+kU6AuGRgPbCZ8uI3KA="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; From 7f52761cff2034e3a6d5821f2a9d39f82ae48748 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 20 Aug 2024 17:20:05 +0800 Subject: [PATCH 184/233] netease-cloud-music-gtk: 2.4.0 -> 2.4.1 --- .../ne/netease-cloud-music-gtk/Cargo.lock | 569 ++++++++++-------- .../ne/netease-cloud-music-gtk/package.nix | 14 +- 2 files changed, 311 insertions(+), 272 deletions(-) diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock b/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock index 2e116556b774..f107fcb94990 100644 --- a/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock +++ b/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock @@ -8,6 +8,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aho-corasick" version = "1.1.3" @@ -34,9 +40,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -49,33 +55,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -89,12 +95,12 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ "event-listener 5.3.1", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -117,16 +123,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -148,9 +154,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -158,29 +164,29 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.3", "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "2.2.2" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ "async-channel 2.3.1", "async-io", @@ -193,7 +199,7 @@ dependencies = [ "futures-lite 2.3.0", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -209,9 +215,9 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", "async-lock", @@ -222,7 +228,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -233,9 +239,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -274,9 +280,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -314,9 +320,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" [[package]] name = "byteorder" @@ -326,9 +332,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cairo-rs" @@ -336,7 +342,7 @@ version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -362,9 +368,12 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.98" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +dependencies = [ + "shlex", +] [[package]] name = "cfg-expr" @@ -384,9 +393,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -399,7 +408,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -410,9 +419,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "concurrent-queue" @@ -453,15 +462,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -508,9 +517,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.72+curl-8.6.0" +version = "0.4.74+curl-8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" dependencies = [ "cc", "libc", @@ -543,9 +552,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" @@ -564,9 +573,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -574,9 +583,9 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", @@ -585,9 +594,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -595,9 +604,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -628,17 +637,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - [[package]] name = "event-listener" version = "5.3.1" @@ -650,16 +648,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" @@ -706,12 +694,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -846,9 +834,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -858,9 +846,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" +checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" dependencies = [ "gio-sys", "glib-sys", @@ -944,9 +932,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" dependencies = [ "futures-channel", "futures-core", @@ -962,9 +950,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" dependencies = [ "glib-sys", "gobject-sys", @@ -975,11 +963,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.7" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" +checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -997,9 +985,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.7" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" +checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" dependencies = [ "heck", "proc-macro-crate", @@ -1010,9 +998,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" dependencies = [ "libc", "system-deps", @@ -1020,9 +1008,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" dependencies = [ "glib-sys", "libc", @@ -1031,9 +1019,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" dependencies = [ "glib", "graphene-sys", @@ -1042,9 +1030,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" +checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" dependencies = [ "glib-sys", "libc", @@ -1085,9 +1073,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.22.5" +version = "0.22.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b59fdce2dfacda226d4b1b71ce4700b2f04228909b52252c197d8e30bd54a6" +checksum = "5ca0b90646bb67fccf80d228f5333f2a0745526818ccefbf5a97326c76d30e4d" dependencies = [ "cfg-if", "futures-channel", @@ -1110,9 +1098,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.22.0" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" +checksum = "39d55668b23fc69f1843daa42b43d289c00fe38e9586c5453b134783d2dd75a3" dependencies = [ "atomic_refcell", "cfg-if", @@ -1124,9 +1112,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8d11de9d94072657f2e9ca294b72326874a1e53de9f45613a9bf00773a5938" +checksum = "5448abb00c197e3ad306710293bf757303cbeab4036b5ccad21c7642b8bf00c9" dependencies = [ "glib-sys", "gobject-sys", @@ -1137,9 +1125,9 @@ dependencies = [ [[package]] name = "gstreamer-play" -version = "0.22.0" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cd4315d97f8f38a6a6fdaad27d51cc67fd132785816091ad9985e197d2c052" +checksum = "495d23636d87581ba42810f72f90a710dd03bd14199e74132e828425b13f0722" dependencies = [ "glib", "gstreamer", @@ -1150,9 +1138,9 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bdd875021fecd478d0ee3b787dc3fd41be86f83692c59344af2db6251028b3c" +checksum = "80b4bb761b930472fe0e16ca3d0d92244e94c4a41e2182861c895b082e090400" dependencies = [ "glib-sys", "gobject-sys", @@ -1164,9 +1152,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4975a75279a9cf658bac1798dcf57100c6ec89fca7886572c8250ea4d94b76bd" +checksum = "71f147e7c6bc9313d5569eb15da61f6f64026ec69791922749de230583a07286" dependencies = [ "glib-sys", "gobject-sys", @@ -1176,9 +1164,9 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7900a4c4d7a48bd73405fb23289d2604c5efe483eb224cbe252d6a7517a6d5" +checksum = "25acba301f86b02584a642de0f224317be2bd0ceec3acda49a0ef111cbced98c" dependencies = [ "cfg-if", "futures-channel", @@ -1193,9 +1181,9 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cbe811de2cc60da42eb6d374a106bb5446e8fcd2134a97319dd2b8cc11450c7" +checksum = "f2ec210495f94cabaa45d08003081b550095c2d4ab12d5320f64856a91f3f01c" dependencies = [ "glib-sys", "gobject-sys", @@ -1271,9 +1259,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1371,9 +1359,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown", @@ -1390,9 +1378,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "isahc" @@ -1439,18 +1427,18 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[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 = "libadwaita" @@ -1486,9 +1474,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libnghttp2-sys" @@ -1502,9 +1490,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" dependencies = [ "cc", "libc", @@ -1533,9 +1521,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "malloc_buf" @@ -1548,9 +1536,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1569,19 +1557,28 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] [[package]] -name = "mpris-server" +name = "miniz_oxide" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8408a42f7325f9217576c25dd3066d2741ed6a5b962e189493d83c440ca475" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mpris-server" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058bc2227727af394f34aa51da3e36aeecf2c808f39315d35f754872660750ae" dependencies = [ "async-channel 2.3.1", "futures-channel", @@ -1598,8 +1595,8 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "netease-cloud-music-api" -version = "1.3.2" -source = "git+https://gitee.com/gmg137/netease-cloud-music-api.git?tag=1.3.2#4ea470a0e3b4f2a310a70ca485f60d3f6a643c03" +version = "1.4.0" +source = "git+https://gitee.com/gmg137/netease-cloud-music-api.git?tag=1.4.0#137a77d2ffb84fd9710f4599bfdc6e65875865f4" dependencies = [ "anyhow", "base64", @@ -1616,7 +1613,7 @@ dependencies = [ [[package]] name = "netease-cloud-music-gtk4" -version = "2.4.0" +version = "2.4.1" dependencies = [ "anyhow", "async-channel 2.3.1", @@ -1639,11 +1636,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1721,11 +1718,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1753,9 +1750,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1784,9 +1781,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" +checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" dependencies = [ "gio", "glib", @@ -1796,9 +1793,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" +checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" dependencies = [ "glib-sys", "gobject-sys", @@ -1858,9 +1855,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -1883,7 +1880,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -1904,9 +1901,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", @@ -1914,7 +1911,7 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1925,9 +1922,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-crate" @@ -1940,9 +1940,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2021,9 +2021,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2033,9 +2033,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2044,9 +2044,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc_version" @@ -2063,7 +2063,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2093,18 +2093,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", @@ -2113,11 +2113,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2135,9 +2136,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2153,6 +2154,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -2212,9 +2219,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ "proc-macro2", "quote", @@ -2236,9 +2243,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" @@ -2248,30 +2255,31 @@ checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand 2.1.0", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -2311,9 +2319,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", ] @@ -2326,21 +2334,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.13" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -2358,15 +2366,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.9", + "winnow 0.6.18", ] [[package]] @@ -2462,9 +2470,9 @@ dependencies = [ [[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", @@ -2485,9 +2493,9 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[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 = "vcpkg" @@ -2503,9 +2511,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[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 = "waker-fn" @@ -2521,19 +2529,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -2546,9 +2555,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2556,9 +2565,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -2569,9 +2578,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "winapi" @@ -2601,7 +2610,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2619,7 +2628,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -2639,18 +2657,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "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.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -2661,9 +2679,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2673,9 +2691,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2685,15 +2703,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -2703,9 +2721,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2715,9 +2733,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -2727,9 +2745,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2739,9 +2757,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -2754,28 +2772,28 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.9" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] name = "zbus" -version = "4.2.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", @@ -2811,9 +2829,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2834,10 +2852,31 @@ dependencies = [ ] [[package]] -name = "zvariant" -version = "4.1.1" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zvariant" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -2848,9 +2887,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2861,9 +2900,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix index 276756f5789a..11910a380f40 100644 --- a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix +++ b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix @@ -18,19 +18,19 @@ stdenv.mkDerivation rec { pname = "netease-cloud-music-gtk"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "gmg137"; repo = "netease-cloud-music-gtk"; rev = version; - hash = "sha256-uoC9J09U2aI1dhaKc3TxIyFwRrPRxDrzaV+RyoZ6mKo="; + hash = "sha256-5pIt6VBeNiQbKbffTPa0VJzO8pYGnfonpNpdtkaCwGI="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "netease-cloud-music-api-1.3.2" = "sha256-QRz9Sdu+0I7SwujoTBKWPQMjPDdX8ZyVlFwMw9pM7UY="; + "netease-cloud-music-api-1.4.0" = "sha256-M/7jvrCndgl9lhmzTrNhQor9CBkWTFjfkVxQPW3ed7Q="; }; }; @@ -62,12 +62,12 @@ stdenv.mkDerivation rec { gst-plugins-ugly ]); - meta = with lib; { + meta = { description = "Rust + GTK based netease cloud music player"; homepage = "https://github.com/gmg137/netease-cloud-music-gtk"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ diffumist aleksana ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ diffumist aleksana ]; mainProgram = "netease-cloud-music-gtk4"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 3739608c179a161f2a15ada2e32397b82f5e0cdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 09:50:52 +0000 Subject: [PATCH 185/233] firebase-tools: 13.15.1 -> 13.15.2 --- pkgs/development/tools/firebase-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index acaf1d9db934..8e3d1dab2e94 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.15.1"; + version = "13.15.2"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-DnrKIOKwIZ4MmqYm2RqtMs4N1y4+zdw+Qm8RyDXyzRg="; + hash = "sha256-8W602Rs5kPAYhhwhUaSmA7oV0DROA0Ut2+QHBubNqJM="; }; - npmDepsHash = "sha256-+cJai7Q/xleGiO251eoU3kKvfASQgTfsyHGiABiCaPs="; + npmDepsHash = "sha256-HWTCpBfMvpa9pUOaYOSDCc/JdZzBhZfEO/ejSNxwnXA="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From ca419fa7559912e0bbe39145f0c4e7f1518c868f Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:54:01 +0200 Subject: [PATCH 186/233] nasmfmt: remove vendored go.mod We can use go mod init instead, as the project has no dependencies. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/development/tools/nasmfmt/default.nix | 12 ++++++++---- pkgs/development/tools/nasmfmt/go.mod | 3 --- 2 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 pkgs/development/tools/nasmfmt/go.mod diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix index 0b6aaea05f70..850f0303e825 100644 --- a/pkgs/development/tools/nasmfmt/default.nix +++ b/pkgs/development/tools/nasmfmt/default.nix @@ -1,6 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: -buildGoModule rec { +buildGoModule { pname = "nasmfmt"; version = "unstable-2022-09-15"; @@ -14,10 +18,10 @@ buildGoModule rec { vendorHash = null; preBuild = '' - cp ${./go.mod} go.mod + go mod init github.com/yamnikov-oleg/nasmfmt ''; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" ]; meta = with lib; { description = "Formatter for NASM source files"; diff --git a/pkgs/development/tools/nasmfmt/go.mod b/pkgs/development/tools/nasmfmt/go.mod deleted file mode 100644 index 0dfb1521c9e5..000000000000 --- a/pkgs/development/tools/nasmfmt/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/yamnikov-oleg/nasmfmt - -go 1.18 From e6d9b787ed594b654dd5af3f680c2a85d5a61b76 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:54:27 +0200 Subject: [PATCH 187/233] evmdis: remove vendored go.mod We can use go mod init instead, as the project has no dependencies. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/development/tools/analysis/evmdis/default.nix | 11 +++++++---- pkgs/development/tools/analysis/evmdis/go.mod | 3 --- 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 pkgs/development/tools/analysis/evmdis/go.mod diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 99181764dd04..ade3f53ddef2 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule { pname = "evmdis"; @@ -14,11 +18,10 @@ buildGoModule { vendorHash = null; preBuild = '' - # Add go modules support - cp ${./go.mod} go.mod + go mod init github.com/Arachnid/evmdis ''; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" ]; meta = with lib; { homepage = "https://github.com/Arachnid/evmdis"; diff --git a/pkgs/development/tools/analysis/evmdis/go.mod b/pkgs/development/tools/analysis/evmdis/go.mod deleted file mode 100644 index d71cfe70845d..000000000000 --- a/pkgs/development/tools/analysis/evmdis/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/Arachnid/evmdis - -go 1.18 From 8e333221fcc8d91e21d4554d64d2dcae2e17c575 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 20 Aug 2024 11:57:17 +0200 Subject: [PATCH 188/233] opensnitch: remove vendored go.mod Project doesn't use vendoring anymore, go.mod of the source seem to work. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/op/opensnitch/go.mod | 32 ---- pkgs/by-name/op/opensnitch/go.sum | 227 ------------------------- pkgs/by-name/op/opensnitch/package.nix | 36 ++-- 3 files changed, 16 insertions(+), 279 deletions(-) delete mode 100644 pkgs/by-name/op/opensnitch/go.mod delete mode 100644 pkgs/by-name/op/opensnitch/go.sum diff --git a/pkgs/by-name/op/opensnitch/go.mod b/pkgs/by-name/op/opensnitch/go.mod deleted file mode 100644 index 14242cd3cbb8..000000000000 --- a/pkgs/by-name/op/opensnitch/go.mod +++ /dev/null @@ -1,32 +0,0 @@ -module github.com/evilsocket/opensnitch/daemon - -go 1.17 - -require ( - github.com/fsnotify/fsnotify v1.4.7 - github.com/golang/protobuf v1.5.0 - github.com/google/gopacket v1.1.19 - github.com/google/nftables v0.1.0 - github.com/google/uuid v1.3.0 - github.com/iovisor/gobpf v0.2.0 - github.com/varlink/go v0.4.0 - github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4 - github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae - golang.org/x/net v0.17.0 - golang.org/x/sys v0.13.0 - google.golang.org/grpc v1.32.0 - google.golang.org/protobuf v1.26.0 -) - -require ( - github.com/BurntSushi/toml v0.4.1 // indirect - github.com/google/go-cmp v0.5.6 // indirect - github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect - github.com/mdlayher/netlink v1.4.2 // indirect - github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb // indirect - golang.org/x/mod v0.8.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/tools v0.6.0 // indirect - google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect - honnef.co/go/tools v0.2.2 // indirect -) diff --git a/pkgs/by-name/op/opensnitch/go.sum b/pkgs/by-name/op/opensnitch/go.sum deleted file mode 100644 index baafbc6dd3df..000000000000 --- a/pkgs/by-name/op/opensnitch/go.sum +++ /dev/null @@ -1,227 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw= -github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cilium/ebpf v0.5.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= -github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= -github.com/google/nftables v0.1.0 h1:T6lS4qudrMufcNIZ8wSRrL+iuwhsKxpN+zFLxhUWOqk= -github.com/google/nftables v0.1.0/go.mod h1:b97ulCCFipUC+kSin+zygkvUVpx0vyIAwxXFdY3PlNc= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/iovisor/gobpf v0.2.0 h1:34xkQxft+35GagXBk3n23eqhm0v7q0ejeVirb8sqEOQ= -github.com/iovisor/gobpf v0.2.0/go.mod h1:WSY9Jj5RhdgC3ci1QaacvbFdQ8cbrEjrpiZbLHLt2s4= -github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA= -github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= -github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= -github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= -github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok= -github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw= -github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs= -github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA= -github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U= -github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190/go.mod h1:NmKSdU4VGSiv1bMsdqNALI4RSvvjtz65tTMCnD05qLo= -github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786 h1:N527AHMa793TP5z5GNAn/VLPzlc0ewzWdeP/25gDfgQ= -github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786/go.mod h1:v4hqbTdfQngbVSZJVWUhGE/lbTFf9jb+ygmNUDQMuOs= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo= -github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60 h1:tHdB+hQRHU10CfcK0furo6rSNgZ38JT8uPh70c/pFD8= -github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60/go.mod h1:aYbhishWc4Ai3I2U4Gaa2n3kHWSwzme6EsG/46HRQbE= -github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0= -github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= -github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= -github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= -github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= -github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o= -github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8= -github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= -github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= -github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys= -github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8= -github.com/mdlayher/netlink v1.4.1/go.mod h1:e4/KuJ+s8UhfUpO9z00/fDZZmhSrs+oxyqAS9cNgn6Q= -github.com/mdlayher/netlink v1.4.2 h1:3sbnJWe/LETovA7yRZIX3f9McVOWV3OySH6iIBxiFfI= -github.com/mdlayher/netlink v1.4.2/go.mod h1:13VaingaArGUTUxFLf/iEovKxXji32JAtF858jZYEug= -github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc= -github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g= -github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb h1:2dC7L10LmTqlyMVzFJ00qM25lqESg9Z4u3GuEXN5iHY= -github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/varlink/go v0.4.0 h1:+/BQoUO9eJK/+MTSHwFcJch7TMsb6N6Dqp6g0qaXXRo= -github.com/varlink/go v0.4.0/go.mod h1:DKg9Y2ctoNkesREGAEak58l+jOC6JU2aqZvUYs5DynU= -github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4 h1:fB26rIBlWTVJyEB6ONHdoEvUbvwoudH0/cMEXHiD1RU= -github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns= -github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= -honnef.co/go/tools v0.2.2 h1:MNh1AVMyVX23VUHE2O27jm6lNj3vjO5DexS4A1xvnzk= -honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index 41172f038cc8..37433fb4a9ca 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -1,17 +1,18 @@ -{ buildGoModule -, fetchFromGitHub -, protobuf -, go-protobuf -, pkg-config -, libnetfilter_queue -, libnfnetlink -, lib -, iptables -, makeWrapper -, protoc-gen-go-grpc -, testers -, opensnitch -, nixosTests +{ + buildGoModule, + fetchFromGitHub, + protobuf, + go-protobuf, + pkg-config, + libnetfilter_queue, + libnfnetlink, + lib, + iptables, + makeWrapper, + protoc-gen-go-grpc, + testers, + opensnitch, + nixosTests, }: buildGoModule rec { @@ -45,14 +46,9 @@ buildGoModule rec { protoc-gen-go-grpc ]; - vendorHash = "sha256-PX41xeUJb/WKv3+z5kbRmJNP1vFu8x35NZvN2Dgp4CQ="; + vendorHash = "sha256-urRujxcp58ZuhUtTAqCK0etSZ16YYG/6JY/aOUodl9g="; preBuild = '' - # Fix inconsistent vendoring build error - # https://github.com/evilsocket/opensnitch/issues/770 - cp ${./go.mod} go.mod - cp ${./go.sum} go.sum - make -C ../proto ../daemon/ui/protocol/ui.pb.go ''; From e959525e1547b54b96c454ad023d0cde53789ab5 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Aug 2024 03:05:04 +0200 Subject: [PATCH 189/233] lsh: drop --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 2 +- .../modules/services/networking/ssh/lshd.nix | 187 ------------------ pkgs/tools/networking/lsh/default.nix | 58 ------ .../networking/lsh/lshd-no-root-login.patch | 16 -- .../networking/lsh/pam-service-name.patch | 14 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - pkgs/top-level/release-small.nix | 1 - 10 files changed, 4 insertions(+), 282 deletions(-) delete mode 100644 nixos/modules/services/networking/ssh/lshd.nix delete mode 100644 pkgs/tools/networking/lsh/default.nix delete mode 100644 pkgs/tools/networking/lsh/lshd-no-root-login.patch delete mode 100644 pkgs/tools/networking/lsh/pam-service-name.patch diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index f190cad8a25b..ecd5015c6020 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -311,6 +311,8 @@ - The `services.trust-dns` module has been renamed to `services.hickory-dns`. +- The `lsh` package and the `services.lshd` module have been removed as they had no maintainer in Nixpkgs and hadn’t seen an upstream release in over a decade. It is recommended to migrate to `openssh` and `services.openssh`. + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 599ea640f67c..9f8c6de2dda4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1205,7 +1205,6 @@ ./services/networking/spacecookie.nix ./services/networking/spiped.nix ./services/networking/squid.nix - ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix ./services/networking/sslh.nix ./services/networking/strongswan-swanctl/module.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 628da0d5567a..374d127198d0 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -37,7 +37,6 @@ in The xow package was removed from nixpkgs. Upstream has deprecated the project and users are urged to switch to xone. '') - (mkRemovedOptionModule [ "networking" "liboop" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.") @@ -71,6 +70,7 @@ in (mkRemovedOptionModule [ "services" "hydron" ] "The `services.hydron` module has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability.") (mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer") (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "lshd" ] "The corresponding package was removed from nixpkgs as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decades.") (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed") diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix deleted file mode 100644 index a833d738f885..000000000000 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ /dev/null @@ -1,187 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - inherit (pkgs) lsh; - - cfg = config.services.lshd; - -in - -{ - - ###### interface - - options = { - - services.lshd = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the GNU lshd SSH2 daemon, which allows - secure remote login. - ''; - }; - - portNumber = mkOption { - default = 22; - type = types.port; - description = '' - The port on which to listen for connections. - ''; - }; - - interfaces = mkOption { - default = []; - type = types.listOf types.str; - description = '' - List of network interfaces where listening for connections. - When providing the empty list, `[]`, lshd listens on all - network interfaces. - ''; - example = [ "localhost" "1.2.3.4:443" ]; - }; - - hostKey = mkOption { - default = "/etc/lsh/host-key"; - type = types.str; - description = '' - Path to the server's private key. Note that this key must - have been created, e.g., using "lsh-keygen --server | - lsh-writekey --server", so that you can run lshd. - ''; - }; - - syslog = mkOption { - type = types.bool; - default = true; - description = "Whether to enable syslog output."; - }; - - passwordAuthentication = mkOption { - type = types.bool; - default = true; - description = "Whether to enable password authentication."; - }; - - publicKeyAuthentication = mkOption { - type = types.bool; - default = true; - description = "Whether to enable public key authentication."; - }; - - rootLogin = mkOption { - type = types.bool; - default = false; - description = "Whether to enable remote root login."; - }; - - loginShell = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - If non-null, override the default login shell with the - specified value. - ''; - example = "/nix/store/xyz-bash-10.0/bin/bash10"; - }; - - srpKeyExchange = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable SRP key exchange and user authentication. - ''; - }; - - tcpForwarding = mkOption { - type = types.bool; - default = true; - description = "Whether to enable TCP/IP forwarding."; - }; - - x11Forwarding = mkOption { - type = types.bool; - default = true; - description = "Whether to enable X11 forwarding."; - }; - - subsystems = mkOption { - type = types.listOf types.path; - description = '' - List of subsystem-path pairs, where the head of the pair - denotes the subsystem name, and the tail denotes the path to - an executable implementing it. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - services.lshd.subsystems = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ]; - - systemd.services.lshd = { - description = "GNU lshd SSH2 daemon"; - - after = [ "network.target" ]; - - wantedBy = [ "multi-user.target" ]; - - environment = { - LD_LIBRARY_PATH = config.system.nssModules.path; - }; - - preStart = '' - test -d /etc/lsh || mkdir -m 0755 -p /etc/lsh - test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh - - if ! test -f /var/spool/lsh/yarrow-seed-file - then - # XXX: It would be nice to provide feedback to the - # user when this fails, so that they can retry it - # manually. - ${lsh}/bin/lsh-make-seed --sloppy \ - -o /var/spool/lsh/yarrow-seed-file - fi - - if ! test -f "${cfg.hostKey}" - then - ${lsh}/bin/lsh-keygen --server | \ - ${lsh}/bin/lsh-writekey --server -o "${cfg.hostKey}" - fi - ''; - - script = with cfg; '' - ${lsh}/sbin/lshd --daemonic \ - --password-helper="${lsh}/sbin/lsh-pam-checkpw" \ - -p ${toString portNumber} \ - ${optionalString (interfaces != []) (concatStrings (map (i: "--interface=\"${i}\"") interfaces))} \ - -h "${hostKey}" \ - ${optionalString (!syslog) "--no-syslog" } \ - ${if passwordAuthentication then "--password" else "--no-password" } \ - ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \ - ${if rootLogin then "--root-login" else "--no-root-login" } \ - ${optionalString (loginShell != null) "--login-shell=\"${loginShell}\"" } \ - ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \ - ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \ - ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \ - --subsystems=${concatStringsSep "," - (map (pair: (head pair) + "=" + - (head (tail pair))) - subsystems)} - ''; - }; - - security.pam.services.lshd = {}; - }; -} diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix deleted file mode 100644 index f5fc34487aa1..000000000000 --- a/pkgs/tools/networking/lsh/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv, fetchurl, gperf, guile, gmp, zlib, liboop, readline, gnum4, pam -, nettools, lsof, procps, libxcrypt }: - -stdenv.mkDerivation rec { - pname = "lsh"; - version = "2.0.4"; - - src = fetchurl { - url = "mirror://gnu/lsh/lsh-${version}.tar.gz"; - sha256 = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091"; - }; - - patches = [ ./pam-service-name.patch ./lshd-no-root-login.patch ]; - - preConfigure = '' - # Patch `lsh-make-seed' so that it can gather enough entropy. - sed -i "src/lsh-make-seed.c" \ - -e "s|/usr/sbin/arp|${nettools}/sbin/arp|g ; - s|/usr/bin/netstat|${nettools}/bin/netstat|g ; - s|/usr/local/bin/lsof|${lsof}/bin/lsof|g ; - s|/bin/vmstat|${procps}/bin/vmstat|g ; - s|/bin/ps|${procps}/bin/sp|g ; - s|/usr/bin/w|${procps}/bin/w|g ; - s|/usr/bin/df|$(type -P df)|g ; - s|/usr/bin/ipcs|$(type -P ipcs)|g ; - s|/usr/bin/uptime|$(type -P uptime)|g" - - # Skip the `configure' script that checks whether /dev/ptmx & co. work as - # expected, because it relies on impurities (for instance, /dev/pts may - # be unavailable in chroots.) - export lsh_cv_sys_unix98_ptys=yes - ''; - - # -fcommon: workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: liblsh.a(unix_user.o):/build/lsh-2.0.4/src/server_userauth.h:108: multiple definition of - # `server_userauth_none_preauth'; lshd.o:/build/lsh-2.0.4/src/server_userauth.h:108: first defined here - # Should be present in upcoming 2.1 release. - env.NIX_CFLAGS_COMPILE = "-std=gnu90 -fcommon"; - - buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam libxcrypt ]; - - meta = { - description = "GPL'd implementation of the SSH protocol"; - - longDescription = '' - lsh is a free implementation (in the GNU sense) of the ssh - version 2 protocol, currently being standardised by the IETF - SECSH working group. - ''; - - homepage = "http://www.lysator.liu.se/~nisse/lsh/"; - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/tools/networking/lsh/lshd-no-root-login.patch b/pkgs/tools/networking/lsh/lshd-no-root-login.patch deleted file mode 100644 index 9dd81de3fbc1..000000000000 --- a/pkgs/tools/networking/lsh/lshd-no-root-login.patch +++ /dev/null @@ -1,16 +0,0 @@ -Correctly handle the `--no-root-login' option. - ---- lsh-2.0.4/src/lshd.c 2006-05-01 13:47:44.000000000 +0200 -+++ lsh-2.0.4/src/lshd.c 2009-09-08 12:20:36.000000000 +0200 -@@ -758,6 +758,10 @@ main_argp_parser(int key, char *arg, str - self->allow_root = 1; - break; - -+ case OPT_NO_ROOT_LOGIN: -+ self->allow_root = 0; -+ break; -+ - case OPT_KERBEROS_PASSWD: - self->pw_helper = PATH_KERBEROS_HELPER; - break; - diff --git a/pkgs/tools/networking/lsh/pam-service-name.patch b/pkgs/tools/networking/lsh/pam-service-name.patch deleted file mode 100644 index 6a6156855c51..000000000000 --- a/pkgs/tools/networking/lsh/pam-service-name.patch +++ /dev/null @@ -1,14 +0,0 @@ -Tell `lsh-pam-checkpw', the PAM password helper program, to use a more -descriptive service name. - ---- lsh-2.0.4/src/lsh-pam-checkpw.c 2003-02-16 22:30:10.000000000 +0100 -+++ lsh-2.0.4/src/lsh-pam-checkpw.c 2008-11-28 16:16:58.000000000 +0100 -@@ -38,7 +38,7 @@ - #include - - #define PWD_MAXLEN 1024 --#define SERVICE_NAME "other" -+#define SERVICE_NAME "lshd" - #define TIMEOUT 600 - - static int diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7141ba74865..20082b68cf69 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -912,6 +912,7 @@ mapAliases ({ llvm_11 = throw "llvm_11 has been removed from nixpkgs"; # Added 2024-01-24 lobster-two = google-fonts; # Added 2021-07-22 + lsh = throw "lsh has been removed as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decade"; # Added 2024-08-14 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b8cbe849bdb..c0309fd488f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10163,10 +10163,6 @@ with pkgs; lsb-release = callPackage ../os-specific/linux/lsb-release { }; - # lsh installs `bin/nettle-lfib-stream' and so does Nettle. Give the - # former a lower priority than Nettle. - lsh = lowPrio (callPackage ../tools/networking/lsh { }); - lunatic = callPackage ../development/interpreters/lunatic { }; lux = callPackage ../tools/video/lux { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 0212464acb62..57c07c1bde4c 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -82,7 +82,6 @@ in libxml2 = all; libxslt = all; lout = linux; - lsh = linux; lsof = linux; ltrace = linux; lvm2 = linux; From a80ece9fe36626b885c4cf5682c4813df2e4a126 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:12:49 +0200 Subject: [PATCH 190/233] nwg-look: remove unreferenced go.mod This was never used, unsure why it exists. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/applications/misc/nwg-look/go.mod | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 pkgs/applications/misc/nwg-look/go.mod diff --git a/pkgs/applications/misc/nwg-look/go.mod b/pkgs/applications/misc/nwg-look/go.mod deleted file mode 100644 index 1f40d0a94fbd..000000000000 --- a/pkgs/applications/misc/nwg-look/go.mod +++ /dev/null @@ -1,10 +0,0 @@ -module github.com/nwg-piotr/nwg-look - -go 1.22 - -require ( - github.com/gotk3/gotk3 v0.6.3 - github.com/sirupsen/logrus v1.9.3 -) - -require golang.org/x/sys v0.17.0 // indirect From 9570ff34b7b3ea6fed5c4536bf241886c7c5d13e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 10:14:49 +0000 Subject: [PATCH 191/233] cirrus-cli: 0.122.0 -> 0.122.2 --- .../tools/continuous-integration/cirrus-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 7fd540332766..2b26f3898723 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.122.0"; + version = "0.122.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-7T1do0PWgBBKZUqGZXpzmtBMsRnumRwyTDhhaE9pJ/0="; + hash = "sha256-+P4FpGH09hgY+PCrFNKAZgh9/hO8C0aFAnv545bA0gw="; }; - vendorHash = "sha256-yUnoJoKb6BkZyVlbzIhTeqmdEuumpkbRvIX1+v9WMgs="; + vendorHash = "sha256-WAYjYIHsBkQiTUmMDRXnx3Q1UAFVfXmZDFxzw7Kh0ds="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" From 14f0757fcc72194dc61185e7fa6c5c757c5d5dc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 10:15:01 +0000 Subject: [PATCH 192/233] kubefirst: 2.4.10 -> 2.4.17 --- pkgs/applications/networking/cluster/kubefirst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 7183fb8885b2..19c416d5e69b 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.4.10"; + version = "2.4.17"; src = fetchFromGitHub { owner = "kubefirst"; repo = "kubefirst"; rev = "refs/tags/v${version}"; - hash = "sha256-EgJ+ymddMsB37ygREwdF6qmGcgJKPz06//dwwa1pXd0="; + hash = "sha256-wYPrQkoz1rivfnhku3Njj8e/rJc2GuT1HOPyNSada+o="; }; - vendorHash = "sha256-5UdKjxs0f8dHTzWvHpMbYSCcIqTU5aT5anNVk0O94tw="; + vendorHash = "sha256-ymqBSNzgK79IYSZ+WR+0yi01008jIPaRJ7vnnxMDycY="; ldflags = [ "-s" From 474418fbd3a8a4c434f8a1e5adfbdec2ff744975 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 10:26:09 +0000 Subject: [PATCH 193/233] dracula-theme: 4.0.0-unstable-2024-08-06 -> 4.0.0-unstable-2024-08-14 --- pkgs/data/themes/dracula-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index 8ded319eafae..2b44edfb7f40 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2024-08-06"; + version = "4.0.0-unstable-2024-08-14"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "f3396127033ebfb29da1d994e4ced4a61675850a"; - hash = "sha256-zOLtR1R5wjgHtihO6QGBGU3RhoxBbcCNfjnwNd+aNA0="; + rev = "be80a123f1c47a9fdb6181e60a641778e14be2f7"; + hash = "sha256-c+DOYv3Eg31Fdt8qDBNYFPS/zuGInxJu2AsZqDExjPk="; }; propagatedUserEnvPkgs = [ From a6e60736655ad01cfc308197e2487a6600e174a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 10:46:52 +0000 Subject: [PATCH 194/233] librenms: 24.7.0 -> 24.8.0 --- pkgs/servers/monitoring/librenms/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/librenms/default.nix b/pkgs/servers/monitoring/librenms/default.nix index 7e3a8002b89c..34ab4c176026 100644 --- a/pkgs/servers/monitoring/librenms/default.nix +++ b/pkgs/servers/monitoring/librenms/default.nix @@ -24,16 +24,16 @@ let phpPackage = php82.withExtensions ({ enabled, all }: enabled ++ [ all.memcached ]); in phpPackage.buildComposerProject rec { pname = "librenms"; - version = "24.7.0"; + version = "24.8.0"; src = fetchFromGitHub { owner = "librenms"; repo = pname; rev = "${version}"; - sha256 = "sha256-XAtIm1YVmDhf2JjSiLDPGYhXRTL9lDQxDX+4//skC8Q="; + sha256 = "sha256-K4aHFMTHOLkrep2XtcilbaVsQrqXvuQmYZBl3+iG6kg="; }; - vendorHash = "sha256-adPBPmm4BDUEY/BGsvghWGc38SbcFxsnDwLfvX6SjvQ="; + vendorHash = "sha256-jJa4wQJQyeV6/ZkbZCxwyNi3AmPMtnUpGa4VQzkIKy4="; php = phpPackage; From 0cfa06cf273f0937d24608fdab8c135133a8d1f6 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 20 Aug 2024 12:16:27 +0100 Subject: [PATCH 195/233] kubesec: 2.14.0 -> 2.14.1 Diff: https://github.com/controlplaneio/kubesec/compare/v2.14.0...v2.14.1 Changelog: https://github.com/controlplaneio/kubesec/blob/v2.14.1/CHANGELOG.md --- pkgs/tools/security/kubesec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix index ed562124da90..15485adf9b2f 100644 --- a/pkgs/tools/security/kubesec/default.nix +++ b/pkgs/tools/security/kubesec/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "kubesec"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "controlplaneio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RNLvmoHna5EO0/p24opBagyWzzNbmFkWGzkUXirdWe0="; + sha256 = "sha256-FYYMCouZuG0EqvganPLSrLgaDZ+JowUcYXTnKMJ+6Us="; }; - vendorHash = "sha256-+Y5k9PRxnBR3lqi4T+3DH4Pw+cyHtt9+9OX4aw0CVl0="; + vendorHash = "sha256-KTmsCbFRHMd1KnBYxwWWuETaTP0G3NYCK/ttgrFy59I="; nativeBuildInputs = [ installShellFiles ]; From 92760d40cf26749cc4ce8b05ed7bafca1872ae86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 11:49:02 +0000 Subject: [PATCH 196/233] chamber: 3.0.0 -> 3.0.1 --- pkgs/tools/admin/chamber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index b96f0b7a6e82..579885b806ef 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oeHnzKsOgR1R9oEUQJofYaXJR6X6WwRlGU72g4Yc1yg="; + sha256 = "sha256-zjVch0NzCmimydk7/Uz4FZhcgQD+9xV6H6sAtPnFhDE="; }; CGO_ENABLED = 0; From e64ca20dd9a9a369dfa86e4ce045d2f6c870c943 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Aug 2024 14:04:52 +0200 Subject: [PATCH 197/233] python312Packages.pyeapi: update changelog URL --- pkgs/development/python-modules/pyeapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index 97b46eb63c33..190ea1c9beae 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Arista eAPI"; homepage = "https://github.com/arista-eosplus/pyeapi"; - changelog = "https://github.com/arista-eosplus/pyeapi/releases/tag/v${version}"; + changelog = "https://github.com/arista-eosplus/pyeapi/releases/tag/v.${version}"; license = licenses.bsd3; maintainers = with maintainers; [ astro ]; }; From b19db05d452e765e641ce20cdea773329879fe8e Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Wed, 7 Aug 2024 12:13:34 +0200 Subject: [PATCH 198/233] home-assistant-custom-components.somweb: init at 1.1.0 --- .../custom-components/default.nix | 2 ++ .../custom-components/somweb/default.nix | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/somweb/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 8d573010cf9a..178b3b33d277 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -56,6 +56,8 @@ smartthinq-sensors = callPackage ./smartthinq-sensors {}; + somweb = callPackage ./somweb {}; + spook = callPackage ./spook {}; tuya_local = callPackage ./tuya_local {}; diff --git a/pkgs/servers/home-assistant/custom-components/somweb/default.nix b/pkgs/servers/home-assistant/custom-components/somweb/default.nix new file mode 100644 index 000000000000..90b166138914 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/somweb/default.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + somweb, +}: + +buildHomeAssistantComponent rec { + owner = "taarskog"; + domain = "somweb"; + version = "1.1.0"; + + src = fetchFromGitHub { + inherit owner; + repo = "home-assistant-component-somweb"; + rev = "refs/tags/v${version}"; + hash = "sha256-anOcpaGeblFVaP2EFVuxx1EuXnNgxy/QoYqvYJMv1Fo="; + }; + + dependencies = [ somweb ]; + + meta = with lib; { + changelog = "https://github.com/taarskog/home-assistant-component-somweb/releases/tag/v${version}"; + description = "Custom component for Home Assistant to manage garage doors and gates by Sommer through SOMweb"; + homepage = "https://github.com/taarskog/home-assistant-component-somweb"; + maintainers = with maintainers; [ uvnikita ]; + license = licenses.mit; + }; +} From ce825ce25ddf283961424c294cace737578036fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 12:34:58 +0000 Subject: [PATCH 199/233] dbmate: 2.19.0 -> 2.20.0 --- pkgs/development/tools/database/dbmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 3cd32aa16828..2241f25578ff 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-LNA66Uz/cgwx3Bq2FXpW7+3vh2VXWPyyrlAcRK5MlGU="; + hash = "sha256-5lsScWX7oaYU3IzqBYK41g96bLn2Er0XRq3nUgXI+Vk="; }; - vendorHash = "sha256-ypGPVJ0cfHMGDqOV2xt5MQs9X3YtCW8+sChQ9SPOZAY="; + vendorHash = "sha256-BtMvaMb36F9c1CJb7qAhkMW8jxuPJqlKRSlMzkEOMAY="; doCheck = false; From 7995a227735997e12c1caef72dbc370ee6d8a288 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 12:35:29 +0000 Subject: [PATCH 200/233] dmenu-rs: 5.5.3 -> 5.5.4 --- pkgs/applications/misc/dmenu-rs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dmenu-rs/default.nix b/pkgs/applications/misc/dmenu-rs/default.nix index 37ddb8922a83..87d484c2e9bf 100644 --- a/pkgs/applications/misc/dmenu-rs/default.nix +++ b/pkgs/applications/misc/dmenu-rs/default.nix @@ -18,13 +18,13 @@ # See: https://github.com/Shizcow/dmenu-rs#plugins stdenv.mkDerivation rec { pname = "dmenu-rs"; - version = "5.5.3"; + version = "5.5.4"; src = fetchFromGitHub { owner = "Shizcow"; repo = "dmenu-rs"; rev = version; - hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g="; + hash = "sha256-LdbTvuq1IbzWEoASscIh3j3VAHm+W3UekJNiMHTxSQI="; }; nativeBuildInputs = [ From 5a3fe0fa465717c02234d4b06842acc66efd0005 Mon Sep 17 00:00:00 2001 From: damhiya Date: Fri, 16 Aug 2024 02:42:17 +0900 Subject: [PATCH 201/233] coqPackages.MenhirLib: init at 20240715 --- .../manual/release-notes/rl-2411.section.md | 2 + .../coq-modules/MenhirLib/default.nix | 50 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 3 files changed, 53 insertions(+) create mode 100644 pkgs/development/coq-modules/MenhirLib/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 702d33d38899..e4b366b70528 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -73,6 +73,8 @@ - [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld). +- [MenhirLib](https://gitlab.inria.fr/fpottier/menhir/-/tree/master/coq-menhirlib) A support library for verified Coq parsers produced by Menhir. + - [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance). - [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika). diff --git a/pkgs/development/coq-modules/MenhirLib/default.nix b/pkgs/development/coq-modules/MenhirLib/default.nix new file mode 100644 index 000000000000..5b680c73da44 --- /dev/null +++ b/pkgs/development/coq-modules/MenhirLib/default.nix @@ -0,0 +1,50 @@ +{ + lib, + mkCoqDerivation, + coq, + version ? null, +}: +let + MenhirLib = mkCoqDerivation { + pname = "MenhirLib"; + owner = "fpottier"; + repo = "menhir"; + domain = "gitlab.inria.fr"; + inherit version; + defaultVersion = + with lib.versions; + lib.switch coq.coq-version [ + { + case = range "8.12" "8.20"; + out = "20240715"; + } + { + case = range "8.7" "8.11"; + out = "20200624"; + } + ] null; + release = { + "20240715".sha256 = "sha256-9CSxAIm0aEXkwF+aj8u/bqLG30y5eDNz65EnohJPjzI="; # coq 8.9 - 8.20 + "20231231".sha256 = "sha256-veB0ORHp6jdRwCyDDAfc7a7ov8sOeHUmiELdOFf/QYk="; # coq 8.7 - 8.19 + "20230608".sha256 = "sha256-dUPoIUVr3gqvE5bniyQh/b37tNfRsZN8X3e99GFkyLY="; # coq 8.7 - 8.18 + "20230415".sha256 = "sha256-WjE3iOKlUb15MDG3+GOi+nertAw9L2Ryazi/0JEvjqc="; # coq 8.7 - 8.18 + "20220210".sha256 = "sha256-Nljrgq8iW17qbn2PLIbjPd03WCcZm08d1DF6NrKOYTg="; # coq 8.7 - 8.18 + "20211230".sha256 = "sha256-+ntl4ykkqJWEeJJzt6fO5r0X1J+4in2LJIj1N8R175w="; # coq 8.7 - 8.18 + "20200624".sha256 = "sha256-8lMqwmOsqxU/45Xr+GeyU2aIjrClVdv3VamCCkF76jY="; # coq 8.7 - 8.13 + }; + preBuild = "cd coq-menhirlib/src"; + meta = with lib; { + homepage = "https://gitlab.inria.fr/fpottier/menhir/-/tree/master/coq-menhirlib"; + description = "A support library for verified Coq parsers produced by Menhir"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ ]; + }; + }; +in +MenhirLib.overrideAttrs ( + oldAttrs: + if oldAttrs.version <= "20211230" then + { installPhase = "make TARGET=$out/lib/coq/${coq.coq-version}/user-contrib/MenhirLib install"; } + else + { } +) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 083ae126fb95..f52c1e5f21d8 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -101,6 +101,7 @@ let mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {}; mathcomp-word = callPackage ../development/coq-modules/mathcomp-word {}; mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {}; + MenhirLib = callPackage ../development/coq-modules/MenhirLib {}; metacoq = callPackage ../development/coq-modules/metacoq { }; metacoq-template-coq = self.metacoq.template-coq; metacoq-pcuic = self.metacoq.pcuic; From b3a97d4e1fe197b5ce864fe01ea08f886a07f545 Mon Sep 17 00:00:00 2001 From: damhiya Date: Fri, 16 Aug 2024 02:50:19 +0900 Subject: [PATCH 202/233] coqPackages.compcert: use external MenhirLib --- pkgs/development/coq-modules/compcert/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 7d78a2d37686..28a08f0039f7 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -1,5 +1,5 @@ { lib, mkCoqDerivation -, coq, flocq +, coq, flocq, MenhirLib , ocamlPackages, fetchpatch, makeWrapper, coq2html , stdenv, tools ? stdenv.cc , version ? null @@ -50,7 +50,7 @@ compcert = mkCoqDerivation { nativeBuildInputs = with ocamlPackages; [ makeWrapper ocaml findlib menhir coq coq2html ]; buildInputs = with ocamlPackages; [ menhirLib ]; - propagatedBuildInputs = [ flocq ]; + propagatedBuildInputs = [ flocq MenhirLib ]; enableParallelBuilding = true; @@ -66,6 +66,7 @@ compcert = mkCoqDerivation { -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ -toolprefix ${tools}/bin/ \ -use-external-Flocq \ + -use-external-MenhirLib \ ${target} \ ''; # don't remove the \ above, the command gets appended in override below From 1014b8361377cd381b5d14da1d7d67d375f731b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 20 Aug 2024 15:01:40 +0200 Subject: [PATCH 203/233] firefox-unwrapped: 129.0.1 -> 129.0.2 https://www.mozilla.org/en-US/firefox/129.0.2/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 72f780141d52..3e620b946b7b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -5,10 +5,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "129.0.1"; + version = "129.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "27c463e8277994c62bab85cf0e2f0cea16a9b272694b61fa56a6b3bd7c70d6481774288386094836a54df54c1b1144d61be67f4f5eac418c05479d452221c027"; + sha512 = "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13"; }; extraPatches = [ From 9f14bbaf957c5e56d68f866b3725d246d2a002d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 20 Aug 2024 15:03:24 +0200 Subject: [PATCH 204/233] firefox-bin-unwrapped: 129.0.1 -> 129.0.2 https://www.mozilla.org/en-US/firefox/129.0.2/releasenotes/ --- .../browsers/firefox-bin/release_sources.nix | 826 +++++++++--------- 1 file changed, 413 insertions(+), 413 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 0e6e44e79ef8..53b396126066 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1035 +1,1035 @@ { - version = "129.0.1"; + version = "129.0.2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ach/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ach/firefox-129.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "322f28aa6a05aa88bd310ba59a204958dd6905b6a2cfc9382484adf8a0d22eae"; + sha256 = "7aaaef8961f1a15cedf6b5628f8d9b39e4df21949f3de29c9cff701b8a5396b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/af/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/af/firefox-129.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7fb896bceed70dd5baa88eb6e37f761fa692b02c2a9b7cebb484af2700c2b621"; + sha256 = "183a0bd2d72aa5d37a75c48ec88669d9596daf26bc201c2ae677b817b470de2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/an/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/an/firefox-129.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "b3366c9d3b8754eb4fa9ea20e25fa6d5ee7c61d4c5720d8807f88a9b7ee6e20b"; + sha256 = "de0e5ff3726ffb24a3c395364a81872f2c92d8fe5792977671bdbc947437a68e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ar/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ar/firefox-129.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "2152eb7b98a22adcbbc8281d8f039a11d1713ba65128fd767fd4c7196e6748eb"; + sha256 = "f9ec116e68473c3b9758690c93d6a01b75f147ffa388123f8588f9f1c21af6e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ast/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ast/firefox-129.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f66de256e2d5349c5961299f006e98ee91f6e819575544220c90aa262c3c24a9"; + sha256 = "494f0f5c2a87d72d39d0056bd6ed190d874a89980090b20ce0a35b262b9e2c15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/az/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/az/firefox-129.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6452d13e9eb1af89ff83ba0846441a70465a149610c864f75b912dd60bff42ce"; + sha256 = "fcd4a02e5615fb249ecb03d494c5360f563ae87bd44fb2bda7f0767083f1fbf7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/be/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/be/firefox-129.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "093e1bcb7e4b529e4bab5adeea0f859ec371dfc10e9d4514c38c2da75d4a7c56"; + sha256 = "8053d43134e823e974786f0ccd3182bab8a13b6eb07e40787890474e4990087d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/bg/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/bg/firefox-129.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "bd43c326300071e235e909ba545e72ec53f3a0209ea6e44826d100b3673f30ed"; + sha256 = "69c48d88c051f56c222ebf9828ca7b66f8713e2649b4fcf1224f551765cf584d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/bn/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/bn/firefox-129.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "fb94db4d16754edad54aa9e7367cb66d97dfa09c511b554dfd705df8b589e64d"; + sha256 = "e246019f72f0636bb42132b0c008151adf9d3e86578833a9259c640529f31dce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/br/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/br/firefox-129.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "66f3d58e304c812f4f66c061cd248863339134aa4f33e09b40a1a546b37a56e4"; + sha256 = "bda1bf4cab048cb35595213ecdc2a628d6bca359cb39b946718860a5a6ca224b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/bs/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/bs/firefox-129.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1c799c900aedc42954d26fa7cdea9b05d9375e37fd133de7f84614897ec437df"; + sha256 = "3b5a1a9555d8750a7885df9d6faebd4061cb0392a6c0b64993d808caeac0da6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ca-valencia/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ca-valencia/firefox-129.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "966af148f4378f3679a4ad689871f57159c97a8ff3bb1a04f631f4356e630e38"; + sha256 = "22b7088c272d84a1d092d439603d3845ea485432551bffe96beda477b116b8a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ca/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ca/firefox-129.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e477b9a0defcf0e9767701fffd64cb42c6ae093a73fef336c271720dc6fb43f2"; + sha256 = "71e732f53f0c95a29011fc80f12e3c65d20ba00843aa2a237c97352912bd0ff5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/cak/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/cak/firefox-129.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ee92d9aa77a26fd7ca13e36a81f1dca63666f7238833d8e318514ff08319e055"; + sha256 = "e97b8371b38fb152e1ffa0915a011e1a134eb12b472be657ae2946237ec36f09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/cs/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/cs/firefox-129.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4bb33b974f600e815262d3bfb5b2933917c54c21b3ab70d8f0065d93133dc2b2"; + sha256 = "097bda337bc34a899857b948cb05a7394e60d45fcac08649a0b3e05e86cf5518"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/cy/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/cy/firefox-129.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "baa0359755cbc4d4d702e86f57be9051fcf56bcb488aca007756ed8c4337fb6c"; + sha256 = "ee6e799d8d1722ce7ae7965f9322e32482913905737ba0be43fe5fff89f73a12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/da/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/da/firefox-129.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "125e216ce6bc4da5da4b67a292c06b8a25810a2ef38cf87bef97bd5311d9232c"; + sha256 = "4edbe9fb78034bb68085cb4a28f5b21ba0b136ca6aa61e527c5aa938f14cad33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/de/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/de/firefox-129.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c4573353ef33a65acc8b991bc43d67ca172e69d507ecf7783bbe8c0fdef92fec"; + sha256 = "566a6a89998d039755b0a1fe52967df84851693ec4ac980dd96775abf6f48383"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/dsb/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/dsb/firefox-129.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "6c250ee4fc9beff843af53d660adf9cae8aa2d3fcad73ac7a90ccbe58a5346b7"; + sha256 = "25fd4db8471f79631ac37cd6f1624344b3b1c6074b797ed2495bd07298666bd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/el/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/el/firefox-129.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c018b2eaae8a11462477d7834e8accb35768481b6a9a6331d9222b36ad9493d5"; + sha256 = "f89c3d396e4f9c4aa7262ed3148d0823bd627985cb1b1b5b9a621ad652197b15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/en-CA/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/en-CA/firefox-129.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "fe76fb578ee70be24fb161310c84ee8c4f6087fcc9df647f80b86885492a27fc"; + sha256 = "2f9891b64a32f4ace5cfaf8da2bf8020c06cda82f54815888ec8d322a43186fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/en-GB/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/en-GB/firefox-129.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3857180bee1abc7c2d4c26d10b30f225c71934a0c2db41381aff13b6db1b4dbb"; + sha256 = "4f79574372874afa16f3e15663bb241c2d4487228525813b02b52beafa7ab696"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/en-US/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/en-US/firefox-129.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "fa1a0409640a2e6fe2adcddbed5caa412e6dc9f38ca788eb78800f9e309f5b29"; + sha256 = "abc39c9deb686084933371bbe0546001f7bfab46c9d7a0cf4b1a4a025886cd5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/eo/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/eo/firefox-129.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "45440abd9514544dc6e7bd01cb9c7410725a0d441ff3be3ede1835c188c3dcb4"; + sha256 = "ea987042822c4525fbf9bc9aafb52d8bac31f660350d4b716805a56578b1a180"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/es-AR/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-AR/firefox-129.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "650165ced3106af5ddff504353ccdf669c52dbabfc3c5b72a45968298b81ee85"; + sha256 = "08300765d0b45acc05a5a1570c440d937f9f0b86e7901cef3961d3ea4b6bd65d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/es-CL/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-CL/firefox-129.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "155847655e7dc117f1b7fb87a03b1765146277f2de7c71aa6a483318f863d528"; + sha256 = "f00f2cf4e4d99441c6e412696ba99062253297384b7c1fff4302f26abcebf448"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/es-ES/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-ES/firefox-129.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7995578f9287793e38bdac260d376858ad10b8ba5634c8723fd64009d0b5cda4"; + sha256 = "a0995bb508d84572aa1fbec2b03d822bad6ad0204cae640d55bda1f94bf31d2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/es-MX/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/es-MX/firefox-129.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "1c92dac291ba02cc9d668e6ee472f0245b68089a3afe10b0aa27a1437777f098"; + sha256 = "0cebcbeae39cb6c22a8f7187ad743185c7a5608a052a8e89c9375540c1864cfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/et/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/et/firefox-129.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "acc342182bf1879ea863c440e5c3fd628dcbc738546bfc5477bfe3ddbbc57439"; + sha256 = "311ad4f3f82ad0b6ddcbb04eba56cfa677b4e647a7edd6ab93b839e445ca37fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/eu/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/eu/firefox-129.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9151429ecaac2c4ef613723e5563daad87cdfc33a0d6893fb8fabe4513c88cd5"; + sha256 = "f29874ec11d9b379253c3f1cb0af6dce9bc234f62095f6a5384e7fc71c8790b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/fa/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fa/firefox-129.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "dc34f7a9df6997dff3c5f6468cc9e608d848392f703281c961ddf0fc8584fabf"; + sha256 = "bf533e90cc97ffc202031ad6e031f927cac8ed68a36ed085362fe5b2c71b75b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ff/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ff/firefox-129.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "a132ed00b8819fbb8758be779a0b9dffeee73358288f9cec2b1fd9f056aebac1"; + sha256 = "0b49ab0e7fe4b54b31b459d6589f9d305a30e51b288f5801caa308879c6e9314"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/fi/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fi/firefox-129.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d803ce4df825037f98e6f5bceb1c7952a9d35e894375a2e58bf9ae0a95cea0ec"; + sha256 = "6504da2de952fe15f7ab2384a24f13583a312ace4dcd5a3b047fd56bfd0c637b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/fr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fr/firefox-129.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d3dc1d56a1c7e33bc0bdbaee128c4c6f572bd377d57a9d5e516994d2caf549bd"; + sha256 = "6306db7115a74440e6334ac4f388201ab891944aab03751a211fe0d6a963476f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/fur/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fur/firefox-129.0.2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "b8d9a948bbf1e06d05a483311aaa063d2b3560cb14aa76654089a565f032237d"; + sha256 = "18faff8dcff0bdf8a5bd0e9bfabcc6a341fe422a3c95437e5253f672b6a60afb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/fy-NL/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/fy-NL/firefox-129.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "01d657f62c12f2a85358ead8be0d742a34042ad025df34d105f9410d1f94b848"; + sha256 = "cb96cb4d0c6658a6e564e9ae379a8b6b90e964411aff0f30ccf213ae93d64351"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ga-IE/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ga-IE/firefox-129.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4a46e383bf1a430b04c5c426319c385e4e18bd2172bef73625da7dd646b85c04"; + sha256 = "7d45b7ba424003ecf8ff9f2e22c8881445ed328a7c3d28c7194e856278b59daa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/gd/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gd/firefox-129.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "12cc0c05c5d9633247ea8befca9a264b65d2ebaeb238d30f0b0363435004ef6b"; + sha256 = "83a3cb11b7595b630091a8c65cc78ac0585c5a582513e2a376144a011316e2ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/gl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gl/firefox-129.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7074cb06e70653c1d4cd36d5a2f9c626e52d58b5cd99e883b47b716b1c9dd224"; + sha256 = "b57957ddf205a69e326d4f018d0c359ef5613f46fc29251fe011e8e7779283c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/gn/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gn/firefox-129.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ef580573f2a05fdb1619b156fe34f8c995adb7fcc0e93f9facb3fafe2cc93a5d"; + sha256 = "884eb5acafa07240a992efdd9653ccef3002a4112854e767cbe00856aa1d7da6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/gu-IN/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/gu-IN/firefox-129.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "a119dd61e569da679ac06bd0352f75c257adf12702dbc51206453241efee4794"; + sha256 = "e6c7181087c49b702288c43c033451344b4029f6088ed5d6f8c7d870d3de29e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/he/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/he/firefox-129.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7c1fa0618c79ad7434ae50758c90afb0377dd5c13e462581798bc784f095a505"; + sha256 = "943b6ce9d9831bd3321b71cc9796ee3b311168aa14536bfa27a857f4e9f285e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/hi-IN/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hi-IN/firefox-129.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "bbd7ee49b7f9586b505ddb8569ce221f1fa8ef75d2e7f988549d5f662781123d"; + sha256 = "04d511d86ff2d7ca868358e3713e8354c6953f52c12553faac13bc538782a634"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/hr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hr/firefox-129.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "dd81673dfb6c36a32e3f9ad43da0ce18e76104c2df203c435a7a3821bad3c18d"; + sha256 = "97182b477be51715d2d241e87954a5b722d1b5555047487774e069fcb73802c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/hsb/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hsb/firefox-129.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "428bc28223239357c0f0943e9eee8e749f318d589dba1194a7ebd46d8589d3b0"; + sha256 = "68495a5bcd85e28a125673cf2801b41f039d169dd5d10a375e298be65278474f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/hu/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hu/firefox-129.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b0f920a37304567fa235f169ef0ca89b47b519247dca62dfce49ef3acc7500a0"; + sha256 = "b46db68cc2488c7632cf2ba9b685526c8ae8f4e528ecd37c885e034a1bb548d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/hy-AM/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/hy-AM/firefox-129.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "14c63d4bbcc9955b77bedb88dcb5d899b53c9c51f0a5241c1849ab5a3e485aa4"; + sha256 = "ee6de2465b22e138dbfae37bbac83f0d6ce4367bb6de3bd0baf7753d5e0fa76e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ia/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ia/firefox-129.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5d68a0779bf3ac84a1835c53489bf25bfb735e6c7c6ee49d7c59cd11355b4862"; + sha256 = "f7ab6e0c7acd4480fa6f3e1aeb6ea27df9f105a4b62ddb4f9830df0fc70c2a35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/id/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/id/firefox-129.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "801d433ecb094353618547ec7f6719cf8808f215aaec5025f7a86d503feb766c"; + sha256 = "cee0868a891b37c669127a6a8c4235ba1aa6b32d3e6b35cc0c63377409d3cf14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/is/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/is/firefox-129.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a1f4ee915e718c92913d29f22d2240ae87405ff5486c0080042e1f3eb5ac59cf"; + sha256 = "5acc79cab57f7fe96f4b9c620734c8085b845adb07e1173fc01e23ddd8296f01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/it/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/it/firefox-129.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "dee6b7672240e898bb2fa97a103bee967546700b88fce9f4d4f019de777a659a"; + sha256 = "626304726111b560469f8e091214f7b0eff5a0976966f3c95f10ba39f854991b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ja/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ja/firefox-129.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1eed4c47a334751e25cbc99af413bb9b8040361abf808b6db8b4c4c6357f2f46"; + sha256 = "86d8254bd6f1dbbcc83a482d4c3fd95e1141bde2f12270cb00f5c775dd7a0414"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ka/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ka/firefox-129.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ce92e7c4677b4e90de18316eda8d2606415ab278175cae8f2e3727f78186e2a9"; + sha256 = "25afab664c50acb86a7cda73089a9245543656ff6b5a2657e952bd91efcf0986"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/kab/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/kab/firefox-129.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "64e631e4ad9d7ad8b000d874e17ef745d57b0a162d8044ee0c31aed35468d75d"; + sha256 = "4bbf14ea29b4a23812770013b99c8efc7f097332d6a4b154eb1727c7b5c5d077"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/kk/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/kk/firefox-129.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7db8c3f89aa7973066ee9102eb70cdcbed17f65908d36bf8ca06489b28f8cc62"; + sha256 = "f60d696894b0d400b5e7f144d133edbd52920d072abd02513f18ac247dd719dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/km/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/km/firefox-129.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "e609f7439be7e5a42758a8d2087b430fb1e205a8797a049c45c58ce165509b87"; + sha256 = "f65e2c6b23754b54175e3b403ef1aaa0d86e7fe91807614caf10b24a5a7f2f0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/kn/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/kn/firefox-129.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "2e7b8995ef4dc5ee14ec4e79bcb1daece99f4495da7dd943745fa80928e8b5dd"; + sha256 = "1e726b29828081df75bdfe48e1f882460387e4ca34e5075e2e5de311ce4225f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ko/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ko/firefox-129.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "68b1c50385c079e352983a6ed7cd7c77ba1748b93a8dd43157f5d8c0299ed05f"; + sha256 = "e380cbebd8032d489257509ae3ead668bb622ba79964fe2e115774ab723c61d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/lij/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/lij/firefox-129.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "133f7f217a983d216da56d1d66bf60949ad016ece337b1116643e027238593b7"; + sha256 = "2ff47a150def39612f0c17199ef4ee71b6e75072fd24da896099a83b5342d161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/lt/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/lt/firefox-129.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fe31d578c7e867465d5bdc21277c0b60f4f98b61aa50ede2bfeba1c85b59dea6"; + sha256 = "f4f9ef24a048a8d7d503080e007e7cae60b50cd3eafe10414e4915f9b50590a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/lv/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/lv/firefox-129.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "2c9f9753ef5ee799a9b1a89bb125d55c9593aed1b03a4bb641de719995c247d1"; + sha256 = "1086b7a4d4aa0d85a11e83fda3250c21b0418f6760d6aff9091a853e36b14d1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/mk/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/mk/firefox-129.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "48e0cf34c66a06de3fe61443362ff1b65abb844072088ab899b6c450cf32aa8a"; + sha256 = "9da40a63e3d0839a5475e5d4b9471fe368850c782b5916ffa662c4503a5ab8c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/mr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/mr/firefox-129.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "c00f0bcff71190d35fb23abf4cc2e84eb1bc1080a855ec02568fee0f535e15e1"; + sha256 = "af6050c29664da52fcc95202aaf440706a0fd6607d8a51241310f2b06453670b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ms/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ms/firefox-129.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "046a5a21972e31564a69117af8e1abafc9c4d39f3bfa462bcc2b1045a833b49d"; + sha256 = "225ad7c0161f93fed2a5ca86c7cacdc77175676f314280a2ce80a270cdb10364"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/my/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/my/firefox-129.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "5891859a847d34d9dc6f82a320cbd8dda4adc3a90179b5ecf6ab6080fd39fbdf"; + sha256 = "8a124bda79de71bb3128c1614defb950a744d40271f01e7efdce96a248f3f3ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/nb-NO/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/nb-NO/firefox-129.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d464adc186949c0ee759e0853f8875d8fc466e0c8113d9f8463deac0e5dd7a15"; + sha256 = "b8498c9fee3549d74a0de4145491aa722a25ce83e3f5c99f6964d545e59650d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ne-NP/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ne-NP/firefox-129.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "4faa30e03547f1f628281a3edaefe26d6bc1bcee8131e79ebdc7043ab912bb66"; + sha256 = "393ddf518ac361e21a9f74b3f18f2521e113b628e60adaad02cd7c9534f706a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/nl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/nl/firefox-129.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b6230fb5cef32848a38e0213a3a08646dc18aa379a5035fecfdb7a5a38706159"; + sha256 = "8ee2329b09f50f7359954ac3dbf9cb6a98a038b0f23ac12f7bd57a65cb0e1671"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/nn-NO/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/nn-NO/firefox-129.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "997d17332b8a08f01eaf6a82eabbe4e3f7427deaaf2d4549d23058a75640c8f3"; + sha256 = "744fee46ca52133338e2a2c91c40dde6b0f40aec7cc1a262f3865875d0f05395"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/oc/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/oc/firefox-129.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "7201ed3e4af3677274349b8ec945d990f174e77a11b82d08779ee8f993696ef0"; + sha256 = "d3225783ccc2aeeb037435b7340706bb423ccd6b46fc64f5dc2fe9c2b6c5475e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/pa-IN/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pa-IN/firefox-129.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1f3e14a1af54110c79f81fe52afd6254cd47995c895b3ff02dba2b28c9ba55cb"; + sha256 = "a99e70e0abfc8b059a9d395110d52a42150d82fe34c99c8aa0883aad8894d608"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/pl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pl/firefox-129.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "02b1c07a3796ecf9574eb380037e72f77b5f8c3d602cc565c7d57ac549f74da1"; + sha256 = "d7736cd892696aff5ddbf288d2ad6497e717d6239075b6e1ef97e08abff79c5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/pt-BR/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pt-BR/firefox-129.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8dca8404b0c5391255db1a9a9064b5d339abf5377b4c818494255ad5c24b9bd9"; + sha256 = "000690be0f8f09ab3a7f0416abf0526089592e1f7b7f405f0aa850836c0a5a29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/pt-PT/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/pt-PT/firefox-129.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8ae01dfcc9206543af2cabf7d2e842a5b7cc7a5db05dcf0bad28041fd01e1e0e"; + sha256 = "eca4a2abe96623be899cf0c053c6f4f9fdb2c7bd2bf88b664eab9a515c6f7a25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/rm/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/rm/firefox-129.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7c41ec64aa46c9ffee0e844be3a5178441eb5c3096bcc5fe497a190ecca12959"; + sha256 = "0dc4c7990dbcf497e0b08992d4d7cd835bfbed0c8a780b8800c2e37be6f1a822"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ro/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ro/firefox-129.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9383d9c32880025c62f0992150af13744f987de8dbd734c38742bf54cd1f04a0"; + sha256 = "817b740000d2e63e559743e1beb1cdabda304c171a2a9fd4e189d5ae8a0a1ae4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ru/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ru/firefox-129.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7d64d6aaf9e158fc438f5aa3d790b585dc53774cc2ddf8967b71bce83cd2abe3"; + sha256 = "f72f1d5c3941136825e0a396ba649101403ca6663f0222cd3e4f8cf73311b4ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/sat/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sat/firefox-129.0.2.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "c5544ce2a22c366bde332184fdc2b5a07841b41b878076ceef9c408edc4598b9"; + sha256 = "f0b5ec8b2661d431c31ae7e365bdb058b6a2b461110ee1762570050a30efde06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/sc/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sc/firefox-129.0.2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "4ecb7d49c193eab98737ccfab3a3428a6b69947a0536b7f322f2105bc91b0075"; + sha256 = "af1698573ea3376f307f65d7f1f2209635c5cfb664bfda02f551cd32133b4469"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/sco/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sco/firefox-129.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "aa51ac42d8cc9b75b9948e4f2d920d73745f0d952fbb8cefbb88fc57454a8daf"; + sha256 = "fe91ca8ee0c532f8d385e7242d7ccfe9289ceb76076aaf250ab4134b112a3390"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/si/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/si/firefox-129.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "2c0b574c151f167ff2ef06ebd1e475660999f46bbcb5813f9b92ad9bf995cad5"; + sha256 = "e878f39ec1636dc875ef010dd78d1ec4fe42cdeb4c529a71e54122b5ecbb6f90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/sk/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sk/firefox-129.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "23d4ac0dc081d64bf144cdb239b75bc47de4eb836adbfe7098b8b52c2c92c01e"; + sha256 = "0ee3cc503f07879b443922a364f2a54ae4a5ea645e75d498dd86d50689ea3c76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/skr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/skr/firefox-129.0.2.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "354dc94cc1081591883e4d6735d92a9ea35653ca1f77ba8e6bc1f559f997155e"; + sha256 = "f54927b3bf8e70326fbfb6279dee5e49c71c30b864398f18cbda9656af2ad14c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/sl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sl/firefox-129.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a5177444270d17b85275704e8df12ed7bf0642ab252f7591944af756ee7628e4"; + sha256 = "d6b2fbe32b3828abd3d500f1cf2bba7cc6b5a43e84ea10e51fd80689a1a1b82a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/son/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/son/firefox-129.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f9dc45019a2c80d4c2f5332f379024858e4ccb040e8da3405333d5dbe3840ddb"; + sha256 = "f165f02a2e6b3ad5dc0cee6423b99f3e39b9be404b8ab372ad7afe8fd0772154"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/sq/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sq/firefox-129.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "114385567fafd6e5aaa67ff479b35ed4d95d990c43976192533045f6e632248d"; + sha256 = "40cfd87b696bb431bf76345a15be0b91378e566a16d908bcd557e0411d6c583d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/sr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sr/firefox-129.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "678d2cdd8da3fc63aab271b4bba0882280633600e28fa8b185e67a921714c439"; + sha256 = "595a89f6981f9a6cf9f84bc1f22da72dd0aa1d475c9f2c4cd81b07c74abab2c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/sv-SE/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/sv-SE/firefox-129.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "daa890d621f6622033b2927566d390a59fbb72c1d7bb14c34d0e41d80c3e1835"; + sha256 = "eeee44cf5a18f2b9eb40a06da9d9aece626652d54a0e238549a8312b8abde4be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/szl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/szl/firefox-129.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "019f00aa7e9d0009904414adb8ca67d519e01a6b4294a4a20002f9f11dbca25f"; + sha256 = "9cd0e7ddb3a660a1807189a43d9dc8ed6752c24b983ffdf15455ebcc60e8c21b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ta/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ta/firefox-129.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "edd8b14074f2424cb1cdca3adebbe4aded36b417248e2138aac4946260fc645b"; + sha256 = "6863e65e9428c0ff35ea602939732f858097502144f873ebb68ecd39cf129f49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/te/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/te/firefox-129.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "6119689538c1657465a0c977e516da6edbe865917b277a0f135468fed3e79c9d"; + sha256 = "1d3dc43fd6e0e728398941a8a0cdf568c43def57cd8ac33fefab7ecaf7838798"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/tg/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/tg/firefox-129.0.2.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "cad975d2d9be3077f8ad9bdde7d279d682d22416af1e2273301184ad1fbbe84f"; + sha256 = "93b1f1910585754378e8bc6b2e83db551ac9c3d4d58ebe35071409c16cdc6c83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/th/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/th/firefox-129.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "5a49b78a6b340dda8d84a25516e673b0a02e9dfc99277c98e49a63722764cbf8"; + sha256 = "c03cb0a9222d4f3eb307598bddfb87c99b702b65657a2d4e3fd8fd858fe75ae2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/tl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/tl/firefox-129.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "405d8ef264f8a4a0be2ad1b15d57b53cdf702ad563f98af13dbae306718a750f"; + sha256 = "e303cf1df617025f2afee55e75e3416edffc6bf01434dd877ffb73f22571c57d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/tr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/tr/firefox-129.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "692b3653743b6877c7fe78b24089bcec09e3b607c27e87b49f9914028e570bd0"; + sha256 = "5fe53f7ad3b4555364d9ecd5a794bc5e6de01ec748e8551d9fcfa7d4a9eb7cb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/trs/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/trs/firefox-129.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "4d1619c6ad444e1779518a4126d3e5799dbc982ec335fb81ab267fb2ec0f63c1"; + sha256 = "a1383fbcb469c613c4db07598977aed4d2e72ef52d8a1cb332ce868d741c4e36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/uk/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/uk/firefox-129.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "94c5e230abe96cb63aa4c72aeee00a64dc4bcc756e973703e77cc180b64e8638"; + sha256 = "5849331f7b9a4463e637c5724e065e66adb40f8da2e06d6c68301c3b841a02d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/ur/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/ur/firefox-129.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "6ad5b9af2cc3145567e53d6bad93fedca4cb4c5b9198808d6b4d415a59e332f1"; + sha256 = "072e47775da45609663e64c424ecbb6da7237ce5137c31b3eb4839d3764d6f98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/uz/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/uz/firefox-129.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "02d800350de01df92647be37f6e941b85d42bab9ef48714c7bf2cc09b30dc76f"; + sha256 = "0c9087fcb14f3bf64aaa3c5fc1a6f743362a689425b00fe017d50820b2e89be1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/vi/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/vi/firefox-129.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b51bc602278e09d484922198951a6bdc33c1334ef0dc2bcd23523cbb7d0a791c"; + sha256 = "cda8eb64f5ecd7176bb6e4fc9b275504da6c0e56b3f4ddb24111df39867abdd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/xh/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/xh/firefox-129.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "799341798b04d32aeeeebcd833b5cb1dbccd9d9e1a681626309c1acce1c64041"; + sha256 = "49ba4199a22d86e654fa5e5a47474198d874ca17eb59a36bec6b732609aca223"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/zh-CN/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/zh-CN/firefox-129.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "593906d6c6c6723ffbad5522a144224b6a54d6bbaf63a10f5c5a86f0503a10ba"; + sha256 = "c21b6e85a22370f5d6a9b15597c90706e2d3b2efeb181077d7e2ce8ee3d4180e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-x86_64/zh-TW/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-x86_64/zh-TW/firefox-129.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c181bbee04947715ef386bea67a9380ba085fe746abfc66c79e2c0ff671d8d24"; + sha256 = "4eefbada519857eef6a692fd4497b45bdd901daa66a308caf35a37367734a259"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ach/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ach/firefox-129.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0ff80030b9e7ee44368901e0372e615960c79631c727f70f1ded5b4b51c6b458"; + sha256 = "dc6a9df80df27e8aa7ea4eedf5136e302a4189b98bf135942a4b6aa92b2008fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/af/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/af/firefox-129.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "91ad4ad3cff7493fee40dc600438e66ddb31a170bae71ff66acd28e4fc6b1058"; + sha256 = "e7537da17e34b3cfc95ced5c0b12982d1049403fab440f767768882f844064c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/an/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/an/firefox-129.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "9b059a5d1b4f820528fa7826c76477eba4b1568e257cbffaa3f59f7cdc7ac3c5"; + sha256 = "909adef9469aaeb8978a2b2232aabd4fbae789a97c00088f1629bb191d0d9e5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ar/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ar/firefox-129.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2a34b413ecd5f209f28494507a7ba8386b985f3464188352a190a13e9def8f13"; + sha256 = "3c4b8d7c26074573efce4952d3494c40d5f7632759008ca0623951934024e031"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ast/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ast/firefox-129.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b53473c9c2e5daedada35b0b3e98a38ba87f2c4b17ae4bc5ac05c5dd4bb27e32"; + sha256 = "029ce1a8dec7b14ca671b9267bef8f7300dcffe80472cd8856baa8af23f748f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/az/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/az/firefox-129.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "9741bb9030c2932ed5f8223cc0a8aa784e6544dd813ea5ee521999fbf1c651eb"; + sha256 = "ebf23eb5e9d0fd2a22d0a2c863f387a810a1e55355bbe9b0cbfcbd4183d6c848"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/be/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/be/firefox-129.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "18013e005ce9c8cf6704aa510e40d52d70271cc6611bbf8ff620d8d1f8ddbc04"; + sha256 = "1b7d5803e425cacfb185f78fca810b511150c7c8251216be9da86bb8bddeb4bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/bg/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/bg/firefox-129.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6f610f7e994f4d4c404557bb455d96bda61b11f9e4f60e7824f0842ae2f758fd"; + sha256 = "27257813875b0684096f893360c5ac4efca419e41179537548c45c64ee93b50d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/bn/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/bn/firefox-129.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "80343fcf3a06af523d0572ec35a08e1712609084a05a6a5223ed88f0a09832d7"; + sha256 = "432f4822ed86bc232200bf8feb44e76cf4ce0625424f06bbf4b5836890290c2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/br/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/br/firefox-129.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2e6d626af4c372271e908619137ef4578bd737fbe3f11c85766b8208c9f35d75"; + sha256 = "72518fd9b89a9d362d6106d01e4cb9f65e94b29ad5d4935fe272c0d5fac7a697"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/bs/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/bs/firefox-129.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "901590d8920f77497aa353cec3d0188dbf4b25d756e8c6576f33601ee45318c0"; + sha256 = "9dabbbda2331c8b264bc8fa1a4f87086ea507905a51bb13a196f255faad17d99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ca-valencia/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ca-valencia/firefox-129.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "31ea1a2297703bc5527e3fed0eab3969710d5a50e4e3b9e4d29688b4f0bafbd1"; + sha256 = "ea89121b4e5192712e9a67186666b564ab8ddd3f9cac1d7797692c6cea33823f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ca/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ca/firefox-129.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1cc09a6e61c5cd916dd6d5aaca300167d195e3f5f089e9c113dbb86fdd72b4f4"; + sha256 = "1a62a13309cf8c9fb3acf9c30e6ffb21af0e7942a52b9e90bc13b135ff89196f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/cak/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/cak/firefox-129.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "505150c540d988f88631d8b5cefa54e56dcea3bedd16898959daae867969f598"; + sha256 = "b452a278dad279ba9075e955718194e58b90eec80edf98e9f9f3ad12ecc15472"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/cs/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/cs/firefox-129.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "95becb7703e251834dca3ee25af0614bc955f9debaa0932709e40ffc2044e0b1"; + sha256 = "5796ed1a488413e00b7895ffbf13e9882a245c883c4adc1bf0cc97e3619aec66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/cy/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/cy/firefox-129.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "574d80dd80bc7bf5232ccbb86c976a73757faf7f1a06a3a84f6bcf4dc4bd9bd8"; + sha256 = "533cfc7830ef37ca6540f7ab2fdf7909d871a3155c348fc5e051330ffb0a6dc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/da/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/da/firefox-129.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "209ed29ca4b66ca70e1cba761fd85948cf2602dfe5703835772f68dd98e493ab"; + sha256 = "8bccc19dd59cc059ccb19d94b302fa8230443cb1930919a984919870b7f99398"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/de/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/de/firefox-129.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9a7bd9af878541864ab6732967e784892eb219abd06bfc49b19a505c7b38c6de"; + sha256 = "d964fe752283018bab7e8cfdb9c8d4adc2b38688ba5a194d75c6e353ae4d4d39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/dsb/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/dsb/firefox-129.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e7618e96b9deca4c9d1f5ffd7220b1e981b492b946b75f40c214cec45887a7bc"; + sha256 = "725ae61a6743e82b835f2a0b103d2d345aa2d3f72b3fd7ee45424ef14e8e4190"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/el/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/el/firefox-129.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f8392b7fc803eb09f1636be34469bca2b15d981f09dab10dc00b53869fc7ec79"; + sha256 = "52762372928f56005624e9f2042469e83032632dd151f831478c773deaf48111"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/en-CA/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/en-CA/firefox-129.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "60fb198aafa459dbf45ef6b1969167d5a9132cdcd4db697d13cc69ce154c2cf0"; + sha256 = "50621060f246bcd1e3f2e7de5e941bae17dfafdd4be01bb431245e40fcd4701a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/en-GB/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/en-GB/firefox-129.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "adccfd07e8a0cf64216e86a251e063754995cc9d8a6d233c22fc2d0a2bafdad9"; + sha256 = "207693709a20933c38aecbbb2721a52bda39213b656f12e614368d22cf8f1bd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/en-US/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/en-US/firefox-129.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "acb4f3c297a6abca4ea27b467fd30b5b54e88d718c5869ed2fe1b3ad24cbb419"; + sha256 = "10b24f1717a0ec5d8fd450740d948a157f6075bd07909b1d8a43aff7753c0bed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/eo/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/eo/firefox-129.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e02ce06572f5b9801c5007d4c92ef02e060341b49270413139c920965314a857"; + sha256 = "1a2c610a8d327840af2c8363832b691067b15568ffb9f0907331f22dd17b807b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/es-AR/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-AR/firefox-129.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c5f8bc57f3e18e99f546f4cbf20dd6b6c11a1ffe3af52cabf66fb05fe99d306a"; + sha256 = "81de656e08edaf8527c00d925e7dcd9ad916938fc20e32e007763763b6e67b5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/es-CL/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-CL/firefox-129.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "20f3330f151e672ff96e2d15af4c9e1757ac082b1c9f025e6d580ce34f2359a6"; + sha256 = "6f262b62d9cfbb5d451d3cb40589c3ed069953e710e098d5fe2566e3c594a393"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/es-ES/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-ES/firefox-129.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "50b58bb231d84b91cfc125ee384be87455ac2bf2b11a6e4348ab1af9fe109d89"; + sha256 = "6fbe8832a1475407c37c44d097e530d03e0572c177366d79b9336f199445e679"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/es-MX/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/es-MX/firefox-129.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "ac640ee30096836a06b3f967c56baa6c4ef9fdcabd42b2822918105f7f53b6c4"; + sha256 = "e559bcb6185d89502ac9e71a91f2e770be61cb67fa9957a097891ca6fe44a2f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/et/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/et/firefox-129.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4df5c019150b3b249e4195f0b05c7915ebf926b2974b826cc8981cfe2c25826b"; + sha256 = "472fa478b66f587f80d7dd51d40fd1ee54ef537cdf23fc92427c1c79a6452883"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/eu/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/eu/firefox-129.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a03fad5699ef511eaf559b09e367d925b58d0ff957437311c94cb94df2d93f23"; + sha256 = "fd8579deb8e1da9ecf3f812b2d5f00e507090e60c802bf77257f2281802ebf6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/fa/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fa/firefox-129.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "053fdef958292c6dcb7c9728996ed6894bd47ed341753511522a2d0adcccd839"; + sha256 = "bd65e4309b0db9bf919bea27487033573c5dda66fb62f2520688f449fb57e9d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ff/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ff/firefox-129.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "13a40fa059a32b5672e0256553e5479ec26c4b9377706a7166b4c1cf57cba26d"; + sha256 = "83c3edd356c40dc3cd52338a4ee32ea6e729758bff03ca2e4e2bd2d4aba3467f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/fi/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fi/firefox-129.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "35d630c1653f44572d7551aba688ac2dc758611af729c67223528f27fd7e9304"; + sha256 = "a179eadac35870ca98fe9bf16fff611efb8c62c0eb7091e1d55e5b8b9fdf4337"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/fr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fr/firefox-129.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0a833e57b55046dfd41e6bb735119b530037b5bb9f9117577461e4efb68eb38c"; + sha256 = "bc01513651247d50e3ae065e9ac3693d0e25ea10b00dbaaef09424b46ca843b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/fur/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fur/firefox-129.0.2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "71946454332a129b7043fa3b88c9f0540df80800874c456d404faef51de0e31f"; + sha256 = "b7dc66967c52c1cf817859110c1d15958787ddd8e0aef1ea46ae70c87167b7fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/fy-NL/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/fy-NL/firefox-129.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "9269ae1169786ac8efc91b6ba57427a4ebd670d1ef87d48fac08f6b7584c24d1"; + sha256 = "cc942b523199e81b5574b1a972fdc9cce2ec73bbf1efd88366aa6ace3c9e409c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ga-IE/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ga-IE/firefox-129.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fe380496de621bef00de491f72c567bf178215dece3a3ab7159bb4bde5928ed6"; + sha256 = "0efb2225b65df3640a690c6ca9e8d1c817b248b1ef0af8afe9175b4716b60215"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/gd/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gd/firefox-129.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "071955e7cd1f9d937be75e0489600af7b503b7c3296a5692406ff5ec6d45a6d3"; + sha256 = "15c9fea41632fd61e083d75538a76afe98ba09202ccbef44a9c1951fb99b1bb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/gl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gl/firefox-129.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "c8ab8ba081d1f5f96aac33774310b67b299b02d3923216485a27a7948f71e488"; + sha256 = "3e4f7dc67a9981c80859286c7f94da6b56e882d1706e1e6e56b97fc855b60891"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/gn/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gn/firefox-129.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "08c8cd20522a3830676946bca2fb465fff5caaf8bcd51ce26caeefeb353745bf"; + sha256 = "99ba85209d17c203fd51107249603e4a79a547da06fda6eb19a387e0ef41e93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/gu-IN/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/gu-IN/firefox-129.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "cac85e19c7014b833dc89c60fe7c1e809962b78016b1f31aed236f881958c0c1"; + sha256 = "912873aa4a734f25ca1f0aca946713a53c1c01b093b12d722fde673cc53c66b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/he/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/he/firefox-129.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "cd0c447b1003aa3dcfb93229e54f5aad6b340c0d5eb6d354fac6396a6ee7b8c4"; + sha256 = "21ce37a70f0ace5d15334e64633282f664161d58deb315ac48749cebab58a064"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/hi-IN/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hi-IN/firefox-129.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "e8c134ea251cc508f5883431208e7ebc220b2934af6d4c629916e75e7fb9df21"; + sha256 = "dc700ef62e264d0c493fe1ed6ff8d77672baca2bac5314e85dfb4ead137f09d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/hr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hr/firefox-129.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b51da7eed7a17356c0af0a4a53e307db7068aaf4be501dd59cc0c7c1ec1f24ce"; + sha256 = "2f23713521bf0e9ae4eea5e38ef653d6c16400d70979b648b23c7e913847380a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/hsb/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hsb/firefox-129.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "3186db39a2cca084d2fa88c70139b41f4c554b57131dd2283af8d2d5d1d17ec9"; + sha256 = "51436bdc094c6fa921e0f778cb5f4bfc866e7b6d25e76e096bd08d469e6d79cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/hu/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hu/firefox-129.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "186d71eba86305dbc4c4f89afca00d8ebccec09a8af9bb723e4134697ff0e0a0"; + sha256 = "3ad2f8847414dc2ed8b6c1016ffbbf50ade5d45a19a7a6e2b4d9e39a63f65610"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/hy-AM/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/hy-AM/firefox-129.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "924b0abfae0465e96eaa4db4ee792842d92bd9704ea66184cc72334f5be011de"; + sha256 = "ee64c6125a882e8f302162a2e08694b2ca95de1290b5b55e534887e6f50715d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ia/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ia/firefox-129.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e735d03acfba333dd799f2bfb81b7dcd56a81b5dc2d26764874ffa204746fed2"; + sha256 = "f9f2581bb3ec84ca3b0d8b1881fff420fece9fb9030afe4903e5984901223197"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/id/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/id/firefox-129.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "2b92a0e56c1d989423d21c25bafea44647f57f53555d81696ce4388d9df47aef"; + sha256 = "b01e61576471d473b052ae2f20c29b4966169735b0096d9703fc905768ea2531"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/is/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/is/firefox-129.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e9b92a4937c1bc01bfca6e16b8905f2414f5460c7db5fc9c95c3c0669e35cf97"; + sha256 = "7623c5cfececf30dc458b9255dcd5da7542c88a0e8a326958d9d61c107af41c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/it/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/it/firefox-129.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "75b889405a3c86704863219e1d9282b07a01ab08a0effb81ac358907423a193c"; + sha256 = "0003e065feab434db52441bb82c6f0e6d626e1040db41a289668866b58702a46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ja/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ja/firefox-129.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "2e7b1eafd838aa89cc1c6ddd73e705a3bbf3e0d20d3d6523ca7606dcf494e7da"; + sha256 = "8fa4cad993cb27a46c79359cc1670217ad8400731cc27ce7f537ec90b4ffe463"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ka/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ka/firefox-129.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bdf4dc10613ff34cd47c73b094c3a17eec262a9b5925a900aae421c6f235e436"; + sha256 = "7a939879bad4101419e50ae9611ed0efe5797917815324fc1593f94a5b714f1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/kab/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/kab/firefox-129.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "4bec2d6b6488238433fc69b709af0a87102aebef29efe15474c09946c3f57ebb"; + sha256 = "a4a5f2844042d923840b8b1b8602aef4473aa3a1e428ae59724d8fd66a68506d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/kk/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/kk/firefox-129.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "04467ace6a2d9729067a9ac5bb7e56f383e5724400a2a4c9a152c5e399d803ae"; + sha256 = "a543bb171815a378a494f0fb073506c11eeaed9d146be4a4893c908d75a233f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/km/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/km/firefox-129.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "b5141d12c89b1517b5ea394a64c58acf4825311cec4deb54e883e6d642eab472"; + sha256 = "9ff3c92904daa9ffac0b482ff1d3e06fa338fa50bdb0300cdae5ca3df00f0fd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/kn/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/kn/firefox-129.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "21e2200cbb2afbf0ecbe7e2149cf656140e757d4e8880c68055b1dc39f84348a"; + sha256 = "a584cf1df366a71f91ff04d8d4fd32f66b185387484b351b700017df8e07d5f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ko/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ko/firefox-129.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3bed5f6da768c0adf1bb9fdc9694b4709ddb13d6d843db75cc7528a16e4b7ad4"; + sha256 = "0bfd51544f5a9270d2538aff828d597f5a7ed94ce68daa11a0a008aea48f000e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/lij/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/lij/firefox-129.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "2f5d40d3de0c96ee726ea54acf26e321197107be34f2cc45fadc705c5a9c1d47"; + sha256 = "97e9897b42d43d583066c3874547337c812af1d1174fe138e3690b9fc9fe9dfe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/lt/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/lt/firefox-129.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "bf89bb850c1be3b5cac7c433688689e186b0af30bb3f70b2094a735d8db9d782"; + sha256 = "a32276d1a6a65974ec7119e9a0e27904f2d6faec540444d85b7cd1961635ac0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/lv/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/lv/firefox-129.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "87e9fd01c2cc1434bd64d48ec48e70f138364492c854923fd4b6497ba2547042"; + sha256 = "26b6e1a90c153e72485555ba26732c01a4a5370f189dc76408f4bd782630b611"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/mk/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/mk/firefox-129.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0ac5b8a2d702a66ce0b50f9d6a06597313221e6f00ba26696a4d65dad887ad93"; + sha256 = "9cd76a0b51d553f5363d368c4a8bd569c3f31e9fe53ea581fe5d477a3e2bb5a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/mr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/mr/firefox-129.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "3b8914fdfaa9bd4c91b0656c82934093a2ffcae6e88064914c9ffd83797ec89d"; + sha256 = "dbf225cea7dd46225862dafea1528ebf9af4a0c1c4376fd0286c388f93a9bb30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ms/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ms/firefox-129.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "8c1c009618e16b25ca81151e58e8452c3910768c0daa11863cd28e84c10027af"; + sha256 = "beb734692ef042eaae17eb7c64a44c661a903874056d2a755caa048f3e46582f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/my/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/my/firefox-129.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "44330a92af3e3c154e927223f24e4915ef1c093f47e4585aeff36c856e5e6dbd"; + sha256 = "55381b086e360f443db378432c93a48da06c969d78fbffe3a22b561b65a5697b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/nb-NO/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/nb-NO/firefox-129.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b725bf081fc02a851abdd6b7ac6910b8abae8a8dea39eaea169842ff32f6506b"; + sha256 = "652a27817bcf35537e30e642517c6b9f279fbb182bbfe0e1f3f2e7abce51dc80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ne-NP/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ne-NP/firefox-129.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "0d7bdd6a966c32758184bd125d5cbf311d694372ce88e47b8e0a9529eefbf628"; + sha256 = "cfde01a7c01ec8db923145faa1e84b521bdfd9edf9434602152aa6bc92e6b775"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/nl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/nl/firefox-129.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "81475f5d7fa4c7b45b4959cfa1c3e2114065ae79ff9f2509451634276bd1184c"; + sha256 = "c58291b410032f9dcece60a26740cec4189c807c6239d91eb01eccd0a769be65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/nn-NO/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/nn-NO/firefox-129.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8cfb5929ad86f0b0d1a275f5e7188695726879fff34b605a58f4622b6ee0852b"; + sha256 = "0e49abf506436444071eb4d9af919f36e93a2313e94409e505f2e2c102162e50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/oc/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/oc/firefox-129.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "824cf90cef8db0ea22e62dc3d94b68fe2f4fa11d36897defd578c8efbc5a563f"; + sha256 = "2e2eb99dff764537ebe36e47a0f161d343011f95075fef31e09d179ab821dfba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/pa-IN/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pa-IN/firefox-129.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "1cf5177e348635a36d18614a8a2d6ff523858c516a828a08f86073fc2982924e"; + sha256 = "d4480f5c7db7bf91ee783f5e5d35cf39168171549178e84b132c7d620027350c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/pl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pl/firefox-129.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "09b328d5a92d5c0443a17b6a465b41af4db8b49f2f37685b86da8695054d6bfe"; + sha256 = "5ad811e583c96a994813635cd24ff3dd9255509a313c4d12655038f913ff1542"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/pt-BR/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pt-BR/firefox-129.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "be9da9e5e16cb6f47960622af858467469036d3620e040d14dfe7a5fa9cc423e"; + sha256 = "9ffa73a862da1ea7c9ff6f92311db599f3fa3cddbbb80f6170e9921e203f0019"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/pt-PT/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/pt-PT/firefox-129.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f596acdda2cd57f39aaeab21f54101dc267df45faf9a32f0a05815b8089d3497"; + sha256 = "a0a91a30752179b0a47589e15542559b3e7aadd4d80c7ac235772b7a2b475c11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/rm/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/rm/firefox-129.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1d7c5ebcdd3f9e887437ac0d95058c0b4d7e28f5e8828cfd44dd030a95b309a5"; + sha256 = "dce6ad38b33d3d09627b940695fe09990dafed4014609d72ccccbb5ebf933f46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ro/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ro/firefox-129.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "86d5bd90306fb3a713f7a68b47bfbb413068c34c7e403d0f5fde64beef278539"; + sha256 = "17a41544e81ca30f8343767de18289ffa2d8a5ba0f5baf56c1604db51d890420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ru/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ru/firefox-129.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e62dbc742dd2070b2c42ae0dd96e1fdefc15f40eb3d9147b6924340730da5d58"; + sha256 = "62cc7f609a793f44de5ef69c4128f85fc8529a202dff06d2e13de7dba78792eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/sat/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sat/firefox-129.0.2.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "c02a4511f856172e03756ac696e9d197cf3929987f446b8c6164aa44ac8ad9fa"; + sha256 = "40d4987233506205ba542f34f548db58277811538d11cb5a9abe1ce190fcc56e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/sc/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sc/firefox-129.0.2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "429bd06e8bc4e4ae1ef1ff37770b079d4def70806a45e6b1f9e07aa97005653e"; + sha256 = "d866b09ab322517304ebd2dc3d3d3a74d0747577ed358dfdb63629c783248192"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/sco/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sco/firefox-129.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "2073f7919ef5e30a85fdb9e65c15048e29c5afc3215eb59abea82d4870a3e3ac"; + sha256 = "6e4492fd8138e436d6f7fefd9718a0a3cfd9eb6e6d82420b00567d133273c1ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/si/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/si/firefox-129.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "715431f817d2dcfb7fd0f401549b18c8880f27290de9a00ba294d71590ae66c5"; + sha256 = "7ee7f72dcabe2ca171fa940b236fe3000d989a506eb04c780137c403bed53f21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/sk/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sk/firefox-129.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "17748b26ac166a7c3f2fadb5dd224c1056b5fa904cf295f24cb5478654726920"; + sha256 = "4d4c2c45efa3aa54b5ec6e137f0fb8b92059f5c7eae3ee5b56a857e093ed816d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/skr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/skr/firefox-129.0.2.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "fa60e65ff92b2c39a0bd1cf65a7bb083ae0008023c4bcfccfeaf3af554a3a6ff"; + sha256 = "cfe7864e3d2b2a621f42784ca5d8be3414e757c56e401a687fb32a6be6180c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/sl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sl/firefox-129.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "fafa0957d1205efad8028378331e18799b08d1ae2f2e21531b13cc3d44bfef30"; + sha256 = "73af554b3cd3e2782c56df579b5254c0658895cf5c3e6e5c18f9911047cc45d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/son/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/son/firefox-129.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3db9e0fa16493f758e26cfec97b44ddae18f9906723b340c2b4682556b1a1134"; + sha256 = "1e67654241341f4fa4092737183ed0c16affdcf9612a068a89f55497d05c17fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/sq/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sq/firefox-129.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0defd57e62a5b61b36ac9801077f26aa5170ff9a12635752f518c9c169bef47c"; + sha256 = "b9325457af48f36bb3cc1521e64add9524c95010e6fc44a7976170b5efd5fa71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/sr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sr/firefox-129.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "32472cf260859d65e10afbc5ddb9f353d52989546493bd88925053f6953aa4c7"; + sha256 = "2e107a9e262256947ec2864bcd02b9a479de4b5fbb29ca4e978feb54fb515470"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/sv-SE/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/sv-SE/firefox-129.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d14270bfff44a3bd43a2f75bd875a9df749233de1301f282725184113e06293f"; + sha256 = "91d8e8092ee35a790778a8ff8f89c12fda000ada0b27476de2ec5b9f7dc6ebe1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/szl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/szl/firefox-129.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d54a4d1cf68099e3d0f086f3bdcf4062925f6184f2dbd73f66d1feaa340b002e"; + sha256 = "a929fa6e7742ed2e37dc86162f6982c32e99487fd7763e56a17736ea3e390256"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ta/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ta/firefox-129.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "a7caa1166fb11badbf7edc903420c668e4cf2a4c00dd656a9cf5a8407ab068d5"; + sha256 = "b7af5e9cf3240b6a30da249c2d0209907cce342c0f48d433ec8ff9cf72c3d468"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/te/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/te/firefox-129.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "aef3180a5b8296845214058145a67b23d6644998a1fc6737465efbaac8f739fd"; + sha256 = "d9ced92020305d6a641ca6190bfc808bd83e8cd43decfa49f22c1fb03f4a7861"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/tg/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/tg/firefox-129.0.2.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "77fa055e9c51fb9180fcc383ce2f787db0cb7a18e2a3a9f1174b665fb10b1fe7"; + sha256 = "7ea19763f02ce91015f3701d3ea7fcc4e1a1f22743c035a8bc6beae2f9b5bbaf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/th/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/th/firefox-129.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8de0f7b49aee80568dcd7b5d6d8d3ba825549f9fca46f82121d9226928abc3fc"; + sha256 = "b8e82d0d1e810e3c6dce35cdde6b38e2b8187bbe2d8edb4281088bfa74b197f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/tl/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/tl/firefox-129.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ccc69a903013497c9a17a97829f1cbe47cb32ef321b4243e71adb76763c8d354"; + sha256 = "a7d0fd082f86b21267f82ef068d2965f090d6c050243f94c28c812cf3052f3fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/tr/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/tr/firefox-129.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "996adca8a6e9088d4658706f9ba9e6bd12096486a2200ad3886b5b5067c158f3"; + sha256 = "cde9e1a2ab04e9bdc2d72ca6f69abeb3b5838d85e81aa58d1fc766c0b4de9f16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/trs/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/trs/firefox-129.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "3db160ce39190ea6b8f9252ffb406d028ecec531700cf133510193442026cc15"; + sha256 = "344c0f7dfe6fbc08cb7c9008b148c78f1fd04c35411b7a6530526a2b2285c683"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/uk/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/uk/firefox-129.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7e45e9e42afef40baa1ace5ef51c7a5b1f251817b46fb70b64516885e38107ef"; + sha256 = "3bd0777c7028bb9bfd891afd60238777c073c27c60229183b8dc003bed50ed3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/ur/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/ur/firefox-129.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "b28749d81213ac782a356f3803ec9e65feef42131ccfa319cf8f38f0e479d0ea"; + sha256 = "afeba739025b7dd656ca6f68fce268efac3c6e0bd7cc47ab6f62d95dfbd7a3a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/uz/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/uz/firefox-129.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c99ef9182f81bdc8b70c1a99b47177abd7ddab068674563bed2f186f9fbf16cd"; + sha256 = "4a068543bb839af64e3fccd5e299d5ae01033ac0b6617fad7749088b59fbd166"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/vi/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/vi/firefox-129.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ad59ceefb5226e935f14820f9728b58d1eb2716f8730cb22f37b691ec72094e2"; + sha256 = "5f1b0a92d3504db44f5a9727b6e899bc0866cb96959e9d4a051016cf0b38249a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/xh/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/xh/firefox-129.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "fcac6918cd14258e51b3aaf64bbcab68093e3c28c8f5c37e872e5ee638522c9f"; + sha256 = "98bb156006acb8953ef64da46b20ae7c599338900124ce8becc352f42a763cc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/zh-CN/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/zh-CN/firefox-129.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "bad64328c0755a3acbcc02b415851493ac8f76952f187c7652393b25da4ca278"; + sha256 = "120ae812950335df8bbab9864d9938d83834fc81b38f9d49d12f66e173255969"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.1/linux-i686/zh-TW/firefox-129.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0.2/linux-i686/zh-TW/firefox-129.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "063df0a50a051b8f240a020267ac40dc8998e9857145a7ce474a5ebb1732933c"; + sha256 = "e8b4fafa98e812b0f483a861ac175be2324773cb91c2abe9f724d78596ebb17e"; } ]; } From 1693e37254ac5717f14bdef6b842449812e44794 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 13:09:44 +0000 Subject: [PATCH 205/233] helm-ls: 0.0.20 -> 0.0.21 --- pkgs/development/tools/language-servers/helm-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 0a671ed2bac8..e160042d35f1 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.20"; + version = "0.0.21"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-E2I4gEcJQ1NJqpN5rJGyFuj/KfjJC4bG/5Ei9gjIKCY="; + hash = "sha256-O30gdcQdNjKADraPCltTjNglztz37CVx+fUeoVI3/O8="; }; - vendorHash = "sha256-jGC8JNlorw0FSc0HhFdUVZJDCNaX4PWPaFKRklufIsQ="; + vendorHash = "sha256-AWKCE2BZGVYcr6Pe8URQo11Xnr3sfgWWkm9v7vvILOo="; nativeBuildInputs = [ installShellFiles ]; From 20a57578242cb89dfe1f145da12920c150bc1835 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:20:33 +0200 Subject: [PATCH 206/233] element-desktop: 1.11.74 -> 1.11.75 Fixes for CVE-2024-42369 / GHSA-vhr5-g3pm-49fm https://github.com/element-hq/element-desktop/releases/tag/v1.11.75 --- .../networking/instant-messengers/element/pin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 5d5fecf55477..2387b6ce5db6 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.74"; + "version" = "1.11.75"; "hashes" = { - "desktopSrcHash" = "sha256-RKDwtoad8gP1fAjkg2+6BJj6z8SqYk1ddG7wQ9wI1XQ="; + "desktopSrcHash" = "sha256-bO23E1xG3FfizBBAWh0kCN+5JYbiX5V/wxLlY6ljWVQ="; "desktopYarnHash" = "0bl78yd7apd5qbsqyhxnwj7lwrjx5820zh22rzgn9jqkcv25jwgw"; - "webSrcHash" = "sha256-5Tujhqias3+k4BgQbO8R0toHlKQcAywG2MWBZX1SVOM="; - "webYarnHash" = "06wmzxsc0iijrz017lb40nydb05n8ckmin2rrwiw25bl8ywfw0qr"; + "webSrcHash" = "sha256-cDayCoznbmALOiPg9FUYrfdFjzg0NV1NY9/b2KzTvMs="; + "webYarnHash" = "04si1x663z70nxj6nfaq7m2wcd8r4l3vdpirnjhc13wrj1kb8r8x"; }; } From de456377fe524480d8318233cef5e1f250a7f4d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 13:25:47 +0000 Subject: [PATCH 207/233] mdbook-d2: 0.3.0 -> 0.3.1 --- pkgs/by-name/md/mdbook-d2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index c36a099b79c9..8b30e7fea45c 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-d2"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "danieleades"; repo = "mdbook-d2"; rev = "v${version}"; - hash = "sha256-IkMydlmUQrZbOZYzQFxzROhdwlcO0H6MzQo42fBEYQE="; + hash = "sha256-5/vChjSYMlCcieA10jncoXZw9Gpeol+Am7mUo78Zqho="; }; - cargoHash = "sha256-xc00/FOQtAg2u8bZxaTbk8+gX7r+q9O8DKgWchPnOJc="; + cargoHash = "sha256-lZ92vvRYXEBMx6ka8RP1wXctf73QNp5rNE8n7O96AEc="; doCheck = false; buildInputs = lib.optionals stdenv.isDarwin [ From 8fb69d99c0d34f479096613440895367a05cc8eb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 Aug 2024 15:55:03 +0200 Subject: [PATCH 208/233] zed-editor: disable auto-updates --- pkgs/by-name/ze/zed-editor/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 91f14aafafcf..4019236fa14f 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -125,6 +125,9 @@ rustPlatform.buildRustPackage rec { "${src}/assets/fonts/zed-sans" ]; }; + # Setting this environment variable allows to disable auto-updates + # https://zed.dev/docs/development/linux#notes-for-packaging-zed + ZED_UPDATE_EXPLANATION = "zed has been installed using nix. Auto-updates have thus been disabled."; }; RUSTFLAGS = if withGLES then "--cfg gles" else ""; From 31d6f7806b07b235f34f835ce178e065af140d53 Mon Sep 17 00:00:00 2001 From: e1mo Date: Fri, 16 Aug 2024 16:21:55 +0200 Subject: [PATCH 209/233] maintainers: update information for e1mo --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a02b6f0be78f..edf16f101d09 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5628,7 +5628,7 @@ matrix = "@e1mo:chaos.jetzt"; github = "e1mo"; githubId = 61651268; - name = "Moritz Fromm"; + name = "Nina Fromm"; keys = [ { fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; } ]; }; eadwu = { From 0669be90824575c6dde136f52032538b6ae19a69 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 20 Aug 2024 07:38:41 -0700 Subject: [PATCH 210/233] nixVersions.nix_2_24: 2.24.2 -> 2.24.3 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c4e3ea95536f..cc9b6eb3850d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -185,8 +185,8 @@ in lib.makeExtensible (self: ({ }; nix_2_24 = (common { - version = "2.24.2"; - hash = "sha256-ne4/57E2hOeBIc4yIJkm5JDIPtAaRvkDPkKj7pJ5fhg="; + version = "2.24.3"; + hash = "sha256-aBuGXm0UwDekCYLl7xDyw+BAJOg7728i57TbSXzPacc="; self_attribute_name = "nix_2_24"; }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: From f39985a8bd199607272e437bd39dc15e7b305ed1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 Aug 2024 16:52:24 +0200 Subject: [PATCH 211/233] pylyzer: 0.0.59 -> 0.0.61 Diff: https://github.com/mtshiba/pylyzer/compare/refs/tags/v0.0.59...v0.0.61 Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.61 --- pkgs/by-name/py/pylyzer/Cargo.lock | 104 ++++++++++++++++++++++++---- pkgs/by-name/py/pylyzer/package.nix | 4 +- 2 files changed, 94 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/py/pylyzer/Cargo.lock b/pkgs/by-name/py/pylyzer/Cargo.lock index 7f4fe640cd5f..e8e4f697e531 100644 --- a/pkgs/by-name/py/pylyzer/Cargo.lock +++ b/pkgs/by-name/py/pylyzer/Cargo.lock @@ -85,6 +85,12 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + [[package]] name = "byteorder" version = "1.5.0" @@ -139,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.54-nightly.2" +version = "0.1.54-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d774d511ed129b8438a9633b17f3303768fa7a3941372c1650e61a7bc7b00c" +checksum = "bdc6282121d9e2871553e0731cfb88119cbfe76ce8aab08ac2be01f5644e3bee" dependencies = [ "erg_common", "erg_compiler", @@ -153,9 +159,9 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.42-nightly.2" +version = "0.6.42-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b084d80afdb59d10d300595b2860868e52d1a0a72ad98ac995c9f5abfba9acd8" +checksum = "c0dfc622cc65f230a05a284a21f62c8f4a3c964c51c97881cc4e01202ef2a3c0" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -165,9 +171,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.42-nightly.2" +version = "0.6.42-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805b009c668055c8d72d11f8b26853c9a65a2744548909beda8b32bd4058a375" +checksum = "42247c4ab1eb33ed3e2e9e74f4773565eba4491f76bfbda4b965015938704ca1" dependencies = [ "erg_common", "erg_parser", @@ -175,9 +181,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.42-nightly.2" +version = "0.6.42-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec4f2cc69904baae639ff154323d1cc0e100ca2785bfb6d8c392c88e0560771" +checksum = "6c921c178517c2071e45418e8c5b35e0c3a19021e4459283fd8f6997b89ba216" dependencies = [ "erg_common", "erg_proc_macros", @@ -186,9 +192,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.42-nightly.2" +version = "0.6.42-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6234abaef2fed929391add7520409890b2b7ee7029f2a5dcb9c2f4905bb7556b" +checksum = "c1381ca7a7a0781834cb1d617cd8361cca23f880cb9c515d249905d585832734" dependencies = [ "quote", "syn 1.0.109", @@ -554,7 +560,7 @@ dependencies = [ [[package]] name = "py2erg" -version = "0.0.59" +version = "0.0.61" dependencies = [ "erg_common", "erg_compiler", @@ -564,9 +570,18 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.59" +version = "0.0.61" dependencies = [ "els", + "erg_common", + "erg_compiler", + "pylyzer_core", +] + +[[package]] +name = "pylyzer_core" +version = "0.0.61" +dependencies = [ "erg_common", "erg_compiler", "py2erg", @@ -574,6 +589,16 @@ dependencies = [ "rustpython-parser", ] +[[package]] +name = "pylyzer_wasm" +version = "0.0.61" +dependencies = [ + "erg_common", + "erg_compiler", + "pylyzer_core", + "wasm-bindgen", +] + [[package]] name = "quote" version = "1.0.36" @@ -968,6 +993,61 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.74", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + [[package]] name = "windows-targets" version = "0.52.6" diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 771304ce0bb5..0aa0865c97da 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.59"; + version = "0.0.61"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-8XwNdxPREqrmd3IoD+Z/uTEGs3Qk6+vGa4S+6qje1Ic="; + hash = "sha256-t0BzNNofjeBlNqf6iqaWrTzVpzEACyyrZ3YKDYz713U="; }; cargoLock = { From e3b1986b0b18bdb0729bc821da735d6883b572ed Mon Sep 17 00:00:00 2001 From: RoyDubnium <72664566+RoyDubnium@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:02:03 +0100 Subject: [PATCH 212/233] qdiskinfo: change pname to lowercase --- pkgs/by-name/qd/qdiskinfo/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix index 41ad61351127..5105e6c30a1c 100644 --- a/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "QDiskInfo"; + pname = "qdiskinfo"; version = "0.3"; src = fetchFromGitHub { From 6bd20c45887f2bb347c592e3a16616140cd52f84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 15:19:57 +0000 Subject: [PATCH 213/233] python312Packages.aiolifx: 1.0.6 -> 1.0.8 --- pkgs/development/python-modules/aiolifx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index c4421a071f5a..5811fc2344c7 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.0.6"; + version = "1.0.8"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DA949hZogSY3KkLSeILvB5Ay6rXZoLe8ndbOtagTtvM="; + hash = "sha256-GbChqlBOcrDvzwrY0Vd6TTqPOhUjKbcYtULdQDVsY2o="; }; build-system = [ setuptools ]; From 80f5ff1862a8f9f29abf751ad7adb4b2711d1c13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 15:22:11 +0000 Subject: [PATCH 214/233] python312Packages.blebox-uniapi: 2.4.2 -> 2.5.0 --- pkgs/development/python-modules/blebox-uniapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index bf1b15ffcd63..ae3a63ac3ce8 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.4.2"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-/NXAyEv4RR12/aoSodKiexKlC83GB1YQVAii8vf6U8c="; + hash = "sha256-johTs1AGvC6mGasK87ijhBNbHb1m36Ep9TR8XPG35d0="; }; postPatch = '' From 8e8472a8e0f9700939617239e35100ea0f307bed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 15:35:01 +0000 Subject: [PATCH 215/233] python312Packages.meilisearch: 0.31.4 -> 0.31.5 --- pkgs/development/python-modules/meilisearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 9af00cebb90b..59252dddc7c1 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.31.4"; + version = "0.31.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+1VqnAIqiLaPl75dH4tf3/GFRuwkSrKpqOcv9dGYsb8="; + hash = "sha256-br+FnUnwDt64dvZAMEK/oqESCWZuOUt9Lp9HGcIPqxc="; }; build-system = [ setuptools ]; From 628f796c5a22b111b0b96957f078fb78ac0cbe7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 16:38:24 +0000 Subject: [PATCH 216/233] python312Packages.withings-sync: 4.2.4 -> 4.2.5 --- pkgs/development/python-modules/withings-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix index 638369a3314e..8de6f43c85d3 100644 --- a/pkgs/development/python-modules/withings-sync/default.nix +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "withings-sync"; - version = "4.2.4"; + version = "4.2.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jaroslawhartman"; repo = "withings-sync"; - rev = "refs/tags/v.${version}"; - hash = "sha256-nFYEtQob3x6APWDKCVP5p+qkKmgvXIcmegp/6ZRbDQA="; + rev = "refs/tags/v${version}"; + hash = "sha256-4gxJwe8v4trTysGBNORX7C54EUzFIPwpVLfKSNxJ8y4="; }; nativeBuildInputs = [ setuptools ]; From e81c8b13bfd27afac2602ae656b467185f3221e1 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 25 Jul 2024 12:46:06 +0200 Subject: [PATCH 217/233] gitlab: 17.2.0 -> 17.2.1 https://gitlab.com/gitlab-org/gitlab/-/blob/v17.2.1-ee/CHANGELOG.md https://about.gitlab.com/releases/2024/07/24/patch-release-gitlab-17-2-1-released/ Fixes CVE-2024-0231 Fixes CVE-2024-5067 Fixes CVE-2024-7057 --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../version-management/gitlab/gitaly/git.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index bf4eca6edb5f..656c510fd8a9 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.0", - "repo_hash": "0g3g0nwxwv0h7i49qlv1835n9gh0cw8hikms62jl89nv1ca833yr", + "version": "17.2.1", + "repo_hash": "0bn5pz1rvnzvjm4yxpz651cz3zvar1mwd8wjxi0c34bv631g7903", "yarn_hash": "119acrb27gpmh4m6vk917y4djfm9319jnys0mrqj183diw8j3zcn", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.0-ee", + "rev": "v17.2.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.0", - "GITLAB_PAGES_VERSION": "17.2.0", + "GITALY_SERVER_VERSION": "17.2.1", + "GITLAB_PAGES_VERSION": "17.2.1", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.0" + "GITLAB_WORKHORSE_VERSION": "17.2.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index f41248123934..973723f8f99e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "17.2.0"; + version = "17.2.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,7 +20,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-thQ8Gufcygt3QEbIcmkroSuAky9kJ7f7hupim87AJdE="; + hash = "sha256-X4ZkeVwuyiFNucqH6zI9slegvrFksu9Ve6rRNoNy9TI="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; diff --git a/pkgs/applications/version-management/gitlab/gitaly/git.nix b/pkgs/applications/version-management/gitlab/gitaly/git.nix index b80f5de40668..a6d272b2fbb7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/git.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/git.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gitaly-git"; - version = "2.44.1.gl1"; + version = "2.44.2.gl1"; # `src` attribute for nix-update src = fetchFromGitLab { owner = "gitlab-org"; repo = "git"; rev = "v${version}"; - hash = "sha256-1XtzM2dYbt3nsYOm5isgHnolfziyIC9yCTkfLJ95V6Y="; + hash = "sha256-VIffbZZEbGjVW1No8zojSQlX/ciJ2DJnaogNlQtc77o="; }; # we actually use the gitaly build system diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 5b75abd4c2d1..7453dae1d339 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.0"; + version = "17.2.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-Rw78xDkOf/LDINsWqNGkMSjUXkbgVlSI6PTiZLHo2Wo="; + hash = "sha256-4viJD8i+9vVPQISpGB9tZFqCk/LonfcPZy9uYoDu3Qw="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 32db49747235..937c3a2736b8 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.2.0"; + version = "17.2.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { From a4ea8e7033e1bd234f2552790e0b987f4507aac7 Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 19 Aug 2024 12:37:38 +0200 Subject: [PATCH 218/233] gitlab: 17.2.1 -> 17.2.2 https://about.gitlab.com/releases/2024/08/07/patch-release-gitlab-17-2-2-released/ https://gitlab.com/gitlab-org/gitlab/-/blob/v17.2.2-ee/CHANGELOG.md Fixes CVE-2024-2800 Fixes CVE-2024-3035 Fixes CVE-2024-3114 Fixes CVE-2024-3958 Fixes CVE-2024-4207 Fixes CVE-2024-4210 Fixes CVE-2024-4784 Fixes CVE-2024-5423 Fixes CVE-2024-6329 Fixes CVE-2024-6356 Fixes CVE-2024-7586 --- .../version-management/gitlab/data.json | 14 +++++++------- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 2 +- .../version-management/gitlab/rubyEnv/gemset.nix | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 656c510fd8a9..60ef72756c34 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.1", - "repo_hash": "0bn5pz1rvnzvjm4yxpz651cz3zvar1mwd8wjxi0c34bv631g7903", - "yarn_hash": "119acrb27gpmh4m6vk917y4djfm9319jnys0mrqj183diw8j3zcn", + "version": "17.2.2", + "repo_hash": "1gk29bwd6vzikjg28p30wgdq9a46l4qbnac5r0h2mwih1sm8hlbc", + "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.1-ee", + "rev": "v17.2.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.1", - "GITLAB_PAGES_VERSION": "17.2.1", + "GITALY_SERVER_VERSION": "17.2.2", + "GITLAB_PAGES_VERSION": "17.2.2", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.1" + "GITLAB_WORKHORSE_VERSION": "17.2.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 973723f8f99e..ab137a045933 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "17.2.1"; + version = "17.2.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,7 +20,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-X4ZkeVwuyiFNucqH6zI9slegvrFksu9Ve6rRNoNy9TI="; + hash = "sha256-4K0unlvhAnTIiuyRUNm0dXG5sJsxIuo8HkUQvUK7ws4="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 7453dae1d339..5c934a5afc83 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.1"; + version = "17.2.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-4viJD8i+9vVPQISpGB9tZFqCk/LonfcPZy9uYoDu3Qw="; + hash = "sha256-AtLsy2hHxqr3XyTItLfMoTmrUsM707Kme7jE2jAAfyc="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 937c3a2736b8..77ba5813469d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.2.1"; + version = "17.2.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 3a520314aa47..f8d33908e6ca 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -2279,4 +2279,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.11 + 2.5.16 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 10c3460eded1..325a467cd624 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2789,7 +2789,7 @@ src: version = "1.45.0"; }; google-protobuf = { - groups = ["default"]; + groups = ["default" "development" "opentelemetry" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; From 08d4eb0924a7bcb352c717cd310075d906924c4d Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 19 Aug 2024 12:38:42 +0200 Subject: [PATCH 219/233] gitlab-container-registry: 4.6.0 -> 4.7.0 https://gitlab.com/gitlab-org/container-registry/-/blob/v4.7.0-gitlab/CHANGELOG.md --- .../gitlab/gitlab-container-registry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index b13c9a12706d..6d1a3ba1a192 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.6.0"; + version = "4.7.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-rFojpy8xUXhlzBFBYFW3+AjDI5efaNWh+Vi3wsqVebI="; + hash = "sha256-+71mqnXRMq0vE+T6V/JqIhP//zldQOEK7694IB5RSnc="; }; - vendorHash = "sha256-xhy0WSqdlri5bckIeS6CSeyZGf3pBNpLElkvsMm6N48="; + vendorHash = "sha256-h4nLnmsQ52PU3tUbTCUwWN8LbYuSgzaDkqplEZcDAGM="; postPatch = '' # Disable flaky inmemory storage driver test From 6315afab1b8ed70c6a80e017d5c5a483ccb5c6fc Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Tue, 20 Aug 2024 19:27:22 +0200 Subject: [PATCH 220/233] php.packages.castor: switch to `buildComposerProject2` --- pkgs/development/php-packages/castor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 04b45a5961de..b9831c854a6d 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -7,7 +7,7 @@ testers, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "castor"; version = "0.17.1"; @@ -18,7 +18,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-ng32vuGlGffpkzf3hXu0sNbj0PCDu4DpZnMnbDV9pZk="; }; - vendorHash = "sha256-E2NMWuUQXQ96NbKrcFnFGlxWR0tkd56MXk1bCL0N/sE="; + vendorHash = "sha256-0aDT0hPhoPl0U/QbstiGmUHaqDdQb1ReY2hy9FEnzwM="; nativeBuildInputs = [ installShellFiles ]; From bceb4c8c8cfe1ee710c729d5411d6cdb9514f0c8 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Tue, 20 Aug 2024 19:51:03 +0200 Subject: [PATCH 221/233] php.packages.deployer: switch to `buildComposerProject2` --- pkgs/development/php-packages/deployer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/deployer/default.nix b/pkgs/development/php-packages/deployer/default.nix index 5fc8cc5679df..b0065f7674eb 100644 --- a/pkgs/development/php-packages/deployer/default.nix +++ b/pkgs/development/php-packages/deployer/default.nix @@ -4,7 +4,7 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "deployer"; version = "7.4.0"; @@ -15,7 +15,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-nSrW4o0Tb8H056AAjjMzbsAVvWY2z1pdWmPFZDpDr1k="; }; - vendorHash = "sha256-BDq2uryNWC31AEAEZJL9zGaAPbhXZ6hmfpsnr4wlixE="; + vendorHash = "sha256-pUZoQV1CVErnsSu6jVNOJROqBZZ4xymKXm25GW67HmM="; meta = { changelog = "https://github.com/deployphp/deployer/releases/tag/v${finalAttrs.version}"; From 845e89f31d35c6a5bfcdf40aea11574d5ca54276 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 17:58:11 +0000 Subject: [PATCH 222/233] rasm: 2.2.5 -> 2.2.6 --- pkgs/by-name/ra/rasm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index 5e79bb7ae9b8..e31e4c0354a2 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-m2XRi9RF089dBpkwcu/zgmd3XnBF4uJU5B4ec4WJ36I="; + hash = "sha256-DX+i9G+HK0Iek6qmsYQFbieHUtRazKkcyv+gYQ748X0="; }; # by default the EXEC variable contains `rasm.exe` From cc3c7ed91d6dd246ed9a44f108281a75e4d3daf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 18:07:07 +0000 Subject: [PATCH 223/233] python312Packages.qbittorrent-api: 2024.7.64 -> 2024.8.65 --- pkgs/development/python-modules/qbittorrent-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index 920c3e08c4a7..a299e2caa3ba 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2024.7.64"; + version = "2024.8.65"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-tHYoM4f6EfEX6LXhqHXPvYtiqd8WDFwwzkE0/A8CwmM="; + hash = "sha256-lC31v6WLNk0RZDFz1GOlqrd2kAijTHffZ7NsUsm2vAk="; }; propagatedBuildInputs = [ From 711c7c827f9a2d1f844bced7ea53213c3f4a2271 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Aug 2024 20:11:14 +0200 Subject: [PATCH 224/233] python312Packages.withings-sync: refactor --- pkgs/development/python-modules/withings-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix index 8de6f43c85d3..8f1468ab3993 100644 --- a/pkgs/development/python-modules/withings-sync/default.nix +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -24,9 +24,9 @@ buildPythonPackage rec { hash = "sha256-4gxJwe8v4trTysGBNORX7C54EUzFIPwpVLfKSNxJ8y4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ garth lxml python-dotenv @@ -37,10 +37,10 @@ buildPythonPackage rec { meta = with lib; { description = "Synchronisation of Withings weight"; - mainProgram = "withings-sync"; homepage = "https://github.com/jaroslawhartman/withings-sync"; changelog = "https://github.com/jaroslawhartman/withings-sync/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "withings-sync"; }; } From 21ce51cca3b612024cc9653eecf58b589894b24a Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Tue, 20 Aug 2024 20:29:34 +0200 Subject: [PATCH 225/233] phpactor: switch to `buildComposerProject2` --- pkgs/by-name/ph/phpactor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 97a02d0e2cb5..dbd86adc44cc 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -5,7 +5,7 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; version = "2024.06.30.0"; @@ -16,7 +16,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-QcKkkgpWWypapQPawK1hu+6tkF9c5ICPeEPWqCwrUBM="; }; - vendorHash = "sha256-onUhRO6d2osf7n5QlYY86eamlCCslQMVltAv1shskgI="; + vendorHash = "sha256-Q72EeGeVqjaOZeW8VAB59OY0E/wvL8Ljq/9XC4iK/rg="; nativeBuildInputs = [ installShellFiles ]; From 9f58544a2573ae0aca6c7231a44626d5114515a6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 20 Aug 2024 21:30:35 +0200 Subject: [PATCH 226/233] Revert "thorium-browser: init at 120.0.6099.235" --- pkgs/by-name/th/thorium-browser/package.nix | 173 -------------------- 1 file changed, 173 deletions(-) delete mode 100644 pkgs/by-name/th/thorium-browser/package.nix diff --git a/pkgs/by-name/th/thorium-browser/package.nix b/pkgs/by-name/th/thorium-browser/package.nix deleted file mode 100644 index 15d3d687ce57..000000000000 --- a/pkgs/by-name/th/thorium-browser/package.nix +++ /dev/null @@ -1,173 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - autoPatchelfHook, - dpkg, - wrapGAppsHook, - alsa-lib, - at-spi2-atk, - at-spi2-core, - cairo, - cups, - curl, - dbus, - expat, - ffmpeg, - fontconfig, - freetype, - glib, - glibc, - gtk3, - gtk4, - libcanberra, - liberation_ttf, - libexif, - libglvnd, - libkrb5, - libnotify, - libpulseaudio, - libu2f-host, - libva, - libxkbcommon, - mesa, - nspr, - nss, - pango, - pciutils, - pipewire, - qt6, - speechd, - systemd, - udev, - _7zz, - vaapiVdpau, - vulkan-loader, - wayland, - wget, - xdg-utils, - xfce, - xorg, -}: -stdenv.mkDerivation rec { - pname = "thorium-browser"; - version = "120.0.6099.235"; - - src = fetchurl { - url = "https://github.com/Alex313031/thorium/releases/download/M${version}/thorium-browser_${version}_amd64.deb"; - hash = "sha256-UQqYXlkjXuZ3Vkcie0SNp4AMnBjemavW2G7dKGTxVAc="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - wrapGAppsHook - qt6.wrapQtAppsHook - ]; - - buildInputs = [ - stdenv.cc.cc.lib - alsa-lib - at-spi2-atk - at-spi2-core - cairo - cups - curl - dbus - expat - ffmpeg - fontconfig - freetype - glib - glibc - gtk3 - gtk4 - libcanberra - liberation_ttf - libexif - libglvnd - libkrb5 - libnotify - libpulseaudio - libu2f-host - libva - libxkbcommon - mesa - nspr - nss - qt6.qtbase - pango - pciutils - pipewire - speechd - udev - _7zz - vaapiVdpau - vulkan-loader - wayland - wget - xdg-utils - xfce.exo - xorg.libxcb - xorg.libX11 - xorg.libXcursor - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXxf86vm - ]; - - # Needed to make the process get past zygote_linux fork()'ing - runtimeDependencies = [ - systemd - ]; - - autoPatchelfIgnoreMissingDeps = [ - "libQt5Widgets.so.5" - "libQt5Gui.so.5" - "libQt5Core.so.5" - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out - cp -vr usr/* $out - cp -vr etc $out - cp -vr opt $out - ln -sf $out/opt/chromium.org/thorium/thorium-browser $out/bin/thorium-browser - substituteInPlace $out/share/applications/thorium-shell.desktop \ - --replace /usr/bin $out/bin \ - --replace /opt $out/opt - substituteInPlace $out/share/applications/thorium-browser.desktop \ - --replace /usr/bin $out/bin \ - --replace StartupWMClass=thorium StartupWMClass=thorium-browser \ - --replace Icon=thorium-browser Icon=$out/opt/chromium.org/thorium/product_logo_256.png - addAutoPatchelfSearchPath $out/chromium.org/thorium - addAutoPatchelfSearchPath $out/chromium.org/thorium/lib - substituteInPlace $out/opt/chromium.org/thorium/thorium-browser \ - --replace 'export LD_LIBRARY_PATH' "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${lib.makeLibraryPath buildInputs}:$out/chromium.org/thorium:$out/chromium.org/thorium/lib" - makeWrapper "$out/opt/chromium.org/thorium/thorium-browser" "$out/bin/thorium-browser" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - runHook postInstall - ''; - - postPatchMkspecs = '' - substituteInPlace $out/bin/..thorium-shell-wrapped-wrapped \ - --replace /opt $out/opt - ''; - - meta = with lib; { - description = "Compiler-optimized Chromium fork"; - homepage = "https://thorium.rocks"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ rgri ]; - license = licenses.bsd3; - platforms = ["x86_64-linux"]; - mainProgram = "thorium-browser"; - }; -} From dc7379e04f7fa74da6a19364994467e94db61381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 13 Aug 2024 09:11:02 +0200 Subject: [PATCH 227/233] nixos/ups: restart upsdrv.service on config changes Or else new configuration won't take effect until the next boot (or if the user manually restarts the service). --- nixos/modules/services/monitoring/ups.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 35a2d61da1de..359cb9085fcf 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -560,6 +560,9 @@ in }; environment.NUT_CONFPATH = "/etc/nut"; environment.NUT_STATEPATH = "/var/lib/nut"; + restartTriggers = [ + config.environment.etc."nut/ups.conf".source + ]; }; environment.etc = { From ad938385453836eba5829f8cbec458e57c846899 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 20:38:01 +0000 Subject: [PATCH 228/233] python312Packages.homeassistant-stubs: 2024.8.1 -> 2024.8.2 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index d0505688b484..003905fd954c 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.8.1"; + version = "2024.8.2"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-/zhTPS3x1SSMAfxhUo+IzvuHBrSCnezw8YxgJc0adTU="; + hash = "sha256-ey1fglgyD7peGdBBD9fO9BWN48u+C+hYmTyh84FwYMY="; }; build-system = [ From 8031eccf5c0d2489817eb76e6e7ba83773b70736 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 Aug 2024 22:54:55 +0200 Subject: [PATCH 229/233] uv: 0.2.37 -> 0.3.0 Diff: https://github.com/astral-sh/uv/compare/refs/tags/0.2.37...0.3.0 Changelog: https://github.com/astral-sh/uv/blob/refs/tags/0.3.0/CHANGELOG.md --- pkgs/by-name/uv/uv/Cargo.lock | 171 ++++++++++++++++++++------------- pkgs/by-name/uv/uv/package.nix | 8 +- 2 files changed, 108 insertions(+), 71 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index ca443cb85ca1..8f6662462218 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -226,7 +226,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -388,12 +388,12 @@ name = "bench" version = "0.0.0" dependencies = [ "anyhow", - "chrono", "codspeed-criterion-compat", "criterion", "distribution-filename", "distribution-types", "install-wheel-rs", + "jiff", "pep440_rs", "pep508_rs", "platform-tags", @@ -634,9 +634,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "charset" @@ -656,10 +656,8 @@ checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", "serde", - "wasm-bindgen", "windows-targets 0.52.6", ] @@ -692,9 +690,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.15" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -752,7 +750,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -976,12 +974,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.28.0", - "windows-sys 0.52.0", + "nix 0.29.0", + "windows-sys 0.59.0", ] [[package]] @@ -1105,6 +1103,7 @@ dependencies = [ "distribution-filename", "fs-err", "itertools 0.13.0", + "jiff", "pep440_rs", "pep508_rs", "platform-tags", @@ -1186,6 +1185,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "event-listener" version = "5.3.1" @@ -1391,7 +1401,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -1773,9 +1783,9 @@ checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" [[package]] name = "indexmap" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1926,6 +1936,32 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jiff" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fda28c0e0f7e5ac1e40c34a06393ae6ecf4c9ce6b6421a2217a32680bb8038" +dependencies = [ + "jiff-tzdb-platform", + "serde", + "windows-sys 0.59.0", +] + +[[package]] +name = "jiff-tzdb" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05fac328b3df1c0f18a3c2ab6cb7e06e4e549f366017d796e3e66b6d6889abe6" + +[[package]] +name = "jiff-tzdb-platform" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8da387d5feaf355954c2c122c194d6df9c57d865125a67984bb453db5336940" +dependencies = [ + "jiff-tzdb", +] + [[package]] name = "jobserver" version = "0.1.32" @@ -2171,7 +2207,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2244,9 +2280,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -2466,7 +2502,6 @@ name = "pep508_rs" version = "0.6.0" dependencies = [ "boxcar", - "derivative", "indexmap", "insta", "itertools 0.13.0", @@ -2528,7 +2563,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2575,7 +2610,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2742,7 +2777,7 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=2fac39371a47e7cb821e510aaa4de25405413d29#2fac39371a47e7cb821e510aaa4de25405413d29" +source = "git+https://github.com/astral-sh/pubgrub?rev=aaef464c1b0d8eea4ff9ffaee4f3458c236d10da#aaef464c1b0d8eea4ff9ffaee4f3458c236d10da" dependencies = [ "indexmap", "log", @@ -2761,7 +2796,7 @@ dependencies = [ "indoc", "libc", "memoffset 0.9.1", - "parking_lot 0.12.3", + "parking_lot 0.11.2", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -2809,7 +2844,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2822,7 +2857,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -2830,10 +2865,10 @@ name = "pypi-types" version = "0.0.1" dependencies = [ "anyhow", - "chrono", "distribution-filename", "indexmap", "itertools 0.13.0", + "jiff", "mailparse", "pep440_rs", "pep508_rs", @@ -3155,8 +3190,8 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.3.2" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe#21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe" +version = "0.3.3" +source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" dependencies = [ "anyhow", "async-trait", @@ -3169,12 +3204,11 @@ dependencies = [ [[package]] name = "reqwest-retry" -version = "0.7.0" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe#21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe" +version = "0.7.1" +source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" dependencies = [ "anyhow", "async-trait", - "chrono", "futures", "getrandom", "http", @@ -3476,7 +3510,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3522,22 +3556,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.206" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.206" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3548,14 +3582,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] name = "serde_json" -version = "1.0.124" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", "memchr", @@ -3780,9 +3814,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.74" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ "proc-macro2", "quote", @@ -3879,7 +3913,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3890,7 +3924,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "test-case-core", ] @@ -3912,7 +3946,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -3952,7 +3986,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4043,9 +4077,9 @@ checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7" [[package]] name = "tokio" -version = "1.39.2" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", @@ -4067,7 +4101,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4203,7 +4237,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -4464,7 +4498,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uv" -version = "0.2.37" +version = "0.3.0" dependencies = [ "anstream", "anyhow", @@ -4474,7 +4508,6 @@ dependencies = [ "base64 0.22.1", "byteorder", "cache-key", - "chrono", "clap", "distribution-types", "filetime", @@ -4488,6 +4521,7 @@ dependencies = [ "insta", "install-wheel-rs", "itertools 0.13.0", + "jiff", "miette", "mimalloc", "owo-colors", @@ -4502,6 +4536,7 @@ dependencies = [ "rustc-hash 2.0.0", "serde", "serde_json", + "similar", "textwrap", "thiserror", "tikv-jemallocator", @@ -4553,6 +4588,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "rust-netrc", + "rustc-hash 2.0.0", "tempfile", "test-log", "tokio", @@ -4599,6 +4635,7 @@ dependencies = [ "clap", "directories", "distribution-types", + "etcetera", "fs-err", "nanoid", "pypi-types", @@ -4648,7 +4685,6 @@ dependencies = [ "async_http_range_reader", "async_zip", "cache-key", - "chrono", "distribution-filename", "distribution-types", "fs-err", @@ -4661,6 +4697,7 @@ dependencies = [ "insta", "install-wheel-rs", "itertools 0.13.0", + "jiff", "pep440_rs", "pep508_rs", "platform-tags", @@ -4932,7 +4969,7 @@ version = "0.0.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "textwrap", ] @@ -5002,7 +5039,6 @@ dependencies = [ "url", "uv-cache", "uv-client", - "uv-configuration", "uv-extract", "uv-fs", "uv-state", @@ -5052,7 +5088,6 @@ version = "0.0.1" dependencies = [ "anyhow", "cache-key", - "chrono", "clap", "dashmap", "derivative", @@ -5064,6 +5099,7 @@ dependencies = [ "insta", "install-wheel-rs", "itertools 0.13.0", + "jiff", "once-map", "owo-colors", "pep440_rs", @@ -5160,6 +5196,7 @@ name = "uv-state" version = "0.0.1" dependencies = [ "directories", + "etcetera", "fs-err", "tempfile", ] @@ -5211,7 +5248,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.2.37" +version = "0.3.0" [[package]] name = "uv-virtualenv" @@ -5334,7 +5371,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "wasm-bindgen-shared", ] @@ -5368,7 +5405,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5434,9 +5471,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" -version = "6.0.2" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" dependencies = [ "either", "home", @@ -5534,7 +5571,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5545,7 +5582,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5556,7 +5593,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5567,7 +5604,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] @@ -5865,7 +5902,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.75", ] [[package]] diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 711443c596af..62b1b590a4ae 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -16,22 +16,22 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.2.37"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-3FSA+JsAbLzS3ONoLciDzpyCsO6Em8lNVYR43WiK1xs="; + hash = "sha256-5tX7PvON/n2ntwunoKU/U9zUIVxU+SPVWXelfHapqDA="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss="; - "pubgrub-0.2.1" = "sha256-yhZm35Dyl6gcBTxKvsxJXv1GTOuMCDknnSTgGgKD488="; - "reqwest-middleware-0.3.2" = "sha256-OiC8Kg+F2eKy7YNuLtgYPi95DrbxLvsIKrKEeyuzQTo="; + "pubgrub-0.2.1" = "sha256-OVR4ioUSbraMZYglIGzBA0KQ+XZY0P0+fw68v8/e9sQ="; + "reqwest-middleware-0.3.3" = "sha256-csQN7jZTifliSTsOm6YrjPVgsXBOfelY7LkHD1HkNGQ="; }; }; From 330d94ee5a0eec31f129f7b110f17167bcbd74a0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 20 Aug 2024 23:50:23 +0200 Subject: [PATCH 230/233] python312Packages.qtile-extras: disable flaky test --- pkgs/development/python-modules/qtile-extras/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index d361034fd2d7..90f439317884 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -64,6 +64,8 @@ buildPythonPackage rec { # AttributeError: 'NoneType' object has no attribute 'theta' "test_image_size_horizontal" "test_image_size_vertical" + # flaky, timing sensitive + "test_visualiser" ]; disabledTestPaths = [ From d2f3b99a6b7b74a6fecaac280d88ecb4b5b28c5a Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Tue, 20 Aug 2024 22:00:39 +0200 Subject: [PATCH 231/233] luaPackages.lz.n: 1.4.4 -> 2.0.0 --- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 009c99ff30c1..ea5067dddc59 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2469,14 +2469,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "1.4.4-1"; + version = "2.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-1.4.4-1.rockspec"; - sha256 = "15sslyvzwkfj3mz6z9by7slj063vxj52pyx9y7xqjsrrq1s54446"; + url = "mirror://luarocks/lz.n-2.0.0-1.rockspec"; + sha256 = "1p77m6r1a4a3p96hzwx7i6svdkiy2nfb2xj37axvay7psbqcyd51"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v1.4.4.zip"; - sha256 = "0aiqyybjhn2y4zzgr8lqvlvky2sr7fgp8nw4sh65pwki139ky2qh"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v2.0.0.zip"; + sha256 = "1i55ilg57n2hl0r81a5jqk5ar1bchgavqcscnj6j62ag1dfv6l7f"; }; disabled = luaOlder "5.1"; From e55ca5377613a8c251b3db32a3a676ee7341eab2 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 15 Jul 2024 01:20:24 +0100 Subject: [PATCH 232/233] oven-media-engine: add Arch patch for FFmpeg 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Arch have been shipping this patch to users for a month, and the package maintainer states that it has been confirmed to work, including FFmpeg‐based transcoding functionality. --- .../misc/oven-media-engine/default.nix | 13 +- .../oven-media-engine/support-ffmpeg-7.patch | 829 ++++++++++++++++++ 2 files changed, 839 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 5b7442cfdeb6..20241ab89060 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -6,7 +6,7 @@ , perl , openssl , zlib -, ffmpeg_4 +, ffmpeg_7 , libvpx , libopus , libuuid @@ -27,14 +27,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-f0kZTOI2XzhnXwWLJzWqUJmz3d7c9wGN/D5LC0nY/08="; }; - sourceRoot = "${src.name}/src"; + patches = [ + # ffmpeg 7.0 Update: Use new channel layout + # https://github.com/AirenSoft/OvenMediaEngine/pull/1626 + ./support-ffmpeg-7.patch + ]; + makeFlags = [ "release" "CONFIG_LIBRARY_PATHS=" "CONFIG_PKG_PATHS=" "GLOBAL_CC=$(CC)" "GLOBAL_CXX=$(CXX)" "GLOBAL_LD=$(CXX)" "SHELL=${stdenv.shell}" ]; enableParallelBuilding = true; nativeBuildInputs = [ bc pkg-config perl ]; - buildInputs = [ openssl srt zlib ffmpeg_4 libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; + buildInputs = [ openssl srt zlib ffmpeg_7 libvpx libopus srtp jemalloc pcre2 libuuid hiredis ]; preBuild = '' + cd src + patchShebangs core/colorg++ patchShebangs core/colorgcc patchShebangs projects/main/update_git_info.sh diff --git a/pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch b/pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch new file mode 100644 index 000000000000..5ca777df1919 --- /dev/null +++ b/pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch @@ -0,0 +1,829 @@ +From 6ca213328dc9f63cd9b39768b4c1d5953c71219c Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 25 May 2024 19:25:57 +0200 +Subject: [PATCH 01/12] Update ffmpeg version to 7.0 + +--- + misc/prerequisites.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/prerequisites.sh b/misc/prerequisites.sh +index a647558d3..eb4505cdc 100755 +--- a/misc/prerequisites.sh ++++ b/misc/prerequisites.sh +@@ -13,7 +13,7 @@ OPUS_VERSION=1.3.1 + VPX_VERSION=1.11.0 + FDKAAC_VERSION=2.0.2 + NASM_VERSION=2.15.05 +-FFMPEG_VERSION=5.0.1 ++FFMPEG_VERSION=7.0 + JEMALLOC_VERSION=5.3.0 + PCRE2_VERSION=10.39 + OPENH264_VERSION=2.4.0 + +From 80b015e5374a2e4aa3f850a6797ff066860caa3d Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 25 May 2024 19:26:26 +0200 +Subject: [PATCH 02/12] ffmpeg Update: stream->codecpar->channel_layout to + ch_layout +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +``` +[ 17/505| 3%] [static] libapi_server.a: C++ projects/api_server/controllers/v1/vhosts/apps/output_profiles/output_profiles_controller.cpp => intermediates/RELEASE/objs/api_server/controllers/v1/vhosts/apps/output_profiles/output_profiles_controller.o +In file included from projects/providers/multiplex/multiplex_stream.h:11, + from projects/providers/multiplex/multiplex_application.h:16, + from projects/api_server/controllers/v1/vhosts/apps/multiplex_channels/multiplex_channels_controller.cpp:13: +projects/modules/ffmpeg/ffmpeg_conv.h: In static member function ‘static bool ffmpeg::Conv::ToMediaTrack(AVStream*, std::shared_ptr)’: +projects/modules/ffmpeg/ffmpeg_conv.h:375:130: error: ‘AVCodecParameters’ {aka ‘struct AVCodecParameters’} has no member named ‘channel_layout’; did you mean ‘ch_layout’? + 375 | media_track->GetChannel().SetLayout(ffmpeg::Conv::ToAudioChannelLayout(stream->codecpar->channel_layout)); + | ^~~~~~~~~~~~~~ + | ch_layout +``` +--- + src/projects/modules/ffmpeg/ffmpeg_conv.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/projects/modules/ffmpeg/ffmpeg_conv.h b/src/projects/modules/ffmpeg/ffmpeg_conv.h +index 115864a05..c7eb3da34 100644 +--- a/src/projects/modules/ffmpeg/ffmpeg_conv.h ++++ b/src/projects/modules/ffmpeg/ffmpeg_conv.h +@@ -373,7 +373,7 @@ namespace ffmpeg + case cmn::MediaType::Audio: + media_track->SetSampleRate(stream->codecpar->sample_rate); + media_track->GetSample().SetFormat(ffmpeg::Conv::ToAudioSampleFormat(stream->codecpar->format)); +- media_track->GetChannel().SetLayout(ffmpeg::Conv::ToAudioChannelLayout(stream->codecpar->channel_layout)); ++ media_track->GetChannel().SetLayout(ffmpeg::Conv::ToAudioChannelLayout(stream->codecpar->ch_layout)); + break; + default: + break; + +From 29d3b3dbd7f3d0d05b71cb5f5f41f3396304b389 Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 25 May 2024 19:26:26 +0200 +Subject: [PATCH 03/12] ffmpeg Update: Replace deprecated channel_layout with + ch_layout.u.mask + +``` + /** + * Audio only. The channel layout bitmask. May be 0 if the channel layout is + * unknown or unspecified, otherwise the number of bits set must be equal to + * the channels field. + * @deprecated use ch_layout + */ + attribute_deprecated + uint64_t channel_layout; +``` +--- + src/projects/modules/ffmpeg/ffmpeg_conv.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/projects/modules/ffmpeg/ffmpeg_conv.h b/src/projects/modules/ffmpeg/ffmpeg_conv.h +index c7eb3da34..1be2ccb90 100644 +--- a/src/projects/modules/ffmpeg/ffmpeg_conv.h ++++ b/src/projects/modules/ffmpeg/ffmpeg_conv.h +@@ -373,7 +373,7 @@ namespace ffmpeg + case cmn::MediaType::Audio: + media_track->SetSampleRate(stream->codecpar->sample_rate); + media_track->GetSample().SetFormat(ffmpeg::Conv::ToAudioSampleFormat(stream->codecpar->format)); +- media_track->GetChannel().SetLayout(ffmpeg::Conv::ToAudioChannelLayout(stream->codecpar->ch_layout)); ++ media_track->GetChannel().SetLayout(ffmpeg::Conv::ToAudioChannelLayout(stream->codecpar->ch_layout.u.mask)); + break; + default: + break; +@@ -493,7 +493,7 @@ namespace ffmpeg + media_frame->SetMediaType(media_type); + media_frame->SetBytesPerSample(::av_get_bytes_per_sample(static_cast(frame->format))); + media_frame->SetNbSamples(frame->nb_samples); +- media_frame->GetChannels().SetLayout(ffmpeg::Conv::ToAudioChannelLayout(frame->channel_layout)); ++ media_frame->GetChannels().SetLayout(ffmpeg::Conv::ToAudioChannelLayout(frame->ch_layout.u.mask)); + media_frame->SetSampleRate(frame->sample_rate); + media_frame->SetFormat(frame->format); + media_frame->SetDuration(frame->pkt_duration); + +From 86d3cd217e6b59ee6ab85400548ccc2697045f21 Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 25 May 2024 19:46:33 +0200 +Subject: [PATCH 04/12] ffmpeg Update: Replace deprecated frame->pkt_duration + with duration + +``` + /** + * duration of the corresponding packet, expressed in + * AVStream->time_base units, 0 if unknown. + * - encoding: unused + * - decoding: Read by user. + * + * @deprecated use duration instead + */ + attribute_deprecated + int64_t pkt_duration; +``` +--- + src/projects/modules/ffmpeg/ffmpeg_conv.h | 4 ++-- + src/projects/transcoder/codec/decoder/decoder_aac.cpp | 6 +++--- + src/projects/transcoder/codec/decoder/decoder_avc.cpp | 4 ++-- + .../transcoder/codec/decoder/decoder_avc_nilogan.cpp | 4 ++-- + src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp | 4 ++-- + src/projects/transcoder/codec/decoder/decoder_avc_qsv.cpp | 4 ++-- + src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp | 4 ++-- + src/projects/transcoder/codec/decoder/decoder_hevc.cpp | 4 ++-- + .../transcoder/codec/decoder/decoder_hevc_nilogan.cpp | 4 ++-- + src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp | 4 ++-- + src/projects/transcoder/codec/decoder/decoder_hevc_qsv.cpp | 4 ++-- + src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp | 4 ++-- + src/projects/transcoder/codec/decoder/decoder_mp3.cpp | 6 +++--- + src/projects/transcoder/codec/decoder/decoder_opus.cpp | 6 +++--- + src/projects/transcoder/codec/decoder/decoder_vp8.cpp | 2 +- + 15 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/src/projects/modules/ffmpeg/ffmpeg_conv.h b/src/projects/modules/ffmpeg/ffmpeg_conv.h +index 1be2ccb90..06d4107c8 100644 +--- a/src/projects/modules/ffmpeg/ffmpeg_conv.h ++++ b/src/projects/modules/ffmpeg/ffmpeg_conv.h +@@ -478,7 +478,7 @@ namespace ffmpeg + media_frame->SetHeight(frame->height); + media_frame->SetFormat(frame->format); + media_frame->SetPts((frame->pts == AV_NOPTS_VALUE) ? -1LL : frame->pts); +- media_frame->SetDuration(frame->pkt_duration); ++ media_frame->SetDuration(frame->duration); + + AVFrame* moved_frame = av_frame_alloc(); + av_frame_move_ref(moved_frame, frame); +@@ -496,7 +496,7 @@ namespace ffmpeg + media_frame->GetChannels().SetLayout(ffmpeg::Conv::ToAudioChannelLayout(frame->ch_layout.u.mask)); + media_frame->SetSampleRate(frame->sample_rate); + media_frame->SetFormat(frame->format); +- media_frame->SetDuration(frame->pkt_duration); ++ media_frame->SetDuration(frame->duration); + media_frame->SetPts((frame->pts == AV_NOPTS_VALUE) ? -1LL : frame->pts); + + AVFrame* moved_frame = av_frame_alloc(); +diff --git a/src/projects/transcoder/codec/decoder/decoder_aac.cpp b/src/projects/transcoder/codec/decoder/decoder_aac.cpp +index c1302d50a..1fbefdae3 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_aac.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_aac.cpp +@@ -215,16 +215,16 @@ void DecoderAAC::CodecThread() + } + + // If there is no duration, the duration is calculated by timebase. +- if (_frame->pkt_duration <= 0LL) ++ if (_frame->duration <= 0LL) + { +- _frame->pkt_duration = ffmpeg::Conv::GetDurationPerFrame(cmn::MediaType::Audio, GetRefTrack(), _frame); ++ _frame->duration = ffmpeg::Conv::GetDurationPerFrame(cmn::MediaType::Audio, GetRefTrack(), _frame); + } + + + // If the decoded audio frame does not have a PTS, Increase frame duration time in PTS of previous frame + if(_frame->pts == AV_NOPTS_VALUE) + { +- _frame->pts = _last_pkt_pts + _frame->pkt_duration; ++ _frame->pts = _last_pkt_pts + _frame->duration; + } + + auto output_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Audio, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_avc.cpp b/src/projects/transcoder/codec/decoder/decoder_avc.cpp +index 1ec6f185e..b7339e71c 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_avc.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_avc.cpp +@@ -270,9 +270,9 @@ void DecoderAVC::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); + } + + +diff --git a/src/projects/transcoder/codec/decoder/decoder_avc_nilogan.cpp b/src/projects/transcoder/codec/decoder/decoder_avc_nilogan.cpp +index 50b829a93..7bb959102 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_avc_nilogan.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_avc_nilogan.cpp +@@ -292,9 +292,9 @@ void DecoderAVCxNILOGAN::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); + } + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp b/src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp +index d6a444901..d5b82f2f6 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp +@@ -271,9 +271,9 @@ void DecoderAVCxNV::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / (double) GetRefTrack()->GetTimeBase().GetExpr() ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / (double) GetRefTrack()->GetTimeBase().GetExpr() ); + } + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_avc_qsv.cpp b/src/projects/transcoder/codec/decoder/decoder_avc_qsv.cpp +index 541040a2d..595065866 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_avc_qsv.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_avc_qsv.cpp +@@ -210,9 +210,9 @@ void DecoderAVCxQSV::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); + } + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp b/src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp +index b4bc8b896..494c5f910 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp +@@ -295,9 +295,9 @@ void DecoderAVCxXMA::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); + } + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_hevc.cpp b/src/projects/transcoder/codec/decoder/decoder_hevc.cpp +index eea80b21b..0c58fec8c 100755 +--- a/src/projects/transcoder/codec/decoder/decoder_hevc.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_hevc.cpp +@@ -261,9 +261,9 @@ void DecoderHEVC::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); + } + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_hevc_nilogan.cpp b/src/projects/transcoder/codec/decoder/decoder_hevc_nilogan.cpp +index e5868db24..60a68ef87 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_hevc_nilogan.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_hevc_nilogan.cpp +@@ -257,9 +257,9 @@ void DecoderHEVCxNILOGAN::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); + } + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp b/src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp +index 76f7f5ed1..44fe91828 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp +@@ -260,9 +260,9 @@ void DecoderHEVCxNV::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); + } + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_hevc_qsv.cpp b/src/projects/transcoder/codec/decoder/decoder_hevc_qsv.cpp +index c7ec0d137..c8531e0ba 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_hevc_qsv.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_hevc_qsv.cpp +@@ -208,9 +208,9 @@ void DecoderHEVCxQSV::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); + } + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp b/src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp +index 521dc12ef..1f971b4f6 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp +@@ -295,9 +295,9 @@ void DecoderHEVCxXMA::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- if(_frame->pkt_duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) ++ if(_frame->duration <= 0LL && _context->framerate.num > 0 && _context->framerate.den > 0) + { +- _frame->pkt_duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); ++ _frame->duration = (int64_t)( ((double)_context->framerate.den / (double)_context->framerate.num) / ((double) GetRefTrack()->GetTimeBase().GetNum() / (double) GetRefTrack()->GetTimeBase().GetDen()) ); + } + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_mp3.cpp b/src/projects/transcoder/codec/decoder/decoder_mp3.cpp +index a53c2f831..c7301a1cf 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_mp3.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_mp3.cpp +@@ -215,16 +215,16 @@ void DecoderMP3::CodecThread() + } + + // If there is no duration, the duration is calculated by timebase. +- if (_frame->pkt_duration <= 0LL) ++ if (_frame->duration <= 0LL) + { +- _frame->pkt_duration = ffmpeg::Conv::GetDurationPerFrame(cmn::MediaType::Audio, GetRefTrack(), _frame); ++ _frame->duration = ffmpeg::Conv::GetDurationPerFrame(cmn::MediaType::Audio, GetRefTrack(), _frame); + } + + + // If the decoded audio frame does not have a PTS, Increase frame duration time in PTS of previous frame + if(_frame->pts == AV_NOPTS_VALUE) + { +- _frame->pts = _last_pkt_pts + _frame->pkt_duration; ++ _frame->pts = _last_pkt_pts + _frame->duration; + } + + auto output_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Audio, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_opus.cpp b/src/projects/transcoder/codec/decoder/decoder_opus.cpp +index 031db5f06..2d43143e9 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_opus.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_opus.cpp +@@ -215,16 +215,16 @@ void DecoderOPUS::CodecThread() + } + + // If there is no duration, the duration is calculated by timebase. +- if (_frame->pkt_duration <= 0LL) ++ if (_frame->duration <= 0LL) + { +- _frame->pkt_duration = ffmpeg::Conv::GetDurationPerFrame(cmn::MediaType::Audio, GetRefTrack(), _frame); ++ _frame->duration = ffmpeg::Conv::GetDurationPerFrame(cmn::MediaType::Audio, GetRefTrack(), _frame); + } + + + // If the decoded audio frame does not have a PTS, Increase frame duration time in PTS of previous frame + if(_frame->pts == AV_NOPTS_VALUE) + { +- _frame->pts = _last_pkt_pts + _frame->pkt_duration; ++ _frame->pts = _last_pkt_pts + _frame->duration; + } + + auto output_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Audio, _frame); +diff --git a/src/projects/transcoder/codec/decoder/decoder_vp8.cpp b/src/projects/transcoder/codec/decoder/decoder_vp8.cpp +index c52edb977..616147a7a 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_vp8.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_vp8.cpp +@@ -253,7 +253,7 @@ void DecoderVP8::CodecThread() + } + + // If there is no duration, the duration is calculated by framerate and timebase. +- _frame->pkt_duration = (_frame->pkt_duration <= 0LL) ? ffmpeg::Conv::GetDurationPerFrame(cmn::MediaType::Video, GetRefTrack()) : _frame->pkt_duration; ++ _frame->duration = (_frame->duration <= 0LL) ? ffmpeg::Conv::GetDurationPerFrame(cmn::MediaType::Video, GetRefTrack()) : _frame->duration; + + auto decoded_frame = ffmpeg::Conv::ToMediaFrame(cmn::MediaType::Video, _frame); + ::av_frame_unref(_frame); + +From f469e7e18344243248585b3b5478aba95454231e Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 25 May 2024 20:26:32 +0200 +Subject: [PATCH 05/12] ffmpeg Update: Replace deprecated + av_get_channel_layout_string with av_get_channel_layout_describe + +``` +/** + * Return a description of a channel layout. + * If nb_channels is <= 0, it is guessed from the channel_layout. + * + * @param buf put here the string containing the channel layout + * @param buf_size size in bytes of the buffer + * @param nb_channels number of channels + * @param channel_layout channel layout bitset + * @deprecated use av_channel_layout_describe() + */ +attribute_deprecated +void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout); +``` +--- + src/projects/modules/ffmpeg/ffmpeg_conv.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/projects/modules/ffmpeg/ffmpeg_conv.h b/src/projects/modules/ffmpeg/ffmpeg_conv.h +index 06d4107c8..05981c542 100644 +--- a/src/projects/modules/ffmpeg/ffmpeg_conv.h ++++ b/src/projects/modules/ffmpeg/ffmpeg_conv.h +@@ -701,11 +701,12 @@ namespace ffmpeg + } + else + { +- char channel_layout[16]{}; +- ::av_get_channel_layout_string(channel_layout, OV_COUNTOF(channel_layout), parameters->channels, parameters->channel_layout); ++ char channel_layout_buf[16]{}; ++ ++ ::av_channel_layout_describe(¶meters->ch_layout, channel_layout_buf, OV_COUNTOF(channel_layout_buf)); + + // 48000 Hz, stereo, fltp, +- message.AppendFormat("%d Hz, %s(%d), %s, ", parameters->sample_rate, channel_layout, parameters->channels, ::av_get_sample_fmt_name(static_cast(parameters->format))); ++ message.AppendFormat("%d Hz, %s(%d), %s, ", parameters->sample_rate, channel_layout_buf, parameters->channels, ::av_get_sample_fmt_name(static_cast(parameters->format))); + } + + message.AppendFormat("%d kbps, ", (parameters->bit_rate / 1024)); + +From a73e2efb2466d18fc15fdeccb0c5da031bcec643 Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 25 May 2024 20:31:15 +0200 +Subject: [PATCH 06/12] ffmpeg Update: Replace deprecated channels with + ch_layout.nb_channels + +``` + /** + * Audio only. The number of audio channels. + * @deprecated use ch_layout.nb_channels + */ + attribute_deprecated + int channels; +``` +--- + src/projects/modules/ffmpeg/ffmpeg_conv.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/projects/modules/ffmpeg/ffmpeg_conv.h b/src/projects/modules/ffmpeg/ffmpeg_conv.h +index 05981c542..7b199f08a 100644 +--- a/src/projects/modules/ffmpeg/ffmpeg_conv.h ++++ b/src/projects/modules/ffmpeg/ffmpeg_conv.h +@@ -702,11 +702,10 @@ namespace ffmpeg + else + { + char channel_layout_buf[16]{}; +- + ::av_channel_layout_describe(¶meters->ch_layout, channel_layout_buf, OV_COUNTOF(channel_layout_buf)); + + // 48000 Hz, stereo, fltp, +- message.AppendFormat("%d Hz, %s(%d), %s, ", parameters->sample_rate, channel_layout_buf, parameters->channels, ::av_get_sample_fmt_name(static_cast(parameters->format))); ++ message.AppendFormat("%d Hz, %s(%d), %s, ", parameters->sample_rate, channel_layout_buf, parameters->ch_layout.nb_channels, ::av_get_sample_fmt_name(static_cast(parameters->format))); + } + + message.AppendFormat("%d kbps, ", (parameters->bit_rate / 1024)); +@@ -790,7 +789,7 @@ namespace ffmpeg + break; + + case cmn::MediaType::Audio: { +- codecpar->channels = static_cast(media_track->GetChannel().GetCounts()); ++ codecpar->ch_layout.nb_channels = static_cast(media_track->GetChannel().GetCounts()); + codecpar->channel_layout = ToAVChannelLayout(media_track->GetChannel().GetLayout()); + codecpar->sample_rate = media_track->GetSample().GetRateNum(); + codecpar->frame_size = (media_track->GetAudioSamplesPerFrame()!=0)?media_track->GetAudioSamplesPerFrame():1024; + +From f0334563e0aa1baf038c8c93111b2517e1a7f7be Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 25 May 2024 20:49:52 +0200 +Subject: [PATCH 07/12] ffmpeg Update: Replace deprecated channel_layout with + ch_layout struct + +--- + src/projects/modules/ffmpeg/ffmpeg_conv.h | 13 +++++++++---- + src/projects/modules/segment_writer/writer.cpp | 8 ++++++-- + .../transcoder/codec/encoder/encoder_aac.cpp | 8 ++++++-- + .../transcoder/codec/encoder/encoder_ffopus.cpp | 10 +++++++--- + src/projects/transcoder/filter/filter_resampler.cpp | 2 +- + 5 files changed, 29 insertions(+), 12 deletions(-) + +diff --git a/src/projects/modules/ffmpeg/ffmpeg_conv.h b/src/projects/modules/ffmpeg/ffmpeg_conv.h +index 7b199f08a..f67932f63 100644 +--- a/src/projects/modules/ffmpeg/ffmpeg_conv.h ++++ b/src/projects/modules/ffmpeg/ffmpeg_conv.h +@@ -789,10 +789,15 @@ namespace ffmpeg + break; + + case cmn::MediaType::Audio: { +- codecpar->ch_layout.nb_channels = static_cast(media_track->GetChannel().GetCounts()); +- codecpar->channel_layout = ToAVChannelLayout(media_track->GetChannel().GetLayout()); +- codecpar->sample_rate = media_track->GetSample().GetRateNum(); +- codecpar->frame_size = (media_track->GetAudioSamplesPerFrame()!=0)?media_track->GetAudioSamplesPerFrame():1024; ++ uint64_t channel_layout = ToAVChannelLayout(media_track->GetChannel().GetLayout()); ++ codecpar->ch_layout = { ++ .order = AVChannelOrder::AV_CHANNEL_ORDER_NATIVE, ++ .nb_channels = static_cast(media_track->GetChannel().GetCounts()), ++ .u = {.mask = channel_layout} ++ }; ++ ++ codecpar->sample_rate = media_track->GetSample().GetRateNum(); ++ codecpar->frame_size = (media_track->GetAudioSamplesPerFrame()!=0)?media_track->GetAudioSamplesPerFrame():1024; + } + break; + +diff --git a/src/projects/modules/segment_writer/writer.cpp b/src/projects/modules/segment_writer/writer.cpp +index 1fb8fd94d..6e2dc42b7 100644 +--- a/src/projects/modules/segment_writer/writer.cpp ++++ b/src/projects/modules/segment_writer/writer.cpp +@@ -256,13 +256,17 @@ bool Writer::FillCodecParameters(const std::shared_ptr &track, AVCo + codec_parameters->codec_type = AVMEDIA_TYPE_AUDIO; + codec_parameters->codec_id = AvCodecIdFromMediaCodecId(media_track->GetCodecId()); + codec_parameters->bit_rate = media_track->GetBitrate(); +- codec_parameters->channels = static_cast(media_track->GetChannel().GetCounts()); +- codec_parameters->channel_layout = AvChannelLayoutFromAudioChannelLayout(media_track->GetChannel().GetLayout()); + codec_parameters->sample_rate = media_track->GetSample().GetRateNum(); + codec_parameters->frame_size = 1024; + codec_parameters->format = static_cast(media_track->GetSample().GetFormat()); + codec_parameters->codec_tag = 0; + ++ codec_parameters->ch_layout = { ++ .order = AVChannelOrder::AV_CHANNEL_ORDER_NATIVE, ++ .nb_channels = static_cast(media_track->GetChannel().GetCounts()), ++ .u = {.mask = static_cast(AvChannelLayoutFromAudioChannelLayout(media_track->GetChannel().GetLayout()))} ++ }; ++ + std::shared_ptr extra_data = nullptr; + if (media_track->GetCodecId() == cmn::MediaCodecId::Aac) + { +diff --git a/src/projects/transcoder/codec/encoder/encoder_aac.cpp b/src/projects/transcoder/codec/encoder/encoder_aac.cpp +index 238de1541..91e5eefd3 100644 +--- a/src/projects/transcoder/codec/encoder/encoder_aac.cpp ++++ b/src/projects/transcoder/codec/encoder/encoder_aac.cpp +@@ -15,8 +15,12 @@ bool EncoderAAC::SetCodecParams() + _codec_context->bit_rate = GetRefTrack()->GetBitrate(); + _codec_context->sample_fmt = (AVSampleFormat)GetSupportedFormat(); + _codec_context->sample_rate = GetRefTrack()->GetSampleRate(); +- _codec_context->channel_layout = static_cast(GetRefTrack()->GetChannel().GetLayout()); +- _codec_context->channels = GetRefTrack()->GetChannel().GetCounts(); ++ ++ _codec_context->ch_layout = { ++ .order = AVChannelOrder::AV_CHANNEL_ORDER_NATIVE, ++ .nb_channels = static_cast(GetRefTrack()->GetChannel().GetCounts()), ++ .u = {.mask = static_cast(GetRefTrack()->GetChannel().GetLayout())} ++ }; + + _bitstream_format = cmn::BitstreamFormat::AAC_ADTS; + +diff --git a/src/projects/transcoder/codec/encoder/encoder_ffopus.cpp b/src/projects/transcoder/codec/encoder/encoder_ffopus.cpp +index c70021b18..3c0a53812 100644 +--- a/src/projects/transcoder/codec/encoder/encoder_ffopus.cpp ++++ b/src/projects/transcoder/codec/encoder/encoder_ffopus.cpp +@@ -15,9 +15,13 @@ bool EncoderFFOPUS::SetCodecParams() + _codec_context->bit_rate = GetRefTrack()->GetBitrate(); + _codec_context->sample_fmt = (AVSampleFormat)GetSupportedFormat(); + _codec_context->sample_rate = GetRefTrack()->GetSampleRate(); +- _codec_context->channel_layout = static_cast(GetRefTrack()->GetChannel().GetLayout()); +- _codec_context->channels = GetRefTrack()->GetChannel().GetCounts(); +- ++ ++ _codec_context->ch_layout = { ++ .order = AVChannelOrder::AV_CHANNEL_ORDER_NATIVE, ++ .nb_channels = static_cast(GetRefTrack()->GetChannel().GetCounts()), ++ .u = {.mask = static_cast(GetRefTrack()->GetChannel().GetLayout())} ++ }; ++ + // Support Frequency + // 4000 - OPUS_BANDWIDTH_NARROWBAND (8kHz) (2~8 kbps) + // 6000 - OPUS_BANDWIDTH_MEDIUMBAND (12kHz) +diff --git a/src/projects/transcoder/filter/filter_resampler.cpp b/src/projects/transcoder/filter/filter_resampler.cpp +index beda3b993..9bf3f33fd 100644 +--- a/src/projects/transcoder/filter/filter_resampler.cpp ++++ b/src/projects/transcoder/filter/filter_resampler.cpp +@@ -248,7 +248,7 @@ void FilterResampler::WorkerThread() + if (ret < 0) + { + logte("An error occurred while feeding the audio filtergraph: pts: %lld, linesize: %d, srate: %d, layout: %d, channels: %d, format: %d, rq: %d", +- _frame->pts, _frame->linesize[0], _frame->sample_rate, _frame->channel_layout, _frame->channels, _frame->format, _input_buffer.Size()); ++ _frame->pts, _frame->linesize[0], _frame->sample_rate, _frame->ch_layout.u.mask, _frame->ch_layout.nb_channels, _frame->format, _input_buffer.Size()); + + continue; + } + +From 555e779e02311a31dfd6a8ee7e65c21e1e0a3b8c Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 25 May 2024 21:01:39 +0200 +Subject: [PATCH 08/12] ffmpeg Update: Drop depreacted avcodec_close and use + avcodec_free_context only + +--- + src/projects/transcoder/codec/decoder/decoder_avc.cpp | 1 - + src/projects/transcoder/codec/decoder/decoder_avc_nilogan.cpp | 1 - + src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp | 1 - + src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp | 1 - + src/projects/transcoder/codec/decoder/decoder_hevc.cpp | 1 - + src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp | 1 - + src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp | 1 - + src/projects/transcoder/codec/decoder/decoder_vp8.cpp | 1 - + 8 files changed, 8 deletions(-) + +diff --git a/src/projects/transcoder/codec/decoder/decoder_avc.cpp b/src/projects/transcoder/codec/decoder/decoder_avc.cpp +index b7339e71c..760f02622 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_avc.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_avc.cpp +@@ -92,7 +92,6 @@ bool DecoderAVC::InitCodec() + + void DecoderAVC::UninitCodec() + { +- ::avcodec_close(_context); + ::avcodec_free_context(&_context); + + _context = nullptr; +diff --git a/src/projects/transcoder/codec/decoder/decoder_avc_nilogan.cpp b/src/projects/transcoder/codec/decoder/decoder_avc_nilogan.cpp +index 7bb959102..7c6bbcd0d 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_avc_nilogan.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_avc_nilogan.cpp +@@ -117,7 +117,6 @@ bool DecoderAVCxNILOGAN::InitCodec() + it seems that dynamic resolution is supported + void DecoderAVCxNILOGAN::UninitCodec() + { +- ::avcodec_close(_context); + ::avcodec_free_context(&_context); + + _context = nullptr; +diff --git a/src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp b/src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp +index d5b82f2f6..83c3da39e 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_avc_nv.cpp +@@ -99,7 +99,6 @@ bool DecoderAVCxNV::InitCodec() + + void DecoderAVCxNV::UninitCodec() + { +- ::avcodec_close(_context); + ::avcodec_free_context(&_context); + + _context = nullptr; +diff --git a/src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp b/src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp +index 494c5f910..22d8fdfe9 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_avc_xma.cpp +@@ -111,7 +111,6 @@ bool DecoderAVCxXMA::InitCodec() + + void DecoderAVCxXMA::UninitCodec() + { +- ::avcodec_close(_context); + ::avcodec_free_context(&_context); + + _context = nullptr; +diff --git a/src/projects/transcoder/codec/decoder/decoder_hevc.cpp b/src/projects/transcoder/codec/decoder/decoder_hevc.cpp +index 0c58fec8c..88d0d5e6a 100755 +--- a/src/projects/transcoder/codec/decoder/decoder_hevc.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_hevc.cpp +@@ -84,7 +84,6 @@ bool DecoderHEVC::InitCodec() + + void DecoderHEVC::UninitCodec() + { +- ::avcodec_close(_context); + ::avcodec_free_context(&_context); + + _context = nullptr; +diff --git a/src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp b/src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp +index 44fe91828..36dab687d 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_hevc_nv.cpp +@@ -93,7 +93,6 @@ bool DecoderHEVCxNV::InitCodec() + + void DecoderHEVCxNV::UninitCodec() + { +- ::avcodec_close(_context); + ::avcodec_free_context(&_context); + + _context = nullptr; +diff --git a/src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp b/src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp +index 1f971b4f6..2c1e27a78 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_hevc_xma.cpp +@@ -111,7 +111,6 @@ bool DecoderHEVCxXMA::InitCodec() + + void DecoderHEVCxXMA::UninitCodec() + { +- ::avcodec_close(_context); + ::avcodec_free_context(&_context); + + _context = nullptr; +diff --git a/src/projects/transcoder/codec/decoder/decoder_vp8.cpp b/src/projects/transcoder/codec/decoder/decoder_vp8.cpp +index 616147a7a..464b1c27d 100644 +--- a/src/projects/transcoder/codec/decoder/decoder_vp8.cpp ++++ b/src/projects/transcoder/codec/decoder/decoder_vp8.cpp +@@ -83,7 +83,6 @@ bool DecoderVP8::InitCodec() + + void DecoderVP8::UninitCodec() + { +- ::avcodec_close(_context); + ::avcodec_free_context(&_context); + + _context = nullptr; + +From 9685274797362b8f3235464e1c4902465389dec9 Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 25 May 2024 22:19:24 +0200 +Subject: [PATCH 09/12] ffmpeg Update: Change buffer to const in OnWrite + function declaration + +--- + src/projects/modules/segment_writer/writer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/projects/modules/segment_writer/writer.h b/src/projects/modules/segment_writer/writer.h +index ca06dcf37..c87b25b0d 100644 +--- a/src/projects/modules/segment_writer/writer.h ++++ b/src/projects/modules/segment_writer/writer.h +@@ -120,7 +120,7 @@ class Writer + int DecideBufferSize() const; + + int OnWrite(const uint8_t *buf, int buf_size); +- static int OnWrite(void *opaque, uint8_t *buf, int buf_size) ++ static int OnWrite(void *opaque, const uint8_t *buf, int buf_size) + { + return (static_cast(opaque))->OnWrite(buf, buf_size); + } + +From 70ec85fcfebc8a2969756f117687bca64abdbb77 Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 15 Jun 2024 15:54:07 +0200 +Subject: [PATCH 10/12] Drop unsupported ffmpeg v7 configuration flags + +Disabling lzo isn't allowed anymore https://github.com/FFmpeg/FFmpeg/commit/df272928ff8041f87b92f4cf8dbf12a28fe9cdf7 + +Couldn't find commits for the other two. But I suspect they are now +enabled by default. +--- + misc/prerequisites.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/misc/prerequisites.sh b/misc/prerequisites.sh +index eb4505cdc..9766a50a6 100755 +--- a/misc/prerequisites.sh ++++ b/misc/prerequisites.sh +@@ -316,8 +316,8 @@ install_ffmpeg() + --extra-ldflags="${ADDI_LDFLAGS} -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib " \ + --extra-libs=-ldl ${ADDI_EXTRA_LIBS} \ + ${ADDI_LICENSE} \ +- --disable-everything --disable-programs --disable-avdevice --disable-dwt --disable-lsp --disable-lzo --disable-faan --disable-pixelutils \ +- --enable-shared --enable-zlib --enable-libopus --enable-libvpx --enable-libfdk_aac --enable-libopenh264 --enable-openssl --enable-network --enable-libsrt --enable-dct --enable-rdft ${ADDI_LIBS} \ ++ --disable-everything --disable-programs --disable-avdevice --disable-dwt --disable-lsp --disable-faan --disable-pixelutils \ ++ --enable-shared --enable-zlib --enable-libopus --enable-libvpx --enable-libfdk_aac --enable-libopenh264 --enable-openssl --enable-network --enable-libsrt ${ADDI_LIBS} \ + ${ADDI_HWACCEL} \ + --enable-ffmpeg \ + --enable-encoder=libvpx_vp8,libopus,libfdk_aac,libopenh264,mjpeg,png${ADDI_ENCODER} \ + +From ac60ded1c973593285177fe5757e82b6ea91be77 Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 15 Jun 2024 15:55:11 +0200 +Subject: [PATCH 11/12] Ignore the included uid in the jemalloc tar archive + +Otherwise this fails with `Cannot change ownership to uid 66878, gid +100: Invalid argument`, at least with podman. +--- + misc/prerequisites.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/prerequisites.sh b/misc/prerequisites.sh +index 9766a50a6..5d11048a1 100755 +--- a/misc/prerequisites.sh ++++ b/misc/prerequisites.sh +@@ -348,7 +348,7 @@ install_jemalloc() + (DIR=${TEMP_PATH}/jemalloc && \ + mkdir -p ${DIR} && \ + cd ${DIR} && \ +- curl -sSLf https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2 | tar -jx --strip-components=1 && \ ++ curl -sSLf https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2 | tar -jx --strip-components=1 --no-same-owner && \ + ./configure --prefix="${PREFIX}" && \ + make -j$(nproc) && \ + sudo make install_include install_lib && \ + +From 9b01f66afa8f45deee945baab4dbbef542a6618c Mon Sep 17 00:00:00 2001 +From: hashworks +Date: Sat, 6 Jul 2024 01:43:08 +0200 +Subject: [PATCH 12/12] ffmpeg Update: Replace deprecated frame->pkt_duration + with duration in transcoder context + +--- + src/projects/transcoder/transcoder_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/projects/transcoder/transcoder_context.h b/src/projects/transcoder/transcoder_context.h +index a34a635a9..a1e198e22 100644 +--- a/src/projects/transcoder/transcoder_context.h ++++ b/src/projects/transcoder/transcoder_context.h +@@ -78,7 +78,7 @@ class MediaFrame + + if (_priv_data) + { +- _priv_data->pkt_duration = duration; ++ _priv_data->duration = duration; + } + } + From fcdecc256adcdf46ec77d26f60421c8dcfa69fcc Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 21 Aug 2024 00:56:55 +0200 Subject: [PATCH 233/233] treewide: change `${pname}` to string literal (#336172) * adwaita-icon-theme: change `${pname}` to string literal * alp: change `${pname}` to string literal * alsa-oss: change `${pname}` to string literal * alsa-plugins: change `${pname}` to string literal * alsa-ucm-conf: change `${pname}` to string literal * alsa-utils: change `${pname}` to string literal * anyrun: change `${pname}` to string literal * assemblyscript: change `${pname}` to string literal * audiobookshelf: change `${pname}` to string literal * baobab: change `${pname}` to string literal * braa: change `${pname}` to string literal * brill: change `${pname}` to string literal * centrifugo: change `${pname}` to string literal * cheese: change `${pname}` to string literal * cljfmt: change `${pname}` to string literal * coppwr: change `${pname}` to string literal * cosmic-edit: change `${pname}` to string literal * cosmic-files: change `${pname}` to string literal * cosmic-store: change `${pname}` to string literal * cosmic-term: change `${pname}` to string literal * crate2nix: change `${pname}` to string literal * cups-kyocera-3500-4500: change `${pname}` to string literal * dbqn: change `${pname}` to string literal * dconf-editor: change `${pname}` to string literal * devhelp: change `${pname}` to string literal * dmarc-report-converter: change `${pname}` to string literal * engage: change `${pname}` to string literal * eog: change `${pname}` to string literal * evolution-data-server-gtk4: change `${pname}` to string literal * find-billy: change `${pname}` to string literal * firefly-iii: change `${pname}` to string literal * fuchsia-cursor: change `${pname}` to string literal * geary: change `${pname}` to string literal * ghex: change `${pname}` to string literal * gitg: change `${pname}` to string literal * glasskube: change `${pname}` to string literal * gnome.gnome-autoar: change `${pname}` to string literal * gnome.gnome-calculator: change `${pname}` to string literal * gnome.gnome-calendar: change `${pname}` to string literal * gnome.gnome-common: change `${pname}` to string literal * gnome.gnome-dictionary: change `${pname}` to string literal * gnome.gnome-disk-utility: change `${pname}` to string literal * gnome.gnome-font-viewer: change `${pname}` to string literal * gnome.gnome-keyring: change `${pname}` to string literal * gnome.gnome-screenshot: change `${pname}` to string literal * gnome.gnome-system-monitor: change `${pname}` to string literal * gnome.seahorse: change `${pname}` to string literal * gnome.simple-scan: change `${pname}` to string literal * gnome.sushi: change `${pname}` to string literal * gnome.totem: change `${pname}` to string literal * gnome.yelp: change `${pname}` to string literal * gnome.yelp-xsl: change `${pname}` to string literal * gnucap-full: change `${pname}` to string literal * goredo: change `${pname}` to string literal * guile-semver: change `${pname}` to string literal * halo: change `${pname}` to string literal * intiface-central: change `${pname}` to string literal * intune-portal: change `${pname}` to string literal * iscc: change `${pname}` to string literal * jetbrains-toolbox: change `${pname}` to string literal * jnr-posix: change `${pname}` to string literal * keymapp: change `${pname}` to string literal * libation: change `${pname}` to string literal * libeduvpn-common: change `${pname}` to string literal * libmamba: change `${pname}` to string literal * littlefs-fuse: change `${pname}` to string literal * logseq: change `${pname}` to string literal * lxgw-wenkai-tc: change `${pname}` to string literal * microsoft-identity-broker: change `${pname}` to string literal * minetest-mapserver: change `${pname}` to string literal * msalsdk-dbusclient: change `${pname}` to string literal * neverest: change `${pname}` to string literal * nf-test: change `${pname}` to string literal * numbat: change `${pname}` to string literal * pdf2odt: change `${pname}` to string literal * plemoljp: change `${pname}` to string literal * plemoljp-hs: change `${pname}` to string literal * plemoljp-nf: change `${pname}` to string literal * pocket-updater-utility: change `${pname}` to string literal * proto: change `${pname}` to string literal * pw3270: change `${pname}` to string literal * ratchet: change `${pname}` to string literal * read-it-later: change `${pname}` to string literal * redmine: change `${pname}` to string literal * regina: change `${pname}` to string literal * regripper: change `${pname}` to string literal * revolt-desktop: change `${pname}` to string literal * rs: change `${pname}` to string literal * signaturepdf: change `${pname}` to string literal * sonarlint-ls: change `${pname}` to string literal * srgn: change `${pname}` to string literal * stackit-cli: change `${pname}` to string literal * substudy: change `${pname}` to string literal * swayosd: change `${pname}` to string literal * synthesia: change `${pname}` to string literal * tarlz: change `${pname}` to string literal * termcap: change `${pname}` to string literal * tinycompress: change `${pname}` to string literal * tracexec: change `${pname}` to string literal * treefmt2: change `${pname}` to string literal * udev-gothic: change `${pname}` to string literal * udev-gothic-nf: change `${pname}` to string literal * vvvvvv: change `${pname}` to string literal * yggdrasil: change `${pname}` to string literal * zsync: change `${pname}` to string literal --- .../by-name/ad/adwaita-icon-theme/package.nix | 2 +- pkgs/by-name/al/alp/package.nix | 2 +- pkgs/by-name/al/alsa-oss/package.nix | 2 +- pkgs/by-name/al/alsa-plugins/package.nix | 2 +- pkgs/by-name/al/alsa-ucm-conf/package.nix | 2 +- pkgs/by-name/al/alsa-utils/package.nix | 2 +- pkgs/by-name/an/anyrun/package.nix | 2 +- pkgs/by-name/as/assemblyscript/package.nix | 4 +-- pkgs/by-name/au/audiobookshelf/package.nix | 12 ++++---- pkgs/by-name/ba/baobab/package.nix | 4 +-- pkgs/by-name/br/braa/package.nix | 2 +- pkgs/by-name/br/brill/package.nix | 4 +-- pkgs/by-name/ce/centrifugo/package.nix | 2 +- pkgs/by-name/ch/cheese/package.nix | 2 +- pkgs/by-name/cl/cljfmt/package.nix | 2 +- pkgs/by-name/co/coppwr/package.nix | 2 +- pkgs/by-name/co/cosmic-edit/package.nix | 4 +-- pkgs/by-name/co/cosmic-files/package.nix | 4 +-- pkgs/by-name/co/cosmic-store/package.nix | 4 +-- pkgs/by-name/co/cosmic-term/package.nix | 4 +-- pkgs/by-name/cr/crate2nix/package.nix | 10 +++---- .../cu/cups-kyocera-3500-4500/package.nix | 2 +- pkgs/by-name/db/dbqn/package.nix | 6 ++-- pkgs/by-name/dc/dconf-editor/package.nix | 4 +-- pkgs/by-name/de/devhelp/package.nix | 2 +- .../dm/dmarc-report-converter/package.nix | 2 +- pkgs/by-name/en/engage/package.nix | 6 ++-- pkgs/by-name/eo/eog/package.nix | 4 +-- .../ev/evolution-data-server/package.nix | 6 ++-- pkgs/by-name/fi/find-billy/package.nix | 8 ++--- pkgs/by-name/fi/firefly-iii/package.nix | 2 +- pkgs/by-name/fu/fuchsia-cursor/package.nix | 2 +- pkgs/by-name/ge/geary/package.nix | 4 +-- pkgs/by-name/gh/ghex/package.nix | 2 +- pkgs/by-name/gi/gitg/package.nix | 4 +-- pkgs/by-name/gl/glasskube/package.nix | 2 +- pkgs/by-name/gn/gnome-autoar/package.nix | 2 +- pkgs/by-name/gn/gnome-calculator/package.nix | 2 +- pkgs/by-name/gn/gnome-calendar/package.nix | 4 +-- pkgs/by-name/gn/gnome-common/package.nix | 2 +- pkgs/by-name/gn/gnome-dictionary/package.nix | 2 +- .../by-name/gn/gnome-disk-utility/package.nix | 2 +- pkgs/by-name/gn/gnome-font-viewer/package.nix | 2 +- pkgs/by-name/gn/gnome-keyring/package.nix | 2 +- pkgs/by-name/gn/gnome-screenshot/package.nix | 4 +-- .../gn/gnome-system-monitor/package.nix | 2 +- pkgs/by-name/gn/gnucap/package.nix | 2 +- pkgs/by-name/go/goredo/package.nix | 2 +- pkgs/by-name/gu/guile-semver/package.nix | 2 +- pkgs/by-name/ha/halo/package.nix | 2 +- pkgs/by-name/in/intiface-central/package.nix | 2 +- pkgs/by-name/in/intune-portal/package.nix | 2 +- pkgs/by-name/is/iscc/package.nix | 6 ++-- pkgs/by-name/je/jetbrains-toolbox/package.nix | 4 +-- pkgs/by-name/jn/jnr-posix/package.nix | 2 +- pkgs/by-name/ke/keymapp/package.nix | 4 +-- pkgs/by-name/li/libation/package.nix | 8 ++--- pkgs/by-name/li/libeduvpn-common/package.nix | 4 +-- pkgs/by-name/li/libmamba/package.nix | 2 +- pkgs/by-name/li/littlefs-fuse/package.nix | 6 ++-- pkgs/by-name/lo/logseq/package.nix | 30 +++++++++---------- pkgs/by-name/lx/lxgw-wenkai-tc/package.nix | 2 +- .../mi/microsoft-identity-broker/package.nix | 2 +- .../by-name/mi/minetest-mapserver/package.nix | 6 ++-- .../by-name/ms/msalsdk-dbusclient/package.nix | 2 +- pkgs/by-name/ne/neverest/package.nix | 2 +- pkgs/by-name/nf/nf-test/package.nix | 2 +- pkgs/by-name/nu/numbat/package.nix | 6 ++-- pkgs/by-name/pd/pdf2odt/package.nix | 2 +- pkgs/by-name/pl/plemoljp-hs/package.nix | 8 ++--- pkgs/by-name/pl/plemoljp-nf/package.nix | 4 +-- pkgs/by-name/pl/plemoljp/package.nix | 8 ++--- pkgs/by-name/pr/proto/package.nix | 4 +-- pkgs/by-name/pu/pupdate/package.nix | 2 +- pkgs/by-name/pw/pw3270/package.nix | 4 +-- pkgs/by-name/ra/ratchet/package.nix | 2 +- pkgs/by-name/re/read-it-later/package.nix | 2 +- pkgs/by-name/re/redmine/package.nix | 2 +- pkgs/by-name/re/regina/package.nix | 2 +- pkgs/by-name/re/regripper/package.nix | 4 +-- pkgs/by-name/re/revolt-desktop/package.nix | 14 ++++----- pkgs/by-name/rs/rs/package.nix | 2 +- pkgs/by-name/se/seahorse/package.nix | 4 +-- pkgs/by-name/si/signaturepdf/package.nix | 2 +- pkgs/by-name/si/simple-scan/package.nix | 2 +- pkgs/by-name/so/sonarlint-ls/package.nix | 8 ++--- pkgs/by-name/sr/srgn/package.nix | 2 +- pkgs/by-name/st/stackit-cli/package.nix | 2 +- pkgs/by-name/su/substudy/package.nix | 2 +- pkgs/by-name/su/sushi/package.nix | 2 +- pkgs/by-name/sw/swayosd/package.nix | 2 +- pkgs/by-name/sy/synthesia/package.nix | 14 ++++----- pkgs/by-name/ta/tarlz/package.nix | 4 +-- pkgs/by-name/te/termcap/package.nix | 4 +-- pkgs/by-name/ti/tinycompress/package.nix | 2 +- pkgs/by-name/to/totem/package.nix | 2 +- pkgs/by-name/tr/tracexec/package.nix | 4 +-- pkgs/by-name/tr/treefmt2/package.nix | 2 +- pkgs/by-name/ud/udev-gothic-nf/package.nix | 2 +- pkgs/by-name/ud/udev-gothic/package.nix | 2 +- pkgs/by-name/vv/vvvvvv/package.nix | 6 ++-- pkgs/by-name/ye/yelp-xsl/package.nix | 4 +-- pkgs/by-name/ye/yelp/package.nix | 2 +- pkgs/by-name/yg/yggdrasil/package.nix | 2 +- pkgs/by-name/zs/zsync/package.nix | 2 +- 105 files changed, 196 insertions(+), 196 deletions(-) diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index ac39b2f70359..1ea493890bf9 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz"; hash = "sha256-S8tTm9ddZNo4XW+gjLqp3erOtqyOgrhbpsQRF79bpk4="; }; diff --git a/pkgs/by-name/al/alp/package.nix b/pkgs/by-name/al/alp/package.nix index 39f6040f9d98..1f79cd296bf9 100644 --- a/pkgs/by-name/al/alp/package.nix +++ b/pkgs/by-name/al/alp/package.nix @@ -33,7 +33,7 @@ buildGoModule rec { buildPhase = '' runHook preBuild - go build -o $GOPATH/bin/${pname} main.go + go build -o $GOPATH/bin/alp main.go runHook postBuild ''; diff --git a/pkgs/by-name/al/alsa-oss/package.nix b/pkgs/by-name/al/alsa-oss/package.nix index 71c53580c286..5010c1a3dac6 100644 --- a/pkgs/by-name/al/alsa-oss/package.nix +++ b/pkgs/by-name/al/alsa-oss/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.8"; src = fetchurl { - url = "mirror://alsa/oss-lib/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/oss-lib/alsa-oss-${version}.tar.bz2"; sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4"; }; diff --git a/pkgs/by-name/al/alsa-plugins/package.nix b/pkgs/by-name/al/alsa-plugins/package.nix index bba1944f109e..2d123e460a06 100644 --- a/pkgs/by-name/al/alsa-plugins/package.nix +++ b/pkgs/by-name/al/alsa-plugins/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.12"; src = fetchurl { - url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/plugins/alsa-plugins-${version}.tar.bz2"; hash = "sha256-e9ioPTBOji2GoliV2Nyw7wJFqN8y4nGVnNvcavObZvI="; }; diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index b2e2889ee21e..6224bafc6c54 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.11"; src = fetchurl { - url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/lib/alsa-ucm-conf-${version}.tar.bz2"; hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE="; }; diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix index 401c66beb703..cadf42149fbc 100644 --- a/pkgs/by-name/al/alsa-utils/package.nix +++ b/pkgs/by-name/al/alsa-utils/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { version = "1.2.10"; src = fetchurl { - url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/utils/alsa-utils-${version}.tar.bz2"; sha256 = "sha256-EEti7H8Cp84WynefSBVhbfHMIZM1A3g6kQe1lE+DBjo="; }; patches = [ diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 6ea894c95494..66ad50e47dfe 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/${pname}/examples/ + install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/anyrun/examples/ ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/as/assemblyscript/package.nix b/pkgs/by-name/as/assemblyscript/package.nix index 43b630607b76..b2fcb5ff6317 100644 --- a/pkgs/by-name/as/assemblyscript/package.nix +++ b/pkgs/by-name/as/assemblyscript/package.nix @@ -9,7 +9,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "AssemblyScript"; - repo = pname; + repo = "assemblyscript"; rev = "v${version}"; sha256 = "sha256-Jhjq+kLRzDesTPHHonImCnuzt1Ay04n7+O9aK4knb5g="; }; @@ -17,7 +17,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-mWRQPQVprM+9SCYd8M7NMDtiwDjSH5cr4Xlr5VP9eHo="; meta = with lib; { - homepage = "https://github.com/AssemblyScript/${pname}"; + homepage = "https://github.com/AssemblyScript/assemblyscript"; description = "TypeScript-like language for WebAssembly"; license = licenses.asl20; maintainers = with maintainers; [ lucperkins ]; diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix index a1a4df946704..91008472059b 100644 --- a/pkgs/by-name/au/audiobookshelf/package.nix +++ b/pkgs/by-name/au/audiobookshelf/package.nix @@ -20,13 +20,13 @@ let src = fetchFromGitHub { owner = "advplyr"; - repo = pname; + repo = "audiobookshelf"; rev = "refs/tags/v${source.version}"; inherit (source) hash; }; client = buildNpmPackage { - pname = "${pname}-client"; + pname = "audiobookshelf-client"; inherit (source) version; src = runCommand "cp-source" { } '' @@ -74,13 +74,13 @@ buildNpmPackage { installPhase = '' mkdir -p $out/opt/client cp -r index.js server package* node_modules $out/opt/ - cp -r ${client}/lib/node_modules/${pname}-client/dist $out/opt/client/dist + cp -r ${client}/lib/node_modules/audiobookshelf-client/dist $out/opt/client/dist mkdir $out/bin - echo '${wrapper}' > $out/bin/${pname} - echo " exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/${pname} + echo '${wrapper}' > $out/bin/audiobookshelf + echo " exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/audiobookshelf - chmod +x $out/bin/${pname} + chmod +x $out/bin/audiobookshelf ''; passthru = { diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix index 3978661baabb..c57ea6c12942 100644 --- a/pkgs/by-name/ba/baobab/package.nix +++ b/pkgs/by-name/ba/baobab/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz"; hash = "sha256-zk3vXILQVnGlAJ9768+FrJhnXZ2BYNKK2RgbJppy43w="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "baobab"; }; }; diff --git a/pkgs/by-name/br/braa/package.nix b/pkgs/by-name/br/braa/package.nix index a3b416ae482e..b4a482bfa8e4 100644 --- a/pkgs/by-name/br/braa/package.nix +++ b/pkgs/by-name/br/braa/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.82"; src = fetchzip { - url = "http://s-tech.elsat.net.pl/${pname}/${pname}-${version}.tar.gz"; + url = "http://s-tech.elsat.net.pl/braa/braa-${version}.tar.gz"; hash = "sha256-GS3kk432BdGx/sLzzjXvotD9Qn4S3U4XtMmM0fWMhGA="; }; diff --git a/pkgs/by-name/br/brill/package.nix b/pkgs/by-name/br/brill/package.nix index f5ed5d0882dc..0ea130064e3d 100644 --- a/pkgs/by-name/br/brill/package.nix +++ b/pkgs/by-name/br/brill/package.nix @@ -14,8 +14,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 *agreement.pdf -t $out/share/licenses/${pname} - install -Dm644 *use.pdf -t $out/share/doc/${pname} + install -Dm644 *agreement.pdf -t $out/share/licenses/brill + install -Dm644 *use.pdf -t $out/share/doc/brill runHook postInstall ''; diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index d170da92d8c7..c195ead5764c 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -43,7 +43,7 @@ buildGoModule rec { inherit (nixosTests) centrifugo; version = testers.testVersion { package = centrifugo; - command = "${pname} version"; + command = "centrifugo version"; version = "v${version}"; }; }; diff --git a/pkgs/by-name/ch/cheese/package.nix b/pkgs/by-name/ch/cheese/package.nix index 9ac53092c114..4a39d865d363 100644 --- a/pkgs/by-name/ch/cheese/package.nix +++ b/pkgs/by-name/ch/cheese/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/cheese/${lib.versions.major version}/cheese-${version}.tar.xz"; sha256 = "XyGFxMmeVN3yuLr2DIKBmVDlSVLhMuhjmHXz7cv49o4="; }; diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix index 2e0a07fe5d5e..9fe357071439 100644 --- a/pkgs/by-name/cl/cljfmt/package.nix +++ b/pkgs/by-name/cl/cljfmt/package.nix @@ -11,7 +11,7 @@ buildGraalvmNativeImage rec { version = "0.12.0"; src = fetchurl { - url = "https://github.com/weavejester/${pname}/releases/download/${version}/${pname}-${version}-standalone.jar"; + url = "https://github.com/weavejester/cljfmt/releases/download/${version}/cljfmt-${version}-standalone.jar"; sha256 = "sha256-JdrMsRmTT8U8RZDI2SnQxM5WGMpo1pL2CQ5BqLxcf5M="; }; diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index 25a0952fc7da..78c692181f4e 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/pkgs/by-name/co/coppwr/package.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { ''; postFixup = '' - patchelf $out/bin/${pname} \ + patchelf $out/bin/coppwr \ --add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]} ''; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 127837e3f322..2c8cd21562de 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-edit"; rev = "epoch-${version}"; hash = "sha256-ZG5Ctyp2crTDS0WxhQqwN4T6WR5qW79HTbICMlOA3P8="; }; @@ -93,7 +93,7 @@ rustPlatform.buildRustPackage rec { # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 postInstall = '' - wrapProgram "$out/bin/${pname}" \ + wrapProgram "$out/bin/cosmic-edit" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 4e03188b5faf..32994724519a 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-files"; rev = "epoch-${version}"; hash = "sha256-UwQwZRzOyMvLRRmU2noxGrqblezkR8J2PNMVoyG0M0w="; }; @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 postInstall = '' - wrapProgram "$out/bin/${pname}" \ + wrapProgram "$out/bin/cosmic-files" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi wayland ]} ''; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 216be5d959fb..c2859ba558de 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-store"; rev = "epoch-${version}"; hash = "sha256-RuqWO2/sqMMd9xMRClAy7cwv7iCTEC15TZ7JLBZ2zwM="; fetchSubmodules = true; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec { # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 postInstall = '' - wrapProgram "$out/bin/${pname}" \ + wrapProgram "$out/bin/cosmic-store" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index bd0fde3b8c95..699c8a8564e3 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-term"; rev = "epoch-${version}"; hash = "sha256-dY4QGQXJFL+yjCYRGCg3NfMLMjlEBSEmxHn68PvhCAQ="; }; @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec { # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 postInstall = '' - wrapProgram "$out/bin/${pname}" \ + wrapProgram "$out/bin/cosmic-term" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libxkbcommon diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix index 12ce3f76edeb..8016d2db2fe2 100644 --- a/pkgs/by-name/cr/crate2nix/package.nix +++ b/pkgs/by-name/cr/crate2nix/package.nix @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "nix-community"; - repo = pname; + repo = "crate2nix"; rev = version; hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE="; }; - sourceRoot = "${src.name}/${pname}"; + sourceRoot = "${src.name}/crate2nix"; cargoHash = "sha256-nQ1VUCFMmpWZWvKFbyJFIZUJ24N9ZPY8JCHWju385NE="; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = '' - wrapProgram $out/bin/${pname} \ + wrapProgram $out/bin/crate2nix \ --prefix PATH ":" ${ lib.makeBinPath [ cargo @@ -44,8 +44,8 @@ rustPlatform.buildRustPackage rec { for shell in bash zsh fish do - $out/bin/${pname} completions -s $shell - installShellCompletion ${pname}.$shell || installShellCompletion --$shell _${pname} + $out/bin/crate2nix completions -s $shell + installShellCompletion crate2nix.$shell || installShellCompletion --$shell _crate2nix done ''; diff --git a/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix b/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix index 14f89056daf9..32470d4ab4ba 100644 --- a/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix +++ b/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { # for lib/cups/filter/kyofilter_pre_H wrapPythonProgramsIn $out/lib/cups/filter "$propagatedBuildInputs" - install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/${pname}/copyright + install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/cups-kyocera-3500-4500/copyright ''; meta = with lib; { diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix index ff7f8fe14a7f..0e9d311c4dc7 100644 --- a/pkgs/by-name/db/dbqn/package.nix +++ b/pkgs/by-name/db/dbqn/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { '' + (if buildNativeImage then '' mv dbqn $out/bin '' else '' - mkdir -p $out/share/${pname} - mv BQN.jar $out/share/${pname}/ + mkdir -p $out/share/dbqn + mv BQN.jar $out/share/dbqn/ makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dbqn" \ - --add-flags "-jar $out/share/${pname}/BQN.jar" + --add-flags "-jar $out/share/dbqn/BQN.jar" '') + '' ln -s $out/bin/dbqn $out/bin/bqn diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index 44fca17bec32..b40371f51487 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "45.0.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz"; sha256 = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0="; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "dconf-editor"; }; }; diff --git a/pkgs/by-name/de/devhelp/package.nix b/pkgs/by-name/de/devhelp/package.nix index 97795c1d9f7a..54991136da64 100644 --- a/pkgs/by-name/de/devhelp/package.nix +++ b/pkgs/by-name/de/devhelp/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/devhelp-${version}.tar.xz"; sha256 = "Y87u/QU5LgIESIHvHs1yQpNVPaVzW378CCstE/6F3QQ="; }; diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix index 8121f554a291..0c9265415f15 100644 --- a/pkgs/by-name/dm/dmarc-report-converter/package.nix +++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { ]; passthru.tests = { - simple = runCommand "${pname}-test" { } '' + simple = runCommand "dmarc-report-converter-test" { } '' ${dmarc-report-converter}/bin/dmarc-report-converter -h > $out ''; }; diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 585d072dae42..b355f96513c9 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { src = fetchFromGitLab { domain = "gitlab.computer.surgery"; owner = "charles"; - repo = pname; + repo = "engage"; rev = "v${version}"; hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk="; }; @@ -27,11 +27,11 @@ rustPlatform.buildRustPackage { ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ( - "installShellCompletion --cmd ${pname} " + "installShellCompletion --cmd engage " + builtins.concatStringsSep " " (builtins.map - (shell: "--${shell} <($out/bin/${pname} completions ${shell})") + (shell: "--${shell} <($out/bin/engage completions ${shell})") [ "bash" "fish" diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index 27aa4149e6c5..9ef4b303828b 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/eog/${lib.versions.major version}/eog-${version}.tar.xz"; sha256 = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4="; }; @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "eog"; }; }; diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index fce52129f0ac..228e20ae0eab 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz"; hash = "sha256-GzaoOdscjYmAZuGb54uZWTCgovKohvFJ5PZOF1XwZPc="; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { prePatch = '' substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ - --subst-var-by EDS ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ + --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${version}"} \ --subst-var-by GDS ${glib.getSchemaPath gsettings-desktop-schemas} patches="$patches $PWD/hardcode-gsettings.patch" ''; @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { ''; postInstall = lib.optionalString stdenv.isDarwin '' - ln -s $out/lib/${pname}/*.dylib $out/lib/ + ln -s $out/lib/evolution-data-server/*.dylib $out/lib/ ''; passthru = { diff --git a/pkgs/by-name/fi/find-billy/package.nix b/pkgs/by-name/fi/find-billy/package.nix index aae851fbacd5..6ff964c684e9 100644 --- a/pkgs/by-name/fi/find-billy/package.nix +++ b/pkgs/by-name/fi/find-billy/package.nix @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot mkdir -p $out/share/find-billy - godot3-headless --export-pack 'Linux/X11' $out/share/${pname}/${pname}.pck - makeWrapper ${godot3}/bin/godot3 $out/bin/${pname} \ + godot3-headless --export-pack 'Linux/X11' $out/share/find-billy/find-billy.pck + makeWrapper ${godot3}/bin/godot3 $out/bin/find-billy \ --add-flags "--main-pack" \ - --add-flags "$out/share/${pname}/${pname}.pck" + --add-flags "$out/share/find-billy/find-billy.pck" runHook postBuild ''; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { runHook preInstall just build-icons - install -D ${pname}.desktop -t $out/share/applications + install -D find-billy.desktop -t $out/share/applications runHook postInstall ''; diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 5425fd2da084..b84ec2044032 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -76,7 +76,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; postInstall = '' - mv $out/share/php/${pname}/* $out/ + mv $out/share/php/firefly-iii/* $out/ rm -R $out/share $out/storage $out/bootstrap/cache $out/node_modules ln -s ${dataDir}/storage $out/storage ln -s ${dataDir}/cache $out/bootstrap/cache diff --git a/pkgs/by-name/fu/fuchsia-cursor/package.nix b/pkgs/by-name/fu/fuchsia-cursor/package.nix index 96fd659e47e7..990414e219c9 100644 --- a/pkgs/by-name/fu/fuchsia-cursor/package.nix +++ b/pkgs/by-name/fu/fuchsia-cursor/package.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "ful1e5"; - repo = pname; + repo = "fuchsia-cursor"; rev = "v${version}"; hash = "sha256-WnDtUsjRXT7bMppgwU5BIDqphP69DmPzQM/0qXES5tM="; }; diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix index 565ed9ae2d23..66f7bc222c27 100644 --- a/pkgs/by-name/ge/geary/package.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/geary/${lib.versions.major version}/geary-${version}.tar.xz"; sha256 = "r60VEwKBfd8Ji15BbnrH8tXupWejuAu5C9PGKv0TuaE="; }; @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "geary"; }; }; diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index 95c4448025ef..0d81d0ba969f 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/ghex/${lib.versions.major version}/ghex-${version}.tar.xz"; hash = "sha256-ocRvMCDLNYuDIwJds6U5yX2ZSkxG9wH0jtxjV/f7y9E="; }; diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix index 923f1ccc28bf..5c99f00c1206 100644 --- a/pkgs/by-name/gi/gitg/package.nix +++ b/pkgs/by-name/gi/gitg/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { version = "44"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gitg/${lib.versions.majorMinor version}/gitg-${version}.tar.xz"; hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA="; }; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gitg"; }; }; diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index 0406ba52e231..15500ed8ea9d 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -51,7 +51,7 @@ in buildGoModule rec { "-X github.com/glasskube/glasskube/internal/config.Commit=${src.rev}" ]; - subPackages = [ "cmd/${pname}" "cmd/package-operator" ]; + subPackages = [ "cmd/glasskube" "cmd/package-operator" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gn/gnome-autoar/package.nix b/pkgs/by-name/gn/gnome-autoar/package.nix index dfbcc24898b5..75c971559f7b 100644 --- a/pkgs/by-name/gn/gnome-autoar/package.nix +++ b/pkgs/by-name/gn/gnome-autoar/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/gnome-autoar-${version}.tar.xz"; sha256 = "wK++MzvPPLFEGh9XTMjsexuBl3eRRdTt7uKJb9rPw8I="; }; diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index 577a8245426a..d1008f4867b7 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "46.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz"; hash = "sha256-LTZ1CnOJAIYSLPPwyD5oUXiRWFYVFlMG+hWWqRhmgkc="; }; diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index a751ee382271..15108e40856e 100644 --- a/pkgs/by-name/gn/gnome-calendar/package.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "46.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz"; hash = "sha256-mGH/e4q9W3sgaQulXrdULH7FNLVmJp4ptbHoWMFhCJc="; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-calendar"; }; }; diff --git a/pkgs/by-name/gn/gnome-common/package.nix b/pkgs/by-name/gn/gnome-common/package.nix index 0f9a1269b6ba..1954088e6587 100644 --- a/pkgs/by-name/gn/gnome-common/package.nix +++ b/pkgs/by-name/gn/gnome-common/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/gnome-common-${version}.tar.xz"; sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; }; diff --git a/pkgs/by-name/gn/gnome-dictionary/package.nix b/pkgs/by-name/gn/gnome-dictionary/package.nix index 9db61b591eb7..7e11d1dec189 100644 --- a/pkgs/by-name/gn/gnome-dictionary/package.nix +++ b/pkgs/by-name/gn/gnome-dictionary/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/gnome-dictionary-${version}.tar.xz"; sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; }; diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index 4ca25e2cf822..dd65e5727623 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/gnome-disk-utility-${version}.tar.xz"; hash = "sha256-RkZJFIxtZ3HxrC6/5DpOUZIFsRwtkUoJ8qABgh0GlX0="; }; diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index c97bad1879b8..c05243ecb529 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz"; hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w="; }; diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix index ee5b243adfc7..c26662eaec0b 100644 --- a/pkgs/by-name/gn/gnome-keyring/package.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/gnome-keyring-${version}.tar.xz"; hash = "sha256-vybJZriot/MoXsyLs+RnucIPlTW5TcRRycVZ3c/2GSU="; }; diff --git a/pkgs/by-name/gn/gnome-screenshot/package.nix b/pkgs/by-name/gn/gnome-screenshot/package.nix index e282277469f0..7af7cec11bfc 100644 --- a/pkgs/by-name/gn/gnome-screenshot/package.nix +++ b/pkgs/by-name/gn/gnome-screenshot/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "41.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-screenshot/${lib.versions.major version}/gnome-screenshot-${version}.tar.xz"; sha256 = "Stt97JJkKPdCY9V5ZnPPFC5HILbnaPVGio0JM/mMlZc="; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-screenshot"; }; }; diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index 27c4576e0170..4ce32f874b19 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/package.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/gnome-system-monitor-${version}.tar.xz"; hash = "sha256-U3YkgVjGhsMIJVRy6MKp5MFyVWQsFJ/HGYxtA05UdZk="; }; diff --git a/pkgs/by-name/gn/gnucap/package.nix b/pkgs/by-name/gn/gnucap/package.nix index b80e46b42d51..d67fc5d2c74b 100644 --- a/pkgs/by-name/gn/gnucap/package.nix +++ b/pkgs/by-name/gn/gnucap/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz"; + url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/gnucap-${version}.tar.gz"; hash = "sha256-MUCtGw3BxGWgXgUwzklq5T1y9kjBTnFBa0/GK0hhl0E="; }; diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix index beb62fc1ce8a..57835efc4acc 100644 --- a/pkgs/by-name/go/goredo/package.nix +++ b/pkgs/by-name/go/goredo/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { version = "2.6.0"; src = fetchurl { - url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; + url = "http://www.goredo.cypherpunks.ru/download/goredo-${version}.tar.zst"; hash = "sha256-XTL/otfCKC55TsUBBVors2kgFpOFh+6oekOOafOhcUs="; }; diff --git a/pkgs/by-name/gu/guile-semver/package.nix b/pkgs/by-name/gu/guile-semver/package.nix index ac2a95b09f1a..3d4713f70966 100644 --- a/pkgs/by-name/gu/guile-semver/package.nix +++ b/pkgs/by-name/gu/guile-semver/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "0.1.1"; src = fetchurl { - url = "https://files.ngyro.com/guile-semver/${pname}-${version}.tar.gz"; + url = "https://files.ngyro.com/guile-semver/guile-semver-${version}.tar.gz"; hash = "sha256-T3kJGTdf6yBKjqLtqSopHZu03kyOscZ3Z4RYmoYlN4E="; }; diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index a7787fd8ece6..8caaddf8b465 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "halo"; version = "2.18.0"; src = fetchurl { - url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar"; + url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; hash = "sha256-XFV+cdqtBJID/s0I3Z6TBfeyzN/e9euUoQVTWy64NYM="; }; diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 186c4918b994..7353a8ed6aca 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -14,7 +14,7 @@ flutterPackages.v3_19.buildFlutterApplication rec { version = "2.6.0"; src = fetchFromGitHub { owner = "intiface"; - repo = pname; + repo = "intiface-central"; rev = "v${version}"; hash = "sha256-7+rw0cD8MJPFOkgmfHD6y+EojTGQhb15o1mn2p14eoE="; }; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 945efaec3c19..8fa8aa976e34 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "1.2405.17-jammy"; src = fetchurl { - url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; + url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb"; hash = "sha256-WpVPWzh8jN092MaY2rMXhLfpVXsflMl9hOY9nNGJlLk="; }; diff --git a/pkgs/by-name/is/iscc/package.nix b/pkgs/by-name/is/iscc/package.nix index e8228113881f..03f231ca365c 100644 --- a/pkgs/by-name/is/iscc/package.nix +++ b/pkgs/by-name/is/iscc/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" cp -r ./app/* "$out/bin" - cat << 'EOF' > "$out/bin/${pname}" + cat << 'EOF' > "$out/bin/iscc" #!${runtimeShell} export PATH=${wineWow64Packages.stable}/bin:$PATH export WINEDLLOVERRIDES="mscoree=" # disable mono @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { ${wineWow64Packages.stable}/bin/wine "$out/bin/ISCC.exe" "$wineInputFile" EOF - substituteInPlace $out/bin/${pname} \ + substituteInPlace $out/bin/iscc \ --replace "\$out" "$out" - chmod +x "$out/bin/${pname}" + chmod +x "$out/bin/iscc" runHook postInstall ''; diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 7c88f7e4634d..d311e8785d5f 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -22,7 +22,7 @@ let nativeBuildInputs = [ appimageTools.appimage-exec ]; } '' - appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname} + appimage-exec.sh -x $out ${src}/jetbrains-toolbox-${version}/jetbrains-toolbox # JetBrains ship a broken desktop file. Despite registering a custom # scheme handler for jetbrains:// URLs, they never mark the command as @@ -46,7 +46,7 @@ stdenv.mkDerivation { runHook preInstall install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg - makeWrapper ${appimage}/bin/${pname} $out/bin/${pname} \ + makeWrapper ${appimage}/bin/jetbrains-toolbox $out/bin/jetbrains-toolbox \ --append-flags "--update-failed" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [icu]} diff --git a/pkgs/by-name/jn/jnr-posix/package.nix b/pkgs/by-name/jn/jnr-posix/package.nix index 8ae46e7f5dc8..80f35d3d827d 100644 --- a/pkgs/by-name/jn/jnr-posix/package.nix +++ b/pkgs/by-name/jn/jnr-posix/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D target/${pname}-${version}.jar $out/share/java/${pname}-${version}.jar + install -D target/jnr-posix-${version}.jar $out/share/java/jnr-posix-${version}.jar runHook postInstall ''; diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix index 5b28107f7b2d..5438236d1a7b 100644 --- a/pkgs/by-name/ke/keymapp/package.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -m755 -D keymapp "$out/bin/${pname}" - install -Dm644 icon.png "$out/share/pixmaps/${pname}.png" + install -m755 -D keymapp "$out/bin/keymapp" + install -Dm644 icon.png "$out/share/pixmaps/keymapp.png" runHook postInstall ''; diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index c533b8fdb872..fc61d7c0d48f 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -73,7 +73,7 @@ buildDotnetModule rec { preFixup = '' # remove binaries for other platform, like upstream does - pushd $out/lib/${pname} + pushd $out/lib/libation rm -f *.x86.dll *.x64.dll ${lib.optionalString (stdenv.system != "x86_64-linux") "rm -f *.x64.so"} ${lib.optionalString (stdenv.system != "aarch64-linux") "rm -f *.arm64.so"} @@ -81,9 +81,9 @@ buildDotnetModule rec { ${lib.optionalString (stdenv.system != "aarch64-darwin") "rm -f *.arm64.dylib"} popd - wrapDotnetProgram $out/lib/${pname}/Libation $out/bin/libation - wrapDotnetProgram $out/lib/${pname}/LibationCli $out/bin/libationcli - wrapDotnetProgram $out/lib/${pname}/Hangover $out/bin/hangover + wrapDotnetProgram $out/lib/libation/Libation $out/bin/libation + wrapDotnetProgram $out/lib/libation/LibationCli $out/bin/libationcli + wrapDotnetProgram $out/lib/libation/Hangover $out/bin/hangover ''; meta = { diff --git a/pkgs/by-name/li/libeduvpn-common/package.nix b/pkgs/by-name/li/libeduvpn-common/package.nix index b6c2120cd9ea..f9dce02b5d40 100644 --- a/pkgs/by-name/li/libeduvpn-common/package.nix +++ b/pkgs/by-name/li/libeduvpn-common/package.nix @@ -16,13 +16,13 @@ buildGoModule rec { buildPhase = '' runHook preBuild - go build -o ${pname}-${version}.so -buildmode=c-shared -tags=release ./exports + go build -o libeduvpn-common-${version}.so -buildmode=c-shared -tags=release ./exports runHook postBuild ''; installPhase = '' runHook preInstall - install -Dt $out/lib ${pname}-${version}.so + install -Dt $out/lib libeduvpn-common-${version}.so runHook postInstall ''; diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index 8db98ea2b664..435d15c34a5d 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; - rev = "${pname}-${version}"; + rev = "libmamba-${version}"; hash = "sha256-sxZDlMFoMLq2EAzwBVO++xvU1C30JoIoZXEX/sqkXS0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix index c026a8b7ce07..a4150b8786b5 100644 --- a/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/pkgs/by-name/li/littlefs-fuse/package.nix @@ -5,15 +5,15 @@ stdenv.mkDerivation rec { version = "2.7.8"; src = fetchFromGitHub { owner = "littlefs-project"; - repo = pname; + repo = "littlefs-fuse"; rev = "v${version}"; hash = "sha256-dJt2Tcw+qdcOoZ9ejao9NXys/OYQTvbP9+dD6DCzFAw="; }; buildInputs = [ fuse ]; installPhase = '' runHook preInstall - install -D lfs $out/bin/${pname} - ln -s $out/bin/${pname} $out/bin/mount.littlefs + install -D lfs $out/bin/littlefs-fuse + ln -s $out/bin/littlefs-fuse $out/bin/mount.littlefs ln -s $out/bin $out/sbin runHook postInstall ''; diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 2ede057a2fc7..72bedaf64f36 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -33,7 +33,7 @@ in { src = fetchurl { inherit hash; url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-${suffix}"; - name = lib.optionalString stdenv.isLinux "${pname}-${version}.AppImage"; + name = lib.optionalString stdenv.isLinux "logseq-${version}.AppImage"; }; nativeBuildInputs = [ makeWrapper ] @@ -52,35 +52,35 @@ in { appimageContents = appimageTools.extract { inherit pname src version; }; in '' - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop + mkdir -p $out/bin $out/share/logseq $out/share/applications + cp -a ${appimageContents}/{locales,resources} $out/share/logseq + cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git - chmod +w $out/share/${pname}/resources/app/node_modules/dugite - rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git - chmod -w $out/share/${pname}/resources/app/node_modules/dugite + chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git + chmod +w $out/share/logseq/resources/app/node_modules/dugite + rm -rf $out/share/logseq/resources/app/node_modules/dugite/git + chmod -w $out/share/logseq/resources/app/node_modules/dugite mkdir -p $out/share/pixmaps - ln -s $out/share/${pname}/resources/app/icons/logseq.png $out/share/pixmaps/${pname}.png + ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace Exec=Logseq Exec=${pname} \ - --replace Icon=Logseq Icon=${pname} + substituteInPlace $out/share/applications/logseq.desktop \ + --replace Exec=Logseq Exec=logseq \ + --replace Icon=Logseq Icon=logseq '') + lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications/Logseq.app,bin} cp -R . $out/Applications/Logseq.app - makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/${pname} + makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq '' + '' runHook postInstall ''; postFixup = lib.optionalString stdenv.isLinux '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron}/bin/electron $out/bin/logseq \ --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/${pname}/resources/app \ + --add-flags $out/share/logseq/resources/app \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; diff --git a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix index d4b2d8969597..fc8bb799930f 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai-tc"; version = "1.330"; src = fetchurl { - url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/${pname}-v${version}.tar.gz"; + url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/lxgw-wenkai-tc-v${version}.tar.gz"; hash = "sha256-qpX5shH1HbGMa287u/R1rMFgQeAUC0wwKFVD+QSTyho="; }; diff --git a/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/pkgs/by-name/mi/microsoft-identity-broker/package.nix index 1ab977d04e82..2866d38da4cd 100644 --- a/pkgs/by-name/mi/microsoft-identity-broker/package.nix +++ b/pkgs/by-name/mi/microsoft-identity-broker/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "2.0.1"; src = fetchurl { - url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/${pname}/${pname}_${version}_amd64.deb"; + url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_${version}_amd64.deb"; hash = "sha256-O9zbImSWMrRsaOozj5PsCRvQ3UsaJzLfoTohmLZvLkM="; }; diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix index bc35c9598847..525918caab20 100644 --- a/pkgs/by-name/mi/minetest-mapserver/package.nix +++ b/pkgs/by-name/mi/minetest-mapserver/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { version = "4.9.1"; src = fetchFromGitHub { - owner = pname; + owner = "minetest-mapserver"; repo = "mapserver"; rev = "v${version}"; hash = "sha256-3bL23hwJgYMPV2nSSfq9plttcx7UYvhUa6OCbKfBACY="; @@ -19,8 +19,8 @@ buildGoModule rec { meta = with lib; { description = "Realtime mapserver for minetest"; mainProgram = "mapserver"; - homepage = "https://github.com/${pname}/mapserver/blob/master/readme.md"; - changelog = "https://github.com/${pname}/mapserver/releases/tag/v${version}"; + homepage = "https://github.com/minetest-mapserver/mapserver/blob/master/readme.md"; + changelog = "https://github.com/minetest-mapserver/mapserver/releases/tag/v${version}"; license = with licenses; [ mit cc-by-sa-30 ]; platforms = platforms.all; maintainers = with maintainers; [ gm6k ]; diff --git a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix index 2fcccf8c6c9e..b06f097c76d8 100644 --- a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix +++ b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.0.1"; src = fetchurl { - url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/${pname}/${pname}_${version}_amd64.deb"; + url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/msalsdk-dbusclient/msalsdk-dbusclient_${version}_amd64.deb"; hash = "sha256-AVPrNxCjXGza2gGETP0YrlXeEgI6AjlrSVTtqKb2UBI="; }; diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index 4b7076a8e03e..9b51e9715906 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromSourcehut { owner = "~soywod"; - repo = "${pname}-cli"; + repo = "neverest-cli"; rev = "v${version}"; hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE="; }; diff --git a/pkgs/by-name/nf/nf-test/package.nix b/pkgs/by-name/nf/nf-test/package.nix index b11fe8ee740e..81a5d52ee72b 100644 --- a/pkgs/by-name/nf/nf-test/package.nix +++ b/pkgs/by-name/nf/nf-test/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "0.9.0"; src = fetchurl { - url = "https://github.com/askimed/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/askimed/nf-test/releases/download/v${version}/nf-test-${version}.tar.gz"; hash = "sha256-PhI866NrbokMsSrU6YeSv03S1+VcNqVJsocI3xPfDcc="; }; sourceRoot = "."; diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index f9dcdb5031bd..829b1bf8a4a4 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/${pname}/modules"; + env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules"; postInstall = '' - mkdir -p $out/share/${pname} - cp -r $src/${pname}/modules $out/share/${pname}/ + mkdir -p $out/share/numbat + cp -r $src/numbat/modules $out/share/numbat/ ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/pd/pdf2odt/package.nix b/pkgs/by-name/pd/pdf2odt/package.nix index 809af8919343..a5d14a6fc299 100644 --- a/pkgs/by-name/pd/pdf2odt/package.nix +++ b/pkgs/by-name/pd/pdf2odt/package.nix @@ -28,7 +28,7 @@ resholve.mkDerivation rec { runHook preInstall install -Dm0555 pdf2odt -t $out/bin - install -Dm0444 README.md LICENSE -t $out/share/doc/${pname} + install -Dm0444 README.md LICENSE -t $out/share/doc/pdf2odt ln -rs $out/bin/pdf2odt $out/bin/pdf2ods diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix index fe94bdc0a147..e96b55472637 100644 --- a/pkgs/by-name/pl/plemoljp-hs/package.nix +++ b/pkgs/by-name/pl/plemoljp-hs/package.nix @@ -12,10 +12,10 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm444 PlemolJP_HS/*.ttf -t $out/share/fonts/truetype/${pname} - install -Dm444 PlemolJP35_HS/*.ttf -t $out/share/fonts/truetype/${pname}-35 - install -Dm444 PlemolJPConsole_HS/*.ttf -t $out/share/fonts/truetype/${pname}-console - install -Dm444 PlemolJP35Console_HS/*.ttf -t $out/share/fonts/truetype/${pname}-35console + install -Dm444 PlemolJP_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs + install -Dm444 PlemolJP35_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs-35 + install -Dm444 PlemolJPConsole_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs-console + install -Dm444 PlemolJP35Console_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs-35console runHook postInstall ''; diff --git a/pkgs/by-name/pl/plemoljp-nf/package.nix b/pkgs/by-name/pl/plemoljp-nf/package.nix index 40687bb720f9..c4675319ec0e 100644 --- a/pkgs/by-name/pl/plemoljp-nf/package.nix +++ b/pkgs/by-name/pl/plemoljp-nf/package.nix @@ -12,8 +12,8 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm444 PlemolJPConsole_NF/*.ttf -t $out/share/fonts/truetype/${pname}-console - install -Dm444 PlemolJP35Console_NF/*.ttf -t $out/share/fonts/truetype/${pname}-35console + install -Dm444 PlemolJPConsole_NF/*.ttf -t $out/share/fonts/truetype/plemoljp-nf-console + install -Dm444 PlemolJP35Console_NF/*.ttf -t $out/share/fonts/truetype/plemoljp-nf-35console runHook postInstall ''; diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix index 43472cb743e0..8f7f092de310 100644 --- a/pkgs/by-name/pl/plemoljp/package.nix +++ b/pkgs/by-name/pl/plemoljp/package.nix @@ -12,10 +12,10 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm444 PlemolJP/*.ttf -t $out/share/fonts/truetype/${pname} - install -Dm444 PlemolJP35/*.ttf -t $out/share/fonts/truetype/${pname}-35 - install -Dm444 PlemolJPConsole/*.ttf -t $out/share/fonts/truetype/${pname}-console - install -Dm444 PlemolJP35Console/*.ttf -t $out/share/fonts/truetype/${pname}-35console + install -Dm444 PlemolJP/*.ttf -t $out/share/fonts/truetype/plemoljp + install -Dm444 PlemolJP35/*.ttf -t $out/share/fonts/truetype/plemoljp-35 + install -Dm444 PlemolJPConsole/*.ttf -t $out/share/fonts/truetype/plemoljp-console + install -Dm444 PlemolJP35Console/*.ttf -t $out/share/fonts/truetype/plemoljp-35console runHook postInstall ''; diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 0e19eb417167..d108ed652b10 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "moonrepo"; - repo = pname; + repo = "proto"; rev = "v${version}"; hash = "sha256-o/du9XmiS7U5ypm6osQtVTjrJY60iLCkJ4DWCYOeIoY="; }; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' # proto looks up a proto-shim executable file in $PROTO_LOOKUP_DIR - wrapProgram $out/bin/${pname} \ + wrapProgram $out/bin/proto \ --set PROTO_LOOKUP_DIR $out/bin ''; diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index c1b925e200bb..b78ac0a2b50d 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -15,7 +15,7 @@ buildDotnetModule rec { src = fetchFromGitHub { owner = "mattpannella"; - repo = "${pname}"; + repo = "pupdate"; rev = "${version}"; hash = "sha256-odlKNp6kjOAYeRIHnLniqkCXTi1UXF3szn8tJtrxzQU="; }; diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix index 953674cd3ec5..b46d30355a29 100644 --- a/pkgs/by-name/pw/pw3270/package.nix +++ b/pkgs/by-name/pw/pw3270/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "PerryWerneck"; - repo = pname; + repo = "pw3270"; rev = version; hash = "sha256-Nk/OUqrWngKgb1D1Wi8q5ygKtvuRKUPhPQaLvWi1Z4g="; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { postFixup = '' # Schemas get installed to wrong directory. mkdir -p $out/share/glib-2.0 - mv $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas $out/share/glib-2.0/ + mv $out/share/gsettings-schemas/pw3270-${version}/glib-2.0/schemas $out/share/glib-2.0/ rm -rf $out/share/gsettings-schemas ''; diff --git a/pkgs/by-name/ra/ratchet/package.nix b/pkgs/by-name/ra/ratchet/package.nix index a613bea272aa..6d94200fcc9c 100644 --- a/pkgs/by-name/ra/ratchet/package.nix +++ b/pkgs/by-name/ra/ratchet/package.nix @@ -35,7 +35,7 @@ buildGoModule rec { [ "-s" "-w" - "-X ${package_url}/internal/version.name=${pname}" + "-X ${package_url}/internal/version.name=ratchet" "-X ${package_url}/internal/version.version=${version}" "-X ${package_url}/internal/version.commit=${src.rev}" ]; diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix index 397d03a13e13..d25117c00b4c 100644 --- a/pkgs/by-name/re/read-it-later/package.nix +++ b/pkgs/by-name/re/read-it-later/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; - repo = pname; + repo = "read-it-later"; rev = version; hash = "sha256-A8u1fecJAsVlordgZmUJt/KZWxx6EWMhfdayKWHTTFY="; }; diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index 7dbd0434ba41..f15b9b365a4b 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -15,7 +15,7 @@ in inherit version; src = fetchurl { - url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; + url = "https://www.redmine.org/releases/redmine-${version}.tar.gz"; hash = "sha256-iiIyD9nJQOZZjzrV+3o5MxlchgaO7plLpvzcIsXOy1k="; }; diff --git a/pkgs/by-name/re/regina/package.nix b/pkgs/by-name/re/regina/package.nix index f551d09dfc72..f805ffe2465f 100644 --- a/pkgs/by-name/re/regina/package.nix +++ b/pkgs/by-name/re/regina/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "3.9.6"; src = fetchurl { - url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/regina-rexx-${version}.tar.gz"; hash = "sha256-7ZjHp/HVpBSLAv7xsWruSmpthljQGoDPXFAwFe8Br6U="; }; diff --git a/pkgs/by-name/re/regripper/package.nix b/pkgs/by-name/re/regripper/package.nix index a8dc3d9828f7..a26a00a41d37 100644 --- a/pkgs/by-name/re/regripper/package.nix +++ b/pkgs/by-name/re/regripper/package.nix @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { cp -aR . "$out/share/regripper/" - cat > "$out/bin/${pname}" << EOF + cat > "$out/bin/regripper" << EOF #!${runtimeShell} exec ${perl}/bin/perl $out/share/regripper/rip.pl "\$@" EOF - chmod u+x "$out/bin/${pname}" + chmod u+x "$out/bin/regripper" runHook postInstall ''; diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix index 6a7461f3b13e..85e8ed70ab0a 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -47,19 +47,19 @@ mkdir -p $out/bin $out/share/{applications,revolt-desktop} - cp -a ${final.appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${final.appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop + cp -a ${final.appimageContents}/{locales,resources} $out/share/revolt-desktop + cp -a ${final.appimageContents}/revolt-desktop.desktop $out/share/applications/revolt-desktop.desktop cp -a ${final.appimageContents}/usr/share/icons $out/share/icons - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + substituteInPlace $out/share/applications/revolt-desktop.desktop \ + --replace 'Exec=AppRun' 'Exec=revolt-desktop' runHook postInstall ''; postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar \ + makeWrapper ${electron}/bin/electron $out/bin/revolt-desktop \ + --add-flags $out/share/revolt-desktop/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" ''; } @@ -77,7 +77,7 @@ mkdir -p "$out/Applications/" "$out/bin/" mv Revolt.app "$out/Applications/" - makeWrapper "$out/Applications/Revolt.app/Contents/MacOS/Revolt" "$out/bin/${pname}" + makeWrapper "$out/Applications/Revolt.app/Contents/MacOS/Revolt" "$out/bin/revolt-desktop" runHook postInstall ''; diff --git a/pkgs/by-name/rs/rs/package.nix b/pkgs/by-name/rs/rs/package.nix index 9361ca564dc6..9486c13cb1e2 100644 --- a/pkgs/by-name/rs/rs/package.nix +++ b/pkgs/by-name/rs/rs/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "20200313"; src = fetchurl { - url = "https://www.mirbsd.org/MirOS/dist/mir/rs/${pname}-${version}.tar.gz"; + url = "https://www.mirbsd.org/MirOS/dist/mir/rs/rs-${version}.tar.gz"; sha256 = "0gxwlfk7bzivpp2260w2r6gkyl7vdi05cggn1fijfnp8kzf1b4li"; }; diff --git a/pkgs/by-name/se/seahorse/package.nix b/pkgs/by-name/se/seahorse/package.nix index 2ebc5bae4d0b..127dcf23a7a5 100644 --- a/pkgs/by-name/se/seahorse/package.nix +++ b/pkgs/by-name/se/seahorse/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/seahorse/${lib.versions.major version}/seahorse-${version}.tar.xz"; hash = "sha256-Wx0b+6dPNlgifzyC4pbzMN0PzR70Y2tqIYIo/uXqgy0="; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "seahorse"; }; }; diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index 011d25f349bc..baff481f6f2b 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "24eme"; - repo = "${pname}"; + repo = "signaturepdf"; rev = "v${version}"; hash = "sha256-WPcnG1iRT4l4S/CSZkj75lIiyzVLsrSyH3GUJa7Tedc="; }; diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index e7f2954ca39f..52dc9d7bc01e 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz"; hash = "sha256-wW5lkBQv5WO+UUMSKzu7U/awCn2p2VL2HEf6Jve08Kk="; }; diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index ee3f66b5d9dc..7c043da4e359 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -92,14 +92,14 @@ maven.buildMavenPackage rec { LATEST_TAG=$(curl https://api.github.com/repos/${src.owner}/${src.repo}/tags | \ jq -r '[.[] | select(.name | test("^[0-9]"))] | sort_by(.name | split(".") | map(tonumber)) | reverse | .[0].name') - update-source-version ${pname} "$LATEST_TAG" + update-source-version sonarlint-ls "$LATEST_TAG" sed -i '0,/mvnHash *= *"[^"]*"/{s/mvnHash = "[^"]*"/mvnHash = ""/}' ${pkgFile} echo -e "\nFetching all mvn dependencies to calculate the mvnHash. This may take a while ..." - nix-build -A ${pname}.fetchedMavenDeps 2> ${pname}-stderr.log || true + nix-build -A sonarlint-ls.fetchedMavenDeps 2> sonarlint-ls-stderr.log || true - NEW_MVN_HASH=$(grep "got:" ${pname}-stderr.log | awk '{print ''$2}') - rm ${pname}-stderr.log + NEW_MVN_HASH=$(grep "got:" sonarlint-ls-stderr.log | awk '{print ''$2}') + rm sonarlint-ls-stderr.log # escaping double quotes looks ugly but is needed for variable substitution # use # instead of / as separator because the sha256 might contain the / character sed -i "0,/mvnHash *= *\"[^\"]*\"/{s#mvnHash = \"[^\"]*\"#mvnHash = \"$NEW_MVN_HASH\"#}" ${pkgFile} diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index 39a16c5d372c..696bd36ddd8e 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "alexpovel"; repo = "srgn"; - rev = "${pname}-v${version}"; + rev = "srgn-v${version}"; hash = "sha256-d53aSo1gzINC8WdMzjCHzU/8+9kvrrGglV4WsiCt+rM="; }; diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 5cffda41dcba..21be1dd81802 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -35,7 +35,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; postInstall = '' - mv $out/bin/{${pname},stackit} # rename the binary + mv $out/bin/{stackit-cli,stackit} # rename the binary installShellCompletion --cmd stackit \ --bash <($out/bin/stackit completion bash) \ diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix index 55d368fb3749..14efc8ed1dde 100644 --- a/pkgs/by-name/su/substudy/package.nix +++ b/pkgs/by-name/su/substudy/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "emk"; repo = "subtitles-rs"; - rev = "${pname}_v${version}"; + rev = "substudy_v${version}"; hash = "sha256-ACYbSQKaOJ2hS8NbOAppfKo+Mk3CKg0OAwb56AH42Zs="; }; diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix index aad4727da20b..fa2f495ffd12 100644 --- a/pkgs/by-name/su/sushi/package.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/sushi/${lib.versions.major version}/sushi-${version}.tar.xz"; hash = "sha256-lghbqqQwqyFCxgaqtcR+L7sv0+two1ITfmXFmlig8sY="; }; diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix index f7f5c84d204b..8ce57143381a 100644 --- a/pkgs/by-name/sw/swayosd/package.nix +++ b/pkgs/by-name/sw/swayosd/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - name = "${pname}-${version}"; + name = "swayosd-${version}"; hash = "sha256-exbVanUvGp0ub4WE3VcsN8hkcK0Ipf0tNfd92UecICg="; }; diff --git a/pkgs/by-name/sy/synthesia/package.nix b/pkgs/by-name/sy/synthesia/package.nix index 44c48bb59b03..78c82dd010dd 100644 --- a/pkgs/by-name/sy/synthesia/package.nix +++ b/pkgs/by-name/sy/synthesia/package.nix @@ -20,11 +20,11 @@ stdenvNoCC.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = pname; + name = "synthesia"; desktopName = "Synthesia"; comment = meta.description; - exec = pname; - icon = pname; + exec = "synthesia"; + icon = "synthesia"; categories = [ "Game" "Audio" ]; startupWMClass = "synthesia.exe"; }) @@ -47,11 +47,11 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/bin - cat <<'EOF' > $out/bin/${pname} + cat <<'EOF' > $out/bin/synthesia #!${runtimeShell} export PATH=${wineWowPackages.stable}/bin:$PATH export WINEARCH=win64 - export WINEPREFIX="''${SYNTHESIA_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/${pname}"}/wine" + export WINEPREFIX="''${SYNTHESIA_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/synthesia"}/wine" export WINEDLLOVERRIDES="mscoree=" # disable mono if [ ! -d "$WINEPREFIX" ] ; then mkdir -p "$WINEPREFIX" @@ -59,8 +59,8 @@ stdenvNoCC.mkDerivation rec { fi wine "$WINEPREFIX/drive_c/Program Files (x86)/Synthesia/Synthesia.exe" EOF - chmod +x $out/bin/${pname} - install -Dm644 ${icon} $out/share/icons/hicolor/48x48/apps/${pname}.png + chmod +x $out/bin/synthesia + install -Dm644 ${icon} $out/share/icons/hicolor/48x48/apps/synthesia.png runHook postInstall ''; diff --git a/pkgs/by-name/ta/tarlz/package.nix b/pkgs/by-name/ta/tarlz/package.nix index 0798c6c83551..9873d2be1326 100644 --- a/pkgs/by-name/ta/tarlz/package.nix +++ b/pkgs/by-name/ta/tarlz/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ lzlib ]; src = fetchurl { - url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; + url = "mirror://savannah/lzip/tarlz/tarlz-${version}.tar.lz"; sha256 = "7d0bbe9c3a137bb93a10be56988fcf7362e4dbc65490639edc4255b704105fce"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = false; # system clock issues meta = with lib; { - homepage = "https://www.nongnu.org/lzip/${pname}.html"; + homepage = "https://www.nongnu.org/lzip/tarlz.html"; description = "Massively parallel combined implementation of the tar archiver and the lzip compressor"; license = licenses.gpl2Plus; diff --git a/pkgs/by-name/te/termcap/package.nix b/pkgs/by-name/te/termcap/package.nix index 6382ade90ea7..9a91ead85985 100644 --- a/pkgs/by-name/te/termcap/package.nix +++ b/pkgs/by-name/te/termcap/package.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString (!enableStatic) '' rm $out/lib/libtermcap.a '' + lib.optionalString enableShared (let - libName = "lib${pname}${stdenv.hostPlatform.extensions.sharedLibrary}"; - impLibName = "lib${pname}.dll.a"; + libName = "libtermcap${stdenv.hostPlatform.extensions.sharedLibrary}"; + impLibName = "libtermcap.dll.a"; winImpLib = lib.optionalString stdenv.hostPlatform.isWindows "-Wl,--out-implib,${impLibName}"; in '' diff --git a/pkgs/by-name/ti/tinycompress/package.nix b/pkgs/by-name/ti/tinycompress/package.nix index c58ef57fbd7c..f49255e552ee 100644 --- a/pkgs/by-name/ti/tinycompress/package.nix +++ b/pkgs/by-name/ti/tinycompress/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.2.11"; src = fetchurl { - url = "mirror://alsa/tinycompress/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/tinycompress/tinycompress-${version}.tar.bz2"; hash = "sha256-6754jCgyjnzKJFqvkZSlrQ3JHp4NyIPCz5/rbULJ8/w="; }; diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index c2cf2ff9a7d4..8c99d22f822c 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/totem/${lib.versions.major version}/totem-${version}.tar.xz"; sha256 = "s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4="; }; diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix index 8e8a6f39678b..a5fc0c456f83 100644 --- a/pkgs/by-name/tr/tracexec/package.nix +++ b/pkgs/by-name/tr/tracexec/package.nix @@ -48,8 +48,8 @@ rustPlatform.buildRustPackage { # Remove test binaries (e.g. `empty-argv`, `corrupted-envp`) and only retain `tracexec` find "$out/bin" -type f \! -name tracexec -print0 | xargs -0 rm -v - install -Dm644 LICENSE -t "$out/share/licenses/${pname}/" - install -Dm644 THIRD_PARTY_LICENSES.HTML -t "$out/share/licenses/${pname}/" + install -Dm644 LICENSE -t "$out/share/licenses/tracexec/" + install -Dm644 THIRD_PARTY_LICENSES.HTML -t "$out/share/licenses/tracexec/" ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix index 82afb1ef10ae..b40216bbd08d 100644 --- a/pkgs/by-name/tr/treefmt2/package.nix +++ b/pkgs/by-name/tr/treefmt2/package.nix @@ -19,7 +19,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X git.numtide.com/numtide/treefmt/build.Name=${pname}" + "-X git.numtide.com/numtide/treefmt/build.Name=treefmt" "-X git.numtide.com/numtide/treefmt/build.Version=v${version}" ]; diff --git a/pkgs/by-name/ud/udev-gothic-nf/package.nix b/pkgs/by-name/ud/udev-gothic-nf/package.nix index 14f66f5e4f7f..bdd4cffdf043 100644 --- a/pkgs/by-name/ud/udev-gothic-nf/package.nix +++ b/pkgs/by-name/ud/udev-gothic-nf/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 *.ttf -t $out/share/fonts/${pname} + install -Dm644 *.ttf -t $out/share/fonts/udev-gothic-nf runHook postInstall ''; diff --git a/pkgs/by-name/ud/udev-gothic/package.nix b/pkgs/by-name/ud/udev-gothic/package.nix index 4acb50ee342a..85fdeebf7f34 100644 --- a/pkgs/by-name/ud/udev-gothic/package.nix +++ b/pkgs/by-name/ud/udev-gothic/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 *.ttf -t $out/share/fonts/${pname} + install -Dm644 *.ttf -t $out/share/fonts/udev-gothic runHook postInstall ''; diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix index 15fbab6fdbee..92ecebc4b518 100644 --- a/pkgs/by-name/vv/vvvvvv/package.nix +++ b/pkgs/by-name/vv/vvvvvv/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { name = "VVVVVV"; desktopName = "VVVVVV"; comment = meta.description; - exec = pname; + exec = "vvvvvv"; icon = "VVVVVV"; terminal = false; categories = [ "Game" ]; @@ -69,12 +69,12 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 VVVVVV $out/bin/${pname} + install -Dm755 VVVVVV $out/bin/vvvvvv install -Dm644 "$src/desktop_version/icon.ico" "$out/share/pixmaps/VVVVVV.png" cp -r "$src/desktop_version/fonts/" "$out/share/" cp -r "$src/desktop_version/lang/" "$out/share/" - wrapProgram $out/bin/${pname} \ + wrapProgram $out/bin/vvvvvv \ --add-flags "-assets ${dataZip}" \ --add-flags "-langdir $out/share/lang" \ --add-flags "-fontsdir $out/share/fonts" diff --git a/pkgs/by-name/ye/yelp-xsl/package.nix b/pkgs/by-name/ye/yelp-xsl/package.nix index 572f68a923a8..e655624b33ba 100644 --- a/pkgs/by-name/ye/yelp-xsl/package.nix +++ b/pkgs/by-name/ye/yelp-xsl/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "42.1"; src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/yelp-xsl-${version}.tar.xz"; sha256 = "sha256-I4vhULFlMIDOE5lxMw/TbTomWV4NagQKLAML89IAW80="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "yelp-xsl"; }; }; diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix index 7d9549d97093..49bc8954e9b4 100644 --- a/pkgs/by-name/ye/yelp/package.nix +++ b/pkgs/by-name/ye/yelp/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { version = "42.2"; src = fetchurl { - url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/yelp/${lib.versions.major version}/yelp-${version}.tar.xz"; sha256 = "sha256-osX9B4epCJxyLMZr0Phc33CI2HDntsyFeZ+OW/+erEs="; }; diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index a5a144a28287..cd24d14636f9 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { ldflags = [ "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" - "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}" + "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=yggdrasil" "-X github.com/yggdrasil-network/yggdrasil-go/src/config.defaultAdminListen=unix:///var/run/yggdrasil/yggdrasil.sock" "-s" "-w" diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix index 94aa7acce2e0..f0950cdc33c4 100644 --- a/pkgs/by-name/zs/zsync/package.nix +++ b/pkgs/by-name/zs/zsync/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.2"; src = fetchurl { - url = "http://zsync.moria.org.uk/download/${pname}-${version}.tar.bz2"; + url = "http://zsync.moria.org.uk/download/zsync-${version}.tar.bz2"; sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; };