From b1646aaa7cce7d56d92afbd3070cf4db944c1b1c Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Wed, 23 Jul 2025 15:42:44 +0000 Subject: [PATCH 1/3] scsh: fix looking correct scheme version --- pkgs/by-name/sc/scsh/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sc/scsh/package.nix b/pkgs/by-name/sc/scsh/package.nix index 7199980aa06a..6d4c81da43be 100644 --- a/pkgs/by-name/sc/scsh/package.nix +++ b/pkgs/by-name/sc/scsh/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ scheme48 ]; configureFlags = [ "--with-scheme48=${scheme48}" ]; + makeFlags = [ + "SCHEME48VERSION=${scheme48.version}" + ]; passthru.updateScript = unstableGitUpdater { }; From 4c068743a798096674e81c4b10147c3ce2750526 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sun, 20 Jul 2025 14:42:19 +0000 Subject: [PATCH 2/3] deco: unstable-2019-04-03 -> unstable-2025-07-07 --- pkgs/by-name/de/deco/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/de/deco/package.nix b/pkgs/by-name/de/deco/package.nix index d23229c09197..7937cf361de8 100644 --- a/pkgs/by-name/de/deco/package.nix +++ b/pkgs/by-name/de/deco/package.nix @@ -5,17 +5,18 @@ scsh, feh, xorg, + xdg-user-dirs, }: stdenv.mkDerivation { pname = "deco"; - version = "unstable-2019-04-03"; + version = "0-unstable-2025-07-07"; src = fetchFromGitHub { - owner = "ebzzry"; + owner = "vedatechnologiesinc"; repo = "deco"; - rev = "dd8ec7905bc85d085eb2ee3bddabea451054288c"; - sha256 = "sha256-/3GeNvWOCRPOYTUbodXDUxR5QVDEyx6x2Jt5PxsPdvk="; + rev = "2fd28241ed28c07b9d641061d4e1bf3cacfcc7a0"; + sha256 = "sha256-kjXEvgYO1p/dX9nXQ3HHcXmJdtxDM6xzKqDQu3yM4Tw="; }; installPhase = '' @@ -28,10 +29,11 @@ stdenv.mkDerivation { substituteInPlace $out/bin/deco --replace "/usr/bin/env scsh" "${scsh}/bin/scsh" substituteInPlace $out/bin/deco --replace "feh" "${feh}/bin/feh" substituteInPlace $out/bin/deco --replace "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo" + substituteInPlace $out/bin/deco --replace "xdg-user-dir" "${xdg-user-dirs}/bin/xdg-user-dir" ''; meta = with lib; { - homepage = "https://github.com/ebzzry/deco"; + homepage = "https://github.com/vedatechnologiesinc/deco"; description = "Simple root image setter"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; From 14b42392542fc7ef01341423d73c600b0bd31970 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sun, 20 Jul 2025 14:49:18 +0000 Subject: [PATCH 3/3] deco: cleanup - remove with lib --- pkgs/by-name/de/deco/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/de/deco/package.nix b/pkgs/by-name/de/deco/package.nix index 7937cf361de8..c6fbf6b5a1c7 100644 --- a/pkgs/by-name/de/deco/package.nix +++ b/pkgs/by-name/de/deco/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "vedatechnologiesinc"; repo = "deco"; rev = "2fd28241ed28c07b9d641061d4e1bf3cacfcc7a0"; - sha256 = "sha256-kjXEvgYO1p/dX9nXQ3HHcXmJdtxDM6xzKqDQu3yM4Tw="; + hash = "sha256-kjXEvgYO1p/dX9nXQ3HHcXmJdtxDM6xzKqDQu3yM4Tw="; }; installPhase = '' @@ -26,18 +26,18 @@ stdenv.mkDerivation { ''; postFixup = '' - substituteInPlace $out/bin/deco --replace "/usr/bin/env scsh" "${scsh}/bin/scsh" - substituteInPlace $out/bin/deco --replace "feh" "${feh}/bin/feh" - substituteInPlace $out/bin/deco --replace "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo" - substituteInPlace $out/bin/deco --replace "xdg-user-dir" "${xdg-user-dirs}/bin/xdg-user-dir" + substituteInPlace $out/bin/deco --replace-fail "/usr/bin/env scsh" "${scsh}/bin/scsh" + substituteInPlace $out/bin/deco --replace-fail "feh" "${feh}/bin/feh" + substituteInPlace $out/bin/deco --replace-fail "xdpyinfo" "${xorg.xdpyinfo}/bin/xdpyinfo" + substituteInPlace $out/bin/deco --replace-fail "xdg-user-dir" "${xdg-user-dirs}/bin/xdg-user-dir" ''; - meta = with lib; { + meta = { homepage = "https://github.com/vedatechnologiesinc/deco"; description = "Simple root image setter"; - license = licenses.mit; - maintainers = [ maintainers.ebzzry ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ebzzry ]; + platforms = lib.platforms.unix; mainProgram = "deco"; };