From 4bef3d66230df46402ee6d6f7c8d485cde1e1804 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Feb 2025 17:06:56 +0000 Subject: [PATCH 01/28] xlights: 2025.01 -> 2025.03 --- pkgs/by-name/xl/xlights/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index f461b65b4168..4a7bd0852b2e 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2025.01"; + version = "2025.03"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-Xw1sfsvaH+IuuX+4frlFb7GEaF1s8UwWj7uRydj10O4="; + hash = "sha256-ASDiIpVLs02Q0vfGCih+a2kKmDbK8BLM8vcdDDaKfSU="; }; meta = { From e75791d411f71ed0f5e5f2779f70583cbc00ca0d Mon Sep 17 00:00:00 2001 From: polygon Date: Thu, 20 Feb 2025 23:08:34 +0100 Subject: [PATCH 02/28] serial-studio: 1.1.7 -> 3.0.6 + fixes --- .../serial-studio/0001-CMake-Deploy-Fix.patch | 45 +++++++++++++++++++ .../0002-Connect-Button-Fix.patch | 16 +++++++ .../se/serial-studio/package.nix} | 34 +++++++++----- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch create mode 100644 pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch rename pkgs/{applications/misc/serial-studio/default.nix => by-name/se/serial-studio/package.nix} (58%) diff --git a/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch b/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch new file mode 100644 index 000000000000..705039b635bc --- /dev/null +++ b/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch @@ -0,0 +1,45 @@ +diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt +index e69150cd..c4ce7975 100644 +--- a/app/CMakeLists.txt ++++ b/app/CMakeLists.txt +@@ -257,16 +257,16 @@ elseif(APPLE) + MACOSX_BUNDLE_INFO_PLIST ${INFO_MACOSX} + ) + elseif(UNIX) +- install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION /usr/bin) ++ install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION bin) + + install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.png +- DESTINATION /usr/share/pixmaps ++ DESTINATION share/pixmaps + ) + + install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.desktop +- DESTINATION /usr/share/applications ++ DESTINATION share/applications + ) + endif() + +@@ -289,17 +289,6 @@ elseif(WIN32) + set(deploy_tool_options_arg --no-compiler-runtime -force-openssl --release) + endif() + +-qt_generate_deploy_qml_app_script( +- TARGET ${PROJECT_EXECUTABLE} +- OUTPUT_SCRIPT deploy_script +- MACOS_BUNDLE_POST_BUILD +- NO_UNSUPPORTED_PLATFORM_ERROR +- DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM +- DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg} +-) +- +-install(SCRIPT ${deploy_script}) +- + #------------------------------------------------------------------------------- + # Packaging + #------------------------------------------------------------------------------- +-- +2.47.2 + diff --git a/pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch b/pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch new file mode 100644 index 000000000000..d1cbf622909f --- /dev/null +++ b/pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch @@ -0,0 +1,16 @@ +diff --git a/app/qml/MainWindow/Panes/Toolbar.qml b/app/qml/MainWindow/Panes/Toolbar.qml +index 9b59c0c2..fa428a2f 100644 +--- a/app/qml/MainWindow/Panes/Toolbar.qml ++++ b/app/qml/MainWindow/Panes/Toolbar.qml +@@ -320,7 +320,7 @@ Rectangle { + font: Cpp_Misc_CommonFonts.boldUiFont + Layout.minimumWidth: metrics.width + 16 + Layout.maximumWidth: metrics.width + 16 +- enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen && !Cpp_MQTT_Client.isSubscribed ++ enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen + text: checked ? qsTr("Disconnect") : qsTr("Connect") + icon.source: checked ? "qrc:/rcc/icons/toolbar/connect.svg" : + "qrc:/rcc/icons/toolbar/disconnect.svg" +-- +2.47.2 + diff --git a/pkgs/applications/misc/serial-studio/default.nix b/pkgs/by-name/se/serial-studio/package.nix similarity index 58% rename from pkgs/applications/misc/serial-studio/default.nix rename to pkgs/by-name/se/serial-studio/package.nix index 081cff81337b..795c5d73dd38 100644 --- a/pkgs/applications/misc/serial-studio/default.nix +++ b/pkgs/by-name/se/serial-studio/package.nix @@ -2,34 +2,44 @@ lib, stdenv, fetchFromGitHub, - qmake, - qtquickcontrols2, - qtserialport, - qtsvg, - wrapQtAppsHook, + cmake, + qt6, + pkg-config, }: stdenv.mkDerivation rec { pname = "serial-studio"; - version = "1.1.7"; + version = "3.0.6"; src = fetchFromGitHub { owner = "Serial-Studio"; repo = "Serial-Studio"; rev = "v${version}"; - hash = "sha256-Tsd1PGB7cO8h3HDifOtB8jsnj+fS4a/o5nfLoohVLM4="; + hash = "sha256-q3RWy3HRs5NG0skFb7PSv8jK5pI5rtbccP8j38l8kjM="; fetchSubmodules = true; }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + cmake + qt6.wrapQtAppsHook + pkg-config ]; buildInputs = [ - qtquickcontrols2 - qtserialport - qtsvg + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg + qt6.qtgraphs + qt6.qtlocation + qt6.qtconnectivity + qt6.qttools + qt6.qtserialport + qt6.qtpositioning + ]; + + patches = [ + ./0001-CMake-Deploy-Fix.patch + ./0002-Connect-Button-Fix.patch ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6867e25b744..e7f372b54a07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18086,8 +18086,6 @@ with pkgs; pinentry = pinentry-curses; }; - serial-studio = libsForQt5.callPackage ../applications/misc/serial-studio { }; - maphosts = callPackage ../tools/networking/maphosts { }; tora = libsForQt5.callPackage ../development/tools/tora { }; From 708238fdc86156903f4616c99d3527f349c4a974 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 22 Feb 2025 22:51:20 +0900 Subject: [PATCH 03/28] thunderbird-bin: 128.6.1esr -> 128.7.1esr Note: Firefox/Thunderbird 135 use .xz archive while 128 still use .bz2. This patch make update.nix to support both. --- .../browsers/firefox-bin/update.nix | 4 +- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 2 files changed, 267 insertions(+), 267 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index d5f41af336a7..c64a49f270e1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -60,7 +60,7 @@ writeScript "update-${pname}" '' # this is a list of sha256 and tarballs for both arches # Upstream files contains python repr strings like b'somehash', hence the sed dance - shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep tar.xz` + shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep '\.tar\.[a-z0-9]\+'` cat > $tmpfile <> $tmpfile < Date: Sat, 22 Feb 2025 21:49:33 +0000 Subject: [PATCH 04/28] liquid-dsp: don't leak impure builder cpu extensions into the build By default the project builds with automatic vector extension detection for the cpu. This leaks impure state into the executable and depending on the builder results in executables that require AVX extensions. Resolves #384082. --- pkgs/development/libraries/liquid-dsp/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 2540eb9520f7..019749eac91a 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -19,7 +19,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8="; }; - configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; + configureFlags = + lib.optionals stdenv.hostPlatform.isDarwin [ + "LIBTOOL=${cctools}/bin/libtool" + ] + ++ [ + # Prevent native cpu arch from leaking into binaries. This might lead to + # poor performance, but having portable and working executables is more + # important. + (lib.enableFeature true "simdoverride") + ]; nativeBuildInputs = [ autoreconfHook ] From 234c754c6cba511946736be958dfae472d3d8ea5 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 25 Feb 2025 15:08:01 +0100 Subject: [PATCH 05/28] ddnet: 18.9 -> 19.0 Signed-off-by: Sefa Eyeoglu --- pkgs/games/ddnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 5967d6098852..106284474d04 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.9"; + version = "19.0"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-aJzNfo7K5OOo14XJRmDOYzXFF5fZK0aXgIfVvjvzjrU="; + hash = "sha256-R9LXcYM96fibHzpXDWIOSASKIbh+GeiGyz7xVvV2v1Q="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 8c8fa169510b13cde0f589d65f973afa68937810 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 25 Feb 2025 15:08:35 +0100 Subject: [PATCH 06/28] ddnet: add Scrumplex to maintainers Signed-off-by: Sefa Eyeoglu --- pkgs/games/ddnet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 106284474d04..444991064d42 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -128,9 +128,10 @@ stdenv.mkDerivation rec { homepage = "https://ddnet.org"; license = licenses.asl20; maintainers = with maintainers; [ - sirseruju lom ncfavier + Scrumplex + sirseruju ]; mainProgram = "DDNet"; }; From 65bcebfa19ab37438768f99a111c15c4cda7dbab Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 25 Feb 2025 15:12:18 +0100 Subject: [PATCH 07/28] ddnet: move to by-name Signed-off-by: Sefa Eyeoglu --- pkgs/{games/ddnet/default.nix => by-name/dd/ddnet/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{games/ddnet/default.nix => by-name/dd/ddnet/package.nix} (100%) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/by-name/dd/ddnet/package.nix similarity index 100% rename from pkgs/games/ddnet/default.nix rename to pkgs/by-name/dd/ddnet/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed02af407e1..f6a71349973f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16106,7 +16106,6 @@ with pkgs; deliantra-maps = callPackage ../games/deliantra/maps.nix { }; deliantra-data = callPackage ../games/deliantra/data.nix { }; - ddnet = callPackage ../games/ddnet {}; ddnet-server = ddnet.override { buildClient = false; }; devilutionx = callPackage ../games/devilutionx { From eeb1ab1688cc4dc05ffa122d6044745002385e2d Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 26 Feb 2025 09:12:16 +0100 Subject: [PATCH 08/28] ddnet: modernize src Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/dd/ddnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index 444991064d42..d4db65ba9c74 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ddnet"; - repo = pname; - rev = version; + repo = "ddnet"; + tag = version; hash = "sha256-R9LXcYM96fibHzpXDWIOSASKIbh+GeiGyz7xVvV2v1Q="; }; From 8a031ae182bd3a8b321140e5e5252769fd85b8ef Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 26 Feb 2025 09:14:54 +0100 Subject: [PATCH 09/28] ddnet: fix licenses See https://github.com/ddnet/ddnet/blob/33ae91335044b95bf28d9b753e6c8a20baa04eeb/license.txt Upstream code is licensed under zlib, some assets are CC-BY-SA-3.0 and fonts are OFL-1.1 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/dd/ddnet/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index d4db65ba9c74..4753f06e7894 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/DDNet" ''; - meta = with lib; { + meta = { description = "Teeworlds modification with a unique cooperative gameplay"; longDescription = '' DDraceNetwork (DDNet) is an actively maintained version of DDRace, @@ -126,8 +126,12 @@ stdenv.mkDerivation rec { design your own maps, or run your own server. ''; homepage = "https://ddnet.org"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = with lib.licenses; [ + zlib + ofl + cc-by-sa-30 + ]; + maintainers = with lib.maintainers; [ lom ncfavier Scrumplex From 07fa66f83270766b57913506e2eac6ba90d2875b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Feb 2025 16:55:25 +0000 Subject: [PATCH 10/28] python312Packages.google-cloud-artifact-registry: 1.15.0 -> 1.15.1 --- .../python-modules/google-cloud-artifact-registry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index a9d46fd75778..acd83fab82aa 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.15.0"; + version = "1.15.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_artifact_registry"; inherit version; - hash = "sha256-K2oFG+shUXcgg/UDzpgF9LcLuDkhSLUYwQrXfxJUDW8="; + hash = "sha256-k7SaOdk78EJhEwTlWRklr3+JlrRXVctekUjzgl4Xe/o="; }; build-system = [ setuptools ]; From 6dcac3fe168f8dc3c163598bc80167208c881ec9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Feb 2025 17:11:43 +0000 Subject: [PATCH 11/28] qbittorrent: 5.0.3 -> 5.0.4 --- pkgs/by-name/qb/qbittorrent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix index b14db25ef91d..102c0f747396 100644 --- a/pkgs/by-name/qb/qbittorrent/package.nix +++ b/pkgs/by-name/qb/qbittorrent/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${finalAttrs.version}"; - hash = "sha256-nz9no2+nsC+PEnqPyUJpup0OLsS6G+yvTwbwDPko7Eg="; + hash = "sha256-8gSSUgYx0CSSb3ackFknZ9r0cWFLxkC7a3Tj8QJaylc="; }; nativeBuildInputs = [ From 3bc22fc35f398290bbe42f165f5aee0be23d94b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Feb 2025 19:19:54 +0100 Subject: [PATCH 12/28] python313Packages.pymilter: remove unused libredirect, use substituteInPlace --- .../python-modules/pymilter/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix index 60f00f40464f..eaeb815b55b9 100644 --- a/pkgs/development/python-modules/pymilter/default.nix +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -5,8 +5,6 @@ libmilter, berkeleydb, py3dns, - iana-etc, - libredirect, pyasyncore, setuptools, }: @@ -26,24 +24,26 @@ buildPythonPackage rec { build-system = [ setuptools ]; + buildInputs = [ libmilter ]; - nativeCheckInputs = [ pyasyncore ]; + + nativeCheckInputs = [ + pyasyncore + ]; + dependencies = [ berkeleydb py3dns ]; preBuild = '' - sed -i 's/import thread/import _thread as thread/' Milter/greylist.py + substituteInPlace Milter/greylist.py \ + --replace-fail "import thread" "import _thread as thread" ''; - # requires /etc/resolv.conf # testpolicy: requires makemap (#100419) # using exec -a makemap smtpctl results in "unknown group smtpq" preCheck = '' - echo "nameserver 127.0.0.1" > resolv.conf - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) - export LD_PRELOAD=${libredirect}/lib/libredirect.so sed -i '/testpolicy/d' test.py rm testpolicy.py ''; From 80ce0318030b15ee1f0350b9b173b64ab1a7d232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Feb 2025 19:23:14 +0100 Subject: [PATCH 13/28] python313Packages.python-engineio: use libredirect.hook --- pkgs/development/python-modules/python-engineio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 8448b656ce1d..91209292772d 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { nativeCheckInputs = [ eventlet + libredirect.hook mock tornado pytest-asyncio @@ -56,8 +57,7 @@ buildPythonPackage rec { preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' echo "nameserver 127.0.0.1" > resolv.conf - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ - LD_PRELOAD=${libredirect}/lib/libredirect.so + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) ''; postCheck = '' From ae3b2edfefe5964592f4e1dd4724aaf372063b60 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 27 Feb 2025 22:20:58 +0000 Subject: [PATCH 14/28] lego.tests: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. lego.tests error: … while evaluating the attribute 'lego-dns' at pkgs/by-name/le/lego/package.nix:34:5: 33| lego-http = nixosTests.acme.http01-builtin; 34| lego-dns = nixosTests.acme.dns01-builtin; | ^ 35| }; … while evaluating the attribute 'acme.dns01-builtin' at nixos/tests/all-tests.nix:149:3: 148| aaaaxy = runTest ./aaaaxy.nix; 149| acme = import ./acme/default.nix { inherit runTest; }; | ^ 150| acme-dns = handleTest ./acme-dns.nix {}; error: attribute 'dns01-builtin' missing at pkgs/by-name/le/lego/package.nix:34:16: 33| lego-http = nixosTests.acme.http01-builtin; 34| lego-dns = nixosTests.acme.dns01-builtin; | ^ 35| }; --- pkgs/by-name/le/lego/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/le/lego/package.nix b/pkgs/by-name/le/lego/package.nix index da4f053d5221..113408fd109c 100644 --- a/pkgs/by-name/le/lego/package.nix +++ b/pkgs/by-name/le/lego/package.nix @@ -31,6 +31,6 @@ buildGoModule rec { passthru.tests = { lego-http = nixosTests.acme.http01-builtin; - lego-dns = nixosTests.acme.dns01-builtin; + lego-dns = nixosTests.acme.dns01; }; } From c1001ee9438caf06262253afc2e49a59f919521e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 27 Feb 2025 17:11:31 +0100 Subject: [PATCH 15/28] python312Packages.rlax: skip failing tests --- .../python-modules/rlax/default.nix | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index 9cd994e00d47..c74c35c76ed9 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -3,6 +3,11 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + + # build-system + setuptools, + + # dependencies absl-py, chex, distrax, @@ -11,6 +16,8 @@ jaxlib, numpy, tensorflow-probability, + + # tests dm-haiku, optax, pytest-xdist, @@ -20,7 +27,7 @@ buildPythonPackage rec { pname = "rlax"; version = "0.1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; @@ -38,7 +45,11 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ absl-py chex distrax @@ -59,7 +70,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "rlax" ]; disabledTests = [ - # RuntimeErrors + # AssertionError: Array(2, dtype=int32) != 0 + "test_categorical_sample__with_device" + "test_categorical_sample__with_jit" + "test_categorical_sample__without_device" + "test_categorical_sample__without_jit" + + # RuntimeError: Attempted to set 4 devices, but 1 CPUs already available: + # ensure that `set_n_cpu_devices` is executed before any JAX operation. "test_cross_replica_scatter_add0" "test_cross_replica_scatter_add1" "test_cross_replica_scatter_add2" @@ -73,10 +91,11 @@ buildPythonPackage rec { "test_unnormalize_linear" ]; - meta = with lib; { + meta = { description = "Library of reinforcement learning building blocks in JAX"; homepage = "https://github.com/deepmind/rlax"; - license = licenses.asl20; - maintainers = with maintainers; [ onny ]; + changelog = "https://github.com/google-deepmind/rlax/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ onny ]; }; } From 8b4ce134c0fef50bfed2a71045d7a1d0f7e42e1b Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 31 Oct 2024 20:57:42 -0600 Subject: [PATCH 16/28] python3Packages.cardano-tools: init at 2.1.0 --- .../python-modules/cardano-tools/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/cardano-tools/default.nix diff --git a/pkgs/development/python-modules/cardano-tools/default.nix b/pkgs/development/python-modules/cardano-tools/default.nix new file mode 100644 index 000000000000..d6b1af66af58 --- /dev/null +++ b/pkgs/development/python-modules/cardano-tools/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + # Python deps + requests, + pexpect, +}: + +buildPythonPackage rec { + pname = "cardano-tools"; + version = "2.1.0"; + pyproject = true; + + src = fetchPypi { + pname = "cardano_tools"; + inherit version; + hash = "sha256-RFyKXHafV+XgRJSsTjASCCw9DxvZqertf4NNN616Bp4="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + requests + pexpect + ]; + + pythonImportsCheck = [ "cardano_tools" ]; + + meta = with lib; { + description = "Python module for interfacing with the Cardano blockchain"; + homepage = "https://gitlab.com/viperscience/cardano-tools"; + license = licenses.asl20; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9867ff038b73..dcc17fd29c3c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2102,6 +2102,8 @@ self: super: with self; { carbon = callPackage ../development/python-modules/carbon { }; + cardano-tools = callPackage ../development/python-modules/cardano-tools { }; + cardimpose = callPackage ../development/python-modules/cardimpose { }; cart = callPackage ../development/python-modules/cart { }; From 7276d27bb51c410244b1f324b3005cc2f850c7ec Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 31 Oct 2024 21:02:15 -0600 Subject: [PATCH 17/28] python3Packages.ogmios: init at 1.3.0 --- .../python-modules/ogmios/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/ogmios/default.nix diff --git a/pkgs/development/python-modules/ogmios/default.nix b/pkgs/development/python-modules/ogmios/default.nix new file mode 100644 index 000000000000..0d412dc76b30 --- /dev/null +++ b/pkgs/development/python-modules/ogmios/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + setuptools, + # Python deps + cachetools, + cardano-tools, + coloredlogs, + orjson, + pydantic, + websockets, +}: + +buildPythonPackage rec { + pname = "ogmios"; + version = "1.3.0"; + pyproject = true; + + src = fetchPypi { + pname = "ogmios"; + inherit version; + hash = "sha256-b5L1J9lqHEQmlw7alv5HnpXM0gpE26cGkddEKH5cSU0="; + }; + + build-system = [ + hatchling + setuptools + ]; + + dependencies = [ + cachetools + cardano-tools + coloredlogs + orjson + pydantic + websockets + ]; + + pythonImportsCheck = [ "ogmios" ]; + + meta = with lib; { + description = "Python client for Ogmios"; + homepage = "https://gitlab.com/viperscience/ogmios-python"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcc17fd29c3c..958af9668ac3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9732,6 +9732,8 @@ self: super: with self; { oemthermostat = callPackage ../development/python-modules/oemthermostat { }; + ogmios = callPackage ../development/python-modules/ogmios { }; + okonomiyaki = callPackage ../development/python-modules/okonomiyaki { }; okta = callPackage ../development/python-modules/okta { }; From 41f973ccb1609ef92947ad06971aae4e6c1c72e2 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 31 Oct 2024 21:06:24 -0600 Subject: [PATCH 18/28] python3Packages.blockfrost-python: patch version number --- .../python-modules/blockfrost-python/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blockfrost-python/default.nix b/pkgs/development/python-modules/blockfrost-python/default.nix index 0c0582290b7e..1f1c3c98e849 100644 --- a/pkgs/development/python-modules/blockfrost-python/default.nix +++ b/pkgs/development/python-modules/blockfrost-python/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # Python deps requests, setuptools, @@ -20,11 +21,22 @@ buildPythonPackage rec { hash = "sha256-mN26QXxizDR+o2V5C2MlqVEbRns1BTmwZdUnnHNcFzw="; }; - propagatedBuildInputs = [ - requests + patches = [ + (fetchpatch2 { + name = "blockfrost-python-fix-version"; + url = "https://github.com/blockfrost/blockfrost-python/commit/02fdc67ff6d1333c0855e740114585852bbfa0bc.patch?full_index=1"; + hash = "sha256-070tnWxOnVNsCYXmBFo39JUgQDqphdpqx3A9OIuC94U="; + }) + ]; + + build-system = [ setuptools ]; + dependencies = [ + requests + ]; + pythonImportsCheck = [ "blockfrost" ]; meta = with lib; { From ce6d8b83e3fe9af7a05f11090ef65ce5d80c535d Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 31 Oct 2024 21:06:47 -0600 Subject: [PATCH 19/28] python3Packages.pycardano: 0.11.1 -> 0.12.3 --- .../blockfrost-python/default.nix | 3 +- .../python-modules/pycardano/default.nix | 29 ++++++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/blockfrost-python/default.nix b/pkgs/development/python-modules/blockfrost-python/default.nix index 1f1c3c98e849..661ffa326891 100644 --- a/pkgs/development/python-modules/blockfrost-python/default.nix +++ b/pkgs/development/python-modules/blockfrost-python/default.nix @@ -11,8 +11,7 @@ buildPythonPackage rec { pname = "blockfrost-python"; version = "0.6.0"; - - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "blockfrost"; diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix index 973b84f4c035..d06543c29d56 100644 --- a/pkgs/development/python-modules/pycardano/default.nix +++ b/pkgs/development/python-modules/pycardano/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pytestCheckHook, # Python deps blockfrost-python, cachetools, @@ -12,12 +13,15 @@ frozendict, frozenlist, mnemonic, + ogmios, poetry-core, pprintpp, pynacl, + requests, setuptools, typeguard, websocket-client, + websockets, }: let @@ -34,18 +38,21 @@ let in buildPythonPackage rec { pname = "pycardano"; - version = "0.11.1"; - - format = "pyproject"; + version = "0.12.3"; + pyproject = true; src = fetchFromGitHub { owner = "Python-Cardano"; repo = "pycardano"; - rev = "v${version}"; - hash = "sha256-OWm6ztt3s3DUbxDZqpvwTO6XwdY/57AI6Bc6x6kxH7k="; + tag = "v${version}"; + hash = "sha256-jxgskdQ7Us+utndUgFYK7G2IW/e5QbeXytOsxQfFiJI="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ blockfrost-python cachetools cbor2 @@ -55,15 +62,21 @@ buildPythonPackage rec { frozendict frozenlist mnemonic + ogmios poetry-core pprintpp pynacl - setuptools + requests typeguard websocket-client + websockets ]; - pythonRelaxDeps = [ "typeguard" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonRelaxDeps = [ "websockets" ]; pythonImportsCheck = [ "pycardano" ]; From 02c0e2b5860b272e13e67158616fb88dcfd17258 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 27 Feb 2025 16:49:37 -0700 Subject: [PATCH 20/28] opshin: 0.23.0 -> 0.24.0 --- pkgs/by-name/op/opshin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opshin/package.nix b/pkgs/by-name/op/opshin/package.nix index dc2b6486dbc0..242c9044439c 100644 --- a/pkgs/by-name/op/opshin/package.nix +++ b/pkgs/by-name/op/opshin/package.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "opshin"; - version = "0.23.0"; + version = "0.24.0"; format = "pyproject"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "OpShin"; repo = "opshin"; tag = version; - hash = "sha256-H6tuSJYV9bAwXu/5Y8g6aFbbQFCpq2aqcmRaDq2cAEg="; + hash = "sha256-5IzPxzNvH9nlOYBCbc8kC7yzf8L8LPA5Wq9agqg9kng="; }; propagatedBuildInputs = with python3.pkgs; [ From 936174353d40641394ed06576fd3b7580a9f49c9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 28 Feb 2025 01:12:57 +0100 Subject: [PATCH 21/28] python312Packages.distrax: disable flaky test --- pkgs/development/python-modules/distrax/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix index ab3ffdad7558..c01584c3ab4e 100644 --- a/pkgs/development/python-modules/distrax/default.nix +++ b/pkgs/development/python-modules/distrax/default.nix @@ -39,6 +39,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "distrax" ]; disabledTests = [ + # Flaky: AssertionError: 1 not less than 0.7000000000000001 + "test_von_mises_sample_uniform_ks_test" + # NotImplementedError: Primitive 'square' does not have a registered inverse. "test_against_tfp_bijectors_square" "test_log_dets_square__with_device" From 0329ad90d6284a506867114c0edaba2076e0ee1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 Feb 2025 01:51:23 +0100 Subject: [PATCH 22/28] servo: 0-unstable-2025-02-20 -> 0-unstable-2025-02-27 --- pkgs/by-name/se/servo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 14a305602229..964327bff313 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -62,17 +62,17 @@ in rustPlatform.buildRustPackage { pname = "servo"; - version = "0-unstable-2025-02-20"; + version = "0-unstable-2025-02-27"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; - rev = "54b5c7b632ecb48f134b232ee1b9aa8bc8c286c0"; - hash = "sha256-MHxGL7NFa6+QexeBITy0WPcBLCO6NrnPOEBlJMF7iZA="; + rev = "0065e63190dba501d23c16759a2a1ea1e8f15cd8"; + hash = "sha256-5VvKGNBJ+1bWW9XcXk0DU0owBmdkTpX8voAVO4QMdrQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZVHM+z1ZYAu6GIar602FoAB77EhbjV3Mf9oFHe5q3LY="; + cargoHash = "sha256-mfOzlqRAVR7O7uWn27pwccXp+WRl5BEO3l0KEyzjmUc="; postPatch = '' # Remap absolute path between modules to include SEMVER From 88ce8dc125462e7ae27e61ebd564fd9fb625cc1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Feb 2025 01:03:44 +0000 Subject: [PATCH 23/28] nfpm: 2.41.2 -> 2.41.3 --- pkgs/by-name/nf/nfpm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index 3d55292eabc4..ff80c7d8deab 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.41.2"; + version = "2.41.3"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-anEKmMFB4szA6xdwzU2vtJO8rH4i8TCF+kiOOv8kBHs="; + hash = "sha256-5pM3usXT3ukKkhKtDR5nIllaCCEUj7GVIl5HWq9DwII="; }; - vendorHash = "sha256-xtfqHeWaLMxH5paFBsbiSCVd/po9c3yy0INuy1F7Yds="; + vendorHash = "sha256-GnAo+B4UEZIf5K3d1XSU8WpHmdMqzO1nR0reSJ2D1Yk="; ldflags = [ "-s" From 0f2c961355e7fb5c2b78a1d4850810172e15afb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 20:44:34 +0000 Subject: [PATCH 24/28] terraform-providers.akamai: 6.6.1 -> 7.0.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 f95585cfd6c5..76c8597754e0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -36,13 +36,13 @@ "vendorHash": "sha256-0Tbns4vIMxmDUxN8NbCFsTwRoGB6PBzMnrstffbVm7s=" }, "akamai": { - "hash": "sha256-acGLXJclAfg43AkJRoROReIOjBEnhgSpDRgvO6LumIY=", + "hash": "sha256-MZF4yTG4wiFeOi4NLItQmxZ9ZcgHCryFpxpGy2jQYE8=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v6.6.1", + "rev": "v7.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-3AlXMOpL5kctTSnA2V1RsMxRb9roELs1p5TL0uJFR4M=" + "vendorHash": "sha256-NO7e8S+UhbbGWeBm4+bzm6HqqA3G3WZwj3wJmug0aSA=" }, "alicloud": { "hash": "sha256-87QLXAIIBZ4EDdN28Ti4QGtnCDqMoj/D6kGoeyjgHHM=", From c7f1c1a263de54473166ee35a84f0f5130bddc4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 22:20:23 +0000 Subject: [PATCH 25/28] terraform-providers.btp: 1.9.0 -> 1.10.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 76c8597754e0..d5ba881276d1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -198,13 +198,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "btp": { - "hash": "sha256-uyZ4HR9HVLHxGtRE4DTeNlG7RsYcmIxsZMxs5hQbJSc=", + "hash": "sha256-mLW7PD7vtDecg4oN9KEB+fbFo7STGw7ftIH50VHtuRs=", "homepage": "https://registry.terraform.io/providers/SAP/btp", "owner": "SAP", "repo": "terraform-provider-btp", - "rev": "v1.9.0", + "rev": "v1.10.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-RnFY5fAkEV69nuFMcivCb232r/3sqqcgdMU/WYuK+yI=" + "vendorHash": "sha256-qFOfE4yWJfdPtGiGbk+oWzA06QvW0WCd6iUqEMTxBBk=" }, "buildkite": { "hash": "sha256-ihP2q0sCKd4myqANLhKrBfIX+macLvJkQ+/3hMzVM3A=", From 42a84338f0b71d34a0ec713866326ee2c3b39aaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Feb 2025 07:55:25 +0000 Subject: [PATCH 26/28] terraform-providers.scaleway: 2.49.0 -> 2.50.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 d5ba881276d1..d5b0d0ee641f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1111,13 +1111,13 @@ "vendorHash": "sha256-Ry791h5AuYP03nex9nM8X5Mk6PeL7hNDbFyVRvVPJNE=" }, "scaleway": { - "hash": "sha256-8aESalFQaA6Qwod4rDeUzrKe80rbHfVJZIKtLliKUME=", + "hash": "sha256-ZMY69sfWN0281l+QEN6jUpVevYN7Z1CRDey+AqVDq8o=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.49.0", + "rev": "v2.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-a1xH1NX+8/A4tcPYyxvg3lY9DZPrOAEl4OvngU9+tjE=" + "vendorHash": "sha256-TbA6GlRSdyzkc64SU9Tn6o+DAvAN9RqR5M6DH83Tjng=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From 2ca95eef7e3b33ea8b858ed025e492373aca8106 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Feb 2025 21:13:21 +0000 Subject: [PATCH 27/28] terraform-providers.aws: 5.86.0 -> 5.88.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 d5b0d0ee641f..04a1cb9d4d98 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -117,13 +117,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-Ep/P1h1mR/cl8rKCWGBjYWiaUZLouMH2i+FfIg+eVjU=", + "hash": "sha256-SqBPe7/FYK4ybCQsEOq81/gg/mgvQYxYaYUkgg6O3w0=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.86.0", + "rev": "v5.88.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jz4nDldbf/oXsQs3etDhQGROSvrylo/e0brXYRVqgZ4=" + "vendorHash": "sha256-C3/2Kw66b37OUctT0/SdHNshs0r3wnVNP6Z3VuTwsw0=" }, "azuread": { "hash": "sha256-UV6jgVS8tzWiEBC/C/U7/2bGZ1sqk2MnS8xNRBuL+C8=", From 7bde8be097dfa9772bb8f04d0d08cda012ed4d7a Mon Sep 17 00:00:00 2001 From: a-kenji Date: Mon, 24 Feb 2025 14:05:55 +0700 Subject: [PATCH 28/28] cosmic-term: 1.0.0-alpha.5.1 -> 1.0.0-alpha.6 --- pkgs/by-name/co/cosmic-term/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 1c9dde666ba8..6c420ec15c02 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -19,21 +19,21 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-term"; - version = "1.0.0-alpha.5.1"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; rev = "epoch-${version}"; - hash = "sha256-uPKbh1PA8P51Gcet459ZBRKRe0JmxSWvIFn3AQIG6KY="; + hash = "sha256-sdeRkT6UcyBKIFnJZn3aGf8LZQimqVPqtXo7RtwUs5M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-clGzp7pH7YHePFzlq2eLYKKx9IiFQKB5FmqPeuSuIVc="; + cargoHash = "sha256-Qznkqp+zWpP/ok2xG7U5lYBW0qo4+ARnm8hgxU20ha0="; # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made - env.VERGEN_GIT_COMMIT_DATE = "2025-01-14"; + env.VERGEN_GIT_COMMIT_DATE = "2025-02-21"; env.VERGEN_GIT_SHA = src.rev; postPatch = ''