From 44c86d0ef2fde03d477eec88e9d334f39aa89d18 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 3 Apr 2025 11:57:27 +0200 Subject: [PATCH 01/13] icinga2: 2.14.3 -> 2.14.5 --- pkgs/servers/monitoring/icinga2/default.nix | 4 +- .../icinga2/no-var-directories.patch | 42 ++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 403420cb9962..02b382349bc6 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.14.3"; + version = "2.14.5"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - hash = "sha256-QXe/+yQlyyOa78eEiudDni08SCUP3nhTYVpbmVUVKA8="; + hash = "sha256-5FQIcOvuq1GHX80rYuZ3jCM3CF9Fq1149nvlO1njqfA="; }; patches = [ diff --git a/pkgs/servers/monitoring/icinga2/no-var-directories.patch b/pkgs/servers/monitoring/icinga2/no-var-directories.patch index 3a1d48055852..108493a7f831 100644 --- a/pkgs/servers/monitoring/icinga2/no-var-directories.patch +++ b/pkgs/servers/monitoring/icinga2/no-var-directories.patch @@ -1,25 +1,29 @@ diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt -index 87993df..819c87b 100644 +index 1c92d8331..e77199959 100644 --- a/icinga-app/CMakeLists.txt +++ b/icinga-app/CMakeLists.txt -@@ -106,7 +106,3 @@ install( +@@ -94,9 +94,3 @@ install( TARGETS icinga-app RUNTIME DESTINATION ${InstallPath} ) - --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")") --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")") --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")") +-if(NOT WIN32) +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")") +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")") +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")") +-endif() diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt -index 5dda179..22cf69f 100644 +index 986050017..39711c79e 100644 --- a/lib/base/CMakeLists.txt +++ b/lib/base/CMakeLists.txt -@@ -125,7 +125,4 @@ set_target_properties ( +@@ -154,9 +154,4 @@ set_target_properties ( FOLDER Lib ) --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")") --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")") +-if(NOT WIN32) +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")") +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")") +-endif() - set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt @@ -35,22 +39,22 @@ index ab963f7..3d9d506 100644 - set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt -index 65113d2..5e4398f 100644 +index 2271abff6..fc03b5c6b 100644 --- a/lib/remote/CMakeLists.txt +++ b/lib/remote/CMakeLists.txt -@@ -55,12 +55,3 @@ set_target_properties ( +@@ -57,12 +57,3 @@ set_target_properties ( remote PROPERTIES FOLDER Lib ) - --#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")") --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")") --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")") --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")") --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")") --install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")") -- -- +-if(NOT WIN32) +- #install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")") +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")") +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")") +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")") +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")") +- install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")") +-endif() diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt index 1438626..d882ae2 100644 --- a/lib/compat/CMakeLists.txt From 9a1d8f09cfc3245a15bbd2d40c1bafcbe176a789 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Mon, 1 Jul 2024 21:10:03 +0200 Subject: [PATCH 02/13] zfs: add option to use kernel keyring for encryption credentials --- nixos/modules/tasks/filesystems/zfs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index dff0f99bdd29..f8e36eb1646c 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -233,7 +233,7 @@ let tries=3 success=false while [[ $success != true ]] && [[ $tries -gt 0 ]]; do - ${systemd}/bin/systemd-ask-password --timeout=${toString cfgZfs.passwordTimeout} "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \ + ${systemd}/bin/systemd-ask-password ${lib.optionalString cfgZfs.useKeyringForCredentials ("--keyname=zfs-$ds")} --timeout=${toString cfgZfs.passwordTimeout} "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" \ && success=true \ || tries=$((tries - 1)) done @@ -403,6 +403,8 @@ in ''; }; + useKeyringForCredentials = lib.mkEnableOption "Uses the kernel keyring for encryption credentials with keyname=zfs-"; + passwordTimeout = lib.mkOption { type = lib.types.int; default = 0; From 876edfb33785759c94fede408be1891d8e2e2e62 Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Mon, 24 Feb 2025 11:58:24 -0700 Subject: [PATCH 03/13] vscode-extensions.bodil.blueprint-gtk: init at 0.2.0 --- .../bodil.blueprint-gtk/default.nix | 19 +++++++++++++++++++ .../editors/vscode/extensions/default.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/editors/vscode/extensions/bodil.blueprint-gtk/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/bodil.blueprint-gtk/default.nix b/pkgs/applications/editors/vscode/extensions/bodil.blueprint-gtk/default.nix new file mode 100644 index 000000000000..40227103c9b2 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/bodil.blueprint-gtk/default.nix @@ -0,0 +1,19 @@ +{ + lib, + vscode-utils, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "blueprint-gtk"; + publisher = "bodil"; + version = "0.2.0"; + hash = "sha256-A4H/o/HsjQKKee46VZJsjY7EB+1iOm4RWxHKcRLmkEY="; + }; + + meta = { + description = "Gtk Blueprint language support."; + license = lib.licenses.lgpl3; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bodil.blueprint-gtk"; + maintainers = [ lib.maintainers.lyndeno ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e01c1bd7d952..290ee84c877a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -762,6 +762,8 @@ let }; }; + bodil.blueprint-gtk = callPackage ./bodil.blueprint-gtk { }; + bradgashler.htmltagwrap = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "bradgashler"; From 34a88239ca1b4e78bc72e56d4decbbcfced8dacb Mon Sep 17 00:00:00 2001 From: Alice Carroll Date: Wed, 9 Apr 2025 01:36:26 +0300 Subject: [PATCH 04/13] maintainers: caralice -> magistau --- maintainers/maintainer-list.nix | 20 ++++++++++---------- pkgs/by-name/ai/aircrack-ng/package.nix | 2 +- pkgs/by-name/re/revolt-desktop/package.nix | 2 +- pkgs/by-name/sr/srgn/package.nix | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74fec3f9b32a..27c0fa6d552d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3947,16 +3947,6 @@ github = "CaptainJawZ"; githubId = 43111068; }; - caralice = { - name = "Alice Carroll"; - email = "nix@alice-carroll.pet"; - github = "thecaralice"; - githubId = 43097806; - keys = [ - { fingerprint = "C7EA B182 2AB1 246C 0FB8 DD72 0514 0B67 902C D3AF"; } - { fingerprint = "DA77 EDDB 4AF5 244C 665E 9176 A05E A86A 5834 1AA8"; } - ]; - }; CardboardTurkey = { name = "Kiran Ostrolenk"; email = "kiran@ostrolenk.co.uk"; @@ -14514,6 +14504,16 @@ githubId = 1809783; name = "Marco Maggesi"; }; + magistau = { + name = "Mg. Tau"; + email = "nix@alice-carroll.pet"; + github = "magistau"; + githubId = 43097806; + keys = [ + { fingerprint = "C7EA B182 2AB1 246C 0FB8 DD72 0514 0B67 902C D3AF"; } + { fingerprint = "DA77 EDDB 4AF5 244C 665E 9176 A05E A86A 5834 1AA8"; } + ]; + }; magneticflux- = { email = "skaggsm333@gmail.com"; github = "magneticflux-"; diff --git a/pkgs/by-name/ai/aircrack-ng/package.nix b/pkgs/by-name/ai/aircrack-ng/package.nix index fdc2284305e8..b9c42d6cb30b 100644 --- a/pkgs/by-name/ai/aircrack-ng/package.nix +++ b/pkgs/by-name/ai/aircrack-ng/package.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { description = "WiFi security auditing tools suite"; homepage = "https://www.aircrack-ng.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ caralice ]; + maintainers = with lib.maintainers; [ magistau ]; platforms = with lib.platforms; builtins.concatLists [ diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix index 0f7d07d0893b..44bd4a551480 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -19,7 +19,7 @@ license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ heyimnova - caralice + magistau ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index ca6f936051ca..c3d173bd7cb3 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A code surgeon for precise text and code transplantation"; license = licenses.mit; - maintainers = with maintainers; [ caralice ]; + maintainers = with maintainers; [ magistau ]; mainProgram = "srgn"; homepage = "https://github.com/${src.owner}/${src.repo}/"; downloadPage = "https://github.com/${src.owner}/${src.repo}/releases/tag/${src.rev}"; From 439103b95b24ca7c65e543eca7b8aa54336b7025 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 23:38:24 +0000 Subject: [PATCH 05/13] vimPlugins.bitbake-vim: 2.8.8 -> 2.10.4 --- .../editors/vim/plugins/non-generated/bitbake-vim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix index 178e59579256..fc811bb0ff8a 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix @@ -5,13 +5,13 @@ }: vimUtils.buildVimPlugin rec { pname = "bitbake-vim"; - version = "2.8.8"; + version = "2.10.4"; src = fetchFromGitHub { owner = "openembedded"; repo = "bitbake"; tag = version; - hash = "sha256-ShNMTsDL2N2BxwsHetn9rSQdWUBtF/N1EVAbYHXgBSY="; + hash = "sha256-gdxPnRhd4Hj1PWgCU5A/+639ndJXlkdArOBZt6eiZWA="; }; sourceRoot = "source/contrib/vim"; From f84c9b2463517d75dd81efefe42054705012cdf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 23:43:29 +0000 Subject: [PATCH 06/13] dioxionary: 1.1.4 -> 1.2.0 --- pkgs/by-name/di/dioxionary/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/dioxionary/package.nix b/pkgs/by-name/di/dioxionary/package.nix index a4de07a41b84..16fedc05404f 100644 --- a/pkgs/by-name/di/dioxionary/package.nix +++ b/pkgs/by-name/di/dioxionary/package.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "dioxionary"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "vaaandark"; repo = "dioxionary"; tag = "v${finalAttrs.version}"; - hash = "sha256-7Kex5o518L7v5EAhlr4BGoT7LynTe5JmDU8Urn0H3vA="; + hash = "sha256-xIieWhT/a5dZ+UPfsMWtgwru5nkUdzr8/0pOiqCSnqo="; # enable fetchSubmodules since the tests require dictionaries from the submodules fetchSubmodules = true; }; - cargoHash = "sha256-3Cny2OtEoevlUilL0/xtYbyHcuBsFGEFZG6EX35PL+M="; + cargoHash = "sha256-YFx8V86awxVUX83bNLHRP6nIBZGHck/0ywriBgVqvxY="; useFetchCargoVendor = true; nativeBuildInputs = [ From 4b92da53ca82cb09e68d29e9151d41af07f00434 Mon Sep 17 00:00:00 2001 From: Sam W Date: Wed, 9 Apr 2025 01:43:29 +0100 Subject: [PATCH 07/13] sendgmail: init at 0-unstable-2025-03-06 --- pkgs/by-name/se/sendgmail/package.nix | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/se/sendgmail/package.nix diff --git a/pkgs/by-name/se/sendgmail/package.nix b/pkgs/by-name/se/sendgmail/package.nix new file mode 100644 index 000000000000..b735fd70c96c --- /dev/null +++ b/pkgs/by-name/se/sendgmail/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule { + pname = "sendgmail"; + version = "0-unstable-2025-03-06"; + + src = fetchFromGitHub { + owner = "google"; + repo = "gmail-oauth2-tools"; + rev = "85c6b4f07e637683cc5e0ec6a66ce8e4397a4b18"; + hash = "sha256-bzbTU9SA4dJKtQVkqESvV5o3l3MY4Uy7HDqo7jI3dhM="; + }; + + sourceRoot = "source/go/sendgmail"; + + vendorHash = "sha256-0pjcO2Ati+mUSw614uEL3CatHSgbgDUfOBE8bWpjmcw="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Mimic sendmail with Gmail for git send-email"; + homepage = "https://github.com/google/gmail-oauth2-tools/tree/master/go/sendgmail"; + maintainers = [ lib.maintainers.samw ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + }; +} From c38a109ae1f5a3e1706e1cdc65bfbac5167e4d86 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 7 Apr 2025 19:14:54 +0200 Subject: [PATCH 08/13] =?UTF-8?q?webkitgtk=5F6=5F0:=202.48.0=20=E2=86=92?= =?UTF-8?q?=202.48.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/WebKit/WebKit/compare/webkitgtk-2.48.0...webkitgtk-2.48.1 https://webkitgtk.org/2025/04/02/webkitgtk2.48.1-released.html https://webkitgtk.org/security/WSA-2025-0003.html CVE-2024-54551, CVE-2025-24208, CVE-2025-24209, CVE-2025-24213, CVE-2025-24216, CVE-2025-24264, CVE-2025-30427 --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 7efd167223f0..409dc44b6829 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -80,7 +80,7 @@ # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.48.0"; + version = "2.48.1"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${ if lib.versionAtLeast gtk3.version "4.0" then "6.0" @@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-lJBKVc8S1EpONs6tr/8C1G2nPXa+m0dp80y/3w7r+I4="; + hash = "sha256-mO/fIcTNyg/gtzq1qMtSCTtapS2bGwFqk/cdv6HrJY8="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ From 00ed468673ba9c1a8c0ca20f9092059b04419ded Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 02:51:25 +0000 Subject: [PATCH 09/13] python312Packages.firecrawl-py: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/firecrawl-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/firecrawl-py/default.nix b/pkgs/development/python-modules/firecrawl-py/default.nix index cbff62958ad1..73985ce40596 100644 --- a/pkgs/development/python-modules/firecrawl-py/default.nix +++ b/pkgs/development/python-modules/firecrawl-py/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "firecrawl-py"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "mendableai"; repo = "firecrawl"; tag = "v${version}"; - hash = "sha256-xr2curv7Inzav0wGOEfWwKn1XhBg8EIotJbwhXc+aBQ="; + hash = "sha256-Tsw5OMjv/t9lt3seG31958R9o+s/6N7MGzHgqgkHrzQ="; }; sourceRoot = "${src.name}/apps/python-sdk"; From 8db5666df28023bb5fb7e8bd4e3e35bb88e6f5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 9 Apr 2025 06:37:16 +0200 Subject: [PATCH 10/13] nixVersions: update nix-fallback-paths (2.24.14 -> 2.28.1) --- nixos/modules/installer/tools/nix-fallback-paths.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index c94e0fe4699a..9d35d0f4fad8 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/kvqnqgjw3k0xmv3ypzajz3c5wf1pxnbs-nix-2.24.14"; - i686-linux = "/nix/store/292xy9z1vjmy0888bzadmj9fmq1ccapv-nix-2.24.14"; - aarch64-linux = "/nix/store/qsy62z6rk31s8s937nvkcdhn0ds62yax-nix-2.24.14"; - riscv64-linux = "/nix/store/zvrzwzv534zcmhw4ai1hbc4iz229hk3p-nix-riscv64-unknown-linux-gnu-2.24.14"; - x86_64-darwin = "/nix/store/jc7x6906wyy6csgf6br1gbwkw56nxm4l-nix-2.24.14"; - aarch64-darwin = "/nix/store/sfrmn30fijs6qpfi7ckjkv2vdr4z590h-nix-2.24.14"; + x86_64-linux = "/nix/store/ppvbj1hzk77il5wd5g6q5ibyyd4jsnrl-nix-2.28.1"; + i686-linux = "/nix/store/5lb00s5p37715jh8y9nw6ihdjlzrs2bq-nix-2.28.1"; + aarch64-linux = "/nix/store/2zy7z2ablw09s0fj511x6d6za2vswv09-nix-2.28.1"; + riscv64-linux = "/nix/store/m4fw1gfzx7z3lp2pra1x1bajjb5d4fvi-nix-riscv64-unknown-linux-gnu-2.28.1"; + x86_64-darwin = "/nix/store/yi9ysd086218v1k1i16ilkmnkavgrxsi-nix-2.28.1"; + aarch64-darwin = "/nix/store/v4g8bccvg56b8y4r93c6w1f8125qs3cm-nix-2.28.1"; } From 00f81357aac4fbe778861a86bbf9ea945f6db0bb Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Mon, 27 Jan 2025 09:09:31 +0100 Subject: [PATCH 11/13] astal: move source to a separate package It provides general description for all astal packages and r-ryantm will create properly named PRs. --- .../libraries/astal/buildAstalModule.nix | 11 ++----- pkgs/development/libraries/astal/default.nix | 1 + .../libraries/astal/modules/io.nix | 19 +++-------- pkgs/development/libraries/astal/source.nix | 33 +++++++++++++++++++ 4 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/libraries/astal/source.nix diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix index 5ef28e83396b..973334d8f8e1 100644 --- a/pkgs/development/libraries/astal/buildAstalModule.nix +++ b/pkgs/development/libraries/astal/buildAstalModule.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitHub, + source, # this is ./source.nix glib, wrapGAppsHook3, @@ -39,17 +39,12 @@ let cleanArgs args // { pname = "astal-${name}"; - version = "0-unstable-2025-03-21"; + inherit (source) version; __structuredAttrs = true; strictDeps = true; - src = fetchFromGitHub { - owner = "Aylur"; - repo = "astal"; - rev = "dc0e5d37abe9424c53dcbd2506a4886ffee6296e"; - hash = "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q="; - }; + src = source; sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; diff --git a/pkgs/development/libraries/astal/default.nix b/pkgs/development/libraries/astal/default.nix index 9edaebb2a92e..227ceb161438 100644 --- a/pkgs/development/libraries/astal/default.nix +++ b/pkgs/development/libraries/astal/default.nix @@ -1,5 +1,6 @@ { wireplumber }: self: { + source = self.callPackage ./source.nix { }; buildAstalModule = self.callPackage ./buildAstalModule.nix { }; apps = self.callPackage ./modules/apps.nix { }; diff --git a/pkgs/development/libraries/astal/modules/io.nix b/pkgs/development/libraries/astal/modules/io.nix index be3bdf2e164a..f60188d29454 100644 --- a/pkgs/development/libraries/astal/modules/io.nix +++ b/pkgs/development/libraries/astal/modules/io.nix @@ -1,17 +1,6 @@ -{ buildAstalModule, nix-update-script }: -(buildAstalModule { +{ buildAstalModule }: +buildAstalModule { name = "io"; sourceRoot = "lib/astal/io"; - meta = { - description = "Astal core library"; - longDescription = '' - Astal is a collection of building blocks for creating custom desktop shells - ''; - mainProgram = "astal"; - }; -}).overrideAttrs - { - # add an update script only in one place, - # so r-ryantm won't run it multiple times - passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; - } + meta.description = "Astal core library"; +} diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix new file mode 100644 index 000000000000..29fd220716d1 --- /dev/null +++ b/pkgs/development/libraries/astal/source.nix @@ -0,0 +1,33 @@ +{ + lib, + nix-update-script, + fetchFromGitHub, +}: +(fetchFromGitHub { + owner = "Aylur"; + repo = "astal"; + rev = "dc0e5d37abe9424c53dcbd2506a4886ffee6296e"; + hash = "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q="; +}).overrideAttrs + ( + final: prev: { + name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name + pname = "astal-source"; + version = "0-unstable-2025-03-21"; + + meta = prev.meta // { + description = "Building blocks for creating custom desktop shells (source)"; + longDescription = '' + Please don't use this package directly, use one of subpackages in + `astal` namespace. This package is just a `fetchFromGitHub`, which is + reused between all subpackages. + ''; + maintainers = with lib.maintainers; [ perchun ]; + platforms = lib.platforms.linux; + }; + + passthru = prev.passthru // { + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + }; + } + ) From d82a5b3ed0e4fdadcc647861ee41c963ccc16ae8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 02:28:34 +0000 Subject: [PATCH 12/13] vscode-extensions.ms-pyright.pyright: 1.1.398 -> 1.1.399 --- .../editors/vscode/extensions/ms-pyright.pyright/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix index 423e0c23c81f..41a721af1bc3 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-pyright"; name = "pyright"; - version = "1.1.398"; - hash = "sha256-fSBn4c1e1e4atJUV6STmEYB/++WXZFsN2v5+zyfYnZA="; + version = "1.1.399"; + hash = "sha256-dKkx01NVbg0f6+LkZPs1/djqJjOAY/BjROEr4455Shc="; }; meta = { From 8bb328e0dd51ab437f274adb7d046702727fc395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 9 Apr 2025 06:56:10 +0200 Subject: [PATCH 13/13] nixVersions.2_25: drop we haven't backported fixes to this version in a while. --- pkgs/tools/package-management/nix/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6fd7f3e18dbf..1588f248d38b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -176,12 +176,6 @@ lib.makeExtensible ( self_attribute_name = "nix_2_24"; }; - nix_2_25 = commonAutoconf { - version = "2.25.5"; - hash = "sha256-9xrQhrqHCSqWsQveykZvG/ZMu0se66fUQw3xVSg6BpQ="; - self_attribute_name = "nix_2_25"; - }; - nix_2_26 = commonMeson { version = "2.26.3"; hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI="; @@ -243,6 +237,7 @@ lib.makeExtensible ( // { nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_28."; nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28."; + nix_2_25 = throw "nix_2_25 has been removed. use nix_2_28."; unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake."; }