From aaee0efe60827b309caf1a008d0686fccd8dd72d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Sep 2023 01:44:15 +0000 Subject: [PATCH 1/3] netbird: 0.22.7 -> 0.23.1 (cherry picked from commit 479efeade68ba40c63108e74bf48a67f366de901) --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 97a53e882c70..6e90bd64a433 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -30,13 +30,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.22.7"; + version = "0.23.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2Xvpalizazhkp8aYPYY5Er9I6dkL8AKnrjpIU44o2WM="; + sha256 = "sha256-YCCkVNFRFoHkBGZ67VHOrw/hxMrwi3lkdbHwMCLE6Hg="; }; vendorHash = "sha256-CwozOBAPFSsa1XzDOHBgmFSwGiNekWT8t7KGR2KOOX4="; From 76e176baef131db720b13895fdbcd4750cdaeb8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:19:17 +0200 Subject: [PATCH 2/3] gitlab: 16.3.2 -> 16.3.3 (#254943) https://gitlab.com/gitlab-org/gitlab/-/blob/v16.3.3-ee/CHANGELOG.md (cherry picked from commit 3d2a10abfce3ebd6313d3c7d85e3ea52c4fe662d) Co-authored-by: Yaya --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 314b7a694e68..d0c88d1ecb48 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.3.2", - "repo_hash": "sha256-SFxmbVWFEq0kWhzCLESdAksxUd0tiNeLGCOKNRHKMqI=", + "version": "16.3.3", + "repo_hash": "sha256-+h3ksxuphegTvjrKTWk68fgan1n2g64b1sn5nMoYhLc=", "yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.3.2-ee", + "rev": "v16.3.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.3.2", - "GITLAB_PAGES_VERSION": "16.3.2", + "GITALY_SERVER_VERSION": "16.3.3", + "GITLAB_PAGES_VERSION": "16.3.3", "GITLAB_SHELL_VERSION": "14.26.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8", - "GITLAB_WORKHORSE_VERSION": "16.3.2" + "GITLAB_WORKHORSE_VERSION": "16.3.3" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 4af439246003..d5705250f437 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.3.2"; + version = "16.3.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-Q2wXoc4tLJvc0LwSct3cCswOqhUJSVVhoG/uFXeVOB4="; + hash = "sha256-V9uh5QkvQ1ifO5DNCivg47NBjgE06Ehz7DnmBeU3lVY="; }; vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index e2e9642ac4e5..e94d32d27a63 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.3.2"; + version = "16.3.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-1e3s+RLuNilNtsKzfKrsbAD0dzA87LbLH/c43CKh5EU="; + hash = "sha256-TPXMXuxckALObfEcIguJbGToIGp8b2bpd974epaXpyk="; }; vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 950e069e29f8..4b4580a9ba87 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.3.2"; + version = "16.3.3"; src = fetchFromGitLab { owner = data.owner; From e27ca312d56522b907b998c2ff99169bf12639f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Sep 2023 15:55:06 +0200 Subject: [PATCH 3/3] Revert "firefox-esr: use nss_esr as intended" We're currently not updating the NSS on the stable release to the version required in new esr releases, so this broke Firefox ESR 115 and Thunderbird 115. This reverts commit f81059c16b16d9826ef7fd0ecc23bf3d0888f859. --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 5eb882651380..62f525a76959 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -457,7 +457,7 @@ buildStdenv.mkDerivation ({ # icu73 changed how it follows symlinks which breaks in the firefox sandbox # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287 ++ [ (if (lib.versionAtLeast version "115") then icu else icu72) ] - ++ [ (if (lib.versionAtLeast version "116") then nss_latest else nss_esr/*3.90*/) ] + ++ [ (if (lib.versionAtLeast version "103") then nss_latest else nss_esr) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed