From 522bad71594ec4ad81930e40c2eee9fefc5ad1de Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Wed, 26 Jul 2023 21:41:19 +0200 Subject: [PATCH 01/41] jetbrains.jcef: 654 -> 672 --- .../development/compilers/jetbrains-jdk/jcef.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index d3785703da33..165c9bea58ee 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -76,11 +76,11 @@ buildType = if debugBuild then "Debug" else "Release"; in stdenv.mkDerivation rec { pname = "jcef-jetbrains"; - rev = "3dfde2a70f1f914c6a84ba967123a0e38f51053f"; + rev = "1ac1c682c497f2b864f86050796461f22935ea64"; # This is the commit number - # Currently from the 231 branch: https://github.com/JetBrains/jcef/tree/231 + # Currently from the branch: https://github.com/JetBrains/jcef/tree/232 # Run `git rev-list --count HEAD` - version = "654"; + version = "672"; nativeBuildInputs = [ cmake python3 jdk17 git rsync ant ninja ]; buildInputs = [ libX11 libXdamage nss nspr ]; @@ -89,19 +89,19 @@ in stdenv.mkDerivation rec { owner = "jetbrains"; repo = "jcef"; inherit rev; - hash = "sha256-g8jWzRI2uYzu8O7JHENn0u9yY08fvY6g0Uym02oYUMI="; + hash = "sha256-3HuW8upR/bZoK8euVti2KpCZh9xxfqgyHmgoG1NjxOI="; }; cef-bin = let - fileName = "cef_binary_104.4.26+g4180781+chromium-104.0.5112.102_linux64_minimal"; + fileName = "cef_binary_111.2.1+g870da30+chromium-111.0.5563.64_linux64_minimal"; urlName = builtins.replaceStrings ["+"] ["%2B"] fileName; in fetchzip rec { name = fileName; url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2"; - hash = "sha256-0PAWWBR+9TO8hhejydWz8R6Df3d9A/Mb0VL8stlPz5Q="; + hash = "sha256-r+zXTmDN5s/bYLvbCnHufYdXIqQmCDlbWgs5pdOpLTw="; }; clang-fmt = fetchurl { - url = "https://storage.googleapis.com/chromium-clang-format/942fc8b1789144b8071d3fc03ff0fcbe1cf81ac8"; - hash = "sha256-5iAU49tQmLS7zkS+6iGT+6SEdERRo1RkyRpiRvc9nVY="; + url = "https://storage.googleapis.com/chromium-clang-format/dd736afb28430c9782750fc0fd5f0ed497399263"; + hash = "sha256-4H6FVO9jdZtxH40CSfS+4VESAHgYgYxfCBFSMHdT0hE="; }; configurePhase = '' From 6cb07752da5843e668d05d42666768e00dcea2e8 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 31 Jul 2023 23:07:17 -0700 Subject: [PATCH 02/41] firefox_decrypt: add missing build dependencies --- pkgs/tools/security/firefox_decrypt/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/firefox_decrypt/default.nix b/pkgs/tools/security/firefox_decrypt/default.nix index f0f2e1cf76d4..57f1215ed817 100644 --- a/pkgs/tools/security/firefox_decrypt/default.nix +++ b/pkgs/tools/security/firefox_decrypt/default.nix @@ -2,6 +2,8 @@ , fetchFromGitHub , buildPythonApplication , setuptools +, setuptools-scm +, wheel , nss , nix-update-script }: @@ -9,18 +11,19 @@ buildPythonApplication rec { pname = "firefox_decrypt"; version = "1.1.0"; - format = "pyproject"; src = fetchFromGitHub { owner = "unode"; repo = pname; rev = "0931c0484d7429f7d4de3a2f5b62b01b7924b49f"; - sha256 = "sha256-9HbH8DvHzmlem0XnDbcrIsMQRBuf82cHObqpLzQxNZM="; + hash = "sha256-9HbH8DvHzmlem0XnDbcrIsMQRBuf82cHObqpLzQxNZM="; }; nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; makeWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ nss ]) ]; From d482e00d611047d015838c8f308d5dfda9eb5e77 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Fri, 4 Aug 2023 22:57:00 +0200 Subject: [PATCH 03/41] jetbrains: 2023.1.4 -> 2023.2 jetbrains.phpstorm: 2023.1.4 -> 2023.2 jetbrains.rider: 2023.1.4 -> 2023.2 --- .../editors/jetbrains/default.nix | 4 +- .../editors/jetbrains/versions.json | 48 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 71bf0eaeb5a5..91b803babdab 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -9,7 +9,7 @@ , python3 , icu , lldb -, dotnet-sdk_6 +, dotnet-sdk_7 , maven , autoPatchelfHook , libdbusmenu @@ -275,7 +275,7 @@ let plugins/dotCommon/DotFiles/linux-x64/JetBrains.Profiler.PdbServer rm -rf lib/ReSharperHost/linux-x64/dotnet - ln -s ${dotnet-sdk_6} lib/ReSharperHost/linux-x64/dotnet + ln -s ${dotnet-sdk_7} lib/ReSharperHost/linux-x64/dotnet ''); }); diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 1024284a0112..ee11932fbd5b 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -67,10 +67,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "7b44d704641c6015ce49e12e82c8866e9fdd8e8d421590235e536b3b1312b180", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.tar.gz", - "build_number": "231.9225.18", + "version": "2023.2", + "sha256": "81345b7bf6f9bd844804a6d72f617dd9ced606508e5d34eba8cd83a8b115f556", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.tar.gz", + "build_number": "232.8660.205", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -92,10 +92,10 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2023.1.4", - "sha256": "0ff1916d0db4f081629e118da5418353e14d57bf2c0ec983db931d989becc683", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.tar.gz", - "build_number": "231.9225.23" + "version": "2023.2", + "sha256": "1aa3436edb94cba8ec0e51605e146ecd528affa96e0e26df572c2437e9b00d2f", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.tar.gz", + "build_number": "232.8660.212" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -182,10 +182,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.1.4", - "sha256": "4d3d9005772d2136e44f7774377fae053b690501800ea5e650d0f35882690fdd", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4.dmg", - "build_number": "231.9225.18", + "version": "2023.2", + "sha256": "c8a3287383190113c65ec3c11fe808096faf581ce71953a258992900d97c377f", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.dmg", + "build_number": "232.8660.205", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -207,10 +207,10 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2023.1.4", - "sha256": "5f1fc9acebd587902908e310a97ff4e0fb12e6d840584618ffff6102d756d703", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4.dmg", - "build_number": "231.9225.23" + "version": "2023.2", + "sha256": "8041b79a64ac24578d8fe9c1ec02d91eb3b047164cf48713e988bc9a9c3d53d7", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.dmg", + "build_number": "232.8660.212" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -297,10 +297,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "3285135fc4c529640ecfc5b451fa9b51d9df2a323915509cc6cbb3f25717c9e2", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.4-aarch64.dmg", - "build_number": "231.9225.18", + "version": "2023.2", + "sha256": "365ed1ea1eb87f93abf581080c72866d693bfc60c4b8cd5682b5ec93f63ed4a9", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2-aarch64.dmg", + "build_number": "232.8660.205", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -322,10 +322,10 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2023.1.4", - "sha256": "3995b3566fb64938931d6308891cc63d1a7743076d27cab4ebee1ed028d8f9a5", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.4-aarch64.dmg", - "build_number": "231.9225.23" + "version": "2023.2", + "sha256": "c5168f8ce698b5ddea7652f88b652239f87e87fa51438ac358aa8a44a3686272", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2-aarch64.dmg", + "build_number": "232.8660.212" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", From 50dc54de04e7ba4f7eb3f6d38f905d03e74f0bd2 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Sat, 12 Aug 2023 23:18:04 +0200 Subject: [PATCH 04/41] jetbrains.plugins: update --- .../editors/jetbrains/plugins/plugins.json | 146 +++++++++--------- 1 file changed, 69 insertions(+), 77 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 1b0f0472dd40..3fa5d012ee96 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,13 +17,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", "232.8660.111": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", "232.8660.143": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", "232.8660.185": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", "232.8660.186": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip" + "232.8660.197": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip" }, "name": "ideavim" }, @@ -63,13 +63,13 @@ ], "builds": { "223.8836.1185": null, - "231.9225.18": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip" + "232.8660.111": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip" }, "name": "ini" }, @@ -79,8 +79,8 @@ "phpstorm" ], "builds": { - "231.9225.18": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip" + "232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip" }, "name": "symfony-support" }, @@ -90,8 +90,8 @@ "phpstorm" ], "builds": { - "231.9225.18": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" }, "name": "php-annotations" }, @@ -103,9 +103,9 @@ "rider" ], "builds": { - "231.9225.23": "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip", "232.8660.111": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip" + "232.8660.185": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip" }, "name": "python-community-edition" }, @@ -126,13 +126,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip" + "232.8660.111": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip" }, "name": "rust" }, @@ -153,13 +153,13 @@ ], "builds": { "223.8836.1185": null, - "231.9225.18": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip" + "232.8660.111": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" }, "name": "rust-beta" }, @@ -197,14 +197,14 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip", - "232.8660.111": null, - "232.8660.143": null, - "232.8660.185": null, - "232.8660.186": null, - "232.8660.197": null + "223.8836.1185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip" }, "name": "nixidea" }, @@ -234,13 +234,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip", "232.8660.111": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", "232.8660.143": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", "232.8660.185": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", "232.8660.186": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" + "232.8660.197": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" }, "name": "csv-editor" }, @@ -261,13 +261,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", "232.8660.111": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.8660.143": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.8660.185": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.8660.186": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" + "232.8660.197": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" }, "name": "vscode-keymap" }, @@ -288,13 +288,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip", "232.8660.111": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.8660.143": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.8660.185": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.8660.186": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" + "232.8660.197": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" }, "name": "eclipse-keymap" }, @@ -315,13 +315,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip", "232.8660.111": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.8660.143": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.8660.185": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.8660.186": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" + "232.8660.197": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" }, "name": "visual-studio-keymap" }, @@ -342,13 +342,13 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "231.9225.23": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.8660.111": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.8660.143": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.8660.185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.8660.186": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.8660.197": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "232.8660.197": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.8660.205": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.8660.212": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -368,14 +368,14 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip" + "223.8836.1185": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", + "232.8660.111": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", + "232.8660.143": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", + "232.8660.185": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", + "232.8660.186": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", + "232.8660.197": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip" }, "name": "github-copilot" }, @@ -396,49 +396,41 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "231.9225.23": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.8660.111": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.8660.143": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.8660.185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.8660.186": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "232.8660.197": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.8660.205": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.8660.212": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" } }, "files": { - "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip": "sha256-JC/NOICLHf1gc4wTarDPw7lYfGHOkCOlG194yt18xOA=", "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=", "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip": "sha256-m9ocJSFWparZLrX1MQA0IlSH5LHodmzzVmGZ6eHml24=", "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip": "sha256-MlWTPLA6517inAtiOdJDUeUMyHczXzeUIe4dfASLzsM=", - "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip": "sha256-OqK3HmcksgNlrADv7Ld91VCW+uzTOVWtcXcRC60IKfw=", "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=", "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=", - "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip": "sha256-8jUsRK4evNMzjuWQIjIMrvQ0sIXPoY1C/buu1nod5X8=", "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=", "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=", - "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip": "sha256-b/SFrQX+pIV/R/Dd72EjqbbRgaSgppe3kv4aSxWr//Y=", "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=", "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip": "sha256-dI+Oh6Z+OuqiS8yJI/PbelZdg2YCmoGw9NGotvKc0no=", - "https://plugins.jetbrains.com/files/17718/369180/github-copilot-intellij-1.2.16.2847.zip": "sha256-qsKmVhgh8FyZN4cWbt/UKQEnk+3ANR2U2+wo5sVZZf8=", + "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip": "sha256-pSbM2BkXrWdEVedLIh89sQ1FDnlgO+saXyZsfkI2qYA=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip": "sha256-SqHA6I+mJeBH/Gjos+OiTayClesl5YBLqHvXIVL5o9k=", - "https://plugins.jetbrains.com/files/6981/363869/ini-231.9225.21.zip": "sha256-/HljUhlum/bmgw0sfhK+33AgxCJsT32uU/UjQIzIbKs=", - "https://plugins.jetbrains.com/files/6981/367671/ini-232.8660.158.zip": "sha256-ZJuLy0WM1OC6pjeEyBFDeOqbUz0gcUIgd71k4ggcCeA=", + "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip": "sha256-qxTbWKdYSb4b6CRDKup7rL8EO2qZLM9bctMlTDHfrBk=", "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip": "sha256-vE+fobPbtWlaSHGTLlbDcC6NkaJiA4Qp50h8flXHaJc=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", - "https://plugins.jetbrains.com/files/7322/357028/python-ce-231.9225.4.zip": "sha256-77v4vSHULX2vC0NFMeo2HoOaD3i4WG7zVCmaPUHQJIE=", "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip": "sha256-MD2HNM9ltLK/0KKB6Ly1qu3J8B8QD/8t0FjWEcalIkE=", "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", - "https://plugins.jetbrains.com/files/8182/363621/intellij-rust-0.4.199.5413-231-beta.zip": "sha256-PasY5Ep9vlbM5SAs/uB4j8b7F6dl8keeV/yLAuoTcZY=", - "https://plugins.jetbrains.com/files/8182/363622/intellij-rust-0.4.199.5413-232-beta.zip": "sha256-8GSMckx4hHAfJBZbWcTuN85RROLaXTGix3a9QwZ5pSc=", - "https://plugins.jetbrains.com/files/8182/367350/intellij-rust-0.4.199.5414-231.zip": "sha256-uHitLtuxa6w7XL0kdGf1hPAah8OpsrUWBLxbUNf7Y9o=", - "https://plugins.jetbrains.com/files/8182/367438/intellij-rust-0.4.199.5415-232.zip": "sha256-qa7R+YfVWu/x5p8t28tDtRtMH6dZCGZzMXycpK+epQo=", + "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=", + "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip": "sha256-NeAF3umfaSODjpd6J1dT8Ei5hF8g8OA+sgk7VjBodoU=", "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip": "sha256-SCxqar6a7Q6sOFuZWNXtLRiSd7/34ydhWpL8groKT0U=", - "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=", + "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=", "https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip": "sha256-MPeTPoSUvfjwdWifKxlYHmmVNr+nOD22Hp4srRQbG/o=" } } From fa8fe58eb0b8f3a3f583504caa05ae3f9780db3e Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 12 Aug 2023 17:03:19 -0700 Subject: [PATCH 05/41] openrazer-daemon: do not install twice --- pkgs/development/python-modules/openrazer/common.nix | 1 + pkgs/development/python-modules/openrazer/daemon.nix | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index ff67aa88a5bf..d62c8450cda4 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -2,6 +2,7 @@ , fetchFromGitHub }: rec { version = "3.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "openrazer"; diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 31fbdc462682..622917e8a3e7 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -17,15 +17,13 @@ let common = import ./common.nix { inherit lib fetchFromGitHub; }; in buildPythonPackage (common // { - pname = "openrazer_daemon"; + pname = "openrazer-daemon"; disabled = !isPy3k; outputs = [ "out" "man" ]; - prePatch = '' - cd daemon - ''; + sourceRoot = "${common.src.name}/daemon"; postPatch = '' substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer" @@ -43,8 +41,8 @@ buildPythonPackage (common // { setproctitle ]; - postBuild = '' - DESTDIR="$out" PREFIX="" make install manpages + postInstall = '' + DESTDIR="$out" PREFIX="" make manpages install-resources install-systemd ''; # no tests run From 5c4398b08157543c96deb5f77d7f6bd9b7e40cbc Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 12 Aug 2023 20:12:09 -0700 Subject: [PATCH 06/41] play-with-mpv: unstable-2020-05-18 -> unstable-2021-04-02 --- pkgs/tools/video/play-with-mpv/default.nix | 54 ++++++++++++++++------ 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/video/play-with-mpv/default.nix b/pkgs/tools/video/play-with-mpv/default.nix index d9ab0493160e..9047f9062462 100644 --- a/pkgs/tools/video/play-with-mpv/default.nix +++ b/pkgs/tools/video/play-with-mpv/default.nix @@ -1,31 +1,57 @@ -{ lib, python3Packages, fetchFromGitHub, fetchurl, youtube-dl, git }: +{ lib +, python3Packages +, fetchFromGitHub +, fetchurl +, youtube-dl +}: let - install_freedesktop = fetchurl { - url = "https://github.com/thann/install_freedesktop/tarball/2673e8da4a67bee0ffc52a0ea381a541b4becdd4"; - sha256 = "0j8d5jdcyqbl5p6sc1ags86v3hr2sghmqqi99d1mvc064g90ckrv"; + install-freedesktop = python3Packages.buildPythonPackage rec { + pname = "install-freedesktop"; + version = "0.1.2-1-g2673e8d"; + format = "setuptools"; + + src = fetchurl { + name = "Thann-install_freedesktop-${version}.tar.gz"; + url = "https://github.com/thann/install_freedesktop/tarball/2673e8da4a67bee0ffc52a0ea381a541b4becdd4"; + hash = "sha256-O08G0iMGsF1DSyliXOHTIsOxDdJPBabNLXRhz5osDUk="; + }; + + # package has no tests + doCheck = false; }; in python3Packages.buildPythonApplication rec { pname = "play-with-mpv"; - version = "unstable-2020-05-18"; + version = "unstable-2021-04-02"; + format = "setuptools"; src = fetchFromGitHub { - owner = "thann"; - repo = "play-with-mpv"; - rev = "656448e03fe9de9e8bd21959f2a3b47c4acb8c3e"; - sha256 = "1qma8b3lnkdhxdjsnrq7n9zgy53q62j4naaqqs07kjxbn72zb4p4"; + owner = "thann"; + repo = "play-with-mpv"; + rev = "07a9c1dd57d9e16538991b13fd3e2ed54d6e3a2d"; + hash = "sha256-ZtUFzgYGNa9+g2xDONW8B5bbsbXmyY3IeT1GQH0AVIw="; }; - nativeBuildInputs = [ git ]; - propagatedBuildInputs = [ youtube-dl ]; - postPatch = '' substituteInPlace setup.py --replace \ - '"https://github.com/thann/install_freedesktop/tarball/master#egg=install_freedesktop-0.2.0"' \ - '"file://${install_freedesktop}#egg=install_freedesktop-0.2.0"' + '"https://github.com/thann/install_freedesktop/tarball/master#egg=install_freedesktop-0.2.0"' \ + '"file://${install-freedesktop}#egg=install_freedesktop-0.2.0"' \ + --replace 'version = get_version()' 'version = "0.1.0.post9"' ''; + nativeBuildInputs = with python3Packages; [ + install-freedesktop + wheel + ]; + + propagatedBuildInputs = [ + youtube-dl + ]; + + # package has no tests + doCheck = false; + meta = with lib; { description = "Chrome extension and python server that allows you to play videos in webpages with MPV instead"; homepage = "https://github.com/Thann/play-with-mpv"; From ea620454763b80b8b119bf6bbdb4d1f8a5c7e3e3 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 13 Aug 2023 01:50:19 -0700 Subject: [PATCH 07/41] python3.pkgs.h5py: add missing build dependencies --- pkgs/development/python-modules/h5py/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 4d611cbaf2ab..427caf0211e6 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -2,7 +2,9 @@ , fetchPypi , buildPythonPackage , pythonOlder +, oldest-supported-numpy , setuptools +, wheel , numpy , hdf5 , cython @@ -33,7 +35,6 @@ in buildPythonPackage rec { # avoid strict pinning of numpy postPatch = '' substituteInPlace setup.py \ - --replace "numpy ==" "numpy >=" \ --replace "mpi4py ==" "mpi4py >=" ''; @@ -50,8 +51,10 @@ in buildPythonPackage rec { nativeBuildInputs = [ cython + oldest-supported-numpy pkgconfig setuptools + wheel ]; buildInputs = [ hdf5 ] From ff94bb4ba64bfc3c6efe05cdc303730b666477e5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 15 Aug 2023 00:23:43 +0900 Subject: [PATCH 08/41] python310Packages.jmp: unstable-2021-10-03 -> 0.0.4 Diff: https://github.com/deepmind/jmp/compare/4b94370b8de29b79d6f840b09d1990b91c1afddd...v0.0.4 Changelog: https://github.com/deepmind/jmp/releases/tag/v0.0.4 --- pkgs/development/python-modules/jmp/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jmp/default.nix b/pkgs/development/python-modules/jmp/default.nix index d45c68462372..2435d90accaf 100644 --- a/pkgs/development/python-modules/jmp/default.nix +++ b/pkgs/development/python-modules/jmp/default.nix @@ -8,15 +8,13 @@ buildPythonPackage rec { pname = "jmp"; - # As of 2022-01-01, the latest stable version (0.0.2) fails tests with recent JAX versions, - # IIUC it's fixed in https://github.com/deepmind/jmp/commit/4969392f618d7733b265677143d8c81e44085867 - version = "unstable-2021-10-03"; + version = "0.0.4"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; - rev = "260e5ba01f46b10c579a61393e6c7e546aeae93e"; - hash = "sha256-BTHy/jNf6LeV+x3GTI9MDBWLK6A5z2Z1TQyBkHMTeuE="; + rev = "refs/tags/v${version}"; + hash = "sha256-+PefZU1209vvf1SfF8DXiTvKYEnZ4y8iiIr8yKikx9Y="; }; # Wheel requires only `numpy`, but the import needs `jax`. From 6075cdde4327edd3bd39f6be61fb3a5fbb9b9b47 Mon Sep 17 00:00:00 2001 From: Okan Celik Date: Tue, 15 Aug 2023 17:24:17 +0200 Subject: [PATCH 09/41] jetbrains-toolbox: 2.0.1.16621 -> 2.0.2.16660 --- pkgs/applications/misc/jetbrains-toolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jetbrains-toolbox/default.nix b/pkgs/applications/misc/jetbrains-toolbox/default.nix index f8485132fc78..205ef838203e 100644 --- a/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -10,11 +10,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.0.1.16621"; + version = "2.0.2.16660"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-FZuoLzouwi3HfTJct+Sh8DNzdzQoEsErBb04SgYrZN0="; + sha256 = "sha256-iz9bUkeQZs0k3whRZuIl/KtSn7KlTq1urQ2I+D292MM="; stripRoot = false; }; From 368126c2712a8d113422d2f2aeceb3dc24129b1e Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Tue, 15 Aug 2023 22:01:51 +0200 Subject: [PATCH 10/41] regreet: add support for svg icons --- pkgs/applications/display-managers/greetd/regreet.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix index 6cd336821cca..254589c7a43e 100644 --- a/pkgs/applications/display-managers/greetd/regreet.nix +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -2,9 +2,11 @@ , rustPlatform , fetchFromGitHub , pkg-config +, wrapGAppsHook , glib , gtk4 , pango +, librsvg }: rustPlatform.buildRustPackage rec { @@ -22,8 +24,8 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "gtk4_8" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib gtk4 pango ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook]; + buildInputs = [ glib gtk4 pango librsvg ]; meta = with lib; { description = "Clean and customizable greeter for greetd"; From 1c704628dc81063664db9dcac8d0d90612166d8f Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 16 Aug 2023 08:56:35 +0800 Subject: [PATCH 11/41] nixos/environment: stop setting ASPELL_CONF We set[1] ASPELL_CONF to the last nix profile containing lib/aspell in 2013. In 2017, aspell is patched[2] to search NIX_PROFILES, which makes [1] not needed any more. Deleting it is also agreed in this discussion[3]. [1]: 0192c027203efa9b7b4d6516d8d5ae322e76c6bd [2]: ba4cefe4ae70cfb9121281f508ed5d9fa9dbc662 [3]: https://github.com/NixOS/nixpkgs/pull/30234 --- nixos/modules/programs/environment.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index a448727be778..3fbda153e0b4 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -51,13 +51,6 @@ in environment.extraInit = '' - unset ASPELL_CONF - for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do - if [ -d "$i/lib/aspell" ]; then - export ASPELL_CONF="dict-dir $i/lib/aspell" - fi - done - export NIX_USER_PROFILE_DIR="/nix/var/nix/profiles/per-user/$USER" export NIX_PROFILES="${concatStringsSep " " (reverseList cfg.profiles)}" ''; From dfb2f189af91d608cbc686edb01fc04df73da1fd Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 15 Aug 2023 19:10:21 -0700 Subject: [PATCH 12/41] libgcc: build arm-{isa,cpu}.h for all 32-bit arm, not just armv7 As reported here: https://github.com/NixOS/nixpkgs/pull/247900#issuecomment-1679258061 --- pkgs/development/libraries/gcc/libgcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index e2fbf55876fa..c168113fa3c4 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation (finalAttrs: { insn-constants.h \ '' + lib.optionalString stdenv.targetPlatform.isM68k '' sysroot-suffix.h \ - '' + lib.optionalString stdenv.targetPlatform.isArmv7 '' + '' + lib.optionalString stdenv.targetPlatform.isAarch32 '' arm-isa.h \ arm-cpu.h \ '' + '' From 360dc254fe174ad9f209f5a7a5507538fa76be7a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 15 Aug 2023 19:11:09 -0700 Subject: [PATCH 13/41] tests.cross.sanity: add armv5tel and armv6l --- pkgs/test/cross/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index d6fd8d3b1f80..ff83aedca123 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -135,6 +135,8 @@ let pkgs.pkgsLLVM.stdenv pkgs.pkgsStatic.bash pkgs.pkgsCross.arm-embedded.stdenv + pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel + pkgs.pkgsCross.raspberryPi.stdenv # for armv6l pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv pkgs.pkgsCross.m68k.stdenv pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc From 2fb327fbe6402a096fc33048124b8d87aaf95348 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 16 Aug 2023 11:28:58 +0800 Subject: [PATCH 14/41] meme-image-generator: use sri hash --- pkgs/applications/graphics/meme-image-generator/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/meme-image-generator/default.nix b/pkgs/applications/graphics/meme-image-generator/default.nix index 7418aa07c75b..198f68577487 100644 --- a/pkgs/applications/graphics/meme-image-generator/default.nix +++ b/pkgs/applications/graphics/meme-image-generator/default.nix @@ -11,16 +11,15 @@ buildGoModule rec { owner = "nomad-software"; repo = "meme"; rev = "v${version}"; - sha256 = "089r0v5az2d2njn0s3d3wd0861pcs4slg6zl0rj4cm1k5cj8yd1k"; + hash = "sha256-MzSPJCszVEZkBvSbRzXR7AaDQOOjDQ2stKKJr8oGOSE="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "A command line utility for creating image macro style memes"; homepage = "https://github.com/nomad-software/meme"; license = licenses.mit; maintainers = [ maintainers.fgaz ]; - platforms = with platforms; linux ++ darwin; }; } From f357de89789b54c53c83f82982901d7496723ec1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 16 Aug 2023 13:00:36 +0800 Subject: [PATCH 15/41] uhk-agent: 3.0.1 -> 3.0.2 Diff: https://github.com/UltimateHackingKeyboard/agent/compare/v3.0.1...v3.0.2 --- pkgs/os-specific/linux/uhk-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 435318842048..19ac7fcd42b3 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -1,11 +1,11 @@ { appimageTools, lib, fetchurl }: let pname = "uhk-agent"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-TX7mL6BWAZHZ2W9/BneOt1vxt2slC2Lv6eFWPAgS2a8="; + sha256 = "sha256-RrZ2J6bmk8VXVmpUi9bjqQRJBYjGIczMaSEG9aQ4U4I="; }; appimageContents = appimageTools.extract { From 467c723b66eaabcf657fc0109350b150181e9082 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Wed, 16 Aug 2023 16:02:57 +1000 Subject: [PATCH 16/41] nwg-panel: 0.7.17 -> 0.9.11 --- pkgs/applications/misc/nwg-panel/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index a7d35325c39f..167e9a83d976 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -10,17 +10,18 @@ , pamixer # pamixer , pulseaudio # pactl , libdbusmenu-gtk3 # tray +, playerctl }: python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.7.17"; + version = "0.9.11"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-HGbPBHf5PIjbuMSd/2fFSCLQ/7s1Xbys+KoGXctQOvM="; + rev = "v${version}"; + hash = "sha256-4/R/x3iQ6nsG5OLy/FMA24uxS3xKD/2901gBNe6lkk4="; }; # No tests @@ -30,7 +31,7 @@ python3Packages.buildPythonApplication rec { strictDeps = false; dontWrapGApps = true; - buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango ]; + buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ]; nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; propagatedBuildInputs = (with python3Packages; [ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ]) @@ -56,6 +57,7 @@ python3Packages.buildPythonApplication rec { description = "GTK3-based panel for Sway window manager"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ludovicopiero ]; + mainProgram = "nwg-panel"; }; } From b7cc813898e513bc2639b10603303f7b4fac2751 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Aug 2023 08:51:05 +0000 Subject: [PATCH 17/41] sarasa-gothic: 0.41.3 -> 0.41.6 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index a6840559e293..b5954f485e71 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.41.3"; + version = "0.41.6"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-/VC9zhWC3jJuIXQ2fel6moLzrdsguPaylgfkY9FoClQ="; + hash = "sha256-6CDK9DNjBQ5EPp562na0DOWFmlxnlVl8Z8pwm3pGQ9A="; }; sourceRoot = "."; From b3a9edefc6c8e9336cf829de78ff982fca77dc54 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Wed, 16 Aug 2023 11:06:37 +0200 Subject: [PATCH 18/41] pixinsight: 1.8.9-1 -> 1.8.9-2 --- pkgs/applications/graphics/pixinsight/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 9cf2e50ea3b2..b75e5564d668 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "pixinsight"; - version = "1.8.9-1"; + version = "1.8.9-2"; src = requireFile rec { - name = "PI-linux-x64-${version}-20220518-c.tar.xz"; + name = "PI-linux-x64-${version}-20230814-c.tar.xz"; url = "https://pixinsight.com/"; - sha256 = "sha256-AVeDJ7YYqCo7KfelUUQurjglNnTwCf0pOzJCV/bQrrw="; + sha256 = "sha256-4Jspkl5riMlbeJX/h1zhVfVymORPK1X4l0LyOgXm05Y="; message = '' PixInsight is available from ${url} and requires a commercial (or trial) license. After a license has been obtained, PixInsight can be downloaded from the software distribution @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { libXext libXfixes libXrandr + libxkbfile ]); postPatch = '' From 62bf40dea38560839e051f8a1a92a36e7648a490 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 16 Aug 2023 17:29:33 +0800 Subject: [PATCH 19/41] ligolo-ng: 0.4.3 -> 0.4.4 --- pkgs/tools/networking/ligolo-ng/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index fabd4de1f49f..d4b4dca3326f 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "v${version}"; - hash = "sha256-O/qiznQs+x7qBYXVItd0W7a0irEzRf0We7kW7HHLqcw="; + hash = "sha256-bv611kvjyXvWVkWpymQn4NLtDAYuXnNi1c3yT3t3p+8="; }; + vendorHash = "sha256-MEG1p8PJinFOPIU9+9cxtU9FweCgVMYX8KojQ3ZhKKs="; + postConfigure = '' export CGO_ENABLED=0 ''; ldflags = [ "-s" "-w" "-extldflags '-static'" ]; - vendorHash = "sha256-If0K6DmkGk3AmO3eb/ocAl1RJeBN/xgY7dOh9lnVLh8="; - doCheck = false; # tests require network access meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ded768cc63a7..7c790ac074cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23670,9 +23670,7 @@ with pkgs; lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; - ligolo-ng = callPackage ../tools/networking/ligolo-ng { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + ligolo-ng = callPackage ../tools/networking/ligolo-ng { }; linenoise = callPackage ../development/libraries/linenoise { }; From 0a732d2adf679b654775013252bb8c91ff608d1a Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Wed, 16 Aug 2023 14:40:33 +0300 Subject: [PATCH 20/41] nixos/oauth2_proxy: service after network.target -> network-online.target --- nixos/modules/services/security/oauth2_proxy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 12547acabfe0..718c3d2498ea 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -579,7 +579,7 @@ in description = "OAuth2 Proxy"; path = [ cfg.package ]; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network-online.target" ]; serviceConfig = { User = "oauth2_proxy"; From bf6c1577a9032e76c0f1527a82b8a444a7bb80be Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 16 Aug 2023 09:08:37 +0200 Subject: [PATCH 21/41] libxisf: 0.2.8 -> 0.2.9 --- .../libraries/science/astronomy/libxisf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/pkgs/development/libraries/science/astronomy/libxisf/default.nix index a1fcd4da7b3d..17e454e13e21 100644 --- a/pkgs/development/libraries/science/astronomy/libxisf/default.nix +++ b/pkgs/development/libraries/science/astronomy/libxisf/default.nix @@ -6,18 +6,19 @@ , lz4 , pugixml , zlib +, zstd }: stdenv.mkDerivation (finalAttrs: { pname = "libxisf"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitea { domain = "gitea.nouspiro.space"; owner = "nou"; repo = "libXISF"; rev = "v${finalAttrs.version}"; - hash = "sha256-YB97vMz2+cFRYq8x2Su3Eh952U6kGIVLYV7kDEd5S8g="; + hash = "sha256-Jh3NWtQSV0uePDMCDNzdI4qpRGbHTel3neRZAA3anQk="; }; patches = [ @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { lz4 pugixml zlib + zstd ]; doCheck = true; From 14767f46f348917d39184e15c5a742df5a5029cf Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 16 Aug 2023 09:31:12 -0400 Subject: [PATCH 22/41] difftastic: 0.49.0 -> 0.50.0 Diff: https://github.com/wilfred/difftastic/compare/0.49.0...0.50.0 Changelog: https://github.com/Wilfred/difftastic/blob/0.50.0/CHANGELOG.md --- pkgs/tools/text/difftastic/Cargo.lock | 30 ++++++++++++++++++++------ pkgs/tools/text/difftastic/default.nix | 4 ++-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/text/difftastic/Cargo.lock b/pkgs/tools/text/difftastic/Cargo.lock index 25e3c8e41fe2..1d0974afe898 100644 --- a/pkgs/tools/text/difftastic/Cargo.lock +++ b/pkgs/tools/text/difftastic/Cargo.lock @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -234,7 +234,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.49.0" +version = "0.50.0" dependencies = [ "assert_cmd", "bumpalo", @@ -244,6 +244,7 @@ dependencies = [ "crossterm", "glob", "hashbrown 0.12.3", + "humansize", "itertools", "lazy_static", "libc", @@ -362,6 +363,15 @@ dependencies = [ "libc", ] +[[package]] +name = "humansize" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" +dependencies = [ + "libm", +] + [[package]] name = "humantime" version = "1.3.0" @@ -402,6 +412,12 @@ version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + [[package]] name = "libmimalloc-sys" version = "0.1.24" @@ -651,9 +667,9 @@ checksum = "59ffec9df464013295b499298811e6a3de31bf8128092135826517db12dee601" [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -661,9 +677,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 3842fb6b1473..520afe5a3024 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -16,13 +16,13 @@ in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-jFBvMRkuAaQAi/28BBf/9cm6FcNMOYS5M69YoSXsX4Q="; + hash = "sha256-CC06Bryn5VNEsW4Wwbo+ubifizCWgpWUE1FsAozZcdg="; }; cargoLock = { From 228a8d907a82edc008a9c587ee76e14f1c7735a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Aug 2023 14:05:13 +0000 Subject: [PATCH 23/41] komga: 1.3.0 -> 1.3.1 --- pkgs/servers/komga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index e85fbbdef359..14e53cbd166c 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-7/Q4POz2MyS8he3E5F/Delmwc4/EHCoXXz5EAnzVwFk="; + sha256 = "sha256-R1weJRQ8DkBbUndGyO8wvFpsI+6OTZ59C8P6EzsMV+E="; }; nativeBuildInputs = [ From 9a6ea9af2801e009346c970b7182257e0de546b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Aug 2023 14:19:03 +0000 Subject: [PATCH 24/41] api-linter: 1.55.2 -> 1.56.0 --- pkgs/development/tools/api-linter/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index 550cdb8e56b6..e3fef3f13428 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.55.2"; + version = "1.56.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-OBx8zlxDLlPy6hfA8A9+F0bOglAzY81d9U7uCje0vyo="; + hash = "sha256-IanIznKRmmW83/NWjW5VeBQUA/u4RSFzAQf1/QOAsK8="; }; - vendorHash = "sha256-x8mncoXVK7p6xxgaZL/Fv6dHgeOj2rWr55ovvk6zwQE="; + vendorHash = "sha256-6MvXVHg4EH5S37JnY0jnAFjDplQINWPFyd54c1W/oAE="; subPackages = [ "cmd/api-linter" ]; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.55.2/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.56.0/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go < Date: Wed, 16 Aug 2023 23:42:38 +0800 Subject: [PATCH 25/41] okteto: 2.18.3 -> 2.19.0 --- pkgs/development/tools/okteto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index df89a174158a..398746f87be2 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.18.3"; + version = "2.19.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-ZSrTVfZfIzfeXr6SDKHZZYrqvGKYA6bwMXZ4fBP+2Uo="; + hash = "sha256-cjdSJNhGP0YCent3r5GG1AhfWGbML46JAremXIwXMDY="; }; - vendorHash = "sha256-ruDXfDwVmMLFsIF+YV4CryEPSeU2cEul9FfRiApII9g="; + vendorHash = "sha256-u1oMX2ZplmDGx7ePfA5vKHUuDmWYVCJrYh2HQ23dTfU="; postPatch = '' # Disable some tests that need file system & network access. From d16b0690f8f73e2b085136591cab912d51fe944b Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 10 Aug 2023 15:38:47 -0400 Subject: [PATCH 26/41] libiio: disable Python for static builds libiio's Python bindings use ctypes to load the shared library, which obviously can't work with a static build. This has recently started causing eval errors because the package uses stdenv.hostPlatform.extensions.sharedLibrary, which isn't available when building a static library. This patch adds a flag to disable the Python bindings, and automatically disables them for static builds. Note that even with this patch, static libiio doesn't build successfully by default. You have to disable avahi and manually disable libxml2 with custom CMake flags. --- pkgs/development/libraries/libiio/default.nix | 21 +++++++++++-------- pkgs/top-level/python-packages.nix | 5 ++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index d217fbd82384..98ca22d2e90d 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -4,7 +4,7 @@ , flex , bison , libxml2 -, python +, pythonSupport ? stdenv.hostPlatform.hasSharedLibraries, python , libusb1 , avahiSupport ? true, avahi , libaio @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { pname = "libiio"; version = "0.24"; - outputs = [ "out" "lib" "dev" "python" ]; + outputs = [ "out" "lib" "dev" ] + ++ lib.optional pythonSupport "python"; src = fetchFromGitHub { owner = "analogdevicesinc"; @@ -37,8 +38,9 @@ stdenv.mkDerivation rec { flex bison pkg-config + ] ++ lib.optionals pythonSupport ([ python - ] ++ lib.optional python.isPy3k python.pkgs.setuptools; + ] ++ lib.optional python.isPy3k python.pkgs.setuptools); buildInputs = [ libxml2 @@ -49,25 +51,26 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" - "-DPython_EXECUTABLE=${python.pythonForBuild.interpreter}" - "-DPYTHON_BINDINGS=on" # osx framework is disabled, # the linux-like directory structure is used for proper output splitting "-DOSX_PACKAGE=off" "-DOSX_FRAMEWORK=off" + ] ++ lib.optionals pythonSupport [ + "-DPython_EXECUTABLE=${python.pythonForBuild.interpreter}" + "-DPYTHON_BINDINGS=on" ] ++ lib.optionals (!avahiSupport) [ "-DHAVE_DNS_SD=OFF" ]; postPatch = '' - # Hardcode path to the shared library into the bindings. - sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1 - substituteInPlace libiio.rules.cmakein \ --replace /bin/sh ${runtimeShell} + '' + lib.optionalString pythonSupport '' + # Hardcode path to the shared library into the bindings. + sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1 ''; - postInstall = '' + postInstall = lib.optionalString pythonSupport '' # Move Python bindings into a separate output. moveToOutput ${python.sitePackages} "$python" ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2572b7a4e70..6d6611eb8718 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5882,7 +5882,10 @@ self: super: with self; { inherit (pkgs.config) cudaSupport; }; - libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; + libiio = (toPythonModule (pkgs.libiio.override { + pythonSupport = true; + inherit python; + })).python; libkeepass = callPackage ../development/python-modules/libkeepass { }; From d095f4d2b20f5987653d76a718806fbfd9c8a455 Mon Sep 17 00:00:00 2001 From: chewblacka Date: Wed, 16 Aug 2023 21:52:35 +0100 Subject: [PATCH 27/41] remnote: 1.12.3 -> 1.12.9 https://feedback.remnote.com/changelog/1-12-8 --- pkgs/applications/misc/remnote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 722e1b4bfa79..75804968f57d 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "remnote"; - version = "1.12.3"; + version = "1.12.9"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - sha256 = "sha256-qLEEIzTE5h9+9tWL0qSFCqN/MW124NtIacqiKnhlbp8="; + sha256 = "sha256-ZBo7yxbTS+2pWecbPGxp0UMy16HRMwuuUUejb6DUHic="; }; meta = with lib; { From 681b500b6faaccf5a0b685ce226295d89bafbd6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 23:18:07 +0200 Subject: [PATCH 28/41] python311Packages.json-tricks: 3.15.5 -> 3.17.2 Diff: https://github.com/mverleg/pyjson_tricks/compare/v3.15.5...v3.17.2 --- pkgs/development/python-modules/json-tricks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix index 65ed7e7220fe..a9fd6f24aa2d 100644 --- a/pkgs/development/python-modules/json-tricks/default.nix +++ b/pkgs/development/python-modules/json-tricks/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "json-tricks"; - version = "3.15.5"; + version = "3.17.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "mverleg"; repo = "pyjson_tricks"; rev = "v${version}"; - sha256 = "wdpqCqMO0EzKyqE4ishL3CTsSw3sZPGvJ0HEktKFgZU="; + sha256 = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s="; }; nativeCheckInputs = [ numpy pandas pytz pytestCheckHook ]; From d2514e1a8e2f833f36fced192ccd0fad2d92fe29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 23:28:03 +0200 Subject: [PATCH 29/41] python311Packages.json-tricks: add format --- .../python-modules/json-tricks/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix index a9fd6f24aa2d..74d30d1aa468 100644 --- a/pkgs/development/python-modules/json-tricks/default.nix +++ b/pkgs/development/python-modules/json-tricks/default.nix @@ -11,18 +11,27 @@ buildPythonPackage rec { pname = "json-tricks"; version = "3.17.2"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "mverleg"; repo = "pyjson_tricks"; - rev = "v${version}"; - sha256 = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s="; + rev = "refs/tags/v${version}"; + hash = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s="; }; - nativeCheckInputs = [ numpy pandas pytz pytestCheckHook ]; + nativeCheckInputs = [ + numpy + pandas + pytz + pytestCheckHook + ]; - pythonImportsCheck = [ "json_tricks" ]; + pythonImportsCheck = [ + "json_tricks" + ]; meta = with lib; { description = "Extra features for Python JSON handling"; From ea0c453fea3949b82f89475b6b10cddd77831564 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 23:28:38 +0200 Subject: [PATCH 30/41] python311Packages.json-tricks: update disabled --- pkgs/development/python-modules/json-tricks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix index 74d30d1aa468..f6f0ddf77cba 100644 --- a/pkgs/development/python-modules/json-tricks/default.nix +++ b/pkgs/development/python-modules/json-tricks/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "3.17.2"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mverleg"; From 5a747c08443daff0a2626ad73d98f67a9b5adc74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 23:35:41 +0200 Subject: [PATCH 31/41] python310Packages.msgspec: 0.18.0 -> 0.18.1 Diff: https://github.com/jcrist/msgspec/compare/refs/tags/0.18.0...0.18.1 Changelog: https://github.com/jcrist/msgspec/releases/tag/0.18.1 --- pkgs/development/python-modules/msgspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 2c3a0b153e43..89ccbb63ff60 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FZq8SEtn/p7x43Je2d0gIGDi8S4uz4cdV0KkQecCFT4="; + hash = "sha256-cacwbl5JYqQGXhdt/F0nhX032GCw8RwFi0XBsn7dlq0="; }; # Requires libasan to be accessible From 2f29aa92b52306055c7e99c2c8a765466618b74d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 23:51:10 +0200 Subject: [PATCH 32/41] python311Packages.odp-amsterdam: 5.1.1 -> 5.2.0 Diff: https://github.com/klaasnicolaas/python-odp-amsterdam/compare/refs/tags/v5.1.1...v5.2.0 Changelog: https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/v5.2.0 --- pkgs/development/python-modules/odp-amsterdam/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 99c3f9e46990..76cf0b0ef1e5 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -7,11 +7,12 @@ , pythonOlder , pytest-asyncio , pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "odp-amsterdam"; - version = "5.1.1"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,13 +21,12 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-DaL2CTrhWqBwl3kktF1wndxzrreA24C3zXmp4ghf/4s="; + hash = "sha256-iJjwxvlxzRpKy2P0A3mS2i05bues5YasP72HuZiuFyE="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace '"0.0.0"' '"${version}"' - sed -i '/addopts/d' pyproject.toml ''; @@ -36,6 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pytz ]; nativeCheckInputs = [ From 190e3457d1790a286f5b0dabc17a68057dc98b7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Aug 2023 00:01:33 +0200 Subject: [PATCH 33/41] python311Packages.oracledb: 1.3.2 -> 1.4.0 Changelog: https://github.com/oracle/python-oracledb/blob/v1.4.0/doc/src/release_notes.rst --- pkgs/development/python-modules/oracledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index cd7f6ad1b8ff..b7aae7330bba 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "1.3.2"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uzw5HBZ7V3jdsVp1OKKzbbXJuIpQyGxheByp/zArtkM="; + hash = "sha256-lrpQj3g4ksfKZI8misvLikqcgDfH3UpQnwXyyJ1iMb4="; }; nativeBuildInputs = [ From 7b3adc85bfb0af3d4a1fda4a54e202211fbf71a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Aug 2023 00:12:53 +0200 Subject: [PATCH 34/41] python310Packages.aioesphomeapi: 16.0.0 -> 16.0.1 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v16.0.0...v16.0.1 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v16.0.1 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 205409520618..f6b87c401cee 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "16.0.0"; + version = "16.0.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ATfAI8srh5G1ejkp/2wl2Soowatjprq9e8h8tSAAXGs="; + hash = "sha256-DxEfkM//WvGqS/iWb6RIvE2raIYb/I0bcwrLqLBjCmw="; }; propagatedBuildInputs = [ From 8c93ca7597fcffa6806efa39f4902d39e7db185f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Aug 2023 00:13:37 +0200 Subject: [PATCH 35/41] python310Packages.boschshcpy: 0.2.60 -> 0.2.65 Diff: https://github.com/tschamm/boschshcpy/compare/0.2.60...0.2.65 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 8d0f0b21590e..9bf45e92f47c 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.60"; + version = "0.2.65"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-RCHOkTBnJcqGc3Y0cQhkgkizuqNl98MU8lxpVoHVLcc="; + hash = "sha256-6KqfEPwTrW9VzR73LYFZeQOpG57vS9Xa/Dl4vLMD8U8="; }; propagatedBuildInputs = [ From f2b530294f34dfb52a0fdc1fb5a01ea908abb388 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 14 Aug 2023 09:30:56 -0400 Subject: [PATCH 36/41] .github/labeler.yml: add zig label --- .github/labeler.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 941cc65e6d07..fc6202f51cf0 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -188,6 +188,10 @@ - nixos/tests/xfce.nix - pkgs/desktops/xfce/**/* +"6.topic: zig": + - pkgs/development/compilers/zig/**/* + - doc/hooks/zig.section.md + "8.has: changelog": - nixos/doc/manual/release-notes/**/* From d3257078d8b345b2be04630897a2e308e0487463 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Aug 2023 03:33:56 +0000 Subject: [PATCH 37/41] python310Packages.drf-spectacular: 0.26.3 -> 0.26.4 --- pkgs/development/python-modules/drf-spectacular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index aeb90488dfd1..b90a35f4ea69 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "drf-spectacular"; - version = "0.26.3"; + version = "0.26.4"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular"; rev = "refs/tags/${version}"; - hash = "sha256-O47676BOuCx3wMpeuRATQOAWZQev+R+OxZi4boQABmc="; + hash = "sha256-f8x4QOt2EbDv+NlYAmpzXrCdT+q4wLGIrDsuUd45j2U="; }; propagatedBuildInputs = [ From eea82945f9e60bd77f022d395dcca1429daaf308 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 03:08:59 +0000 Subject: [PATCH 38/41] terraform-providers.linode: 2.5.2 -> 2.6.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 7799c7d0627e..9d698fdc2798 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -682,13 +682,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-4lcEiX/Prx1fpD1HOo8B4YSvxo9yo7zWu07DVZ6NTmw=", + "hash": "sha256-tSbrd+T1HOOpO4atNDcYmq0SkEureSJkjWOnxqOTdnM=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.5.2", + "rev": "v2.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ggKPeTPIFrnfoREB4yr5Wr2dwc5y7Gq0fBtUsbnoCL0=" + "vendorHash": "sha256-dIxOvx8UpZD5I7acucxzfnq+gyDX+uqVMJRkqH5jTRI=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", From 057d2bd7dd8b831c2c326030dede795205f11463 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 03:09:10 +0000 Subject: [PATCH 39/41] terraform-providers.kubernetes: 2.22.0 -> 2.23.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 9d698fdc2798..40e29fd3a790 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -655,11 +655,11 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-J3+F6GJJjGzWBwqnznI/If6I0sZ733h6ShR2EdbqPVs=", + "hash": "sha256-aPplKT6L9Lmp4St6DLtHywiunqLaABEB9urbtSfK8Ec=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.22.0", + "rev": "v2.23.0", "spdx": "MPL-2.0", "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, From 3f410ddcf650369a64bf11d5d1db1c538eca15dc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 03:16:10 +0000 Subject: [PATCH 40/41] terraform-providers.yandex: 0.96.1 -> 0.97.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 40e29fd3a790..26efc4b892e5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1270,12 +1270,12 @@ "vendorHash": "sha256-77pijBYzCQoaZgMRNRwZEAJVM51EMGezXXcrfn9ae1Q=" }, "yandex": { - "hash": "sha256-bG8cBOkwsVew5qmaFXdq7yc2j8JNfY9qwnQ7IJGUZvM=", + "hash": "sha256-Y4bEbqUTxP1QDf1r8a3vtxV+RG3dqjHxHN9p/nB3qz8=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.96.1", + "rev": "v0.97.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ni422dybGvn5yzu85FbBdvG0zL7+rSpJWr8+HE1MSeg=" + "vendorHash": "sha256-1Sw4a9HFYt24Om5Bbbmx6JskhbMd4zTv6K6WOrQetpQ=" } } From 2540f5c05c4223228b58700b5690486658c719bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 03:16:26 +0000 Subject: [PATCH 41/41] terraform-providers.oci: 5.8.0 -> 5.9.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 26efc4b892e5..119c151a8875 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -827,11 +827,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-dB8yoUPv6uYKveZxCblwif2FKW0qNdY5CJMpbZivB78=", + "hash": "sha256-sxhykS4pXF00VJVtVd7kO2GasAqBUUMqPDPLE3BzUFI=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.8.0", + "rev": "v5.9.0", "spdx": "MPL-2.0", "vendorHash": null },