From 983bbf6c1e1f98d76a0f0c9cf31d7b2fb8d5634a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 26 Jun 2023 04:20:00 +0000 Subject: [PATCH 01/26] millet: 0.11.4 -> 0.12.0 Diff: https://github.com/azdavis/millet/compare/v0.11.4...v0.12.0 Changelog: https://github.com/azdavis/millet/raw/v0.12.0/docs/CHANGELOG.md --- .../tools/language-servers/millet/Cargo.lock | 72 +++++++++---------- .../tools/language-servers/millet/default.nix | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 53486c5cfeb5..d77d8c39878e 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "diagnostic", @@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "str-util", @@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "cm-syntax" -version = "0.11.4" +version = "0.12.0" dependencies = [ "lex-util", "paths", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "config" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "serde", @@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "once_cell", @@ -415,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.11.4" +version = "0.12.0" dependencies = [ "cm-syntax", "config", @@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.11.4" +version = "0.12.0" dependencies = [ "analysis", "anyhow", @@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.11.4" +version = "0.12.0" [[package]] name = "libc" @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.11.4" +version = "0.12.0" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.11.4" +version = "0.12.0" dependencies = [ "anyhow", "env_logger", @@ -622,7 +622,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "paths", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "diagnostic", @@ -657,7 +657,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.11.4" +version = "0.12.0" dependencies = [ "lex-util", "paths", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.11.4" +version = "0.12.0" dependencies = [ "better-panic", ] @@ -923,7 +923,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "str-util", @@ -931,14 +931,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.11.4" +version = "0.12.0" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "fmt-util", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "pretty_assertions", @@ -965,7 +965,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "elapsed", @@ -979,7 +979,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "once_cell", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.11.4" +version = "0.12.0" dependencies = [ "la-arena", "sml-lab", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "cov-mark", @@ -1014,14 +1014,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.11.4" +version = "0.12.0" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.11.4" +version = "0.12.0" dependencies = [ "cov-mark", "diagnostic", @@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "sml-comment", @@ -1045,11 +1045,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.11.4" +version = "0.12.0" [[package]] name = "sml-parse" -version = "0.11.4" +version = "0.12.0" dependencies = [ "diagnostic", "event-parse", @@ -1061,14 +1061,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.11.4" +version = "0.12.0" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.11.4" +version = "0.12.0" dependencies = [ "num-bigint", "num-traits", @@ -1077,7 +1077,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.11.4" +version = "0.12.0" dependencies = [ "chain-map", "config", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.11.4" +version = "0.12.0" dependencies = [ "chain-map", "code-h2-md-map", @@ -1119,7 +1119,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.11.4" +version = "0.12.0" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1127,7 +1127,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.11.4" +version = "0.12.0" dependencies = [ "char-name", "code-h2-md-map", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "sml-hir", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.4" +version = "0.12.0" dependencies = [ "analysis", "cm-syntax", @@ -1552,7 +1552,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.11.4" +version = "0.12.0" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index aa3c13246dff..11aad10e0f91 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-hlL1Rgw78umLyWJNHv3TUpRhQofro+gZQUJJ2ss1ilY="; + hash = "sha256-WoawuH0fuhVrTEtcdfkKpJUQBcbMnbybDST4DDkJEqM="; }; cargoLock = { From 952db33c5e1389d6af4b6abe503caf489d205383 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 26 Jun 2023 04:20:00 +0000 Subject: [PATCH 02/26] nfpm: 2.30.1 -> 2.31.0 Diff: https://github.com/goreleaser/nfpm/compare/v2.30.1...v2.31.0 --- pkgs/tools/package-management/nfpm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index d4f9faa9e67f..3853271ac00b 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.30.1"; + version = "2.31.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sQpFIZphZqjifqVH3okR+2Ww6IRnqImDySLNk7qYgtg="; + hash = "sha256-49MhTCc+LCfw1tOvLFaagMnQITeCeG+xfH5FmF4/u/c="; }; - vendorHash = "sha256-FW39fqvoMkXrpV0C3WAAOjaEUPF0LrBS99dIC/rFtSI="; + vendorHash = "sha256-eHNdtK3OZRi+oujuC4yToPdNL5GyRqNu09nRRP5cYK4="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; @@ -37,6 +37,7 @@ buildGoModule rec { meta = with lib; { description = "A simple deb and rpm packager written in Go"; homepage = "https://github.com/goreleaser/nfpm"; + changelog = "https://github.com/goreleaser/nfpm/releases/tag/v${version}"; maintainers = with maintainers; [ marsam techknowlogick caarlos0 ]; license = with licenses; [ mit ]; }; From c33c6c4aa419f75076ec36ef196c496b7120d91a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 26 Jun 2023 04:20:00 +0000 Subject: [PATCH 03/26] esbuild: 0.18.9 -> 0.18.10 Diff: https://github.com/evanw/esbuild/compare/v0.18.9...v0.18.10 Changelog: https://github.com/evanw/esbuild/blob/v0.18.10/CHANGELOG.md --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 8249f2ca421e..4e95b02bfb7b 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.18.9"; + version = "0.18.10"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-sNVRn80IKG14OVaBGy58f+WXCMwRCZC4hAh+sN3ulR4="; + hash = "sha256-mJ6q/Ccg7Lm6OXncLnA7QAyiDS/tZJJqobPG+shGPJQ="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From d57a08965239e9b32cdea58213ce99d699be3f04 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 26 Jun 2023 08:07:55 +0000 Subject: [PATCH 04/26] eos-installer: set meta.mainProgram --- pkgs/applications/misc/eos-installer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix index 5200907ff0db..67e6b2bc97ad 100644 --- a/pkgs/applications/misc/eos-installer/default.nix +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Installer UI which writes images to disk"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qyliss ]; + mainProgram = "gnome-image-installer"; platforms = platforms.linux; }; } From 32927c0aba9ca923b5495d58b297530ab2839920 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 26 Jun 2023 21:56:51 +0800 Subject: [PATCH 05/26] uefi-run: 0.6.0 -> 0.6.1 Diff: https://github.com/Richard-W/uefi-run/compare/v0.6.0...v0.6.1 --- pkgs/tools/virtualization/uefi-run/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/tools/virtualization/uefi-run/default.nix index 9de84ae8fc23..aacb6f7d583b 100644 --- a/pkgs/tools/virtualization/uefi-run/default.nix +++ b/pkgs/tools/virtualization/uefi-run/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "uefi-run"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Richard-W"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OL21C3J4M7q1nNB6lL9xaU6ryZN45UDUqiKsbqQhYH8="; + hash = "sha256-tR547osqw18dCMHJLqJ8AQBelbv8yCl7rAqslu+vnDQ="; }; - cargoSha256 = "sha256-ieX8jQKv9Fht1p7JtTieZ5M+rXdn6/Oo/LgJ8NEBIuQ="; + cargoHash = "sha256-s1Kbc3JHoYy0UJwNfSunIdQ3xHjlQaut/Cb0JSYyB9g="; meta = with lib; { description = "Directly run UEFI applications in qemu"; From 5e979fc0dd693fbf7579b25d965f482a865e45e7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 21:51:42 +0800 Subject: [PATCH 06/26] cinnamon.cinnamon-common: 5.8.2 -> 5.8.3 https://github.com/linuxmint/cinnamon/compare/5.8.2...5.8.3 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 417cd6b717f6..e1f0009ba472 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.8.2"; + version = "5.8.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-KY5ctByMYKxigiZ0X/blaHJuyiAUNB6B2gpGtC/k100="; + hash = "sha256-PvU5lcoIDguWiLdI+uIiJHqS1ae436Xc7TfRVytR02k="; }; patches = [ From 52ae9f099cfba69aa1cea2739298d15d5e48b952 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 21:58:46 +0800 Subject: [PATCH 07/26] xdg-desktop-portal-xapp: 1.0.1 -> 1.0.2 https://github.com/linuxmint/xdg-desktop-portal-xapp/compare/1.0.1...1.0.2 --- .../development/libraries/xdg-desktop-portal-xapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index 5b447e8b8891..ce25bd9519a8 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-N0LVgk3VT0Fax1GTB7jzFhwzNEeAuyFHAuxXNCo2o3Y="; + hash = "sha256-0qZUSo3m63kSFYbfn8GUU8JLdgBimlqfEWWrsK/k+Aw="; }; nativeBuildInputs = [ From f2dc536888b3c62f0bcb0cd95fee95ac4432a054 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 21:59:58 +0800 Subject: [PATCH 08/26] cinnamon.nemo: 5.8.2 -> 5.8.3 https://github.com/linuxmint/nemo/compare/5.8.2...5.8.3 --- pkgs/desktops/cinnamon/nemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 18b2aff557ff..13963f386dfb 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.8.2"; + version = "5.8.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-Be67TOA1gLwSYx8y2iyfvY0QCpWOFutpXMDaPiTRQGg="; + sha256 = "sha256-/GwtTklOkhCkbBMQLl4dKUnlZwN6FX2kqxN7cJVaVwE="; }; patches = [ From 5bed31475f6e1911e968d9ca45ba28691296f69f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 22:00:26 +0800 Subject: [PATCH 09/26] cinnamon.mint-themes: 2.1.2 -> 2.1.3 https://github.com/linuxmint/mint-themes/compare/2.1.2...2.1.3 --- pkgs/desktops/cinnamon/mint-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index ed7d011bc4f7..05b743904ff0 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Y+KmSKuREn2E3FySsScjL+oSpSFnyEqhoXQfU++86JY="; + hash = "sha256-ouqhksy3999pi8v4f64W4X/h655ZVi8dR22g4LlYwMI="; }; nativeBuildInputs = [ From 008293231b0540aab35f25613f3c2cc2af667ac8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 22:03:11 +0800 Subject: [PATCH 10/26] cinnamon.folder-color-switcher: 1.5.7 -> 1.5.8 https://github.com/linuxmint/folder-color-switcher/compare/03311d62...f167627c --- pkgs/desktops/cinnamon/folder-color-switcher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix index cc7f7e7cdcf6..b889d7ff6a70 100644 --- a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "03311d62a62e2cd7d0592b241c287091161ec6b6"; - sha256 = "sha256-HQv9vSpRSBjqbncGFv+O5XQtRJ+4Cq0aWZHoj5BhKYE="; + rev = "f167627cffaf8b34e27b0515153b669b980fd62e"; + sha256 = "sha256-u8Lv0OTxKgjIp1q5WR0NXULhnwFfEDYGRlBpFMVHCBY="; }; nativeBuildInputs = [ From d6cb6539a05a0b05ad1091a350dbbbb7a58a64b2 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 26 Jun 2023 00:18:34 +0800 Subject: [PATCH 11/26] qttools: disable clang-based c++ parser by default --- pkgs/development/libraries/qt-6/modules/qttools.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index 7d13e9a03e5c..adca87550cca 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -3,13 +3,15 @@ , lib , qtbase , qtdeclarative -, llvmPackages , cups +, llvmPackages +# clang-based c++ parser for qdoc and lupdate +, withClang ? false }: qtModule { pname = "qttools"; - buildInputs = [ + buildInputs = lib.optionals withClang [ llvmPackages.libclang llvmPackages.llvm ]; From 4e5204700c6933e6116a8d5dbb059890f11562d2 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 26 Jun 2023 22:56:51 +0800 Subject: [PATCH 12/26] qtdoc/qtcreator: use qttools with clang support --- pkgs/development/libraries/qt-6/modules/qtdoc.nix | 2 +- pkgs/development/tools/qtcreator/qt6.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/pkgs/development/libraries/qt-6/modules/qtdoc.nix index 004a18f53c78..3bbe39e5ee20 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdoc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdoc.nix @@ -13,7 +13,7 @@ qtModule { --replace '$QT_INSTALL_DOCS' "${qtbase}/share/doc" done ''; - nativeBuildInputs = [ qttools ]; + nativeBuildInputs = [ (qttools.override { withClang = true; }) ]; qtInputs = [ qtdeclarative ]; cmakeFlags = [ "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS" diff --git a/pkgs/development/tools/qtcreator/qt6.nix b/pkgs/development/tools/qtcreator/qt6.nix index 1d61966386f4..25d056917e43 100644 --- a/pkgs/development/tools/qtcreator/qt6.nix +++ b/pkgs/development/tools/qtcreator/qt6.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qttools + (qttools.override { withClang = true; }) wrapQtAppsHook python3 ninja From 4eb02eab86c8809d8f7648d770ceb3844cd4516e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 23:53:03 +0800 Subject: [PATCH 13/26] xed-editor: 3.4.1 -> 3.4.2 https://github.com/linuxmint/xed/compare/3.4.1...3.4.2 --- pkgs/applications/editors/xed-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index a1508e7a3b62..de3f1801ef9c 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-fBwxc6n4sNNRiKcax96Tl3cFD+Ryvmj+XizB3z2s4+Q="; + sha256 = "sha256-fTrvHf7iA3qexxdebSgzLXlngAOkdraW3KiVTVYodrY="; }; nativeBuildInputs = [ From 118b0bf1300c496781c79deb247649a660e490bf Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 14:29:35 -0400 Subject: [PATCH 14/26] scraper: 0.16.0 -> 0.17.1 Diff: https://diff.rs/scraper/0.16.0/0.17.1 Changelog: https://github.com/causal-agent/scraper/releases/tag/v0.17.1 --- pkgs/tools/text/scraper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index fd8324217f05..d325646a35d2 100644 --- a/pkgs/tools/text/scraper/default.nix +++ b/pkgs/tools/text/scraper/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.16.0"; + version = "0.17.1"; src = fetchCrate { inherit pname version; - hash = "sha256-3FxEfrScOetB1raiT9xjq9G2xLrLZqVlkqbVAFCIhZ0="; + hash = "sha256-SVrQi9VxTzUHkdFdieOAIBhKvyrZqi3xKGooHkCEmhQ="; }; - cargoHash = "sha256-Pf8+vvOvOHpuJ2v7iwdVzHwneqvhk2E4nbGO4TL/FAM="; + cargoHash = "sha256-/Lut38gFO4XtrBHXr4sfcII+bWgcCDrHf5/PKPrDiDs="; nativeBuildInputs = [ installShellFiles ]; From 5887c52c3c40cc44cd16d65901dcc719dd69c077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Mon, 26 Jun 2023 22:25:41 +0200 Subject: [PATCH 15/26] comodoro: 0.0.8 -> 0.0.9 --- pkgs/applications/misc/comodoro/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix index c036b2aa2c7d..1ce6195aaec5 100644 --- a/pkgs/applications/misc/comodoro/default.nix +++ b/pkgs/applications/misc/comodoro/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comodoro"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "soywod"; repo = "comodoro"; rev = "v${version}"; - sha256 = "rGnVXyfWJkPHfpf1gRGbDJ6Y1ycKOOcCZ+Jx35fUo6M="; + hash = "sha256-pxe3Nv1N85uWsiv4s0wtD++zlZZgMADH51f5RMK9huA="; }; - cargoSha256 = "jpshuavywCLN03xD/gFgQeGbKtmHq5pULbxd+RUbaDk="; + cargoSha256 = "E5oHeMow9MrVrlDX+v0tX9Nv3gHUxDNUpRAT5jPa+DI="; nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; From 1ab0f466c8e5d92a0637e9a854543a1f33648b77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Jun 2023 20:53:18 +0000 Subject: [PATCH 16/26] git-machete: 3.17.4 -> 3.17.6 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 18b83d8e4400..05e21b641e94 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.17.4"; + version = "3.17.6"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-g3SEUVcyr6+nt0zMHB1F4drCwmQvPYQErOwSl9I+1Tg="; + hash = "sha256-o3Z1xPu5RcspU4m3Bb6ydZkXOMgOMJPN/+TLekwe/wI="; }; nativeBuildInputs = [ installShellFiles ]; From b6d9d0123e7d98165341c05966caf086463792d8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 17:09:26 -0400 Subject: [PATCH 17/26] typos: 1.15.6 -> 1.15.7 Diff: https://github.com/crate-ci/typos/compare/v1.15.6...v1.15.7 Changelog: https://github.com/crate-ci/typos/blob/v1.15.7/CHANGELOG.md --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 8218a1d59174..f99257fee592 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.15.6"; + version = "1.15.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-J78EJi2PXa3a83gP05b+ufDyq+BT9e1h7E/QiYs5mls="; + hash = "sha256-x4ydM6xDls/7otR8toDEZVk/dKBGHB1+3K1RdRGg9eI="; }; - cargoHash = "sha256-9WUzWWwZHC9OPw18Xi3krkIfNH/gdB6VPhrL80RLCvk="; + cargoHash = "sha256-tc0Bf5n4pKwAExps84kSgI0rP2BwvuMRdFEqU0qlDdg="; meta = with lib; { description = "Source code spell checker"; From c203643b82fc99785be7eb3559838e003382eb7f Mon Sep 17 00:00:00 2001 From: Josh Hoffer Date: Mon, 26 Jun 2023 15:21:06 -0600 Subject: [PATCH 18/26] electron-mail: 5.1.6 -> 5.1.8 --- .../networking/mailreaders/electron-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index 20f3597b1517..a7b51585e3a0 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "5.1.6"; + version = "5.1.8"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-lsXVsx7U43czWFWxAgwTUYTnUXSL4KPFnXLzUklieAo="; + sha256 = "sha256-btqlxFrQUyb728i99IE65A9jwEFNvJ5b6zji0kwwATU="; }; appimageContents = appimageTools.extract { inherit name src; }; From 005c84e12a79f8f81e66e46ad8e081afef8ac411 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 27 Jun 2023 04:18:05 +0200 Subject: [PATCH 19/26] firefox-mobile: init (#206054) --- .../browsers/firefox/mobile-config.nix | 113 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 115 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/mobile-config.nix diff --git a/pkgs/applications/networking/browsers/firefox/mobile-config.nix b/pkgs/applications/networking/browsers/firefox/mobile-config.nix new file mode 100644 index 000000000000..6e43295697ea --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/mobile-config.nix @@ -0,0 +1,113 @@ +{ stdenv, lib, runCommand, fetchFromGitLab, wrapFirefox, firefox-unwrapped }: + +let + pkg = fetchFromGitLab { + owner = "postmarketOS"; + repo = "mobile-config-firefox"; + rev = "ff2f07873f4ebc6e220da0e9b9f04c69f451edda"; + sha256 = "sha256-8wRz8corz00+0qROMiOmZAddM4tjfmE91bx0+P8JNx4="; + }; + userChrome = runCommand "userChrome.css" {} '' + cat ${pkg}/src/userChrome/*.css > $out + ''; + userContent = runCommand "userContent.css" {} '' + cat ${pkg}/src/userContent/*.css > $out + ''; +in wrapFirefox firefox-unwrapped { + # extraPolicies = (lib.importJSON "${pkg}/src/policies.json").policies; + extraPoliciesFiles = [ "${pkg}/src/policies.json" ]; + extraPrefs = '' + // Copyright 2022 Arnaud Ferraris, Oliver Smith + // SPDX-License-Identifier: MPL-2.0 + + // This is a Firefox autoconfig file: + // https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig + + // Import custom userChrome.css on startup or new profile creation + const {classes: Cc, interfaces: Ci, utils: Cu} = Components; + Cu.import("resource://gre/modules/Services.jsm"); + Cu.import("resource://gre/modules/FileUtils.jsm"); + + var updated = false; + + // Create /chrome/ directory if not already present + var chromeDir = Services.dirsvc.get("ProfD", Ci.nsIFile); + chromeDir.append("chrome"); + if (!chromeDir.exists()) { + chromeDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + } + + // Create nsIFile objects for userChrome.css in /chrome/ and in /etc/ + var chromeFile = chromeDir.clone(); + chromeFile.append("userChrome.css"); + var defaultChrome = new FileUtils.File("${userChrome}"); + + // No auto-upgrade. Should this be replaced with symlinking? + // // Remove the existing userChrome.css if older than the installed one + // if (chromeFile.exists() && defaultChrome.exists() && + // chromeFile.lastModifiedTime < defaultChrome.lastModifiedTime) { + // chromeFile.remove(false); + // } + + // Copy userChrome.css to /chrome/ + if (!chromeFile.exists()) { + defaultChrome.copyTo(chromeDir, "userChrome.css"); + updated = true; + } + + // Create nsIFile objects for userContent.css in /chrome/ and in /etc/ + var contentFile = chromeDir.clone(); + contentFile.append("userContent.css"); + var defaultContent = new FileUtils.File("${userContent}"); + + // No auto-upgrade. Should this be replaced with symlinking? + // // Remove the existing userContent.css if older than the installed one + // if (contentFile.exists() && defaultContent.exists() && + // contentFile.lastModifiedTime < defaultContent.lastModifiedTime) { + // contentFile.remove(false); + // } + + // Copy userContent.css to /chrome/ + if (!contentFile.exists()) { + defaultContent.copyTo(chromeDir, "userContent.css"); + updated = true; + } + + // Restart Firefox immediately if one of the files got updated + if (updated === true) { + var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup); + appStartup.quit(Ci.nsIAppStartup.eForceQuit | Ci.nsIAppStartup.eRestart); + } + + defaultPref('general.useragent.override', 'Mozilla/5.0 (Android 11; Mobile; rv:96.0) Gecko/96.0 Firefox/96.0'); + defaultPref('browser.urlbar.suggest.topsites', false); + defaultPref('browser.urlbar.suggest.engines', false); + defaultPref('browser.newtabpage.enabled', true); + + // Enable android-style pinch-to-zoom + pref('dom.w3c.touch_events.enabled', true); + pref('apz.allow_zooming', true); + pref('apz.allow_double_tap_zooming', true); + + // Save vertical space by hiding the titlebar + pref('browser.tabs.inTitlebar', 1); + + // Disable search suggestions + pref('browser.search.suggest.enabled', false); + + // Empty new tab page: faster, less distractions + pref('browser.newtabpage.enabled', false); + + // Allow UI customizations with userChrome.css and userContent.css + pref('toolkit.legacyUserProfileCustomizations.stylesheets', true); + + // Select the entire URL with one click + pref('browser.urlbar.clickSelectsAll', true); + + // Disable cosmetic animations, save CPU + pref('toolkit.cosmeticAnimations.enabled', false); + + // Disable download animations, save CPU + pref('browser.download.animateNotifications', false); + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cae1ec5ec64..b85950f1e450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31082,6 +31082,8 @@ with pkgs; firefox-beta = wrapFirefox firefox-beta-unwrapped { }; firefox-devedition = wrapFirefox firefox-devedition-unwrapped { }; + firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; + firefox-esr = firefox-esr-102; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; From e183519871591fad0588a0e5e656a7041d7e0c67 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 22:25:57 -0400 Subject: [PATCH 20/26] fclones-gui: 0.1.3 -> 0.1.4 Diff: https://github.com/pkolaczk/fclones-gui/compare/v0.1.3...v0.1.4 Changelog: https://github.com/pkolaczk/fclones-gui/releases/tag/v0.1.4 --- pkgs/tools/misc/fclones/gui.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix index 0e7a6ae4dafa..2652b674e39b 100644 --- a/pkgs/tools/misc/fclones/gui.nix +++ b/pkgs/tools/misc/fclones/gui.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchCrate +, fetchFromGitHub , pkg-config , wrapGAppsHook4 , gdk-pixbuf @@ -12,14 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones-gui"; - version = "0.1.3"; + version = "0.1.4"; - src = fetchCrate { - inherit pname version; - hash = "sha256-SQJ6CZlvu4V9Rs+rhH4jMf0AVWs71KvRUnUxGPlgj80="; + src = fetchFromGitHub { + owner = "pkolaczk"; + repo = "fclones-gui"; + rev = "v${version}"; + hash = "sha256-zJ5TqFmvUL1nKR8E+jGR4K6OGHJ4ckRky+bdKW0T30s="; }; - cargoHash = "sha256-8WLYbEbPrR8c0y+Uaxo6YGiFRt7FLHZM+1O/UZq0c7g="; + cargoHash = "sha256-QT4ZxjarPkEqJLKPsGAaMIaSUmKWZ1xtxWMe2uXaUek="; nativeBuildInputs = [ pkg-config @@ -36,7 +38,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Interactive duplicate file remover"; - homepage = "https://github.com/pkolaczk/fclones/tree/main/fclones-gui"; + homepage = "https://github.com/pkolaczk/fclones-gui"; + changelog = "https://github.com/pkolaczk/fclones-gui/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; From 2229c311e4a70762a33887c0442e0d16ccecf4c5 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 27 Jun 2023 10:52:13 +0800 Subject: [PATCH 21/26] cpeditor: fixup build cpeditor require c++14, the setting of CMAKE_CXX_STANDARD does not seem to affect submodules --- pkgs/applications/editors/cpeditor/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix index eaa2b0d9959c..718c3fdd20fd 100644 --- a/pkgs/applications/editors/cpeditor/default.nix +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { substituteInPlace src/Core/Runner.cpp --replace "/bin/bash" "${runtimeShell}" ''; + env.NIX_CFLAGS_COMPILE = "-std=c++14"; + meta = with lib; { description = "An IDE specially designed for competitive programming"; homepage = "https://cpeditor.org"; From 1b83ce98d323ba6f27d9bb47cc36b62ece3aca70 Mon Sep 17 00:00:00 2001 From: Misaka13514 Date: Tue, 27 Jun 2023 08:44:22 +0800 Subject: [PATCH 22/26] nuclei: 2.9.6 -> 2.9.7 Diff: https://github.com/projectdiscovery/nuclei/compare/v2.9.6...v2.9.7 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v2.9.7 Co-authored-by: figsoda --- pkgs/tools/security/nuclei/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 778f5e6ca008..2f6323bb3f79 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.9.6"; + version = "2.9.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-hltXm+NXExmO9IuwdfuET9+PaRby9pLAE/4ac7xQqvE="; + hash = "sha256-w9XiXZzkDM1ZETzs/c3uMEoaRXUXKzpzn3k3RbgTXbE="; }; - vendorHash = "sha256-geQBa0caKjDQD3AlVNhU8cmM9mFSR+Ix0HjxKKadSqE="; + vendorHash = "sha256-T09uSUBRZGsI732723UTd2jOT9/pYjUp+nshWthGA1k="; modRoot = "./v2"; subPackages = [ @@ -36,6 +36,6 @@ buildGoModule rec { homepage = "https://github.com/projectdiscovery/nuclei"; changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab Misaka13514 ]; }; } From d0f2eb641dd5f780c8c136f5d2013672d3cb0afd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:17:11 +0000 Subject: [PATCH 23/26] terraform-providers.bitbucket: 2.33.0 -> 2.34.0 --- .../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 1896bafd9031..d8f0d5c370ea 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -164,13 +164,13 @@ "vendorHash": null }, "bitbucket": { - "hash": "sha256-T9e3IQHe6uCdllRTctJg/aG1QmPFR6V4ryw79yX2k/o=", + "hash": "sha256-Sby7Dvu4UWzdbQWa/GLMkDzlK7foaFApy4yLNBOJgck=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.33.0", + "rev": "v2.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ebkUF+Xv9diwUYXYt/WK+0tWheqL1cgA665VbGLmvvo=" + "vendorHash": "sha256-AcUw5i3st7VfAnpy/6nTYfTv3rOAN2jm4rUmEKcSrXM=" }, "brightbox": { "hash": "sha256-yKoYjrZs6EOX1pdDuF+LOu/jZ3fidZJBU7yhSp6qSFU=", From 62c4033e53fba6bdee618b8ba9f58884b86fec3a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:18:09 +0000 Subject: [PATCH 24/26] terraform-providers.exoscale: 0.49.0 -> 0.50.0 --- .../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 d8f0d5c370ea..16876b2ce82a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,11 +363,11 @@ "vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM=" }, "exoscale": { - "hash": "sha256-DD6CkdZ9KCCkPCgPyWXaAvHfHyn9rYXRsXg9BVJkELM=", + "hash": "sha256-dLA9BWW4ghD1OSZaZtFfv8ipS+2lTeNRr1YD3E8ewpI=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.49.0", + "rev": "v0.50.0", "spdx": "MPL-2.0", "vendorHash": null }, From 72c1b61eae5ce0a2128f5bf69c613af18d4204a2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:19:04 +0000 Subject: [PATCH 25/26] terraform-providers.grafana: 1.41.0 -> 1.42.0 --- .../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 16876b2ce82a..7d8e76f84ee5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -474,13 +474,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-5V0TW80GQKa2JHrSf9SlsCrT9jTTQK+SMRa/OCIrthE=", + "hash": "sha256-J5Fn3JGp7jXAA04RJ3FFKqLpB4hekd0yFA8zkfPPQ+4=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.41.0", + "rev": "v1.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-CRqUSPXap8lXRa/yIDnG11F/D+IdylY3JzkV6bXmzwY=" + "vendorHash": "sha256-8FgjFIgEx3pA6vKo7m9e6gASrpp5cPtN7A2US2GASy8=" }, "gridscale": { "hash": "sha256-OzOI//WXMHzHSbsqLSAfVpt756SbF3Uv0r/7MsVMjzY=", From 521ad9a6d67615506778d47bdce03da383f8d120 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:21:47 +0000 Subject: [PATCH 26/26] terraform-providers.vsphere: 2.4.0 -> 2.4.1 --- .../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 7d8e76f84ee5..c3ad7f546551 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1234,11 +1234,11 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-XVMTKYb9RuK5sErVHsP0j5otUEioxp6C7GV7/J6OYVA=", + "hash": "sha256-lWMtsBRAirNI7dNXI7APzS1AbPmkz5fsbpCdd/0XBRc=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.4.0", + "rev": "v2.4.1", "spdx": "MPL-2.0", "vendorHash": "sha256-wKKrBSJkbdqqnDLoS+jhvI26rOzvMWjjsN8wh67Le5U=" },