From 85574ba216e0225b79db33dd2d07685e85eab10e Mon Sep 17 00:00:00 2001 From: Wesley Jr Date: Sat, 31 Dec 2022 17:51:34 -0300 Subject: [PATCH 001/110] ctpv: init at v1.0 --- pkgs/applications/file-managers/lf/ctpv.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/file-managers/lf/ctpv.nix diff --git a/pkgs/applications/file-managers/lf/ctpv.nix b/pkgs/applications/file-managers/lf/ctpv.nix new file mode 100644 index 000000000000..7f5e2a6e089e --- /dev/null +++ b/pkgs/applications/file-managers/lf/ctpv.nix @@ -0,0 +1,41 @@ +{ lib +, pkgs +, file +, openssl +, stdenv +, fetchFromGitHub +, waylandSupport ? stdenv.isLinux +, x11Support ? stdenv.isLinux +}: + +stdenv.mkDerivation rec { + pname = "ctpv"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "NikitaIvanovV"; + repo = "${pname}"; + rev = "v${version}"; + hash = "sha256-0OuskRCBVm8vMd2zH5u5EPABmCOlEv5N4ZZMdc7bAwM="; + }; + + nativeBuildInputs = [ + file # libmagic + openssl + ]; + + buildInputs = with pkgs; [ + ffmpegthumbnailer ffmpeg + ] ++ lib.optional waylandSupport [ chafa ] + ++ lib.optional x11Support [ ueberzug ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Image previews for lf (list files) file manager"; + homepage = "https://github.com/NikitaIvanovV/ctpv"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.wesleyjrz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e2a6a76198c..8c4ca2ff8db4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2264,6 +2264,8 @@ with pkgs; lf = callPackage ../applications/file-managers/lf { }; + ctpv = callPackage ../applications/file-managers/lf/ctpv.nix { }; + llama = callPackage ../applications/file-managers/llama { }; mc = callPackage ../applications/file-managers/mc { From 34bb2681f5daa536f2ef9a9777644823d24e66f7 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 17 Jan 2023 21:22:43 -0800 Subject: [PATCH 002/110] pdfstudio: remove libgccjit dependency I don't think pdfstudio depends on libgccjit. If it did, that would be a license violation. Unlike the other libraries in gcc, libgccjit is licensed GPLv3 with no exceptions, since libgccjit contains the entire compiler. I wasn't able to build pdfstudio2022 prior to this PR due to openjdk breakage. However I did download and extract the `.deb` used, and ran this command, which produced no outputs: ``` find . -name \*.so -exec ldd {} \; | grep libgccjit ``` Maybe somebody confused `libgccjit` with (may it rest in peace) `libgcj`? --- pkgs/applications/misc/pdfstudio/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index f1ce2219ba89..88af09a83ab2 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -8,10 +8,11 @@ # - year identifies the year portion of the version, defaults to most recent year. # - pname is either "pdfstudio${year}" or "pdfstudioviewer". -{ program ? "pdfstudio" +{ lib +, program ? "pdfstudio" , year ? "2022" , fetchurl -, libgccjit +, gcc , callPackage , jdk11 , jdk17 @@ -49,7 +50,7 @@ in sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU="; }; extraBuildInputs = [ - libgccjit #for libstdc++.so.6 and libgomp.so.1 + (lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk11; }; @@ -62,7 +63,7 @@ in sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI="; }; extraBuildInputs = [ - libgccjit #for libstdc++.so.6 and libgomp.so.1 + (lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; From d2823723cc77bc8d530dc441b1253473ac03521c Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 26 Jan 2023 04:01:19 +0100 Subject: [PATCH 003/110] slack: add conditional-flag "--enable-features=WebRTCPipeWireCapturer" for screensharing under wayland --- .../networking/instant-messengers/slack/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 7bd88eaa7545..ff3b74fd7fcd 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -172,7 +172,8 @@ let makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ --suffix PATH : ${lib.makeBinPath [xdg-utils]} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "\''${WAYLAND_DISPLAY:+--enable-features=WebRTCPipeWireCapturer}" # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ From 8db2dbb6cb20d9f8d1974f4986fe34858b8a77ec Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Sun, 12 Feb 2023 23:12:51 +0100 Subject: [PATCH 004/110] ceres-solver: Add and propagate metis dependency SuiteSparse depends on METIS anyway, so we might as well enable METIS in ceres-solver as well. --- pkgs/development/libraries/ceres-solver/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index a5119f4a7f65..7052c98d8ef8 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -8,6 +8,7 @@ , gflags , glog , suitesparse +, metis , runTests ? false , enableStatic ? stdenv.hostPlatform.isStatic , withBlas ? true @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional runTests gflags; propagatedBuildInputs = [ eigen glog ] - ++ lib.optionals withBlas [ blas suitesparse ]; + ++ lib.optionals withBlas [ blas suitesparse metis ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}" From 9bff8435da488dd4e43bccc485c0b2bb03aff1d2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 Feb 2023 22:16:02 -0300 Subject: [PATCH 005/110] xemu: cosmetic rewrite - Use rec-less, overlay-style overridable attributes for stdenv.mkDerivation; - Reorder the lists and sets in asciibetical order; - Format the code. --- pkgs/applications/emulators/xemu/default.nix | 93 ++++++++++---------- 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index 482ea9e06fd5..3837ec653bd9 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -1,67 +1,67 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub -, lib -, makeDesktopItem -, copyDesktopItems -, pkg-config -, python3 -, ninja -, meson -, which -, perl -, wrapGAppsHook -, glib -, gtk3 -, libpcap -, openssl -, libepoxy -, libsamplerate , SDL2 , SDL2_image -, mesa -, libdrm -, libGLU +, copyDesktopItems , gettext +, glib +, gtk3 +, libGLU +, libdrm +, libepoxy +, libpcap +, libsamplerate +, makeDesktopItem +, mesa +, meson +, ninja +, openssl +, perl +, pkg-config +, python3 , vte +, which +, wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "xemu"; version = "0.7.84"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; - rev = "v${version}"; - fetchSubmodules = true; + rev = "v${self.version}"; hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY="; + fetchSubmodules = true; }; nativeBuildInputs = [ + copyDesktopItems + meson + ninja + perl pkg-config python3 python3.pkgs.pyyaml - ninja which - meson - perl wrapGAppsHook - copyDesktopItems ]; buildInputs = [ - glib - gtk3 - openssl - mesa - libepoxy - libdrm - libpcap - libsamplerate SDL2 - libGLU SDL2_image gettext + glib + gtk3 + libGLU + libdrm + libepoxy + libpcap + libsamplerate + mesa + openssl vte ]; @@ -80,23 +80,26 @@ stdenv.mkDerivation rec { buildFlags = [ "qemu-system-i386" ]; - desktopItems = [(makeDesktopItem { - name = "xemu"; - desktopName = "xemu"; - exec = "xemu"; - icon = "xemu"; - })] ; + desktopItems = [ + (makeDesktopItem { + name = "xemu"; + desktopName = "xemu"; + exec = "xemu"; + icon = "xemu"; + }) + ]; preConfigure = let + # When the data below can't be obtained through git, the build process tries + # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) branch = "master"; commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351"; + inherit (self) version; in '' patchShebangs . configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls") substituteInPlace ./scripts/xemu-version.sh \ --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'" - # If the versions can't be obtained through git, the build process tries - # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) echo '${commit}' > XEMU_COMMIT echo '${branch}' > XEMU_BRANCH echo '${version}' > XEMU_VERSION @@ -128,4 +131,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; }; -} +}) From 320cb5981592aad6544b6c1820132d0804aa868d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 Feb 2023 22:20:41 -0300 Subject: [PATCH 006/110] xemu: refactor installPhase - Use install command instead of mkdir + cp - Use nix functional code instead of shell for loop --- pkgs/applications/emulators/xemu/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index 3837ec653bd9..25a8fc9688c8 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -113,14 +113,14 @@ stdenv.mkDerivation (self: { installPhase = '' runHook preInstall - mkdir -p $out/{bin,share} - cp qemu-system-i386 $out/bin/xemu - - for RES in 16x16 24x24 32x32 48x48 128x128 256x256 512x512 - do - mkdir -p $out/share/icons/hicolor/$RES/apps/ - cp ../ui/icons/xemu_$RES.png $out/share/icons/hicolor/$RES/apps/xemu.png - done + install -Dm755 -T qemu-system-i386 $out/bin/xemu + '' + + # Generate code to install the icons + (lib.concatMapStringsSep ";\n" + (res: + "install -Dm644 -T ../ui/icons/xemu_${res}.png $out/share/icons/hicolor/${res}/apps/xemu.png") + [ "16x16" "24x24" "32x32" "48x48" "128x128" "256x256" "512x512" ]) + + '' runHook postInstall ''; From 31b278f6ade7f3a5a4ea9482a859839864edacdd Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 18 Feb 2023 15:07:54 -0300 Subject: [PATCH 007/110] xemu: add meta attributes - Get rid of nested `with` in meta + Because `with` itself is an antipattern, as explained in https://nix.dev/anti-patterns/language#with-attrset-expression + Because nested `with` has unintuitive behavior, as shown in https://github.com/NixOS/nix/issues/490 - Add meta.longDescription; - Add meta.changelog; - Update meta.maintainers list. --- pkgs/applications/emulators/xemu/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index 25a8fc9688c8..bc3828fc03a1 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -125,10 +125,17 @@ stdenv.mkDerivation (self: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://xemu.app/"; description = "Original Xbox emulator"; - maintainers = with maintainers; [ ]; - license = licenses.gpl2Plus; + longDescription = '' + A free and open-source application that emulates the original Microsoft + Xbox game console, enabling people to play their original Xbox games on + Windows, macOS, and Linux systems. + ''; + changelog = "https://github.com/xemu-project/xemu/releases/tag/v${self.version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ]; + platforms = with lib.platforms; linux; }; }) From 5de1cdfcfc02a345bbe4b31871de404860dcb991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Tue, 21 Feb 2023 19:28:33 +0100 Subject: [PATCH 008/110] pulumiPackages.pulumi-command: init at 0.7.1 --- pkgs/tools/admin/pulumi-packages/default.nix | 1 + .../admin/pulumi-packages/pulumi-command.nix | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/admin/pulumi-packages/pulumi-command.nix diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix index c1c76934945f..588214980782 100644 --- a/pkgs/tools/admin/pulumi-packages/default.nix +++ b/pkgs/tools/admin/pulumi-packages/default.nix @@ -6,6 +6,7 @@ in { pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { }; pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { }; + pulumi-command = callPackage' ./pulumi-command.nix { }; pulumi-language-nodejs = callPackage ./pulumi-language-nodejs.nix { }; pulumi-language-python = callPackage ./pulumi-language-python.nix { }; pulumi-random = callPackage' ./pulumi-random.nix { }; diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-command.nix b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix new file mode 100644 index 000000000000..3b181ceb05b0 --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix @@ -0,0 +1,33 @@ +{ lib +, mkPulumiPackage +}: +mkPulumiPackage rec { + owner = "pulumi"; + repo = "pulumi-command"; + version = "0.7.1"; + rev = "v${version}"; + hash = "sha256-QrKtnpJGWoc5WwV6bnERrN3iBJpyoFKFwlqBtNNK7F8="; + vendorHash = "sha256-HyzWPRYfjdjGGBByCc8N91qWhX2QBJoQMpudHWrkmFM="; + cmdGen = "pulumi-gen-command"; + cmdRes = "pulumi-resource-command"; + extraLdflags = [ + "-X github.com/pulumi/${repo}/provider/v4/pkg/version.Version=v${version}" + ]; + + postConfigure = '' + pushd .. + + ${cmdGen} provider/cmd/pulumi-resource-command/schema.json --version ${version} + + popd + ''; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "A Pulumi provider to execute commands and scripts either locally or remotely as part of the Pulumi resource model"; + homepage = "https://github.com/pulumi/pulumi-command"; + license = licenses.asl20; + maintainers = with maintainers; [ veehaitch trundle ]; + }; +} From 5199f94e6583d787a1ddcdc6501dec83056cb710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Tue, 21 Feb 2023 19:43:16 +0100 Subject: [PATCH 009/110] python310Packages.pulumi-command: init at 0.7.1 --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f09a8eb1a188..4a9a38ef54bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1117,6 +1117,8 @@ self: super: with self; { pulumi-azure-native = pkgs.pulumiPackages.pulumi-azure-native.sdks.python; + pulumi-command = pkgs.pulumiPackages.pulumi-command.sdks.python; + pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python; backcall = callPackage ../development/python-modules/backcall { }; From 884edcc23a1e7fc6de1186463d76e32e4a7dd667 Mon Sep 17 00:00:00 2001 From: Matthew Wraith Date: Fri, 17 Feb 2023 18:21:01 -0800 Subject: [PATCH 010/110] grafana-dash-n-grab: init at 0.3.1 --- .../grafana-dash-n-grab/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana-dash-n-grab/default.nix diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix new file mode 100644 index 000000000000..f3f25370f30e --- /dev/null +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -0,0 +1,37 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "grafana-dash-n-grab"; + version = "0.3.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "esnet"; + repo = "gdg"; + sha256 = "sha256-M4V4ybOizXCLxTTuS17M0y2tRmjQmTIBdXVbumzOoeA="; + }; + + vendorSha256 = "sha256-pXo80Tean5OkQ0Sv2+/RlRnAtaClwGP7tuDC2irsh+E="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X github.com/esnet/gdg/version.GitCommit=${src.rev}" + ]; + + # The test suite tries to communicate with a running version of grafana locally. This fails if + # you don't have grafana running. + doCheck = false; + + meta = with lib; { + description = "Grafana Dash-n-Grab (gdg) -- backup and restore Grafana dashboards, datasources, and other entities"; + license = licenses.bsd3; + homepage = "https://github.com/esnet/gdg"; + maintainers = with maintainers; [ wraithm ] ++ teams.bitnomial.members; + platforms = platforms.unix; + mainProgram = "gdg"; + changelog = + "https://github.com/esnet/gdg/releases/tag/v${version}"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e691cacef64..6b138b04461f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24485,6 +24485,8 @@ with pkgs; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; + grafana-dash-n-grab = callPackage ../servers/monitoring/grafana-dash-n-grab { }; + gerbera = callPackage ../servers/gerbera {}; gobetween = callPackage ../servers/gobetween { }; From 92b71b5be970528ad5ad0d4c57abcba1da4c8b94 Mon Sep 17 00:00:00 2001 From: Matthew Wraith Date: Fri, 17 Feb 2023 18:46:36 -0800 Subject: [PATCH 011/110] maintainers: add wraithm --- maintainers/maintainer-list.nix | 6 ++++++ maintainers/team-list.nix | 1 + pkgs/servers/monitoring/grafana-dash-n-grab/default.nix | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 04658beb7f81..254e50c75c4c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15983,6 +15983,12 @@ github = "wr0belj"; githubId = 40501814; }; + wraithm = { + name = "Matthew Wraith"; + email = "wraithm@gmail.com"; + github = "wraithm"; + githubId = 1512913; + }; wrmilling = { name = "Winston R. Milling"; email = "Winston@Milli.ng"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 4d338675c654..4b3c0176910f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -81,6 +81,7 @@ with lib.maintainers; { # Verify additions to this team with at least one already existing member of the team. members = [ cdepillabout + wraithm ]; scope = "Group registration for packages maintained by Bitnomial."; shortName = "Bitnomial employees"; diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix index f3f25370f30e..ac9ec9f02d7b 100644 --- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { description = "Grafana Dash-n-Grab (gdg) -- backup and restore Grafana dashboards, datasources, and other entities"; license = licenses.bsd3; homepage = "https://github.com/esnet/gdg"; - maintainers = with maintainers; [ wraithm ] ++ teams.bitnomial.members; + maintainers = with maintainers; teams.bitnomial.members; platforms = platforms.unix; mainProgram = "gdg"; changelog = From 912441ef4fff147ef9cb629e584ed89e57be482e Mon Sep 17 00:00:00 2001 From: Ksenia Portu Date: Wed, 22 Feb 2023 10:15:05 +0500 Subject: [PATCH 012/110] mathematica: 13.2.0 -> 13.2.1 --- .../science/math/mathematica/versions.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 09df9e13977e..5fd879b13338 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -7,6 +7,20 @@ */ let versions = [ + { + version = "13.2.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-GA2k+jvE4mTJsIbMHce5c516h/glHLnXdthEfnNmk0w="; + installer = "Mathematica_13.2.1_LINUX.sh"; + } + { + version = "13.2.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-ZvgG2W/gjQIo4hyXHsGta5FyTslrz/ltOe/ZK/U2Sx8="; + installer = "Mathematica_13.2.1_BNDL_LINUX.sh"; + } { version = "13.2.0"; lang = "en"; From 0f74c643227974d445a942973efc4ca7f1f7ca3e Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 21 Feb 2023 21:00:53 +0100 Subject: [PATCH 013/110] span-lite: init at 0.10.3 --- .../libraries/span-lite/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/span-lite/default.nix diff --git a/pkgs/development/libraries/span-lite/default.nix b/pkgs/development/libraries/span-lite/default.nix new file mode 100644 index 000000000000..1af8466a4d07 --- /dev/null +++ b/pkgs/development/libraries/span-lite/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "span-lite"; + version = "0.10.3"; + + src = fetchFromGitHub { + owner = "martinmoene"; + repo = "span-lite"; + rev = "v${version}"; + hash = "sha256-WfoyyPLBqXSGGATWN/wny6P++3aCmQMOMLCARhB+R3c="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "A C++20-like span for C++98, C++11 and later in a single-file header-only library"; + homepage = "https://github.com/martinmoene/span-lite"; + license = lib.licenses.bsd1; + maintainers = with lib.maintainers; [ icewind1991 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33e3f7fd1601..f9b87077f817 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23360,6 +23360,8 @@ with pkgs; soundtouch = callPackage ../development/libraries/soundtouch {}; + span-lite = callPackage ../development/libraries/span-lite { }; + spandsp = callPackage ../development/libraries/spandsp {}; spandsp3 = callPackage ../development/libraries/spandsp/3.nix {}; From d6942e22f1944802b85cc40515b27cfcc9ae22a1 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 21 Feb 2023 21:13:13 +0100 Subject: [PATCH 014/110] openloco: init at 23.02 --- pkgs/games/openloco/default.nix | 57 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/games/openloco/default.nix diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix new file mode 100644 index 000000000000..c884c39dafa2 --- /dev/null +++ b/pkgs/games/openloco/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, cmake +, libpng +, libzip +, openal +, pkg-config +, span-lite +, yaml-cpp +}: + +stdenv.mkDerivation rec { + pname = "openloco"; + version = "23.02"; + + src = fetchFromGitHub { + owner = "OpenLoco"; + repo = "OpenLoco"; + rev = "v${version}"; + hash = "sha256-35g7tnKez4tnTdZzavfU+X8f3btFG6EbLkU+cqL6Qek="; + }; + + # the upstream build process determines the version tag from git; since we + # are not using a git checkout, we patch it manually + postPatch = '' + sed -i '/#define NAME "OpenLoco"/a#define OPENLOCO_VERSION_TAG "${version}"' src/OpenLoco/src/Version.cpp + ''; + + NIX_CFLAGS_COMPILE = "-Wno-error=null-dereference"; + + cmakeFlags = [ + "-DOPENLOCO_BUILD_TESTS=NO" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + SDL2 + libpng + libzip + openal + yaml-cpp + span-lite + ]; + + meta = { + description = "An open source re-implementation of Chris Sawyer's Locomotion"; + homepage = "https://github.com/OpenLoco/OpenLoco"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ icewind1991 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9b87077f817..7694108b4829 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35545,6 +35545,8 @@ with pkgs; openjk = callPackage ../games/openjk { }; + openloco = pkgsi686Linux.callPackage ../games/openloco { }; + openmw = libsForQt5.callPackage ../games/openmw { }; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; From 20121a61171ea9f8be7f6fe1ecb81c01e46d5e03 Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 24 Feb 2023 22:56:43 +0100 Subject: [PATCH 015/110] portfolio: 0.61.0 -> 0.61.3 https://github.com/buchen/portfolio/releases/tag/0.61.3 --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 38a15e8bef01..e602e6e5af7f 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.61.0"; + version = "0.61.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-lpKnhAF/VsbLOHkIy1TFqjT0yKlFMNsN+yMUmpBAZKY="; + hash = "sha256-OtFHTZQ+K3CQPEcuirvp8MmW9IC5lEpg42A6FSZVTTA="; }; nativeBuildInputs = [ From c4744988ff31f378881b0d3859db3d5cabc6ca4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 26 Feb 2023 00:18:36 +0100 Subject: [PATCH 016/110] glew: fix cmake's FindGLEW.cmake by adding more cmake target properties This is particular needed to build flightgear. --- pkgs/development/libraries/glew/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 4cbd85e7a04c..5e1c986be28f 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation (finalAttrs: { set(GLEW_VERSION "$version") set(GLEW_LIBRARIES GLEW::glew\''${_glew_target_postfix}) get_target_property(GLEW_INCLUDE_DIRS GLEW::glew\''${_glew_target_postfix} INTERFACE_INCLUDE_DIRECTORIES) + set_target_properties(GLEW::GLEW\''${_glew_target_postfix} PROPERTIES + IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE "" + IMPORTED_IMPLIB_RELEASE "GLEW" + IMPORTED_IMPLIB_DEBUG "GLEW" + ) EOF ''; From 742cdb455fc2dc36c85d9485b071220695b096b9 Mon Sep 17 00:00:00 2001 From: pinkcreeper100 <35699052+pinkcreeper100@users.noreply.github.com> Date: Thu, 19 Jan 2023 19:02:51 +0000 Subject: [PATCH 017/110] maintainers: add pinkcreeper100 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d77092b06b57..fb35b7ad2c45 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11654,6 +11654,12 @@ fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; }]; }; + pinkcreeper100 = { + email = "benmoreosm@gmail.com"; + github = "pinkcreeper100"; + githubId = 35699052; + name = "Oliver Samuel Morris"; + }; pinpox = { email = "mail@pablo.tools"; github = "pinpox"; From eec584d627fe0ab5675ebecfc5b6d68d7570d02c Mon Sep 17 00:00:00 2001 From: pinkcreeper100 <35699052+pinkcreeper100@users.noreply.github.com> Date: Thu, 19 Jan 2023 19:03:49 +0000 Subject: [PATCH 018/110] findex: init at v0.7.1 --- pkgs/applications/misc/findex/default.nix | 32 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/misc/findex/default.nix diff --git a/pkgs/applications/misc/findex/default.nix b/pkgs/applications/misc/findex/default.nix new file mode 100644 index 000000000000..1736c349f3a2 --- /dev/null +++ b/pkgs/applications/misc/findex/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, rustPlatform, pkg-config, keybinder3, gtk3 }: + +rustPlatform.buildRustPackage rec { + pname = "findex"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "mdgaziur"; + repo = pname; + rev = "v${version}"; + hash = "sha256-KaT6lEbrUelv/f9bIBW4bSCuExFu4b7XI7hcrO4mD0M="; + }; + + cargoHash = "sha256-7A+EF88DJrgsKPOJt2xaBnWSMkyhpFImyZmnHcyp+Dw="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + gtk3 + keybinder3 + ]; + + meta = with lib; { + description = "Highly customizable application finder written in Rust and uses Gtk3"; + homepage = "https://github.com/mdgaziur/findex"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.pinkcreeper100 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 698edfa6b86e..ef61ff62f1ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7320,6 +7320,8 @@ with pkgs; filet = callPackage ../applications/misc/filet { }; + findex = callPackage ../applications/misc/findex { }; + findomain = callPackage ../tools/networking/findomain { inherit (darwin.apple_sdk.frameworks) Security; }; From 2a251817f423a786fc7c0695c326b8e8012a0086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sun, 26 Feb 2023 10:37:30 -0300 Subject: [PATCH 019/110] swaynotificationcenter: 0.7.3 -> 0.8.0 Bumps to new version, including thsese changes: - Includes new deps: libgee and libpulseaudio; - Adds meta.changelog; - Release changelog: https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v0.8.0 - Full changelog: https://github.com/ErikReider/SwayNotificationCenter/compare/v0.7.3...v0.8.0 --- .../applications/misc/swaynotificationcenter/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index a3d64a25565b..41a065349c4e 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -13,7 +13,9 @@ , gtk-layer-shell , gtk3 , json-glib +, libgee , libhandy +, libpulseaudio , librsvg , meson , ninja @@ -26,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "SwayNotificationCenter"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; rev = "v${version}"; - hash = "sha256-RU6zzhRu7YK+zcazxj2wZ5vSwLwlilBaG9l+rEstefc="; + hash = "sha256-E9CjNx/xzkkOZ39XbfIb1nJFheZVFpj/lwmITKtpb7A="; }; nativeBuildInputs = [ @@ -58,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: rec { gtk-layer-shell gtk3 json-glib + libgee libhandy + libpulseaudio librsvg # systemd # ends with broken permission ]; @@ -76,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { description = "Simple notification daemon with a GUI built for Sway"; homepage = "https://github.com/ErikReider/SwayNotificationCenter"; + changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${version}"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ berbiche pedrohlc ]; From e9c3f417dd0f687979237c10eb7945ea2ab390ed Mon Sep 17 00:00:00 2001 From: iko Date: Sat, 25 Feb 2023 11:31:37 +0300 Subject: [PATCH 020/110] ubports-click: init at 22-02-2023 --- .../tools/click/dbus-test-runner.patch | 23 +++++ pkgs/development/tools/click/default.nix | 86 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 111 insertions(+) create mode 100644 pkgs/development/tools/click/dbus-test-runner.patch create mode 100644 pkgs/development/tools/click/default.nix diff --git a/pkgs/development/tools/click/dbus-test-runner.patch b/pkgs/development/tools/click/dbus-test-runner.patch new file mode 100644 index 000000000000..c705cf99aa7c --- /dev/null +++ b/pkgs/development/tools/click/dbus-test-runner.patch @@ -0,0 +1,23 @@ +diff --git a/click_package/Makefile.am b/click_package/Makefile.am +index 4981d74..9df9e79 100644 +--- a/click_package/Makefile.am ++++ b/click_package/Makefile.am +@@ -1,5 +1,3 @@ +-SUBDIRS = tests +- + noinst_SCRIPTS = paths.py + CLEANFILES = $(noinst_SCRIPTS) + +diff --git a/configure.ac b/configure.ac +index 8f4dc9e..adbd366 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,8 +52,6 @@ PKG_CHECK_MODULES([SERVICE], [ + AC_SUBST([SERVICE_CFLAGS]) + AC_SUBST([SERVICE_LIBS]) + +-AC_CHECK_PROG(DBUS_TEST_RUNNER_CHECK,dbus-test-runner,yes) +-AS_IF([test "${DBUS_TEST_RUNNER_CHECK}" != "yes"], [AC_MSG_ERROR([dbus-test-runner not found])]) + AC_CHECK_PROG(GDBUS_CHECK,gdbus,yes) + AS_IF([test "${GDBUS_CHECK}" != "yes"], [AC_MSG_ERROR([gdbus (glib) not found])]) + diff --git a/pkgs/development/tools/click/default.nix b/pkgs/development/tools/click/default.nix new file mode 100644 index 000000000000..4adaf11088b8 --- /dev/null +++ b/pkgs/development/tools/click/default.nix @@ -0,0 +1,86 @@ +{ lib +, fetchFromGitLab +, buildPythonApplication +, autoreconfHook +, debian +, perl +, vala +, pkg-config +, libgee +, json-glib +, properties-cpp +, gobject-introspection +, getopt +, setuptools +, pygobject3 +, wrapGAppsHook +}: + +buildPythonApplication { + pname = "click"; + version = "unstable-2023-02-22"; + format = "other"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/click"; + rev = "aaf2735e8e6cbeaf2e429c70136733513a81718a"; + sha256 = "sha256-pNu995/w3tbz15QQVdVYBnWnAoZmqWj1DN/5PZZ0iZw="; + }; + + configureFlags = [ + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" + ]; + + preFixup = '' + makeWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "$out/lib" + ) + ''; + + preConfigure = '' + export click_cv_perl_vendorlib=$out/${perl.libPrefix} + export PYTHON_INSTALL_FLAGS="--prefix=$out" + ''; + + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + gobject-introspection + vala + getopt + wrapGAppsHook + ]; + + # Tests were omitted for time constraint reasons + doCheck = false; + + enableParallelBuilding = true; + + patches = [ + # dbus-test-runner not packaged yet, otherwise build-time dependency even when not running tests + ./dbus-test-runner.patch + ]; + + buildInputs = [ + libgee + json-glib + properties-cpp + ]; + + propagatedBuildInputs = [ + debian + pygobject3 + setuptools + ]; + + meta = { + description = "A tool to build click packages. Mainly used for Ubuntu Touch."; + homepage = "https://gitlab.com/ubports/development/core/click"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ilyakooo0 OPNA2608 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa05105d53c4..d73ae2d4f1ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16121,6 +16121,8 @@ with pkgs; bupc = callPackage ../development/compilers/bupc { }; + ubports-click = python3Packages.callPackage ../development/tools/click { }; + uasm = callPackage ../development/compilers/uasm { }; urn = callPackage ../development/compilers/urn { }; From fca0501c76e38f4ef375f1581770598144803e2e Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Fri, 24 Feb 2023 08:45:19 +0100 Subject: [PATCH 021/110] =?UTF-8?q?crystfel:=200.10.1=20=E2=86=92=200.10.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../science/physics/crystfel/default.nix | 16 ++++++++----- .../link-to-argp-standalone-if-needed.patch | 24 +++++++++---------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 74cc677963e3..0a981f0adf4e 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, fetchpatch , cmake , lz4 , bzip2 @@ -9,7 +10,6 @@ , m4 , hdf5 , gsl -, slurm , unzip , makeWrapper , meson @@ -161,10 +161,10 @@ let in stdenv.mkDerivation rec { pname = "crystfel"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0i9d5ggalic7alj97dxjdys7010kxhm2cb4lwakvigl023j8ms79"; + sha256 = "sha256-nCO9ndDKS54bVN9IhFBiCVNzqk7BsCljXFrOmlx+sP4="; }; nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ] ++ lib.optionals withGui [ wrapGAppsHook ]; @@ -186,12 +186,16 @@ stdenv.mkDerivation rec { argp-standalone memorymappingHook ] - # slurm is not available for Darwin; when it is, remove the condition - ++ lib.optionals (!stdenv.isDarwin) [ slurm ] # hdf5-external-filter-plugins doesn't link on Darwin ++ lib.optionals (withBitshuffle && !stdenv.isDarwin) [ hdf5-external-filter-plugins ]; - patches = [ ./link-to-argp-standalone-if-needed.patch ]; + patches = [ + ./link-to-argp-standalone-if-needed.patch + (fetchpatch { + url = "https://gitlab.desy.de/thomas.white/crystfel/-/commit/3c54d59e1c13aaae716845fed2585770c3ca9d14.diff"; + hash = "sha256-oaJNBQQn0c+z4p1pnW4osRJA2KdKiz4hWu7uzoKY7wc="; + }) + ]; # CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but # we'd have to do that for every CrystFEL executable (indexamajig, crystfel, partialator). Better to just diff --git a/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch b/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch index 707ecafde8b8..8314be29ac00 100644 --- a/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch +++ b/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch @@ -1,9 +1,9 @@ diff --git a/meson.build b/meson.build -index efc9002b..070f37e4 100644 +index 59bbcfb7..dd75d4e2 100644 --- a/meson.build +++ b/meson.build -@@ -34,6 +34,12 @@ if slurmdep.found() - conf_data.set10('HAVE_SLURM', 1) +@@ -80,6 +80,12 @@ if cc.has_function('clock_gettime', prefix: '#include ') + conf_data.set10('HAVE_CLOCK_GETTIME', true) endif +if build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include \nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') @@ -12,15 +12,15 @@ index efc9002b..070f37e4 100644 + argpdep = dependency('', required : false) +endif + - # Find HDF5 using inbuilt Meson methods. Requires Meson >= 0.50.0 - hdf5dep = dependency('hdf5', language: 'c', required: true) + # ************************ libcrystfel (subdir) ************************ -@@ -180,7 +186,7 @@ if zmqdep.found() - endif + subdir('libcrystfel') +@@ -180,7 +186,7 @@ endif - executable('indexamajig', indexamajig_sources, -- dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep], -+ dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep, argpdep], - install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + indexamajig = executable('indexamajig', indexamajig_sources, + dependencies: [mdep, libcrystfeldep, gsldep, +- pthreaddep, zmqdep, asapodep], ++ pthreaddep, zmqdep, asapodep, argpdep], + install: true, + install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') From b8b74bb84ef99cd9e01b3dbe849f69fc6167d273 Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 27 Feb 2023 16:28:27 -0800 Subject: [PATCH 022/110] standardnotes: 3.148.0 -> 3.150.0 --- pkgs/applications/editors/standardnotes/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 4f601a56f8ba..234d3a06901f 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.148.0", + "version": "3.150.0", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.148.0/standard-notes-3.148.0-linux-x86_64.AppImage", - "hash": "sha512-Nzvzl3O7/AXj/Sr5CMfmLktx+w9OUHPZmHH8pxx5GYhmjAgYCh2V0w1iPe5G7/nJpx+jSBJXSKq3jR3wYCeXWA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-x86_64.AppImage", + "hash": "sha512-qDjZ/WQdxXCoTA2PVRiSrIukO+N6gB9UdK7Fed5cvd+xFGteSmfPpP7R6wbvTkxkAe4gkH57taeWg+Tt1jW+nA==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.148.0/standard-notes-3.148.0-linux-arm64.AppImage", - "hash": "sha512-Owwc0WRlATTYZYrUtW6iZK8gXktHstDclqHmo5GZ1AAqB7/W9qTuQ2LNMjfL0kAzIQw/JCBfxvDCG9DjEM6eYA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-arm64.AppImage", + "hash": "sha512-KxK5Z3x611kp2TU5MTxwBfPirlPRbe8zSbF4mjMGDuzmTK3beqHhIGUh4Lud5opMyvUlbVxQf4SxslMxh7uvmw==" } } } From 58609f1dc5183df1c37a34be40f219f7ccacc705 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 17:06:08 +0800 Subject: [PATCH 023/110] deepin.deepin-movie-reborn: init at 5.10.17 --- .../apps/deepin-movie-reborn/default.nix | 129 ++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 130 insertions(+) create mode 100644 pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix new file mode 100644 index 000000000000..eaeeae989299 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -0,0 +1,129 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, runtimeShell +, cmake +, pkg-config +, wrapQtAppsHook +, qtbase +, qttools +, qtx11extras +, qtmultimedia +, dtkwidget +, qt5integration +, qt5platform-plugins +, qtmpris +, qtdbusextended +, gsettings-qt +, elfutils +, ffmpeg +, ffmpegthumbnailer +, mpv +, xorg +, pcre +, libdvdread +, libdvdnav +, libunwind +, libva +, zstd +, glib +, gst_all_1 +, gtest +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "deepin-movie-reborn"; + version = "5.10.23"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-0m8wYRQGsdN4zpnHUJKCfF05SdvTauRSp6gCu2F9ZAI"; + }; + + patches = [ + (fetchpatch { + name = "chore: dont use "; + url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/2afc63541589adab8b0c8c48e290f03535ec2996.patch"; + sha256 = "sha256-Q9dv5L5sUGeuvNxF8ypQlZuZVuU4NIR/8d8EyP/Q5wk="; + }) + (fetchpatch { + name = "feat: rewrite libPath to read LD_LIBRARY_PATH"; + url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/432bf452ed244c256e99ecaf80bb6a0eef9b4a74.patch"; + sha256 = "sha256-5hRQ8D9twBKgouVpIBa1pdAGk0lI/wEdQaHBBHFCZBA"; + }) + ]; + + postPatch = '' + substituteInPlace src/widgets/toolbox_proxy.cpp \ + --replace "/bin/bash" "${runtimeShell}" + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + qtx11extras + qtmultimedia + qtdbusextended + qtmpris + gsettings-qt + elfutils.dev + ffmpeg + ffmpegthumbnailer + xorg.libXtst + xorg.libXdmcp + xorg.xcbproto + pcre.dev + libdvdread + libdvdnav + libunwind + libva + zstd.dev + mpv + gtest + libpulseaudio + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + ]); + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}" + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" + "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" + ]; + + cmakeFlags = [ + "-DVERSION=${version}" + ]; + + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Full-featured video player supporting playing local and streaming media in multiple video formats"; + homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4195af30e5d7..64479dca5eca 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -42,6 +42,7 @@ let deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; + deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; deepin-music = callPackage ./apps/deepin-music { }; deepin-picker = callPackage ./apps/deepin-picker { }; deepin-terminal = callPackage ./apps/deepin-terminal { }; From 5191e540accd5b899a4e1faa9966dfd689bc8c6b Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 13:31:22 +0800 Subject: [PATCH 024/110] deepin.dde-device-formatter: init at unstable-2022-09-05 --- pkgs/desktops/deepin/default.nix | 1 + .../tools/dde-device-formatter/default.nix | 69 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 pkgs/desktops/deepin/tools/dde-device-formatter/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4195af30e5d7..9c8c7adff7ca 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -57,6 +57,7 @@ let deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; #### TOOLS + dde-device-formatter = callPackage ./tools/dde-device-formatter { }; deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; #### ARTWORK diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix new file mode 100644 index 000000000000..87a2fe1b66c7 --- /dev/null +++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, deepin-gettext-tools +, qt5integration +, qmake +, qtbase +, qttools +, qtx11extras +, pkg-config +, wrapQtAppsHook +, udisks2-qt5 +}: + +stdenv.mkDerivation rec { + pname = "dde-device-formatter"; + version = "unstable-2022-09-05"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = "9b8489cb2bb7c85bd62557d16a5eabc94100512e"; + sha256 = "sha256-Mi48dSDCoKhr8CGt9z64/9d7+r9QSrPPICv+R5VDuaU="; + }; + + patches = [ + (fetchpatch { + name = "chore: don't use hardcode path"; + url = "https://github.com/linuxdeepin/dde-device-formatter/commit/b836a498b8e783e0dff3820302957f15ee8416eb.patch"; + sha256 = "sha256-i/VqJ6EmCyhE6weHKUB66bW6b51gLyssIAzb5li4aJM="; + }) + ]; + + postPatch = '' + substituteInPlace dde-device-formatter.pro --replace "/usr" "$out" + patchShebangs *.sh + ''; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + deepin-gettext-tools + ]; + + buildInputs = [ + dtkwidget + udisks2-qt5 + qtx11extras + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "A simple graphical interface for creating file system in a block device"; + homepage = "https://github.com/linuxdeepin/dde-device-formatter"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} From d65319733c25e218c86f22faa61dd17468d039aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 02:57:19 +0000 Subject: [PATCH 025/110] powerstat: 0.03.00 -> 0.03.01 --- pkgs/os-specific/linux/powerstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 5f03c5faabc3..bee805c57bc6 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.03.00"; + version = "0.03.01"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-eiFzWKY4LrudfjMKDk4clmvCqYOGvWFokn6jEryMYBo="; + hash = "sha256-+3b6yH5CuFdtjjTmW2mwuvNyhO8/8N7vv6st+ttztBQ="; }; installFlags = [ From 4bc6ce1da0d9bc378c3528dfed1c862545886793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Feb 2023 20:51:11 -0800 Subject: [PATCH 026/110] ooniprobe-cli: 3.16.7 -> 3.17.0 Diff: https://github.com/ooni/probe-cli/compare/v3.16.7...v3.17.0 Changelog: https://github.com/ooni/probe-cli/releases/tag/v3.17.0 --- pkgs/tools/networking/ooniprobe-cli/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index a8f2d3df4230..307fdbebd158 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,20 +5,21 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.16.7"; + version = "3.17.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-GebDgdz45INM1Sf7T0qDjFeBqRftMHjGLIAWTM/1REY="; + hash = "sha256-xOWGRDK9HyKU/WrLSLgmKpF82UTxxgIMOL1zCQDjtpU="; }; - vendorHash = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E="; + vendorHash = "sha256-r8kyL9gpdDesY8Mbm4lONAhWC4We26Z9uG7QMt1JT9c="; subPackages = [ "cmd/ooniprobe" ]; meta = with lib; { + changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.rev}"; description = "The Open Observatory of Network Interference command line network probe"; homepage = "https://ooni.org/install/cli"; license = licenses.gpl3Plus; From 059ba12eddaca35bbf8dc6dac2c803476f689034 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 04:57:27 +0000 Subject: [PATCH 027/110] tgt: 1.0.85 -> 1.0.86 --- pkgs/tools/networking/tgt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 6ce4d96d7653..8de6a67faedd 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.85"; + version = "1.0.86"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hjP+1uBcUfIFdRd0gbZXR+VsAF+6QrvV3//GrQhOKWc="; + sha256 = "sha256-xQzTGFptw/L+o8ivXGTxIzVFbAMrsMXvwUjCFS4rhdw="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; From d286464ec3ea208f1bd1b92b9bd7f11eb99ae61f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 07:38:03 +0000 Subject: [PATCH 028/110] fioctl: 0.31 -> 0.32.0 --- pkgs/tools/admin/fioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 4ade3c16cd03..b833fc1c0898 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.31"; + version = "0.32.0"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-A5XRokrYRENaw0poq9e3o2OwCPn0GZaAT2fPjYu3p0M="; + sha256 = "sha256-3k3FoRU1yCtntVe3WTGUuhIBTD6KRvSsDISbjmNvzQI="; }; - vendorHash = "sha256-g8sTQXUk162SlA1iLEMGZ6O3FvF+8v/XINtZR8o0m8U="; + vendorHash = "sha256-hSllpWjiYOBbANCX7usdAAF1HNAJ79ELK92qEyn8G1c="; ldflags = [ "-s" "-w" From cb361de4e7a1222b253b6f2d4c4de090e529b576 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 08:35:39 +0000 Subject: [PATCH 029/110] evans: 0.10.10 -> 0.10.11 --- pkgs/development/tools/evans/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix index 1591959f7ccf..a9ea7bc2f8a4 100644 --- a/pkgs/development/tools/evans/default.nix +++ b/pkgs/development/tools/evans/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "evans"; - version = "0.10.10"; + version = "0.10.11"; src = fetchFromGitHub { owner = "ktr0731"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4MPb2sEdjcfu7Lupeplpj+3ebEfJB/Obf7fhoa8EZTY="; + sha256 = "sha256-V5M7vXlBSQFX2YZ+Vjt63hLziWy0yuAbCMmSZFEO0OA="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-oyFPycyQoYnN261kmGhkN9NMPMA6XChf4jXlYezKiCo="; + vendorHash = "sha256-oyFPycyQoYnN261kmGhkN9NMPMA6XChf4jXlYezKiCo="; meta = with lib; { description = "More expressive universal gRPC client"; From d6effdc692304be756e5b84dbace75e90c37aa2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Tue, 28 Feb 2023 21:23:57 +1100 Subject: [PATCH 030/110] rubyPackages.fiddle: add libffi to dependencies --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9a0c93038b45..644641a4ffdf 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -221,6 +221,10 @@ in buildInputs = [ libffi ]; }; + fiddle = attrs: { + buildInputs = [ libffi ]; + }; + gdk_pixbuf2 = attrs: { nativeBuildInputs = [ pkg-config bundler rake ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; From 9676505649de376abec72bc104c5f37458375bd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 10:25:31 +0000 Subject: [PATCH 031/110] flyway: 9.15.0 -> 9.15.1 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index de8e09d3e16b..3e3a137a5769 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.15.0"; + version = "9.15.1"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-/rK7Kd1ofz1D7/o/yMFXS2YBklOEA7jExuYPpnX9xko="; + sha256 = "sha256-Ls7PGvpFfXEz93P+VSkI/w+mGjZPJr+Wrf+QdaDFtqE="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 9900c9eaad0662e6beffe6942b30fb362dbce1a1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 28 Feb 2023 19:12:16 +0800 Subject: [PATCH 032/110] mautrix-telegram: unstable-2023-02-16 -> 0.13.0 Changes: https://github.com/mautrix/telegram/compare/354b49d9e5f91f913b5fdf9288bc631a9a34d142...v0.13.0 --- pkgs/servers/mautrix-telegram/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 79864978af49..7e2b4bfbcab0 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -8,27 +8,27 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.28.0a1"; + version = "1.28.0a3"; pname = "tulir-telethon"; src = super.fetchPypi { inherit pname version; - hash = "sha256-Kf7S5nSvedhA5RYt5rbTxBiQq6DGwHJ5uEYxd9AsYIc="; + hash = "sha256-N1XQGpjfyUqcT+bsSBxC5Purvnd/+4NzVzMhiaq5yDo="; }; doCheck = false; }); }; }; in -python.pkgs.buildPythonPackage { +python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "unstable-2023-02-16"; + version = "0.13.0"; disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; - rev = "354b49d9e5f91f913b5fdf9288bc631a9a34d142"; - hash = "sha256-zdK/0jgw++YwSzP8qs1BqInQlFOoM63TeI1jF1AqDnk="; + rev = "refs/tags/v${version}"; + hash = "sha256-AfCo2uHOcSNCWXgrCLzJwl0Dj8n9Asdqm19wk0OeXgQ="; }; format = "setuptools"; From a4bb6c3c49e2c78290832d34254fda7fb16bbf4a Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Tue, 28 Feb 2023 14:58:51 +0100 Subject: [PATCH 033/110] devspace: 6.2.5 -> 6.3.0 --- pkgs/development/tools/misc/devspace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index b34c460fa16c..fb8767edc89c 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.2.5"; + version = "6.3.0"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-IdJlYCoI8wTl1kIY5M5Lfn+Y9WjSZkLuWI5pFsfAO0I="; + sha256 = "sha256-ISyimfjTWU4niGeL8cSRRsUMNq3OQOvKJw7MCbY0K7o="; }; vendorSha256 = null; From cae5a65c90871aaeeb346e0d986b9de1310a66af Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 9 Sep 2022 21:00:03 +0800 Subject: [PATCH 034/110] pantheon.mutter: 3.38.6 -> 42.7 https://gitlab.gnome.org/GNOME/mutter/-/compare/3.38.6...42.4 https://gitlab.gnome.org/GNOME/mutter/-/compare/42.4...42.7 --- .../core/mutter/3.38/drop-inheritable.patch | 132 ------------------ .../mutter/3.38/fix-glitches-in-gala.patch | 27 ---- .../core/mutter/{3.38 => 42}/default.nix | 26 +--- .../core/mutter/{3.38 => 42}/fix-paths.patch | 0 pkgs/desktops/gnome/default.nix | 5 +- pkgs/desktops/pantheon/default.nix | 2 +- 6 files changed, 10 insertions(+), 182 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch delete mode 100644 pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch rename pkgs/desktops/gnome/core/mutter/{3.38 => 42}/default.nix (76%) rename pkgs/desktops/gnome/core/mutter/{3.38 => 42}/fix-paths.patch (100%) diff --git a/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch deleted file mode 100644 index 7374e1b86935..000000000000 --- a/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch +++ /dev/null @@ -1,132 +0,0 @@ -From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= -Date: Sat, 19 Oct 2019 13:26:05 +0200 -Subject: [PATCH] drop inheritable - -Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 - -We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. - ---- - config.h.meson | 3 +++ - meson.build | 5 +++++ - meson_options.txt | 6 ++++++ - src/core/main.c | 11 +++++++++++ - src/meson.build | 1 + - 5 files changed, 26 insertions(+) - -diff --git a/config.h.meson b/config.h.meson -index 0bab71848..202fb7ed1 100644 ---- a/config.h.meson -+++ b/config.h.meson -@@ -58,6 +58,9 @@ - /* Xwayland applications allowed to issue keyboard grabs */ - #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES - -+/* Defined if libcap-ng is available */ -+#mesondefine HAVE_LIBCAPNG -+ - /* XKB base prefix */ - #mesondefine XKB_BASE - -diff --git a/meson.build b/meson.build -index 3322bd3b1..01c8020fa 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' - libcanberra_req = '>= 0.26' - libwacom_req = '>= 0.13' - atk_req = '>= 2.5.3' -+libcapng_req = '>= 0.7.9' - - # optional version requirements - udev_req = '>= 228' -@@ -131,6 +131,7 @@ ice_dep = dependency('ice') - atk_dep = dependency('atk', version: atk_req) - libcanberra_dep = dependency('libcanberra', version: libcanberra_req) - dbus_dep = dependency('dbus-1') -+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) - - # For now always require X11 support - have_x11 = true -@@ -256,6 +258,7 @@ have_core_tests = false - have_cogl_tests = false - have_clutter_tests = false - have_installed_tests = false -+have_libcapng = libcapng_dep.found() - - if have_tests - have_core_tests = get_option('core_tests') -@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) - cdata.set('HAVE_SM', have_sm) - cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) - cdata.set('HAVE_INTROSPECTION', have_introspection) -+cdata.set('HAVE_LIBCAPNG', have_libcapng) - cdata.set('HAVE_PROFILER', have_profiler) - - xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') -@@ -465,6 +465,7 @@ output = [ - ' Introspection............ ' + have_introspection.to_string(), - ' Profiler................. ' + have_profiler.to_string(), - ' Xwayland initfd.......... ' + have_xwayland_initfd.to_string(), -+ ' libcap-ng................ ' + have_libcapng.to_string(), - '', - ' Tests:', - '', -diff --git a/meson_options.txt b/meson_options.txt -index 73aa7adde..8bfaacd9a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', - value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', - description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' - ) -+ -+option('libcapng', -+ type: 'feature', -+ value: 'auto', -+ description: 'Enable libcap-ng support' -+) -diff --git a/src/core/main.c b/src/core/main.c -index 7f4f666d2..b27968f13 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -66,6 +66,10 @@ - #include - #endif - -+#ifdef HAVE_LIBCAPNG -+#include -+#endif -+ - #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) - #include - #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ -@@ -670,5 +674,12 @@ int - meta_run (void) - { - meta_start (); -+ -+#ifdef HAVE_LIBCAPNG -+ capng_clear(CAPNG_SELECT_BOTH); -+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); -+ capng_apply(CAPNG_SELECT_BOTH); -+#endif -+ - meta_run_main_loop (); - meta_finalize (); -diff --git a/src/meson.build b/src/meson.build -index 90d80734f..a9fffa2c2 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -18,6 +18,7 @@ mutter_pkg_deps = [ - glib_dep, - gsettings_desktop_schemas_dep, - gtk3_dep, -+ libcapng_dep, - pango_dep, - ] - --- -2.23.0 - diff --git a/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch b/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch deleted file mode 100644 index 973768239792..000000000000 --- a/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a58ace29db48f98ad59f4f309d49b458c68a6eec Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Wed, 28 Jul 2021 22:08:11 +0800 -Subject: [PATCH] Fix glitches in gala - -Co-Authored-By: WORLDofPEACE - -This fixes issues for users of mutter like in gala[0]. - -Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 -[0]: https://github.com/elementary/gala/issues/605 ---- - clutter/clutter/clutter-actor.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c -index febfb31918..71906000c0 100644 ---- a/clutter/clutter/clutter-actor.c -+++ b/clutter/clutter/clutter-actor.c -@@ -15926,7 +15926,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) - if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) - { - priv->paint_volume_valid = TRUE; -- priv->needs_paint_volume_update = FALSE; - return &priv->paint_volume; - } - else diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/42/default.nix similarity index 76% rename from pkgs/desktops/gnome/core/mutter/3.38/default.nix rename to pkgs/desktops/gnome/core/mutter/42/default.nix index 464cd285a780..b2c1ccc43b1c 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/42/default.nix @@ -15,6 +15,7 @@ , zenity , libcanberra , ninja +, xvfb-run , xkeyboard_config , libxkbfile , libXdamage @@ -47,32 +48,16 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.38.6"; + version = "42.7"; outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mxln9azl4krmknq2vmhd15lgpa2q7gh7whiv14nsqbr9iaxmg2x"; + url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "OwmmsHDRMHwD2EMorIS0+m1jmfk4MEo4wpTxso3yipM="; }; patches = [ - # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking - # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 - ./drop-inheritable.patch - - # Fixes issues for users of mutter like in gala. - # https://github.com/elementary/gala/issues/605 - # https://gitlab.gnome.org/GNOME/mutter/issues/536 - ./fix-glitches-in-gala.patch - - # Stop using source_root()/build_root(). - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/6288763671692edbc953a2b80225e9a7c7fc87e7.patch"; - sha256 = "immnfZiY+Cgu7xTbo5y8xs0olTa6UGsKgDJ1Xhkhns0="; - }) - # Fix build with separate sysprof. # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 (fetchpatch { @@ -111,6 +96,7 @@ let self = stdenv.mkDerivation rec { mesa # needed for gbm meson ninja + xvfb-run pkg-config python3 wrapGAppsHook @@ -156,7 +142,7 @@ let self = stdenv.mkDerivation rec { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; passthru = { - libdir = "${self}/lib/mutter-7"; + libdir = "${self}/lib/mutter-10"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' diff --git a/pkgs/desktops/gnome/core/mutter/3.38/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/42/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/mutter/3.38/fix-paths.patch rename to pkgs/desktops/gnome/core/mutter/42/fix-paths.patch diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index ae8bc2bc1302..1e2c79eee928 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -96,8 +96,8 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = callPackage ./core/mutter { }; - # Needed for elementary's gala and greeter until support for higher versions is provided - mutter338 = callPackage ./core/mutter/3.38 { }; + # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided + mutter42 = callPackage ./core/mutter/42 { }; nautilus = callPackage ./core/nautilus { }; @@ -271,4 +271,5 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-documents = throw "The ‘gnome.gnome-documents’ package was removed as it is broken and abandoned."; # added 2022-10-26 gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26 + mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 } diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index defa583e98a2..cbd197afed8e 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -40,7 +40,7 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = lib.teams.pantheon.members; - mutter = pkgs.gnome.mutter338; + mutter = pkgs.gnome.mutter42; # Using 3.38 to match Mutter used in Pantheon gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon338; From 3a97d63d5c4f06c3909fc7a78f6c6e65ead4478d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 9 Sep 2022 21:19:39 +0800 Subject: [PATCH 035/110] pantheon.gnome-settings-daemon: 3.38.2 -> 42.2 https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/GNOME_SETTINGS_DAEMON_3_38_2...42.2 --- .../{3.38 => 42}/default.nix | 38 ++----------------- .../{3.38 => 42}/fix-paths.patch | 0 pkgs/desktops/gnome/default.nix | 5 ++- pkgs/desktops/pantheon/default.nix | 4 +- 4 files changed, 8 insertions(+), 39 deletions(-) rename pkgs/desktops/gnome/core/gnome-settings-daemon/{3.38 => 42}/default.nix (60%) rename pkgs/desktops/gnome/core/gnome-settings-daemon/{3.38 => 42}/fix-paths.patch (100%) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix similarity index 60% rename from pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix rename to pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix index 4a09956c4b54..e05040cc6e4c 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/default.nix @@ -39,16 +39,15 @@ , nss , gcr , gnome-session-ctl -, pantheon }: stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.38.2"; + version = "42.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "136p3prdqvc0lvrcqs4h7crpnfqnimqklpzjivq5w4g1rhbdbhrj"; + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA="; }; patches = [ @@ -63,37 +62,6 @@ stdenv.mkDerivation rec { inherit tzdata; }) - # Adjust to libgweather changes. - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch"; - sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg="; - }) - - # Fix build with new meson - # plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments. - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch"; - sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ="; - }) - # meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True) - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff"; - sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY="; - }) - - # Port to gweather4 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/66cae69ad82cfc59435016fba737ce046ffb7e66.patch"; - sha256 = "zf8/rkKdQQFNV/qx/jo4kx1KoLl7SUSu4/T1OBGrZ4c="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch"; - sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM="; - }) - # Use geocode-glib_2 dependency # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300 (fetchpatch { diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/fix-paths.patch rename to pkgs/desktops/gnome/core/gnome-settings-daemon/42/fix-paths.patch diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 1e2c79eee928..155d8413ee2a 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -75,8 +75,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; - # Using 3.38 to match Mutter used in Pantheon - gnome-settings-daemon338 = callPackage ./core/gnome-settings-daemon/3.38 { }; + # Using 42 to match Mutter used in Pantheon + gnome-settings-daemon42 = callPackage ./core/gnome-settings-daemon/42 { }; gnome-software = callPackage ./core/gnome-software { }; @@ -272,4 +272,5 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26 mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 + gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 } diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index cbd197afed8e..a96cce755c97 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -42,8 +42,8 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = pkgs.gnome.mutter42; - # Using 3.38 to match Mutter used in Pantheon - gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon338; + # Using 42 to match Mutter used in Pantheon + gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon42; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; From 6eec505196c94945703a197b6aee07aabf85d9fe Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Oct 2022 08:11:35 +0800 Subject: [PATCH 036/110] pantheon.gala: 6.3.1 -> 7.0.1 We are delaying gala updates since Oct 2022 (6.3.2) because those versions are not shipped in elementary OS 6.1 and not many users test them and I decided I cannot properly test them. So instead, we manually backport patches that we can confirm fixes issues people care. We mostly manage to do that. Starting from 7.0.0, this is shipped in the new elementary OS 7 stable release and used by more people. It still contains some regressions compared to our patched 6.3.1 but should be usuable in most cases (when you only have a single display). And starting from 7.0.1, support for older mutter is dropped, and some of the fixes are done together with large sized formatting changes, making manual backport much more harder. So I decided that this will be a good chance to ship this to NixOS users. --- .../pantheon/desktop/gala/default.nix | 69 +------------------ 1 file changed, 2 insertions(+), 67 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 2a6c79666b3f..89e035d86901 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -26,83 +25,19 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.3.1"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-7RZt6gA3wyp1cxIWBYFK+fYFSZDbjHcwYa2snOmDw1Y="; + sha256 = "sha256-YHmmF9tYDgMieLCs9My7NU16Ysq4n2sxWT/7MpaerkI="; }; patches = [ # We look for plugins in `/run/current-system/sw/lib/` because # there are multiple plugin providers (e.g. gala and wingpanel). ./plugins-dir.patch - - # WindowManager: save/restore easing on workspace switch - # https://github.com/elementary/gala/pull/1430 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/1f94db16c627f73af5dc69714611815e4691b5e8.patch"; - sha256 = "sha256-PLNbAXyOG0TMn1y2QIBnL6BOQVqBA+DBgPOVJo4nDr8="; - }) - - # WindowSwitcher: fix initial alt-tab switcher indicator visibility - # https://github.com/elementary/gala/pull/1417 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/e0095415cdbfc369e6482e84b8aaffc6a04cafe7.patch"; - sha256 = "sha256-n/BJPIrUaCQtBgDotOLq/bCAAccdbL6OwciXY115HsM="; - }) - - # MultitaskingView: fix allocation assertions - # https://github.com/elementary/gala/pull/1463 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/23c7edeb0ee9b0ff0aa48c1d19fbd1739df7af78.patch"; - sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI="; - }) - - # Work around crash when receiving notifications - # https://github.com/elementary/gala/pull/1497 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/8842e576e3e8643a018d506605f80d152e3f5cec.patch"; - sha256 = "sha256-xu9Rh7TH0ccRU1TInTNTm+dDaCXj5aaEwDw3rBW02q8="; - }) - - # ShadowEffect: let Clutter know the shadow's size - # https://github.com/elementary/gala/pull/1500 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/34a208e26d2ee0bf4a1689c8ad6ddfc06c540ff8.patch"; - sha256 = "sha256-KPIXNWTlKGc3JImt82t5lmcMu0bqrPx1JNv+TbsxhOg="; - }) - - # Fix awkward two-finger scroll in multitasking view - # https://github.com/elementary/gala/pull/1499 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/c175d2662dd05e940a5b3311cc9dc285242b7fc5.patch"; - sha256 = "sha256-xsxYDagPmaNSZO/Cj7NjPqBHCc1hrqvpboAvPIg9P58="; - }) - - # Fix crash when monitor is turned off - # https://github.com/elementary/gala/pull/1491 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/1487660812a343e6a6178881e6e7b25c2405cece.patch"; - sha256 = "sha256-YsRaWmDSg0h0RFTUOoMxlNcKoA4MNa8AhW1GGmk8qLA="; - }) - - # Fix quick zooming (next 3 patches) - # https://github.com/elementary/gala/pull/1501 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/b9c5c9c79a045c3eef7695f74f82d851438ba7e2.patch"; - sha256 = "sha256-PGjf/B/7UQxpW0Pby7ZXuMoDlamZwEaDvaN9PaRulHU="; - }) - (fetchpatch { - url = "https://github.com/elementary/gala/commit/49d3ddae5b631027466ff528c2935e05a8f5dc3f.patch"; - sha256 = "sha256-hvm2GcqiMYYxOLpQFXdyz325jZme7W+VYipu5goKoiU="; - }) - (fetchpatch { - url = "https://github.com/elementary/gala/commit/45126e4c2d3736e872c05941a2047a54788cd011.patch"; - sha256 = "sha256-LdhFFFNwvF1p1LqJXer8+DOgAptiHZHlfnQBwVEIZjo="; - }) ]; nativeBuildInputs = [ From 7f1e79239be0d65634dadede08e6f3c658728a38 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 17 May 2022 21:58:41 +0800 Subject: [PATCH 037/110] pantheon.switchboard-plug-mouse-touchpad: 6.1.0 -> 7.0.0 --- .../apps/switchboard-plugs/mouse-touchpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index b71f6ee36ac5..160319f0e160 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5"; + sha256 = "sha256-iXkNdUMHa0IF2FLn34/6G4w3m53GRZun8yzc8dxAg20="; }; patches = [ From 5d5e8537018986a131e76a0e8f0b83ddf38aedc0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 17 May 2022 22:09:15 +0800 Subject: [PATCH 038/110] pantheon.switchboard-plug-keyboard: Adjust GSD & Gala schema change --- .../apps/switchboard-plugs/keyboard/default.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 5ff6a7de4b05..0b9c3213b3d2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , meson @@ -39,19 +38,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit ibus onboard libgnomekbd; }) - - # Revert schema key change that requires new GSD and Gala. - # TODO(@bobby285271): drop these in #196511. - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-keyboard/commit/555e9650bb8f74a7664e2393c589fe6664954a88.patch"; - sha256 = "sha256-koSTYLPRh9rOyxmJPtrj/fPuu2jb1SKZu6BwKsMvAmc="; - revert = true; - }) - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6ebd57673b45cc64e1caf895134efc0d5f6cf2be.patch"; - sha256 = "sha256-Ezsh0t1/909MHCB2EJEnl4kcnXngshNYgrmqUQsfsaY="; - revert = true; - }) ]; nativeBuildInputs = [ From 3da565c170edd16efa5503f958005d8184dc9c5c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 17 May 2022 22:14:35 +0800 Subject: [PATCH 039/110] pantheon.elementary-shortcut-overlay: 1.2.1 -> 2.0.1 --- .../elementary-shortcut-overlay/default.nix | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 94d461a590ac..f249a091572b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,58 +1,44 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson , ninja , vala -, libxml2 , desktop-file-utils -, gtk3 +, gtk4 , glib -, granite +, granite7 , libgee -, libhandy -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "1.2.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "shortcut-overlay"; rev = version; - sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM="; + sha256 = "sha256-YVeCO7mZmf+FEY4d8tvC76lW/HkOwQ6kw7nvmzAFEtw="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/shortcut-overlay/pull/113 - (fetchpatch { - url = "https://github.com/elementary/shortcut-overlay/commit/130f78eb4b7770586ea98ba0a5fdbbf5bb116f3f.patch"; - sha256 = "sha256-XXWq9CEv3Z2B8ogcFQAJZCfy19XxNHs3c8NToE2m/aA="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils - libxml2 meson ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - granite - gtk3 + granite7 + gtk4 libgee - libhandy ]; passthru = { From f9ea95f0df1a8a8e52f2498d8e5d75fc8f07480c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 7 Oct 2022 23:22:22 +0800 Subject: [PATCH 040/110] pantheon.elementary-default-settings: 6.0.2 -> 7.0.1 --- .../pantheon/desktop/elementary-default-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 85e0f1a28fc4..e02129cc8c08 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-default-settings"; - version = "6.0.2"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "default-settings"; rev = version; - sha256 = "sha256-qaPj/Qp7RYzHgElFdM8bHV42oiPUbCMTC9Q+MUj4Q6Y="; + sha256 = "sha256-RPnERK93GCfWyw1sIW5BitCIo11/t1koV4r1+NF5NdI="; }; nativeBuildInputs = [ From f685834edf44b1401f788dd08cc369dde6f825d3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 20 Dec 2022 13:10:04 +0800 Subject: [PATCH 041/110] pantheon.wingpanel-applications-menu: 2.11.0 -> 2.11.1 --- .../wingpanel-indicators/applications-menu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index f342642e326c..2a13ff787c61 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "elementary"; repo = "applications-menu"; rev = version; - sha256 = "sha256-pEBvFN+zYsF8CbB29rTNclwAYhw/Hb0HhLzXtijfI4M="; + sha256 = "sha256-WlRrEkX0DGIHYWvUc9G4BbvofzWJwqkiJaJFwQ43GPE="; }; patches = [ From 39caebaba5927b791d6916052a0b31ffc64c7139 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Dec 2022 10:42:59 +0800 Subject: [PATCH 042/110] rl-2305: Mention Pantheon 7 & Mutter 42 update --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 276405199ca4..b545fe3e79c9 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -140,6 +140,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `vim_configurable` has been renamed to `vim-full` to avoid confusion: `vim-full`'s build-time features are configurable, but both `vim` and `vim-full` are _customizable_ (in the sense of user configuration, like vimrc). +- Pantheon now defaults to Mutter 42 and GNOME settings daemon 42, all Pantheon packages are now tracking elementary OS 7 updates. + - The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules) - The module `usbmuxd` now has the ability to change the package used by the daemon. In case you're experiencing issues with `usbmuxd` you can try an alternative program like `usbmuxd2`. Available as [services.usbmuxd.package](#opt-services.usbmuxd.package) From ab42f6fdb48096ebd9823df9029c51d0818b4ab2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 16:21:40 +0000 Subject: [PATCH 043/110] firefox-beta-bin-unwrapped: 111.0b5 -> 111.0b6 --- .../browsers/firefox-bin/beta_sources.nix | 802 +++++++++--------- 1 file changed, 401 insertions(+), 401 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 11a4dcaf13e0..c8a8a85c3724 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1005 +1,1005 @@ { - version = "111.0b5"; + version = "111.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ach/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "19254e63153e8c5edf5d79c088fdbc879796ba8f54be89e23c543802d900b42e"; + sha256 = "1ee70baaef25a9e412c3c4b57f86bd6875390dc5e342a74aa42a1a8ed6317340"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/af/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a708040c08961278f5da8f29b3db42abe191b4b5b9ba3dd3e10a04567ae47102"; + sha256 = "20c8f0710d6bebcb51fe27e3969048a61e1957a680843751ed9c526668932e5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/an/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "3c8e0380cf389426d52986522dbfd565d94a64601859d1ed3f6a9ad42408159b"; + sha256 = "3eb9397dfbc37bb54ed8193c3c28eafcf85e3c439b50470a171a591c0ba14049"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ar/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5be388564b77463a4004c9b68751df9d000db9637500bfa41a754174c3748886"; + sha256 = "eaa2b0a1177b476a6e4da80ca11c4719872e649f7bec0ac1006bd347e6b627cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ast/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "636f556f002f1522d1d5efccff9754678cb29fbe4ad15b8fd9eba7385e5430db"; + sha256 = "637676aa8418dc6f1d3061d2dc2f6a19b80df26b5aa5b04d2fea697c417c75fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/az/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6c44ab1df3f29145e8b30153d215acfe6467234efe38be413d61eb7e59cc05c7"; + sha256 = "2e1b4ad6c88cfb4369299b952ee7c1d1ddf97461c82d496b1687a6558d008518"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/be/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "7f1dd26ecdca342f4c3cfe5c8b94db7f133cfbc4b97ff6e17184e95afd284779"; + sha256 = "6d3fac5c4402889a9fab97747e397082a75de3651c450ffde52e61b6a105d09e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/bg/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e9c99d9299f6e6aa4278c2b1c28c65df340e99da8389d87a169020d4a9d35c97"; + sha256 = "8c0a04a1d4aa8c27a1afd33251dc6b789b82c8cb2a946a4314032ee211a50d62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/bn/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "8b8fc1ec5e6a45f7d83e91a7495f0d377773ad231ba79f833830d0ff16ce27b8"; + sha256 = "fe5a611afd91bd0724d03ba65acdc5bdef79693771c769bb7ea25ead33d8a61e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/br/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "603c043a3f819921684b825f909d01824cb6c5020c2213490a62a55a7f7c938e"; + sha256 = "10beb0d6cfa7a384090e42827b200eea2bd53454aef1dd9f1a4a49f43d4d82b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/bs/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "5986105ab0660b03d0164c8cf70188f04cdd35eaf578a2a7ddba4c33b8db937c"; + sha256 = "ec8a5e0ca3484c3d422d87a09f014ab9efc0b0c0e11785233d6da72b649d24e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ca-valencia/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "4fb147419fbc6c206e3a283e6292603c9bafa45339412937d453157e215c7b1d"; + sha256 = "15a12109eb1a129fdda1171102aec0bf2e5483d10b0ca3739ec26d6433fe0d33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ca/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "589b9faf0974fd7cf581350d73ee4f916c87721b10747322e30a602688c60f74"; + sha256 = "71025d3cb8b72f0110cdf0243164115f188c1a4bd864f6ff17304f2e58190cfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/cak/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1c0975cb76cfa29316396283066ed2b08f6efbfb16a250e1a8b60d197da7892e"; + sha256 = "1a0eaad50ef10bafcfeba322950fe2d8872c3ea8d2e09146c1cb1c245bc2ddd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/cs/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d8c1202b48da5f75944bbfba947ee759b9571a57d27f6ef9efd08b14b1aa903c"; + sha256 = "06a5f8b14a92d611bb9977f7c574e498b1cf83b4a7ccf7c0517bef8cc1b5c4c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/cy/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "84e1c072a2782df9418bc44c784b72a44f4cf22c131643f0b54f3b34d09e2b30"; + sha256 = "fff902bed4909de9044a6e4217b1525a791a854ea148b0f31f0c7ab06efad667"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/da/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3dd1cbdbea1c7d72b6bcdbf40a08fa1228933ddc2f626ee427ce40877041f304"; + sha256 = "172fbee0184cb829755b0c681593de7f146156f01b8b5fa1c093549d66b091d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/de/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d65e2c6099b7edd5ebd83e971a78db6143bd8f9d88a035641136364740fecb10"; + sha256 = "4f4734b7b68fc3002250cfe3b78cb27925a7267553be5b4c86aaeefea3666f29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/dsb/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "3706a9461d5dc360e69b07c5480e23b5ceedcb0611254c2b648326843ea6be17"; + sha256 = "a29da2c2bbe243fa1b5080962b68b77260d91ea3d16b68c4033c4c683f49d929"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/el/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "90cdb28703f652d5a12b825b7c59aa2d5b4fe1d93e2a6d24945c163c05debb86"; + sha256 = "d0aa992170821e77222daaace13d059bb077e53ff38bda23a1218a99e2a4f994"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/en-CA/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "51614f990ca9e964f785814d12f38db99343d68dd7844fca4039d8a2f1506b35"; + sha256 = "b0e00806bb1d55a0c911b7e022282f3d066158401192fd432bb47e968c9a980c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/en-GB/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c3174a5a65f622deebae5066df20a118a15f992dff383614db24a577d815381b"; + sha256 = "891ca73ee7608902b4a2a0311c615bad9aff1d6514983597202c1baad26b6477"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/en-US/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3ac11a24be0344003de99baa68aac9a65e4a20102625bfc6636e5ccf33db2646"; + sha256 = "1b8650ac822e3176ef2f47e32a6deca53bb53193289dc1b63562831fad2e70a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/eo/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "776020b0572afe6ccb636bc59822504e04827f758f66e8e76e3df49a73c94bd8"; + sha256 = "0a8b46212f36890f4e7671f97a400a0a3a18583bd5fc6a112e6bdadc360a910f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/es-AR/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "7f903056dc8e26071e198c103c0ca26638c008900c725b423363202460eb9a0a"; + sha256 = "9e3df1097dec9dd8e624d974bf2266a48ec064f2b1ea3cffd6a7f6fa99672cb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/es-CL/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "07adda000db536bb9d18b040ab00bfd560c4cb9295854bd7fd10072cb34f224a"; + sha256 = "f2f91fb924b27f9449cf58439a5216e313f77b1ee607a57ed3ba64473b2c8a9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/es-ES/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "860dc74e5810c83b39b5165e6876498d937037f55cfe91a34d256711dc1bb1b4"; + sha256 = "0a6eeed4f58e19f62ba6a35d4ee59190ee3bff0c4a6194c6ce3c2a3b6d75aa74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/es-MX/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "9ca2300bc5b3dbb8c3ac1c815d13055dbb01f293accb0831725c566fb8624e3e"; + sha256 = "b10f6abce1f7e9bb7a2bd0977d2fa4d76b587c868e7636b49f95da5e1e502a94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/et/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "71dd426adc9d2442702c08f7f730979cc3a47be647e0d815f582d3c71964b85c"; + sha256 = "72478742a27db5ba63b06b4f26edc3a03b1719227cb2bb177b965c2805628d25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/eu/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8d165cb0186cf10a08e7ae9db12a66b5d17c74f0979fc42a2ee8ab87412bbafc"; + sha256 = "9a232a430c8108bd944395dfaceb1d3f350482cd10f1f3f54e30f86691c52e65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/fa/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "fed8297068a083c5fcee33b9260ab54cde35067089938b74c5f90009b88ef90b"; + sha256 = "180da12ee212d6a4d387f8d365998de80910727d8999a84d3cd23357289af485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ff/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6be655bea1f325b18d2c54af405e2c2d5e86e50701ba06e2243ae693620c2fef"; + sha256 = "892750a511be03e2e30e4cc7bb9da509f0ee027b08a7480d01f7d84f912ea648"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/fi/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e10fadd6626c84a32c4adedac2974494c91efcfe0d4616d5d1057b6374b62ddf"; + sha256 = "da3f23947dd3796dd3011dad46bde701f151a777e23290ac1519f9e06b72ec35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/fr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "03176cf601e4802ee3f79f8f68411b6532a830affc93bdc7435e16a136046052"; + sha256 = "9db563609d6d740e60606d1d1abff553c04ae2d8ad7873ec375fd15f6a2e1cf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/fur/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fur/firefox-111.0b6.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e10dd93e0e303e1a5fd974f612f9fd6111a474a18775bfbd1c06b0ac253a8417"; + sha256 = "e8fefc8bbd9f489b5eaa14c14d8c1456557b1c85fdb9188fc2ec14f7b7a53794"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/fy-NL/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "2fab67cae82e16c0edaf9c013af1e84ca2851619d6414900081596ba1c949faf"; + sha256 = "5067b3002fbcdb76b42b452d200d1fcd9cc3cedcab81d4b97aa39541fa93dc65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ga-IE/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8823e452133bb182b159d9f03b7e32a1f7614b433abcb0d752bfc5067885df69"; + sha256 = "29ad1bb43e2cf17510fe94a9bbb0f6b03149ae997ecf362cf40a74586787734a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/gd/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "948b7990094b7f0410a95525def2a81e87e93c37851a4314b1e74d79a39cbf8d"; + sha256 = "5096da1af9fc8dc358d86512f4ec416e114df0eac1d6f4a0bbae5b2a9bc37906"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/gl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d4096cecc190cdfb3aef14ecf5eeee001ea706ad9393589e8a0d6977fcfad77e"; + sha256 = "e3e68af4c1c4e6a2c5c2328584af7fbac6b1160cbe20face8d02ae713cab735f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/gn/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "8dd71f1875f37c7c38694d00f9fb2446ed98934a485bd41e9ccad115f18ca4b9"; + sha256 = "713b63f6c31f620f2d079147a1c547e3622b31cde6bbb77ac6ab764145a3624f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/gu-IN/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ef688a075d9b31fa811d48c81b912f832c96c68469f009f34e415902372da914"; + sha256 = "b2b5390fad804c3708f1a4931cfc2d182e4ae27df47fef552a44099119c6b0ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/he/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9f1919762ceff3ecd7eadf65c59a200fde9b08d40b77be6c9707f4d0aba491e3"; + sha256 = "c3287d8e8c3b4431f9b3a1da523d482372f2b461146fc5146e387176f11122bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/hi-IN/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "eb003fae389fcac98b2142fad3fd42df7390c74ab70e59babd87f96cc75eedd7"; + sha256 = "af1f514e8014a808659b7f01ec5274db11e5a682342dfabd69ba5338732af465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/hr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4b79be5190b349c38f6e2bb32b833ce5e9a84ce9fbcd792d342e2295afae058b"; + sha256 = "6039e0b4c76e1a86d0e76eb64682c6e57588b0f385249e2b88cbd280f712c5f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/hsb/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1b3f567d23503659a0b16c3d4929216266d4de8ff8e4e6b4faf5d98eb4fd43e4"; + sha256 = "2bc580b09cb87a8bee5f19ad25da43db92c61ee76d68f94ed75ba750f9074c1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/hu/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b23e06e57ae4e786ac8478014e9cefd0c0a0e25ef201cdbd66fb1a9cdde372b4"; + sha256 = "9f9b0381fe4c044020e9fc1c66203d9d521156b1050ea6ef9b9fd32197333974"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/hy-AM/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b89902489e00fd219f2ffbe259348bec208e5a31a566207164f5b1cb21ef4f92"; + sha256 = "ab640bb474b99f786546fb198439f3ec9216ca7a1e9d9ff829fe9edc869d5ad8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ia/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5fd9175c6a213b863898ed89f02e88aba6e9c3e35afbff7f1b385a2129d6c647"; + sha256 = "6146c01a30e33f05b8e33e9cb296b98c3564a413f4360bf657bd13c1e875a89f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/id/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "eb33997bb458545bdcdfff25a95293b2121389661e320c8dcf27e1af777bc633"; + sha256 = "58d8cfd0ff22c434aa897d709b7b6d9dd631448b348021641443b50c05116a24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/is/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "716f7a5164215098674aa073d2e398ade906fd353ec5625178e1a5f5507d7fe7"; + sha256 = "ae41be247d71227f68f419b81b547a71625a10ff21e93271598fc38de528d696"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/it/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1f117e0073c680cc32a411a4384015604e320bfcf31c02b79fed76d48c565390"; + sha256 = "2ce9ca925b47853ae07efe2370bac839b270c867dd650578461f37ffb109a08a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ja/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "86b9daea5874d98d79e4e1909c51d7af0d5be442bd2a01c34c324ba6dda2b3d0"; + sha256 = "36798fe697913dd15c8831fd9ba287c6e9a1ff9bfa7d57ae518055ff5f097ae9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ka/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4d2dc623b943ab041cab4e005b06ee6812cb398daa30af0ab613e6c7b13cc5fc"; + sha256 = "74e394513597d01ab3eb9ea373ed1eabe081b7ff3d14a486b5133e05784ee212"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/kab/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "cd770efcdeb528cda4cc767e2f3d384131044e3eee7bd17737801dd799d7a581"; + sha256 = "f20b4c48e5864a32c9b44068618cbf0eaec0f157398a735ef5bd66738c546995"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/kk/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "17d319eb9f8826cf1ec1a72b3dbaf4f188cf028cc9b6ce4b22eef8fc5ab8bdbd"; + sha256 = "e144c1a15cfa846be6cbf5c0bd2130c515ee36cc5f4748bcc705facd40f812a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/km/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "87f0226928a9c01279ce960e3477ab3840f0e53d71b6f8daca046c26a3621829"; + sha256 = "85a71e0baf24a1d0dd856f20b9cba5e03db6acdde4e4d19f4958c37bfdd82b6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/kn/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "2f71912f3d7ebe3d7eb411d7342e7c1373eef9602c13f4952fe748aebba95957"; + sha256 = "744e378a3a3006ddf00aacbb9ca635ca4e7bc98b1b2d63af51a3c9c2f4bf23c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ko/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "234c51e384d8b70bf01570bb55391a3f1b2dc61598d5edfc0160cbd5a70ca36f"; + sha256 = "100a1f77b83d80c319021a185eade6cb21e95036c57290ae7f0c8326c1195b32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/lij/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ac8037ba20a0c61b39344d7eb5532bb4c457d663624fad694b8b02647a36cd05"; + sha256 = "e9006a9e8ecdb35b473b34f43088609507e8e5c23656ceb1071ddf7e30254a46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/lt/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2f298758e509906d155a164edde535255dbf2d1c430a997039e77babc1d9c5e4"; + sha256 = "4d1da84d06562f7d81f0a7911ec5b0cf01f59dfa88862602cd8c554bcb8dbde9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/lv/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "eb053763b4534f87dc7b19f87cfaf43968bb799a17fc3b150dc5bb2c38dcd6d6"; + sha256 = "6b0251405bfde6ec7ce719143d56f74ec0557f5603e491ec78048e2409322c79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/mk/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "143b8ae24ee5e14726814e511d545d3bfd039f4d00f04da4d4042c50b73c0bfb"; + sha256 = "100d05845b95841cc7c084cc2657602e1c0520a7e6ae9073c9b8f33dcfbbbc67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/mr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "3a6add5b2270d46874796dcf356d9ce8a536d75e97bed45b21be5eb9022260bc"; + sha256 = "b2fd3304bb6a6f0ac370177d244ee14d973abd088152b861b4e583d9a02cd600"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ms/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4f231c42d2bf39156cb9ce5a5ffbe86ea8262514b5792994efa148c062bc97a1"; + sha256 = "0b235d44c0c77bdff0c3a5d24d16c0231145099d36a382c3e25c08f2607f6005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/my/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "495c44ac72f5a5590460151f4e71bad6010e88562919a127e3b2534d789aa81c"; + sha256 = "413625b9d9a7795db98b1597146afbb634405ac1865a56c9eda5c1c0c8ba8a74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/nb-NO/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "775cea63313bff3c27c4d9f886f3e237ebc14b359bb260988b2dcb823f73dd0a"; + sha256 = "223101645d322985b119597bf750cb811856ec081ca0109736cee556549a4a76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ne-NP/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2e0080da8787ca3cac7a2251c07918d71e7b33c4aa7a7671757b9c1fb1d3c503"; + sha256 = "fd664ec6f9f3c7d01c27dd3a538bdceded371a995cc2b4f3f5754014ee50af30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/nl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ea547bfe13e26a966a079558136779557794999c86ef1d9480146298d9bc273b"; + sha256 = "a9c71bbc38faf6485292c989a47b35ffdee930f112809c06396359107f2928fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/nn-NO/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f7dc1fd57a4667dcdad7698e7c8cb13a31c5572ad2509df1bf0675fb9296049b"; + sha256 = "67f72c9bfde8f68720e52eb96a986195edcb0fc36eb5b122ac460a6c5506f0be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/oc/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6b1b6e96d53c23510cd9ddc42c19b3be3c91882cab1119db424c863a7b4936ef"; + sha256 = "0bc28ca44d311a409fde1f628fc4f511875d7e56aebc8b234599b755a06f7d1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/pa-IN/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c672bfdeb8182561cd2bb8c81aef9743e011624bc08f018f30a537c443c946fe"; + sha256 = "28b367b1b201486bde7ea970ca1e124a1abacf99715b103e79bda7dc779aca02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/pl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b22568a6a8186a72bd9c1697ce344b0ccde4297667ae785a11766e3de63dffab"; + sha256 = "41ccdb0645ca0010dcd96659eaf7cb87eb9ae9fef24f701f196bc9f92c6b1f76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/pt-BR/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2476e99cccfdcfe2c287e48ac904810335f5bfea61b21318a1f2059a86172a6d"; + sha256 = "6ae80689d049c3dbc3b86ba8478815dcc68805f3f9a61afa286d76a4243de66b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/pt-PT/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f5fd736f86246da0024d389b7655cb5374f24825dd732e46e1d49b7a96c8bbcd"; + sha256 = "4f4533b7e443b8cde10baee0a68b3db9cab9762344c4f9376c9ff2aca34c2813"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/rm/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a13735977e6c44558cd7be07a898141e33c3447c4e48fd2565f6a9d81563f4cf"; + sha256 = "aa5e0cd6774e03884683394450abd7172180058ec02c706ba986ecbe67f387eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ro/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "0994ee387431ddcb779ba4bdb8fdcf8da34d01d893da328b28b5fd61195a637a"; + sha256 = "0f73dc37b643df022b3d914f5f544fcbadcbf1bdf85f4abb6d186cdd2ef6b730"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ru/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d3821c9744f0928b618dbbd4943e24312ba3d900fdccc6ee4cf29b7cbcc6735c"; + sha256 = "bfc9c8fe82bced904268c3cfce53c1b34066879f298ee45944812639eb8cca99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/sc/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sc/firefox-111.0b6.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "84217f54575199232230448bdb1a74a8de166da0b5bdbc26312f7917ea10b24e"; + sha256 = "fbb01fa4b75d25004cc5a79d21ca2013ab0833bd394f42867fba70c0a7091e44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/sco/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "02e628e2f03295c0036e288af36d52ae83122f5c712fd3d3fdc6fb1ab65e2d16"; + sha256 = "d73b8c6bf55b42e58410205a99d15af98bdbfec550434cd5815451955bd8598a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/si/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "098a8d5a67c600747d3ed2ecb7949a8da0f775bdcc53e23dab75a86bc7228b9d"; + sha256 = "f5d030c94c6f9a074ebbd97f18a6c14eeef9b00f73d11421614d1cf7e4b05efe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/sk/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5488cf8ed079cea6be82f6beecc8f9271d60d8c2b5c2df9b11e6f5bfb3167b6a"; + sha256 = "8c6b3810988ba862c2419e583f3d14dd9722dfbf7c1a55d7e72b9d09cd2d46d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/sl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f1268f144281bce4ba4995d94383fd072bcd81b103db50e178ade9465c8afc8b"; + sha256 = "8aa97c4ce2484735a009399ebeeadc8270fbce1806890ae17e5d42b6bf69338d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/son/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "b667570aff0bcb8ccee80c1fca5673340aafafbded97213a36068828d2af6f1c"; + sha256 = "57018f57ba6721ff11b5944e6b1d1825894ddd5b422b6bb3c1730be31437aedd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/sq/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "184a24c69d69c861f380c068c68adf1fd0e0051a3bf7bce506c9959d2fa75237"; + sha256 = "48f5b50ad9f7d96ddc26b091f70c195e7f1abcce1347de74cc994364a47e045b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/sr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a68dfdfaf3840eb11e6f526186852bbe6d7560ed47ca94397eb0b64b2ca43b07"; + sha256 = "d69e319133bc57559273111e85d573389151e841bc4381b909fa767a4b7fa634"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/sv-SE/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "332d63a461de0c795b6376e2d854e49d6898e5f81e451b3c14404359631c6024"; + sha256 = "1e06f9e2071c846aa703ee1da367512ba27f5854237e041b6c1f03ef2d8b3c07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/szl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "05ec6dcc4d7afce3231876440644ff44b2269b91e33af289f50b3af9617efe35"; + sha256 = "ffbec68627bb7660a2a5e55982e4405d74d48d56912506aca96ec42198e82337"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ta/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "e85467ffef712a367c03a8ab11c6d07ec5fbab0daac7df10bdeb2465d0854b0f"; + sha256 = "add9451aaa5c20c3b963fda1cc0e75eb4ba4b84311f10ba405c10b8392d78ab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/te/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a2241f4bf3fa1d6a05317dcc923cc68a9a18af796f2b206ee6bf106527343fe4"; + sha256 = "da0772a5156e0ec08a5ce30c6ee7dc9cefe51cfd72790cbc53d6f2f3eb25a8e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/th/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "47810b41d92abc50f26fd363eb186d54078a5caa920667ba5396a39a7fbecfb5"; + sha256 = "604d1b9e09334a639164dbbf5c3b974cbdfd0607d0823cb154381a406e43997d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/tl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "a5e95e77ce80963cf7e3f40ec8c9fb22082bf682f133a9b257fa554b79d448c4"; + sha256 = "2e1469c867e54ad1c6ba8504cf594ebb2f7167f619dce35073bc19c42f0db52f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/tr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1afd28e165306bb823ff457d1e2556e57aaaf7eaecabf6b5e1fb4b4f45f4092a"; + sha256 = "3310fcff33e6e6c93a17f73ef9a4c7557245e6881b87fef89fba61e24cf18aa6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/trs/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3b51ba4f362f6f25cc98b307d1f3b97170bc33634018813982403f686895a77a"; + sha256 = "e9efa109578943b4779a89206ff2d096c4067bc996789d1a5a28885978a9acd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/uk/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0b5fd533404167465126e64f4c6484452b6773d7cd20dd14131ebc203fd08135"; + sha256 = "b83faddf077b8c346b5ca76c7e78c23bdcaabd7b2edef2747a89de5eff19179b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/ur/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e9e3c530a65afcb673e92ea08657b3ad87c11c7b63ab8cb75a992b7049c4cb4f"; + sha256 = "610732c62364f6c4a5873ba4003d549011eb424e312795749d76c58fe90c85ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/uz/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f66923bef085ba1275012cf385bac78eab682cecf8f43a9f04d6c1c9e61b09d4"; + sha256 = "d0da17dac024d6cc3e636408f4736f586fc6695dd6b6614166ce4d6cf9321761"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/vi/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "9450b40e26043bb28e7cc17f692aae93df72af14cfb88d87e50b5c8ca8240c6c"; + sha256 = "e90b17a36ea6dcd9189e1c6b0d8f152b0d56a852922ddf9e4ca9abf3bed724dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/xh/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ea9d15b493062b2bef3543bec72f78fe94e9f91f0dd656555ece6cdcf503e2d1"; + sha256 = "5d8fd0e91d7c8e3930a4be87560d6293680bd17f7e275ab619b23b772093ec95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/zh-CN/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "795ae9309c78b37c0d3c4848370bb6b4fc32dccadb935cf64bb6c753b18acc22"; + sha256 = "e67450564d27eeb7e605b673ccebd86924195a76d6eb7aa52603f1d8e3198f57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-x86_64/zh-TW/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "ded2bae5397828215f5b6dc1dbfc96be7dd37bf9ede20cdd93c3664e6ff5fbe1"; + sha256 = "7822b37160091511fc120ab7c6d11ebaab8cd601e1c4c89931140917a28f6e6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ach/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "2f92a1f1ff84dc08f6497693de065568343155faa75e95f3c7103acf098957f2"; + sha256 = "67c634da5c832ad7d39088b397d0e34c69837e0e6c36604ffef4ada917df9341"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/af/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "25879d99d681c6293280a1fd1d7a4ec2fb0b72ee3f27ad033ff1ca3a809e3b1d"; + sha256 = "c08af1538f18f6c19eaad1c830b115ae168db2b5554e223f5be985e57e156e6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/an/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "0df1fd052e9454643a5bbff6b025929864102f81aca89e838db4a098705b58f7"; + sha256 = "922d7f8217b29e2bd22c237b47db29fe510a33587df0281cbc55ed75da17dac3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ar/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "21dcd08a61f4c9baed087824d087bd9518602ed7cca57b56dd3801ff59678f11"; + sha256 = "68f64732c29def431f7d87fc90d35e3fcc74f8e284c30ec959f2ef8a5fce4445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ast/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "392575a18ff97347f43ecc7f3441511e8747f38328266e1cd8a084ad9defaac2"; + sha256 = "423ffa467fd8001614882e36aa26857dcaa9466fdd3a819decd7cd5816ae7ffc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/az/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "919d3d128ee9e578ce75f58ec398886d9a6e37bb922ecbd23f69fed0198f55c4"; + sha256 = "5d349b29dca8f2e3f8b7f3815811c87e2bdea47c0686dd6bb2272546d4c94586"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/be/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e5dd4bf98c533ad188b1f434d98ae291822928565a7c6def7275cb601f7979ed"; + sha256 = "8c9d2818217257bfeca1aff0250530fdaad569436f1c9218fa8ff839bbeb42fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/bg/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "7d8df56b0211003d64f83f920bc7e0a045428b8bab70fc6e7eac0b521fd47b02"; + sha256 = "1ea72a0bc20a3c5a986ae5d2ec43e6347b0631f21e98ef9d2e5847e76e6686b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/bn/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "33285f5b9e4b5aaed29aba1fcd017a8bd579b68d337b0fdfbd6e59cb6c8c267d"; + sha256 = "895b803948074af1c6b4fcc12a17594179a5af35d58b3a85ece79e40cea6d56b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/br/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3859b8fda9aafa704490477704ebe40e34092d4467238670cdcd7047c5ea6bf8"; + sha256 = "87c6538c14fb8e51c464df8e3b6999f0fc8cd20ac3b1285d5a0856271f9fd1fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/bs/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "97237ed9177f1d89be0a5a3dc2451e7b565fb698329f4c8d36a22ee048f1ae18"; + sha256 = "7085d95b9d9afdf17becec98b86a76d815cddb3fe43cbae15831156daeda337d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ca-valencia/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "6792f5f5f7683299db1fadb68482f37d43e7ed3b5d0b86ef1c3a44f733b4a5cd"; + sha256 = "251524d2ec9988ca5d72128cc4de2ad0aa4a80c576a1517dc27081fe158c99b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ca/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d2dc812bf9872241863e74960c9ce04c44345dd76c00d6c737d172dab44f3027"; + sha256 = "ef87a4bb863140d72542e7cc02172028bac7781f806d0f52d51339acc7d49efa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/cak/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "4332c7e26e3c4dcc9c11eb9cc0087f2874a13a9a0b6bbdf97abf5b90191bac34"; + sha256 = "37d34d26264da9ce96829d5c2cb7ab1156c9420043a3d6cea7ef4e87256b9417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/cs/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "71f899babd231d38d9fbf2be8a64f93ac491336cd2a694f20e0e9187bfd641bd"; + sha256 = "463e68256aa98781f77c8a2467f58c40a89ff43ba38d728fba648b4f76da0850"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/cy/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "09cfa616b23cc9a8dace77a166d6dd34a3871a6c85246825ea8b9698f9d1abf6"; + sha256 = "a479727e6546452cd4ad14f90fbb48136f336734abf0dc0e92a56065ed4679c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/da/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c314f0baf73ff74f3276fbae88efb69309779f8fa665fb87c8af91eb182f8660"; + sha256 = "a39b122fbef49420cbe7c12b0cfda10a061ba644aba36e77971b08bfaa213862"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/de/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f13fdc469bed9adf665f919320fcaf69f151ff8a962a53a630e8ced9b6b29737"; + sha256 = "e653f75cb2e7616389e93737a2bba59c7422a11ca7cf7f670fc9c868fc089be2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/dsb/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "3f41ae9a15119727aadc47b61509bd45a2bdf98c10c392c7dfdab5df342f373b"; + sha256 = "d9b02475bf5146d232f8fb2e96b4da93142c2a4090addb9fc8f636d38de021b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/el/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b38866c02e5d30831ad7792e95c69075ba18c5f15e94531c4cd082b2f7399b4b"; + sha256 = "dfdc5682800de16e0327549b1f444eff08bf6a4cf5a38d9cb7a6909207afd324"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/en-CA/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "5b0b5081a229f58ed28eb78e6614183cdbdf99c8a8188cf523dab0f64050a51e"; + sha256 = "81e9791af2c7a896c38a752178b9fbff6da0f95ae84ae0fc0a0b315161b4b8f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/en-GB/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "241f1863cd6c18b84ece46b886cbbaaf5cfb979285b4aad741cfc0c0f474a9da"; + sha256 = "59083c9ba66dbd20079d96f24e94fb44d9152dcc973f4e283574de0ca3818dee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/en-US/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1de5fe9d2c8146517fbe7968f9f9921508ee92c3e815f80e3fad8cb658b88f1d"; + sha256 = "6fb7a30e23479614dc4f77b728af3736bac41af0a9f45a43ad776d5c0b22e260"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/eo/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "f6229f19758239ab2e8633f9080eea35bdcc314be4b42a7a92bb8ef0d1118e12"; + sha256 = "5af5000ff60d6c647317d9026bfe75b2af93fa7078414d9ca7e33d078e894b5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/es-AR/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "31b083c6b6473b06c88fa696899dba171661c960caf75af2b90abc34a618a0c7"; + sha256 = "ec88b3bb69c589cac44b07194904c73dd77b6ccb6cf4f0df5b3d668f70a96968"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/es-CL/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "d9f33c62a415dc13aed56e44f12fd63b85d2bf738785b6a473cf4ef117a4bd57"; + sha256 = "9b459d0782b0e2d7efe60a23bb3f81d546978f5bc8e230644de8fe3618231c06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/es-ES/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4c0a9e9a7bb9cfb02b619cc5b0a1aeb9734330ee0b82446508353364de0d7a66"; + sha256 = "35f382b4387d8f4b89fd9ea9dd73da1765098f00942714e5de39ff51230a54f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/es-MX/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d8a313c8e4c6b9837b156ef42607ca60a2646cc030b97c986ade5d126e2c0f27"; + sha256 = "90d90cb11ca58f16018b270608882754ffcf89503811f4d17ca14645e1935284"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/et/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3ddee12243875d9cc1fd8559341d700ebf8fa313309ec7c44821e4eb0cec4022"; + sha256 = "92ee0798472b4c17c0d30145ec4db414ba0f641b1f58904d43726d6cad826149"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/eu/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "63e0743b08d3b99c339fec0de70372984e47d17c11e747cedd151721e7f905ea"; + sha256 = "76fb6ee46121973a20a8edc737781980e04ced07761418e0d9d9121eb0209585"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/fa/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "fd617b5cdb46c07fa9940ef5f295619f5732e8c0a8a7f81ebba151411f3cbba7"; + sha256 = "ebf40f448c55b455da214a4822c83b55f6a7010101167eeefa0ee7b554802f66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ff/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "211e3ce0447aaddecf5010abed78bada819046fb63939fb8c0b443c6daf1b8cc"; + sha256 = "861bc300603dae711b152cf20b8be1f6a6247c8e1c87b92dd44c30e71f5437a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/fi/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "1eec8c3ebf2e1e14eb7da4b57ec7010bc38a97b8900bb76b29ea623470246033"; + sha256 = "4fdd7c7eda0730a168d913f437435dd0f46e3e97a69bfa7b7e3abd3817e81edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/fr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d3077f73273f6d588bc3f05486a9180963ccf8465655a7a7b7624560d0290b0a"; + sha256 = "3b17ff465c8956ab8baaa71ee3eb7fac5ff12daca655629ed7d50b0ee0500253"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/fur/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fur/firefox-111.0b6.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "5ab909cd83424b7a40e79869d535577a55f7d10a4b1e342f18c4e06d82ad8f19"; + sha256 = "efdea88bba602a91e2935f6dd53f874f8ef1fb33ccba045b5392c25650a85637"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/fy-NL/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c0a276b7562ee58fb85f831c9f822a96f1d643eb2627db79d1c6cdc879a2852a"; + sha256 = "8c75c2bb5f61b94f9a44027293340532e104b5899f7e4555b27a00d3bb2ad4fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ga-IE/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fbe049445a4aee5a7c8b633436fde9964694e6a7497fce8aaac1b4e80a8fd4f8"; + sha256 = "21853766ad4f9cb09fe2a5919353dc3ec71e99b1034ded1c82725dfa0d489720"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/gd/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "20418a72c8d79d846bbf1d7370fe36c2ef778e3c627e889578fcba64160bc23a"; + sha256 = "86dca0143ddfef6fec63cf70d5dfa5322cca8561f4270cfef936340eec8dd4ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/gl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "2d898893177542305cc6f7c7244ef4fb8f325407e671de8a6c4fc1674c1a84e3"; + sha256 = "0bc4e3af051329405f2b660319f8f984c136133b86f54594d96523ad148d98a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/gn/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "3c515d4021948a81efc88125ffe8a3e6bdc9fa54b34d2e54a6be056b55570d63"; + sha256 = "d5308fe2d705d127496097e627e0943feae7b6068642733c36d5ef9dfb812678"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/gu-IN/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f6d48c217cc7ffa6db60cb44f51c0651e6ac9816512a0dd29cd88d991359d8a2"; + sha256 = "674d7f3f9af1bd63f0ac5bf690c23fb051461259baa4c5fe49f914804291cbcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/he/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b5d129458e10f3f9389041617036dcf485c1aaccd413025752103533488ee944"; + sha256 = "bba2bc622a90f1051ad4ceb74f502580ec30a1b5df56a27d7ed6e3a0fa6797b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/hi-IN/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "95ae72ff3e203b1488e9a0c800ca521fde64279f1678125f1f75a6bc366327b5"; + sha256 = "b2dcbbfd89a03fd0408ca292fcf40f879a5df920823aae5a9ee13f57fe22ea01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/hr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e7820a120cdbbfe0d6203f1e916e05604182441cf6852333822ab2eb8b6ff6bd"; + sha256 = "ec0e866ccde7b96ed65f4d0f06bab2e232319a20edd38fcaa19bce650635a4e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/hsb/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "86c592868709e95c5f7d507c79a9fdbf737d1aa3b10efc601ced25261387cdd4"; + sha256 = "d14f7c7b93034f8f2ee6807e64de7f73f600b3071744ec6d5cf1b996ae56b357"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/hu/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "1d6863a28aa13aadd9f645a48e2191b1176b0a97431cb7b90ee9ca7f07124f19"; + sha256 = "6c6fcc5fa0333a589f8a897fdb05957b93016e4afc0c476995ceb148df6454c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/hy-AM/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "dbbda98f820b0b357fa8c8d6e6493adfaffea1a19b6d76e75172351909774f25"; + sha256 = "a3c967dbf2f276a6a2e60e60c5e225211d6372619fc052e11ee4b0132e174cd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ia/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "802514f8542df80e796ac9bf00eccae54849bf7a467fc9bf8fd5f48e89d360c1"; + sha256 = "16f6e527fc617738e7e153b9bc7c012c4bc0b6c242f641465d2db01d48ff89fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/id/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "152611365b80f9c1d17918b1db47068b24057533a572631f1b3a62f4019e341e"; + sha256 = "7e27cd38b5defe430189554f929f43be72278c0d5ed010c5ac78920d52993934"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/is/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "ceef7bddbda91bcfaf926a6acc10d467f625b62ae5e703a820d6ab33d184c187"; + sha256 = "c7faad118878aa68078c850730ebc0abc4d4f199625af975eecc76900e920f4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/it/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "edb2bdb0f91bcee367c59f55e56d030fc123f5b0f4812964be9752e6903f5f1e"; + sha256 = "5b30917c8f689882813f9f25870ea104d780fc476329231cb37b9358ce2c1bc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ja/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "75b45044a46e11466fafee07eae0d1cea5dcb2f19bf85a9a7d7a980dc7507a1d"; + sha256 = "a3916d54ad28297316294065b41cfe99237acf29752b9bf8a6ea886ea77000e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ka/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "799fd69552fb694a0d8fe572c64148b0baa89193a085f396e68796b3897daa74"; + sha256 = "65ca0ebc62d144c0a5f7a8f29544de601487523628544ad8050b8367d02e1f31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/kab/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b640217b536002baa42d1c7b1d337f38508ae8a65a10f654d7876fdf2e0e4597"; + sha256 = "af9939e9f2be3b7aa823649e285e027565275d602148f7049001176f2bf3cd56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/kk/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9b1b9e2f493232d717846d786d5d2b98488613ed8dedcca20c59dd870841a6db"; + sha256 = "536481db78eecb11c9b5dd7e9cdf5cea0fae6593b373aeb6774dc55b97e9e749"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/km/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "8296c908e246c7ae1a568797f5395fce625e5be29861f19880ddd2485e258265"; + sha256 = "181d1bd71d1cb96370e54bfe678deb50d3884b9042b0b7fb901e65faeee9e3c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/kn/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "06666ce85839bf3c3127f1fb0611093d1ac95a7a6a07c91dc11e78ad79c72e66"; + sha256 = "2c52d62b7a45259460a1198fbc176bafda3c826a5e30d085ec9fae622100fd5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ko/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "84dccd8048c57311c57ebe591a8d6d936e50b9ed63a88b52be381edba7a8b968"; + sha256 = "7cdc34f750e7fcdf68c07169cbd23dfd5225a77a325ab4e5056a5e75be488536"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/lij/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "95e9692a28b5b6712679c044ac7a4865c72a81e81d23760e14404bfedacd4100"; + sha256 = "dcf20c70faa4fc6434b86418f49658b564a312d7c05045e9d7bbbe08e3412b92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/lt/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "91d77cd74ab58232290d94af0195098ba29817f03008bdb032fafe31103da89d"; + sha256 = "a0f837de6a7ea9ae287b2bd8aa8d07d3e495489a4a4e25877547ecbd1aa635de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/lv/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "e662e9c20f1e8cfd8a174299b707fe27526a9833a81e6074462dd8aa9c48fbb9"; + sha256 = "29bd052f0fc211f15b0449104047359f0e54a7395b615d1bc0f25a3a1e2f747e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/mk/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "4b3d0db6fa71c7d7db98e92e717ecd87f8aeba570784884da96445a3d5a052fb"; + sha256 = "6cae243bcd0f790ca156f7aa9c6602a0dcf9e482e2fd98890b741729be27c63f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/mr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "d5733fbd8df17d74b82a21e022df4e2e57775c61fd2bd58a95f69025890bf908"; + sha256 = "42adf4de407edb938b98ed3a27b1491dbe463d42fdf3e63c60a7ce83eaab1d7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ms/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b38a8c8cb96c34b383a198c6e4218eb09246845ebe284d5316b8b1c1c950983f"; + sha256 = "f1e3e7db826643527896e7d1568a9040ac534327858bad653953e1be9c960e52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/my/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "9f7a02987dcece622f8c5e436efce5131e6228a70428ffe0ec3944a7e44e6bb4"; + sha256 = "b1a51f7770ee6c3a23859c90fab894aaa3c2aa36f49c3fb9d520542a9492e044"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/nb-NO/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "fb5036e009050ebfee2512852f134d8432432d84bbf56570eb344c7878482a2d"; + sha256 = "9688da318359cbb4e0f37ff0dd7a9ec727dbb9e997ab1c0247cfbfffbb8820f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ne-NP/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "bc88ea0ed014eb921c66d69a4afa3b1356f88dddfe7ff4eaad9b85db04d0594e"; + sha256 = "e5fc128298e297d2d7b6fc788ce1566bfcdf868962441dd4ee11af3acbafb7d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/nl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d4c8a2c08677d467d7c82e52c67bcffc7e55bc23d9534bf435db1f16a5348a26"; + sha256 = "53e10046449208e44acd8f9cc11d2500cb0be0e0fabc2dc7883cc8347a436aa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/nn-NO/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "eb9653fa6ca0deedf614e6a36aefcee9818014280a705796fe470d88625ff39d"; + sha256 = "a36cbe8b97febd8ad1fdcedace1a0a087dfde07586e207ae92a9f4f7b6fa7538"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/oc/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "bfca1abbb0f4083ad031d5ffe1895b5837a21e2f874db2398896d272a19670c4"; + sha256 = "46db41b7ae8c30a889131c7f9e1f6adf2af8fe13d872d951134b06a3591e5e27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/pa-IN/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a5b5df17927c7243e708d499390b238a2b77bb32403aa2dc8642b91064cecbec"; + sha256 = "b07dfb59d5bdd02ea2e55ab0684bd2d4192e888578670e536b847823f49e7b1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/pl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "54991b86e2fbb546f9234bdb9a5a1a6e67873c6bd63a6532a19156e39f3f7b7f"; + sha256 = "1bd366a3ebf1eecc4eeb30e6f43852fe55c00d0db330607d90647fac00cff9fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/pt-BR/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "89ddc2f846bee94b0d5accceb786d24fd3587b8ec0a642285eb2bf025a812abe"; + sha256 = "99cfa9de6bc60f84b5cb44a4e139d3a609cab4f1bec126b4cd6c6c6b287dfbed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/pt-PT/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0da7a0e65be8571c3ea693e89e8f058e0f9c442eec0dec87ec120225b85e8216"; + sha256 = "352fcdad76adf69d708638e81468add5542fe6298ec3b13ba500f8dd7d2a7907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/rm/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fe143ba04487294c6be1520b2549309ef8d1cc395cbbc172c14aafe2f6e94bab"; + sha256 = "24015a6e677171ea1609cf551e038f10606f34d5c8fdc9f28263e83d219442fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ro/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d386d150e3272ca1f544e00a7e4f467957f0c347f78fc18aab0d207c8558e90e"; + sha256 = "f3fcb0597580ec67a33aee155bc9ad626fd01b40ca8aee9bbd51b372361f09fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ru/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "29d48937c3fb6887b5ce24dbe9f779db75e0ac1121e8e76c93def0934616b433"; + sha256 = "5fe26295471bf18171b64eb9a5204453556459763b439b7ea0a5afc5b2115b5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/sc/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sc/firefox-111.0b6.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "6e84b2034e4d39f680db71dc43d7a1848190ce1147ce339c52d20e45a0619344"; + sha256 = "295ce6d814f4b7b356ea01da7fd0c83ac443614a21d45da89c0691f0dc914705"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/sco/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "70557fcc22fd1a2c6e9b01b5d0a0c7682de9ba6eae6ca10e7b1b46b5a25367c6"; + sha256 = "a1b85d136a2a1086da69592739d8fc1429e34aa7f180c56f3b270630fee8a6a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/si/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c108c5214495dace20c7015dca63ef55023fb23448e4785af68ab1f5af3c7b22"; + sha256 = "eed2e61f123ef88c71d2d9a1f0fa6019856c2c0e7cc5d3de760091785741f897"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/sk/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d568328e4b199b93be5a8de15456dfc7e05c118b7dc21813336af7666a7a896b"; + sha256 = "66d6ed76a9e659703b2d586b97a76ae8b7af22dac3a01d4d902cd5747ee3735b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/sl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4c09280da371544ad4fa4226f35939d382c59cb02a107b99d0229f35bcfeb3c3"; + sha256 = "24644a2feda81a5e5f2ad70d420a018a4d36507130699f0175d0e3a9837d3e9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/son/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "291074d36e902a5c6237c96428821d060dc6157b65a2927c32735ccfa435a0ac"; + sha256 = "a1b5d23e4c1cb67cbdc9842e2ea5878f4b6be9b9899bfa59d0e5689d589f3e0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/sq/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "943dff1a60b11beb3aed1449ec65c00eff4dcadc03a73739e9a8ba5e0e338c2a"; + sha256 = "879c5b1f90b6fa51a648417e70a770479f844f5fc4cc124b0b7ea68eb458dbe6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/sr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "f770508a4af23c3764716d54515c46fa3114af8bba344bedcff7c1e0fb434e90"; + sha256 = "94f19f7e0ef54acbf79d16b1228367704c968aebd10d3b8afaa0379f503ccd4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/sv-SE/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3733b4124a1248db36c09defe1793b78d21bd906f2746e4b145b0b17bd362314"; + sha256 = "2efa5241fdf5211e8452e5b8c6d07a989fc3585a7ee00b0a60fccdac140ab531"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/szl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c343588a32b6ba1ecd51736b792e7c90352129c9c5d67f6917ad842309105cdd"; + sha256 = "8a18cbed900564fcaa0cf52d6be461f3e7e6146841568006f409fcc8f5241bea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ta/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "6ffebce65cf333bf7ccaf2733a9c405cff092c54ab88bad630bec7984af79e84"; + sha256 = "ef901fe934af0978089b7463f743f583e9f2c46c617234b2206cc5e0c31daaaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/te/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "30b95217e0dadff81a13b370ed3718223fda9894653227b624e62cebacc0f55e"; + sha256 = "6847dca8150ba6dac5f7082ae518b9fcba129320e93909b9340ce5adeae6540f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/th/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "374b9c94e4271683ff17f7ba79bbea10670ed4ed9e4eb49cfcc3d4499ac7df90"; + sha256 = "ac72b502b1fc8cea75ec2b878b957d52fa8fcc29663b7003c334ec6932e5ece5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/tl/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d9ef5e415c7aa9fa52c715daee6a055eef784c71f42eb96055313c6e24aafd35"; + sha256 = "1f2ef4a9dd341c3151c7e66c8d9fc1e0f62f33ec397e3ff399bb56dee89532a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/tr/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3531fe8f68a508821fabb4f71eb588419b76bc79ed7090cc3c2262bb0121e596"; + sha256 = "6026af884fb2f1c899fbd28f99d383ca34fd4e6540c37e08904155df3d6e2907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/trs/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "ae8c971988a0a7aabf47d1255e9a5028a24e5578fd003ceb25fa6d3279f93a7b"; + sha256 = "36f70f8275de2201ee29387c2724f908ae92a22d8e1c830f5e4572f2d8a8838b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/uk/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e4ba4353429ff4ce29d0404c799370226c186ebe46365c3303ff3333ea6ffb69"; + sha256 = "f46da613145e3ecbcaff8334fe54e340dbce9b0c4fffa0121958abd6fd1e1445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/ur/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d9f28b69bef2c0243d2c8e99eb546a21e7a76012e24aa91a6802c1ec411330dd"; + sha256 = "048b6285f5600b2c09a63f5c90c2b8fde0159e6c3bc7f282482bf4e3b0581e78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/uz/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d5b7d80bbc2601bdad038e6c6a5b8d47a8ee7f5ae2cd937d77b52e6c8c55dd30"; + sha256 = "21da3f9a45abb3156ca14c399c2b6329801135d37c3e969b0e7f615311649a72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/vi/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c5036b2b8bb199e76a276b54b1661777260e670d2cd11c8ca15bd91c5a2c8d2d"; + sha256 = "e0e6509645516ae50f044755da40a30685edf2d33ee38d213000507db3a25d34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/xh/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "4c70306ce6b57b6ed949c998ce165e457f826a0f1773ede5f59967a24cf1a299"; + sha256 = "b8904a816b1f6f3290bb2b9d79e2bbe92d01dd5fef059c7ebe4a70cdcdd4cc74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/zh-CN/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d4ad6a4c9ec82f6323312e5b5caa571ac8b58235dd739380e0a35a4d53836a1f"; + sha256 = "307a472ac7ca779883e162a5dd780cc9ef69cd1e09f8aa03f33cb0501960bc32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b5/linux-i686/zh-TW/firefox-111.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f8998f1549884104a2d631f3ccdf6678b405e60bf6ebc4c01ffed4042f622376"; + sha256 = "ffc5c9f740ef19167a463de5b5a85d75aa9cdad85f0d476734b01350c48de9e3"; } ]; } From 2ce6d7392a8bb235fce03c0b9ef3157f86217b45 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 26 Feb 2023 21:16:22 -0300 Subject: [PATCH 044/110] rtl88x2bu: 2022-12-17 -> 2023-02-24 Signed-off-by: Otavio Salvador --- pkgs/os-specific/linux/rtl88x2bu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index d3560aca91ad..7cd15f194cc0 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2022-12-17"; + version = "${kernel.version}-unstable-2023-02-24"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "9a04d2bb9d882c7f2708560774d7b96a70d83f4b"; - sha256 = "sha256-PxTUCYBfyCDB8IjNKsp7aiPtSI3TFzGuJsHqG66e2Q0="; + rev = "51a2fb94893c562ec5f2fabce0b80e4da4eda812"; + sha256 = "sha256-nTas2EkghZeQhc8bTtoQfHEl8QJtClXi9V1IxlIThbI="; }; hardeningDisable = [ "pic" ]; From 64ff965cf84ccbbc9ea8aa9b32ccf39e52cd5dfc Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Tue, 28 Feb 2023 11:10:30 -0800 Subject: [PATCH 045/110] pulumi-bin: 3.54.0 -> 3.55.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 290 +++++++++++++-------------- 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 72767fb84c53..4e3c3b187b45 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,44 +1,44 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.54.0"; + version = "3.55.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-linux-x64.tar.gz"; - sha256 = "0qp32lzdsz806f0jvl6900h4z5597c7yijga24f88c1k90kzyx3f"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-linux-x64.tar.gz"; + sha256 = "078mvn8aj94z9vbnxzl6q2kgncbna4z72l6q8j06dmx63m7gqs9m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-amd64.tar.gz"; sha256 = "0c5rw7nk9sw2mcccq0a9apy0rfsd14jkg6wqivf0vc0c5frwhgqi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-linux-amd64.tar.gz"; - sha256 = "1x0vv5b61achyysm5inffi9dh2nry7qkr62iqjml4n7qb9f3dcxd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-linux-amd64.tar.gz"; + sha256 = "11f8lha7cqqcp2kfw3mlagsislwn78kl26cw3dcliy82x64wkrm6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-linux-amd64.tar.gz"; - sha256 = "1hfwk31xxdsqgjckvrqr8n1awdl7spkij71qbrrnzf3bngyaq2lv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-linux-amd64.tar.gz"; + sha256 = "17h8iiq50jlwdihjm3x8x4sncyjpgdsrymzz8wjjw6lcyd8mzad9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-linux-amd64.tar.gz"; - sha256 = "0vis19vj9xj8hrx4a3a6d50ixhkldb2fzg0nkh4azad69pj0jjjl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-amd64.tar.gz"; + sha256 = "0jv6gwjpdjhla4dgi6cfcz6c4h38fsc8c5ak168k40d4ixin8g5v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-amd64.tar.gz"; - sha256 = "01zjsw7f9r2andc6am09qhs2gy9189i3bvkdyxmv6bkh7907z8pg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-linux-amd64.tar.gz"; + sha256 = "1whpm1l1x1mk32npdsdc4fji1z8yyrcma4xfvjsm7cg5mc01c3a2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-linux-amd64.tar.gz"; - sha256 = "04spn0180c5y90xvpadwd8ym3ffywvi4nbmjpa1qhy7j20zpd698"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-linux-amd64.tar.gz"; + sha256 = "1vpwvpmkj8ca7cjb9b4mcrxwdwyzljrzgqrkfak8vs95a895752f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-linux-amd64.tar.gz"; - sha256 = "1chrpjsbracndk4mfcck3shvjk4s82x6wlb71q9vrmijw1kll5ac"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-linux-amd64.tar.gz"; + sha256 = "0d8a66iv03b8wsfx8jidgmvq126ypw5i6dnyd3hz6kd1vbyvvp4d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-linux-amd64.tar.gz"; - sha256 = "0i3w5rzgkdy9qz12h0l6hhm9hdg0k8vkrv15fvr8k0vvfmk898kc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-linux-amd64.tar.gz"; + sha256 = "0pddkbqldlrz9xz0bmv6i0hm0m5gxv7ms8p5p710ww5jbyj6gni6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "0cyrrxd2iyrf8zbvn46vbi6ayg93l284y66lwcggdqh3snj3gc7y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-linux-amd64.tar.gz"; - sha256 = "00ispk56g2jb9c410r6khdysyq0g3crn42sa4vq5bmgzkrsz78yv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-linux-amd64.tar.gz"; + sha256 = "09k4ni7dl3jndf85ypg00xlxij0ik6j1ndvw1yi4w8shikvy18rx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-amd64.tar.gz"; @@ -73,12 +73,12 @@ sha256 = "15mygp5kbj3z868dfz3w00srm88qn6i38dgfsclhs2flj9h989wh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-linux-amd64.tar.gz"; - sha256 = "0c3s36a93pgidv81frbczyqai23d61cs3a6k2zck7kz9l7796mm8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-linux-amd64.tar.gz"; + sha256 = "1dql09k9dgz4d91i893xcli4wq1c0i4fmxjcm2ss4cvnkipzhdxv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-linux-amd64.tar.gz"; - sha256 = "0yx03k6pipcyxa2ibmyq4a7kpsiy1j3ycfzg8ijdww6i2sh9z5z4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-amd64.tar.gz"; + sha256 = "1s76ghsi9p9fda3j2nqyn3q1gjvfssxn74r7zapjl41day6h84wc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-amd64.tar.gz"; @@ -93,12 +93,12 @@ sha256 = "113yrv1yr0lzwslayhzhsyrrfk3vrddicbbbd0fs56pgks2r66ik"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-linux-amd64.tar.gz"; - sha256 = "1bh70bqjp5jq56yxf4ggvnvz9v1271wads6gmhlik4f0fvss3v8k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-linux-amd64.tar.gz"; + sha256 = "180jdyhqv0jkqhfwmn12c62cp3c7839d56vbj3ibi9rjmvipwlg9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-linux-amd64.tar.gz"; - sha256 = "1cmd779ldxfazksgiyxpagg84a6k5ckqmpf0kq0z7s9s7a6favy8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-amd64.tar.gz"; + sha256 = "0hanfcw21n7d2m6zzj98mgfq3kdc70xp7bqc4lilmh6f90dhcrhy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; @@ -117,16 +117,16 @@ sha256 = "1cdz32s7bfri7n81gviyg3gh1l6pz95fp6alwrsn797adl3qq3s7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-linux-amd64.tar.gz"; - sha256 = "1fhynzw38l7agc4wm8c92n7ig3gnl7gskzq697hq8dk4r7xl2179"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-linux-amd64.tar.gz"; + sha256 = "0p9kfy12334lzdj3c283fc572rfqav4xvf041z2as28hvbdi5jnc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-linux-amd64.tar.gz"; - sha256 = "0znz88v2w0fb6yzjjhfs20ampwjngyzskna26qid42d40jbxyqxm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-linux-amd64.tar.gz"; + sha256 = "0ddy78rh7m9ikgsl317ibsf4xdyny9034aa6f6dp64bif4mn0mz2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-linux-amd64.tar.gz"; - sha256 = "0gfsji7vgxk0kanfbjaxf1ia79n8x3qqhkm2fdhxqlscc0d6vpgp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-linux-amd64.tar.gz"; + sha256 = "04bx4hnha1jnbzn0s5rpixqw7xniqih0g3fi4pjmgzbgjcgjgl7q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-amd64.tar.gz"; @@ -137,8 +137,8 @@ sha256 = "1x0s7k6wplami10qfk8i4qf5cqfzn3pa601yn30hhq0k16g5vm65"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-linux-amd64.tar.gz"; - sha256 = "0ay5rlvp17jbjkf8ig6k6i35cy0rgg8gng77ldh83r6cjca15l5v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-linux-amd64.tar.gz"; + sha256 = "1n0brv4m8xjyd3lk1rgwbj7c5bpa1m6lr95ipzj3nk8338mb420n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-amd64.tar.gz"; @@ -149,8 +149,8 @@ sha256 = "01jsl59rwns87ybx1hmfr634ma381i7xmx40ahrrfpg851mzsgig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-linux-amd64.tar.gz"; - sha256 = "1rkn9l16mfr97h9hi5i0kfm4lh6xm5wwxj4mwz8rwwiwfr963zw9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-linux-amd64.tar.gz"; + sha256 = "0svlqccq9rb00hz8g5fbpb7r6wf5wbjacab8rvjcb13wvrc8rx54"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-linux-amd64.tar.gz"; @@ -163,40 +163,40 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-darwin-x64.tar.gz"; - sha256 = "09n7q0c218w74vqx3idhjjzqb6wcq3ynqpqnss9w4n7qxxcm953f"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-darwin-x64.tar.gz"; + sha256 = "12yzj1ibdvki61q2vq9vygj6sl0s1x783v111q7wl328s3383pgj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-amd64.tar.gz"; sha256 = "1l26w106lrhy3gn3x1x3hc8gackxzm7ipvx37vqxmb2xhraq952z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-darwin-amd64.tar.gz"; - sha256 = "1p06n6g4a6mhlfkw38v3xdbci40y4yhin61bw32nqyfg9j1gj87l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "01w2hh6vf3smjn7dqlfxhfnl1k6fm7mdrafk1ngzyaqg76ggn52j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-darwin-amd64.tar.gz"; - sha256 = "1bm1nv00ik2hvncinqwkir9vsixcr05jib5ihhzwcsl1gqgl3i84"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-darwin-amd64.tar.gz"; + sha256 = "0iyyfx84wn1q2k51llhajlv1vm4yhs6i8654ic00pxp0nrv6gnk5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-darwin-amd64.tar.gz"; - sha256 = "1jlzny3wns6rr4h620m5wp11fn4v8ycpg8kizpqyl2iccsxxmva0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-amd64.tar.gz"; + sha256 = "0a6hvi15z2viyv97xdq2s1kgrhz45f21rh4zcx4y7kqbv0v4a9aa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-amd64.tar.gz"; - sha256 = "0ypm2xknhz09cmzj57d5r8axn4jscb8r8z9sqx88y3fsh14s3j6d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-darwin-amd64.tar.gz"; + sha256 = "0fmv68gr11gap5gczfw51fwwyasxamxd24zwn0gp0rzc4600qd2b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-darwin-amd64.tar.gz"; - sha256 = "0qbiihqj7dqq85gmy4dkyffaa82z2sz8mq0rjxha9831qcs5qy3c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-darwin-amd64.tar.gz"; + sha256 = "181q2hdj6wxj9c3jyndcnkgrz8rh6sqzzqjl6r4g681ci5j4nqrd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-darwin-amd64.tar.gz"; - sha256 = "0q14jp0n42m53lhcvl2j7klzgq0s085nhgvcpi85kn9j0gn58n9v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-darwin-amd64.tar.gz"; + sha256 = "1xgxqx62116g4i17m4lpzgpcgwqhjisbfc4cvs49n31h0g2xlfl9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-darwin-amd64.tar.gz"; - sha256 = "1g1bf25d240rfr25v1d6srsfqfxgm9dmzpaf29dipd5ym4cy5v87"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-darwin-amd64.tar.gz"; + sha256 = "1bjhnaqdclz0ajjvgiqal0k1x6ri0fz4z4ww25hbwjqlvyd4n7ww"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "1dz6vi3c067f51p3ya43hahc82w9r3ywhxdxmbnjc1sk7py1pbi4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-darwin-amd64.tar.gz"; - sha256 = "1xlhaqb4hpdk5gppcj7014xw3a3x0n8cgyb90j4gi4gczwzq6blg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-darwin-amd64.tar.gz"; + sha256 = "1a70h0apgxk5d70rki612s71wd6p0lg1g4v2w564q1f94fpqp9vb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-amd64.tar.gz"; @@ -231,12 +231,12 @@ sha256 = "0dzxv7qkk68bxw9p5xbmb40sqqnbf8dckpk352f5802x78wxhaf5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-darwin-amd64.tar.gz"; - sha256 = "0ysfyyb0s4r5pph32qik09qzdxn6ac2b601fpfx9cjn8aamcz0nq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-darwin-amd64.tar.gz"; + sha256 = "17madjffjskjbgg2ab942d1dqpq74ff618a4yjkz679l490z14mi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-darwin-amd64.tar.gz"; - sha256 = "1ivwh2wbhg9fl678292zx1vbb0l4kgnp8xxlx6zkx4gjs24fmls1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-amd64.tar.gz"; + sha256 = "1gjl4yx3g8p487yv61jslkiy1ar7qijhmsm6s52ghxyh8w2wfbrj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-amd64.tar.gz"; @@ -251,12 +251,12 @@ sha256 = "069hl04cwjvd9hy6sm2wv225r1fmmf7z04p8qiy6kmck588c19lx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-darwin-amd64.tar.gz"; - sha256 = "1mcjjdi8lvn0lk78y5jbfcl7k78kq83k83bsbi3bvc5wkskv1y2h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-darwin-amd64.tar.gz"; + sha256 = "0ca581x90ypw73z0dmy7b21sc0npqivnhfnv5r8pf2abwhbkpny0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-darwin-amd64.tar.gz"; - sha256 = "0v2qd5jlbnsd85mzw4c465ykjzm92w288vfdd0jgkqqc3kf4cyax"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-amd64.tar.gz"; + sha256 = "0y78a6sc81mnbr7djj4nmyra5n3bmqnm9jic0552mqikw59jsikw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; @@ -275,16 +275,16 @@ sha256 = "1p79wp1sk5ka9xisjmmrv9s7aw6dghp22lkiz15vzrqwifm6nxmb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-darwin-amd64.tar.gz"; - sha256 = "15gpjmak6xp3fwa6rp3whl0aah7m1fmdvpy9icnjxagmd4ixpf1r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-darwin-amd64.tar.gz"; + sha256 = "02vp3lar6nj9ssy7cr194vni6vqg2v8rnvwxixbc5ijq5azz5ipi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-darwin-amd64.tar.gz"; - sha256 = "09mzdd4271ifmn3b4nm0b47zmkqj408y1dg6d5c4nib67fb8glcq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-darwin-amd64.tar.gz"; + sha256 = "071x2z4kb2m5cvlgpmk7ha7857c85fhqb56jas5r8c2vn70spqpv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-darwin-amd64.tar.gz"; - sha256 = "0nzlx81yk674xkr2r7q4fkl84c8cxn3ahw9983vsy4jq9a0ik81k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-darwin-amd64.tar.gz"; + sha256 = "143802ikmgjgk1w7rkkl4q9hb2skvx4pf5wxi6h5rziav03w97p3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-amd64.tar.gz"; @@ -295,8 +295,8 @@ sha256 = "0mg35il3xdr43y5fq7420dal7a2nmg542v7njm71m98rdw2jlnnq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "1nywayf1c6amhjik0091fdxmr74b5pp4pcpxpnqwss04q7l7qcz3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-darwin-amd64.tar.gz"; + sha256 = "1cr0zbfrid4xsyjmabppzg7f867vmhpjf29s4qrb3g9vg0k4fibk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-amd64.tar.gz"; @@ -307,8 +307,8 @@ sha256 = "1jn1j72s3dqjw0xdyk7mncw61fzqmwg4sqbbh7f3708wv1rznv5a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-darwin-amd64.tar.gz"; - sha256 = "0bmdfvdh2smwpdmz8jhkn4cl4zrn7jqw8nmf7y7zkpwpiw8647ir"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "1g7jcwrff8nd1m6fmvfri3nfgby8agcwmq60ascd45mkianwf2i8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-darwin-amd64.tar.gz"; @@ -321,40 +321,40 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-linux-arm64.tar.gz"; - sha256 = "1dixd7dckinp5vj52kb9rzp4qpcacppyv3qwbisxl2g4dadlf88v"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-linux-arm64.tar.gz"; + sha256 = "0q8bb5mh2zqrf45g1sbwbxlhwvn4j467czbi0zy0iwy3wp7gpp8s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-arm64.tar.gz"; sha256 = "0a0gy3im1ymjqn1pfc1ds8rikp0zsn3msc7g3zrvqlqkypih5fmy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-linux-arm64.tar.gz"; - sha256 = "0scpn0mz4ljqwb473j1xk39z0cmjv87lmnd3s9fm5rijqcinjw6y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-linux-arm64.tar.gz"; + sha256 = "1dhhsdxcg3jhf9yjhjpgsdz92vwj52v45d34paa0qy5xmdw89g23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-linux-arm64.tar.gz"; - sha256 = "0qplrij1bbpsdcmxzixrlkb2l49c21alla2g70aqm0vxkpjscn7m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-linux-arm64.tar.gz"; + sha256 = "1cg68j7nn0jx3zdfhkxmgbms27xk7mllwll6pwmp1rljh04p48ap"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-linux-arm64.tar.gz"; - sha256 = "1wviw5iijiq7666kx0c51ka32qv6cr4l2mbmpfg4mp8yq5hlz7cc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-arm64.tar.gz"; + sha256 = "0hgnwzslhcxf1xp3dza9adf1dlc1v3fsgb22n0dqq65hyixkdlar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-arm64.tar.gz"; - sha256 = "0m773l7289rqpkyzmfbdsg4v6m531p8mp4mjhr6px5amii7875qz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-linux-arm64.tar.gz"; + sha256 = "0sl8af8arqjg70p9ndw72adfpv8rybw4nb3n120cnwrz3bw0sfqy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-linux-arm64.tar.gz"; - sha256 = "1z2jss2yc3fylqc8hpgfy4sqyvkgcbmf4hngdzphnknqapiz927w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-linux-arm64.tar.gz"; + sha256 = "0bcv46ib2pbsp41rxqb60mvj7f9b2rab6r342rr27azxvf6jzc8i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-linux-arm64.tar.gz"; - sha256 = "0ma2n41nz916qr5l2nbmc4h9bz90fk6p9gnqqk5pzgwqxvw55jlh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-linux-arm64.tar.gz"; + sha256 = "1z5x90z92q34ibfzm98ir308b7yw9ryw0whdrfrbxd97qdzq226b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-linux-arm64.tar.gz"; - sha256 = "1pyzmfg0k58l409wflx78ngpvspj5b38pi9janvh7xcajkcj4mfb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-linux-arm64.tar.gz"; + sha256 = "064fbh583gfpilb7rn7rwazmf79q8m361nh9jcqxs6r7mihb0ch4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "14qpxps76y1jc995l9h1m3nwbkna0fsa6hm32m11qw9c4clk7npd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-linux-arm64.tar.gz"; - sha256 = "0svvm7icwxi4ly7dsbfsw16m4nkg13ag0j03c3x7amfq80n80zdb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-linux-arm64.tar.gz"; + sha256 = "0n8vimvn4p7mcrgnd0v8l1q21pswhlxs1mph4928lnpk8h68hz51"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-arm64.tar.gz"; @@ -389,12 +389,12 @@ sha256 = "1ad76i2avaaxfhq5bvhdmp3wy2c0zs959i3i1hsda2qdw5c91rjr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-linux-arm64.tar.gz"; - sha256 = "1zak9vf9dc2y0ic1mi3aakqcv5iabdnzrzxkl1mwxgl2jibmq2n0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-linux-arm64.tar.gz"; + sha256 = "1biq7rjw49d8vpfsb9ab0ixr2a42y404nxa9v8ndkyhqskmjgz68"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-linux-arm64.tar.gz"; - sha256 = "0pxlcmkrbvdni46kml02vqx22syzdp512zb1cvagnnlkdb00azdg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-arm64.tar.gz"; + sha256 = "0y454009cwryi6bcz9k6398bbngdslxkpcvdnl270jk1rkk0b2qz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-arm64.tar.gz"; @@ -409,12 +409,12 @@ sha256 = "0b8zaqcmlbdl5p38xjk0j7pgd6cy5mf1wc25g6rxflbikx9k43v9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-linux-arm64.tar.gz"; - sha256 = "0dn0y8hwb7kza27igfwcx3fdy083jpwlbhk4kdnrfl71wf9h7ix2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-linux-arm64.tar.gz"; + sha256 = "0xj174k6qk5fkivzj9481smgvvv3i1861kbjiplsfkka8j6wcw09"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-linux-arm64.tar.gz"; - sha256 = "1zqlilnayrgazd1ad2fhpqrp9mc3hccm55klhz2skxdh9w8fqk3c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-arm64.tar.gz"; + sha256 = "087hbcb5y7l3gmr7x2y5kzp1ykdj0samm7vbn5iy2y2rpwirszpw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; @@ -433,16 +433,16 @@ sha256 = "1knyj2djz077c38kls5gyjn0v83qif8qddgji488mr8k8nf4k6lg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-linux-arm64.tar.gz"; - sha256 = "08j20ikmfdlgwcrv9csb3fj36cvay0s90yzv0r7p2ma22ganvznj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-linux-arm64.tar.gz"; + sha256 = "07agbpg8v32zq27395zzjpvpi5sr8ryzi16hj4jk1144g0bi7gxd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-linux-arm64.tar.gz"; - sha256 = "1rrmhwlm7vx8n9p8rymqpwnh7g54k89bj1ywv94v73b4l97vnhm8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-linux-arm64.tar.gz"; + sha256 = "0sr7hxxczs90sqhaz3asp1bd3bcld0nw00gah0m36rdr3kb8d2zl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-linux-arm64.tar.gz"; - sha256 = "1la6hkcyr1dbqy3pz00wl88v2asbswnidfj1s14gy91gmwdj0593"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-linux-arm64.tar.gz"; + sha256 = "1w5l6m13113lak1yv4kfhh07adqz3pci9zyzx57llic4mccczpan"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-arm64.tar.gz"; @@ -453,8 +453,8 @@ sha256 = "05xhgy6n4msxvi72a898g4bas7aqxdvj5a4vf1mjf80f55m8hc8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-linux-arm64.tar.gz"; - sha256 = "1r8d77mamkzdaq2c9gqbvywfaa7z5wsbaxpimsd3sdkr8x49j753"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-linux-arm64.tar.gz"; + sha256 = "0wc2j439pi1s5j6ncmdj0670svis5ljfgn1q49lh37pgn88m7m75"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-arm64.tar.gz"; @@ -465,8 +465,8 @@ sha256 = "1psibvdvnqmcjyd4knwxqq97k72da7qgrm2g08n41bvjdv10j6hh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-linux-arm64.tar.gz"; - sha256 = "065bcvm1p6fbhnhq4r0l5km7z7srd6yfpj05qd070lp5iaz90mp7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-linux-arm64.tar.gz"; + sha256 = "158iqlvxdc38yn2cdifp94v4jmqbybczm98g3fc8n1ny2wr7akny"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-linux-arm64.tar.gz"; @@ -479,40 +479,40 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-darwin-arm64.tar.gz"; - sha256 = "1igr2ahjlpcp8m6isz6q19kxjj640rrm6h8sj58b9dr1rm842gsl"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-darwin-arm64.tar.gz"; + sha256 = "1c5vivch4ddj63pbiq61890lpnf1jdn3xlv127njmp5syb6ankzl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-arm64.tar.gz"; sha256 = "1g8adp2q0r4fvaahyx0jqgqvp972h1kjzxrvlfw5012z76qnar47"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-darwin-arm64.tar.gz"; - sha256 = "0xqwgc89wgfz8sd0yl6w2qqxlb2hraqdap162sa7gafz6hydfjdn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-darwin-arm64.tar.gz"; + sha256 = "0454pqi4qrb9iv30ghj4jqjhxi32b5yrsp0vi7x23m8c474y676m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-darwin-arm64.tar.gz"; - sha256 = "10640g1azg8h65lf7qk11nh8l0ca236xhjp8yciaypn9b074s4rx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-darwin-arm64.tar.gz"; + sha256 = "0fndz76l1h6isspr60ng0dr3rv0v1rs8kp8w5ssx9ixi9r6nvqc5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-darwin-arm64.tar.gz"; - sha256 = "1giprh33bxkvm3kb0c8hw9kxrjvrsjvvh3l8rq15iv8s11zzmq6l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-arm64.tar.gz"; + sha256 = "1nh9hsv9sc0l9vfamhv8ixbra9xnldai0h3dfgrmy0zl3v1njmh1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-arm64.tar.gz"; - sha256 = "02v0p3ksv0rlz1fk216fr1q3smnxw3fvzpbd9bichsmp8hids4gq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-darwin-arm64.tar.gz"; + sha256 = "0jhr9h8m54kc9yqmxmd8di78yk1r6l6p2v621123vbj407l1san4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-darwin-arm64.tar.gz"; - sha256 = "1wnmbn5dc7py89ycjhyhjg14g78wjsywqiyygc65hj6yz79w4avc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-darwin-arm64.tar.gz"; + sha256 = "0jq26kj5v6fj2sw3yyygk0gnawbx85fj4vfn68a9lsfm10xl624p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-darwin-arm64.tar.gz"; - sha256 = "00afm28jahxf631sf40vk8fdhsh7v0bdh0bhw3ivhy9hzrkzvww5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-darwin-arm64.tar.gz"; + sha256 = "1s0bk2bbwpqw1qng4mq8kcbz0jnizdvv3xfnhzr30b79qndg22yg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-darwin-arm64.tar.gz"; - sha256 = "0lysjbslc5cxybwgjhrm8rjnbqmnjb5ncsl9k1p3wkv7bmawkyvz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-darwin-arm64.tar.gz"; + sha256 = "1zz4j434ngckir5nk8cbnvac8vxfrf92qw3gcrhrnj65bpv8703i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "0g1n0vkr1lqny1rgb1pgmsvyr2rc0jsj4j6m0ibgcps6j3g9h207"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-darwin-arm64.tar.gz"; - sha256 = "0aayd2wx0fyrcqhsm0h29xya9xawfrcylx4485l356xj0jbpdm3b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-darwin-arm64.tar.gz"; + sha256 = "0jghq2bl0p7wwdipdqqvrpfdj1n1cl9q53ssjhmaj2f9vmikhdsi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-arm64.tar.gz"; @@ -547,12 +547,12 @@ sha256 = "0ssvm9dwpiisk1n93a522bcc5ijfqz2c25b1qgjsmlgd93phias4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-darwin-arm64.tar.gz"; - sha256 = "0n2qjbhaqxdw94ryrq1ma73qfxvms1dvyqjg53ay1zsy889ssbfx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-darwin-arm64.tar.gz"; + sha256 = "156yw48m0aglrk3b6ajz29x3cs9c9fdka4k91h8bss2r0badn9lf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-darwin-arm64.tar.gz"; - sha256 = "12ksqg1mrqwl2bwn8308l5k5vmxy1xc2makphwrpfd6sq0rsp1jg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-arm64.tar.gz"; + sha256 = "140rvajb742r84sb3wjvrr1nvvl6a3lraj5k6lf1hlgvi4rv0q0y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-arm64.tar.gz"; @@ -567,12 +567,12 @@ sha256 = "09ri5bp9hvq9db1hpgjxjzd9i2fkmr7fry2fdjx6gv1j2djcvryq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-darwin-arm64.tar.gz"; - sha256 = "0y46n3wmpm35kb20wfiy0zgkrqrrrj6axkxwv8nxzgyl2hk7ay17"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-darwin-arm64.tar.gz"; + sha256 = "0pyl0rdwgd4vm4rcass0va4r036nwwj9imwi026gha4y9b3138cp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-darwin-arm64.tar.gz"; - sha256 = "09z55lszcqym65w80zw1s63vcmvhn810si460w9fdzli0x9gg53n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-arm64.tar.gz"; + sha256 = "1wcslax3iih2ripcla3rqcyc4qxy7qcs5gix9n811b6dx20ppdqv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; @@ -591,16 +591,16 @@ sha256 = "1cl9qj041z8fgc95vgsx7y0f5jxyjr8cjb5ain4gl501v4s88hn9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-darwin-arm64.tar.gz"; - sha256 = "1l0ykg6v6h70197163h5cn1di1ycacrn7j3s23yrphqfdq3xfi4g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-darwin-arm64.tar.gz"; + sha256 = "0aav8v0hk9r647yxy2a4mxj45iqbjab26q3xm093z43sdq05rm0a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-darwin-arm64.tar.gz"; - sha256 = "088kzd3lv32520xb57fsj5r284dnkarlf996cv5jdyrl1750rcd4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-darwin-arm64.tar.gz"; + sha256 = "0m4385fndkwrag12w0yclbw0krhij27wa49wckwpvhn80syj80nr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-darwin-arm64.tar.gz"; - sha256 = "0s2y6bf283x0vcjj3nrkbbyi0rszlicmdahpjlr8h50w45cg1j44"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-darwin-arm64.tar.gz"; + sha256 = "02882h0sgrcxdjsddmqld4k4637h3dmblkb42kjrdq6d518gfivn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-arm64.tar.gz"; @@ -611,8 +611,8 @@ sha256 = "1k4yvbmhpaf244bwv94swz7nvp07pllica40q2kcgz9aynb9zljy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-darwin-arm64.tar.gz"; - sha256 = "0r3yrdhsqvwrmpnajqiyyrjnnfazawkwwx6yf6371g4n6zqxqy4c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-darwin-arm64.tar.gz"; + sha256 = "0sxdpvx2hwd1sgaz34ddpa676n0g081ymrldr881cb5lfh01zbji"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-arm64.tar.gz"; @@ -623,8 +623,8 @@ sha256 = "1lnbsfcv1vrgc2hzmqwydxp9j6w9cmgpkpm83hmzz2ryy2vn6g07"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-darwin-arm64.tar.gz"; - sha256 = "02739v2jq70s9vxvibffd9xnhfpy0zp3724n79pdcjygj5xw32g9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "1hy2w6x8mr7bi1pkaz4s8881w1nvl1nhrlqmc371xkpfkaahhj25"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-darwin-arm64.tar.gz"; From f4e48a372d747669025ab305e75c07a639e6c101 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 19:31:58 +0000 Subject: [PATCH 046/110] webex: 42.12.0.24485 -> 43.2.0.25211 --- .../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 1c2c3eb9fec7..a01df75371c8 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "42.12.0.24485"; + version = "43.2.0.25211"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221206141837/Webex_ubuntu.7z"; - sha256 = "4c09c13b760abbdcc8bc1a74d137f8bc23386da4425cbefd8ea75bd0a877fdbf"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230214022524/Webex_ubuntu.7z"; + sha256 = "c58a0da26c8f64302cc612c60980dbd68c074d6d8a567b3d870d7d6d06b420ad"; }; buildInputs = [ From 210852bd518f8a79d78b26419c5e4e169dd13fbe Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 28 Feb 2023 22:45:40 +0200 Subject: [PATCH 047/110] pdfstudio: gcc -> stdenv.cc.cc --- pkgs/applications/misc/pdfstudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 88af09a83ab2..6162207693be 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -9,10 +9,10 @@ # - pname is either "pdfstudio${year}" or "pdfstudioviewer". { lib +, stdenv , program ? "pdfstudio" , year ? "2022" , fetchurl -, gcc , callPackage , jdk11 , jdk17 @@ -50,7 +50,7 @@ in sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU="; }; extraBuildInputs = [ - (lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk11; }; @@ -63,7 +63,7 @@ in sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI="; }; extraBuildInputs = [ - (lib.getLib gcc) # for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; From 204e4756029cd23c8696b5ae164cb965994ac1cf Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 1 Mar 2023 00:17:28 +0200 Subject: [PATCH 048/110] mailutils: disable tests on darwin --- pkgs/tools/networking/mailutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 2ce2414b50ae..4eb1a4738322 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!guileSupport) "--without-guile"; nativeCheckInputs = [ dejagnu ]; - doCheck = true; + doCheck = !stdenv.isDarwin; # ERROR: All 46 tests were run, 46 failed unexpectedly. doInstallCheck = false; # fails preCheck = '' From 62dcd158d3e6b49fce660aa53da17145cb66ac89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 22:24:29 +0000 Subject: [PATCH 049/110] eventstat: 0.05.00 -> 0.05.01 --- pkgs/os-specific/linux/eventstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 03ab973c8b99..88ac5add34a7 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.05.00"; + version = "0.05.01"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-yGEFegUpWNBsrGZJjWud3aOsRJgXsOJmXkgpXcsPHo0="; + hash = "sha256-raODDA1EKtZThFg0NV6EfrWj5mSQNaiekywfOfAvYXI="; }; buildInputs = [ ncurses ]; From 8cba148eaca12d43e60a09f2d3a593e85a5c6bee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Feb 2023 22:26:53 +0000 Subject: [PATCH 050/110] rocsparse: 5.4.2 -> 5.4.3 --- pkgs/development/libraries/rocsparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index 9255e4f38f4a..d821ee693880 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-paibzXYvRnd+4yYvteLf7EYmqeqWDc7BoDByfSMrhYo="; + hash = "sha256-jzHD55c4rlPab5IAj2UzHTJI9MKhTfevsLthSZKOEzQ="; }; nativeBuildInputs = [ From 74cbd2b79c6c42face4302ce5fcc113e64eacea1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 21:01:04 +0100 Subject: [PATCH 051/110] python310Packages.haversine: 2.7.0 -> 2.8.0 Diff: https://github.com/mapado/haversine/compare/v2.7.0...v2.8.0 --- pkgs/development/python-modules/haversine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index 38bd8f54beab..328af63b6e9e 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "haversine"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mapado"; repo = pname; rev = "v${version}"; - hash = "sha256-iAGG1mjrt6oJ0IkmlJwrvb2Bpk4dNxV7ee9LYov03UY="; + hash = "sha256-cwvTs/91eJhjmeuCQAUBgfnKuCiLEg1jSnrXfx9VWkI="; }; nativeCheckInputs = [ From ed9386a0509e81f92822dee0c07e43aebf079d06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 21:19:39 +0100 Subject: [PATCH 052/110] cpuid: 20230120 -> 20230228 --- pkgs/os-specific/linux/cpuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 7d6431b5ced6..68c058789bbb 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20230120"; + version = "20230228"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-uJtB+IldDVj9uwpUECu0kLx8WCjbLNFb6C0U0ZRjpXk="; + sha256 = "sha256-EYLFnFqpp7ljNzlABgQ+YN7hQIh6DBeERm1dLAhH7fM="; }; # For pod2man during the build process. From 4130d1b884ecda501f31f2a0ffabdf9cd9e1bf73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 20:50:52 +0100 Subject: [PATCH 053/110] exploitdb: 2023-02-03 -> 2023-02-28 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index a710daca6013..46852f61e970 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-02-03"; + version = "2023-02-28"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uTyUACY9Pm+gMuLrttGCNZ/UQaOW/h12ysY/noTkw7A="; + hash = "sha256-hEuOGnAWyX3oBfrUWBhT58WAjDWTWeLIYuyfUs3q0Jc="; }; nativeBuildInputs = [ From 5280ef56982254d1b713ca290d7ea7c2c21d3cd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 20:49:36 +0100 Subject: [PATCH 054/110] python310Packages.auroranoaa: 0.0.2 -> 0.0.3 Diff: https://github.com/djtimca/aurora-api/compare/0.0.2...0.0.3 --- pkgs/development/python-modules/auroranoaa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auroranoaa/default.nix b/pkgs/development/python-modules/auroranoaa/default.nix index 5d3fe1ff15dd..d9162d704b3a 100644 --- a/pkgs/development/python-modules/auroranoaa/default.nix +++ b/pkgs/development/python-modules/auroranoaa/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "auroranoaa"; - version = "0.0.2"; + version = "0.0.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "djtimca"; repo = "aurora-api"; rev = version; - sha256 = "0bh8amixkg3xigwh3ryra22x6kzhbdassmf1iqv20lhbvzmsqjv0"; + sha256 = "sha256-ho0O5aEHCKaTuWh2eW2kY5a7dVGIGBLm4nKxAMq0bZ4="; }; propagatedBuildInputs = [ aiohttp ]; From 3603891b63e0ad837b75c335ccf8ac6acec66a50 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Tue, 28 Feb 2023 15:15:52 -0800 Subject: [PATCH 055/110] vscode-extensions.eamodio.gitlens: 2023.2.1404 -> 2023.2.2804 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 8a19ce2a2dd4..739b0b687fbd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -927,8 +927,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "2023.2.1404"; - sha256 = "sha256-hszwiETLDKqV4yqchPA1o3WuAgvmY2AwslvvbAhkRCE="; + version = "2023.2.2804"; + sha256 = "sha256-3jQ0CpAGrPLQPpwZx2u3ylfOwy6cBu7WLr0w3h8IM2Y="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; From 1b564ea8485e39827295a247cc3a778100fc8e88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 00:20:25 +0100 Subject: [PATCH 056/110] python310Packages.psrpcore: 0.2.1 -> 0.2.2 Diff: https://github.com/jborean93/psrpcore/compare/refs/tags/v0.2.1...v0.2.2 Changelog: https://github.com/jborean93/psrpcore/blob/v0.2.2/CHANGELOG.md --- pkgs/development/python-modules/psrpcore/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index fc0517f0df84..8608c19c8dcd 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -3,14 +3,13 @@ , cryptography , fetchFromGitHub , pytestCheckHook -, pythonAtLeast , pythonOlder , xmldiff }: buildPythonPackage rec { pname = "psrpcore"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +18,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KMSyqXKhNH+i9Y0Mx3DHCwJZOkl4Va2n0zu0TEitslU="; + hash = "sha256-6d5HQJEH/x+V0rpmQkprMlH1n151KyUF6d4tM9W5TFs="; }; propagatedBuildInputs = [ @@ -35,13 +34,6 @@ buildPythonPackage rec { "psrpcore" ]; - disabledTests = lib.optionals (pythonAtLeast "3.11") [ - # https://github.com/jborean93/psrpcore/issues/22 - "test_remote_stream_options" - "test_ps_flags" - ]; - - meta = with lib; { description = "Library for the PowerShell Remoting Protocol (PSRP)"; homepage = "https://github.com/jborean93/psrpcore"; From 4abfe25fafccd0beb911e13ad4ae58a5b99e720c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Mar 2023 01:45:38 +0100 Subject: [PATCH 057/110] yubikey-manager4: fix build --- pkgs/tools/misc/yubikey-manager/4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/yubikey-manager/4.nix b/pkgs/tools/misc/yubikey-manager/4.nix index 6d653caeeb13..3b5b430df0d2 100644 --- a/pkgs/tools/misc/yubikey-manager/4.nix +++ b/pkgs/tools/misc/yubikey-manager/4.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"' + --replace 'cryptography = ">=2.1, <39"' 'cryptography = ">=2.1"' substituteInPlace "ykman/pcsc/__init__.py" \ --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill' ''; From d0e6ae382a68a2c1151567d509e829e8585530ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Mar 2023 01:45:46 +0100 Subject: [PATCH 058/110] yubikey-manager4: cleanup --- pkgs/tools/misc/yubikey-manager/4.nix | 40 +++++++++++++-------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/4.nix b/pkgs/tools/misc/yubikey-manager/4.nix index 3b5b430df0d2..b03e5fa93bb1 100644 --- a/pkgs/tools/misc/yubikey-manager/4.nix +++ b/pkgs/tools/misc/yubikey-manager/4.nix @@ -1,4 +1,4 @@ -{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps +{ python3Packages, fetchFromGitHub, lib, installShellFiles, yubikey-personalization, libu2f-host, libusb1, procps , stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }: python3Packages.buildPythonPackage rec { @@ -7,9 +7,9 @@ python3Packages.buildPythonPackage rec { format = "pyproject"; src = fetchFromGitHub { + owner = "Yubico"; repo = "yubikey-manager"; rev = "refs/tags/${version}"; - owner = "Yubico"; sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0="; }; @@ -24,23 +24,23 @@ python3Packages.buildPythonPackage rec { --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill' ''; - nativeBuildInputs = with python3Packages; [ poetry-core ]; + nativeBuildInputs = [ installShellFiles ] + ++ (with python3Packages; [ poetry-core ]); - propagatedBuildInputs = - with python3Packages; ([ - click - cryptography - pyscard - pyusb - six - fido2 - ] ++ lib.optionals pyOpenSSLSupport [ - pyopenssl - ]) ++ [ - libu2f-host - libusb1 - yubikey-personalization - ]; + propagatedBuildInputs = with python3Packages; ([ + click + cryptography + pyscard + pyusb + six + fido2 + ] ++ lib.optionals pyOpenSSLSupport [ + pyopenssl + ]) ++ [ + libu2f-host + libusb1 + yubikey-personalization + ]; makeWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" @@ -48,8 +48,7 @@ python3Packages.buildPythonPackage rec { ]; postInstall = '' - mkdir -p "$out/man/man1" - cp man/ykman.1 "$out/man/man1" + installManPage man/ykman.1 mkdir -p $out/share/bash-completion/completions _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || : @@ -64,7 +63,6 @@ python3Packages.buildPythonPackage rec { meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager"; description = "Previous release of command line tool for configuring any YubiKey over all USB transports"; - license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ benley lassulus pinpox ]; From 2010b76f58fbbd18aefee401c6606c2f268ac287 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 01:12:28 +0000 Subject: [PATCH 059/110] yubikey-touch-detector: 1.10.0 -> 1.10.1 --- pkgs/tools/security/yubikey-touch-detector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix index aa697b447ac0..6d21bbe6f565 100644 --- a/pkgs/tools/security/yubikey-touch-detector/default.nix +++ b/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "yubikey-touch-detector"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "maximbaz"; repo = "yubikey-touch-detector"; rev = version; - sha256 = "sha256-3tZyaOrNzLfcCORhTSMEu8EvnNUjva8hBNotHgANS0g="; + sha256 = "sha256-y/iDmxlhu2Q6Zas0jsv07HQPkNdMrOQaXWy/cuWvpMk="; }; - vendorSha256 = "sha256-OitI9Yp4/mRMrNH4yrWSL785+3mykPkvzarrc6ipOeg="; + vendorHash = "sha256-OitI9Yp4/mRMrNH4yrWSL785+3mykPkvzarrc6ipOeg="; nativeBuildInputs = [ pkg-config ]; From 7a6bbe39701e26ff2ccdc320169b0c3fb6da8012 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 02:09:45 +0000 Subject: [PATCH 060/110] d2: 0.2.0 -> 0.2.1 --- pkgs/tools/text/d2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 27614de6b281..c23d08159f7d 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "d2"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-1AFioXDIh+qQYhhIaQky2SkGd+amnYdOeoNDU+1+poI="; + hash = "sha256-Xi+30H+uLKpmuT3qXnvk+0DcSKiwG2Rge49ppJekRA8="; }; - vendorHash = "sha256-PtKKGHzxshahecbfvvo1nGCseap4o8r8raBpFDUSbx4="; + vendorHash = "sha256-VUedaPnwLvfnL+WXKGBdeG1eUQynQSYPQSdpUqHixc0="; ldflags = [ "-s" From 220e3491c57bbf5557e7a56378c1c218cd535f3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 02:18:22 +0000 Subject: [PATCH 061/110] air: 1.41.0 -> 1.42.0 --- pkgs/development/tools/air/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 819cb38fef08..89c7d977e720 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.41.0"; + version = "1.42.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-31C1iNiYokClAZlk9KOVE12lFdOKJBSOwQK+zOp082k="; + hash = "sha256-3lnCqetpQ0Gnms5AR7/+eKV8jxhfv0R2LJ4l+74edt4="; }; - vendorHash = "sha256-i3bXf/EsPAJOg2aWh4mANtNeRXnie4jtuLCd/01DB/0="; + vendorHash = "sha256-uVN99Sgjwtg0IaDuMfuDKWRZRYKVp9UDJwinr56eXOg="; ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; From 6e3507b17499fbef955541cfde00cca2c86a5852 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 02:27:38 +0000 Subject: [PATCH 062/110] lefthook: 1.2.9 -> 1.3.2 --- pkgs/applications/version-management/lefthook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix index 06c7c6c4d941..2af3845c978a 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.9"; + version = "1.3.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-MYeQMgac1bqqN2QPz2KO55w7++3MnsRFm/ziSm6e2Rw="; + sha256 = "sha256-tY22dc6Bm++YreHwwTtRHIwll5+BN351vHsJlWmREKk="; }; vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg="; From ecd57170875170b8e487b4ab2aad0d460700dc76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 02:45:16 +0000 Subject: [PATCH 063/110] wangle: 2023.02.20.00 -> 2023.02.27.00 --- pkgs/development/libraries/wangle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix index 9ccb88b9e2e1..54cdee3f7aa4 100644 --- a/pkgs/development/libraries/wangle/default.nix +++ b/pkgs/development/libraries/wangle/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wangle"; - version = "2023.02.20.00"; + version = "2023.02.27.00"; src = fetchFromGitHub { owner = "facebook"; repo = "wangle"; rev = "v${version}"; - sha256 = "sha256-islo6jbilDaWc48GfipXuPhUaY2Gn95PDjuJsEDnn50="; + sha256 = "sha256-r+hS9BJWgIYIHZ0xgLosJrLZT/bQCQdwzNlXxxk5xLU="; }; nativeBuildInputs = [ cmake ]; From 6340fcc6a9ebb78d16b674d462508ee467884e96 Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Tue, 28 Feb 2023 19:58:41 -0800 Subject: [PATCH 064/110] proj: fix test suite (#218719) When testing #213831 internally we ran into a build failure caused by that change for the `proj` package (on `x86_64-linux`). We're not sure how that's possible, but the nature of the build failure was that the network tests for the `proj` package were failing due to missing certificates, so I fixed the build failure by adding `cacert` as a test dependency. It's still not clear (A) why the cert suddenly became necessary after the change in #213831 or (B) why the build worked at all before, but this is probably the right thing to do regardless because the test suite does have a network component. --- pkgs/development/libraries/proj/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 1dc4a3a838b5..e6675ae99507 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -12,6 +12,7 @@ , gtest , nlohmann_json , python3 +, cacert }: stdenv.mkDerivation (finalAttrs: rec { @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ sqlite libtiff curl nlohmann_json ]; - nativeCheckInputs = [ gtest ]; + nativeCheckInputs = [ cacert gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" From 7773d61a07d1da96a8fadc8cbe1be9366b028738 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 28 Feb 2023 22:28:11 -0500 Subject: [PATCH 065/110] miniserve: 0.22.0 -> 0.23.0 Diff: https://github.com/svenstaro/miniserve/compare/v0.22.0...v0.23.0 Changelog: https://github.com/svenstaro/miniserve/blob/v0.23.0/CHANGELOG.md --- pkgs/tools/misc/miniserve/default.nix | 18 ++++++++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index e2d322695449..24f8be2df49e 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -3,33 +3,37 @@ , fetchFromGitHub , installShellFiles , stdenv -, Security +, darwin +, curl }: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - hash = "sha256-pi+dBJE+EqQpyZAkIV7duK1g378J6BgjIiFcjV5H1fQ="; + hash = "sha256-iI9J1BGD7/SDLoJ2WfizAEHUXBJH4DiUbfGingef9lM="; }; - cargoSha256 = "sha256-nRTGKW33NO2vRkvpNVk4pT1DrHPEsSfhwf8y5pJ+n9U="; + cargoSha256 = "sha256-qvV7rJx0Yrv5CLRqSshGf1JUL6nW5KDb7Sv7B6M6WDs="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + curl ]; checkFlags = [ "--skip=bind_ipv4_ipv6::case_2" - "--skip=cant_navigate_up_the_root" "--skip=qrcode_hidden_in_tty_when_disabled" "--skip=qrcode_shown_in_tty_when_enabled" ]; @@ -44,6 +48,8 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/miniserve --print-completions zsh) ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 615361633af8..4bfac13f7dd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5229,9 +5229,7 @@ with pkgs; miniscript = callPackage ../applications/blockchains/miniscript { }; - miniserve = callPackage ../tools/misc/miniserve { - inherit (darwin.apple_sdk.frameworks) Security; - }; + miniserve = callPackage ../tools/misc/miniserve { }; mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; From 074245aea0e9613241f26669e51ac8f72a27531f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 066/110] lefthook: 1.3.2 -> 1.3.3 https://github.com/evilmartians/lefthook/releases/tag/v1.3.3 --- pkgs/applications/version-management/lefthook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix index 2af3845c978a..261b309ebf9a 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-tY22dc6Bm++YreHwwTtRHIwll5+BN351vHsJlWmREKk="; + sha256 = "sha256-9XmLQPkc8we5wRZe5+bhL1b9lxWX6JAQeF4DmRXBgew="; }; vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg="; From 9eae4723b3c19eceb318ef08faa9724d672f65cb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 067/110] d2: 0.2.1 -> 0.2.2 https://github.com/terrastruct/d2/releases/tag/v0.2.2 --- pkgs/tools/text/d2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index c23d08159f7d..bac1189cf579 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "d2"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-Xi+30H+uLKpmuT3qXnvk+0DcSKiwG2Rge49ppJekRA8="; + hash = "sha256-CBDZNqYtQElXWmf+oMS7NKpWZG3aD0UTLM1efNg9gFg="; }; - vendorHash = "sha256-VUedaPnwLvfnL+WXKGBdeG1eUQynQSYPQSdpUqHixc0="; + vendorHash = "sha256-WwLPC3hS5yyySwNg62deQrryUI0RunW5oShbrFnGAFQ="; ldflags = [ "-s" From d5dfcf220a590a1a539b98d80ab1b786233e2276 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:23:10 +1000 Subject: [PATCH 068/110] clusterctl: 1.3.3 -> 1.3.4 Diff: https://github.com/kubernetes-sigs/cluster-api/compare/v1.3.3...v1.3.4 Changelog: https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.3.4 --- .../applications/networking/cluster/clusterctl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 69862bd51559..3f614815f7a5 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-O/InVEWSqdcfqchVMYetZ3RCOxgEjQ9XvnKpOIjV2zE="; + hash = "sha256-bkjtJidG+UHma15axlLcXtqtWTqesOdHHmH4db5hoAY="; }; - vendorHash = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM="; + vendorHash = "sha256-VPeaT4vPhBa6V+Ir+vNRIWgyVBzEgTDSnDtGrxxdZ0c="; subPackages = [ "cmd/clusterctl" ]; @@ -39,6 +39,7 @@ buildGoModule rec { }; meta = with lib; { + changelog = "https://github.com/kubernetes-sigs/cluster-api/releases/tag/${src.rev}"; description = "Kubernetes cluster API tool"; homepage = "https://cluster-api.sigs.k8s.io/"; license = licenses.asl20; From 45b33173d6f9f4fdbf1e3ebab76685d4a36ffe9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 04:45:55 +0000 Subject: [PATCH 069/110] ipxe: unstable-2023-02-20 -> unstable-2023-02-28 --- pkgs/tools/misc/ipxe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index f0fa269360e3..3e788ad0d14b 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "unstable-2023-02-20"; + version = "unstable-2023-02-28"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "471599dc7721d454b6658062c901b52038a78be2"; - sha256 = "F158oUVsfIvuWDHwUnJlyyCFsfn0varRA6Borf9VZ60="; + rev = "04e60a278abcda47301f6be2c23755e5e1004661"; + sha256 = "/p+mSn9ZL5H9aTIygpbgFaW5uBBBlSQfh/OksI0bMbY="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' From 8f7660bddfe384be08a658305c1f5e5f4665e108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Feb 2023 20:51:05 -0800 Subject: [PATCH 070/110] python310Packages.pyrogram: 2.0.99 -> 2.0.100 Diff: https://github.com/pyrogram/pyrogram/compare/v2.0.99...v2.0.100 --- pkgs/development/python-modules/pyrogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 464a2cfcc750..8897ae953578 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.99"; + version = "2.0.100"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-QQFRDLB+gf5jzCf8imHwkSgOkAyLWJF3UDStnpq6+04="; + hash = "sha256-WlKzBhToSrBl6T8XFlqi3p0ABDufBGdhmK/0Fn7V61A="; }; propagatedBuildInputs = [ From 5c72d17b21221b21df7fab1128b8f738fa3c0da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Feb 2023 20:53:59 -0800 Subject: [PATCH 071/110] python310Packages.twitchapi: 3.8.0 -> 3.9.0 Changelog: https://github.com/Teekeks/pyTwitchAPI/blob/v3.9.0/docs/changelog.rst --- pkgs/development/python-modules/twitchapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 6200298b3be3..ce4c3cbee13e 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "3.8.0"; + version = "3.9.0"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-gGLSR6XESaUUt31njQJtPeTOKSgVJHlS+UdYhPKvQJQ="; + hash = "sha256-M3Jl3DGvjWdeqYOWmOSe/W9h9yZq4HVGrDR+5tEXBow="; }; propagatedBuildInputs = [ From 1251ac584c210cb635aa14e859446889b89fe195 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 05:08:01 +0000 Subject: [PATCH 072/110] python310Packages.srsly: 2.4.5 -> 2.4.6 --- pkgs/development/python-modules/srsly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 9f1d94668851..fa4cf74069bc 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.4.5"; + version = "2.4.6"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yEIliWe6pSfOqTZ5huQrgUOhqJDn1KGNJaNu3Dx6M8c="; + hash = "sha256-R7QfMjq6TJwzEav2DkQ8A6nv6cafZdxALRc8Mvd0Sm8="; }; nativeBuildInputs = [ From 1c2d630513ac5bdedfc5ffb696e32423db99a69a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 03:17:32 +0000 Subject: [PATCH 073/110] =?UTF-8?q?terraform-providers.dnsimple:=200.15.0?= =?UTF-8?q?=20=E2=86=92=200.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 114bf808bcbc..d0d0de43fc51 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -328,13 +328,13 @@ "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" }, "dnsimple": { - "hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=", + "hash": "sha256-AbNOqxZOrXUxkuScOgrZ3OyEHWpZ8+tsqqXW6lofaMc=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.15.0", + "rev": "v0.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" + "vendorHash": "sha256-rGcCbESdzKGy3I1FcDA3dUbblyG/uk74rizj7INRGPw=" }, "docker": { "hash": "sha256-M2K4N39vtVDA/vMp/s2KYiS/uoE+STf2e6yh6q0CS28=", From 0c21ea6a855f7a1ed74d5b7a27b3a1aeaf4723c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 03:18:52 +0000 Subject: [PATCH 074/110] =?UTF-8?q?terraform-providers.launchdarkly:=202.1?= =?UTF-8?q?0.0=20=E2=86=92=202.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d0d0de43fc51..10508ea73da2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -648,13 +648,13 @@ "vendorHash": null }, "launchdarkly": { - "hash": "sha256-3zQN7cc4p5ivjPxiIqdv6e/m+2KnhwiLhwSa6RAQ1sk=", + "hash": "sha256-7m5+Fu9UjmGWL4PgYCpI9vMStfmU4oQ1cx+7wAirEbQ=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.10.0", + "rev": "v2.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-x5C+WimWRBJQiOwsy+Woop1U6a7nSnO0rDoy4UU6j+4=" + "vendorHash": "sha256-j8Lit22aWeLvYrq5ao0nIdcVZDSxaAKaW+bxQ/JCSgE=" }, "libvirt": { "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=", From f2995531d041edaf830dfa0cf6f404357cc8c3e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 03:20:48 +0000 Subject: [PATCH 075/110] =?UTF-8?q?terraform-providers.scaleway:=202.11.1?= =?UTF-8?q?=20=E2=86=92=202.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 10508ea73da2..ed1f9f33c86d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -964,13 +964,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-sUYRsh1t4y9SNdt0QzhP1BM3CglxYy/ciZAEGCLj7c8=", + "hash": "sha256-rkDNV58mN/7pgQC1WBnrggHtq7q3O7r3v+huB4oPVLM=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.11.1", + "rev": "v2.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-e/Pqu58ngWnoMKjDKEUm49e0D0PfYEqxm/BxfN8UX3c=" + "vendorHash": "sha256-zice1rGuZH9kmQJQ8RdIONJXVXu1BIuRUKjTGLPK7Ns=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From 06c5a4d8c9e927cc9a257414bd3914130bd23566 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 03:21:09 +0000 Subject: [PATCH 076/110] =?UTF-8?q?terraform-providers.snowflake:=200.56.5?= =?UTF-8?q?=20=E2=86=92=200.57.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ed1f9f33c86d..6e858269bd77 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1027,11 +1027,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-gXi/S+DMPU0RROYtrLkV7eIgpQMDaFwz5uCeeoe51L4=", + "hash": "sha256-nNv2lo7I5+eFmw+BvRB/DmgNE6iuR3Aq0kxyOeQdiqU=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.56.5", + "rev": "v0.57.0", "spdx": "MIT", "vendorHash": "sha256-yFk5ap28JluaKkUPfePBuRUEg6/Ma5MrRkmWK6iAGNg=" }, From 8aa433fd6460f9aa5e119b82b4cebd7aff91ebd6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Mar 2023 09:28:03 +1000 Subject: [PATCH 077/110] treewide: pin packages with failures to go 1.19 --- pkgs/top-level/all-packages.nix | 119 ++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 29 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c35469aa8f0e..a07b7d8e8e05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -512,7 +512,9 @@ with pkgs; efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; - enumer = callPackage ../tools/misc/enumer { }; + enumer = callPackage ../tools/misc/enumer { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; evans = callPackage ../development/tools/evans { }; @@ -1541,7 +1543,9 @@ with pkgs; mnc = callPackage ../tools/misc/mnc { }; - mgmt = callPackage ../applications/system/mgmt {}; + mgmt = callPackage ../applications/system/mgmt { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; mprocs = callPackage ../tools/misc/mprocs { }; @@ -3006,7 +3010,9 @@ with pkgs; botamusique = callPackage ../tools/audio/botamusique { }; - boulder = callPackage ../tools/admin/boulder { }; + boulder = callPackage ../tools/admin/boulder { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; @@ -3456,7 +3462,9 @@ with pkgs; gospider = callPackage ../tools/security/gospider { }; - browserpass = callPackage ../tools/security/browserpass { }; + browserpass = callPackage ../tools/security/browserpass { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; passff-host = callPackage ../tools/security/passff-host { }; @@ -4073,7 +4081,9 @@ with pkgs; cloudbrute = callPackage ../tools/security/cloudbrute { }; - cloudflared = callPackage ../applications/networking/cloudflared { }; + cloudflared = callPackage ../applications/networking/cloudflared { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { }; @@ -4910,7 +4920,9 @@ with pkgs; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; - gsctl = callPackage ../applications/misc/gsctl { }; + gsctl = callPackage ../applications/misc/gsctl { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; gsocket = callPackage ../tools/networking/gsocket { }; @@ -5405,7 +5417,9 @@ with pkgs; pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; - pcp = callPackage ../tools/misc/pcp { }; + pcp = callPackage ../tools/misc/pcp { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; persepolis = python3Packages.callPackage ../tools/networking/persepolis { wrapQtAppsHook = qt5.wrapQtAppsHook; @@ -6092,7 +6106,9 @@ with pkgs; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; - unparam = callPackage ../tools/misc/unparam { }; + unparam = callPackage ../tools/misc/unparam { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; inherit (nodePackages) uppy-companion; @@ -6568,7 +6584,9 @@ with pkgs; dnspeep = callPackage ../tools/security/dnspeep { }; - dnsproxy = callPackage ../tools/networking/dnsproxy { }; + dnsproxy = callPackage ../tools/networking/dnsproxy { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; dnsperf = callPackage ../tools/networking/dnsperf { }; @@ -7095,7 +7113,9 @@ with pkgs; endlessh-go = callPackage ../servers/endlessh-go { }; - eris-go = callPackage ../servers/eris-go { }; + eris-go = callPackage ../servers/eris-go { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; @@ -7893,7 +7913,9 @@ with pkgs; goreplay = callPackage ../tools/networking/goreplay { }; - gost = callPackage ../tools/networking/gost { }; + gost = callPackage ../tools/networking/gost { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; gource = callPackage ../applications/version-management/gource { }; @@ -8543,7 +8565,9 @@ with pkgs; ipfetch = callPackage ../tools/networking/ipfetch { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { }; @@ -8903,7 +8927,9 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - kube-router = callPackage ../applications/networking/cluster/kube-router { }; + kube-router = callPackage ../applications/networking/cluster/kube-router { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; kubepug = callPackage ../development/tools/kubepug { }; @@ -8911,7 +8937,9 @@ with pkgs; kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; - kubo = callPackage ../applications/networking/kubo { }; + kubo = callPackage ../applications/networking/kubo { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { }; kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { }; @@ -10474,7 +10502,9 @@ with pkgs; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; - ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { }; + ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; @@ -16166,6 +16196,9 @@ with pkgs; llvmPackages = llvmPackages_14; avrgcc = pkgsCross.avr.buildPackages.gcc; wasi-libc = pkgsCross.wasi32.wasilibc; + # go 1.20 build failure + go = go_1_19; + buildGoModule = buildGo119Module; }; tinyscheme = callPackage ../development/interpreters/tinyscheme { }; @@ -17830,7 +17863,9 @@ with pkgs; emma = callPackage ../development/tools/analysis/emma { }; - ent-go = callPackage ../development/tools/ent { }; + ent-go = callPackage ../development/tools/ent { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; epm = callPackage ../development/tools/misc/epm { }; @@ -22162,7 +22197,9 @@ with pkgs; lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; - ligolo-ng = callPackage ../tools/networking/ligolo-ng { }; + ligolo-ng = callPackage ../tools/networking/ligolo-ng { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; linenoise = callPackage ../development/libraries/linenoise { }; @@ -24605,9 +24642,13 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent {}; + grafana-agent = callPackage ../servers/monitoring/grafana-agent { + buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure + }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoModule = buildGo119Module; # nixosTests.loki go 1.20 failure + }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; mimir = callPackage ../servers/monitoring/mimir { }; @@ -24857,7 +24898,9 @@ with pkgs; networkaudiod = callPackage ../servers/networkaudiod { }; - unifiedpush-common-proxies = callPackage ../servers/unifiedpush-common-proxies { }; + unifiedpush-common-proxies = callPackage ../servers/unifiedpush-common-proxies { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; unit = callPackage ../servers/http/unit { }; @@ -25547,7 +25590,9 @@ with pkgs; vouch-proxy = callPackage ../servers/vouch-proxy { }; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; virtiofsd = callPackage ../servers/misc/virtiofsd { }; @@ -25953,7 +25998,9 @@ with pkgs; gomp = callPackage ../applications/version-management/gomp { }; - gomplate = callPackage ../development/tools/gomplate { }; + gomplate = callPackage ../development/tools/gomplate { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; gpm = callPackage ../servers/gpm { withNcurses = false; # Keep curses disabled for lack of value @@ -29193,7 +29240,9 @@ with pkgs; edlin = callPackage ../applications/editors/edlin { }; - o = callPackage ../applications/editors/o { }; + o = callPackage ../applications/editors/o { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; oed = callPackage ../applications/editors/oed { }; @@ -30327,7 +30376,9 @@ with pkgs; hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; - hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; + hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; hypnotix = callPackage ../applications/video/hypnotix { }; @@ -31811,7 +31862,9 @@ with pkgs; opcr-policy = callPackage ../development/tools/opcr-policy { }; - open-policy-agent = callPackage ../development/tools/open-policy-agent { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; openmm = callPackage ../development/libraries/science/chemistry/openmm { stdenv = gcc11Stdenv; @@ -32539,7 +32592,9 @@ with pkgs; properties-cpp = callPackage ../development/libraries/properties-cpp { }; - protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { }; protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; @@ -33314,7 +33369,9 @@ with pkgs; syncterm = callPackage ../applications/terminal-emulators/syncterm { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + buildGoModule = buildGo119Module; # go 1.20 build failure + }) syncthing syncthing-discovery syncthing-relay; @@ -33598,7 +33655,9 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; - toxiproxy = callPackage ../development/tools/toxiproxy { }; + toxiproxy = callPackage ../development/tools/toxiproxy { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; tqsl = callPackage ../applications/radio/tqsl { openssl = openssl_1_1; @@ -34711,7 +34770,9 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon { }; + erigon = callPackage ../applications/blockchains/erigon { + buildGoModule = buildGo119Module; # go 1.20 build failure + }; exodus = callPackage ../applications/blockchains/exodus { }; From d680957e110a76f30f1986be839f7b3498b58f26 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Feb 2023 17:25:26 +1000 Subject: [PATCH 078/110] containerd: 1.6.18 -> 1.6.19 Diff: https://github.com/containerd/containerd/compare/v1.6.18...v1.6.19 Changelog: https://github.com/containerd/containerd/releases/tag/v1.6.19 --- pkgs/applications/virtualization/containerd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 6e6a6434ed80..d5fb7df67f70 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.18"; + version = "1.6.19"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-ApQKdd+S02YFNDVrrSKVHZmR1ZQwcU1KoQRfhOP9VHQ="; + hash = "sha256-Us7NEv2BngV1Q/Bkuv4XOjVjpqThL0LnIH+yciPG3L8="; }; vendorHash = null; @@ -45,6 +45,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) docker; }; meta = with lib; { + changelog = "https://github.com/containerd/containerd/releases/tag/${src.rev}"; homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; From 3b9518f1aeb69e3edb80483ea90f1dd598e7f60e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 05:39:22 +0000 Subject: [PATCH 079/110] python310Packages.toposort: 1.9 -> 1.10 --- pkgs/development/python-modules/toposort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index 2559399b25c5..bc0185482fce 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "toposort"; - version = "1.9"; + version = "1.10"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9Bo0SQ1Ek0tTOnva/5ee6KRyA/0tinRtuD8tWrEkWLk="; + sha256 = "sha256-v7tHnFPQppbqdAJgH05pPJewNng3yImLxkca38o3pr0="; }; nativeBuildInputs = [ From a4d5b8533a63efe74ac484b2d00f351f4da5a9c8 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Wed, 1 Mar 2023 11:28:03 +0530 Subject: [PATCH 080/110] ugrep: 3.9.7 -> 3.10.0 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index b6ee1d60a82b..f5b5dc4c773f 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.9.7"; + version = "3.10.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - hash = "sha256-y6P0EQfp2HFmhn2c7RwX8jVLUOfLT+LVhtz+OIoaVSo="; + hash = "sha256-ujLKAJNt2bWIq79Wh94QTFpd+7yUMhS7UMXa8gJScA4="; }; buildInputs = [ From 6a174c65c28d9594d0bc855869c0c0d833873e71 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:15:21 +1000 Subject: [PATCH 081/110] .github/workflows: update cachix/install-nix-action to v20 --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/manual-rendering.yml | 2 +- .github/workflows/update-terraform-providers.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 1199a699c74c..de1e85fe6572 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -19,7 +19,7 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 597a5bf1fa3a..a47396e2b445 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 559a290ab396..95c4e59ce9d2 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index fb01d7504b15..1b5c64b45ea9 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index f54553049bb7..907f5b420ac0 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 2808cee9155e..ca7ff52fe231 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: nix_path: nixpkgs=channel:nixpkgs-unstable install_url: https://releases.nixos.org/nix/nix-2.13.3/install From 9df748f599da933a7ca8d8fb49cd4dea0d013793 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:16:03 +1000 Subject: [PATCH 082/110] Revert "workflows: pin install-nix-action to use nix 2.13.3" This reverts commit 3563c178ca7d45d028c095b2a3ba35ee28294eea. fixed in cachix/install-nix-action@v20 --- .github/workflows/basic-eval.yml | 2 -- .github/workflows/editorconfig.yml | 1 - .github/workflows/manual-nixos.yml | 1 - .github/workflows/manual-nixpkgs.yml | 1 - .github/workflows/manual-rendering.yml | 1 - .github/workflows/update-terraform-providers.yml | 1 - 6 files changed, 7 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index de1e85fe6572..605d6a30a383 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -20,8 +20,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v20 - with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index a47396e2b445..5dd85ca26f9d 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -33,7 +33,6 @@ jobs: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - name: Checking EditorConfig run: | cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 95c4e59ce9d2..85c7ac2d6929 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -22,7 +22,6 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 1b5c64b45ea9..599840006524 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -22,7 +22,6 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index 907f5b420ac0..f571bf773fa4 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -22,7 +22,6 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index ca7ff52fe231..4cf798a654bb 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -20,7 +20,6 @@ jobs: - uses: cachix/install-nix-action@v20 with: nix_path: nixpkgs=channel:nixpkgs-unstable - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - name: setup id: setup run: | From d07f292e550c7ab1c108e7e98e0d90fe5756380a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 06:41:11 +0000 Subject: [PATCH 083/110] python310Packages.junos-eznc: 2.6.6 -> 2.6.7 --- pkgs/development/python-modules/junos-eznc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index c7c9997cf8ff..5d44f259f61b 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.6"; + version = "2.6.7"; format = "setuptools"; src = fetchFromGitHub { owner = "Juniper"; repo = "py-junos-eznc"; rev = "refs/tags/${version}"; - hash = "sha256-0JF9/lSIquXp25bM3GESqLC//aorSVT0hHccaOmQuM8="; + hash = "sha256-+hGybznip5RpJm89MLg9JO4B/y50OIdgtmV2FIpZShU="; }; propagatedBuildInputs = [ From caac122399aca717ec5ee76cefa19560f8ca0faa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 02:34:57 +0000 Subject: [PATCH 084/110] worker-build: 0.0.12 -> 0.0.13 --- pkgs/development/tools/worker-build/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/development/tools/worker-build/default.nix index b96a9fb605ec..e4fa4b214382 100644 --- a/pkgs/development/tools/worker-build/default.nix +++ b/pkgs/development/tools/worker-build/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; rev = "v${version}"; - sha256 = "sha256-s5fcs1A31ePr2EvFdNvX55jMRkHZkR+LRkcy59brwXg="; + sha256 = "sha256-eJLYe6H8g2ZM3gWt0GMzj0X7+7e7pFtCRCqDJfVzvms="; }; - cargoSha256 = "sha256-2jLv3/mLLnSsSKEGaAd4jaM5FOdTvdJg2W1Nc4mVkqs="; + cargoHash = "sha256-DjWVJH0XeSPesqQr0Rb9Bd+8Q39I1rUoS4dg7KT4mo4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 7b4ce6bbc8187fd190f56765cd96fe8213f9ecec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 28 Feb 2023 20:47:16 +0100 Subject: [PATCH 085/110] trufflehog: 3.28.2 -> 3.28.3 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.28.3 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index b87ef179981f..5eb29a14ba5b 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.28.2"; + version = "3.28.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-sLADYTjC2jXhKkZbq1ft61SDLjY6xpQjwlhS3XkitBo="; + hash = "sha256-zuNDTf7OvlUTg7DUzqeTL3qijcSTQXbOF9pO+uoNANU="; }; - vendorHash = "sha256-+N/aF/aDufOzejpsd49EtkAJGqPZd666KHL0khmS+OA="; + vendorHash = "sha256-xWPH3vbYQu6cBqZjq739S+I7xyQgQ8feJc1PBUbnJZo="; # Test cases run git clone and require network access doCheck = false; From 85246c3f388dfc54ac0c83422ebda0b387e0479f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 08:27:13 +0100 Subject: [PATCH 086/110] python310Packages.pontos: 23.2.10 -> 23.2.12 Diff: https://github.com/greenbone/pontos/compare/refs/tags/v23.2.10...v23.2.12 Changelog: https://github.com/greenbone/pontos/releases/tag/v23.2.12 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index e828149b9cdd..d6fed8f9ac5b 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.2.10"; + version = "23.2.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sXCBuN6H5/7cyOW7LuP5cJ5NixN3KWHJyJudT24rpYg="; + hash = "sha256-3SxgAFpES53AP9W/Q4cajOmgU8sZgK/LduG4psw2KP4="; }; nativeBuildInputs = [ From 784a88b8eff853de378c40712442582910d2f1e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 08:27:45 +0100 Subject: [PATCH 087/110] trufflehog: 3.28.3 -> 3.28.4 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.28.4 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 5eb29a14ba5b..83786aced77a 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.28.3"; + version = "3.28.4"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-zuNDTf7OvlUTg7DUzqeTL3qijcSTQXbOF9pO+uoNANU="; + hash = "sha256-GEmWgS8Y56LJbVxmDXVUk5MHZwP9W0Wo7o/YKvZD7ts="; }; - vendorHash = "sha256-xWPH3vbYQu6cBqZjq739S+I7xyQgQ8feJc1PBUbnJZo="; + vendorHash = "sha256-d8xc7yCyG1xfno/8ANe5eu7irP2yKDY2LKs3XdlktQk="; # Test cases run git clone and require network access doCheck = false; From 92ad4b792cae0bfa9c29d6fb030850c8c24dd01f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 08:30:57 +0100 Subject: [PATCH 088/110] python310Packages.reolink-aio: 0.5.1 -> 0.5.2 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.5.1...0.5.2 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.5.2 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index aa1ebb430d9a..7d4ec741431b 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.1"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-twfFPtTR2LIAbd5YuOgTG/j/xktLkTD3/9fjo514eXI="; + hash = "sha256-GLBekTsJqwzwtSYiYaJSeTt7qNs0gx2nOhlsfECFvKg="; }; postPatch = '' From a681323bcc76d40ebb18f406dff3bf845f2fd149 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 08:31:46 +0100 Subject: [PATCH 089/110] python310Packages.sunweg: 0.0.11 -> 1.0.0 Diff: https://github.com/rokam/sunweg/compare/refs/tags/0.0.11...1.0.0 Changelog: https://github.com/rokam/sunweg/releases/tag/1.0.0 --- pkgs/development/python-modules/sunweg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix index 9dd2338e10ca..0d2e00e59e54 100644 --- a/pkgs/development/python-modules/sunweg/default.nix +++ b/pkgs/development/python-modules/sunweg/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sunweg"; - version = "0.0.11"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rokam"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-by75V1DXQBPCc/viMcbMqF99kNXDjY2Cx0W3Mh2CfI8="; + hash = "sha256-fGaPn4pp1nDL4MX7K8zP2Vq2R/uRtd8rHSaWEG5Ye7s="; }; propagatedBuildInputs = [ From 5d9c3e7ec20f2af335b6809cec5060a65905b792 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 07:39:51 +0000 Subject: [PATCH 090/110] python310Packages.pydata-sphinx-theme: 0.13.0rc6 -> 0.13.0 --- .../python-modules/pydata-sphinx-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index b9a9d9d682cf..93869a393076 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.13.0rc6"; + version = "0.13.0"; format = "wheel"; @@ -22,7 +22,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - sha256 = "sha256-0JrTt5ZPbaEtqn9KbbAFfDjU3/6wAzbcbdAouv5o02I="; + sha256 = "sha256-+ITUC7adMdlk/xnWBk97zqqmNBk1/bwJLVwknR/wC1I="; }; propagatedBuildInputs = [ From c457b8f256043aba5dacc4aa844fc03c3fc581a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 08:40:54 +0100 Subject: [PATCH 091/110] python310Packages.asyncwhois: 1.0.2 -> 1.0.3 Diff: https://github.com/pogzyb/asyncwhois/compare/refs/tags/v1.0.2...v1.0.3 Changelog: https://github.com/pogzyb/asyncwhois/releases/tag/v1.0.3 --- pkgs/development/python-modules/asyncwhois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 4d9ed2cccdef..187d5f005ba9 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.2"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MYK09kszv7CTvZjdA9YQFfhlJ/A5d/aebLRaiMlnuB0="; + hash = "sha256-h2RAUedcVTlX/DmaXewSQfw9gb0rE8NG9hdNe+exqqk="; }; propagatedBuildInputs = [ From ee7e41392f5ab9438df22e5d2b69f15565125a7b Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 1 Mar 2023 15:44:27 +0800 Subject: [PATCH 092/110] deepin.deepin-camera: move NIX_CFLAGS_COMPILE to the env attrset --- pkgs/desktops/deepin/apps/deepin-camera/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index 27556ed73e04..95e1c9eeb49f 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ]; From 5f39a3378beedc33ba17f2e9aae93c67f918db99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 08:47:02 +0100 Subject: [PATCH 093/110] python310Packages.junos-eznc: add changelog to meta --- pkgs/development/python-modules/junos-eznc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 5d44f259f61b..39dbd3b60afb 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -61,11 +61,14 @@ buildPythonPackage rec { nosetests -v -a unit --exclude=test_sw_put_ftp ''; - pythonImportsCheck = [ "jnpr.junos" ]; + pythonImportsCheck = [ + "jnpr.junos" + ]; meta = with lib; { homepage = "https://github.com/Juniper/py-junos-eznc"; description = "Junos 'EZ' automation for non-programmers"; + changelog = "https://github.com/Juniper/py-junos-eznc/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; }; From 9dd52da7cdb4b3a13230f147fc9dbe67d17bda2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Mar 2023 09:09:23 +0100 Subject: [PATCH 094/110] python311Packages.junos-eznc: patch inspect.getargspec --- .../python-modules/junos-eznc/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 39dbd3b60afb..d50dd571764b 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -1,27 +1,23 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub - -# propagates +, fetchpatch , jinja2 , lxml +, mock , ncclient , netaddr +, nose , ntc-templates , paramiko , pyparsing , pyserial +, pythonOlder , pyyaml , scp , six , transitions , yamlordereddictloader - -# tests -, mock -, nose -, pytestCheckHook }: buildPythonPackage rec { @@ -29,6 +25,8 @@ buildPythonPackage rec { version = "2.6.7"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Juniper"; repo = "py-junos-eznc"; @@ -36,6 +34,12 @@ buildPythonPackage rec { hash = "sha256-+hGybznip5RpJm89MLg9JO4B/y50OIdgtmV2FIpZShU="; }; + postPatch = '' + # https://github.com/Juniper/py-junos-eznc/issues/1236 + substituteInPlace lib/jnpr/junos/utils/scp.py \ + --replace "inspect.getargspec" "inspect.getfullargspec" + ''; + propagatedBuildInputs = [ jinja2 lxml @@ -66,9 +70,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/Juniper/py-junos-eznc"; - description = "Junos 'EZ' automation for non-programmers"; changelog = "https://github.com/Juniper/py-junos-eznc/releases/tag/${version}"; + description = "Junos 'EZ' automation for non-programmers"; + homepage = "https://github.com/Juniper/py-junos-eznc"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; }; From e8884540b5b5ffaa0bd18b10ae276f9cc76d9ef3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 1 Mar 2023 09:31:07 +0100 Subject: [PATCH 095/110] cargo-llvm-cov: 0.5.10 -> 0.5.11 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 10b0a689b625..d8b94b298b10 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.10"; + version = "0.5.11"; src = fetchzip { url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-aCrwmo1a88mpK+hrQxjEQeHBrF4uSO+H5mbV9w3FvWo="; + sha256 = "sha256-ygjCVpstU+gKcO85bzU9O3/2mFE885zkGwhAtlhjtVA="; }; - cargoSha256 = "sha256-jhfHTBoIdNcBVrDzJcfBscqrS8SMG6cx4j9Y1FIwBbU="; + cargoSha256 = "sha256-WT609RDA1/UKRMniBpBF2UU36u4MeQH0PV0TzTQDWo0="; # skip tests which require llvm-tools-preview checkFlags = [ From 4a40c0ab8a0ba7b969f4e9a11923dad79df30b5f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Mar 2023 07:52:45 +1000 Subject: [PATCH 096/110] conmon: 2.1.6 -> 2.1.7 Diff: https://github.com/containers/conmon/compare/v2.1.6...v2.1.7 Changelog: https://github.com/containers/conmon/releases/tag/v2.1.7 --- pkgs/applications/virtualization/conmon/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 16fdd0317d5f..a27930fcb4ac 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-vmZSt0k6h4Zpbf+/Nq19QIkG3Fzjj3K031XnivFDA2s="; + hash = "sha256-W6nqhSEoP2mDp7fCoXqwYAafjfESxymYXAdC3BnJJno="; }; nativeBuildInputs = [ pkg-config ]; @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with lib; { + changelog = "https://github.com/containers/conmon/releases/tag/${src.rev}"; homepage = "https://github.com/containers/conmon"; description = "An OCI container runtime monitor"; license = licenses.asl20; From 4b577494fd9c74a3fdca082bdd2f9445fb04a49c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 01:59:18 +0100 Subject: [PATCH 097/110] libgee: clean up - format the expression (one dependency per line) - re-order the expression - use finalAttrs - shove environment variables to env --- pkgs/development/libraries/libgee/default.nix | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index cec611f366cf..7863235e0211 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,27 +1,46 @@ -{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome }: +{ stdenv +, lib +, fetchurl +, autoconf +, vala +, pkg-config +, glib +, gobject-introspection +, gnome +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgee"; version = "0.20.6"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libgee/${lib.versions.majorMinor finalAttrs.version}/libgee-${finalAttrs.version}.tar.xz"; sha256 = "G/g09eENYMxhJNdO08HdONpkZ4f794ciILi0Bo5HbU0="; }; + nativeBuildInputs = [ + pkg-config + autoconf + vala + gobject-introspection + ]; + + buildInputs = [ + glib + ]; + doCheck = true; - nativeBuildInputs = [ pkg-config autoconf vala gobject-introspection ]; - buildInputs = [ glib ]; - - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + env = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + }; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgee"; versionPolicy = "odd-unstable"; }; }; @@ -33,4 +52,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; }; -} +}) From 48e43dd6617f3a8b2656bcd6a10d5a02ba5145b7 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 1 Mar 2023 10:15:38 +0100 Subject: [PATCH 098/110] logseq: 0.8.17 -> 0.8.18 https://github.com/logseq/logseq/releases/tag/0.8.18 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index f0ed6a07e53c..7aa12ee730e1 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.17"; + version = "0.8.18"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-z7v59wXvSIDC7f4IMT8bblPgn+3+J54XqIPzXqWDses="; + hash = "sha256-tD7uNSgcGMPyiA/HfOOZs3NRbWTrds0AdEXTaHYfUjk="; name = "${pname}-${version}.AppImage"; }; From 82d2212d29ca5e7536451d735750ce669087f322 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 16 Feb 2023 13:03:29 +0100 Subject: [PATCH 099/110] =?UTF-8?q?compcert:=203.11=20=E2=86=92=203.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/compcert/default.nix | 5 +++-- pkgs/top-level/coq-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 0e7225a184a2..acde0cdb84c5 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -14,7 +14,7 @@ let compcert = mkCoqDerivation rec { releaseRev = v: "v${v}"; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.16"; out = "3.11"; } + { case = range "8.14" "8.16"; out = "3.12"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } { case = range "8.8" "8.11"; out = "3.8"; } @@ -25,6 +25,7 @@ let compcert = mkCoqDerivation rec { "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; "3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6"; "3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A="; + "3.12".sha256 = "sha256-hXkQ8UnAx3k50OJGBmSm4hgrnRFCosu4+PEMrcKfmV0="; }; strictDeps = true; @@ -138,7 +139,7 @@ compcert.overrideAttrs (o: }) ]; } - { cases = [ (isEq "8.16") "3.11" ]; + { cases = [ (isEq "8.16") (range "3.11" "3.12") ]; out = [ # Support for Coq 8.16.0 (fetchpatch { diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 64121de7ca40..0b9148d2bb62 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -112,7 +112,10 @@ let trakt = callPackage ../development/coq-modules/trakt {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST {}; + VST = callPackage ../development/coq-modules/VST (lib.optionalAttrs + (lib.versionAtLeast self.coq.version "8.14") { + compcert = self.compcert.override { version = "3.11"; }; + }); zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; From 1662bbb5fb786d57473d9c6b5cdef5376fea936e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 22 Feb 2023 11:51:50 +0100 Subject: [PATCH 100/110] coqPackages.smtcoq.cvc4: fix build with bash 5.2 See: 4d85cedf5a312a7750aeb4fb1ce186067887edc1 --- pkgs/development/coq-modules/smtcoq/cvc4.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/smtcoq/cvc4.nix b/pkgs/development/coq-modules/smtcoq/cvc4.nix index 036feae5865c..5b555cc8fc08 100644 --- a/pkgs/development/coq-modules/smtcoq/cvc4.nix +++ b/pkgs/development/coq-modules/smtcoq/cvc4.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat ''; + patches = [ + ../../../applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch + ]; + preConfigure = '' patchShebangs ./src/ ''; From d6aa02046bfaf4f44bf28b51f622787973946ad6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Feb 2023 21:10:01 +0100 Subject: [PATCH 101/110] =?UTF-8?q?gegl:=200.4.40=20=E2=86=92=200.4.42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gegl/-/compare/GEGL_0_4_40...GEGL_0_4_42 --- pkgs/development/libraries/gegl/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index df800e26ab93..ecf9090864dd 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -37,25 +37,16 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.40"; + version = "0.4.42"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "zd6A0VpJ2rmmFO+Y+ATIzm5M/hM5o8JAw08/tFQ2uF0="; + sha256 = "q6g6DLqmxW7cKeoi8ugXKVClO5bapRWSCD1ZIivd4C0="; }; - patches = [ - (fetchurl { - name = "libraw.patch"; - url = "https://src.fedoraproject.org/cgit/rpms/gegl04.git/plain/" - + "libraw.patch?id=5efd0c16a7b0e73abcaecc48af544ef027f4531b"; - hash = "sha256-ZgVigN1T7JmeBMwSdBsMsmXx0h7UW4Ft9HlSqeB0se8="; - }) - ]; - nativeBuildInputs = [ pkg-config gettext From c1a55b8249eeb7a5b394e50f3ed6287ef2c303d2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Feb 2023 21:19:29 +0100 Subject: [PATCH 102/110] =?UTF-8?q?gimp:=202.10.32=20=E2=86=92=202.10.34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.gimp.org/news/2023/02/27/gimp-2-10-34-released/ https://gitlab.gnome.org/GNOME/gimp/-/compare/GIMP_2_10_32...GIMP_2_10_34 --- pkgs/applications/graphics/gimp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 8ffc0a0424e5..def4bc2e1bb8 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -55,13 +55,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.32"; + version = "2.10.34"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "PxXHBVSvXcwbRubcaPPY8KbMn+VrbXisCMD9hZq4miU="; + sha256 = "hABGQtNRs5ikKTzX/TWSBEqUTwW7UoUO5gaPJHxleqM="; }; patches = [ From 20bd2738a40d13d006bde8ee2cf42c605af05bf5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Feb 2023 21:54:15 +0100 Subject: [PATCH 103/110] gnome-photos: support babel 0.1.100 --- pkgs/applications/graphics/gnome-photos/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index ef731caf1a20..d3d3d66feb97 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , at-spi2-core , babl , dbus @@ -45,6 +46,16 @@ stdenv.mkDerivation rec { patches = [ ./installed-tests-path.patch + + # Support babel 0.1.100 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/64c6f733a44bac5b7f08445a686c000681f93f5f.patch"; + hash = "sha256-iB5qCcDEH8pEX42ypEGJ9QMJWE8VXirv5JfdC1jP218="; + }) + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/9db32c3508a8c5d357a053d5f8278c34b4df18f3.patch"; + hash = "sha256-iz6gSu5rUBZ3Ki5GSRVuLcwX0LRQvJT17XmXQ7WJSmI="; + }) ]; nativeBuildInputs = [ From 81218d829ba617e3494c5d949562055e22ba1abd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Feb 2023 21:35:16 +0100 Subject: [PATCH 104/110] =?UTF-8?q?babl:=200.1.98=20=E2=86=92=200.1.100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/babl/-/compare/BABL_0_1_98...BABL_0_1_100 --- pkgs/development/libraries/babl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 010f4c57aede..61bba841ead9 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.98"; + version = "0.1.100"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "87Ii+E5GJzXeY/qcNlGULyt4/TFMc6IuBf98c6/SOvE="; + sha256 = "pebhk2diFdZdfN/q8RWKBgtCoUKjbxqwdtGDMhL50tQ="; }; nativeBuildInputs = [ From eaace18465ca477645cfffa391d21ab55c2db725 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 1 Mar 2023 03:23:55 -0700 Subject: [PATCH 105/110] matrix-synapse: 1.77.0 -> 1.78.0 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 9253b93945b1..c993b18b70c4 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,26 +12,27 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.77.0"; + version = "1.78.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-//1BTiNH3n2eNjwOADb1OB7xp5QsH6arV5Pg3B7y3r0="; + hash = "sha256-UMP/JQ77qGfAQ+adLBLB8NFI2OiuwjILEbEecEDcK1A="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-B9Z+7VtbbX/S01aaMFHgXH60sg8Lmwku2XPRnpMpwjo="; + hash = "sha256-UTuMvTWfOlFlL+4qsCEfVljnkeylBKq0wd5FlAOYAFQ="; }; postPatch = '' # Remove setuptools_rust from runtime dependencies # https://github.com/matrix-org/synapse/blob/v1.69.0/pyproject.toml#L177-L185 sed -i '/^setuptools_rust =/d' pyproject.toml + sed -i 's/^frozendict = ">=1,!=2.1.2,<2.3.5"/frozendict = ">=1,!=2.1.2,<2.3.6"/g' pyproject.toml ''; nativeBuildInputs = [ From 54b1d155046952c41c79bb0a7da834f52effe3b4 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 1 Mar 2023 09:29:42 +0100 Subject: [PATCH 106/110] xmind: add meta.mainProgram --- pkgs/applications/misc/xmind/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index ff0236af5668..58b46208e510 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { binaryBytecode binaryNativeCode ]; + mainProgram = "XMind"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; From b7cfef7e043884ab955612d85e54d182303607c5 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Wed, 1 Mar 2023 16:44:52 +0530 Subject: [PATCH 107/110] flyctl: 0.470 -> 0.473 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index f280c1c8b8c4..13c4bb5efa3b 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.470"; + version = "0.0.473"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-6D106qRd3dsSpZqlOVVV/I38YsjFTEtApvWtCc+LVNw="; + hash = "sha256-bTOGrg+dM+FXNvbeJ3fx1aMlT/2sPVYwGOzZaZfHVm8="; }; vendorHash = "sha256-ExHzf4L0Ibb+tYfBV45hEaUJgSQhgpHk40QhHa5dpQ8="; From 1b0c89ab599ea2088e390acbd39be12260487938 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 22 Feb 2023 22:10:26 +0000 Subject: [PATCH 108/110] gnome-icon-theme: fix cross --- pkgs/data/icons/gnome-icon-theme/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 239cf052ca9e..0c73728d2dec 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -9,8 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im"; }; - nativeBuildInputs = [ + depsBuildBuild = [ pkg-config + ]; + + nativeBuildInputs = [ intltool iconnamingutils gtk2 From 08b9cec3b5fc7b6bb17efe0dd3f5995ad4846ff1 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 27 Feb 2023 18:01:26 +0000 Subject: [PATCH 109/110] gnome-icon-theme: ensure empty runtime closure --- pkgs/data/icons/gnome-icon-theme/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 0c73728d2dec..792519efc15b 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { rm -r "$out/share/locale" ''; + allowedReferences = [ ]; + meta = with lib; { description = "Collection of icons for the GNOME 2 desktop"; homepage = "https://download.gnome.org/sources/gnome-icon-theme/"; From fea42519a41102668eb215a6cb4a883a88b4b236 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 28 Feb 2023 09:07:33 +0100 Subject: [PATCH 110/110] ocaml: 4.14.0 -> 4.14.1 --- pkgs/development/compilers/ocaml/4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.14.nix b/pkgs/development/compilers/ocaml/4.14.nix index 216620d67d60..8ce7967853e7 100644 --- a/pkgs/development/compilers/ocaml/4.14.nix +++ b/pkgs/development/compilers/ocaml/4.14.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "14"; - patch_version = "0"; - sha256 = "sha256:0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn"; + patch_version = "1"; + sha256 = "sha256-wSeXTQJCV2z0cGGyCqnIbRe+DWqpaH9uyYNd5nvnu28"; }