public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-13 00:36:11 +00:00
committed by GitHub
parent b23b455f9a 8a7eadc708
commit 1d62dc37db
90 changed files with 2517 additions and 1444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/cups/drivers/googlecloudprint/default.nix
-64
View File
@@ -1,64 +0,0 @@
{ stdenv, lib, fetchFromGitHub, python2, python2Packages, file, makeWrapper, cups }:
# Setup instructions can be found at https://github.com/simoncadman/CUPS-Cloud-Print#configuration
# So the nix version is something like:
# nix run nixpkgs.cups-googlecloudprint -c sudo setupcloudprint
# nix run nixpkgs.cups-googlecloudprint -c sudo listcloudprinters
let pythonEnv = python2.buildEnv.override {
extraLibs = with python2Packages; [
six
httplib2
pycups
];
};
in stdenv.mkDerivation rec {
pname = "cups-googlecloudprint";
version = "20160502";
src = fetchFromGitHub {
owner = "simoncadman";
repo = "CUPS-Cloud-Print";
rev = version;
sha256 = "0760i12w7jrhq7fsgyz3yqla5cvpjb45n6m2jz96wsy3p3xf6dzz";
};
buildInputs = [ cups makeWrapper ];
cupsgroup = "nonexistantgroup";
NOPERMS = 1;
postConfigure = ''
substituteInPlace Makefile --replace "${cups}" "$out"
'';
postInstall = ''
pushd "$out"
for s in lib/cups/backend/gcp lib/cups/driver/cupscloudprint
do
echo "Wrapping $s..."
wrapProgram "$out/$s" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups"
done
mkdir bin
for s in share/cloudprint-cups/*.py
do
if [ -x "$s" ] # Only wrapping those Python scripts marked as executable
then
o="bin/$(echo $s | sed 's,share/cloudprint-cups/\(.*\).py,\1,')"
echo "Wrapping $o -> $s..."
makeWrapper "$out/$s" "$o" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups"
fi
done
popd
'';
meta = with lib; {
description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print";
homepage = "http://ccp.niftiestsoftware.com";
platforms = platforms.linux;
license = licenses.gpl3;
};
}
pkgs/misc/drivers/epson-escpr2/default.nix
+4 -4
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
version = "1.1.24";
version = "1.1.25";
src = fetchurl {
# To find new versions, visit
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
"https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
"https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm"
"https://web.archive.org/web/20210212220538if_/https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm"
];
sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co=";
sha256 = "sha256-8hgafO/1qOTVdfAdx7FpOOSLqfTl0sBFunuN/2q7KHw=";
};
patches = [ ./cups-filter-ppd-dirs.patch ];