From 2342d6f4931858a8d964205d5ef7881aad1cd34f Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 1 Aug 2025 05:49:24 -0600 Subject: [PATCH 01/25] tandoor-recipes: 1.5.35 -> 2.0.1 https://github.com/TandoorRecipes/recipes/releases/tag/2.0.1 Diff: https://github.com/TandoorRecipes/recipes/compare/1.5.35...2.0.1 --- pkgs/by-name/ta/tandoor-recipes/common.nix | 8 ++++---- pkgs/by-name/ta/tandoor-recipes/frontend.nix | 11 +++++------ pkgs/by-name/ta/tandoor-recipes/package.nix | 18 +++++++++++++----- .../ta/tandoor-recipes/pytest-xdist.patch | 6 ++++-- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index ad73275243ac..92ab353d10f0 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.35"; + version = "2.0.1"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; - rev = version; - hash = "sha256-pzujKBUNVILFrgsCWuYFvO48AYPbBpxS1im1dj7NpMw="; + tag = version; + hash = "sha256-tFnfuRYg9lq7hveGZqpRVHNaXxS6BUs88/BHnUXe4mA="; }; - yarnHash = "sha256-P8TqHa5t3oWEYUQDD7VrGTWHJ3y68OhQa3YzQpceJgw="; + yarnHash = "sha256-6+GmYibzujV1vE0FqMctGscRkrendpvczDdMK++qtTU="; meta = { homepage = "https://tandoor.dev/"; diff --git a/pkgs/by-name/ta/tandoor-recipes/frontend.nix b/pkgs/by-name/ta/tandoor-recipes/frontend.nix index 1e0735d15fe7..7b529ec5be6f 100644 --- a/pkgs/by-name/ta/tandoor-recipes/frontend.nix +++ b/pkgs/by-name/ta/tandoor-recipes/frontend.nix @@ -9,14 +9,14 @@ let common = callPackage ./common.nix { }; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "tandoor-recipes-frontend"; inherit (common) version; - src = "${common.src}/vue"; + src = "${common.src}/vue3"; yarnOfflineCache = fetchYarnDeps { - yarnLock = "${common.src}/vue/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = common.yarnHash; }; @@ -50,8 +50,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - cp -R ../cookbook/static/vue/ $out - cp webpack-stats.json $out + cp -R ../cookbook/static/vue3/ $out echo "${common.version}" > "$out/version" runHook postInstall @@ -60,4 +59,4 @@ stdenv.mkDerivation { meta = common.meta // { description = "Tandoor Recipes frontend"; }; -} +}) diff --git a/pkgs/by-name/ta/tandoor-recipes/package.nix b/pkgs/by-name/ta/tandoor-recipes/package.nix index 16beda51bee5..5b81e5df48ea 100644 --- a/pkgs/by-name/ta/tandoor-recipes/package.nix +++ b/pkgs/by-name/ta/tandoor-recipes/package.nix @@ -28,6 +28,10 @@ python.pkgs.buildPythonPackage { fi substituteInPlace pytest.ini --subst-var NIX_BUILD_CORES + + # The script name test tries to use django allauth for admin login + substituteInPlace cookbook/admin.py \ + --replace-fail "admin.site.login = secure_admin_login(admin.site.login)" "" ''; propagatedBuildInputs = with python.pkgs; [ @@ -37,7 +41,10 @@ python.pkgs.buildPythonPackage { django-cleanup django-crispy-forms django-tables2 + django-vite djangorestframework + drf-spectacular + drf-spectacular-sidecar drf-writable-nested django-oauth-toolkit bleach @@ -81,13 +88,16 @@ python.pkgs.buildPythonPackage { python3-openid python3-saml standard-imghdr + + # Tests + fido2 + litellm ]; configurePhase = '' runHook preConfigure - ln -sf ${frontend}/ cookbook/static/vue - cp ${frontend}/webpack-stats.json vue/ + ln -sf ${frontend}/ cookbook/static/vue3 runHook postConfigure ''; @@ -106,7 +116,6 @@ python.pkgs.buildPythonPackage { touch cookbook/static/themes/bootstrap.min.css.map touch cookbook/static/css/bootstrap-vue.min.css.map - ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic_js_reverse ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic runHook postBuild @@ -121,8 +130,7 @@ python.pkgs.buildPythonPackage { makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \ --prefix PYTHONPATH : "$PYTHONPATH" - # usually copied during frontend build (see vue.config.js) - cp vue/src/sw.js $out/lib/tandoor-recipes/cookbook/templates/ + cp staticfiles/vue3/service-worker.js $out/lib/tandoor-recipes/cookbook/templates/ runHook postInstall ''; diff --git a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch index 39b5acf00dea..4845110543e8 100644 --- a/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch +++ b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch @@ -1,12 +1,14 @@ diff --git a/pytest.ini b/pytest.ini -index a3d26ec4..8bdf12fb 100644 +index 2755dc99..4026b96e 100644 --- a/pytest.ini +++ b/pytest.ini -@@ -3,5 +3,5 @@ DJANGO_SETTINGS_MODULE = recipes.test_settings +@@ -3,6 +3,6 @@ DJANGO_SETTINGS_MODULE = recipes.test_settings testpaths = cookbook/tests python_files = tests.py test_*.py *_tests.py # uncomment to run coverage reports -addopts = -n auto --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html +addopts = -n @NIX_BUILD_CORES@ --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html # addopts = -n auto --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html +-asyncio_default_fixture_loop_scope = fixture \ No newline at end of file ++asyncio_default_fixture_loop_scope = fixture From 2ccf06c42e1e9f5b27cda04ccf45a47bf8e53313 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 3 Aug 2025 12:03:41 +0000 Subject: [PATCH 02/25] brakeman: migrate to by-name brakeman: 6.1.2 -> 7.1.0 brakeman: fix changelog version with let binding --- .../tools/analysis => by-name/br}/brakeman/Gemfile | 0 .../tools/analysis => by-name/br}/brakeman/Gemfile.lock | 6 +++--- .../tools/analysis => by-name/br}/brakeman/gemset.nix | 8 ++++---- .../default.nix => by-name/br/brakeman/package.nix} | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 13 insertions(+), 11 deletions(-) rename pkgs/{development/tools/analysis => by-name/br}/brakeman/Gemfile (100%) rename pkgs/{development/tools/analysis => by-name/br}/brakeman/Gemfile.lock (70%) rename pkgs/{development/tools/analysis => by-name/br}/brakeman/gemset.nix (64%) rename pkgs/{development/tools/analysis/brakeman/default.nix => by-name/br/brakeman/package.nix} (78%) diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile b/pkgs/by-name/br/brakeman/Gemfile similarity index 100% rename from pkgs/development/tools/analysis/brakeman/Gemfile rename to pkgs/by-name/br/brakeman/Gemfile diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/by-name/br/brakeman/Gemfile.lock similarity index 70% rename from pkgs/development/tools/analysis/brakeman/Gemfile.lock rename to pkgs/by-name/br/brakeman/Gemfile.lock index 3a2065935c38..a6603a1c1bed 100644 --- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/pkgs/by-name/br/brakeman/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - brakeman (6.1.2) + brakeman (7.1.0) racc - racc (1.7.3) + racc (1.8.1) PLATFORMS ruby @@ -12,4 +12,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.5.5 + 2.6.9 diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/by-name/br/brakeman/gemset.nix similarity index 64% rename from pkgs/development/tools/analysis/brakeman/gemset.nix rename to pkgs/by-name/br/brakeman/gemset.nix index b77d22a54027..fdb42970c776 100644 --- a/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/pkgs/by-name/br/brakeman/gemset.nix @@ -5,19 +5,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lylig4vgnw9l1ybwgxdi9nw9q2bc5dcplklg8nsbi7j32f7c5kp"; + sha256 = "1bs8bm3qj2wfy5h1bp8qi1d3vjw5zabhnq5rr288802kbakhiixv"; type = "gem"; }; - version = "6.1.2"; + version = "7.1.0"; }; racc = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; } diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/by-name/br/brakeman/package.nix similarity index 78% rename from pkgs/development/tools/analysis/brakeman/default.nix rename to pkgs/by-name/br/brakeman/package.nix index e8532a81d03b..3ea856f75b79 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/by-name/br/brakeman/package.nix @@ -5,6 +5,10 @@ bundlerUpdateScript, }: +let + gems = import ./gemset.nix; + version = gems.brakeman.version; +in bundlerApp { pname = "brakeman"; exes = [ "brakeman" ]; @@ -12,11 +16,11 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "brakeman"; - meta = with lib; { + meta = { description = "Static analysis security scanner for Ruby on Rails"; homepage = "https://brakemanscanner.org/"; changelog = "https://github.com/presidentbeef/brakeman/blob/v${version}/CHANGES.md"; - license = [ licenses.unfreeRedistributable ]; + license = lib.licenses.unfreeRedistributable; platforms = ruby.meta.platforms; maintainers = [ ]; mainProgram = "brakeman"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb2b8144aadd..a6dc25b4dbfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1608,8 +1608,6 @@ with pkgs; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; - brakeman = callPackage ../development/tools/analysis/brakeman { }; - # Derivation's result is not used by nixpkgs. Useful for validation for # regressions of bootstrapTools on hydra and on ofborg. Example: # pkgsCross.aarch64-multiplatform.freshBootstrapTools.build From 1c134a8ffc29e7742d65ad913c6b380ae32f6817 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 1 Aug 2025 20:38:39 +0200 Subject: [PATCH 03/25] onedrivegui: 1.1.1a -> 1.2.1, modernize Changelog: https://github.com/bpozdena/OneDriveGUI/compare/v1.1.1a...v1.2.1 --- pkgs/by-name/on/onedrivegui/package.nix | 30 ++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index 93f296b61bd6..e5e630c158c8 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -11,7 +11,7 @@ }: let - version = "1.1.1a"; + version = "1.2.1"; setupPy = writeText "setup.py" '' from setuptools import setup @@ -28,15 +28,19 @@ in python3Packages.buildPythonApplication rec { pname = "onedrivegui"; inherit version; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bpozdena"; repo = "OneDriveGUI"; - rev = "v${version}"; - hash = "sha256-pcY1JOi74pePvkIMRuHv5mlE4F68NzuBLJTCtgjUFRw="; + tag = "v${version}"; + hash = "sha256-QCSCJ1m/PKSpkfseq8fyDEHFyIt156Lp15JC04NY0ps="; }; + build-system = with python3Packages; [ + setuptools + ]; + nativeBuildInputs = [ copyDesktopItems qt6.wrapQtAppsHook @@ -48,7 +52,7 @@ python3Packages.buildPythonApplication rec { qt6.qtwayland ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pyside6 requests ]; @@ -58,7 +62,7 @@ python3Packages.buildPythonApplication rec { dontWrapQtApps = true; doCheck = false; # No tests defined - pythonImportsCheck = [ "OneDriveGUI" ]; + # pythonImportsCheck = [ "OneDriveGUI" ]; # requires a display desktopItems = [ (makeDesktopItem { @@ -74,8 +78,8 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - # Patch OneDriveGUI.py so DIR_PATH points to shared files location - sed -i src/OneDriveGUI.py -e "s@^DIR_PATH =.*@DIR_PATH = '$out/share/OneDriveGUI'@" + # Patch global_config.py so DIR_PATH points to shared files location + sed -i src/global_config.py -e "s@^DIR_PATH =.*@DIR_PATH = '$out/share/OneDriveGUI'@" cp ${setupPy} ${setupPy.name} ''; @@ -91,17 +95,17 @@ python3Packages.buildPythonApplication rec { ''${qtWrapperArgs[@]} \ --prefix PATH : ${lib.makeBinPath [ onedrive ]} \ --prefix PYTHONPATH : ${ - python3Packages.makePythonPath (propagatedBuildInputs ++ [ (placeholder "out") ]) + python3Packages.makePythonPath (dependencies ++ [ (placeholder "out") ]) } \ --add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py ''; - meta = with lib; { + meta = { homepage = "https://github.com/bpozdena/OneDriveGUI"; description = "Simple GUI for Linux OneDrive Client, with multi-account support"; mainProgram = "onedrivegui"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } From 0381027a38d7d241cb140a21e518e31e7340c6c6 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 1 Aug 2025 20:43:35 +0200 Subject: [PATCH 04/25] onedrivegui: add update script --- pkgs/by-name/on/onedrivegui/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index e5e630c158c8..7f1538d0e154 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -8,6 +8,8 @@ makeDesktopItem, makeWrapper, onedrive, + + nix-update-script, }: let @@ -100,6 +102,8 @@ python3Packages.buildPythonApplication rec { --add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/bpozdena/OneDriveGUI"; description = "Simple GUI for Linux OneDrive Client, with multi-account support"; From 63c58039afdcea3d8f0fbb399fd5bc5dff742011 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Fri, 1 Aug 2025 20:44:03 +0200 Subject: [PATCH 05/25] onedrivegui: add philipdb as maintainer --- pkgs/by-name/on/onedrivegui/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix index 7f1538d0e154..15786a21c781 100644 --- a/pkgs/by-name/on/onedrivegui/package.nix +++ b/pkgs/by-name/on/onedrivegui/package.nix @@ -109,7 +109,7 @@ python3Packages.buildPythonApplication rec { description = "Simple GUI for Linux OneDrive Client, with multi-account support"; mainProgram = "onedrivegui"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ philipdb ]; platforms = lib.platforms.linux; }; } From a836782af79d98f6c4f46770d5127ac88b871ad2 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:15:23 -0700 Subject: [PATCH 06/25] zombietrackergps: use callPackage --- pkgs/applications/gis/zombietrackergps/default.nix | 14 +++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix index 3cc6bf69e45c..801095b6e7b1 100644 --- a/pkgs/applications/gis/zombietrackergps/default.nix +++ b/pkgs/applications/gis/zombietrackergps/default.nix @@ -1,14 +1,12 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, gitUpdater, - wrapQtAppsHook, cmake, - marble, libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "zombietrackergps"; version = "1.15"; @@ -21,20 +19,18 @@ mkDerivation rec { hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM="; }; - buildInputs = [ + buildInputs = with libsForQt5; [ marble.dev - ] - ++ (with libsForQt5; [ qtbase qtcharts qtsvg qtwebengine ldutils - ]); + ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2b319170a0..4a80b413358e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11580,7 +11580,7 @@ with pkgs; wxGTK = wxGTK32; }; - zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; + zombietrackergps = callPackage ../applications/gis/zombietrackergps { }; ### APPLICATIONS From 12bc7a5e5da3f5fcc5581484e6db43d0120ee3a8 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:18:21 -0700 Subject: [PATCH 07/25] zombietrackergps: remove rec --- pkgs/applications/gis/zombietrackergps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix index 801095b6e7b1..dc297841eba5 100644 --- a/pkgs/applications/gis/zombietrackergps/default.nix +++ b/pkgs/applications/gis/zombietrackergps/default.nix @@ -6,13 +6,13 @@ cmake, libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zombietrackergps"; version = "1.15"; src = fetchFromGitLab { owner = "ldutils-projects"; - repo = pname; + repo = "zombietrackergps"; # latest revision is not tagged upstream, use commit sha in the meantime #rev = "v_${version}"; rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce"; From 67d8b9e1757e548c22204e52af4a50d8fc6c81d4 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:18:49 -0700 Subject: [PATCH 08/25] zombietrackergps: remove with lib --- pkgs/applications/gis/zombietrackergps/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix index dc297841eba5..46660eef0d97 100644 --- a/pkgs/applications/gis/zombietrackergps/default.nix +++ b/pkgs/applications/gis/zombietrackergps/default.nix @@ -45,12 +45,12 @@ stdenv.mkDerivation { rev-prefix = "v_"; }; - meta = with lib; { + meta = { description = "GPS track manager for Qt using KDE Marble maps"; homepage = "https://www.zombietrackergps.net/ztgps/"; changelog = "https://www.zombietrackergps.net/ztgps/history.html"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sohalt ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sohalt ]; + platforms = lib.platforms.linux; }; } From 1a020d050913a838ad59d40c69707f222c577090 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:19:29 -0700 Subject: [PATCH 09/25] zombietrackergps: move to by-name --- .../default.nix => by-name/zo/zombietrackergps/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/gis/zombietrackergps/default.nix => by-name/zo/zombietrackergps/package.nix} (100%) diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/by-name/zo/zombietrackergps/package.nix similarity index 100% rename from pkgs/applications/gis/zombietrackergps/default.nix rename to pkgs/by-name/zo/zombietrackergps/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a80b413358e..836a5581009f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11580,8 +11580,6 @@ with pkgs; wxGTK = wxGTK32; }; - zombietrackergps = callPackage ../applications/gis/zombietrackergps { }; - ### APPLICATIONS _2bwm = callPackage ../applications/window-managers/2bwm { From 409e80d2446aa57e888eeb5327c035819466c220 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 5 Aug 2025 18:54:34 +0000 Subject: [PATCH 10/25] ktimetracker: migrate to by-name ktimetracker: 5.0.1 -> 6.0.0 --- .../office/ktimetracker/default.nix | 61 ------------------- pkgs/by-name/kt/ktimetracker/package.nix | 56 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 56 insertions(+), 63 deletions(-) delete mode 100644 pkgs/applications/office/ktimetracker/default.nix create mode 100644 pkgs/by-name/kt/ktimetracker/package.nix diff --git a/pkgs/applications/office/ktimetracker/default.nix b/pkgs/applications/office/ktimetracker/default.nix deleted file mode 100644 index 50cd0de5142e..000000000000 --- a/pkgs/applications/office/ktimetracker/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - mkDerivation, - lib, - fetchurl, - cmake, - pkg-config, - extra-cmake-modules, - kconfig, - kconfigwidgets, - kdbusaddons, - kdoctools, - ki18n, - kidletime, - kjobwidgets, - kio, - knotifications, - kwindowsystem, - kxmlgui, - ktextwidgets, - kcalendarcore, -}: - -mkDerivation rec { - pname = "ktimetracker"; - version = "5.0.1"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0jp63fby052rapjjaz413b1wjz4qsgpxh82y2d75jzimch0n5s02"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - ]; - - buildInputs = [ - kconfig - kconfigwidgets - kdbusaddons - kdoctools - ki18n - kidletime - kjobwidgets - kio - knotifications - kwindowsystem - kxmlgui - ktextwidgets - kcalendarcore - ]; - - meta = with lib; { - description = "Todo management and time tracking application"; - mainProgram = "ktimetracker"; - license = licenses.gpl2; - homepage = "https://userbase.kde.org/KTimeTracker"; - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/kt/ktimetracker/package.nix b/pkgs/by-name/kt/ktimetracker/package.nix new file mode 100644 index 000000000000..6e68df6a10b9 --- /dev/null +++ b/pkgs/by-name/kt/ktimetracker/package.nix @@ -0,0 +1,56 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + kdePackages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ktimetracker"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "KDE"; + repo = "ktimetracker"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SQjqNzmmt0AEQvGW4Vz5GldQcp7Q9rZvGG7mGugRwd8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ] + ++ (with kdePackages; [ + extra-cmake-modules + wrapQtAppsHook + ]); + + buildInputs = with kdePackages; [ + kconfig + kconfigwidgets + kdbusaddons + kdoctools + ki18n + kidletime + kjobwidgets + kio + knotifications + kwindowsystem + kxmlgui + ktextwidgets + kcalendarcore + qt5compat + kstatusnotifieritem + kcmutils + ]; + + meta = { + description = "Todo management and time tracking application"; + mainProgram = "ktimetracker"; + license = lib.licenses.gpl2; + homepage = "https://userbase.kde.org/KTimeTracker"; + maintainers = with lib.maintainers; [ ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f64bfcdaa731..e105a7ab145f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12637,8 +12637,6 @@ with pkgs; callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; - ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - kubeval = callPackage ../applications/networking/cluster/kubeval { }; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; From 38c7c217aa43e10fb7592cb8e4ba8184cb27fd65 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 5 Aug 2025 22:06:15 +0000 Subject: [PATCH 11/25] squishyball: migrate to by-name squishyball: unstable-2020-11-23 -> unstable-2021-01-05 --- .../sq}/squishyball/gnu-screen.patch | 0 .../sq/squishyball/package.nix} | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 7 insertions(+), 11 deletions(-) rename pkgs/{applications/audio => by-name/sq}/squishyball/gnu-screen.patch (100%) rename pkgs/{applications/audio/squishyball/default.nix => by-name/sq/squishyball/package.nix} (86%) diff --git a/pkgs/applications/audio/squishyball/gnu-screen.patch b/pkgs/by-name/sq/squishyball/gnu-screen.patch similarity index 100% rename from pkgs/applications/audio/squishyball/gnu-screen.patch rename to pkgs/by-name/sq/squishyball/gnu-screen.patch diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/by-name/sq/squishyball/package.nix similarity index 86% rename from pkgs/applications/audio/squishyball/default.nix rename to pkgs/by-name/sq/squishyball/package.nix index 4e0f8ffb0e2b..224c754dab7a 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/by-name/sq/squishyball/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation { pname = "squishyball"; - version = "unstable-2020-11-23"; + version = "unstable-2021-01-05"; src = fetchFromGitLab { domain = "gitlab.xiph.org"; owner = "xiph"; repo = "squishyball"; - rev = "27590fe6bac545e2dd3eacf048edbd969682263a"; - sha256 = "07zs8wx1ahf3q505fk9b6cgzlkhnayfsscch46yy9s1wgxgphj7s"; + rev = "d3525c015abf123d55a7a209a40976538be9d402"; + hash = "sha256-2tzfTPwfC/FE+nsXIkIyHSKXNkGwVPfERkFW83py1Dk="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation { cp squishyball.1 $out/share/man/man1 ''; - meta = with lib; { + meta = { description = "Tool to perform sample comparison testing on the command line"; longDescription = '' squishyball is a simple command-line utility for performing @@ -72,9 +72,9 @@ stdenv.mkDerivation { mode of operation. ''; homepage = "https://gitlab.xiph.org/xiph/squishyball"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ michalrus ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ michalrus ]; + platforms = lib.platforms.linux; mainProgram = "squishyball"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5838fe9df80a..579014146b1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13443,10 +13443,6 @@ with pkgs; spotify-qt = qt6Packages.callPackage ../applications/audio/spotify-qt { }; - squishyball = callPackage ../applications/audio/squishyball { - ncurses = ncurses5; - }; - sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; stag = callPackage ../applications/misc/stag { From 9c013621d0cf922157e5b0ce1b63276b0ef96050 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 10 Aug 2025 15:21:47 +0300 Subject: [PATCH 12/25] nixos/lomiri: remove unneded options, refactor hardware.graphics and fonts.enableDefaultPackages was already enabled in https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/misc/graphical-desktop.nix --- nixos/modules/services/desktop-managers/lomiri.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 77762bf9d28b..c0b04270b3ec 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -148,11 +148,11 @@ in lomiri-download-manager ]; - # Copy-pasted basic stuff - hardware.graphics.enable = lib.mkDefault true; - fonts.enableDefaultPackages = lib.mkDefault true; - services.accounts-daemon.enable = true; + services.udisks2.enable = true; + services.upower.enable = true; + services.geoclue2.enable = true; + services.telepathy.enable = true; services.ayatana-indicators = { enable = true; @@ -176,10 +176,6 @@ in ); }; - services.udisks2.enable = true; - services.upower.enable = true; - services.geoclue2.enable = true; - services.gnome.evolution-data-server = { enable = true; plugins = with pkgs; [ @@ -187,8 +183,6 @@ in ]; }; - services.telepathy.enable = true; - services.displayManager = { defaultSession = lib.mkDefault "lomiri"; sessionPackages = with pkgs.lomiri; [ lomiri-session ]; From f969bab590019a8ce1739baa2cda10eb7482ebf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Aug 2025 08:06:48 +0000 Subject: [PATCH 13/25] ruffle: 0-nightly-2025-08-05 -> 0-nightly-2025-08-14 --- pkgs/by-name/ru/ruffle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 92e0be6b095f..8abdb22b2a41 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -21,16 +21,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0-nightly-2025-08-05"; + version = "0-nightly-2025-08-14"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0-" finalAttrs.version; - hash = "sha256-1v/PnGYchauwSpYxP6mXNkkcK1bLF/u6VAYTPXk5bVc="; + hash = "sha256-+JdZoYderFUngMbFMNXw1pbW6qogb7vCeqdIHEzqMjQ="; }; - cargoHash = "sha256-xrlcn18ryK7PrR/KfBKN0ot+h06nj4cl2Gx4Dm1RyqU="; + cargoHash = "sha256-P+uFE92ZWa491snEanzB1T0OPPOOYZsy2RAmwtIIAdo="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = From 3e9c061f090b49eeb58f5504fd7fb2de44657598 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Thu, 14 Aug 2025 17:27:17 +0800 Subject: [PATCH 14/25] clash-rs: 0.7.7 -> 0.8.2 --- pkgs/by-name/cl/clash-rs/package.nix | 14 +++++++++++--- pkgs/by-name/cl/clash-rs/unbounded-shifts.patch | 16 +++++++--------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index b5611a03b517..29e996040e9f 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -4,24 +4,32 @@ rustPlatform, protobuf, versionCheckHook, + cmake, + pkg-config, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-rs"; - version = "0.7.7"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-x89sFBQ6bAIHvaRTCxqKKgFKo7PpquVze0R6VicwrJw="; + hash = "sha256-HkIsflsLTQdvetgamLt6LbYxOpv1+FQ/e/PzJjKOfq4="; }; - cargoHash = "sha256-jfc0Rmt9eEN3ds5Rakj+IcJcUa28CbhiSu4AfqHurf0="; + cargoHash = "sha256-Qh/YxNO/DtVBj6Eiloc3+Fs+dQqvAXSe+5lCer0F2zs="; patches = [ ./unbounded-shifts.patch ]; + nativeBuildInputs = [ + cmake + pkg-config + rustPlatform.bindgenHook + ]; + nativeInstallCheckInputs = [ protobuf versionCheckHook diff --git a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch index ab6c43b7a264..08d50ecb5e49 100644 --- a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch +++ b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch @@ -1,13 +1,11 @@ -diff --git a/clash_lib/src/lib.rs b/clash_lib/src/lib.rs -index 6ada034..420e465 100644 ---- a/clash_lib/src/lib.rs -+++ b/clash_lib/src/lib.rs -@@ -2,7 +2,7 @@ - #![feature(ip)] - #![feature(sync_unsafe_cell)] +--- a/clash-lib/src/lib.rs ++++ b/clash-lib/src/lib.rs +@@ -4,7 +4,7 @@ #![feature(let_chains)] --#![cfg_attr(not(version("1.86.0")), feature(unbounded_shifts))] + #![feature(lazy_get)] + #![feature(duration_millis_float)] +-#![cfg_attr(not(version("1.87.0")), feature(unbounded_shifts))] +#![feature(unbounded_shifts)] - + #[macro_use] extern crate anyhow; From 8660791fef5f0eac44062c3e199c91ac737efdd9 Mon Sep 17 00:00:00 2001 From: Joel Granados Date: Thu, 14 Aug 2025 13:20:17 +0200 Subject: [PATCH 15/25] vmctl: 0.99-unstable-2024-05-14 -> 1.00 Signed-off-by: Joel Granados --- pkgs/by-name/vm/vmctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vm/vmctl/package.nix b/pkgs/by-name/vm/vmctl/package.nix index fd6f7a145da6..1cb5d96ce31a 100644 --- a/pkgs/by-name/vm/vmctl/package.nix +++ b/pkgs/by-name/vm/vmctl/package.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation { pname = "vmctl"; - version = "0.99-unstable-2024-05-14"; + version = "1.00"; src = fetchFromGitHub { owner = "SamsungDS"; repo = "vmctl"; - rev = "5b6b7084b8cba06b474c0e020df965237f2c832c"; - hash = "sha256-yDgaY2RJXBjWkMSQb4JaJzMGLFzowfOGixSRzzv2iIk="; + rev = "8cc71d4350f4f5814ffd7a3091a5c1a9d2e25158"; + hash = "sha256-nIJEgd62yq3DKhaMnB2OEaGN/zC5/Z5cTtO3iQEVF44="; }; dontBuild = true; From 95c8b69ae90cebd01a5eed28996a4f0724071e6a Mon Sep 17 00:00:00 2001 From: crertel Date: Thu, 14 Aug 2025 11:46:08 -0500 Subject: [PATCH 16/25] lmstudio: 0.3.22.1 -> 0.3.23.3 --- pkgs/by-name/lm/lmstudio/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 3146d449ad56..1f3d4c6dbdd4 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.22-1"; - hash_aarch64-darwin = "sha256-rmIZ+NIfryZUc1nZZD36oxICGjBReO4SMCCOr9p5ID8="; - version_x86_64-linux = "0.3.22-1"; - hash_x86_64-linux = "sha256-oqukPQ0kSiBpDIePwSKTC4gpbFmGZ+CaNf7p8z65xAE="; + version_aarch64-darwin = "0.3.23-3"; + hash_aarch64-darwin = "sha256-Jfx4Fx9mlrdGckE2ML3eTQHfgglEELOYJYxibRiAB7c="; + version_x86_64-linux = "0.3.23-3"; + hash_x86_64-linux = "sha256-FG3CzD6UjuPYXImjTkKTozpTQVGk8JLqxhJxTS9qjuo="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; From 5cbaaede1463a347912915980a9f2947e499db7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 14 Aug 2025 14:40:59 -0300 Subject: [PATCH 17/25] jwm: fix build with autoconf-2.72 --- pkgs/applications/window-managers/jwm/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index a307f359dd94..7a034b8ea642 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -66,6 +66,10 @@ stdenv.mkDerivation rec { xorgproto ]; + postPatch = '' + sed -i '/AM_ICONV/i AC_CONFIG_MACRO_DIRS([m4])' configure.ac + ''; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; enableParallelBuilding = true; From 256102ec3d621b2e08627038fea6c23d6ccf3622 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 15 Aug 2025 03:16:27 +0800 Subject: [PATCH 18/25] emacs: 30.1 -> 30.2 https://lists.gnu.org/archive/html/emacs-devel/2025-08/msg00493.html Two patches are removed. The first one is backported[1] to 30.2. The second one is contained in 30.2. [1]: 6cac92928a99a2cf33aeeeddf295cf981750391c --- pkgs/applications/editors/emacs/sources.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 77c66d758491..c706d8ecc276 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -105,25 +105,15 @@ in { emacs30 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "30.1"; + version = "30.2"; variant = "mainline"; - rev = "30.1"; - hash = "sha256-wBuWLuFzwB77FqAYAUuNe3CuJFutjqp0XGt5srt7jAo="; + rev = "30.2"; + hash = "sha256-3Lfb3HqdlXqSnwJfxe7npa4GGR9djldy8bKRpkQCdSA="; patches = fetchpatch: [ (builtins.path { name = "inhibit-lexical-cookie-warning-67916.patch"; path = ./inhibit-lexical-cookie-warning-67916-30.patch; }) - (fetchpatch { - # bug#63288 and bug#76523 - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=53a5dada413662389a17c551a00d215e51f5049f"; - hash = "sha256-AEvsQfpdR18z6VroJkWoC3sBoApIYQQgeF/P2DprPQ8="; - }) - (fetchpatch { - # bug#76573 - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=05ecb2b8f0216aa3f391ee661aad4d61fd6aed0e"; - hash = "sha256-fvnHMvuqwQseVrDpVpnzSaoWfXrR5tsjIib7+lhRGII="; - }) ]; }); From b87e8754497a9d64a266a2bc8a03946b3b50d2ce Mon Sep 17 00:00:00 2001 From: qzylinra Date: Fri, 15 Aug 2025 06:41:12 +0800 Subject: [PATCH 19/25] flutter335: 3.35.0-0.3.pre -> 3.35.1 --- .../compilers/flutter/versions/3_35/data.json | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json index 9a17781b89f2..683e5ea6230b 100644 --- a/pkgs/development/compilers/flutter/versions/3_35/data.json +++ b/pkgs/development/compilers/flutter/versions/3_35/data.json @@ -1,73 +1,73 @@ { - "version": "3.35.0-0.3.pre", - "engineVersion": "659d9553df45256ed2aa388aae7ed5a1a4f51bae", + "version": "3.35.1", + "engineVersion": "1e9a811bf8e70466596bcf0ea3a8b5adb5f17f7f", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", - "channel": "beta", + "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-M1DdrGsI0qEpk/DxSlZwN3eRw87ytBZkudfWPrkgbcA=", - "x86_64-linux": "sha256-M1DdrGsI0qEpk/DxSlZwN3eRw87ytBZkudfWPrkgbcA=" + "aarch64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4=", + "x86_64-linux": "sha256-A25De1Xqz5Tx63hx43xt+r/cH4TEbaSMMSxu3J114n4=" }, "x86_64-linux": { - "aarch64-linux": "sha256-fYd3T5t2kxJQr6VHqQWn/Cx/djYj3G4cHS6wNT656Rs=", - "x86_64-linux": "sha256-fYd3T5t2kxJQr6VHqQWn/Cx/djYj3G4cHS6wNT656Rs=" + "aarch64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q=", + "x86_64-linux": "sha256-0XT18p8kcfepSG84p8Un0I71pLwJyBlH3wscCmJ9z2Q=" } }, - "dartVersion": "3.9.0-333.2.beta", + "dartVersion": "3.9.0", "dartHash": { - "x86_64-linux": "sha256-1QnclBC2IKuHNl2Xc1OXeG+/Owp46z4Uac3+3smimY8=", - "aarch64-linux": "sha256-g/zDpFjzTc7NEuER1jxo8hL/yzaRZeoN2Q+oa1Vs4yM=", - "x86_64-darwin": "sha256-K6DJ9O8//F3MVCmJd9vGjJg/qC83XtVrqd4pwaQeOng=", - "aarch64-darwin": "sha256-a85QVapUKgFovzC0CuLzSPSWXu8tm3HuK+AxfuwlrUI=" + "x86_64-linux": "sha256-25hZuxVDfu5/8PIlfHKoeLXpESBtoGc9F3kSV56E7UA=", + "aarch64-linux": "sha256-EbxZlvvjxDUskxH0Rtxd8KOLakguucFjI7+A5Z28V+w=", + "x86_64-darwin": "sha256-JNN27p/a9+7xcIkrLLM2Tuyih5R2Q0YibXqcm3QXc8U=", + "aarch64-darwin": "sha256-VG0o4b0dPTXQmABr3+iO+xv/2IcXFt018CQYnD4kXAs=" }, - "flutterHash": "sha256-K1Z/SzFK1tGC7qTbbnLXbb1fVb/wsqSvtBGUaIjKpPE=", + "flutterHash": "sha256-1G7PZLMm0VsT0CWygxOk0GGiXbtJGIBBvccQcaqV+EQ=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-xxWlavfiKXlEfTbYgk0+4VM4zsORuXRAaNwzYpRdU08=", - "aarch64-linux": "sha256-Wg0yuh4TJ9VroTpJqCeIwDK4uyucPUxa3f4XN7SAzUI=", - "x86_64-darwin": "sha256-xxWlavfiKXlEfTbYgk0+4VM4zsORuXRAaNwzYpRdU08=", - "x86_64-linux": "sha256-Wg0yuh4TJ9VroTpJqCeIwDK4uyucPUxa3f4XN7SAzUI=" + "aarch64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=", + "aarch64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA=", + "x86_64-darwin": "sha256-CEf/NUC06z7IhB4tSzIV6jia/3OElUaqNgYM9P6emQM=", + "x86_64-linux": "sha256-7q/ewvhysJ5SVdkILK0qkX1fw4GKi/U82sRq6JX6fzA=" }, "fuchsia": { - "aarch64-darwin": "sha256-zzrbl7IPIGW8IniM5xTg8ydrXvgDg9R6d1Yr+q1pMwk=", - "aarch64-linux": "sha256-zzrbl7IPIGW8IniM5xTg8ydrXvgDg9R6d1Yr+q1pMwk=", - "x86_64-darwin": "sha256-zzrbl7IPIGW8IniM5xTg8ydrXvgDg9R6d1Yr+q1pMwk=", - "x86_64-linux": "sha256-zzrbl7IPIGW8IniM5xTg8ydrXvgDg9R6d1Yr+q1pMwk=" + "aarch64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=", + "aarch64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=", + "x86_64-darwin": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=", + "x86_64-linux": "sha256-gFqWUHEGh1fpyuiDRYOzEG2mKbDfBxP0TAfJ7nU0D+s=" }, "ios": { - "aarch64-darwin": "sha256-qH5UzFC4N+3limzSFRSGaT3bSoNXeV1kgnj0ASgwU3U=", - "aarch64-linux": "sha256-qH5UzFC4N+3limzSFRSGaT3bSoNXeV1kgnj0ASgwU3U=", - "x86_64-darwin": "sha256-qH5UzFC4N+3limzSFRSGaT3bSoNXeV1kgnj0ASgwU3U=", - "x86_64-linux": "sha256-qH5UzFC4N+3limzSFRSGaT3bSoNXeV1kgnj0ASgwU3U=" + "aarch64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=", + "aarch64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=", + "x86_64-darwin": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=", + "x86_64-linux": "sha256-h0fXGxzmzikdYdTrbG4+kzxj/kX5/Pz70SEcAK/KKTs=" }, "linux": { - "aarch64-darwin": "sha256-AfB55jB4bNv0j5fyyLZEPO0W/9I6xhn7Sh5gVppbu5o=", - "aarch64-linux": "sha256-AfB55jB4bNv0j5fyyLZEPO0W/9I6xhn7Sh5gVppbu5o=", - "x86_64-darwin": "sha256-I1jE7iGN9GNVhNi68dVNoDKuF+OxI1tM3+gttncBKfk=", - "x86_64-linux": "sha256-I1jE7iGN9GNVhNi68dVNoDKuF+OxI1tM3+gttncBKfk=" + "aarch64-darwin": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=", + "aarch64-linux": "sha256-DqDfJGNm91wT927OoBYO+h5biif/993ebrPj+I8sMrg=", + "x86_64-darwin": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs=", + "x86_64-linux": "sha256-7AWtDjucIOEHc77Ff2FUoh09GUbMzwZQ9r2MAv9atQs=" }, "macos": { - "aarch64-darwin": "sha256-oR9gomhLORmE0jaUHS9SX92lfCaeGebZUC0NLiR5jEM=", - "aarch64-linux": "sha256-oR9gomhLORmE0jaUHS9SX92lfCaeGebZUC0NLiR5jEM=", - "x86_64-darwin": "sha256-oR9gomhLORmE0jaUHS9SX92lfCaeGebZUC0NLiR5jEM=", - "x86_64-linux": "sha256-oR9gomhLORmE0jaUHS9SX92lfCaeGebZUC0NLiR5jEM=" + "aarch64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=", + "aarch64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=", + "x86_64-darwin": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=", + "x86_64-linux": "sha256-x/6qDRviSVg0Z3fPN/c9iJn75csvuxJj1ytONcQ7ueo=" }, "universal": { - "aarch64-darwin": "sha256-Uu7H2iltu7hYMzNfn0TyUoBQcrII5zmTCMLArs2oBSA=", - "aarch64-linux": "sha256-ba7ayG8Hsb2TLFVIo6HMQrm1RKDfpcAMoBH9FDVhGN0=", - "x86_64-darwin": "sha256-NF/RKJ28q88MbKXr9gcPZmPg9Q+4IatwCiqXeVIRr/A=", - "x86_64-linux": "sha256-B1GCfIYemqzMs8ozAfqa3QmBM04dT1eKihGjyw9EZ2A=" + "aarch64-darwin": "sha256-+EfVH+XpI4d/UlFs6rZKdfK00IzDFz9o4CuzJRdDNfw=", + "aarch64-linux": "sha256-1jYtJ/toFDfUG2HIKyM1XT9rl0Fzl3or67q9ZVl1vDg=", + "x86_64-darwin": "sha256-nACkicnu+Pkimpyx3q/uxUcLz/xAExLbXHl+Ex4kFzA=", + "x86_64-linux": "sha256-XGxRc2LOqgxd8Zbd2XWhA6yj39WJCa5DC5UGYIiw4RY=" }, "web": { - "aarch64-darwin": "sha256-SnhSlHAmkVdZKXH6TCsdz8HDKz2E17jIfIgpoTJ82eU=", - "aarch64-linux": "sha256-SnhSlHAmkVdZKXH6TCsdz8HDKz2E17jIfIgpoTJ82eU=", - "x86_64-darwin": "sha256-SnhSlHAmkVdZKXH6TCsdz8HDKz2E17jIfIgpoTJ82eU=", - "x86_64-linux": "sha256-SnhSlHAmkVdZKXH6TCsdz8HDKz2E17jIfIgpoTJ82eU=" + "aarch64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=", + "aarch64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=", + "x86_64-darwin": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=", + "x86_64-linux": "sha256-dltAxQPWbNoVDxz7qEc0NnE1xjDeB7r3eAwQU2iH1Vs=" }, "windows": { - "x86_64-darwin": "sha256-2N+IkOUbbFs2gtWwbpP4rdzHi0R7iMIiMwpHZUPr6C8=", - "x86_64-linux": "sha256-2N+IkOUbbFs2gtWwbpP4rdzHi0R7iMIiMwpHZUPr6C8=" + "x86_64-darwin": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ=", + "x86_64-linux": "sha256-D/B3prbqobFlHO0dvq8fKcavqXxrvX3kqfDpma7QfNQ=" } }, "pubspecLock": { From 96047df611bf10c7726a8bc050d4f68ac63eafb5 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Fri, 15 Aug 2025 06:41:48 +0800 Subject: [PATCH 20/25] quickgui: pin flutter to flutter332 --- pkgs/by-name/qu/quickgui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quickgui/package.nix b/pkgs/by-name/qu/quickgui/package.nix index 2080dc8be4e5..e8a91a6d31f7 100644 --- a/pkgs/by-name/qu/quickgui/package.nix +++ b/pkgs/by-name/qu/quickgui/package.nix @@ -3,10 +3,10 @@ makeDesktopItem, copyDesktopItems, lib, - flutter, + flutter332, quickemu, }: -flutter.buildFlutterApplication rec { +flutter332.buildFlutterApplication rec { pname = "quickgui"; version = "1.2.10"; src = fetchFromGitHub { From eca7e9a040db39b157cf9458b336f9cdb8ad04e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Aug 2025 01:12:32 +0000 Subject: [PATCH 21/25] cpp-utilities: 5.29.0 -> 5.30.0 --- pkgs/by-name/cp/cpp-utilities/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index 3948bec1451b..a5feb501bb21 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.29.0"; + version = "5.30.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EtKcvkNpqEzpJj+hTJsQaDQad4SO0h1TLUbJ8leNTdk="; + sha256 = "sha256-cBr9Vw0UnC2+x/VSvL8u5hsvgk5RdY/3/KCUFQy24rg="; }; nativeBuildInputs = [ cmake ]; From efd8935cf8694765cd7b01bb25af208158f4bbeb Mon Sep 17 00:00:00 2001 From: qzylinra Date: Fri, 15 Aug 2025 11:12:05 +0800 Subject: [PATCH 22/25] multipass-gui: pin flutter to flutter332 --- pkgs/by-name/mu/multipass/gui.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/multipass/gui.nix b/pkgs/by-name/mu/multipass/gui.nix index 39fa7dd2ab16..eacb8962aa7b 100644 --- a/pkgs/by-name/mu/multipass/gui.nix +++ b/pkgs/by-name/mu/multipass/gui.nix @@ -5,7 +5,7 @@ version, autoPatchelfHook, - flutter, + flutter332, gtkmm3, keybinder3, lib, @@ -15,7 +15,7 @@ protoc-gen-dart, qt6, }: -flutter.buildFlutterApplication { +flutter332.buildFlutterApplication { inherit version; pname = "multipass-gui"; src = multipass_src; From a486fcd75047c54ca2ebeb64210010cf91cb3dee Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 15 Aug 2025 08:05:26 +0300 Subject: [PATCH 23/25] kdePackages.akonadi: backport patch recommended by upstream --- pkgs/kde/gear/akonadi/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix index 1b84ee1212f0..8e4023cc5ff6 100644 --- a/pkgs/kde/gear/akonadi/default.nix +++ b/pkgs/kde/gear/akonadi/default.nix @@ -1,6 +1,7 @@ { lib, mkKdeDerivation, + fetchpatch, qttools, accounts-qt, kaccounts-integration, @@ -24,6 +25,13 @@ mkKdeDerivation { patches = [ # Always regenerate MySQL config, as the store paths don't have accurate timestamps ./ignore-mysql-config-timestamp.patch + + # Backport fix for Merkuro account settings not opening + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/pim/akonadi/-/commit/8a2dfd13b3c4730636a962121368d49c57f79273.patch"; + hash = "sha256-r3jQUxbKvZbpKWg6SUQTyFpos7aLC5cNoByl22vpaR8="; + }) ]; extraCmakeFlags = [ From 0393de24a9f61e0ac80105727d3699522d01cb1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Aug 2025 23:49:41 +0000 Subject: [PATCH 24/25] uwsm: 0.23.0 -> 0.23.2 --- pkgs/by-name/uw/uwsm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index eea2bc537ca9..06b270c2ab0c 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; tag = "v${finalAttrs.version}"; - hash = "sha256-VQhU88JvL7O2MP41JVuBdieIopmqrNiAWacGWvsNhSc="; + hash = "sha256-lKPCtlTfIAb7axthl/PUU82cULafYIhZ5xJolFKSOno="; }; nativeBuildInputs = [ From 13c53b2f627f8ca25cd82510d1bb7b717e0b0e26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Aug 2025 23:04:22 +0000 Subject: [PATCH 25/25] vscode: 1.103.0 -> 1.103.1 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index fb1a781e3bad..1bfa8a5c7874 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,17 +36,17 @@ let hash = { - x86_64-linux = "sha256-Fji3/9T8X2VQH6gUhReSuniuX2BX+4S7uPJWEZn56vc="; - x86_64-darwin = "sha256-LgYdgiZbMdpe/KjAYuAVYEFFc1gcFSo5+/6lf15zUvk="; - aarch64-linux = "sha256-WxJEjTvXK1N1FjEFv0nUX7oLgPrcKlPHYSiLkTcdhj4="; - aarch64-darwin = "sha256-2H44MkP7Vv+j78DxGWROHCPdMQv2WzTrG1I7LANMYqg="; - armv7l-linux = "sha256-Pw9krAFjrllNOsXipaZy7X7wnB7C8V45WU7HuKa59JQ="; + x86_64-linux = "sha256-0zM9dyK226l4RgF1H81ojp5HC25snaN5K1QCnWIw/nw="; + x86_64-darwin = "sha256-PpThKF6TKp7hcku8QEsVYhQYVwgiVFaCWSgNI6Vo2+s="; + aarch64-linux = "sha256-bv9WsrvvlUc4PCKNZmsFBXQD6le5Ier1nm5qaXD2Mic="; + aarch64-darwin = "sha256-5wWmlgarDlWvk2Y4HRk00/oi0WcjDmnT7YL2Z1rfJ+Y="; + armv7l-linux = "sha256-hSYqK1hXg3nfxz344XdLrnWfixmlqbJUpI68PCcfF+I="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.103.0"; + version = "1.103.1"; # This is used for VS Code - Remote SSH test rev = "e3550cfac4b63ca4eafca7b601f0d2885817fd1f";