From df4cbbc521e2a416dadaddeabf251880fe136a5d Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sun, 5 May 2024 12:27:38 +0200 Subject: [PATCH] foomatic-db*: migrate to `pkgs/by-name` overlay --- .../fo/foomatic-db-engine/package.nix} | 0 .../fo/foomatic-db-nonfree/package.nix} | 0 .../default.nix => by-name/fo/foomatic-db-ppds/package.nix} | 0 .../default.nix => by-name/fo/foomatic-db/package.nix} | 0 pkgs/top-level/all-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 5 deletions(-) rename pkgs/{misc/cups/drivers/foomatic-db-engine/default.nix => by-name/fo/foomatic-db-engine/package.nix} (100%) rename pkgs/{misc/cups/drivers/foomatic-db-nonfree/default.nix => by-name/fo/foomatic-db-nonfree/package.nix} (100%) rename pkgs/{misc/cups/drivers/foomatic-db-ppds/default.nix => by-name/fo/foomatic-db-ppds/package.nix} (100%) rename pkgs/{misc/cups/drivers/foomatic-db/default.nix => by-name/fo/foomatic-db/package.nix} (100%) diff --git a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix b/pkgs/by-name/fo/foomatic-db-engine/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/foomatic-db-engine/default.nix rename to pkgs/by-name/fo/foomatic-db-engine/package.nix diff --git a/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix b/pkgs/by-name/fo/foomatic-db-nonfree/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix rename to pkgs/by-name/fo/foomatic-db-nonfree/package.nix diff --git a/pkgs/misc/cups/drivers/foomatic-db-ppds/default.nix b/pkgs/by-name/fo/foomatic-db-ppds/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/foomatic-db-ppds/default.nix rename to pkgs/by-name/fo/foomatic-db-ppds/package.nix diff --git a/pkgs/misc/cups/drivers/foomatic-db/default.nix b/pkgs/by-name/fo/foomatic-db/package.nix similarity index 100% rename from pkgs/misc/cups/drivers/foomatic-db/default.nix rename to pkgs/by-name/fo/foomatic-db/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a50fff35616..6c7aa319ddd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39320,11 +39320,7 @@ with pkgs; epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { }; - foomatic-db = callPackage ../misc/cups/drivers/foomatic-db { }; - foomatic-db-engine = callPackage ../misc/cups/drivers/foomatic-db-engine { }; - foomatic-db-nonfree = callPackage ../misc/cups/drivers/foomatic-db-nonfree { }; - foomatic-db-ppds = callPackage ../misc/cups/drivers/foomatic-db-ppds { }; - foomatic-db-ppds-withNonfreeDb = callPackage ../misc/cups/drivers/foomatic-db-ppds { withNonfreeDb = true; }; + foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; }; gutenprint = callPackage ../misc/drivers/gutenprint { };