From 7acfdc40e1d9e9c9c7feb50e125849b3b75bddd8 Mon Sep 17 00:00:00 2001 From: Artur Taranchiev Date: Sun, 27 Dec 2020 00:21:45 +0300 Subject: [PATCH 1/2] maintainers: add ewok --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 856d2280efe3..1482e8be6069 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2863,6 +2863,12 @@ githubId = 30512529; name = "Evils"; }; + ewok = { + email = "ewok@ewok.ru"; + github = "ewok"; + githubId = 454695; + name = "Artur Taranchiev"; + }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; From 795ecae08649129be7afd4690b158e44558622a1 Mon Sep 17 00:00:00 2001 From: Artur Taranchiev Date: Sun, 27 Dec 2020 00:22:14 +0300 Subject: [PATCH 2/2] carps-cups: init at unstable-2018-03-05 --- pkgs/misc/cups/drivers/carps-cups/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/misc/cups/drivers/carps-cups/default.nix diff --git a/pkgs/misc/cups/drivers/carps-cups/default.nix b/pkgs/misc/cups/drivers/carps-cups/default.nix new file mode 100644 index 000000000000..32e92da16084 --- /dev/null +++ b/pkgs/misc/cups/drivers/carps-cups/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, cups +}: + +stdenv.mkDerivation { + pname = "carps-cups"; + version = "unstable-2018-03-05"; + + src = fetchFromGitHub { + owner = "ondrej-zary"; + repo = "carps-cups"; + rev = "18d80d1d6f473dd9132e4b6d8b5c592c74982f17"; + sha256 = "0mjj9hs5lqxi0qamgb4sxfz4fvf7ggi66bxd37bkz3fl0g9xff70"; + }; + + preBuild = '' + export CUPS_DATADIR="${cups}/share/cups" + ''; + + installPhase = '' + CUPSDIR="$out/lib/cups" + CUPSDATADIR="$out/share/cups" + + mkdir -p "$CUPSDIR/filter" "$CUPSDATADIR/drv" "$CUPSDATADIR/usb" + + install -s rastertocarps $CUPSDIR/filter + install -m 644 carps.drv $CUPSDATADIR/drv/ + install -m 644 carps.usb-quirks $CUPSDATADIR/usb/ + ''; + + buildInputs = [ cups ]; + + meta = with lib; { + description = "CUPS Linux drivers for Canon printers"; + homepage = "https://www.canon.com/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + ewok + ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b8b051d19a7..4e1d83a184d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27609,6 +27609,8 @@ in gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; + carps-cups = callPackage ../misc/cups/drivers/carps-cups { }; + cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { };