Merge pull request #309334 from Yarny0/foomatic-db-update

5 files changed, 10 insertions, 14 deletions

diff --git a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix b/pkgs/by-name/fo/foomatic-db-engine/package.nix
index 5408f7eff38e5..5408f7eff38e5 100644
--- a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix
+++ b/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
index a9ce7228f45f1..a433b58a0ac92 100644
--- a/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix
+++ b/pkgs/by-name/fo/foomatic-db-nonfree/package.nix
@@ -6,7 +6,7 @@
 , perl
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "foomatic-db-nonfree";
   version = "unstable-2015-06-05";
 
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    changelog = "https://github.com/OpenPrinting/foomatic-db-nonfree/blob/${src.rev}/ChangeLog";
+    changelog = "https://github.com/OpenPrinting/foomatic-db-nonfree/blob/${finalAttrs.src.rev}/ChangeLog";
     description = "OpenPrinting printer support database (unfree content)";
     downloadPage = "https://www.openprinting.org/download/foomatic/";
     homepage = "https://openprinting.github.io/projects/02-foomatic/";
@@ -84,4 +84,4 @@ stdenv.mkDerivation rec {
       Dell, Genicom, Lexmark, Oce and Xerox.
     '';
   };
-}
+})
diff --git a/pkgs/misc/cups/drivers/foomatic-db-ppds/default.nix b/pkgs/by-name/fo/foomatic-db-ppds/package.nix
index bdc1e0a9b5feb..bdc1e0a9b5feb 100644
--- a/pkgs/misc/cups/drivers/foomatic-db-ppds/default.nix
+++ b/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
index b4be3a1436047..494216228a063 100644
--- a/pkgs/misc/cups/drivers/foomatic-db/default.nix
+++ b/pkgs/by-name/fo/foomatic-db/package.nix
@@ -11,17 +11,17 @@
 , patchPpdFilesHook
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "foomatic-db";
-  version = "unstable-2024-02-09";
+  version = "unstable-2024-05-04";
 
   src = fetchFromGitHub {
     # there is also a daily snapshot at the `downloadPage`,
     # but it gets deleted quickly and would provoke 404 errors
     owner = "OpenPrinting";
     repo = "foomatic-db";
-    rev = "f8b43644771612f854fecda969440511de784bf0";
-    hash = "sha256-8Pui83Z7g5aHBJk46AYeKil/0++I6zcc5S/BWRuy1WM=";
+    rev = "eaad4c0d2406d4cd38a6d15e5dc93d1bc8358c30";
+    hash = "sha256-A+Op1E16woNl/ppVj0QfdV4XgT1M8sbrpTXtdOz3PYk=";
   };
 
   buildInputs = [ cups cups-filters ghostscript gnused perl ];
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    changelog = "https://github.com/OpenPrinting/foomatic-db/blob/${src.rev}/ChangeLog";
+    changelog = "https://github.com/OpenPrinting/foomatic-db/blob/${finalAttrs.src.rev}/ChangeLog";
     description = "OpenPrinting printer support database (free content)";
     downloadPage = "https://www.openprinting.org/download/foomatic/";
     homepage = "https://openprinting.github.io/projects/02-foomatic/";
@@ -100,4 +100,4 @@ stdenv.mkDerivation rec {
       Oce, Oki, Ricoh, Samsung, Savin, Sharp, Toshiba and Utax.
     '';
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62741829d720a..d84b568db6d21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39131,11 +39131,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 { };