From 7914096306b6c4f20ef71b0f23eafb181f4a005a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 17 Jul 2025 16:53:47 -0500 Subject: [PATCH 1/2] hollywood: migrate to by-name --- .../misc => by-name/ho}/hollywood/nixos-paths.patch | 0 .../default.nix => by-name/ho/hollywood/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{applications/misc => by-name/ho}/hollywood/nixos-paths.patch (100%) rename pkgs/{applications/misc/hollywood/default.nix => by-name/ho/hollywood/package.nix} (100%) diff --git a/pkgs/applications/misc/hollywood/nixos-paths.patch b/pkgs/by-name/ho/hollywood/nixos-paths.patch similarity index 100% rename from pkgs/applications/misc/hollywood/nixos-paths.patch rename to pkgs/by-name/ho/hollywood/nixos-paths.patch diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/by-name/ho/hollywood/package.nix similarity index 100% rename from pkgs/applications/misc/hollywood/default.nix rename to pkgs/by-name/ho/hollywood/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8df040634ca..65d3b6d5be7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12508,10 +12508,6 @@ with pkgs; haskellPackages.hledger-web; hledger-utils = with python3.pkgs; toPythonApplication hledger-utils; - hollywood = callPackage ../applications/misc/hollywood { - inherit (python3Packages) pygments; - }; - hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; From 30919bd4e0f273657b8d223086491382648799f6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 17 Jul 2025 16:57:11 -0500 Subject: [PATCH 2/2] hollywood: move definition out of top-level --- pkgs/by-name/ho/hollywood/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ho/hollywood/package.nix b/pkgs/by-name/ho/hollywood/package.nix index 3761121dabd3..c45f76163b3a 100644 --- a/pkgs/by-name/ho/hollywood/package.nix +++ b/pkgs/by-name/ho/hollywood/package.nix @@ -8,7 +8,7 @@ atop, bmon, cmatrix, - pygments, + python3Packages, moreutils, util-linux, jp2a, @@ -57,7 +57,7 @@ stdenv.mkDerivation { atop bmon cmatrix - pygments + python3Packages.pygments moreutils util-linux man