From b69d32b23ccfe0a0d3161edfa4988d88ae32c69d Mon Sep 17 00:00:00 2001 From: Patka Date: Mon, 4 Mar 2024 15:59:16 +0100 Subject: [PATCH 01/49] phpPackages.castor: 0.11.1 -> 0.13.1 Diff: https://github.com/jolicode/castor/compare/v0.11.1...v0.13.1 --- pkgs/development/php-packages/castor/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 70d07c1b8c70..241980e93d6f 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -8,26 +8,25 @@ php.buildComposerProject (finalAttrs: { pname = "castor"; - version = "0.11.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-FqFCKvhOEtDERNRLB3613geEiNDOlQuLeCa5uVvoMdM="; + hash = "sha256-Sm6I306iKVr66sBp+ADeTZAKGToVMc+Y/BCymUdszNc="; }; - vendorHash = "sha256-+ORwa3+tkVJ9KU+9URg+1lyHoL1swxg6DG5ex8HjigE="; + vendorHash = "sha256-KbmovAnejShyVclF4IcZ9ckUOWysfEz3DFqE8OxlzI0="; nativeBuildInputs = [ installShellFiles ]; # install shell completions postInstall = '' - echo "yes" | ${php}/bin/php $out/share/php/castor/bin/castor installShellCompletion --cmd castor \ - --bash <(${php}/bin/php $out/share/php/castor/bin/castor completion bash) \ - --fish <(${php}/bin/php $out/share/php/castor/bin/castor completion fish) \ - --zsh <(${php}/bin/php $out/share/php/castor/bin/castor completion zsh) + --bash <($out/bin/castor completion bash) \ + --fish <($out/bin/castor completion fish) \ + --zsh <($out/bin/castor completion zsh) ''; passthru = { From 113cc2d08679acec1c4e9424a8613682d46781a3 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Tue, 5 Mar 2024 09:06:39 +0100 Subject: [PATCH 02/49] kdePackages.baloo: fix systemd unit to actually work The kde-systemd-start-condition binary is not part of baloo. Hence the condition check would fail and baloo would not start automatically. Use a proper path instead. --- pkgs/kde/frameworks/baloo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/kde/frameworks/baloo/default.nix b/pkgs/kde/frameworks/baloo/default.nix index 517e5285a4e0..40ab00ebd193 100644 --- a/pkgs/kde/frameworks/baloo/default.nix +++ b/pkgs/kde/frameworks/baloo/default.nix @@ -6,5 +6,10 @@ mkKdeDerivation { pname = "baloo"; + # kde-systemd-start-condition is not part of baloo + postPatch = '' + substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition + ''; + extraBuildInputs = [qtdeclarative lmdb]; } From f436504b4abb5d25826021ee2ec4d908e713cd1a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 5 Mar 2024 07:49:45 -0300 Subject: [PATCH 03/49] jasper: does not split outputs when Darwin --- pkgs/by-name/ja/jasper/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index cd61d3b9be52..3bbaef90f536 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SE3zB+8zZuuT+W6QYTuQhM+dBgYuFzYK4a7QaquGB60="; }; - outputs = [ "out" "dev" "doc" "lib" "man" ]; + # Splitting outputs going bad on Darwin + outputs = if stdenv.isDarwin + then [ "out" ] + else [ "out" "dev" "doc" "lib" "man" ]; nativeBuildInputs = [ cmake From ee3d9ef0a91e125d05b0ec5f723ee747af72ebf1 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 5 Mar 2024 07:50:10 -0300 Subject: [PATCH 04/49] jasper: cosmetic reword on meta --- pkgs/by-name/ja/jasper/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 3bbaef90f536..88665973596a 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -78,12 +78,13 @@ stdenv.mkDerivation (finalAttrs: { was chosen primarily due to the availability of C development environments for most computing platforms when JasPer was first developed, circa 1999. ''; - license = lib.licenses.mit; + license = with lib.licenses; [ mit ]; mainProgram = "jasper"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - - # The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling. + # The value of __STDC_VERSION__ cannot be automatically determined when + # cross-compiling. broken = stdenv.buildPlatform != stdenv.hostPlatform; }; }) +# TODO: investigate opengl support From 5c74ce2762a35516409095f4534db7224bc91b8f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 5 Mar 2024 14:32:49 +0100 Subject: [PATCH 05/49] mkKdeDerivation: set the expected UTF-8 environment --- pkgs/kde/lib/mk-kde-derivation.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 80508eebb7d4..042c7531f07e 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -100,6 +100,8 @@ in cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags; separateDebugInfo = true; + + env.LANG = "C.UTF-8"; }; cleanArgs = builtins.removeAttrs args [ From d73e602b444013792cefd116d98126aa51830994 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 5 Mar 2024 14:38:54 +0100 Subject: [PATCH 06/49] gromacs: 2024 -> 2024.1 --- .../science/molecular-dynamics/gromacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index fe4d965b7778..6ab9ec5d9cc3 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -45,8 +45,8 @@ let } else { - version = "2024"; - hash = "sha256-BNIm1SBmqLw6QuANYhPec3tOwpLiZwMGWST/AZVoAeI="; + version = "2024.1"; + hash = "sha256-k32PEqNv/78q963XGtu1qlxVN4ktRsmnavvsqxqgqsc="; }; in stdenv.mkDerivation rec { From de1ff3a0079472eae27799ea5d3feb6e20ff4a77 Mon Sep 17 00:00:00 2001 From: Martin Landa Date: Tue, 5 Mar 2024 15:45:03 +0100 Subject: [PATCH 07/49] grass: remove default configure options --- pkgs/applications/gis/grass/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 7dbe74703766..c100c9dd1441 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-blas" - "--with-fftw" "--with-geos" # It complains about missing libmysqld but doesn't really seem to need it "--with-mysql" @@ -107,10 +106,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-proj-share=${proj}/share/proj" "--with-pthread" "--with-readline" - "--with-zstd" "--without-opengl" - ] ++ lib.optionals stdenv.isLinux [ - "--with-pdal" ] ++ lib.optionals stdenv.isDarwin [ "--without-cairo" "--without-freetype" From 821ea0b581af65fa8d20732aada11d830acd7212 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 19:34:21 +0000 Subject: [PATCH 08/49] llama-cpp: 2294 -> 2346 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index ebb9c29e75bd..7da6c5c305a1 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -69,13 +69,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "2294"; + version = "2346"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-uZi4Bj03PgfFV+jS5M+A1sMCWC/GMY5IyyrlR1b4Sh4="; + hash = "sha256-s937fAOUjid2H+6OQEMicdkFQVqPJ37GR+DMrCV1ky4="; }; postPatch = '' From eb787006d739947f662894139400a9d0115ed80d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 5 Mar 2024 20:27:47 +0100 Subject: [PATCH 09/49] nixos/doc/running-nixos-tests: Describe system requirements --- .../manual/development/running-nixos-tests.section.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/doc/manual/development/running-nixos-tests.section.md b/nixos/doc/manual/development/running-nixos-tests.section.md index 33076f5dc2a7..b8191ebd313c 100644 --- a/nixos/doc/manual/development/running-nixos-tests.section.md +++ b/nixos/doc/manual/development/running-nixos-tests.section.md @@ -18,3 +18,13 @@ you can view a log of the test: ```ShellSession $ nix-store --read-log result ``` + +## System Requirements {#sec-running-nixos-tests-requirements} + +NixOS tests require virtualization support. +This means that the machine must have `kvm` in its [system features](https://nixos.org/manual/nix/stable/command-ref/conf-file.html?highlight=system-features#conf-system-features) list, or `apple-virt` in case of macOS. +These features are autodetected locally, but `apple-virt` is only autodetected since Nix 2.19.0. + +Features of **remote builders** must additionally be configured manually on the client, e.g. on NixOS with [`nix.buildMachines.*.supportedFeatures`](https://search.nixos.org/options?show=nix.buildMachines.*.supportedFeatures&sort=alpha_asc&query=nix.buildMachines) or through general [Nix configuration](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds). + +If you run the tests on a **macOS** machine, you also need a "remote" builder for Linux; possibly a VM. [nix-darwin](https://daiderd.com/nix-darwin/) users may enable [`nix.linux-builder.enable`](https://daiderd.com/nix-darwin/manual/index.html#opt-nix.linux-builder.enable) to launch such a VM. From b70b3a6f7b1d714e5819ca7ef1334d541fa0319d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 22:24:01 +0100 Subject: [PATCH 10/49] python311Packages.llama-parse: 0.3.5 -> 0.3.6 --- pkgs/development/python-modules/llama-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index d5df83113dac..e7c07a62c3fa 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.3.5"; + version = "0.3.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-c2qA5PxZcLnL7xBIFxkIAh69Jr5D8HuAaInw0bs4df4="; + hash = "sha256-mAk+YCJeer1ReluiRagiQy00XRNqX5iLS029oFdYAqE="; }; nativeBuildInputs = [ From b2af238d31a267e93c20238161104858455aa9e1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 5 Mar 2024 21:52:55 +0100 Subject: [PATCH 11/49] build-support/php: update `composer validate` steps --- .../php/hooks/php-script-utils.bash | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/php/hooks/php-script-utils.bash b/pkgs/build-support/php/hooks/php-script-utils.bash index 60afacbed0af..9b5978865634 100644 --- a/pkgs/build-support/php/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/hooks/php-script-utils.bash @@ -13,7 +13,28 @@ setComposeRootVersion() { } checkComposerValidate() { - if ! composer validate --strict --no-ansi --no-interaction; then + if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --no-check-lock; then + if [ "1" == "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.json is valid.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.json is valid.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi + + if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --check-lock; then if [ "1" == "${composerStrictValidation-}" ]; then echo echo -e "\e[31mERROR: composer files validation failed\e[0m" From 04d33b98e1e36bb5a32926d6969e49fac742d26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Mar 2024 22:58:29 +0100 Subject: [PATCH 12/49] treewide: stop using deprecated git.io shortlink service --- nixos/modules/services/monitoring/mackerel-agent.nix | 2 +- pkgs/data/themes/adapta-kde/default.nix | 2 +- pkgs/data/themes/arc-kde/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/mackerel-agent.nix b/nixos/modules/services/monitoring/mackerel-agent.nix index 5915634ed26f..d1e84c0359dc 100644 --- a/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/nixos/modules/services/monitoring/mackerel-agent.nix @@ -81,7 +81,7 @@ in { include = mkDefault "/etc/mackerel-agent/conf.d/*.conf"; }; - # upstream service file in https://git.io/JUt4Q + # upstream service file in https://github.com/mackerelio/mackerel-agent/blob/master/packaging/rpm/src/mackerel-agent.service systemd.services.mackerel-agent = { description = "mackerel.io agent"; wants = [ "network-online.target" ]; diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix index a93e78480b00..be9367106d4d 100644 --- a/pkgs/data/themes/adapta-kde/default.nix +++ b/pkgs/data/themes/adapta-kde/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the Adapta theme for Plasma"; - homepage = "https://git.io/adapta-kde"; + homepage = "https://github.com/PapirusDevelopmentTeam/adapta-kde"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.tadfisher ]; platforms = lib.platforms.all; diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index 2b41baa63494..79467e1743ef 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the arc theme for Plasma"; - homepage = "https://git.io/arc-kde"; + homepage = "https://github.com/PapirusDevelopmentTeam/arc-kde"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.nixy ]; platforms = lib.platforms.all; From 99d55fd3f0f8620de6279140b84c5baff2dd6aee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 23:31:04 +0100 Subject: [PATCH 13/49] python311Packages.reptor: 0.11 -> 0.12 Diff: https://github.com/Syslifters/reptor/compare/refs/tags/0.11...0.12 Changelog: https://github.com/Syslifters/reptor/releases/tag/0.12 --- pkgs/development/python-modules/reptor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 800966352d08..db85c6b3edcb 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.11"; + version = "0.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-OJcg/e+ZC5Hf4dkP1dhsR9A+5lWvuFeuNLXyW8Hw6ko="; + hash = "sha256-8XjEWs+LKKc7ztNchNVmW+YGdYpmi5ee4eOoXIUBoM8="; }; pythonRelaxDeps = true; From e9228b248350939ac86eb497dbc3bab04a6cb52f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 Mar 2024 22:32:13 +0000 Subject: [PATCH 14/49] python3Packages.ecos: drop redundant `disable-warnings-if-gcc13` --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05759673e9c7..618b0b8ea57b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3601,7 +3601,7 @@ self: super: with self; { ecoaliface = callPackage ../development/python-modules/ecoaliface { }; - ecos = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/ecos { }); + ecos = callPackage ../development/python-modules/ecos { }; ecpy = callPackage ../development/python-modules/ecpy { }; From 4adf95957acfc4f86cdda37974e4161a4471cccd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 Mar 2024 22:38:35 +0000 Subject: [PATCH 15/49] python3Packages.gmsh: drop redundant `disable-warnings-if-gcc13` --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05759673e9c7..1e75c802dc82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4716,9 +4716,9 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = pkgs.disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { enablePython = true; - })); + }); gntp = callPackage ../development/python-modules/gntp { }; From ec4f9669f7b702115cfce16d6adb1e6b80d48340 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 23:48:12 +0100 Subject: [PATCH 16/49] python311Packages.llama-index-readers-file: decouple from llama-index-core --- .../python-modules/llama-index-readers-file/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 05bbdec8f258..4c5503c66071 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -6,13 +6,15 @@ , poetry-core , pymupdf , pypdf +, pytestCheckHook , pythonRelaxDepsHook }: buildPythonPackage rec { pname = "llama-index-readers-file"; + version = "0.1.7"; - inherit (llama-index-core) version src meta; + inherit (llama-index-core) src meta; pyproject = true; @@ -40,6 +42,10 @@ buildPythonPackage rec { pypdf ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "llama_index.readers.file" ]; From 7f222991f58519eee33a6d15ccc2407d91233bed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 00:07:41 +0100 Subject: [PATCH 17/49] audiness: 0.2.1 -> 0.3.0 Diff: https://github.com/audiusGmbH/audiness/compare/refs/tags/0.2.1...0.3.0 Changelog: https://github.com/audiusGmbH/audiness/releases/tag/0.3.0 --- pkgs/by-name/au/audiness/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index 3fe2b2491184..28ab75b6dd79 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "audiness"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audiness"; rev = "refs/tags/${version}"; - hash = "sha256-QznJdm9wSmxdWxaRYgiaUqFfRs2apLuQOIr226eFIGA="; + hash = "sha256-PkzYsfEhwrMoB+a2eJMmt/PRCbjASQRm38reA8PP4aI="; }; nativeBuildInputs = with python3.pkgs; [ From d2faa08fd630488188af8f8d2e386f034fff812c Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Wed, 6 Mar 2024 00:11:10 +0100 Subject: [PATCH 18/49] nushell: 0.90.1 -> 0.91.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 33089063e68a..bdc3e1a0da7a 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -24,7 +24,7 @@ }: let - version = "0.90.1"; + version = "0.91.0"; in rustPlatform.buildRustPackage { @@ -35,10 +35,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-MODd2BT2g6g5H6/1EG5OjIoYm18yBSvYTR83RuYDMec="; + hash = "sha256-X3D+JRvnk6HMKWJMTNR16Fmhu+gYd8Ip+7PZQoLIoEU="; }; - cargoHash = "sha256-35KPY5t4aozHIcukmeS00g6tzZA9ZsS/44u9vpZ3oGQ="; + cargoHash = "sha256-Xj4P/qd4GvmhWGwGaPvY23cQwdjdf6cSb1xyRZLN0tQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] From 16c9831ad5114c91c4f034c37bef92ddf5ddcf39 Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Wed, 6 Mar 2024 00:20:01 +0100 Subject: [PATCH 19/49] nushellPlugins: update to nushell 0.91.0 --- pkgs/shells/nushell/plugins/formats.nix | 2 +- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/query.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 1e3a3a5b2a03..fad270fb8df5 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-lMxI+tw5B6Q/ZXW1ANl+Oi/x37ds2IEuOkdPIV1zXLA="; + cargoHash = "sha256-sEc+Oa2s8d3/9mye/9cHipjamPmLj6P38Jh24VrpfXM="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 20edc7fd7b22..8a11be39ef59 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-/viATLt2CixUCUa45YWo4fod2/iI/qvqB/BP8L8qrvY="; + cargoHash = "sha256-wtw4S5fbZPh6OXmbbQu8oXpo0/rXWdOGHspx+z8Fjns="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index dedd7944cdb8..daee91a6e919 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-pDsjKpb4c9nnYA81sQm4RCYhIoKJe+vcV1hs8KCSP9Q="; + cargoHash = "sha256-u6etPrtq/q37CvJ2rkoFvVDBgu/YyVugeGOJbeHcSek="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; From e188a6bc2a41dd30fbf83ee0cf18c373096c812e Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sat, 2 Mar 2024 22:06:16 -0600 Subject: [PATCH 20/49] k9s: 0.31.9 -> 0.32.2 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 7b238fb8b1f1..c20dee0bac78 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.31.9"; + version = "0.32.2"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-yPSAHqnGdLW2a2TCR7HPl8e5WlG+ruHwITATtivtBnw="; + hash = "sha256-lqLXk98rH5ZBI54ovj7YlyPh88d9Z9/jPjwUixeNJQc="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-roHFUKH72BSzqZp2qh/Hw7rfTXj9yqpJyB2dozUz+Y8="; + vendorHash = "sha256-R/lQAjEfch3RtJNsny6ox0ZgUOFGZdoUEgmeIIM/pmQ="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); From 8890024497754ed5fef8d0af6382c1828c6248f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 6 Mar 2024 06:04:27 +0100 Subject: [PATCH 21/49] eza: 0.18.5 -> 0.18.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 5ac21168eb1f..5e0423a4ac9b 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.5"; + version = "0.18.6"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-L0FF9pN4WGCFpg2MPAvrKC/DwyWK6BWGxwYEpQBl9Rw="; + hash = "sha256-xdMoOGOHbGNRouVbJewQ1bWJbd7nusq3H7mXDC4AIXU="; }; - cargoHash = "sha256-bZ2NzFpB9vpT0mB2LsETdmtzYAwNrpzBRoqmm4+13+0="; + cargoHash = "sha256-IM1dxTaFa5kq94pn6QQrUGg6fZWhBZsf4ZND42BPVag="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From 0e0fbc99050a4fd4d3e320351b1dd4c77dabaab0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 06:39:28 +0000 Subject: [PATCH 22/49] libretro.mgba: unstable-2023-05-28 -> unstable-2024-02-28 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..02221578b6c3 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -518,10 +518,10 @@ "src": { "owner": "libretro", "repo": "mgba", - "rev": "314bf7b676f5b820f396209eb0c7d6fbe8103486", - "hash": "sha256-Rk+glDgSa1J1IIe5NrJElX9zr59+LQynfDXuHWyZcEM=" + "rev": "b2564482c86378581a7a43ef4e254b2a75167bc7", + "hash": "sha256-9qHk4V7wb9YISpZ2xO2NWCGCFMRWpE8lAKTzIldsC9M=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-02-28" }, "mrboom": { "fetcher": "fetchFromGitHub", From 565b23a0cbb77478a14f80181a09456a01086b78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 06:39:44 +0000 Subject: [PATCH 23/49] libretro.play: unstable-2024-02-23 -> unstable-2024-03-05 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..cb3a7cd34636 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -651,11 +651,11 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "a9a404632d3c6457e103314edb5f0985729ed0f1", - "hash": "sha256-PpRQXSK3TujmNL3Tmfva2oV6mWANGqz81ffiC99vuzQ=", + "rev": "79cb8379b0ac86d26bacf85f34b5d199b232f6fa", + "hash": "sha256-lXSbFsbZh01FxzN1f0pBSFXrJe1RimlmmmTB9GitQzo=", "fetchSubmodules": true }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-05" }, "ppsspp": { "fetcher": "fetchFromGitHub", From e619085f91702add77bcfe2984d2d487ec350ae0 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 09:47:17 +0300 Subject: [PATCH 24/49] maintainers/scripts/kde/generate-sources: sort keys for consistency --- maintainers/scripts/kde/generate-sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index e9f8c41ef4d7..380213ee6907 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -101,7 +101,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path): set_dir.mkdir(parents=True, exist_ok=True) with (set_dir / "default.nix").open("w") as fd: - fd.write(ROOT_TEMPLATE.render(packages=results.keys()) + "\n") + fd.write(ROOT_TEMPLATE.render(packages=sorted(results.keys())) + "\n") sources_dir = generated_dir / "sources" sources_dir.mkdir(parents=True, exist_ok=True) From 242a616c1ed8b21290775bc2478f3f4601ad6053 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 09:47:35 +0300 Subject: [PATCH 25/49] pkgs/kde/plasma: 6.0.0 -> 6.0.1 --- pkgs/kde/generated/sources/plasma.json | 386 ++++++++++++------------- pkgs/kde/plasma/default.nix | 4 +- 2 files changed, 195 insertions(+), 195 deletions(-) diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 605ff3d9fb96..6897ae10ea10 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,317 +1,317 @@ { "bluedevil": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/bluedevil-6.0.0.tar.xz", - "hash": "sha256-gxRzBpx78HGHryrLsQHTpsdHVVh+SQFCCY1aoFTuYmU=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/bluedevil-6.0.1.tar.xz", + "hash": "sha256-7bpz4yNYWvTgzHhtCAZXclkRP9fLH6sPYsvHOL1/53k=" }, "breeze": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-6.0.0.tar.xz", - "hash": "sha256-vHKhaxFre+q/G06aRRAZ+QSOe+awWsc6RifyWywgWeo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-6.0.1.tar.xz", + "hash": "sha256-IASCzv0Gbg1I4WqnOAqcsA5jSyujSDTNxzVPNjtgVE0=" }, "breeze-grub": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-grub-6.0.0.tar.xz", - "hash": "sha256-bsSL/16nneLcQgdr5ROGb9zV10K0ZytpDK8u3OXLcNY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-grub-6.0.1.tar.xz", + "hash": "sha256-iI1vzXZ+j97dqgq/Uze81TSpeu+RqKXkf6oZcmdNguM=" }, "breeze-gtk": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-gtk-6.0.0.tar.xz", - "hash": "sha256-zsTK8cIpvDDKAMZgXbTbmKllAhZ/NKm3fKArJrSZqzY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-gtk-6.0.1.tar.xz", + "hash": "sha256-MmInFnKHzR4PHzIfm7UFQsQAa/x53lehSNSaHL8gYqU=" }, "breeze-plymouth": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-plymouth-6.0.0.tar.xz", - "hash": "sha256-J3eGWAwBDAmqGS+I0JZFmvYKKv/yWpDo/TldOlInpkw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-plymouth-6.0.1.tar.xz", + "hash": "sha256-TlPrMhAYMWCf8dGyzxP1PjS8JMQHb1ec0JysuXtx8ZM=" }, "discover": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/discover-6.0.0.tar.xz", - "hash": "sha256-e6gl/kd5pJX/7UaStQ5xFw4gIz25kB7L4VKO3Dqz37A=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/discover-6.0.1.tar.xz", + "hash": "sha256-fVGh2NErdS2rcyHMKC/mT8L2H5OAfDUzi1BEp4ahoZo=" }, "drkonqi": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/drkonqi-6.0.0.tar.xz", - "hash": "sha256-oI1SR63vWJ5K+8ow3xSPjxgjfFDWThOkzphb93h9MQY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/drkonqi-6.0.1.tar.xz", + "hash": "sha256-X2YFQ8MKee/7SJANHrrZ+eViBRTaq96b2rwrXwGyAm0=" }, "flatpak-kcm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/flatpak-kcm-6.0.0.tar.xz", - "hash": "sha256-3u5cNcxTHAkuSJjmvJUInDOzJ5z1mPk0RjY8bYD7cSE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/flatpak-kcm-6.0.1.tar.xz", + "hash": "sha256-sHI/1B0LYRm1cplSH0iy1jXeIsZ3mfK/UDxbfD+N5YM=" }, "kactivitymanagerd": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kactivitymanagerd-6.0.0.tar.xz", - "hash": "sha256-khCzkcMpAY5FrGXG46d/ZFMvPgF2xYm812RgwgMBAvw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kactivitymanagerd-6.0.1.tar.xz", + "hash": "sha256-L5LCvqE8fGn2gjfoyHBvfNnP70CdWex8HcSd+JRvsrc=" }, "kde-cli-tools": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kde-cli-tools-6.0.0.tar.xz", - "hash": "sha256-Q3DJO7XCBe8yv0i8APJj6qOQt/G0bfh1pC/L/79Ch0E=" - }, - "kdecoration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kdecoration-6.0.0.tar.xz", - "hash": "sha256-NjpdI9kJUqXi4yvH+/Qf9Nu7fM/xOL7xnUiz2tEfFVE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kde-cli-tools-6.0.1.tar.xz", + "hash": "sha256-RuDbooTXS1BpScAw4/gX8RwpJiwRbT6aKp5l855DzRU=" }, "kde-gtk-config": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kde-gtk-config-6.0.0.tar.xz", - "hash": "sha256-YAcf/LVCeBilDKqVsickidoQgFwyuXXTggJsB4+NhFM=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kde-gtk-config-6.0.1.tar.xz", + "hash": "sha256-u1Df3OqfIavqqAs91SiZMhrRi2bjNRYfZrRHKWCJflU=" + }, + "kdecoration": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kdecoration-6.0.1.tar.xz", + "hash": "sha256-gSDaTJyMrv6nYKj5egjz7P//uK8ncqtE34EJ9hn/NZY=" }, "kdeplasma-addons": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kdeplasma-addons-6.0.0.tar.xz", - "hash": "sha256-vQ1ZBmRGTIhv4URHvjjBYakntw+2yc4opwkPkJAmDPc=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kdeplasma-addons-6.0.1.tar.xz", + "hash": "sha256-ZFjmBdJY4LKkLWAUwzaALBDfGvP+FPNND9v56THNK28=" }, "kgamma": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kgamma-6.0.0.tar.xz", - "hash": "sha256-lwTTLITibYwzAX8LDFYrdBu7ZpW4n6OIKfyEN1pQVmU=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kgamma-6.0.1.tar.xz", + "hash": "sha256-+2CVNijflwfXuoMVXVgo1fRNCT7YQZdMeO6adOzjyRI=" }, "kglobalacceld": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kglobalacceld-6.0.0.tar.xz", - "hash": "sha256-qn6zTz36/cL0dbsg7WqFY6Lp+/sGRwiQ4SfckFT5Rao=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kglobalacceld-6.0.1.tar.xz", + "hash": "sha256-tA1DMo0CPXqxsmWj6FUNv+8rjQ0dsq2oWBEdzzwZTqc=" }, "kinfocenter": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kinfocenter-6.0.0.tar.xz", - "hash": "sha256-byma0LoUOGQSDazzZUSGOkkGg1pZFcHLiRcGzzmjfnk=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kinfocenter-6.0.1.tar.xz", + "hash": "sha256-FP7LO/ME5sI3eJ2WL+o/vHJWsEAwde2b9K661Y+IluA=" }, "kmenuedit": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kmenuedit-6.0.0.tar.xz", - "hash": "sha256-+moJ6P7DQ2gNWNR9rt8NWCZ/i5kPEuLFCqcrq8ljrF8=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kmenuedit-6.0.1.tar.xz", + "hash": "sha256-9wZA2Q88JbE5NFM5UDwAGax0Oy8ldd+d+Ywn0URcdiQ=" }, "kpipewire": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kpipewire-6.0.0.tar.xz", - "hash": "sha256-3Vhe5N47W83BDzb+XfkZZkR8pxZXDWtOoVFg2x8dc7w=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kpipewire-6.0.1.tar.xz", + "hash": "sha256-CfahfSldlHT0ecVrzYuL5pCl1RCHAdDcICJ+84Udvjk=" }, "kscreen": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kscreen-6.0.0.tar.xz", - "hash": "sha256-+XwEV2MLzg2Q/bwPbEXx4rIaYBRL0YLYtB9Yk5v9c0Y=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kscreen-6.0.1.tar.xz", + "hash": "sha256-WHLCDvu4mvi59SZWsFyYaE4PrOWAAdOw7g2nslgi9ho=" }, "kscreenlocker": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kscreenlocker-6.0.0.tar.xz", - "hash": "sha256-JQL6qFyHRgpLXqu5J2nTPBls0zc7PzpSHtOW5QTSKrY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kscreenlocker-6.0.1.tar.xz", + "hash": "sha256-Kd74dcQG41cCjekXiFh/3mtTrL0Q1LgXd1S+z12VYCg=" }, "ksshaskpass": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/ksshaskpass-6.0.0.tar.xz", - "hash": "sha256-tdkYWBTLYsZMVfTA67KQ0jn3Pqr3IVjEWOVkM4xV7cY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ksshaskpass-6.0.1.tar.xz", + "hash": "sha256-0kRZcKvMZXYVKLfTp7KAJAb6ykTYkowpUOR7dXMDIUY=" }, "ksystemstats": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/ksystemstats-6.0.0.tar.xz", - "hash": "sha256-qFAYXmObZ4kt6lGy/7cadJj9BJ/8KNFz5u58atPzzro=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ksystemstats-6.0.1.tar.xz", + "hash": "sha256-Bxr+Zkw47Gq3spK5DmtVzC0r6yC+P4qlOxMWgok6XEk=" }, "kwallet-pam": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwallet-pam-6.0.0.tar.xz", - "hash": "sha256-GTqIHaQf8VG84ejt86CUqzUbUi/ZDjenNX0aGV7wBno=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwallet-pam-6.0.1.tar.xz", + "hash": "sha256-Gti7wB7F0cIUQSK9PYKyJn2nfQdq47+ku/HEGi1wulA=" }, "kwayland": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwayland-6.0.0.tar.xz", - "hash": "sha256-ADEglGgZZqTPaSKIOYBHokE28bzhMjBzBNDf+hz57Xk=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwayland-6.0.1.tar.xz", + "hash": "sha256-0rTZqzHiVNZ1ek7GqxzngNvGwA1Mj2pdoHz5GB6MhZU=" }, "kwayland-integration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwayland-integration-6.0.0.tar.xz", - "hash": "sha256-BOLLxF6jxLbxiroWYQ/Sx/ogsmPKYGKQsbJ1RmUBAek=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwayland-integration-6.0.1.tar.xz", + "hash": "sha256-G4S88fPSm7FKvEVUR4r9srx8x5UboSwtPIgCM4uzLHM=" }, "kwin": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwin-6.0.0.tar.xz", - "hash": "sha256-sZR8K0TeYZCQhGLIHorIn/nHMmqHZB/rZebM2FJipNs=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwin-6.0.1.tar.xz", + "hash": "sha256-bmGFfFAwt7OVPMDaXulKJDdVmZpM4AegAxH5HbiXXwQ=" }, "kwrited": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwrited-6.0.0.tar.xz", - "hash": "sha256-9kHAA98JHE83lsTG8xUdVieoo4UxAITi5/T8rPT3SmI=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwrited-6.0.1.tar.xz", + "hash": "sha256-YGx8Iojk9T9YmUPQhhjuFcOulE+HCDwJM7u+LeAhdBI=" }, "layer-shell-qt": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/layer-shell-qt-6.0.0.tar.xz", - "hash": "sha256-FaV6gtnMsNUgtVihc/Mxs5d1yADAsoSB2oCBFeHSirQ=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/layer-shell-qt-6.0.1.tar.xz", + "hash": "sha256-PbMq6DC2f1Wl3ikrdXkRJKft0DOYm36T5L2RPFj9l58=" }, "libkscreen": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/libkscreen-6.0.0.tar.xz", - "hash": "sha256-xCpykMiZ/IuIeJCnsD79cgtHbXrG/JHGTm8D2t/wm0Q=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libkscreen-6.0.1.tar.xz", + "hash": "sha256-8D3Px59OGyDSvT0WluRiKpW8TTtjYHgP3wxAj/o2KJs=" }, "libksysguard": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/libksysguard-6.0.0.tar.xz", - "hash": "sha256-a3LM++1p8nvOwNhkFO14CHAQmAHMIMUFkBZXyFw2RN0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libksysguard-6.0.1.tar.xz", + "hash": "sha256-kPDmZzBbmqucMqToAQyqzGqfsfyBpzuB0uu7SEXrLwM=" }, "libplasma": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/libplasma-6.0.0.tar.xz", - "hash": "sha256-sdj0cBoAndGHl8v2jwa9xFo+haJDsEGQiQtLQEQJJ9I=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libplasma-6.0.1.tar.xz", + "hash": "sha256-df7WkHW/Eazi++KfHRUnDIc3+6qReJBQSe/YAt52tHQ=" }, "milou": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/milou-6.0.0.tar.xz", - "hash": "sha256-yOqST3w5FeHeqlIgugByOFJrPfkCmzrJjsoVjlVSs0o=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/milou-6.0.1.tar.xz", + "hash": "sha256-wC6xYOq3nUvsGvh3RDptPGVfS5UsUXHhmHAT2s1L5hA=" }, "ocean-sound-theme": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/ocean-sound-theme-6.0.0.tar.xz", - "hash": "sha256-IqDtyoacebSb5aJVtsPfsNJYTJ72jbt5BhOKfJb2efo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ocean-sound-theme-6.0.1.tar.xz", + "hash": "sha256-YoctZEvuhcjofoyUcER3ttxIdyU8bqLfwGWeodN6sp0=" }, "oxygen": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/oxygen-6.0.0.tar.xz", - "hash": "sha256-+5NjfGeceeuPdkPn1IQiVfN/kluWW84v1Vf4Ct/6weg=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/oxygen-6.0.1.tar.xz", + "hash": "sha256-Tdkt0bgp7pwlSRunoigb2cTsmV1ujdBM+ZDr+4lJ91Q=" }, "oxygen-sounds": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/oxygen-sounds-6.0.0.tar.xz", - "hash": "sha256-dWWuHsxtOVvK9DaH7/lPVu2opCidDG/19KV1E5HG5Y8=" - }, - "plasma5support": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma5support-6.0.0.tar.xz", - "hash": "sha256-qhMUh/8sdciSzoxSgTtuH+LWpJ9S7QjzhwDiLA6Z6+0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/oxygen-sounds-6.0.1.tar.xz", + "hash": "sha256-bMbU68dKW17oLbEg9tdX28F/m3CRJ5hACiATMjGbeo8=" }, "plasma-activities": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-activities-6.0.0.tar.xz", - "hash": "sha256-8L0Hu82QIscuVkBGBGAps59x0cxbRnufUJFIEwQ7J5U=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-6.0.1.tar.xz", + "hash": "sha256-L9fe7g6q78KXoC5o4Ra09tqUdbtvJvc9fO0bWSK/TYY=" }, "plasma-activities-stats": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-activities-stats-6.0.0.tar.xz", - "hash": "sha256-Xmqw/l88XbDeLr5q3NecJhcLkq3cBWzzXwSE+0UAfS4=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-stats-6.0.1.tar.xz", + "hash": "sha256-d5/1WkSbl0UpWn3L/5oiq7TU8PdKgHIZZ09iT3tVpuo=" }, "plasma-browser-integration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-browser-integration-6.0.0.tar.xz", - "hash": "sha256-IdX3JyJKnhxUhqc0UELbQoLqpC4JpoUvt3tbATX09kE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-browser-integration-6.0.1.tar.xz", + "hash": "sha256-QpBJgaCwFxKG71tTAJHrXzZgBfEfzLlslcr2GQXYFjU=" }, "plasma-desktop": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-desktop-6.0.0.tar.xz", - "hash": "sha256-kkzgTbLIjPeuGiPxmzjrRSl3CHtuk37QVozlOXvMkn0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-desktop-6.0.1.tar.xz", + "hash": "sha256-l9dA6OO1/5IXO5qQhlZ9/0D/dwyjTQzs/rNdZQgIovE=" }, "plasma-disks": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-disks-6.0.0.tar.xz", - "hash": "sha256-uC/+Mn227ddGxCL3HgBxUjcT3m2bL0b7DhLQMAKHTyo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-disks-6.0.1.tar.xz", + "hash": "sha256-eC8HigBYUBU7uH3zZjRI/Uqpz/TMfMve+kClFq1+p/4=" }, "plasma-firewall": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-firewall-6.0.0.tar.xz", - "hash": "sha256-MrC04kHmfXqrKt5eo0VnDwlFhQ4iDWWro8blX2AYV5Y=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-firewall-6.0.1.tar.xz", + "hash": "sha256-K+GFZDSTYBGZiCUf4VLAdiBLR0LsDSFv5RtRjopzaec=" }, "plasma-integration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-integration-6.0.0.tar.xz", - "hash": "sha256-Ez/2bspjY7eYtRUuluNwQAIT5aK8KL1jPYtpFAawLEE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-integration-6.0.1.tar.xz", + "hash": "sha256-FtEj3D9ZxJIlG44vupScddO/D2fzzs+WxRvkjcQUQp8=" }, "plasma-mobile": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-mobile-6.0.0.tar.xz", - "hash": "sha256-128H4RR/0utqMuNdfLTIR5XtoysWHLCmCgRnah6ab/M=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-mobile-6.0.1.tar.xz", + "hash": "sha256-snOILhyWtKu57n9BInxHokC6v+9FkJ8N13ysBa02QAg=" }, "plasma-nano": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-nano-6.0.0.tar.xz", - "hash": "sha256-mfxE3tTdO0TEX4k+2SIaphJt3p1Paty3JwTAOpMgfCc=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-nano-6.0.1.tar.xz", + "hash": "sha256-IEHQFekEQButOtNaSjEC2kaGau6PycwMk9o3246plHQ=" }, "plasma-nm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-nm-6.0.0.tar.xz", - "hash": "sha256-Us+Wc4zur85l8YOjRXMlrrWx8YpDNs7t5aImVW5unrQ=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-nm-6.0.1.tar.xz", + "hash": "sha256-cKIB7prSAiQrAP9QYZZkrFIFlE+J3yrDpyqfTOV4kyo=" }, "plasma-pa": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-pa-6.0.0.tar.xz", - "hash": "sha256-tJq7K7dEAbIs2uHZkhAddktIOhjGAIfCAvbmlRRdAiw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-pa-6.0.1.tar.xz", + "hash": "sha256-Jyjs2fHFEG/ovAfwsDvaMWA2rcXQOjrAAVEfdUPDN8c=" }, "plasma-sdk": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-sdk-6.0.0.tar.xz", - "hash": "sha256-jLLeV6og30Qzp9lRMGpjfMKErOuuKzTPpxxQ7j7eKqo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-sdk-6.0.1.tar.xz", + "hash": "sha256-cuDXrIGZJI96emqO3nvc1geZDVhnqZmOHmrxT9cjKLc=" }, "plasma-systemmonitor": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-systemmonitor-6.0.0.tar.xz", - "hash": "sha256-WJ/QTx/g2Wv6KXpP4D7rAVx7X4OZMlvyMyd9/nnmb5k=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-systemmonitor-6.0.1.tar.xz", + "hash": "sha256-L4l5l4s0jWtxrAePmJ3SH/TptrDSW15Zo3G+UA/JnVE=" }, "plasma-thunderbolt": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-thunderbolt-6.0.0.tar.xz", - "hash": "sha256-BHjvWduv56m0l00o8Ukcud37OZ+DHW3BulqwN1zoqJ8=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-thunderbolt-6.0.1.tar.xz", + "hash": "sha256-mzw6wQ94iaZr+rv2KCPsld/a2f9GZSltDCB9S9KIkr0=" }, "plasma-vault": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-vault-6.0.0.tar.xz", - "hash": "sha256-ZB3XHds51dFb6E1LDCTVoODEG0zityVzj6cuWcRS7ak=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-vault-6.0.1.tar.xz", + "hash": "sha256-rWYoml4dP23zwX2xah+IwVi0z3h2VnJuiVhI0L5u0AU=" }, "plasma-welcome": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-welcome-6.0.0.tar.xz", - "hash": "sha256-xihVGMLHIQfGgnqdcZj5Oh8wrsb5mZPCoxHjE3/T5mw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-welcome-6.0.1.tar.xz", + "hash": "sha256-+Lrjd8pQpMvsSpYwXy4rjowzNZ9ZamSFEQirCVC280E=" }, "plasma-workspace": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-workspace-6.0.0.tar.xz", - "hash": "sha256-R92HtMDgnBvLNBYreq4+WjuaSquhuf7Q9NaBuz+f67o=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-6.0.1.tar.xz", + "hash": "sha256-1MNcsWi5kEh7OfG36xlGkJxedPAgDQ3i0xdlnBbxWgw=" }, "plasma-workspace-wallpapers": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-workspace-wallpapers-6.0.0.tar.xz", - "hash": "sha256-Tde+PXqq8Bt8mmKGX/BITnSvEbJGhcVCMaMV90r2uB0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-wallpapers-6.0.1.tar.xz", + "hash": "sha256-MWMiru1TqQSs+mk3gT320hZEmM2dTC8th7YQu1vPgs4=" + }, + "plasma5support": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma5support-6.0.1.tar.xz", + "hash": "sha256-CyW9EyMGCEy1wNrgfFwP+noy2eserMDTS1bnhHEe0zU=" }, "plymouth-kcm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plymouth-kcm-6.0.0.tar.xz", - "hash": "sha256-D79i6jP593fdbe4JPQlALUtNmF2Ghuc1S7xDavqJLeM=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plymouth-kcm-6.0.1.tar.xz", + "hash": "sha256-RQtov7L/0cuFzQLE1kEgg3iHB4SBGn+POngU1mM1Ink=" }, "polkit-kde-agent-1": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/polkit-kde-agent-1-6.0.0.tar.xz", - "hash": "sha256-LM/EGoPP74ybMxH+H5OrUtBi9jsPblpjsIJA7RFTqk4=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/polkit-kde-agent-1-6.0.1.tar.xz", + "hash": "sha256-YpgXxuVqVkfDr5fW3JYOd0RGAzK9PeavgJCV6LUy2T0=" }, "powerdevil": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/powerdevil-6.0.0.tar.xz", - "hash": "sha256-EmNCdg4bjKS5j6hXmryqQVuFnX1tGAKzagJWSGcssFA=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/powerdevil-6.0.1.tar.xz", + "hash": "sha256-CsSPI+gmRDhDQPBjkDeoQkFpqOGjS0nz9tJQUzJC0K8=" }, "print-manager": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/print-manager-6.0.0.tar.xz", - "hash": "sha256-vZBXi5HmyQoTxa/PlLwW1XvHo7feiURb+gFfDE54FP0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/print-manager-6.0.1.tar.xz", + "hash": "sha256-qMam4P00JMAi1yEUEKP3dMNT+G7ny08Yrb06pnEhl0o=" }, "qqc2-breeze-style": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/qqc2-breeze-style-6.0.0.tar.xz", - "hash": "sha256-pDDhl8ITxJif4Q/CSeTwrkYu4dP11vvJWPQus4sEySc=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/qqc2-breeze-style-6.0.1.tar.xz", + "hash": "sha256-d4hSRmOyOT2I8DeYeKu9HlLAUg6zyofZVHh3aiUCkLQ=" }, "sddm-kcm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/sddm-kcm-6.0.0.tar.xz", - "hash": "sha256-iBIFJOqFFY5nhPNSP7cGQ8KmXBn+cu4NXwQAc6wih48=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/sddm-kcm-6.0.1.tar.xz", + "hash": "sha256-f8538z7WWFkQNx2YP+LiCxB/7KvIZS+K+wjZrhk+4c8=" }, "systemsettings": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/systemsettings-6.0.0.tar.xz", - "hash": "sha256-Vh+QE7oHBxwK3Xd4WOyF1AqN3fzIOhD18Ess4QFmZrw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/systemsettings-6.0.1.tar.xz", + "hash": "sha256-HGShWBnCxoPGaXJfEa6Fos3ElOR5lvalbLLYExiQTZU=" }, "wacomtablet": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/wacomtablet-6.0.0.tar.xz", - "hash": "sha256-1/MYJz6HWKOiJAFuEJMIc/uO1wnZzWrMJm1lp47k0Ww=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/wacomtablet-6.0.1.tar.xz", + "hash": "sha256-m4LCsY3YClBN6OAM1qT5ypB2vZj6b6EReCIj3pRdzj4=" }, "xdg-desktop-portal-kde": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/xdg-desktop-portal-kde-6.0.0.tar.xz", - "hash": "sha256-xW7ePlFI33RoOWGLdLCuOPsPtrEM0Eo1xxvJL41X3Wo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/xdg-desktop-portal-kde-6.0.1.tar.xz", + "hash": "sha256-2koLhkyhdujOGfbhXSfI+RkyOlGgck7II3gXnDFY2Zk=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index b50dc05b2fa4..a29c1fc36d2e 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -9,8 +9,8 @@ flatpak-kcm = callPackage ./flatpak-kcm {}; kactivitymanagerd = callPackage ./kactivitymanagerd {}; kde-cli-tools = callPackage ./kde-cli-tools {}; - kdecoration = callPackage ./kdecoration {}; kde-gtk-config = callPackage ./kde-gtk-config {}; + kdecoration = callPackage ./kdecoration {}; kdeplasma-addons = callPackage ./kdeplasma-addons {}; kgamma = callPackage ./kgamma {}; kglobalacceld = callPackage ./kglobalacceld {}; @@ -34,7 +34,6 @@ ocean-sound-theme = callPackage ./ocean-sound-theme {}; oxygen = callPackage ./oxygen {}; oxygen-sounds = callPackage ./oxygen-sounds {}; - plasma5support = callPackage ./plasma5support {}; plasma-activities = callPackage ./plasma-activities {}; plasma-activities-stats = callPackage ./plasma-activities-stats {}; plasma-browser-integration = callPackage ./plasma-browser-integration {}; @@ -53,6 +52,7 @@ plasma-welcome = callPackage ./plasma-welcome {}; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {}; + plasma5support = callPackage ./plasma5support {}; plymouth-kcm = callPackage ./plymouth-kcm {}; polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {}; powerdevil = callPackage ./powerdevil {}; From 89ab2b075f12f31ec4c59ff9961f82d887c14998 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 06:59:19 +0000 Subject: [PATCH 26/49] libretro.beetle-psx-hw: unstable-2024-02-27 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..210973643c8f 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "4a006dca366af88d491e232892fe93aabe094b14", - "hash": "sha256-tdD2Ilkzph425RC4pVcS7kpvIxA+DF/rWYM9BhcWGyY=" + "rev": "680bbf0e2a4f9bc2b534d213416456baa9c95212", + "hash": "sha256-QmiCokeMtQC2+cwWFovve2+c3pahD+IdOFBRAXEPV0k=" }, - "version": "unstable-2024-02-27" + "version": "unstable-2024-03-01" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", From 9fbb05a8f4d281e6ee1f303ce1449f85b40b44d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:00:56 +0000 Subject: [PATCH 27/49] libretro.stella: unstable-2024-02-02 -> unstable-2024-03-03 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..f75395a73a08 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -793,10 +793,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "4557099e5d7a0c0b02424ea85d2a4b093911e048", - "hash": "sha256-wyJExpIIScgLTALgvqW5f/QgIsMC19JU8Meh3mV4d2c=" + "rev": "a311e1d714db3837ae4c05e2fab0abcf092a2e54", + "hash": "sha256-QJirSJleSPezNoyH2DKkaoNmGY3r/5J64IHBp+MeFvI=" }, - "version": "unstable-2024-02-02" + "version": "unstable-2024-03-03" }, "stella2014": { "fetcher": "fetchFromGitHub", From 7abcb46186e17c4d166db475769174857b86384e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:02:08 +0000 Subject: [PATCH 28/49] libretro.beetle-pce-fast: unstable-2024-02-23 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..1e21314f2235 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -65,10 +65,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "ad9ad7e7e3b89d322e9f9492f5b04738641ffbe8", - "hash": "sha256-UUej94plV/UDsvfh7CPjP6zv99zNw4JT+ZDOl0AKzmc=" + "rev": "28180934e9d7f1a6ec655adde0b81f0b167732ad", + "hash": "sha256-Kt1Bh32zoJynbqp/0ARngPTYHlvp6k/Ya09l8/736gk=" }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-01" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", From 2c86192f73d1fb5f00de61b3a62b3bed93c99e5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:02:25 +0000 Subject: [PATCH 29/49] libretro.beetle-pce: unstable-2024-02-09 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..233110dc8ff5 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,10 +55,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "753f067738e55a6325d3ca5206151a9acd9127f0", - "hash": "sha256-OWvoIi0DS3YhxK1S6PAbCNZwKKXti6brZlWVCJELfKY=" + "rev": "95b5ea18a694f5a05b1c0cda20928c825d981238", + "hash": "sha256-4Y2dyELUGWycCQ1UA0Ov6Ijh1t+KgSL1AtDefbRmjbA=" }, - "version": "unstable-2024-02-09" + "version": "unstable-2024-03-01" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", From 4e825dc6c48fdd0654f40fabf2485e55e86cc4c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:12:41 +0000 Subject: [PATCH 30/49] libretro.beetle-supergrafx: unstable-2024-02-09 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..ff375b66128d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "32070ffd0082fd5127519bb6e92a2daecc359408", - "hash": "sha256-ZBZtDMP2inarEuLE76Zw1/qZ2YfyTJy+2eN10hhpn64=" + "rev": "29ff9e00a85db3d462cca42543a84597c421c99c", + "hash": "sha256-UZt1yFcwgdY/TbDs+GQ73Nu5KRA1R8gdKs73IQC1mCg=" }, - "version": "unstable-2024-02-09" + "version": "unstable-2024-03-01" }, "beetle-vb": { "fetcher": "fetchFromGitHub", From a9382f213b0b38e53a1c8f8f3f44f45cd1c4dc91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:18:35 +0000 Subject: [PATCH 31/49] libretro.ppsspp: unstable-2024-02-27 -> unstable-2024-02-28 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..c77dd95e666d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -662,11 +662,11 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "bc18fb145bda05735b92dde1869426c3380d35e5", - "hash": "sha256-sofvjkrKDTCHyYWIqlaAR6kN3JdBOjh67pNCvw5IXi8=", + "rev": "0159102a191d43de7ae51775a79846efa2635988", + "hash": "sha256-b7QOOpeoVJUComVOlMtZK8B5w5vkE6rxJVEHecJE19k=", "fetchSubmodules": true }, - "version": "unstable-2024-02-27" + "version": "unstable-2024-02-28" }, "prboom": { "fetcher": "fetchFromGitHub", From 5557dc174393908019c09e0585abbdf4fa1f14f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:19:11 +0000 Subject: [PATCH 32/49] libretro.mame2003-plus: unstable-2024-02-26 -> unstable-2024-03-02 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..3efd19a47661 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -438,10 +438,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "d3bc97daafcd0ff8498c4e1acd8996accb668ad3", - "hash": "sha256-Ua/uP9vXKiij+VyEOf7lAD352LGpoqH3nuHAjDTaYus=" + "rev": "a7cb863de48247c771a0fcc71d519131eae4e9c6", + "hash": "sha256-Y/Zyfck5tJ6oVsL/WjNXJZdPE5THeyBD5tNzJQaLSn8=" }, - "version": "unstable-2024-02-26" + "version": "unstable-2024-03-02" }, "mame2010": { "fetcher": "fetchFromGitHub", From 9018456959fa4ad3172fabd185eb8502c7a33c27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:29:07 +0000 Subject: [PATCH 33/49] libretro.fbneo: unstable-2024-02-22 -> unstable-2024-03-03 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..34003e82b5ea 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "226123d45854f23a93f5030471bf82d068f018ad", - "hash": "sha256-GTkUgLhnP2KFR6Lo354577qYS5CXjGZ7k7PZ9sTE0Cg=" + "rev": "a9c41d1e1132b1a7aad48c0f8e94fcf9c7ba0f9f", + "hash": "sha256-H4pJruHqJ4p3tBykm015U+wApHrAeVaZO9nLJ9Rc0NQ=" }, - "version": "unstable-2024-02-22" + "version": "unstable-2024-03-03" }, "fceumm": { "fetcher": "fetchFromGitHub", From 35f59cc7a5022d33fc23e14ca29ae9684db8ee3e Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 10:43:17 +0300 Subject: [PATCH 34/49] kde/plasma: apply hacks to fix build --- pkgs/kde/plasma/breeze-gtk/default.nix | 5 +++++ pkgs/kde/plasma/breeze-plymouth/default.nix | 3 +++ pkgs/kde/plasma/kpipewire/default.nix | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/pkgs/kde/plasma/breeze-gtk/default.nix b/pkgs/kde/plasma/breeze-gtk/default.nix index fc0bc4759d48..621ae4f88aae 100644 --- a/pkgs/kde/plasma/breeze-gtk/default.nix +++ b/pkgs/kde/plasma/breeze-gtk/default.nix @@ -10,5 +10,10 @@ mkKdeDerivation { # FIXME(later): upstream patches = [./0001-fix-add-executable-bit.patch]; + # FIXME: hack to fix build, remove for 6.0.2 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" + ''; + extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; } diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix index 7551eca94e3a..b69ff3601a56 100644 --- a/pkgs/kde/plasma/breeze-plymouth/default.nix +++ b/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -41,6 +41,9 @@ in postPatch = '' substituteInPlace cmake/FindPlymouth.cmake --subst-var out + + # FIXME: hack to fix build, remove for 6.0.2 + substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" '' + lib.optionalString (logoFile != null) '' cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index c79bfc792d51..18e595f39e16 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + fetchpatch, qtquick3d, pkg-config, pipewire, @@ -10,6 +11,14 @@ mkKdeDerivation { pname = "kpipewire"; + # FIXME: backport to fix build, remove for 6.0.2 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/plasma/kpipewire/-/commit/df052bfa3c66d24109f40f18266ee057d1838b9b.patch"; + hash = "sha256-69ftUUz5cvG/CmCw3hHFeU8XKhZPJjnx1raJCCay38g="; + }) + ]; + extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; } From b9d157857d994cf2f9a7880d47f7d226c4184cfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:55:20 +0000 Subject: [PATCH 35/49] libretro.beetle-psx: unstable-2024-02-27 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..210973643c8f 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "4a006dca366af88d491e232892fe93aabe094b14", - "hash": "sha256-tdD2Ilkzph425RC4pVcS7kpvIxA+DF/rWYM9BhcWGyY=" + "rev": "680bbf0e2a4f9bc2b534d213416456baa9c95212", + "hash": "sha256-QmiCokeMtQC2+cwWFovve2+c3pahD+IdOFBRAXEPV0k=" }, - "version": "unstable-2024-02-27" + "version": "unstable-2024-03-01" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", From baec779d4919182e2a9aa854949efdfab0141532 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:03:22 +0000 Subject: [PATCH 36/49] libretro.bsnes: unstable-2024-02-09 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..28bc185b3e4c 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "d230353616ab4c7dc01a2f2a63865011bd5c7ffd", - "hash": "sha256-TiOdptWOb13UQ8jKDbIlZQQ3mY3h/lPHr/GskPVAkwA=" + "rev": "9e9b928e0153f663cf4802f266315ab092067b7e", + "hash": "sha256-Fn1bz3TC+8CEmGDNcll0yfzBpDPvfS1vknf49ogNCIQ=" }, - "version": "unstable-2024-02-09" + "version": "unstable-2024-03-01" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", From 84003e9ec805c3f6578456d3b8f550a5525347b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:04:48 +0000 Subject: [PATCH 37/49] libretro.flycast: unstable-2024-02-23 -> unstable-2024-03-04 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..54cec76a8ff0 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "bc51aefa9c52981621abf1d3545bff7befa4d01b", - "hash": "sha256-NSCJxex5Rl7sWe2DkJ2aIyPzfdTcwSRb2iI3xpvYiow=", + "rev": "391da7023f63c2afd32af72ac9f2cfb02bbc7eb6", + "hash": "sha256-fcNpFl6VwaoL2mWZOgyVoJWX9CV2KbWctukdxxo797I=", "fetchSubmodules": true }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-04" }, "fmsx": { "fetcher": "fetchFromGitHub", From 6e957fb53040cbb2768736f8894bc4ac62b5aee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:04:52 +0000 Subject: [PATCH 38/49] libretro.mame: unstable-2024-02-13 -> unstable-2024-02-29 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..2c1e5252adc4 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -408,10 +408,10 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "8ebaec4073703f5050dac3f6c8da408943e15938", - "hash": "sha256-CFCem9MiaHW2flEZyJkcC9JEGzx7Ox/uqrTY3jue+Pk=" + "rev": "6d6d21fd9e41dab2b0e0ca0587baf3fcad18fd67", + "hash": "sha256-8pPDIxnEeeTQl160E+sg/wmchOR53pQmbhvEAXRFif0=" }, - "version": "unstable-2024-02-13" + "version": "unstable-2024-02-29" }, "mame2000": { "fetcher": "fetchFromGitHub", From 03887526902a028065a64178732fc2f20770f1b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:08:05 +0000 Subject: [PATCH 39/49] libretro.fceumm: unstable-2024-02-27 -> unstable-2024-03-02 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..530c429645fe 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -297,10 +297,10 @@ "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "1deea6c93cdcf5158b032683f426a06dd1bfa8d5", - "hash": "sha256-e0AxHw9sRufk5cc6q66/cmdkD+FbVRY+OUkRjZA8j1U=" + "rev": "40969671ce9e4b1a49165d836476cd71bb960131", + "hash": "sha256-wdAigh3qUzB3wmh6q/dwCHHhuyqyAmqV+NSvrzjODVM=" }, - "version": "unstable-2024-02-27" + "version": "unstable-2024-03-02" }, "flycast": { "fetcher": "fetchFromGitHub", From dd99987e7779e1381fb7c10e3c83d329c5ff854d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:12:40 +0000 Subject: [PATCH 40/49] libretro.genesis-plus-gx: unstable-2024-02-23 -> unstable-2024-03-02 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..7cf684251d91 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -358,10 +358,10 @@ "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "b38cdca9036332c1b7b05817432d1fd42d59527b", - "hash": "sha256-5yr64Jy8WxamMknIG9nhIV4BLTZg8k7Q8Lnw8sfmWhk=" + "rev": "d434ad9ee418247490a8560b52e0651d25304f35", + "hash": "sha256-v6IYku+9hLlGD0sgkzoatdD7Glp/3pgwBE2K4hdsFec=" }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-02" }, "gpsp": { "fetcher": "fetchFromGitHub", From ac07d446782cdf4ac55ebaa2ced990367e28fd94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:16:40 +0000 Subject: [PATCH 41/49] libretro.gambatte: unstable-2024-02-23 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..d3656d6ef85d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -348,10 +348,10 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "4041d5a6c474d2d01b4cb1e81324b06b51d0147b", - "hash": "sha256-TmPOka3oz5xIFDEsmDbvXXmLmP15FtQdoUZ+FErbqrI=" + "rev": "9806d3f12bc3a831fad3f71c6fbad6f93d83581c", + "hash": "sha256-EdqS410TZyRqE/nd/oLJt7dauN0DCtNnhB6k6CPd/tc=" }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-01" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", From 73c0b48dd69255193aa07abd5670e39396bfaa3e Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 6 Mar 2024 10:21:23 +0100 Subject: [PATCH 42/49] doc: add details on `mapAttrsRecursive[Cond]` (#293509) * doc: add details on `mapAttrsRecursive[Cond]` from first reading it wasn't clear that `f` also takes the current attribute path. also the value f receives is tricky due to how the condition is evaluated. Co-authored-by: Daniel Sidhion --- lib/attrsets.nix | 77 +++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 4f7d795c397f..ebac469fcd4f 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -680,52 +680,67 @@ rec { attrsToList = mapAttrsToList nameValuePair; - /* Like `mapAttrs`, except that it recursively applies itself to - the *leaf* attributes of a potentially-nested attribute set: - the second argument of the function will never be an attrset. - Also, the first argument of the argument function is a *list* - of the attribute names that form the path to the leaf attribute. + /** + Like `mapAttrs`, except that it recursively applies itself to the *leaf* attributes of a potentially-nested attribute set: + the second argument of the function will never be an attrset. + Also, the first argument of the mapping function is a *list* of the attribute names that form the path to the leaf attribute. - For a function that gives you control over what counts as a leaf, - see `mapAttrsRecursiveCond`. + For a function that gives you control over what counts as a leaf, see `mapAttrsRecursiveCond`. - Example: - mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) - { n = { a = "A"; m = { b = "B"; c = "C"; }; }; d = "D"; } - => { n = { a = "n-a-A"; m = { b = "n-m-b-B"; c = "n-m-c-C"; }; }; d = "d-D"; } + :::{#map-attrs-recursive-example .example} + # Map over leaf attributes - Type: - mapAttrsRecursive :: ([String] -> a -> b) -> AttrSet -> AttrSet + ```nix + mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) + { n = { a = "A"; m = { b = "B"; c = "C"; }; }; d = "D"; } + ``` + evaluates to + ```nix + { n = { a = "n-a-A"; m = { b = "n-m-b-B"; c = "n-m-c-C"; }; }; d = "d-D"; } + ``` + ::: + + # Type + ``` + mapAttrsRecursive :: ([String] -> a -> b) -> AttrSet -> AttrSet + ``` */ mapAttrsRecursive = - # A function, given a list of attribute names and a value, returns a new value. + # A function that, given an attribute path as a list of strings and the corresponding attribute value, returns a new value. f: - # Set to recursively map over. + # Attribute set to recursively map over. set: mapAttrsRecursiveCond (as: true) f set; - /* Like `mapAttrsRecursive`, but it takes an additional predicate - function that tells it whether to recurse into an attribute - set. If it returns false, `mapAttrsRecursiveCond` does not - recurse, but does apply the map function. If it returns true, it - does recurse, and does not apply the map function. + /** + Like `mapAttrsRecursive`, but it takes an additional predicate that tells it whether to recurse into an attribute set. + If the predicate returns false, `mapAttrsRecursiveCond` does not recurse, but instead applies the mapping function. + If the predicate returns true, it does recurse, and does not apply the mapping function. - Example: - # To prevent recursing into derivations (which are attribute - # sets with the attribute "type" equal to "derivation"): - mapAttrsRecursiveCond - (as: !(as ? "type" && as.type == "derivation")) - (x: ... do something ...) - attrs + :::{#map-attrs-recursive-cond-example .example} + # Map over an leaf attributes defined by a condition - Type: - mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet + Map derivations to their `name` attribute. + Derivatons are identified as attribute sets that contain `{ type = "derivation"; }`. + ```nix + mapAttrsRecursiveCond + (as: !(as ? "type" && as.type == "derivation")) + (x: x.name) + attrs + ``` + ::: + + # Type + ``` + mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet + ``` */ mapAttrsRecursiveCond = - # A function, given the attribute set the recursion is currently at, determine if to recurse deeper into that attribute set. + # A function that, given the attribute set the recursion is currently at, determines if to recurse deeper into that attribute set. cond: - # A function, given a list of attribute names and a value, returns a new value. + # A function that, given an attribute path as a list of strings and the corresponding attribute value, returns a new value. + # The attribute value is either an attribute set for which `cond` returns false, or something other than an attribute set. f: # Attribute set to recursively map over. set: From 3d726897d2c44dbf58e86e0e9c6b76bc68b0bfc3 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 6 Mar 2024 10:31:03 +0100 Subject: [PATCH 43/49] opensc: 0.24.0 -> 0.25.0 --- pkgs/tools/security/opensc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 856921edbf18..6edc9a7da55c 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "sha256-1mm0b4AAtX0AgjShpU1FR6e7pUkea5TOJdIGkNQgjuE="; + sha256 = "sha256-pNorJiZzLGpxtlkog2d3E9xePMy9ASoHeWduqVZiBiA="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 9e811a255eb34a240236399eeb3aef8efe31ecbd Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 6 Mar 2024 09:49:13 +0000 Subject: [PATCH 44/49] multipass: revert change from OVMF.fd -> OVMF.firmware --- pkgs/tools/virtualization/multipass/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix index c746639e98ee..e7875f00bb6a 100644 --- a/pkgs/tools/virtualization/multipass/default.nix +++ b/pkgs/tools/virtualization/multipass/default.nix @@ -70,8 +70,8 @@ stdenv.mkDerivation # Patch the patch of the OVMF binaries to use paths from the nix store. substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \ - --replace "OVMF.fd" "${OVMF.firmware}" \ - --replace "QEMU_EFI.fd" "${OVMF.firmware}" + --replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \ + --replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd" # Copy the grpc submodule we fetched into the source code. cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc @@ -122,6 +122,7 @@ stdenv.mkDerivation dnsmasq iproute2 iptables + OVMF.fd qemu qemu-utils xterm From 516bd5c9279f4be737567348eb5486f577656ea9 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 13:03:10 +0300 Subject: [PATCH 45/49] Revert "kde/plasma: apply hacks to fix build" This reverts commit 35f59cc7a5022d33fc23e14ca29ae9684db8ee3e. --- pkgs/kde/plasma/breeze-gtk/default.nix | 5 ----- pkgs/kde/plasma/breeze-plymouth/default.nix | 3 --- pkgs/kde/plasma/kpipewire/default.nix | 9 --------- 3 files changed, 17 deletions(-) diff --git a/pkgs/kde/plasma/breeze-gtk/default.nix b/pkgs/kde/plasma/breeze-gtk/default.nix index 621ae4f88aae..fc0bc4759d48 100644 --- a/pkgs/kde/plasma/breeze-gtk/default.nix +++ b/pkgs/kde/plasma/breeze-gtk/default.nix @@ -10,10 +10,5 @@ mkKdeDerivation { # FIXME(later): upstream patches = [./0001-fix-add-executable-bit.patch]; - # FIXME: hack to fix build, remove for 6.0.2 - postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" - ''; - extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; } diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix index b69ff3601a56..7551eca94e3a 100644 --- a/pkgs/kde/plasma/breeze-plymouth/default.nix +++ b/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -41,9 +41,6 @@ in postPatch = '' substituteInPlace cmake/FindPlymouth.cmake --subst-var out - - # FIXME: hack to fix build, remove for 6.0.2 - substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" '' + lib.optionalString (logoFile != null) '' cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index 18e595f39e16..c79bfc792d51 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -1,6 +1,5 @@ { mkKdeDerivation, - fetchpatch, qtquick3d, pkg-config, pipewire, @@ -11,14 +10,6 @@ mkKdeDerivation { pname = "kpipewire"; - # FIXME: backport to fix build, remove for 6.0.2 - patches = [ - (fetchpatch { - url = "https://invent.kde.org/plasma/kpipewire/-/commit/df052bfa3c66d24109f40f18266ee057d1838b9b.patch"; - hash = "sha256-69ftUUz5cvG/CmCw3hHFeU8XKhZPJjnx1raJCCay38g="; - }) - ]; - extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; } From ca00eb4c4bfe8468219d2b1c78b7a05bab114581 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 13:03:12 +0300 Subject: [PATCH 46/49] kde/plasma: 6.0.1 -> 6.0.1.1 (where needed) --- pkgs/kde/generated/sources/plasma.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 6897ae10ea10..18854156c38b 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -15,14 +15,14 @@ "hash": "sha256-iI1vzXZ+j97dqgq/Uze81TSpeu+RqKXkf6oZcmdNguM=" }, "breeze-gtk": { - "version": "6.0.1", - "url": "mirror://kde/stable/plasma/6.0.1/breeze-gtk-6.0.1.tar.xz", - "hash": "sha256-MmInFnKHzR4PHzIfm7UFQsQAa/x53lehSNSaHL8gYqU=" + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-gtk-6.0.1.1.tar.xz", + "hash": "sha256-I8qWYBzJv/AENPf7/jkB+8uSNi0XUaMcCFIPtMESRhA=" }, "breeze-plymouth": { - "version": "6.0.1", - "url": "mirror://kde/stable/plasma/6.0.1/breeze-plymouth-6.0.1.tar.xz", - "hash": "sha256-TlPrMhAYMWCf8dGyzxP1PjS8JMQHb1ec0JysuXtx8ZM=" + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-plymouth-6.0.1.1.tar.xz", + "hash": "sha256-Xk/enHtV4kwK4inPSrct34g1nvewvSrnFbuH4eDx94I=" }, "discover": { "version": "6.0.1", @@ -85,9 +85,9 @@ "hash": "sha256-9wZA2Q88JbE5NFM5UDwAGax0Oy8ldd+d+Ywn0URcdiQ=" }, "kpipewire": { - "version": "6.0.1", - "url": "mirror://kde/stable/plasma/6.0.1/kpipewire-6.0.1.tar.xz", - "hash": "sha256-CfahfSldlHT0ecVrzYuL5pCl1RCHAdDcICJ+84Udvjk=" + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/kpipewire-6.0.1.1.tar.xz", + "hash": "sha256-GQLzlJBS/xq12nnGMJWG8+EaKcfASgRPc7P2rJglHEo=" }, "kscreen": { "version": "6.0.1", From 55f0519012ce1f5db872dc3151aaab3f8b8bba67 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 13 Feb 2024 11:47:53 +0100 Subject: [PATCH 47/49] rl_json: 0.14 -> 0.15.1 Diff: https://github.com/RubyLane/rl_json/compare/0.14...0.15.1 --- pkgs/by-name/rl/rl_json/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix index 3a19df59d93a..4feaae71c6b5 100644 --- a/pkgs/by-name/rl/rl_json/package.nix +++ b/pkgs/by-name/rl/rl_json/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rl_json"; - version = "0.14"; + version = "0.15.1"; src = fetchFromGitHub { owner = "RubyLane"; repo = "rl_json"; rev = version; - hash = "sha256-7xjZQ8F8czrkr7p2Xg1xAZRCsDpiWXHXVxPhG0f9PNg="; + hash = "sha256-FkOsdOHPE75bSkKw3cdaech6jAv0f/RJ9tgRVzPSAdA="; fetchSubmodules = true; }; @@ -40,5 +40,7 @@ stdenv.mkDerivation rec { ''; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; + # From version 0.15.1: 'endian.h' file not found + broken = stdenv.isDarwin; }; } From 42934bf64fbb887a7bdcef5b0fe810ab18d1b018 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 13 Feb 2024 11:53:23 +0100 Subject: [PATCH 48/49] rl_json: set platforms to tcl platforms --- pkgs/by-name/rl/rl_json/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix index 4feaae71c6b5..0484635d8f3a 100644 --- a/pkgs/by-name/rl/rl_json/package.nix +++ b/pkgs/by-name/rl/rl_json/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { values, and comparable in speed. ''; maintainers = with lib.maintainers; [ fgaz ]; - platforms = lib.platforms.all; + platforms = tcl.meta.platforms; # From version 0.15.1: 'endian.h' file not found broken = stdenv.isDarwin; }; From 45dd476c54d95a26b1c8e8751171f35fc54c3752 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 17 Feb 2024 10:18:42 +0100 Subject: [PATCH 49/49] rl_json: use finalAttrs --- pkgs/by-name/rl/rl_json/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix index 0484635d8f3a..81076dd07677 100644 --- a/pkgs/by-name/rl/rl_json/package.nix +++ b/pkgs/by-name/rl/rl_json/package.nix @@ -5,14 +5,14 @@ , tcl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rl_json"; version = "0.15.1"; src = fetchFromGitHub { owner = "RubyLane"; repo = "rl_json"; - rev = version; + rev = finalAttrs.version; hash = "sha256-FkOsdOHPE75bSkKw3cdaech6jAv0f/RJ9tgRVzPSAdA="; fetchSubmodules = true; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { # From version 0.15.1: 'endian.h' file not found broken = stdenv.isDarwin; }; -} +})