From d09dda8038d75eeb2bb3b24b700c1be5758f86c4 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 03:29:35 +0200 Subject: [PATCH 1/5] sddm-astronaut: refactor - Drop rec - Move local let variables to global let - Inline homepage URL --- pkgs/by-name/sd/sddm-astronaut/package.nix | 44 ++++++++++------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix index 330c0ca4f122..45c69844946b 100644 --- a/pkgs/by-name/sd/sddm-astronaut/package.nix +++ b/pkgs/by-name/sd/sddm-astronaut/package.nix @@ -7,7 +7,12 @@ themeConfig ? null, embeddedTheme ? "astronaut", }: -stdenvNoCC.mkDerivation rec { +let + configFile = (formats.ini { }).generate "" { General = themeConfig; }; + basePath = "$out/share/sddm/themes/sddm-astronaut-theme"; + sedString = "ConfigFile=Themes/"; +in +stdenvNoCC.mkDerivation { pname = "sddm-astronaut"; version = "1.0-unstable-2025-01-05"; @@ -26,34 +31,25 @@ stdenvNoCC.mkDerivation rec { qtvirtualkeyboard ]; - installPhase = - let - iniFormat = formats.ini { }; - configFile = iniFormat.generate "" { General = themeConfig; }; + installPhase = '' + mkdir -p ${basePath} + cp -r $src/* ${basePath} + '' + + lib.optionalString (embeddedTheme != "astronaut") '' - basePath = "$out/share/sddm/themes/sddm-astronaut-theme"; - sedString = "ConfigFile=Themes/"; - in - '' - mkdir -p ${basePath} - cp -r $src/* ${basePath} - '' - + lib.optionalString (embeddedTheme != "astronaut") '' - - # Replaces astronaut.conf with embedded theme in metadata.desktop on line 9. - # ConfigFile=Themes/astronaut.conf. - sed -i "s|^${sedString}.*\\.conf$|${sedString}${embeddedTheme}.conf|" ${basePath}/metadata.desktop - '' - + lib.optionalString (themeConfig != null) '' - chmod u+w ${basePath}/Themes/ - ln -sf ${configFile} ${basePath}/Themes/${embeddedTheme}.conf.user - ''; + # Replaces astronaut.conf with embedded theme in metadata.desktop on line 9. + # ConfigFile=Themes/astronaut.conf. + sed -i "s|^${sedString}.*\\.conf$|${sedString}${embeddedTheme}.conf|" ${basePath}/metadata.desktop + '' + + lib.optionalString (themeConfig != null) '' + chmod u+w ${basePath}/Themes/ + ln -sf ${configFile} ${basePath}/Themes/${embeddedTheme}.conf.user + ''; meta = { description = "Modern looking qt6 sddm theme"; - homepage = "https://github.com/${src.owner}/${src.repo}"; + homepage = "https://github.com/Keyitdev/sddm-astronaut-theme"; license = lib.licenses.gpl3; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ danid3v From 5bc013aed0f64d5513c0b537dd5e9fe67792489f Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 03:29:47 +0200 Subject: [PATCH 2/5] sddm-astronaut: add nix-update-script with version branch --- pkgs/by-name/sd/sddm-astronaut/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix index 45c69844946b..f322551d64c6 100644 --- a/pkgs/by-name/sd/sddm-astronaut/package.nix +++ b/pkgs/by-name/sd/sddm-astronaut/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, kdePackages, formats, + nix-update-script, themeConfig ? null, embeddedTheme ? "astronaut", }: @@ -46,6 +47,8 @@ stdenvNoCC.mkDerivation { ln -sf ${configFile} ${basePath}/Themes/${embeddedTheme}.conf.user ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "Modern looking qt6 sddm theme"; homepage = "https://github.com/Keyitdev/sddm-astronaut-theme"; From 569391490853cb90f4e52f55df7eee9f9ba2d38c Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 03:30:02 +0200 Subject: [PATCH 3/5] sddm-astronaut: 1.0-unstable-2025-01-05 -> 0-unstable-2025-12-06 --- pkgs/by-name/sd/sddm-astronaut/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix index f322551d64c6..e9d40df6b35a 100644 --- a/pkgs/by-name/sd/sddm-astronaut/package.nix +++ b/pkgs/by-name/sd/sddm-astronaut/package.nix @@ -15,13 +15,13 @@ let in stdenvNoCC.mkDerivation { pname = "sddm-astronaut"; - version = "1.0-unstable-2025-01-05"; + version = "0-unstable-2025-12-06"; src = fetchFromGitHub { owner = "Keyitdev"; repo = "sddm-astronaut-theme"; - rev = "11c0bf6147bbea466ce2e2b0559e9a9abdbcc7c3"; - hash = "sha256-gBSz+k/qgEaIWh1Txdgwlou/Lfrfv3ABzyxYwlrLjDk="; + rev = "d73842c761f7d7859f3bdd80e4360f09180fad41"; + hash = "sha256-+94WVxOWfVhIEiVNWwnNBRmN+d1kbZCIF10Gjorea9M="; }; dontWrapQtApps = true; From 0415b16d1f0562b7bfdce74574b29c1b829d07b1 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 03:30:13 +0200 Subject: [PATCH 4/5] sddm-astronaut: add qweered as maintainer --- pkgs/by-name/sd/sddm-astronaut/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix index e9d40df6b35a..47690d708fa5 100644 --- a/pkgs/by-name/sd/sddm-astronaut/package.nix +++ b/pkgs/by-name/sd/sddm-astronaut/package.nix @@ -57,6 +57,7 @@ stdenvNoCC.mkDerivation { maintainers = with lib.maintainers; [ danid3v uxodb + qweered ]; }; } From f05295674ba68ce2ea091b63075ee2f8bc310e57 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 04:01:49 +0200 Subject: [PATCH 5/5] sddm-astronaut: avoid .dev outputs propagation --- pkgs/by-name/sd/sddm-astronaut/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix index 47690d708fa5..ebee2033d09d 100644 --- a/pkgs/by-name/sd/sddm-astronaut/package.nix +++ b/pkgs/by-name/sd/sddm-astronaut/package.nix @@ -27,9 +27,10 @@ stdenvNoCC.mkDerivation { dontWrapQtApps = true; propagatedBuildInputs = with kdePackages; [ - qtsvg - qtmultimedia - qtvirtualkeyboard + # avoid .dev outputs propagation + qtsvg.out + qtmultimedia.out + qtvirtualkeyboard.out ]; installPhase = ''