From 3f90cde7195de363f79a22ed68808749f3f8ad61 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 6 Nov 2021 14:50:02 -0700 Subject: [PATCH 01/83] llvmPackages_7.libcxxabi: fix build with gcc Unblocks 17 dependers on aarch64-linux --- pkgs/development/compilers/llvm/7/libcxxabi/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix index 1663b8c7291d..0bb76f916285 100644 --- a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version +, fetchpatch , standalone ? stdenv.hostPlatform.useLLVM or false , withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm # on musl the shared objects don't build @@ -21,6 +22,13 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} + '' + lib.optionalString (!stdenv.cc.isClang) '' + pushd libcxx-* + patch -p2 < ${fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/76ccec07b4fa0cc68dfd07d557e7fb661804a468.patch"; + sha256 = "1lgzkfkp7qinfc6gd8x5di1iq1gqdv81249c6f02chn9q122sbq1"; + }} + popd ''; patches = [ From 7f55e03a3eafc379742ab4ccf064eb6ddc360b18 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 8 Nov 2021 10:44:15 +0100 Subject: [PATCH 02/83] openrct2: 0.3.4.1 -> 0.3.5 Next to the version bump, some hints for maintainers to select the right version of the other modules were added. --- pkgs/games/openrct2/default.nix | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index cafa51c8342f..ade022cefe9d 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,32 +5,37 @@ }: let - version = "0.3.4.1"; + openrct2-version = "0.3.5"; + + # Those versions MUST match the pinned versions within the CMakeLists.txt + # file. The REPLAYS repository from the CMakeLists.txt is not necessary. + objects-version = "1.0.21"; + title-sequences-version = "0.1.2c"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; - rev = "v${version}"; - sha256 = "0zjqn47pbgd2nrrbdl3lqk1mcdvwvvpjby2g0gfv6ssfw72fji7d"; + rev = "v${openrct2-version}"; + sha256 = "0xmj0qs49d1xlc8lbspr1vg66i0jdjlhcfxci72x6knjvd0vcgz0"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.21"; + rev = "v${objects-version}"; sha256 = "0r2vp2y67jc1mpfl4j83sx5khvvaddx7xs26ppkigmr2d1xpxgr7"; }; title-sequences-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "title-sequences"; - rev = "v0.1.2c"; + rev = "v${title-sequences-version}"; sha256 = "1qdrm4q75bznmgdrpjdaiqvbf3q4vwbkkmls45izxvyg1djrpsdf"; }; in stdenv.mkDerivation { pname = "openrct2"; - inherit version; + version = openrct2-version; src = openrct2-src; @@ -68,6 +73,15 @@ stdenv.mkDerivation { cp -r ${title-sequences-src} $sourceRoot/data/sequence ''; + preConfigure = '' + # Verify that the correct version of the third party repositories is used. + + grep -q '^set(OBJECTS_VERSION "${objects-version}")$' CMakeLists.txt \ + || (echo "OBJECTS_VERSION differs!"; exit 1) + grep -q '^set(TITLE_SEQUENCE_VERSION "${title-sequences-version}")$' CMakeLists.txt \ + || (echo "TITLE_SEQUENCE_VERSION differs!"; exit 1) + ''; + preFixup = "ln -s $out/share/openrct2 $out/bin/data"; meta = with lib; { From e22ee9bf77ae289ce2b75018a754e0b31d0a1905 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 10 Nov 2021 15:40:38 -0300 Subject: [PATCH 03/83] plymouth: unstable-2020-12-07 -> unstable-2021-10-18 --- pkgs/os-specific/linux/plymouth/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 8cb2a00987e1..62950b085258 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -15,8 +15,8 @@ }: stdenv.mkDerivation rec { - pname = "plymouth-unstable"; - version = "2020-12-07"; + pname = "plymouth"; + version = "unstable-2021-10-18"; outputs = [ "out" @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "plymouth"; repo = "plymouth"; - rev = "c4ced2a2d70edea7fbb95274aa1d01d95928df1b"; - sha256 = "7CPuKMA0fTt8DBsaA4Td74kHT/O7PW8N3awP04nUnOI="; + rev = "18363cd887dbfe7e82a2f4cc1a49ef9513919142"; + sha256 = "sha256-+AP4ALOFdYFt/8MDXjMaHptkogCwK1iXKuza1zfMaws="; }; nativeBuildInputs = [ @@ -47,15 +47,6 @@ stdenv.mkDerivation rec { systemd ]; - patches = [ - # KillMode=none is deprecated - # https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/123 - (fetchpatch { - url = "https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/b406b0895a95949db2adfedaeda451f36f2b51c3.patch"; - sha256 = "/UBImNuFO0G/oxlttjGIXon8YXMXlc9XU8uVuR9QuxY="; - }) - ]; - postPatch = '' sed -i \ -e "s#plymouthplugindir=.*#plymouthplugindir=/etc/plymouth/plugins/#" \ From 3c5ffd288e80020a781ff1101dc223488ef46e88 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 19 Oct 2021 00:59:16 +0300 Subject: [PATCH 04/83] python3Packages.mujson: init at 1.4 --- .../python-modules/mujson/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/mujson/default.nix diff --git a/pkgs/development/python-modules/mujson/default.nix b/pkgs/development/python-modules/mujson/default.nix new file mode 100644 index 000000000000..55c028fc90cb --- /dev/null +++ b/pkgs/development/python-modules/mujson/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mujson"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-J9nPGxDkLQje6AkL9cewNqmQ7Z+00TXBEr3p71E2cnE="; + }; + + # LICENSE file missing from src + # https://github.com/mattgiles/mujson/issues/8 + postPatch = '' + substituteInPlace setup.cfg \ + --replace "license_file = LICENSE" "" + ''; + + # No tests + doCheck = false; + + meta = with lib; { + description = "Use the fastest JSON functions available at import time"; + homepage = "https://github.com/mattgiles/mujson"; + license = licenses.mit; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee1258aa64a1..03be94888531 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4942,6 +4942,8 @@ in { mutf8 = callPackage ../development/python-modules/mutf8 { }; + mujson = callPackage ../development/python-modules/mujson { }; + mwclient = callPackage ../development/python-modules/mwclient { }; mwdblib = callPackage ../development/python-modules/mwdblib { }; From 4f163ad3079533ba50ea1d7689369666d3f016f0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 19 Oct 2021 01:19:34 +0300 Subject: [PATCH 05/83] python3Packages.falcon: enable more tests --- .../python-modules/falcon/default.nix | 30 +++++++++++++++---- .../python-modules/mujson/default.nix | 1 + 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index a42da353fc68..5dba22d83912 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -1,17 +1,28 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder +, fetchPypi +, pytestCheckHook , aiofiles , cbor2 +, ddt +, gunicorn , httpx +, hypercorn +, jsonschema , msgpack +, mujson +, nose +, orjson , pecan , pytest-asyncio -, pytestCheckHook +, python-mimeparse , pyyaml +, rapidjson , requests , testtools +, ujson +, uvicorn , websockets }: @@ -29,24 +40,31 @@ buildPythonPackage rec { checkInputs = [ aiofiles cbor2 + ddt + gunicorn httpx + hypercorn + jsonschema msgpack + mujson + nose + orjson pecan pytest-asyncio pytestCheckHook + python-mimeparse pyyaml + rapidjson requests testtools + ujson + uvicorn websockets ]; disabledTestPaths = [ # missing optional nuts package "falcon/bench/nuts/nuts/tests/test_functional.py" - # missing optional mujson package - "tests/test_media_handlers.py" - # tries to run uvicorn binary and doesn't find it - "tests/asgi/test_asgi_servers.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mujson/default.nix b/pkgs/development/python-modules/mujson/default.nix index 55c028fc90cb..10f0e40b7626 100644 --- a/pkgs/development/python-modules/mujson/default.nix +++ b/pkgs/development/python-modules/mujson/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { # No tests doCheck = false; + pythonImportsCheck = [ "mujson" ]; meta = with lib; { description = "Use the fastest JSON functions available at import time"; From 413e2f0070c139c36e0d6d169b4c35b78148db2b Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 1 Nov 2021 13:01:51 +0200 Subject: [PATCH 06/83] python3Packages.postorius: 1.3.5 -> 1.3.6 --- pkgs/servers/mail/mailman/postorius.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 57df52d0a0a6..4022b6fe91c9 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "postorius"; # Note: Mailman core must be on the latest version before upgrading Postorious. # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "0f23c6542bf0f6e6364d678c094ee5804acfe59ecbcc0e944bc4c13834e24e80"; + sha256 = "sha256-KwzEU9IfcQ6YPZu3jPuFrd6ux/3e2pzoLfTrak/aGmg="; }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; From 5f8d34ad31289e31746d0e9d39705cb993f253cb Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 1 Nov 2021 13:02:18 +0200 Subject: [PATCH 07/83] mailman-web: unstable-2021-04-10 -> 0.0.5 --- pkgs/servers/mail/mailman/web.nix | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 10adb49be84f..c517cb3e4e30 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,24 +1,18 @@ -{ buildPythonPackage, lib, fetchgit, isPy3k -, git, makeWrapper, sassc, hyperkitty, postorius, whoosh, setuptools-scm +{ buildPythonPackage, lib, fetchPypi, pythonOlder +, sassc, hyperkitty, postorius, whoosh, setuptools-scm }: buildPythonPackage rec { pname = "mailman-web"; - version = "unstable-2021-04-10"; - disabled = !isPy3k; + version = "0.0.5"; + disabled = pythonOlder "3.8"; - src = fetchgit { - url = "https://gitlab.com/mailman/mailman-web"; - rev = "19a7abe27dd3bc39c0250440de073f0adecd4da1"; - sha256 = "0h25140n2jaisl0ri5x7gdmbypiys8vlq8dql1zmaxvq459ybxkn"; - leaveDotGit = true; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-9pvs/VATAsMcGNrj58b/LifysEPTNhrAP57sfp4nX6Q="; }; postPatch = '' - # This is just so people installing from pip also get uwsgi - # installed, AFAICT. - sed -i '/^ uwsgi$/d' setup.cfg - # Django is depended on transitively by hyperkitty and postorius, # and mailman_web has overly restrictive version bounds on it, so # let's remove it. @@ -32,16 +26,15 @@ buildPythonPackage rec { --replace /opt/mailman/web /var/lib/mailman-web ''; - nativeBuildInputs = [ git makeWrapper setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ hyperkitty postorius whoosh ]; # Tries to check runtime configuration. doCheck = false; - postInstall = '' - wrapProgram $out/bin/mailman-web \ - --suffix PATH : ${lib.makeBinPath [ sassc ]} - ''; + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ sassc ]}" + ]; meta = with lib; { description = "Django project for Mailman 3 web interface"; From 92b9bd4eb65e2205a13d74108c80b73f9736430d Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 31 Oct 2021 14:16:40 +0200 Subject: [PATCH 08/83] python3Packages.hyperkitty: 1.3.4 -> 1.3.5 --- pkgs/servers/mail/mailman/hyperkitty.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index d0d7cbc7fbb6..4d4f714e7487 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage -, fetchFromGitLab -, isPy3k +, fetchPypi +, pythonOlder # dependencies , defusedxml @@ -32,18 +32,12 @@ buildPythonPackage rec { pname = "HyperKitty"; # Note: Mailman core must be on the latest version before upgrading HyperKitty. # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 - # - # Update to next stable version > 1.3.4 that has fixed tests, see - # https://gitlab.com/mailman/django-mailman3/-/issues/48 version = "1.3.5"; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; - src = fetchFromGitLab { - domain = "gitlab.com"; - owner = "mailman"; - repo = "hyperkitty"; - rev = version; - sha256 = "0v70r0r6w0q56hk2hw1qp3ci0bwd9x8inf4gai6ybjqjfskqrxi4"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y="; }; postPatch = '' From 0235f41adf64a74d25295c779cfe0d8f84e83a66 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 9 Nov 2021 19:16:12 +0200 Subject: [PATCH 09/83] python3Packages.mailman-hyperkitty: 1.1.0 -> 1.2.0 --- .../development/python-modules/mailman-hyperkitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 649d8d4cf3df..117ec4fb4361 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mailman-hyperkitty"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx"; + sha256 = "sha256-EQBx1KX3z/Wv3QAHOi+s/ihLOjpiupIQBYyE6IPbJto="; }; propagatedBuildInputs = [ From a997abfb2843fee283c0976c69ad93a0af509787 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 13 Nov 2021 02:01:19 +0200 Subject: [PATCH 10/83] mailman: formatting --- pkgs/servers/mail/mailman/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 557a9d54c149..8cd087f4174f 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,10 +1,10 @@ -{ lib, python3, fetchPypi, fetchpatch, pythonOlder, postfix, lynx +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, python3, postfix, lynx }: let - py = python3.override { + # Mailman does not support sqlalchemy >= 1.4 https://gitlab.com/mailman/mailman/-/issues/845 + pythonOverride = python3.override { packageOverrides = self: super: { - # https://gitlab.com/mailman/mailman/-/issues/845 sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; src = oldAttrs.src.override { @@ -14,11 +14,8 @@ let }); }; }; - in -with py.pkgs; - buildPythonPackage rec { pname = "mailman"; version = "3.3.5"; @@ -29,7 +26,7 @@ buildPythonPackage rec { sha256 = "12mgxs1ndhdjjkydx48b95na9k9h0disfqgrr6wxx7vda6dqvcwz"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with pythonOverride.pkgs; [ aiosmtpd alembic authheaders From 39a0639b70ef924c11ac00be0337a69516807ac5 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sun, 14 Nov 2021 17:28:41 +0000 Subject: [PATCH 11/83] qgis: 3.6.10 -> 3.6.13 --- pkgs/applications/gis/qgis/unwrapped.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 70b5ffcc707c..4f62ccecbaf5 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , ninja , flex @@ -57,23 +56,16 @@ let six ]; in mkDerivation rec { - version = "3.16.10"; + version = "3.16.13"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30="; + sha256 = "13irzs89lknfxf2y7j931bh0zmqgiwifdbbzvwn8yxxr21gd68ac"; }; - patches = [ - (fetchpatch { - url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch"; - sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy"; - }) - ]; - passthru = { inherit pythonBuildInputs; inherit python3Packages; From 845089ab0ff1ce5e1a9bed5e91a0bccbe74c5f5f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 14 Nov 2021 22:30:11 +0000 Subject: [PATCH 12/83] cxxtools: fix build on aarch64 fix gleaned from opensuse package --- pkgs/development/libraries/cxxtools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 0d8d2498ae73..50417dab1feb 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; }; + configureFlags = lib.optional stdenv.isAarch64 "--with-atomictype=pthread"; + enableParallelBuilding = true; meta = { From 04d9dbddd430b169222213c20a27a81420cc4ff1 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sun, 14 Nov 2021 22:03:29 -0500 Subject: [PATCH 13/83] matrix-facebook: 0.3.1 -> 0.3.2 --- pkgs/servers/mautrix-facebook/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index b9e86f01fbdb..d45ac1225a0d 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-facebook"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "facebook"; rev = "v${version}"; - sha256 = "0m7nznx3z6cg4wgvjybdivx22ifxcdri4i8501yibsri0jnpf0y2"; + sha256 = "1n7gshm2nir6vgjkj36lq9m2bclkgy0y236xi8zvdlvfcb2m596f"; }; propagatedBuildInputs = with python3.pkgs; [ @@ -34,10 +34,6 @@ python3.pkgs.buildPythonPackage rec { doCheck = false; - postPatch = '' - sed -ie 's/^asyncpg.*/asyncpg>=0.20/' requirements.txt - ''; - postInstall = '' mkdir -p $out/bin From 0f7756d322f624829c7b462099b458bb07b0df3f Mon Sep 17 00:00:00 2001 From: gbtb Date: Mon, 15 Nov 2021 22:25:35 +1000 Subject: [PATCH 14/83] rocketchat-desktop: added wrapGAppsHook --- .../instant-messengers/rocketchat-desktop/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 36e7a651eb3e..4cf99c8f4aac 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, fetchurl }: +{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook }: let libPathNative = { packages }: lib.makeLibraryPath packages; in @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1ri8a60fsbqgq83f8wkyfnd59nqk4d0gpz1vanj54769zflpl71s"; }; + nativeBuildInputs = [ + wrapGAppsHook #to fully work with gnome also needs programs.dconf.enable = true in your configuration.nix + ]; buildInputs = with pkgs; [ gtk3 stdenv.cc.cc From 9951e81c004fd0f27c2740de5de39151715a7dc4 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 16 Nov 2021 14:45:31 +0100 Subject: [PATCH 15/83] prisma: 3.4.0 -> 3.5.0 --- pkgs/development/node-packages/default.nix | 8 ++++---- .../development/tools/database/prisma-engines/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index ea5ab3eadae8..1702c3468610 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -304,18 +304,18 @@ let prisma = super.prisma.override rec { nativeBuildInputs = [ pkgs.makeWrapper ]; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-W0AFjVxPOLW5SEnf0ZwbOu4k8ElX98ioFC1E8Gb9Q/nuO2brEwxFJebXglfG+N6zphGbu2bG1I3VAu7aYzR3VA=="; + sha512 = "sha512-WEYQ+H98O0yigG+lI0gfh4iyBChvnM6QTXPDtY9eFraLXAmyb6tf/T2mUdrUAU1AEvHLVzQA5A+RpONZlQozBg=="; }; dependencies = [ rec { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.4.0-27.1c9fdaa9e2319b814822d6dbfd0a69e1fcc13a85"; + version = "3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e"; src = fetchurl { url = "https://registry.npmjs.org/@prisma/engines/-/engines-${version}.tgz"; - sha512 = "sha512-jyCjXhX1ZUbzA7+6Hm0iEdeY+qFfpD/RB7iSwMrMoIhkVYvnncSdCLBgbK0yqxTJR2nglevkDY2ve3QDxFciMA=="; + sha512 = "sha512-MqZUrxuLlIbjB3wu8LrRJOKcvR4k3dunKoI4Q2bPfAwLQY0XlpsLZ3TRVW1c32ooVk939p6iGNkaCUo63Et36g=="; }; }]; postInstall = with pkgs; '' diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 91681a5a9a0b..b05b0c2e47f1 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-EuGGGTHBXm6crnoh5h0DYZZHUtzY4W0wlNgMAxbEb5w="; + sha256 = "sha256-c4t7r9Os0nmQEBpNeZ+XdTPc/5X6Dyw0dd7J4pw5s88="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-CwNe4Qsswh+jMFMpg7DEM9Hq2YeEMcN4UTFMd8AEekw="; + cargoSha256 = "sha256-rjqFEY7GXXWzlw5E6Wg4KPz25BbvQPuLW5m8+3CbcRw="; nativeBuildInputs = [ pkg-config ]; From 98f26c237d23e9ba34524918bb9a25ec93c34ce4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 09:31:27 +0100 Subject: [PATCH 16/83] python3Packages.justbackoff: init at 0.6.0 --- .../python-modules/justbackoff/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/justbackoff/default.nix diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix new file mode 100644 index 000000000000..814d1d3e53f3 --- /dev/null +++ b/pkgs/development/python-modules/justbackoff/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "justbackoff"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "alexferl"; + repo = pname; + rev = "v${version}"; + sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=5.2" "" + ''; + + pythonImportsCheck = [ + "justbackoff" + ]; + + meta = with lib; { + description = "Simple backoff algorithm in Python"; + homepage = "https://github.com/alexferl/justbackoff"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7b7e9017fac..7e956f79d55f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4093,6 +4093,8 @@ in { jupytext = callPackage ../development/python-modules/jupytext { }; + justbackoff = callPackage ../development/python-modules/justbackoff { }; + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; jxmlease = callPackage ../development/python-modules/jxmlease { }; From 9d830c1496e8700c895db56120b39e83d68bbc4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 09:40:09 +0100 Subject: [PATCH 17/83] python3Packages.nessclient: init at 0.9.16b2 --- .../python-modules/nessclient/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/nessclient/default.nix diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix new file mode 100644 index 000000000000..c21ef192bec9 --- /dev/null +++ b/pkgs/development/python-modules/nessclient/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, justbackoff +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nessclient"; + version = "0.9.16b2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nickw444"; + repo = pname; + rev = version; + sha256 = "1g3q9bv1nn1b8n6bklc05k8pac4cndzfxfr7liky0gnnbri15k81"; + }; + + propagatedBuildInputs = [ + justbackoff + click + ]; + + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ + "nessclient" + ]; + + meta = with lib; { + description = "Python implementation/abstraction of the Ness D8x / D16x Serial Interface ASCII protocol"; + homepage = "https://github.com/nickw444/nessclient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e956f79d55f..ca1ac9120b36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5054,6 +5054,8 @@ in { neo = callPackage ../development/python-modules/neo { }; + nessclient = callPackage ../development/python-modules/nessclient { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; nestedtext = callPackage ../development/python-modules/nestedtext { }; From ed52654c891d351fb7766a4b40c14d472b9c4a8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 09:43:32 +0100 Subject: [PATCH 18/83] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 37b078adefa1..b856c3fb098d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -559,7 +559,7 @@ "nanoleaf" = ps: with ps; [ aionanoleaf ]; "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; "nederlandse_spoorwegen" = ps: with ps; [ nsapi ]; - "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient + "ness_alarm" = ps: with ps; [ nessclient ]; "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ netdata ]; From 111b9e563033bd8a83ebe1d16d7cca512f9eaa94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 09:44:23 +0100 Subject: [PATCH 19/83] home-assistant: enable ness_alarm tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 59d2ee364b23..2a21f5d4ceca 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -535,6 +535,7 @@ in with py.pkgs; buildPythonApplication rec { "nam" "namecheapdns" "neato" + "ness_alarm" "netatmo" "nexia" "no_ip" From 2411e72fa4e0d7ce78bdb6dd14b2beb2a4b96013 Mon Sep 17 00:00:00 2001 From: gbtb Date: Wed, 17 Nov 2021 22:29:43 +1000 Subject: [PATCH 20/83] rocketchat-desktop: 3.5.7 -> 3.6.0 --- .../instant-messengers/rocketchat-desktop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 4cf99c8f4aac..73886d1cc52a 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,16 +4,17 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.5.7"; + version = "3.6.0"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; - sha256 = "1ri8a60fsbqgq83f8wkyfnd59nqk4d0gpz1vanj54769zflpl71s"; + sha256 = "1691mzg52hkvkzm4pvmjyc3n04ppxk36rjk7zxh8682ciszz9pl3"; }; nativeBuildInputs = [ wrapGAppsHook #to fully work with gnome also needs programs.dconf.enable = true in your configuration.nix ]; + buildInputs = with pkgs; [ gtk3 stdenv.cc.cc From 555ebb077e7d8c7278e203632c5d632ce66e6d53 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 17 Nov 2021 13:56:20 +0100 Subject: [PATCH 21/83] zookeeper: jdk8 -> jdk11_headless Put the specific version in the zookeeper derivation to try and stay in line with requisite versions as per zookeeper admin docs --- pkgs/servers/zookeeper/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index becd765fd8de..78ee5c34007b 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper, bash, coreutils }: - +{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, bash, coreutils }: +let + # Latest supported LTS JDK for Zookeeper 3.6: + # https://zookeeper.apache.org/doc/r3.6.3/zookeeperAdmin.html#sc_requiredSoftware + jre = jdk11_headless; +in stdenv.mkDerivation rec { pname = "zookeeper"; version = "3.6.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b19e97f089b..d443f88150c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21578,9 +21578,7 @@ with pkgs; xinetd = callPackage ../servers/xinetd { }; - zookeeper = callPackage ../servers/zookeeper { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + zookeeper = callPackage ../servers/zookeeper { }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; From ddb000cb11375b2ee50fcbcb2fb72ef2cdc80f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 16 Nov 2021 16:32:10 +0100 Subject: [PATCH 22/83] cargo-msrv: add rustup to propagatedBuildInputs --- pkgs/development/tools/rust/cargo-msrv/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 18b432df7b4d..33e9fca441fb 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -3,10 +3,12 @@ , fetchFromGitHub , nix-update-script , pkg-config +, rustup , openssl , stdenv , libiconv , Security +, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -35,7 +37,12 @@ rustPlatform.buildRustPackage rec { then [ libiconv Security ] else [ openssl ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + + # Depends at run-time on having rustup in PATH + postInstall = '' + wrapProgram $out/bin/cargo-msrv --prefix PATH : ${lib.makeBinPath [ rustup ]}; + ''; meta = with lib; { description = "Cargo subcommand \"msrv\": assists with finding your minimum supported Rust version (MSRV)"; From 7a30dd25fcbba6af9cb0bdb47eeb65bccc80ed09 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 17 Nov 2021 16:11:08 +0100 Subject: [PATCH 23/83] zookeeper: Add tests.nixos --- pkgs/servers/zookeeper/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 78ee5c34007b..f00c749557f1 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, bash, coreutils }: +{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }: let # Latest supported LTS JDK for Zookeeper 3.6: # https://zookeeper.apache.org/doc/r3.6.3/zookeeperAdmin.html#sc_requiredSoftware @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + nixos = nixosTests.zookeeper; + }; + meta = with lib; { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; From 69ac4b31ad92f8905498717058d0550553d0443f Mon Sep 17 00:00:00 2001 From: Evils Date: Sun, 23 May 2021 20:46:08 +0200 Subject: [PATCH 24/83] python.pkgs.pytomlpp: 0.3.5 -> v1.0.6 --- pkgs/development/python-modules/pytomlpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index d2fc8470d487..271d193ce019 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytomlpp"; - version = "0.3.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "bobfang1992"; repo = pname; - rev = version; + rev = "v${version}"; fetchSubmodules = true; - sha256 = "1h06a2r0f5q4mml485113mn7a7585zmhqsk2p1apcybyydllcqda"; + sha256 = "sha256-QyjIJCSgiSKjqMBvCbOlWYx6rBbKIoDvXez2YnYaPUo="; }; buildInputs = [ pybind11 ]; From a36a91aaa79bf39067b4defa28ffc97702afdca1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Nov 2021 19:11:19 +0100 Subject: [PATCH 25/83] python3Packages.imap-tools: 0.49.1 -> 0.50.0 --- pkgs/development/python-modules/imap-tools/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index eb81678ae4f1..dcee12d68c3a 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.49.1"; + version = "0.50.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "071bri1h6j8saqqlb50zibdrk5hgkpwp4ysiskl1zin18794bq82"; + sha256 = "sha256-4OMWLWvNRg7z4KAAkB1l5YaWILFwIepZOWhBd64SGWI="; }; checkInputs = [ @@ -29,9 +29,6 @@ buildPythonPackage rec { "test_connectio" "test_attributes" "test_live" - # logic operator tests broken in 0.49.0 - # https://github.com/ikvk/imap_tools/issues/143 - "test_logic_operators" ]; pythonImportsCheck = [ "imap_tools" ]; From c27291414f02d7c3ae7ba51bb66228fedd61a71a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 14 Nov 2021 17:24:20 +0000 Subject: [PATCH 26/83] python3Packages.unicorn: add custom checkPhase --- pkgs/development/python-modules/angr/default.nix | 15 ++++++++------- .../python-modules/unicorn/default.nix | 10 ++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index d7b540f50ca9..c00cc93031ad 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -30,14 +30,15 @@ let # Only the pinned release in setup.py works properly unicorn' = unicorn.overridePythonAttrs (old: rec { - pname = "unicorn"; - version = "1.0.2-rc4"; - src = fetchFromGitHub { - owner = "unicorn-engine"; - repo = pname; - rev = version; - sha256 = "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy"; + pname = "unicorn"; + version = "1.0.2-rc4"; + src = fetchFromGitHub { + owner = "unicorn-engine"; + repo = pname; + rev = version; + sha256 = "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy"; }; + doCheck = false; }); in diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index c9043afa85d9..14988bde2869 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -30,6 +30,16 @@ buildPythonPackage rec { "unicorn" ]; + checkPhase = '' + runHook preCheck + + mv unicorn unicorn.hidden + patchShebangs sample_*.py shellcode.py + sh -e sample_all.sh + + runHook postCheck + ''; + meta = with lib; { description = "Python bindings for Unicorn CPU emulator engine"; homepage = "https://www.unicorn-engine.org/"; From eb1aed2a74a06d9aa00fe39c841b454582013b34 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 14 Nov 2021 17:24:38 +0000 Subject: [PATCH 27/83] python3Packages.unicorn: fix build on aarch64 --- .../development/python-modules/unicorn/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 14988bde2869..1f2876bdc693 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -19,17 +19,13 @@ buildPythonPackage rec { ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/ ''; + # needed on non-x86 linux + setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]; + propagatedBuildInputs = [ setuptools ]; - # No tests present - doCheck = false; - - pythonImportsCheck = [ - "unicorn" - ]; - checkPhase = '' runHook preCheck @@ -40,6 +36,10 @@ buildPythonPackage rec { runHook postCheck ''; + pythonImportsCheck = [ + "unicorn" + ]; + meta = with lib; { description = "Python bindings for Unicorn CPU emulator engine"; homepage = "https://www.unicorn-engine.org/"; From f7e03a6a4e75f73730aa9ca8ff5bbc9f5e61011d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 18 Nov 2021 09:34:15 +0000 Subject: [PATCH 28/83] nmon: 16m -> 16n --- pkgs/os-specific/linux/nmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index 18adf9c69057..9372018f5b70 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nmon"; - version = "16m"; + version = "16n"; src = fetchurl { url = "mirror://sourceforge/nmon/lmon${version}.c"; - sha256 = "1hazgrq3m01dzv05639yis1mypcp0jf167n9gqwd3wgxzm2lvv9b"; + sha256 = "1wpm2f30414b87kpbr9hbidblr5cmfby5skwqd0fkpi5v712q0f0"; }; buildInputs = [ ncurses ]; From 80a1a44c70a99e1f563be2659921962fb5c6432d Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Thu, 18 Nov 2021 21:53:46 +0300 Subject: [PATCH 29/83] fetchgitlab: fix unexpected argument --- pkgs/build-support/fetchgitlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index 9ee0b3ca3686..5c82a8f8587d 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -10,7 +10,7 @@ let slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]); escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug; escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev; - passthruAttrs = removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]; + passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" ]; useFetchGit = deepClone || fetchSubmodules || leaveDotGit; fetcher = if useFetchGit then fetchgit else fetchzip; From 1678743f015b152565870e652d467714545bb069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 18 Nov 2021 18:48:17 -0300 Subject: [PATCH 30/83] mate.mozo: 1.26.0 -> 1.26.1 --- pkgs/desktops/mate/mozo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 3a02b03ceb76..6388b2319e8c 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.26.0"; + version = "1.26.1"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hnxqdk69g7j809k6picgq8y626hnyznlzxd0pi743gshpwwnhj6"; + sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk="; }; nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; From 51b4f7aebc2c1eebb12b2a2ecffa680a44d98b31 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 18 Nov 2021 22:10:08 +0000 Subject: [PATCH 31/83] powertop: pull upstream fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: lib.cpp:586:24: error: format not a string literal and no format arguments [Werror=format-security] 586 | mvprintw(1, 0, notify); | ^~~~~~ --- pkgs/os-specific/linux/powertop/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index b8a0487bc7e7..2b498d9ddc91 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gettext, libnl, ncurses, pciutils +{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils , pkg-config, zlib, autoreconfHook }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1zkr2y5nb1nr22nq8a3zli87iyfasfq6489p7h1k428pv8k45w4f"; }; + patches = [ + # Pull upstream patch for ncurses-6.3 compatibility + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/fenrus75/powertop/commit/9ef1559a1582f23d599c149601c3a8e06809296c.patch"; + sha256 = "0qx69f3bwhxgsga9nas8lgrclf1rxvr7fq7fd2n8dv3x4lsb46j1"; + }) + ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 37d5c0e51e10effa26a9d25c064094c3e656a0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 18 Nov 2021 19:59:06 -0300 Subject: [PATCH 32/83] mate.mate-screensaver: 1.26.0 -> 1.26.1 --- pkgs/desktops/mate/mate-screensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index f33c47cbf0a2..d80a19e29bb1 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xmgzrb5nk7x6ganf7jd4gmdafanx7f0znga0lhsd8kd40r40la1"; + sha256 = "T72yHqSlnqjeM+qb93bYaXU+SSlWBGZMMOIg4JZZuLw="; }; nativeBuildInputs = [ From 3a2f6a79e044dcd075414ef9f3558487430cdccd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 18 Nov 2021 18:18:26 -0300 Subject: [PATCH 33/83] gistyc: add tests --- pkgs/development/python-modules/gistyc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/gistyc/default.nix b/pkgs/development/python-modules/gistyc/default.nix index 2f49552df236..51003101abde 100644 --- a/pkgs/development/python-modules/gistyc/default.nix +++ b/pkgs/development/python-modules/gistyc/default.nix @@ -21,6 +21,10 @@ buildPythonPackage rec { requests ]; + pythonImportsCheck = [ + "gistyc" + ]; + meta = with lib; { homepage = "https://github.com/ThomasAlbin/gistyc"; description = "A Python based GitHub GIST management tool"; From bd600302cd0fe66f3d99a874b04cf3095d85aa77 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Fri, 19 Nov 2021 08:44:02 +0100 Subject: [PATCH 34/83] navidrome: 0.45.1 -> 0.47.0 --- pkgs/servers/misc/navidrome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 19a89bbbf1cb..2bec7f6912e7 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,17 +4,17 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.45.1"; + version = "0.47.0"; src = fetchurl (if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-TZcXq51sKoeLPmcRpv4VILDmS6dsS7lxlJzTDH0tEWM="; + sha256 = "sha256-MoBv2dTCotLnGaZOUWLScYd1+gKSjPXTSkHAR6UircA="; } else { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_arm64.tar.gz"; - sha256 = "sha256-Va0DSmemj8hsaywoP6WKo/x+QQzSNwHCpU4VWs5lpbI="; + sha256 = "sha256-FIjrw+BBJXOjh1AoVdfPZIdcDyk5yS/zKD1O+u31YlE="; }); nativeBuildInputs = [ makeWrapper ]; From eafed17eff28c28683f14edd96b5830429385f9a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 Nov 2021 08:40:26 +0000 Subject: [PATCH 35/83] tiptop: pull upstream patch for ncurses-6.3 support Without the patch build fails on ncurses-6.3 as: helpwin.c:64:3: error: format not a string literal and no format arguments [-Werror=format-security] 64 | mvwprintw(win, 2, 1, screen->desc); | ^~~~~~~~~ --- pkgs/os-specific/linux/tiptop/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index c6870d2a4c44..bb9fa2859824 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -9,11 +9,20 @@ stdenv.mkDerivation rec { sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i"; }; - patches = [(fetchpatch { - name = "reproducibility.patch"; - url = "https://salsa.debian.org/debian/tiptop/raw/debian/2.3.1-1/debian/patches/0001-fix-reproducibility-of-build-process.patch"; - sha256 = "116l7n3nl9lj691i7j8x0d0za1i6zpqgghw5d70qfpb17c04cblp"; - })]; + patches = [ + (fetchpatch { + name = "reproducibility.patch"; + url = "https://salsa.debian.org/debian/tiptop/raw/debian/2.3.1-1/debian/patches/0001-fix-reproducibility-of-build-process.patch"; + sha256 = "116l7n3nl9lj691i7j8x0d0za1i6zpqgghw5d70qfpb17c04cblp"; + }) + + # Pull upstream patch for ncurses-6.3 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://gitlab.inria.fr/rohou/tiptop/-/commit/a78234c27fdd62fed09430d998950e49e11a1832.patch"; + sha256 = "1k55agdri7iw3gwm4snj3ps62qzmxlqr6s0868l8qamjw38z9g00"; + }) + ]; postPatch = '' substituteInPlace ./configure --replace -lcurses -lncurses From b524bea334ed9a88850c4312481708902c7dcf42 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 Nov 2021 09:23:32 +0000 Subject: [PATCH 36/83] vimpc: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: src/window/listwindow.cpp:120:16: error: format not a string literal and no format arguments [-Werror=format-security] 120 | mvwprintw(window, line, 0, BlankLine.c_str()); | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/applications/audio/vimpc/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index a576898128ec..5cc3c1099995 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , libmpdclient , ncurses @@ -21,6 +22,16 @@ stdenv.mkDerivation rec { sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx"; }; + patches = [ + # Pull fix pending upstream inclusion for ncurses-6.3: + # https://github.com/boysetsfrog/vimpc/pull/100 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/boysetsfrog/vimpc/commit/055ecdce0720fdfc9ec2528c520b6c33da36271b.patch"; + sha256 = "01p858jjxm0bf8hnk1z8h45j8c1y9i995mafa6ff3vg9vlak61pv"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmpdclient ncurses pcre taglib curl ]; From 17c12a8cd2005da09e7378a3d38f78f481c18c11 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 19 Nov 2021 11:00:43 +0100 Subject: [PATCH 37/83] kail: 0.8.0 -> 0.15.0 switch to buildGoModule Updating to the latest release and switching to go modules. Signed-off-by: Vincent Demeester --- pkgs/tools/networking/kail/default.nix | 24 +- pkgs/tools/networking/kail/deps.nix | 408 ------------------------- 2 files changed, 10 insertions(+), 422 deletions(-) delete mode 100644 pkgs/tools/networking/kail/deps.nix diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index ae431b329eaf..7777c129dbf5 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -1,27 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "kail"; - version = "0.8.0"; + version = "0.15.0"; - goPackagePath = "github.com/boz/kail"; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; src = fetchFromGitHub { owner = "boz"; repo = "kail"; rev = "v${version}"; - sha256 = "0ibk7j40pj6f2086qcnwp998wld61d2gvrv7yiy6hlkalhww2pq7"; + sha256 = "0b4abzk8lc5qa04ywkl8b5hb9jmxhyi2dpgbl27gmw81525wjnj7"; }; - # regenerate deps.nix using following steps: - # - # go get -u github.com/boz/kail - # cd $GOPATH/src/github.com/boz/kail - # git checkout - # dep init - # dep2nix - deleteVendor = true; - goDeps = ./deps.nix; + vendorSha256 = "09s7sq23hglcb2rsi9igzql39zs4238f3jfmvxz9a8v41da225np"; meta = with lib; { description = "Kubernetes log viewer"; diff --git a/pkgs/tools/networking/kail/deps.nix b/pkgs/tools/networking/kail/deps.nix deleted file mode 100644 index b6d9c3e9cf34..000000000000 --- a/pkgs/tools/networking/kail/deps.nix +++ /dev/null @@ -1,408 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "06f11fffc537c4aef126d9fd3a92e2d7968f118f"; - sha256 = "1zhr1pyzk44zb95r2bcs4kkngvmzdr5bac55315nnzl3adx4y4dn"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "1ff28809256a84bb6966640ff3d0371af82ccba4"; - sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/boz/go-lifecycle"; - fetch = { - type = "git"; - url = "https://github.com/boz/go-lifecycle"; - rev = "c39961a5a0ce6b046f15d62bcbed79701666a9e0"; - sha256 = "12xzjzgi0pspb28xrcmp4v33jij2bbg609z1kpq1pql9mxs6h31k"; - }; - } - { - goPackagePath = "github.com/boz/go-logutil"; - fetch = { - type = "git"; - url = "https://github.com/boz/go-logutil"; - rev = "9d21a9e4757dbc497f947fe5253f9570c34562fa"; - sha256 = "0rhhyvvz1lvjalv3hx4yvyh90jqfia27nzx9m54m0i7d0znrwpbj"; - }; - } - { - goPackagePath = "github.com/boz/kcache"; - fetch = { - type = "git"; - url = "https://github.com/boz/kcache"; - rev = "a012826955254d3f31548911e75a9dbd817f9470"; - sha256 = "0xqw4mgz0scjrcfsyfwfdhggq1q80dv4mdqgdaryy5ir18srg15l"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "adab96458c51a58dc1783b3335dcce5461522e75"; - sha256 = "1y743w875aqqwggrh4lwlmqyx7ls5m1bnw5y4vr3zps4ib3gb4n5"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "67c513e5729f918f5e69786686770c27141a4490"; - sha256 = "045i2y2h1a6ml7fm1b3if4692320kjgg3cpxn7chlmpq7z1bmrrn"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9"; - sha256 = "0h9vkfy3ydz0d6x72853yg49r9k54cgjnlv6a7v12gzqw47p941i"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "1909bc2f63dc92bb931deace8b8312c4db72d12f"; - sha256 = "0d4pknkgp5qlbfpw8xp81dqgrfm0na1pfi2ll559nwvjz5vc90g5"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "316fb6d3f031ae8f4d457c6c5186b9e3ded70435"; - sha256 = "1fyj10cy2d37mpfk73hjfjwpsgpnmdzf2mrkkvzyx0d41sf46xfd"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "57b0290873708074edf87ad921eccec8bef5f8ec"; - sha256 = "14raxxsx2bww4f0am0yygv64h950avkswm7bdvq6k4d4lry6dgg8"; - }; - } - { - goPackagePath = "github.com/gophercloud/gophercloud"; - fetch = { - type = "git"; - url = "https://github.com/gophercloud/gophercloud"; - rev = "b4c2377fa77951a0e08163f52dc9b3e206355194"; - sha256 = "00j9ny59zlf3ajwydf2k41n3l92kl2hf0ljx9x73jcfkdkn2xv5k"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "c1f8028e62adb3d518b823a2f8e6a95c38bdd3aa"; - sha256 = "1v7fb4ix2xg0plx5p1f7xd1srvimyss7v7ppn3j7py9ycl560qhr"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "e3000cb3d28c72b837601cac94debd91032d19fe"; - sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "ab8a2e0c74be9d3be70b3184d9acc634935ded82"; - sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "6df6d4d004b64986bbb0d1b25945f42b44787e90"; - sha256 = "0ha2biq708is9i3hqc30vihcpajak3qawn0rnacb9k1gyxsxwb60"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; - sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "94122c33edd36123c84d5368cfb2b69df93a0ec8"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/petar/GoLLRB"; - fetch = { - type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; - sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb"; - sha256 = "07fd392kqyaj7fnl4sgzy7fcs0sw4jx3mx2khhgk64n9j9i37l59"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "181d419aa9e2223811b824e8f0b4af96f9ba9302"; - sha256 = "08ff47w4clnkym3l0v4hhhfq21zvvwzpljvs0qvki5k0azv7siyc"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"; - sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "b176d7def5d71bdd214203491f89843ed217f420"; - sha256 = "1ayi4iagsxhf193rx93j6y2rb48730hgm2qbahiq9lawm5g3vc14"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "9a379c6b3e95a790ffc43293c2a78dee0d7b6e20"; - sha256 = "156wff8s9g3sxni2z80wky4v688pvdgfzxbpfp5rmqjvgqnifxkf"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "2d3e384235de683634e9080b58f757466840aa48"; - sha256 = "1w8zrcjv4sfi3skchdbvbixgwzp5n1g0vny8r20dlapnqbazah0x"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; - sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "d9a072cfa7b9736e44311ef77b3e09d804bfa599"; - sha256 = "07x7s65q9pydpaniga6zf259kw7qs40q6554wb22inq423wcs0nb"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; - sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"; - sha256 = "1cwrwdm104xd3608b1a5mw6a19w45532p647xdwnyn62rw2f08jx"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; - sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "1f13a808da65775f22cbf47862c4e5898d8f4ca1"; - sha256 = "1vkcjg80l49hxiadqmkkd031kj6kc10m8mwcnla3k1ml8fv4qna9"; - }; - } -] From 3e913ac64c178b83e17068513c8d4d2d08b22aec Mon Sep 17 00:00:00 2001 From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com> Date: Thu, 18 Nov 2021 17:17:56 +0200 Subject: [PATCH 38/83] viber: 13.3.1.22 -> 16.1.0.37 Co-authored-by: Sandro --- .../networking/instant-messengers/viber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 53eea50767f5..97df6d643c88 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { pname = "viber"; - version = "13.3.1.22"; + version = "16.1.0.37"; src = fetchurl { # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb - url = "http://web.archive.org/web/20210602004133/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh"; + url = "https://web.archive.org/web/20211119123858/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + sha256 = "sha256-hOz+EQc2OOlLTPa2kOefPJMUyWvSvrgqgPgBKjWE3p8="; }; nativeBuildInputs = [ makeWrapper ]; From e371ffc4a7670e23fcd2f7c8a29a9b0d8b4d26ef Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 Nov 2021 17:51:27 +0000 Subject: [PATCH 39/83] souffle: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: src/include/souffle/provenance/Explain.h:522:18: error: format not a string literal and no format arguments [-Werror=format-security] 522 | mvwprintw(queryWindow, 1, 0, prompt.c_str()); | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- pkgs/development/compilers/souffle/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index e57062642ba4..dada4dfe9e81 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , perl, ncurses, zlib, sqlite, libffi , autoreconfHook, mcpp, bison, flex, doxygen, graphviz , makeWrapper @@ -19,6 +19,16 @@ stdenv.mkDerivation rec { sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5"; }; + patches = [ + # Pull pending unstream inclusion fix for ncurses-6.3: + # https://github.com/souffle-lang/souffle/pull/2134 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch"; + sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa"; + }) + ]; + nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; buildInputs = [ ncurses zlib sqlite libffi ]; @@ -29,7 +39,7 @@ stdenv.mkDerivation rec { # see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for # Wno-error fixes - patchPhase = '' + postPatch = '' substituteInPlace ./src/Makefile.am \ --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other' From b663e1b4d3b996457b9915d3156a41e3649f16f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Fri, 19 Nov 2021 16:28:18 -0300 Subject: [PATCH 40/83] lrzip: refactor derivation - Fetch from GitHub - Set nativeBuildInputs --- pkgs/tools/compression/lrzip/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 02f62c3e3c01..4223aa656e1f 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,15 +1,19 @@ -{ lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, zlib, lzo, bzip2, lz4, nasm, perl }: stdenv.mkDerivation rec { pname = "lrzip"; version = "0.641"; - src = fetchurl { - url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz"; - sha256 = "0ziyanspd96dc3lp2qdcylc7aq8dhb511jhqrhxvlp502fjqjqrc"; + src = fetchFromGitHub { + owner = "ckolivas"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-253CH6TiHWyr13C76y9PXjyB7gj2Bhd2VRgJ5r+cm/g="; }; - buildInputs = [ zlib lzo bzip2 lz4 nasm perl ]; + nativeBuildInputs = [ autoreconfHook nasm perl ]; + + buildInputs = [ zlib lzo bzip2 lz4 ]; configureFlags = [ "--disable-asm" From c91c0296dd3d48fb0225d2b518296abd7a7d5a2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Nov 2021 22:18:06 +0100 Subject: [PATCH 41/83] home-assistant: 2021.11.4 -> 2021.11.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a84ad21775fc..19714e9a33b6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.11.4"; + version = "2021.11.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 688afc5baa0a..7f4c7d65a445 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -152,7 +152,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.11.4"; + hassVersion = "2021.11.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -169,7 +169,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "sha256-411oqzC8VTD7CM9vM/M3m4zW0Ygf2g2hoAXAxGBv7iw="; + sha256 = "sha256-5MxArJLzOg9dU4Q2c6BDjvEzR2u7UVumNZjwE84+br8="; }; # leave this in, so users don't have to constantly update their downstream patch handling From ce224d8643012dcbf9cf4f3b1e1bb4f549bb7c74 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 19 Nov 2021 22:19:28 +0100 Subject: [PATCH 42/83] chromiumBeta: 96.0.4664.45 -> 97.0.4692.20 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d35d3fa75175..030ef5e00a52 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,15 +18,15 @@ } }, "beta": { - "version": "96.0.4664.45", - "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", - "sha256bin64": "1vaazcrlx0999xd9yp25i9kzb8y8g0yqd28xssw7jqwrhz033wgr", + "version": "97.0.4692.20", + "sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372", + "sha256bin64": "0nsaf46a9pl8cxw5v2zsfp2ynja4m55qi1m4mhwhmyr50138655f", "deps": { "gn": { - "version": "2021-09-24", + "version": "2021-11-03", "url": "https://gn.googlesource.com/gn", - "rev": "0153d369bbccc908f4da4993b1ba82728055926a", - "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" + "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", + "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" } } }, From eef64da3dbf88251c103cd25afe598334c2cfbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Nov 2021 23:49:26 +0100 Subject: [PATCH 43/83] ookla-speedtest: fix syntax error when evaling on unsupported platforms --- pkgs/tools/networking/ookla-speedtest/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix index 6f377a0a4bf7..3834355528e9 100644 --- a/pkgs/tools/networking/ookla-speedtest/default.nix +++ b/pkgs/tools/networking/ookla-speedtest/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { inherit pname version; - src = srcs.${stdenv.hostPlatform.system}; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); setSourceRoot = '' sourceRoot=$PWD From 5c35e9184db774816bbd2de4a996f74a6583153b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Fri, 19 Nov 2021 16:33:14 -0300 Subject: [PATCH 44/83] lrzip: enable asm on x86 and fix build on darwin Enable compilation of native assembly code on x86 systems, instead of disabling it for all systems. On darwin ensure the format is set to macho64. The ASM/x86 directory is compiled whether "--enable-asm" is configured or not, but it creates an empty archive, which fails on darwin, so ensure it is not compiled on darwin to fix the build. --- pkgs/tools/compression/lrzip/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 4223aa656e1f..4fe5512b4c6f 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, zlib, lzo, bzip2, lz4, nasm, perl }: +let + inherit (stdenv.hostPlatform) isx86; +in stdenv.mkDerivation rec { pname = "lrzip"; version = "0.641"; @@ -11,11 +14,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-253CH6TiHWyr13C76y9PXjyB7gj2Bhd2VRgJ5r+cm/g="; }; - nativeBuildInputs = [ autoreconfHook nasm perl ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # Building the ASM/x86 directory creates an empty archive, + # which fails on darwin, so remove it + # https://github.com/ckolivas/lrzip/issues/193 + # https://github.com/Homebrew/homebrew-core/pull/85360 + substituteInPlace lzma/Makefile.am --replace "SUBDIRS = C ASM/x86" "SUBDIRS = C" + substituteInPlace configure.ac --replace "-f elf64" "-f macho64" + ''; + + nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals isx86 [ nasm ]; buildInputs = [ zlib lzo bzip2 lz4 ]; - configureFlags = [ + configureFlags = lib.optionals (!isx86) [ "--disable-asm" ]; From 5e253e043dd91ec75112723e9f0b8b923fab5487 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 19 Nov 2021 20:15:43 -0600 Subject: [PATCH 45/83] creduce: 2.9.0 -> 2.10.0 Bump required LLVM from 7 to 8. --- pkgs/development/tools/misc/creduce/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 0ae900060b97..77493bd16647 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "creduce"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { url = "https://embed.cs.utah.edu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1b833z0g1hich68kzbkpfc26xb8w2phfl5savy8c6ir9ihwy1a8w"; + sha256 = "2xwPEjln8k1iCwQM69UwAb89zwPkAPeFVqL/LhH+oGM="; }; nativeBuildInputs = [ cmake makeWrapper llvm.dev ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac159ccf3d4a..5a85340c71f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14319,7 +14319,7 @@ with pkgs; credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_7) llvm libclang; + inherit (llvmPackages_8) llvm libclang; }; cscope = callPackage ../development/tools/misc/cscope { }; From e1990cfa2b9a51af9b3ed33a8dc023d86551edc5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 19 Nov 2021 20:18:54 -0300 Subject: [PATCH 46/83] python3Packages.sanic: skip tests on all archs --- pkgs/development/python-modules/sanic/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 1f7775c1d84f..6161f5c5eb02 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -85,19 +85,14 @@ buildPythonPackage rec { "test_auto_reload" "test_no_exceptions_when_cancel_pending_request" "test_ipv6_address_is_not_wrapped" - ] ++ lib.optionals stdenv.isDarwin [ - # https://github.com/sanic-org/sanic/issues/2298 - "test_no_exceptions_when_cancel_pending_request" - ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # These appear to be very sensitive to output of commands - # Output is different on aarch64 - "test_server_run" - "test_host_port" - "test_num_workers" "test_access_logs" - "test_version" - # Failing for a different reason than Darwin + "test_auto_reload" + "test_host_port" "test_no_exceptions_when_cancel_pending_request" + "test_num_workers" + "test_server_run" + "test_version" ]; # avoid usage of nixpkgs-review in darwin since tests will compete usage From b5e87f5f2e40ab84dd1977348e0ea44f36a749df Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sun, 29 Aug 2021 20:00:59 +0000 Subject: [PATCH 47/83] grab-site: 2.2.0 -> 2.2.2; pythonPackages.ludios_wpull: 3.0.7 -> 3.0.9 Use SQLAlchemy 1.3 because ludios_wpull is incompatible with SQLAlchemy 1.4. Use Python 3.8 instead of Python 3.7, as namedlist 1.8 fixed compatibility with Python 3.8. We cannot use Python 3.9 until https://github.com/ArchiveTeam/ludios_wpull/issues/20 is fixed. --- .../python-modules/ludios_wpull/default.nix | 8 ++++---- pkgs/tools/backup/grab-site/default.nix | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index e87146f6fbc3..620372f192c1 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k , chardet , dnspython , html5-parser @@ -15,15 +14,16 @@ buildPythonPackage rec { pname = "ludios_wpull"; - version = "3.0.7"; + version = "3.0.9"; - disabled = (!isPy3k) || (pythonAtLeast "3.8"); + # https://github.com/ArchiveTeam/ludios_wpull/issues/20 + disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { rev = version; owner = "ludios"; repo = "wpull"; - sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf"; + sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c"; }; propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ]; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 2f2f01356b47..fe6496bf212b 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,8 +1,15 @@ -{ lib, python37, fetchFromGitHub }: +{ lib, python38, fetchFromGitHub }: let - python = python37.override { + python = python38.override { self = python; packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.24"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + }; + }); tornado = super.tornado_4; }; }; @@ -10,18 +17,18 @@ let in with python.pkgs; buildPythonApplication rec { pname = "grab-site"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { rev = version; owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "1jxcv9dral6h7vfpfqkp1yif6plj0vspzakymkj8hfl75nh0wpv8"; + sha256 = "0af53g703kqpxa6bn72mb2l5l0qrjknq5wqwl4wryyscdp4xabx4"; }; postPatch = '' substituteInPlace setup.py \ - --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-3.0.7"' '"wpull"' + --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-${ludios_wpull.version}"' '"wpull"' ''; propagatedBuildInputs = [ From 7769bdce1376315f9085fb87bbc065eb64c78bf0 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 28 Oct 2021 17:12:31 +0000 Subject: [PATCH 48/83] python3Packages.ludios_wpull: use updated URLs https://github.com/ludios/wpull redirects to https://github.com/ArchiveTeam/ludios_wpull --- pkgs/development/python-modules/ludios_wpull/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index 620372f192c1..0045f4b3e0fa 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { rev = version; - owner = "ludios"; - repo = "wpull"; + owner = "ArchiveTeam"; + repo = "ludios_wpull"; sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c"; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "Web crawler; fork of wpull used by grab-site"; - homepage = "https://github.com/ludios/wpull"; + homepage = "https://github.com/ArchiveTeam/ludios_wpull"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ivan ]; broken = lib.versions.major tornado.version != "4"; From 5afe6d962c2c84fa3dc7baf6e5465265d11e9623 Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Fri, 19 Nov 2021 21:22:09 -0800 Subject: [PATCH 49/83] plan9port: tighten up `broken` --- pkgs/tools/system/plan9port/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 6b22dd5fe5ce..88c786e30b6e 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -101,7 +101,8 @@ stdenv.mkDerivation { kovirobi ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + # TODO: revisit this when the sdk situation on x86_64-darwin changes + broken = stdenv.isDarwin && stdenv.isx86_64; }; } # TODO: investigate the mouse chording support patch From 35ec24523b71f4a79409b3b3ded4e4f9c2c39046 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Sat, 20 Nov 2021 15:29:34 +0800 Subject: [PATCH 50/83] nixos/hbase: Fix missing top-level in hbase-site.xml --- nixos/modules/services/databases/hbase.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 183c8a2f46d5..181be2d6b0b8 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -22,7 +22,10 @@ let configAttr)); configFile = pkgs.writeText "hbase-site.xml" - (buildProperty (defaultConfig // cfg.settings)); + '' + ${buildProperty (defaultConfig // cfg.settings)} + + ''; configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } '' mkdir -p $out From 51556957bfc4ea84bc837143c13e9e45e55d82fb Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 20 Nov 2021 10:52:19 +0100 Subject: [PATCH 51/83] pywlroots: 0.14.9 -> 0.14.11 --- pkgs/development/python-modules/pywlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index ab7a8777a243..a35132ade3f6 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.14.9"; + version = "0.14.11"; src = fetchPypi { inherit pname version; - sha256 = "jzHh5ubonn6pCaOp+Dnr7tA9n5DdZ28hBM+03jZZlvc="; + sha256 = "Ey1B3tx6UufxZs8I64vaoPSNC+4LGdcPuyKrLBHxZa8="; }; nativeBuildInputs = [ pkg-config ]; From 5da59495a3ad49de926f789207ed0087596e5cf1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 20 Nov 2021 10:36:08 +0000 Subject: [PATCH 52/83] afterstep: fix build on upcoming binutils-2.36 Without the change build fails on binutils-2.36 as: ar clq libAfterBase.a ashash.o ... ar: libdeps specified more than once --- pkgs/applications/window-managers/afterstep/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index ec7d3ae5004d..ac6ba4e0bf29 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch"; sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4"; }) + + # Fix pending upstream inclusion for binutils-2.36 support: + # https://github.com/afterstep/afterstep/pull/7 + (fetchpatch { + name = "binutils-2.36.patch"; + url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch"; + sha256 = "1kk97max05r2p1a71pvpaza79ff0klz32rggik342p7ki3516qv8"; + }) ]; postPatch = '' From 6ba4962a152132e41e8ae13c0e334f8a799ca5a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Nov 2021 13:13:49 +0100 Subject: [PATCH 53/83] python3Packages.nessclient: enable tests --- .../python-modules/nessclient/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix index c21ef192bec9..d91a80eb9d0f 100644 --- a/pkgs/development/python-modules/nessclient/default.nix +++ b/pkgs/development/python-modules/nessclient/default.nix @@ -1,9 +1,12 @@ { lib +, asynctest , buildPythonPackage , click , fetchFromGitHub , justbackoff , pythonOlder +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { @@ -25,15 +28,18 @@ buildPythonPackage rec { click ]; - # Tests are not shipped - doCheck = false; + checkInputs = [ + asynctest + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "nessclient" ]; meta = with lib; { - description = "Python implementation/abstraction of the Ness D8x / D16x Serial Interface ASCII protocol"; + description = "Python implementation/abstraction of the Ness D8x/D16x Serial Interface ASCII protocol"; homepage = "https://github.com/nickw444/nessclient"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; From a6eeab7ab7f97ddb592e85b612b029619f309e56 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Sat, 20 Nov 2021 15:59:05 +0300 Subject: [PATCH 54/83] super-slicer-staging: 2.3.57.0 -> 2.3.57.6 --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 479e497e3418..e7edafb5c05b 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -6,7 +6,7 @@ let versions = { stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; }; - staging = { version = "2.3.57.0"; sha256 = "sha256-7o0AqgQcKYc6c+Hi3x5pC/pKJZPlEsYOYk9sC21+mvM="; }; + staging = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; }; }; override = { version, sha256 }: super: { From 8afdfa9896e29e1775059adba824ef395f70d78b Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 27 Sep 2021 16:59:32 +0200 Subject: [PATCH 55/83] foo2zjs: add hbpl1 printers support --- pkgs/misc/drivers/foo2zjs/default.nix | 9 +- pkgs/misc/drivers/foo2zjs/hbpl1.patch | 4676 +++++++++++++++++ .../foo2zjs/papercode-format-fix.patch | 101 + 3 files changed, 4785 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/drivers/foo2zjs/hbpl1.patch create mode 100644 pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 6e4a38ed171e..ca50ad2f1cc9 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -11,7 +11,14 @@ stdenv.mkDerivation rec { buildInputs = [ foomatic-filters bc ghostscript systemd vim ]; - patches = [ ./no-hardcode-fw.diff ]; + patches = [ + ./no-hardcode-fw.diff + # Support HBPL1 printers https://www.dechifro.org/hbpl/ + ./hbpl1.patch + # Fix "Unimplemented paper code" error for hbpl1 printers + # https://github.com/mikerr/foo2zjs/pull/2 + ./papercode-format-fix.patch + ]; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/misc/drivers/foo2zjs/hbpl1.patch b/pkgs/misc/drivers/foo2zjs/hbpl1.patch new file mode 100644 index 000000000000..7372e164affa --- /dev/null +++ b/pkgs/misc/drivers/foo2zjs/hbpl1.patch @@ -0,0 +1,4676 @@ +--- foo2zjs/ChangeLog 2021-09-27 16:25:00.735904476 +0200 ++++ foo2zjs/ChangeLog 2021-09-27 16:34:10.661647070 +0200 +@@ -89,10 +89,35 @@ + 2014-04-08 Rick Richardson + * Upgrade to JBIGKIT 2.1 + ++2014-04-04 Dave Coffin ++ * fixed all known bugs in foo2hbpl1.c. It now print multi-page ++ color and grayscale documents without resetting printer. ++ + 2014-04-01 Rick Richardson +- * foo2hbpl2 foomatic-db files and PPDs: ++ * foo2hbpl1, foo2hbpl2 foomatic-db files and PPDs: + Bug with default PageSize. +- PLEASE delete and recreate the foo2hbpl2 printers. ++ PLEASE delete and recreate the foo2hbpl1, foo2hbpl2 printers. ++ ++2014-03-30 Rick Richardson ++ * foo2hbpl1.c: Cleanup the code ++ ++2014-03-25 Rick Richardson ++ * foomatic and PPD stuff for foo2hbpl1 printers: Halftone and ICM ++ ++2014-03-24 Rick Richardson ++ * foomatic and PPD stuff for foo2hbpl1 printers ++ preliminary for: Dell 1250c, Dell C1660w, Dell C1760nw, ++ Epson AcuLaser C1700, Fuji-Xerox DocuPrint CP105b ++ * foo2hbpl1-wrapper: allow for gs 7.x or gs 8.x ++ ++2014-03-24 Dave Coffin ++ * foo2hbpl1, foo2hbpl1-wrapper, et al: first cut at revision 1 ++ stuff. Color works, mono doesn't. No multiple pages. Printer ++ shows: ++ Restart Printer ++ Contact Support ++ IfMessageReturns ++ 016-313 + + 2014-03-22 Rick Richardson + * hbpldecode: another redundancy from Dave Coffin +--- foo2zjs/Makefile 2020-11-27 20:57:33.000000000 +0100 ++++ foo2zjs/Makefile 2021-09-27 16:56:23.363346705 +0200 +@@ -148,6 +148,8 @@ + foo2hiperc.c \ + foo2hiperc.1in \ + hbpl.h \ ++ foo2hbpl1.c \ ++ foo2hbpl1.1in \ + foo2hbpl2.c \ + foo2hbpl2.1in \ + foo2ddst.c \ +@@ -187,6 +189,8 @@ + foo2slx-wrapper.1in \ + foo2hiperc-wrapper.in \ + foo2hiperc-wrapper.1in \ ++ foo2hbpl1-wrapper.in \ ++ foo2hbpl1-wrapper.1in \ + foo2hbpl2-wrapper.in \ + foo2hbpl2-wrapper.1in \ + foo2ddst-wrapper.in \ +@@ -267,7 +271,7 @@ + PROGS+= foo2oak oakdecode + PROGS+= foo2slx slxdecode + PROGS+= foo2hiperc hipercdecode +-PROGS+= foo2hbpl2 hbpldecode ++PROGS+= foo2hbpl1 foo2hbpl2 hbpldecode + PROGS+= gipddecode + PROGS+= foo2ddst ddstdecode + ifneq ($(CUPS_SERVERBIN),) +@@ -279,7 +283,7 @@ + endif + SHELLS= foo2zjs-wrapper foo2oak-wrapper foo2hp2600-wrapper \ + foo2xqx-wrapper foo2lava-wrapper foo2qpdl-wrapper \ +- foo2slx-wrapper foo2hiperc-wrapper foo2hbpl2-wrapper \ ++ foo2slx-wrapper foo2hiperc-wrapper foo2hbpl1-wrapper foo2hbpl2-wrapper \ + foo2ddst-wrapper + SHELLS+= foo2zjs-pstops + SHELLS+= printer-profile +@@ -291,7 +295,7 @@ + MANPAGES+= foo2qpdl-wrapper.1 foo2qpdl.1 qpdldecode.1 + MANPAGES+= foo2slx-wrapper.1 foo2slx.1 slxdecode.1 + MANPAGES+= foo2hiperc-wrapper.1 foo2hiperc.1 hipercdecode.1 +-MANPAGES+= foo2hbpl2-wrapper.1 foo2hbpl2.1 hbpldecode.1 ++MANPAGES+= foo2hbpl1-wrapper.1 foo2hbpl1.1 foo2hbpl2-wrapper.1 foo2hbpl2.1 hbpldecode.1 + MANPAGES+= foo2ddst-wrapper.1 foo2ddst.1 ddstdecode.1 + MANPAGES+= gipddecode.1 + MANPAGES+= foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1 +@@ -485,6 +489,9 @@ + foo2ddst: foo2ddst.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG) + ++foo2hbpl1: foo2hbpl1.o ++ $(CC) $(CFLAGS) -o $@ foo2hbpl1.o ++ + foo2hbpl2: foo2hbpl2.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) + +@@ -519,6 +526,12 @@ + -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1) + chmod 555 $@ + ++foo2hbpl1-wrapper: foo2hbpl1-wrapper.in Makefile ++ [ ! -f $@ ] || chmod +w $@ ++ sed < $@.in > $@ \ ++ -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1) ++ chmod 555 $@ ++ + foo2hbpl2-wrapper: foo2hbpl2-wrapper.in Makefile + [ ! -f $@ ] || chmod +w $@ + sed < $@.in > $@ \ +@@ -1231,6 +1244,7 @@ + -rm -f /usr/bin/foo2slx-wrapper /usr/bin/foo2slx /usr/bin/slxdecode + -rm -f /usr/bin/foo2hiperc-wrapper /usr/bin/foo2hiperc + -rm -f /usr/bin/hipercdecode ++ -rm -f /usr/bin/foo2hbpl1-wrapper /usr/bin/foo2hbpl1 + -rm -f /usr/bin/foo2hbpl2-wrapper /usr/bin/foo2hbpl2 + -rm -f /usr/bin/hbpldecode + -rm -f /usr/bin/foo2ddst-wrapper /usr/bin/foo2ddst /usr/bin/ddstdecode +@@ -1265,7 +1279,7 @@ + -rm -f foo2qpdl.o qpdldecode.o + -rm -f foo2slx.o slxdecode.o + -rm -f foo2hiperc.o hipercdecode.o +- -rm -f foo2hbpl2.o hbpldecode.o ++ -rm -f foo2hbpl1.o foo2hbpl2.o hbpldecode.o + -rm -f opldecode.o gipddecode.o + -rm -f foo2dsst.o ddstdecode.o + -rm -f command2foo2lava-pjl.o +@@ -1513,6 +1527,10 @@ + *C3530*) driver=foo2hiperc;; \ + *C5[12568][05]0*) driver=foo2hiperc;; \ + *CLP*|*CLX*|*6110*) driver=foo2qpdl;; \ ++ *1250*) driver=foo2hbpl1;; \ ++ *1660*|*1760*) driver=foo2hbpl1;; \ ++ *C1700*) driver=foo2hbpl1;; \ ++ *CP105*) driver=foo2hbpl1;; \ + *ML-167*) driver=foo2qpdl;; \ + *6015*|*1355*) driver=foo2hbpl2;; \ + *C1765*) driver=foo2hbpl2;; \ +@@ -1607,6 +1625,8 @@ + $(INSTALL) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/ + $(INSTALL) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/ + $(INSTALL) -c -m 644 hipercdecode.1 $(MANDIR)/man1/ ++ $(INSTALL) -c -m 644 foo2hbpl1.1 $(MANDIR)/man1/ ++ $(INSTALL) -c -m 644 foo2hbpl1-wrapper.1 $(MANDIR)/man1/ + $(INSTALL) -c -m 644 foo2hbpl2.1 $(MANDIR)/man1/ + $(INSTALL) -c -m 644 foo2hbpl2-wrapper.1 $(MANDIR)/man1/ + $(INSTALL) -c -m 644 hbpldecode.1 $(MANDIR)/man1/ +--- foo2zjs/PPD/Dell-1250c.ppd 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/PPD/Dell-1250c.ppd 2014-04-01 11:06:30.000000000 +0000 +@@ -0,0 +1,433 @@ ++*PPD-Adobe: "4.3" ++*% ++*% For information on using this, and to obtain the required backend ++*% script, consult http://www.openprinting.org/ ++*% ++*% This file is published under the GNU General Public License ++*% ++*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with ++*% all programs and environments which use PPD files for dealing with ++*% printer capability information. The printer must be configured with the ++*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This ++*% file and "foomatic-rip" work together to support PPD-controlled printer ++*% driver option access with arbitrary free software printer drivers and ++*% printing spoolers. ++*% ++*% To save this file on your disk, wait until the download has completed ++*% (the animation of the browser logo must stop) and then use the ++*% "Save as..." command in the "File" menu of your browser or in the ++*% pop-up manu when you click on this document with the right mouse button. ++*% DO NOT cut and paste this file into an editor with your mouse. This can ++*% introduce additional line breaks which lead to unexpected results. ++*% ++*% You may save this file as 'Dell-1250c-foo2hbpl1.ppd' ++*% ++*% ++*FormatVersion: "4.3" ++*FileVersion: "1.1" ++*LanguageVersion: English ++*LanguageEncoding: ISOLatin1 ++*PCFileName: "FOO2HBPL.PPD" ++*Manufacturer: "Dell" ++*Product: "(1250c)" ++*cupsVersion: 1.0 ++*cupsManualCopies: True ++*cupsModelNumber: 2 ++*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" ++*%pprRIP: foomatic-rip other ++*ModelName: "Dell 1250c" ++*ShortNickName: "Dell 1250c foo2hbpl1" ++*NickName: "Dell 1250c Foomatic/foo2hbpl1 (recommended)" ++*PSVersion: "(3010.000) 550" ++*PSVersion: "(3010.000) 651" ++*PSVersion: "(3010.000) 652" ++*PSVersion: "(3010.000) 653" ++*PSVersion: "(3010.000) 704" ++*PSVersion: "(3010.000) 705" ++*PSVersion: "(3010.000) 800" ++*LanguageLevel: "3" ++*ColorDevice: True ++*DefaultColorSpace: RGB ++*FileSystem: False ++*Throughput: "1" ++*LandscapeOrientation: Plus90 ++*TTRasterizer: Type42 ++*1284DeviceID: "DRV:Dfoo2hbpl1,R1,M0,TF;" ++ ++*driverName foo2hbpl1/foo2hbpl1: "" ++*driverType F/Filter: "" ++*driverUrl: "http://foo2hbpl.rkkda.com/" ++*driverObsolete: False ++ ++ ++ ++ ++*HWMargins: 9 12.00 9 12 ++*VariablePaperSize: True ++*MaxMediaWidth: 100000 ++*MaxMediaHeight: 100000 ++*NonUIOrderDependency: 135 AnySetup *CustomPageSize ++*CustomPageSize True: "pop pop pop pop pop ++%% FoomaticRIPOptionSetting: PageSize=Custom" ++*End ++*FoomaticRIPOptionSetting PageSize=Custom: "-pCustom.%0x%1 " ++*ParamCustomPageSize Width: 1 points 36 100000 ++*ParamCustomPageSize Height: 2 points 36 100000 ++*ParamCustomPageSize Orientation: 3 int 0 0 ++*ParamCustomPageSize WidthOffset: 4 points 0 0 ++*ParamCustomPageSize HeightOffset: 5 points 0 0 ++ ++*FoomaticIDs: Dell-1250c foo2hbpl1 ++*FoomaticRIPCommandLine: "foo2hbpl1-wrapper %A" ++ ++*OpenGroup: General/General ++ ++*OpenUI *Quality/Printing Quality: PickOne ++*FoomaticRIPOption Quality: enum CmdLine A ++*OrderDependency: 110 AnySetup *Quality ++*DefaultQuality: normal ++*Quality draft/Draft: "%% FoomaticRIPOptionSetting: Quality=draft" ++*FoomaticRIPOptionSetting Quality=draft: " -t " ++*Quality normal/Normal: "%% FoomaticRIPOptionSetting: Quality=normal" ++*FoomaticRIPOptionSetting Quality=normal: " " ++*CloseUI: *Quality ++ ++*OpenUI *ColorMode/Color Mode: PickOne ++*FoomaticRIPOption ColorMode: enum CmdLine A ++*OrderDependency: 120 AnySetup *ColorMode ++*DefaultColorMode: Monochrome ++*ColorMode Color/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" ++*FoomaticRIPOptionSetting ColorMode=Color: "-c " ++*ColorMode Monochrome/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" ++*FoomaticRIPOptionSetting ColorMode=Monochrome: " " ++*CloseUI: *ColorMode ++ ++*OpenUI *PageSize/Page Size: PickOne ++*FoomaticRIPOption PageSize: enum CmdLine A ++*OrderDependency: 135 AnySetup *PageSize ++*DefaultPageSize: Letter ++*PageSize Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*FoomaticRIPOptionSetting PageSize=Letter: "-p4 " ++*PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*FoomaticRIPOptionSetting PageSize=A4: "-p1 " ++*PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*FoomaticRIPOptionSetting PageSize=B5jis: "-p2 " ++*PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*FoomaticRIPOptionSetting PageSize=Env10: "-p9 " ++*PageSize EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*FoomaticRIPOptionSetting PageSize=EnvC5: "-p11 " ++*PageSize EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*FoomaticRIPOptionSetting PageSize=EnvDL: "-p12 " ++*PageSize EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*FoomaticRIPOptionSetting PageSize=EnvMonarch: "-p10 " ++*PageSize Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*FoomaticRIPOptionSetting PageSize=Executive: "-p5 " ++*PageSize FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*FoomaticRIPOptionSetting PageSize=FanfoldGermanLegal: "-p6 " ++*PageSize Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*FoomaticRIPOptionSetting PageSize=Folio: "-p6 " ++*PageSize Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*FoomaticRIPOptionSetting PageSize=Legal: "-p7 " ++*CloseUI: *PageSize ++ ++*OpenUI *PageRegion: PickOne ++*OrderDependency: 135 AnySetup *PageRegion ++*DefaultPageRegion: Letter ++*PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*PageRegion EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*PageRegion EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*PageRegion Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*PageRegion FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*PageRegion Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*PageRegion Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*CloseUI: *PageRegion ++ ++*DefaultImageableArea: Letter ++*ImageableArea Letter/Letter: "9 12.00 603 780.00" ++*ImageableArea A4/A4: "9 12.00 586 830.00" ++*ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00" ++*ImageableArea Env10/Env #10: "9 12.00 288 672.00" ++*ImageableArea EnvC5/Env C5: "9 12.00 450 637.00" ++*ImageableArea EnvDL/Env DL: "9 12.00 302 611.00" ++*ImageableArea EnvMonarch/Env Monarch: "9 12.00 270 528.00" ++*ImageableArea Executive/Executive: "9 12.00 513 744.00" ++*ImageableArea FanfoldGermanLegal/Fanfold German Legal: "9 12.00 603 996.00" ++*ImageableArea Folio/Folio: "9 12.00 603 924.00" ++*ImageableArea Legal/Legal: "9 12.00 603 996.00" ++ ++*DefaultPaperDimension: Letter ++*PaperDimension Letter/Letter: "612 792" ++*PaperDimension A4/A4: "595 842" ++*PaperDimension B5jis/B5 (JIS): "518 727" ++*PaperDimension Env10/Env #10: "297 684" ++*PaperDimension EnvC5/Env C5: "459 649" ++*PaperDimension EnvDL/Env DL: "311 623" ++*PaperDimension EnvMonarch/Env Monarch: "279 540" ++*PaperDimension Executive/Executive: "522 756" ++*PaperDimension FanfoldGermanLegal/Fanfold German Legal: "612 1008" ++*PaperDimension Folio/Folio: "612 936" ++*PaperDimension Legal/Legal: "612 1008" ++ ++*OpenUI *MediaType/Media Type: PickOne ++*FoomaticRIPOption MediaType: enum CmdLine A ++*OrderDependency: 150 AnySetup *MediaType ++*DefaultMediaType: plain ++*MediaType plain/Plain Paper: "%% FoomaticRIPOptionSetting: MediaType=plain" ++*FoomaticRIPOptionSetting MediaType=plain: "-m1 " ++*MediaType plain2/Plain Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=plain2" ++*FoomaticRIPOptionSetting MediaType=plain2: "-m8 " ++*MediaType bond/Bond: "%% FoomaticRIPOptionSetting: MediaType=bond" ++*FoomaticRIPOptionSetting MediaType=bond: "-m2 " ++*MediaType bond2/Bond Side 2: "%% FoomaticRIPOptionSetting: MediaType=bond2" ++*FoomaticRIPOptionSetting MediaType=bond2: "-m9 " ++*MediaType envelope/Envelope: "%% FoomaticRIPOptionSetting: MediaType=envelope" ++*FoomaticRIPOptionSetting MediaType=envelope: "-m6 " ++*MediaType labels/Labels: "%% FoomaticRIPOptionSetting: MediaType=labels" ++*FoomaticRIPOptionSetting MediaType=labels: "-m5 " ++*MediaType lwcard/Light Weight Card: "%% FoomaticRIPOptionSetting: MediaType=lwcard" ++*FoomaticRIPOptionSetting MediaType=lwcard: "-m3 " ++*MediaType lwcard2/Light Weight Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwcard2" ++*FoomaticRIPOptionSetting MediaType=lwcard2: "-m10 " ++*MediaType lwgcard/Light Weight Glossy Card: "%% FoomaticRIPOptionSetting: MediaType=lwgcard" ++*FoomaticRIPOptionSetting MediaType=lwgcard: "-m4 " ++*MediaType lwgcard2/Light Weight Glossy Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwgcard2" ++*FoomaticRIPOptionSetting MediaType=lwgcard2: "-m11 " ++*MediaType recycled/Recycled Paper: "%% FoomaticRIPOptionSetting: MediaType=recycled" ++*FoomaticRIPOptionSetting MediaType=recycled: "-m7 " ++*MediaType recycled2/Recycled Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=recycled2" ++*FoomaticRIPOptionSetting MediaType=recycled2: "-m12 " ++*CloseUI: *MediaType ++ ++*OpenUI *Copies/Copies: PickOne ++*FoomaticRIPOption Copies: int CmdLine A ++*FoomaticRIPOptionPrototype Copies: "-n%s " ++*FoomaticRIPOptionRange Copies: 1 100 ++*OrderDependency: 220 AnySetup *Copies ++*DefaultCopies: 1 ++*FoomaticRIPDefaultCopies: 1 ++*Copies 1/1: "%% FoomaticRIPOptionSetting: Copies=1" ++*Copies 2/2: "%% FoomaticRIPOptionSetting: Copies=2" ++*Copies 3/3: "%% FoomaticRIPOptionSetting: Copies=3" ++*Copies 4/4: "%% FoomaticRIPOptionSetting: Copies=4" ++*Copies 5/5: "%% FoomaticRIPOptionSetting: Copies=5" ++*Copies 6/6: "%% FoomaticRIPOptionSetting: Copies=6" ++*Copies 7/7: "%% FoomaticRIPOptionSetting: Copies=7" ++*Copies 8/8: "%% FoomaticRIPOptionSetting: Copies=8" ++*Copies 9/9: "%% FoomaticRIPOptionSetting: Copies=9" ++*Copies 10/10: "%% FoomaticRIPOptionSetting: Copies=10" ++*Copies 11/11: "%% FoomaticRIPOptionSetting: Copies=11" ++*Copies 12/12: "%% FoomaticRIPOptionSetting: Copies=12" ++*Copies 13/13: "%% FoomaticRIPOptionSetting: Copies=13" ++*Copies 14/14: "%% FoomaticRIPOptionSetting: Copies=14" ++*Copies 15/15: "%% FoomaticRIPOptionSetting: Copies=15" ++*Copies 16/16: "%% FoomaticRIPOptionSetting: Copies=16" ++*Copies 17/17: "%% FoomaticRIPOptionSetting: Copies=17" ++*Copies 18/18: "%% FoomaticRIPOptionSetting: Copies=18" ++*Copies 19/19: "%% FoomaticRIPOptionSetting: Copies=19" ++*Copies 20/20: "%% FoomaticRIPOptionSetting: Copies=20" ++*Copies 21/21: "%% FoomaticRIPOptionSetting: Copies=21" ++*Copies 22/22: "%% FoomaticRIPOptionSetting: Copies=22" ++*Copies 23/23: "%% FoomaticRIPOptionSetting: Copies=23" ++*Copies 24/24: "%% FoomaticRIPOptionSetting: Copies=24" ++*Copies 25/25: "%% FoomaticRIPOptionSetting: Copies=25" ++*Copies 26/26: "%% FoomaticRIPOptionSetting: Copies=26" ++*Copies 27/27: "%% FoomaticRIPOptionSetting: Copies=27" ++*Copies 28/28: "%% FoomaticRIPOptionSetting: Copies=28" ++*Copies 29/29: "%% FoomaticRIPOptionSetting: Copies=29" ++*Copies 30/30: "%% FoomaticRIPOptionSetting: Copies=30" ++*Copies 31/31: "%% FoomaticRIPOptionSetting: Copies=31" ++*Copies 32/32: "%% FoomaticRIPOptionSetting: Copies=32" ++*Copies 33/33: "%% FoomaticRIPOptionSetting: Copies=33" ++*Copies 34/34: "%% FoomaticRIPOptionSetting: Copies=34" ++*Copies 35/35: "%% FoomaticRIPOptionSetting: Copies=35" ++*Copies 36/36: "%% FoomaticRIPOptionSetting: Copies=36" ++*Copies 37/37: "%% FoomaticRIPOptionSetting: Copies=37" ++*Copies 38/38: "%% FoomaticRIPOptionSetting: Copies=38" ++*Copies 39/39: "%% FoomaticRIPOptionSetting: Copies=39" ++*Copies 40/40: "%% FoomaticRIPOptionSetting: Copies=40" ++*Copies 41/41: "%% FoomaticRIPOptionSetting: Copies=41" ++*Copies 42/42: "%% FoomaticRIPOptionSetting: Copies=42" ++*Copies 43/43: "%% FoomaticRIPOptionSetting: Copies=43" ++*Copies 44/44: "%% FoomaticRIPOptionSetting: Copies=44" ++*Copies 45/45: "%% FoomaticRIPOptionSetting: Copies=45" ++*Copies 46/46: "%% FoomaticRIPOptionSetting: Copies=46" ++*Copies 47/47: "%% FoomaticRIPOptionSetting: Copies=47" ++*Copies 48/48: "%% FoomaticRIPOptionSetting: Copies=48" ++*Copies 49/49: "%% FoomaticRIPOptionSetting: Copies=49" ++*Copies 50/50: "%% FoomaticRIPOptionSetting: Copies=50" ++*Copies 51/51: "%% FoomaticRIPOptionSetting: Copies=51" ++*Copies 52/52: "%% FoomaticRIPOptionSetting: Copies=52" ++*Copies 53/53: "%% FoomaticRIPOptionSetting: Copies=53" ++*Copies 54/54: "%% FoomaticRIPOptionSetting: Copies=54" ++*Copies 55/55: "%% FoomaticRIPOptionSetting: Copies=55" ++*Copies 56/56: "%% FoomaticRIPOptionSetting: Copies=56" ++*Copies 57/57: "%% FoomaticRIPOptionSetting: Copies=57" ++*Copies 58/58: "%% FoomaticRIPOptionSetting: Copies=58" ++*Copies 59/59: "%% FoomaticRIPOptionSetting: Copies=59" ++*Copies 60/60: "%% FoomaticRIPOptionSetting: Copies=60" ++*Copies 61/61: "%% FoomaticRIPOptionSetting: Copies=61" ++*Copies 62/62: "%% FoomaticRIPOptionSetting: Copies=62" ++*Copies 63/63: "%% FoomaticRIPOptionSetting: Copies=63" ++*Copies 64/64: "%% FoomaticRIPOptionSetting: Copies=64" ++*Copies 65/65: "%% FoomaticRIPOptionSetting: Copies=65" ++*Copies 66/66: "%% FoomaticRIPOptionSetting: Copies=66" ++*Copies 67/67: "%% FoomaticRIPOptionSetting: Copies=67" ++*Copies 68/68: "%% FoomaticRIPOptionSetting: Copies=68" ++*Copies 69/69: "%% FoomaticRIPOptionSetting: Copies=69" ++*Copies 70/70: "%% FoomaticRIPOptionSetting: Copies=70" ++*Copies 71/71: "%% FoomaticRIPOptionSetting: Copies=71" ++*Copies 72/72: "%% FoomaticRIPOptionSetting: Copies=72" ++*Copies 73/73: "%% FoomaticRIPOptionSetting: Copies=73" ++*Copies 74/74: "%% FoomaticRIPOptionSetting: Copies=74" ++*Copies 75/75: "%% FoomaticRIPOptionSetting: Copies=75" ++*Copies 76/76: "%% FoomaticRIPOptionSetting: Copies=76" ++*Copies 77/77: "%% FoomaticRIPOptionSetting: Copies=77" ++*Copies 78/78: "%% FoomaticRIPOptionSetting: Copies=78" ++*Copies 79/79: "%% FoomaticRIPOptionSetting: Copies=79" ++*Copies 80/80: "%% FoomaticRIPOptionSetting: Copies=80" ++*Copies 81/81: "%% FoomaticRIPOptionSetting: Copies=81" ++*Copies 82/82: "%% FoomaticRIPOptionSetting: Copies=82" ++*Copies 83/83: "%% FoomaticRIPOptionSetting: Copies=83" ++*Copies 84/84: "%% FoomaticRIPOptionSetting: Copies=84" ++*Copies 85/85: "%% FoomaticRIPOptionSetting: Copies=85" ++*Copies 86/86: "%% FoomaticRIPOptionSetting: Copies=86" ++*Copies 87/87: "%% FoomaticRIPOptionSetting: Copies=87" ++*Copies 88/88: "%% FoomaticRIPOptionSetting: Copies=88" ++*Copies 89/89: "%% FoomaticRIPOptionSetting: Copies=89" ++*Copies 90/90: "%% FoomaticRIPOptionSetting: Copies=90" ++*Copies 91/91: "%% FoomaticRIPOptionSetting: Copies=91" ++*Copies 92/92: "%% FoomaticRIPOptionSetting: Copies=92" ++*Copies 93/93: "%% FoomaticRIPOptionSetting: Copies=93" ++*Copies 94/94: "%% FoomaticRIPOptionSetting: Copies=94" ++*Copies 95/95: "%% FoomaticRIPOptionSetting: Copies=95" ++*Copies 96/96: "%% FoomaticRIPOptionSetting: Copies=96" ++*Copies 97/97: "%% FoomaticRIPOptionSetting: Copies=97" ++*Copies 98/98: "%% FoomaticRIPOptionSetting: Copies=98" ++*Copies 99/99: "%% FoomaticRIPOptionSetting: Copies=99" ++*Copies 100/100: "%% FoomaticRIPOptionSetting: Copies=100" ++*CloseUI: *Copies ++ ++*CloseGroup: General ++ ++*OpenGroup: Adjustment/Adjustment ++ ++*OpenUI *halftone/Halftone Algorithm: PickOne ++*FoomaticRIPOption halftone: enum CmdLine A ++*OrderDependency: 110 AnySetup *halftone ++*Defaulthalftone: default ++*halftone default/Default: "%% FoomaticRIPOptionSetting: halftone=default" ++*FoomaticRIPOptionSetting halftone=default: " " ++*halftone as/Accurate Screens (better): "%% FoomaticRIPOptionSetting: halftone=as" ++*FoomaticRIPOptionSetting halftone=as: " -qas " ++*halftone standard/Standard: "%% FoomaticRIPOptionSetting: halftone=standard" ++*FoomaticRIPOptionSetting halftone=standard: " -q1 " ++*halftone wts/Well Tempered Screens (best): "%% FoomaticRIPOptionSetting: halftone=wts" ++*FoomaticRIPOptionSetting halftone=wts: " -qwts " ++*CloseUI: *halftone ++ ++*OpenUI *ICM/ICM Color Profile: PickOne ++*FoomaticRIPOption ICM: enum CmdLine A ++*OrderDependency: 300 AnySetup *ICM ++*DefaultICM: none ++*ICM none/No ICM color correction: "%% FoomaticRIPOptionSetting: ICM=none" ++*FoomaticRIPOptionSetting ICM=none: "-C10 -Gnone.icm " ++*ICM testing/File testing.icm: "%% FoomaticRIPOptionSetting: ICM=testing" ++*FoomaticRIPOptionSetting ICM=testing: "-C10 -Gtesting.icm " ++*ICM testing2/File testing2.icm: "%% FoomaticRIPOptionSetting: ICM=testing2" ++*FoomaticRIPOptionSetting ICM=testing2: "-C10 -Gtesting2.icm " ++*ICM testing3/File testing3.icm: "%% FoomaticRIPOptionSetting: ICM=testing3" ++*FoomaticRIPOptionSetting ICM=testing3: "-C10 -Gtesting3.icm " ++*CloseUI: *ICM ++ ++*CloseGroup: Adjustment ++ ++*OpenGroup: Miscellaneous/Miscellaneous ++ ++*OpenUI *NupOrient/N-up Orientation: PickOne ++*FoomaticRIPOption NupOrient: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupOrient ++*DefaultNupOrient: port ++*NupOrient land/Landscape: "%% FoomaticRIPOptionSetting: NupOrient=land" ++*FoomaticRIPOptionSetting NupOrient=land: "-ol " ++*NupOrient port/Portrait: "%% FoomaticRIPOptionSetting: NupOrient=port" ++*FoomaticRIPOptionSetting NupOrient=port: " " ++*NupOrient sea/Seascape: "%% FoomaticRIPOptionSetting: NupOrient=sea" ++*FoomaticRIPOptionSetting NupOrient=sea: "-os " ++*CloseUI: *NupOrient ++ ++*OpenUI *NupPages/N-up Printing: PickOne ++*FoomaticRIPOption NupPages: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupPages ++*DefaultNupPages: 1up ++*NupPages 1up/1-up: "%% FoomaticRIPOptionSetting: NupPages=1up" ++*FoomaticRIPOptionSetting NupPages=1up: " " ++*NupPages 2up/2-up: "%% FoomaticRIPOptionSetting: NupPages=2up" ++*FoomaticRIPOptionSetting NupPages=2up: "-2 " ++*NupPages 3up/3-up: "%% FoomaticRIPOptionSetting: NupPages=3up" ++*FoomaticRIPOptionSetting NupPages=3up: "-3 " ++*NupPages 4up/4-up: "%% FoomaticRIPOptionSetting: NupPages=4up" ++*FoomaticRIPOptionSetting NupPages=4up: "-4 " ++*NupPages 6up/6-up: "%% FoomaticRIPOptionSetting: NupPages=6up" ++*FoomaticRIPOptionSetting NupPages=6up: "-6 " ++*NupPages 8up/8-up: "%% FoomaticRIPOptionSetting: NupPages=8up" ++*FoomaticRIPOptionSetting NupPages=8up: "-8 " ++*NupPages 10up/10-up: "%% FoomaticRIPOptionSetting: NupPages=10up" ++*FoomaticRIPOptionSetting NupPages=10up: "-10 " ++*NupPages 12up/12-up: "%% FoomaticRIPOptionSetting: NupPages=12up" ++*FoomaticRIPOptionSetting NupPages=12up: "-12 " ++*NupPages 14up/14-up: "%% FoomaticRIPOptionSetting: NupPages=14up" ++*FoomaticRIPOptionSetting NupPages=14up: "-14 " ++*NupPages 15up/15-up: "%% FoomaticRIPOptionSetting: NupPages=15up" ++*FoomaticRIPOptionSetting NupPages=15up: "-15 " ++*NupPages 16up/16-up: "%% FoomaticRIPOptionSetting: NupPages=16up" ++*FoomaticRIPOptionSetting NupPages=16up: "-16 " ++*NupPages 18up/18-up: "%% FoomaticRIPOptionSetting: NupPages=18up" ++*FoomaticRIPOptionSetting NupPages=18up: "-18 " ++*CloseUI: *NupPages ++ ++*CloseGroup: Miscellaneous ++ ++ ++*% Generic boilerplate PPD stuff as standard PostScript fonts and so on ++ ++*DefaultFont: Courier ++*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM ++*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM ++*Font Bookman-Demi: Standard "(001.004S)" Standard ROM ++*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM ++*Font Bookman-Light: Standard "(001.004S)" Standard ROM ++*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM ++*Font Courier: Standard "(002.004S)" Standard ROM ++*Font Courier-Bold: Standard "(002.004S)" Standard ROM ++*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM ++*Font Courier-Oblique: Standard "(002.004S)" Standard ROM ++*Font Helvetica: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM ++*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM ++*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM ++*Font Palatino-Bold: Standard "(001.005S)" Standard ROM ++*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Italic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Roman: Standard "(001.005S)" Standard ROM ++*Font Symbol: Special "(001.007S)" Special ROM ++*Font Times-Bold: Standard "(001.007S)" Standard ROM ++*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM ++*Font Times-Italic: Standard "(001.007S)" Standard ROM ++*Font Times-Roman: Standard "(001.007S)" Standard ROM ++*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM ++*Font ZapfDingbats: Special "(001.004S)" Standard ROM ++ +--- foo2zjs/PPD/Dell-C1660.ppd 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/PPD/Dell-C1660.ppd 2014-04-01 11:06:30.000000000 +0000 +@@ -0,0 +1,433 @@ ++*PPD-Adobe: "4.3" ++*% ++*% For information on using this, and to obtain the required backend ++*% script, consult http://www.openprinting.org/ ++*% ++*% This file is published under the GNU General Public License ++*% ++*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with ++*% all programs and environments which use PPD files for dealing with ++*% printer capability information. The printer must be configured with the ++*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This ++*% file and "foomatic-rip" work together to support PPD-controlled printer ++*% driver option access with arbitrary free software printer drivers and ++*% printing spoolers. ++*% ++*% To save this file on your disk, wait until the download has completed ++*% (the animation of the browser logo must stop) and then use the ++*% "Save as..." command in the "File" menu of your browser or in the ++*% pop-up manu when you click on this document with the right mouse button. ++*% DO NOT cut and paste this file into an editor with your mouse. This can ++*% introduce additional line breaks which lead to unexpected results. ++*% ++*% You may save this file as 'Dell-C1660-foo2hbpl1.ppd' ++*% ++*% ++*FormatVersion: "4.3" ++*FileVersion: "1.1" ++*LanguageVersion: English ++*LanguageEncoding: ISOLatin1 ++*PCFileName: "FOO2HBPL.PPD" ++*Manufacturer: "Dell" ++*Product: "(C1660)" ++*cupsVersion: 1.0 ++*cupsManualCopies: True ++*cupsModelNumber: 2 ++*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" ++*%pprRIP: foomatic-rip other ++*ModelName: "Dell C1660" ++*ShortNickName: "Dell C1660 foo2hbpl1" ++*NickName: "Dell C1660 Foomatic/foo2hbpl1 (recommended)" ++*PSVersion: "(3010.000) 550" ++*PSVersion: "(3010.000) 651" ++*PSVersion: "(3010.000) 652" ++*PSVersion: "(3010.000) 653" ++*PSVersion: "(3010.000) 704" ++*PSVersion: "(3010.000) 705" ++*PSVersion: "(3010.000) 800" ++*LanguageLevel: "3" ++*ColorDevice: True ++*DefaultColorSpace: RGB ++*FileSystem: False ++*Throughput: "1" ++*LandscapeOrientation: Plus90 ++*TTRasterizer: Type42 ++*1284DeviceID: "DRV:Dfoo2hbpl1,R1,M0,TF;" ++ ++*driverName foo2hbpl1/foo2hbpl1: "" ++*driverType F/Filter: "" ++*driverUrl: "http://foo2hbpl.rkkda.com/" ++*driverObsolete: False ++ ++ ++ ++ ++*HWMargins: 9 12.00 9 12 ++*VariablePaperSize: True ++*MaxMediaWidth: 100000 ++*MaxMediaHeight: 100000 ++*NonUIOrderDependency: 135 AnySetup *CustomPageSize ++*CustomPageSize True: "pop pop pop pop pop ++%% FoomaticRIPOptionSetting: PageSize=Custom" ++*End ++*FoomaticRIPOptionSetting PageSize=Custom: "-pCustom.%0x%1 " ++*ParamCustomPageSize Width: 1 points 36 100000 ++*ParamCustomPageSize Height: 2 points 36 100000 ++*ParamCustomPageSize Orientation: 3 int 0 0 ++*ParamCustomPageSize WidthOffset: 4 points 0 0 ++*ParamCustomPageSize HeightOffset: 5 points 0 0 ++ ++*FoomaticIDs: Dell-C1660 foo2hbpl1 ++*FoomaticRIPCommandLine: "foo2hbpl1-wrapper %A" ++ ++*OpenGroup: General/General ++ ++*OpenUI *Quality/Printing Quality: PickOne ++*FoomaticRIPOption Quality: enum CmdLine A ++*OrderDependency: 110 AnySetup *Quality ++*DefaultQuality: normal ++*Quality draft/Draft: "%% FoomaticRIPOptionSetting: Quality=draft" ++*FoomaticRIPOptionSetting Quality=draft: " -t " ++*Quality normal/Normal: "%% FoomaticRIPOptionSetting: Quality=normal" ++*FoomaticRIPOptionSetting Quality=normal: " " ++*CloseUI: *Quality ++ ++*OpenUI *ColorMode/Color Mode: PickOne ++*FoomaticRIPOption ColorMode: enum CmdLine A ++*OrderDependency: 120 AnySetup *ColorMode ++*DefaultColorMode: Monochrome ++*ColorMode Color/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" ++*FoomaticRIPOptionSetting ColorMode=Color: "-c " ++*ColorMode Monochrome/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" ++*FoomaticRIPOptionSetting ColorMode=Monochrome: " " ++*CloseUI: *ColorMode ++ ++*OpenUI *PageSize/Page Size: PickOne ++*FoomaticRIPOption PageSize: enum CmdLine A ++*OrderDependency: 135 AnySetup *PageSize ++*DefaultPageSize: Letter ++*PageSize Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*FoomaticRIPOptionSetting PageSize=Letter: "-p4 " ++*PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*FoomaticRIPOptionSetting PageSize=A4: "-p1 " ++*PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*FoomaticRIPOptionSetting PageSize=B5jis: "-p2 " ++*PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*FoomaticRIPOptionSetting PageSize=Env10: "-p9 " ++*PageSize EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*FoomaticRIPOptionSetting PageSize=EnvC5: "-p11 " ++*PageSize EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*FoomaticRIPOptionSetting PageSize=EnvDL: "-p12 " ++*PageSize EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*FoomaticRIPOptionSetting PageSize=EnvMonarch: "-p10 " ++*PageSize Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*FoomaticRIPOptionSetting PageSize=Executive: "-p5 " ++*PageSize FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*FoomaticRIPOptionSetting PageSize=FanfoldGermanLegal: "-p6 " ++*PageSize Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*FoomaticRIPOptionSetting PageSize=Folio: "-p6 " ++*PageSize Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*FoomaticRIPOptionSetting PageSize=Legal: "-p7 " ++*CloseUI: *PageSize ++ ++*OpenUI *PageRegion: PickOne ++*OrderDependency: 135 AnySetup *PageRegion ++*DefaultPageRegion: Letter ++*PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*PageRegion EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*PageRegion EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*PageRegion Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*PageRegion FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*PageRegion Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*PageRegion Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*CloseUI: *PageRegion ++ ++*DefaultImageableArea: Letter ++*ImageableArea Letter/Letter: "9 12.00 603 780.00" ++*ImageableArea A4/A4: "9 12.00 586 830.00" ++*ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00" ++*ImageableArea Env10/Env #10: "9 12.00 288 672.00" ++*ImageableArea EnvC5/Env C5: "9 12.00 450 637.00" ++*ImageableArea EnvDL/Env DL: "9 12.00 302 611.00" ++*ImageableArea EnvMonarch/Env Monarch: "9 12.00 270 528.00" ++*ImageableArea Executive/Executive: "9 12.00 513 744.00" ++*ImageableArea FanfoldGermanLegal/Fanfold German Legal: "9 12.00 603 996.00" ++*ImageableArea Folio/Folio: "9 12.00 603 924.00" ++*ImageableArea Legal/Legal: "9 12.00 603 996.00" ++ ++*DefaultPaperDimension: Letter ++*PaperDimension Letter/Letter: "612 792" ++*PaperDimension A4/A4: "595 842" ++*PaperDimension B5jis/B5 (JIS): "518 727" ++*PaperDimension Env10/Env #10: "297 684" ++*PaperDimension EnvC5/Env C5: "459 649" ++*PaperDimension EnvDL/Env DL: "311 623" ++*PaperDimension EnvMonarch/Env Monarch: "279 540" ++*PaperDimension Executive/Executive: "522 756" ++*PaperDimension FanfoldGermanLegal/Fanfold German Legal: "612 1008" ++*PaperDimension Folio/Folio: "612 936" ++*PaperDimension Legal/Legal: "612 1008" ++ ++*OpenUI *MediaType/Media Type: PickOne ++*FoomaticRIPOption MediaType: enum CmdLine A ++*OrderDependency: 150 AnySetup *MediaType ++*DefaultMediaType: plain ++*MediaType plain/Plain Paper: "%% FoomaticRIPOptionSetting: MediaType=plain" ++*FoomaticRIPOptionSetting MediaType=plain: "-m1 " ++*MediaType plain2/Plain Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=plain2" ++*FoomaticRIPOptionSetting MediaType=plain2: "-m8 " ++*MediaType bond/Bond: "%% FoomaticRIPOptionSetting: MediaType=bond" ++*FoomaticRIPOptionSetting MediaType=bond: "-m2 " ++*MediaType bond2/Bond Side 2: "%% FoomaticRIPOptionSetting: MediaType=bond2" ++*FoomaticRIPOptionSetting MediaType=bond2: "-m9 " ++*MediaType envelope/Envelope: "%% FoomaticRIPOptionSetting: MediaType=envelope" ++*FoomaticRIPOptionSetting MediaType=envelope: "-m6 " ++*MediaType labels/Labels: "%% FoomaticRIPOptionSetting: MediaType=labels" ++*FoomaticRIPOptionSetting MediaType=labels: "-m5 " ++*MediaType lwcard/Light Weight Card: "%% FoomaticRIPOptionSetting: MediaType=lwcard" ++*FoomaticRIPOptionSetting MediaType=lwcard: "-m3 " ++*MediaType lwcard2/Light Weight Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwcard2" ++*FoomaticRIPOptionSetting MediaType=lwcard2: "-m10 " ++*MediaType lwgcard/Light Weight Glossy Card: "%% FoomaticRIPOptionSetting: MediaType=lwgcard" ++*FoomaticRIPOptionSetting MediaType=lwgcard: "-m4 " ++*MediaType lwgcard2/Light Weight Glossy Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwgcard2" ++*FoomaticRIPOptionSetting MediaType=lwgcard2: "-m11 " ++*MediaType recycled/Recycled Paper: "%% FoomaticRIPOptionSetting: MediaType=recycled" ++*FoomaticRIPOptionSetting MediaType=recycled: "-m7 " ++*MediaType recycled2/Recycled Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=recycled2" ++*FoomaticRIPOptionSetting MediaType=recycled2: "-m12 " ++*CloseUI: *MediaType ++ ++*OpenUI *Copies/Copies: PickOne ++*FoomaticRIPOption Copies: int CmdLine A ++*FoomaticRIPOptionPrototype Copies: "-n%s " ++*FoomaticRIPOptionRange Copies: 1 100 ++*OrderDependency: 220 AnySetup *Copies ++*DefaultCopies: 1 ++*FoomaticRIPDefaultCopies: 1 ++*Copies 1/1: "%% FoomaticRIPOptionSetting: Copies=1" ++*Copies 2/2: "%% FoomaticRIPOptionSetting: Copies=2" ++*Copies 3/3: "%% FoomaticRIPOptionSetting: Copies=3" ++*Copies 4/4: "%% FoomaticRIPOptionSetting: Copies=4" ++*Copies 5/5: "%% FoomaticRIPOptionSetting: Copies=5" ++*Copies 6/6: "%% FoomaticRIPOptionSetting: Copies=6" ++*Copies 7/7: "%% FoomaticRIPOptionSetting: Copies=7" ++*Copies 8/8: "%% FoomaticRIPOptionSetting: Copies=8" ++*Copies 9/9: "%% FoomaticRIPOptionSetting: Copies=9" ++*Copies 10/10: "%% FoomaticRIPOptionSetting: Copies=10" ++*Copies 11/11: "%% FoomaticRIPOptionSetting: Copies=11" ++*Copies 12/12: "%% FoomaticRIPOptionSetting: Copies=12" ++*Copies 13/13: "%% FoomaticRIPOptionSetting: Copies=13" ++*Copies 14/14: "%% FoomaticRIPOptionSetting: Copies=14" ++*Copies 15/15: "%% FoomaticRIPOptionSetting: Copies=15" ++*Copies 16/16: "%% FoomaticRIPOptionSetting: Copies=16" ++*Copies 17/17: "%% FoomaticRIPOptionSetting: Copies=17" ++*Copies 18/18: "%% FoomaticRIPOptionSetting: Copies=18" ++*Copies 19/19: "%% FoomaticRIPOptionSetting: Copies=19" ++*Copies 20/20: "%% FoomaticRIPOptionSetting: Copies=20" ++*Copies 21/21: "%% FoomaticRIPOptionSetting: Copies=21" ++*Copies 22/22: "%% FoomaticRIPOptionSetting: Copies=22" ++*Copies 23/23: "%% FoomaticRIPOptionSetting: Copies=23" ++*Copies 24/24: "%% FoomaticRIPOptionSetting: Copies=24" ++*Copies 25/25: "%% FoomaticRIPOptionSetting: Copies=25" ++*Copies 26/26: "%% FoomaticRIPOptionSetting: Copies=26" ++*Copies 27/27: "%% FoomaticRIPOptionSetting: Copies=27" ++*Copies 28/28: "%% FoomaticRIPOptionSetting: Copies=28" ++*Copies 29/29: "%% FoomaticRIPOptionSetting: Copies=29" ++*Copies 30/30: "%% FoomaticRIPOptionSetting: Copies=30" ++*Copies 31/31: "%% FoomaticRIPOptionSetting: Copies=31" ++*Copies 32/32: "%% FoomaticRIPOptionSetting: Copies=32" ++*Copies 33/33: "%% FoomaticRIPOptionSetting: Copies=33" ++*Copies 34/34: "%% FoomaticRIPOptionSetting: Copies=34" ++*Copies 35/35: "%% FoomaticRIPOptionSetting: Copies=35" ++*Copies 36/36: "%% FoomaticRIPOptionSetting: Copies=36" ++*Copies 37/37: "%% FoomaticRIPOptionSetting: Copies=37" ++*Copies 38/38: "%% FoomaticRIPOptionSetting: Copies=38" ++*Copies 39/39: "%% FoomaticRIPOptionSetting: Copies=39" ++*Copies 40/40: "%% FoomaticRIPOptionSetting: Copies=40" ++*Copies 41/41: "%% FoomaticRIPOptionSetting: Copies=41" ++*Copies 42/42: "%% FoomaticRIPOptionSetting: Copies=42" ++*Copies 43/43: "%% FoomaticRIPOptionSetting: Copies=43" ++*Copies 44/44: "%% FoomaticRIPOptionSetting: Copies=44" ++*Copies 45/45: "%% FoomaticRIPOptionSetting: Copies=45" ++*Copies 46/46: "%% FoomaticRIPOptionSetting: Copies=46" ++*Copies 47/47: "%% FoomaticRIPOptionSetting: Copies=47" ++*Copies 48/48: "%% FoomaticRIPOptionSetting: Copies=48" ++*Copies 49/49: "%% FoomaticRIPOptionSetting: Copies=49" ++*Copies 50/50: "%% FoomaticRIPOptionSetting: Copies=50" ++*Copies 51/51: "%% FoomaticRIPOptionSetting: Copies=51" ++*Copies 52/52: "%% FoomaticRIPOptionSetting: Copies=52" ++*Copies 53/53: "%% FoomaticRIPOptionSetting: Copies=53" ++*Copies 54/54: "%% FoomaticRIPOptionSetting: Copies=54" ++*Copies 55/55: "%% FoomaticRIPOptionSetting: Copies=55" ++*Copies 56/56: "%% FoomaticRIPOptionSetting: Copies=56" ++*Copies 57/57: "%% FoomaticRIPOptionSetting: Copies=57" ++*Copies 58/58: "%% FoomaticRIPOptionSetting: Copies=58" ++*Copies 59/59: "%% FoomaticRIPOptionSetting: Copies=59" ++*Copies 60/60: "%% FoomaticRIPOptionSetting: Copies=60" ++*Copies 61/61: "%% FoomaticRIPOptionSetting: Copies=61" ++*Copies 62/62: "%% FoomaticRIPOptionSetting: Copies=62" ++*Copies 63/63: "%% FoomaticRIPOptionSetting: Copies=63" ++*Copies 64/64: "%% FoomaticRIPOptionSetting: Copies=64" ++*Copies 65/65: "%% FoomaticRIPOptionSetting: Copies=65" ++*Copies 66/66: "%% FoomaticRIPOptionSetting: Copies=66" ++*Copies 67/67: "%% FoomaticRIPOptionSetting: Copies=67" ++*Copies 68/68: "%% FoomaticRIPOptionSetting: Copies=68" ++*Copies 69/69: "%% FoomaticRIPOptionSetting: Copies=69" ++*Copies 70/70: "%% FoomaticRIPOptionSetting: Copies=70" ++*Copies 71/71: "%% FoomaticRIPOptionSetting: Copies=71" ++*Copies 72/72: "%% FoomaticRIPOptionSetting: Copies=72" ++*Copies 73/73: "%% FoomaticRIPOptionSetting: Copies=73" ++*Copies 74/74: "%% FoomaticRIPOptionSetting: Copies=74" ++*Copies 75/75: "%% FoomaticRIPOptionSetting: Copies=75" ++*Copies 76/76: "%% FoomaticRIPOptionSetting: Copies=76" ++*Copies 77/77: "%% FoomaticRIPOptionSetting: Copies=77" ++*Copies 78/78: "%% FoomaticRIPOptionSetting: Copies=78" ++*Copies 79/79: "%% FoomaticRIPOptionSetting: Copies=79" ++*Copies 80/80: "%% FoomaticRIPOptionSetting: Copies=80" ++*Copies 81/81: "%% FoomaticRIPOptionSetting: Copies=81" ++*Copies 82/82: "%% FoomaticRIPOptionSetting: Copies=82" ++*Copies 83/83: "%% FoomaticRIPOptionSetting: Copies=83" ++*Copies 84/84: "%% FoomaticRIPOptionSetting: Copies=84" ++*Copies 85/85: "%% FoomaticRIPOptionSetting: Copies=85" ++*Copies 86/86: "%% FoomaticRIPOptionSetting: Copies=86" ++*Copies 87/87: "%% FoomaticRIPOptionSetting: Copies=87" ++*Copies 88/88: "%% FoomaticRIPOptionSetting: Copies=88" ++*Copies 89/89: "%% FoomaticRIPOptionSetting: Copies=89" ++*Copies 90/90: "%% FoomaticRIPOptionSetting: Copies=90" ++*Copies 91/91: "%% FoomaticRIPOptionSetting: Copies=91" ++*Copies 92/92: "%% FoomaticRIPOptionSetting: Copies=92" ++*Copies 93/93: "%% FoomaticRIPOptionSetting: Copies=93" ++*Copies 94/94: "%% FoomaticRIPOptionSetting: Copies=94" ++*Copies 95/95: "%% FoomaticRIPOptionSetting: Copies=95" ++*Copies 96/96: "%% FoomaticRIPOptionSetting: Copies=96" ++*Copies 97/97: "%% FoomaticRIPOptionSetting: Copies=97" ++*Copies 98/98: "%% FoomaticRIPOptionSetting: Copies=98" ++*Copies 99/99: "%% FoomaticRIPOptionSetting: Copies=99" ++*Copies 100/100: "%% FoomaticRIPOptionSetting: Copies=100" ++*CloseUI: *Copies ++ ++*CloseGroup: General ++ ++*OpenGroup: Adjustment/Adjustment ++ ++*OpenUI *halftone/Halftone Algorithm: PickOne ++*FoomaticRIPOption halftone: enum CmdLine A ++*OrderDependency: 110 AnySetup *halftone ++*Defaulthalftone: default ++*halftone default/Default: "%% FoomaticRIPOptionSetting: halftone=default" ++*FoomaticRIPOptionSetting halftone=default: " " ++*halftone as/Accurate Screens (better): "%% FoomaticRIPOptionSetting: halftone=as" ++*FoomaticRIPOptionSetting halftone=as: " -qas " ++*halftone standard/Standard: "%% FoomaticRIPOptionSetting: halftone=standard" ++*FoomaticRIPOptionSetting halftone=standard: " -q1 " ++*halftone wts/Well Tempered Screens (best): "%% FoomaticRIPOptionSetting: halftone=wts" ++*FoomaticRIPOptionSetting halftone=wts: " -qwts " ++*CloseUI: *halftone ++ ++*OpenUI *ICM/ICM Color Profile: PickOne ++*FoomaticRIPOption ICM: enum CmdLine A ++*OrderDependency: 300 AnySetup *ICM ++*DefaultICM: none ++*ICM none/No ICM color correction: "%% FoomaticRIPOptionSetting: ICM=none" ++*FoomaticRIPOptionSetting ICM=none: "-C10 -Gnone.icm " ++*ICM testing/File testing.icm: "%% FoomaticRIPOptionSetting: ICM=testing" ++*FoomaticRIPOptionSetting ICM=testing: "-C10 -Gtesting.icm " ++*ICM testing2/File testing2.icm: "%% FoomaticRIPOptionSetting: ICM=testing2" ++*FoomaticRIPOptionSetting ICM=testing2: "-C10 -Gtesting2.icm " ++*ICM testing3/File testing3.icm: "%% FoomaticRIPOptionSetting: ICM=testing3" ++*FoomaticRIPOptionSetting ICM=testing3: "-C10 -Gtesting3.icm " ++*CloseUI: *ICM ++ ++*CloseGroup: Adjustment ++ ++*OpenGroup: Miscellaneous/Miscellaneous ++ ++*OpenUI *NupOrient/N-up Orientation: PickOne ++*FoomaticRIPOption NupOrient: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupOrient ++*DefaultNupOrient: port ++*NupOrient land/Landscape: "%% FoomaticRIPOptionSetting: NupOrient=land" ++*FoomaticRIPOptionSetting NupOrient=land: "-ol " ++*NupOrient port/Portrait: "%% FoomaticRIPOptionSetting: NupOrient=port" ++*FoomaticRIPOptionSetting NupOrient=port: " " ++*NupOrient sea/Seascape: "%% FoomaticRIPOptionSetting: NupOrient=sea" ++*FoomaticRIPOptionSetting NupOrient=sea: "-os " ++*CloseUI: *NupOrient ++ ++*OpenUI *NupPages/N-up Printing: PickOne ++*FoomaticRIPOption NupPages: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupPages ++*DefaultNupPages: 1up ++*NupPages 1up/1-up: "%% FoomaticRIPOptionSetting: NupPages=1up" ++*FoomaticRIPOptionSetting NupPages=1up: " " ++*NupPages 2up/2-up: "%% FoomaticRIPOptionSetting: NupPages=2up" ++*FoomaticRIPOptionSetting NupPages=2up: "-2 " ++*NupPages 3up/3-up: "%% FoomaticRIPOptionSetting: NupPages=3up" ++*FoomaticRIPOptionSetting NupPages=3up: "-3 " ++*NupPages 4up/4-up: "%% FoomaticRIPOptionSetting: NupPages=4up" ++*FoomaticRIPOptionSetting NupPages=4up: "-4 " ++*NupPages 6up/6-up: "%% FoomaticRIPOptionSetting: NupPages=6up" ++*FoomaticRIPOptionSetting NupPages=6up: "-6 " ++*NupPages 8up/8-up: "%% FoomaticRIPOptionSetting: NupPages=8up" ++*FoomaticRIPOptionSetting NupPages=8up: "-8 " ++*NupPages 10up/10-up: "%% FoomaticRIPOptionSetting: NupPages=10up" ++*FoomaticRIPOptionSetting NupPages=10up: "-10 " ++*NupPages 12up/12-up: "%% FoomaticRIPOptionSetting: NupPages=12up" ++*FoomaticRIPOptionSetting NupPages=12up: "-12 " ++*NupPages 14up/14-up: "%% FoomaticRIPOptionSetting: NupPages=14up" ++*FoomaticRIPOptionSetting NupPages=14up: "-14 " ++*NupPages 15up/15-up: "%% FoomaticRIPOptionSetting: NupPages=15up" ++*FoomaticRIPOptionSetting NupPages=15up: "-15 " ++*NupPages 16up/16-up: "%% FoomaticRIPOptionSetting: NupPages=16up" ++*FoomaticRIPOptionSetting NupPages=16up: "-16 " ++*NupPages 18up/18-up: "%% FoomaticRIPOptionSetting: NupPages=18up" ++*FoomaticRIPOptionSetting NupPages=18up: "-18 " ++*CloseUI: *NupPages ++ ++*CloseGroup: Miscellaneous ++ ++ ++*% Generic boilerplate PPD stuff as standard PostScript fonts and so on ++ ++*DefaultFont: Courier ++*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM ++*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM ++*Font Bookman-Demi: Standard "(001.004S)" Standard ROM ++*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM ++*Font Bookman-Light: Standard "(001.004S)" Standard ROM ++*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM ++*Font Courier: Standard "(002.004S)" Standard ROM ++*Font Courier-Bold: Standard "(002.004S)" Standard ROM ++*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM ++*Font Courier-Oblique: Standard "(002.004S)" Standard ROM ++*Font Helvetica: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM ++*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM ++*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM ++*Font Palatino-Bold: Standard "(001.005S)" Standard ROM ++*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Italic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Roman: Standard "(001.005S)" Standard ROM ++*Font Symbol: Special "(001.007S)" Special ROM ++*Font Times-Bold: Standard "(001.007S)" Standard ROM ++*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM ++*Font Times-Italic: Standard "(001.007S)" Standard ROM ++*Font Times-Roman: Standard "(001.007S)" Standard ROM ++*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM ++*Font ZapfDingbats: Special "(001.004S)" Standard ROM ++ +--- foo2zjs/PPD/Dell-C1760.ppd 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/PPD/Dell-C1760.ppd 2014-04-01 11:06:30.000000000 +0000 +@@ -0,0 +1,433 @@ ++*PPD-Adobe: "4.3" ++*% ++*% For information on using this, and to obtain the required backend ++*% script, consult http://www.openprinting.org/ ++*% ++*% This file is published under the GNU General Public License ++*% ++*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with ++*% all programs and environments which use PPD files for dealing with ++*% printer capability information. The printer must be configured with the ++*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This ++*% file and "foomatic-rip" work together to support PPD-controlled printer ++*% driver option access with arbitrary free software printer drivers and ++*% printing spoolers. ++*% ++*% To save this file on your disk, wait until the download has completed ++*% (the animation of the browser logo must stop) and then use the ++*% "Save as..." command in the "File" menu of your browser or in the ++*% pop-up manu when you click on this document with the right mouse button. ++*% DO NOT cut and paste this file into an editor with your mouse. This can ++*% introduce additional line breaks which lead to unexpected results. ++*% ++*% You may save this file as 'Dell-C1760-foo2hbpl1.ppd' ++*% ++*% ++*FormatVersion: "4.3" ++*FileVersion: "1.1" ++*LanguageVersion: English ++*LanguageEncoding: ISOLatin1 ++*PCFileName: "FOO2HBPL.PPD" ++*Manufacturer: "Dell" ++*Product: "(C1760)" ++*cupsVersion: 1.0 ++*cupsManualCopies: True ++*cupsModelNumber: 2 ++*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" ++*%pprRIP: foomatic-rip other ++*ModelName: "Dell C1760" ++*ShortNickName: "Dell C1760 foo2hbpl1" ++*NickName: "Dell C1760 Foomatic/foo2hbpl1 (recommended)" ++*PSVersion: "(3010.000) 550" ++*PSVersion: "(3010.000) 651" ++*PSVersion: "(3010.000) 652" ++*PSVersion: "(3010.000) 653" ++*PSVersion: "(3010.000) 704" ++*PSVersion: "(3010.000) 705" ++*PSVersion: "(3010.000) 800" ++*LanguageLevel: "3" ++*ColorDevice: True ++*DefaultColorSpace: RGB ++*FileSystem: False ++*Throughput: "1" ++*LandscapeOrientation: Plus90 ++*TTRasterizer: Type42 ++*1284DeviceID: "DRV:Dfoo2hbpl1,R1,M0,TF;" ++ ++*driverName foo2hbpl1/foo2hbpl1: "" ++*driverType F/Filter: "" ++*driverUrl: "http://foo2hbpl.rkkda.com/" ++*driverObsolete: False ++ ++ ++ ++ ++*HWMargins: 9 12.00 9 12 ++*VariablePaperSize: True ++*MaxMediaWidth: 100000 ++*MaxMediaHeight: 100000 ++*NonUIOrderDependency: 135 AnySetup *CustomPageSize ++*CustomPageSize True: "pop pop pop pop pop ++%% FoomaticRIPOptionSetting: PageSize=Custom" ++*End ++*FoomaticRIPOptionSetting PageSize=Custom: "-pCustom.%0x%1 " ++*ParamCustomPageSize Width: 1 points 36 100000 ++*ParamCustomPageSize Height: 2 points 36 100000 ++*ParamCustomPageSize Orientation: 3 int 0 0 ++*ParamCustomPageSize WidthOffset: 4 points 0 0 ++*ParamCustomPageSize HeightOffset: 5 points 0 0 ++ ++*FoomaticIDs: Dell-C1760 foo2hbpl1 ++*FoomaticRIPCommandLine: "foo2hbpl1-wrapper %A" ++ ++*OpenGroup: General/General ++ ++*OpenUI *Quality/Printing Quality: PickOne ++*FoomaticRIPOption Quality: enum CmdLine A ++*OrderDependency: 110 AnySetup *Quality ++*DefaultQuality: normal ++*Quality draft/Draft: "%% FoomaticRIPOptionSetting: Quality=draft" ++*FoomaticRIPOptionSetting Quality=draft: " -t " ++*Quality normal/Normal: "%% FoomaticRIPOptionSetting: Quality=normal" ++*FoomaticRIPOptionSetting Quality=normal: " " ++*CloseUI: *Quality ++ ++*OpenUI *ColorMode/Color Mode: PickOne ++*FoomaticRIPOption ColorMode: enum CmdLine A ++*OrderDependency: 120 AnySetup *ColorMode ++*DefaultColorMode: Monochrome ++*ColorMode Color/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" ++*FoomaticRIPOptionSetting ColorMode=Color: "-c " ++*ColorMode Monochrome/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" ++*FoomaticRIPOptionSetting ColorMode=Monochrome: " " ++*CloseUI: *ColorMode ++ ++*OpenUI *PageSize/Page Size: PickOne ++*FoomaticRIPOption PageSize: enum CmdLine A ++*OrderDependency: 135 AnySetup *PageSize ++*DefaultPageSize: Letter ++*PageSize Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*FoomaticRIPOptionSetting PageSize=Letter: "-p4 " ++*PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*FoomaticRIPOptionSetting PageSize=A4: "-p1 " ++*PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*FoomaticRIPOptionSetting PageSize=B5jis: "-p2 " ++*PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*FoomaticRIPOptionSetting PageSize=Env10: "-p9 " ++*PageSize EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*FoomaticRIPOptionSetting PageSize=EnvC5: "-p11 " ++*PageSize EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*FoomaticRIPOptionSetting PageSize=EnvDL: "-p12 " ++*PageSize EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*FoomaticRIPOptionSetting PageSize=EnvMonarch: "-p10 " ++*PageSize Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*FoomaticRIPOptionSetting PageSize=Executive: "-p5 " ++*PageSize FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*FoomaticRIPOptionSetting PageSize=FanfoldGermanLegal: "-p6 " ++*PageSize Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*FoomaticRIPOptionSetting PageSize=Folio: "-p6 " ++*PageSize Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*FoomaticRIPOptionSetting PageSize=Legal: "-p7 " ++*CloseUI: *PageSize ++ ++*OpenUI *PageRegion: PickOne ++*OrderDependency: 135 AnySetup *PageRegion ++*DefaultPageRegion: Letter ++*PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*PageRegion EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*PageRegion EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*PageRegion Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*PageRegion FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*PageRegion Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*PageRegion Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*CloseUI: *PageRegion ++ ++*DefaultImageableArea: Letter ++*ImageableArea Letter/Letter: "9 12.00 603 780.00" ++*ImageableArea A4/A4: "9 12.00 586 830.00" ++*ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00" ++*ImageableArea Env10/Env #10: "9 12.00 288 672.00" ++*ImageableArea EnvC5/Env C5: "9 12.00 450 637.00" ++*ImageableArea EnvDL/Env DL: "9 12.00 302 611.00" ++*ImageableArea EnvMonarch/Env Monarch: "9 12.00 270 528.00" ++*ImageableArea Executive/Executive: "9 12.00 513 744.00" ++*ImageableArea FanfoldGermanLegal/Fanfold German Legal: "9 12.00 603 996.00" ++*ImageableArea Folio/Folio: "9 12.00 603 924.00" ++*ImageableArea Legal/Legal: "9 12.00 603 996.00" ++ ++*DefaultPaperDimension: Letter ++*PaperDimension Letter/Letter: "612 792" ++*PaperDimension A4/A4: "595 842" ++*PaperDimension B5jis/B5 (JIS): "518 727" ++*PaperDimension Env10/Env #10: "297 684" ++*PaperDimension EnvC5/Env C5: "459 649" ++*PaperDimension EnvDL/Env DL: "311 623" ++*PaperDimension EnvMonarch/Env Monarch: "279 540" ++*PaperDimension Executive/Executive: "522 756" ++*PaperDimension FanfoldGermanLegal/Fanfold German Legal: "612 1008" ++*PaperDimension Folio/Folio: "612 936" ++*PaperDimension Legal/Legal: "612 1008" ++ ++*OpenUI *MediaType/Media Type: PickOne ++*FoomaticRIPOption MediaType: enum CmdLine A ++*OrderDependency: 150 AnySetup *MediaType ++*DefaultMediaType: plain ++*MediaType plain/Plain Paper: "%% FoomaticRIPOptionSetting: MediaType=plain" ++*FoomaticRIPOptionSetting MediaType=plain: "-m1 " ++*MediaType plain2/Plain Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=plain2" ++*FoomaticRIPOptionSetting MediaType=plain2: "-m8 " ++*MediaType bond/Bond: "%% FoomaticRIPOptionSetting: MediaType=bond" ++*FoomaticRIPOptionSetting MediaType=bond: "-m2 " ++*MediaType bond2/Bond Side 2: "%% FoomaticRIPOptionSetting: MediaType=bond2" ++*FoomaticRIPOptionSetting MediaType=bond2: "-m9 " ++*MediaType envelope/Envelope: "%% FoomaticRIPOptionSetting: MediaType=envelope" ++*FoomaticRIPOptionSetting MediaType=envelope: "-m6 " ++*MediaType labels/Labels: "%% FoomaticRIPOptionSetting: MediaType=labels" ++*FoomaticRIPOptionSetting MediaType=labels: "-m5 " ++*MediaType lwcard/Light Weight Card: "%% FoomaticRIPOptionSetting: MediaType=lwcard" ++*FoomaticRIPOptionSetting MediaType=lwcard: "-m3 " ++*MediaType lwcard2/Light Weight Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwcard2" ++*FoomaticRIPOptionSetting MediaType=lwcard2: "-m10 " ++*MediaType lwgcard/Light Weight Glossy Card: "%% FoomaticRIPOptionSetting: MediaType=lwgcard" ++*FoomaticRIPOptionSetting MediaType=lwgcard: "-m4 " ++*MediaType lwgcard2/Light Weight Glossy Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwgcard2" ++*FoomaticRIPOptionSetting MediaType=lwgcard2: "-m11 " ++*MediaType recycled/Recycled Paper: "%% FoomaticRIPOptionSetting: MediaType=recycled" ++*FoomaticRIPOptionSetting MediaType=recycled: "-m7 " ++*MediaType recycled2/Recycled Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=recycled2" ++*FoomaticRIPOptionSetting MediaType=recycled2: "-m12 " ++*CloseUI: *MediaType ++ ++*OpenUI *Copies/Copies: PickOne ++*FoomaticRIPOption Copies: int CmdLine A ++*FoomaticRIPOptionPrototype Copies: "-n%s " ++*FoomaticRIPOptionRange Copies: 1 100 ++*OrderDependency: 220 AnySetup *Copies ++*DefaultCopies: 1 ++*FoomaticRIPDefaultCopies: 1 ++*Copies 1/1: "%% FoomaticRIPOptionSetting: Copies=1" ++*Copies 2/2: "%% FoomaticRIPOptionSetting: Copies=2" ++*Copies 3/3: "%% FoomaticRIPOptionSetting: Copies=3" ++*Copies 4/4: "%% FoomaticRIPOptionSetting: Copies=4" ++*Copies 5/5: "%% FoomaticRIPOptionSetting: Copies=5" ++*Copies 6/6: "%% FoomaticRIPOptionSetting: Copies=6" ++*Copies 7/7: "%% FoomaticRIPOptionSetting: Copies=7" ++*Copies 8/8: "%% FoomaticRIPOptionSetting: Copies=8" ++*Copies 9/9: "%% FoomaticRIPOptionSetting: Copies=9" ++*Copies 10/10: "%% FoomaticRIPOptionSetting: Copies=10" ++*Copies 11/11: "%% FoomaticRIPOptionSetting: Copies=11" ++*Copies 12/12: "%% FoomaticRIPOptionSetting: Copies=12" ++*Copies 13/13: "%% FoomaticRIPOptionSetting: Copies=13" ++*Copies 14/14: "%% FoomaticRIPOptionSetting: Copies=14" ++*Copies 15/15: "%% FoomaticRIPOptionSetting: Copies=15" ++*Copies 16/16: "%% FoomaticRIPOptionSetting: Copies=16" ++*Copies 17/17: "%% FoomaticRIPOptionSetting: Copies=17" ++*Copies 18/18: "%% FoomaticRIPOptionSetting: Copies=18" ++*Copies 19/19: "%% FoomaticRIPOptionSetting: Copies=19" ++*Copies 20/20: "%% FoomaticRIPOptionSetting: Copies=20" ++*Copies 21/21: "%% FoomaticRIPOptionSetting: Copies=21" ++*Copies 22/22: "%% FoomaticRIPOptionSetting: Copies=22" ++*Copies 23/23: "%% FoomaticRIPOptionSetting: Copies=23" ++*Copies 24/24: "%% FoomaticRIPOptionSetting: Copies=24" ++*Copies 25/25: "%% FoomaticRIPOptionSetting: Copies=25" ++*Copies 26/26: "%% FoomaticRIPOptionSetting: Copies=26" ++*Copies 27/27: "%% FoomaticRIPOptionSetting: Copies=27" ++*Copies 28/28: "%% FoomaticRIPOptionSetting: Copies=28" ++*Copies 29/29: "%% FoomaticRIPOptionSetting: Copies=29" ++*Copies 30/30: "%% FoomaticRIPOptionSetting: Copies=30" ++*Copies 31/31: "%% FoomaticRIPOptionSetting: Copies=31" ++*Copies 32/32: "%% FoomaticRIPOptionSetting: Copies=32" ++*Copies 33/33: "%% FoomaticRIPOptionSetting: Copies=33" ++*Copies 34/34: "%% FoomaticRIPOptionSetting: Copies=34" ++*Copies 35/35: "%% FoomaticRIPOptionSetting: Copies=35" ++*Copies 36/36: "%% FoomaticRIPOptionSetting: Copies=36" ++*Copies 37/37: "%% FoomaticRIPOptionSetting: Copies=37" ++*Copies 38/38: "%% FoomaticRIPOptionSetting: Copies=38" ++*Copies 39/39: "%% FoomaticRIPOptionSetting: Copies=39" ++*Copies 40/40: "%% FoomaticRIPOptionSetting: Copies=40" ++*Copies 41/41: "%% FoomaticRIPOptionSetting: Copies=41" ++*Copies 42/42: "%% FoomaticRIPOptionSetting: Copies=42" ++*Copies 43/43: "%% FoomaticRIPOptionSetting: Copies=43" ++*Copies 44/44: "%% FoomaticRIPOptionSetting: Copies=44" ++*Copies 45/45: "%% FoomaticRIPOptionSetting: Copies=45" ++*Copies 46/46: "%% FoomaticRIPOptionSetting: Copies=46" ++*Copies 47/47: "%% FoomaticRIPOptionSetting: Copies=47" ++*Copies 48/48: "%% FoomaticRIPOptionSetting: Copies=48" ++*Copies 49/49: "%% FoomaticRIPOptionSetting: Copies=49" ++*Copies 50/50: "%% FoomaticRIPOptionSetting: Copies=50" ++*Copies 51/51: "%% FoomaticRIPOptionSetting: Copies=51" ++*Copies 52/52: "%% FoomaticRIPOptionSetting: Copies=52" ++*Copies 53/53: "%% FoomaticRIPOptionSetting: Copies=53" ++*Copies 54/54: "%% FoomaticRIPOptionSetting: Copies=54" ++*Copies 55/55: "%% FoomaticRIPOptionSetting: Copies=55" ++*Copies 56/56: "%% FoomaticRIPOptionSetting: Copies=56" ++*Copies 57/57: "%% FoomaticRIPOptionSetting: Copies=57" ++*Copies 58/58: "%% FoomaticRIPOptionSetting: Copies=58" ++*Copies 59/59: "%% FoomaticRIPOptionSetting: Copies=59" ++*Copies 60/60: "%% FoomaticRIPOptionSetting: Copies=60" ++*Copies 61/61: "%% FoomaticRIPOptionSetting: Copies=61" ++*Copies 62/62: "%% FoomaticRIPOptionSetting: Copies=62" ++*Copies 63/63: "%% FoomaticRIPOptionSetting: Copies=63" ++*Copies 64/64: "%% FoomaticRIPOptionSetting: Copies=64" ++*Copies 65/65: "%% FoomaticRIPOptionSetting: Copies=65" ++*Copies 66/66: "%% FoomaticRIPOptionSetting: Copies=66" ++*Copies 67/67: "%% FoomaticRIPOptionSetting: Copies=67" ++*Copies 68/68: "%% FoomaticRIPOptionSetting: Copies=68" ++*Copies 69/69: "%% FoomaticRIPOptionSetting: Copies=69" ++*Copies 70/70: "%% FoomaticRIPOptionSetting: Copies=70" ++*Copies 71/71: "%% FoomaticRIPOptionSetting: Copies=71" ++*Copies 72/72: "%% FoomaticRIPOptionSetting: Copies=72" ++*Copies 73/73: "%% FoomaticRIPOptionSetting: Copies=73" ++*Copies 74/74: "%% FoomaticRIPOptionSetting: Copies=74" ++*Copies 75/75: "%% FoomaticRIPOptionSetting: Copies=75" ++*Copies 76/76: "%% FoomaticRIPOptionSetting: Copies=76" ++*Copies 77/77: "%% FoomaticRIPOptionSetting: Copies=77" ++*Copies 78/78: "%% FoomaticRIPOptionSetting: Copies=78" ++*Copies 79/79: "%% FoomaticRIPOptionSetting: Copies=79" ++*Copies 80/80: "%% FoomaticRIPOptionSetting: Copies=80" ++*Copies 81/81: "%% FoomaticRIPOptionSetting: Copies=81" ++*Copies 82/82: "%% FoomaticRIPOptionSetting: Copies=82" ++*Copies 83/83: "%% FoomaticRIPOptionSetting: Copies=83" ++*Copies 84/84: "%% FoomaticRIPOptionSetting: Copies=84" ++*Copies 85/85: "%% FoomaticRIPOptionSetting: Copies=85" ++*Copies 86/86: "%% FoomaticRIPOptionSetting: Copies=86" ++*Copies 87/87: "%% FoomaticRIPOptionSetting: Copies=87" ++*Copies 88/88: "%% FoomaticRIPOptionSetting: Copies=88" ++*Copies 89/89: "%% FoomaticRIPOptionSetting: Copies=89" ++*Copies 90/90: "%% FoomaticRIPOptionSetting: Copies=90" ++*Copies 91/91: "%% FoomaticRIPOptionSetting: Copies=91" ++*Copies 92/92: "%% FoomaticRIPOptionSetting: Copies=92" ++*Copies 93/93: "%% FoomaticRIPOptionSetting: Copies=93" ++*Copies 94/94: "%% FoomaticRIPOptionSetting: Copies=94" ++*Copies 95/95: "%% FoomaticRIPOptionSetting: Copies=95" ++*Copies 96/96: "%% FoomaticRIPOptionSetting: Copies=96" ++*Copies 97/97: "%% FoomaticRIPOptionSetting: Copies=97" ++*Copies 98/98: "%% FoomaticRIPOptionSetting: Copies=98" ++*Copies 99/99: "%% FoomaticRIPOptionSetting: Copies=99" ++*Copies 100/100: "%% FoomaticRIPOptionSetting: Copies=100" ++*CloseUI: *Copies ++ ++*CloseGroup: General ++ ++*OpenGroup: Adjustment/Adjustment ++ ++*OpenUI *halftone/Halftone Algorithm: PickOne ++*FoomaticRIPOption halftone: enum CmdLine A ++*OrderDependency: 110 AnySetup *halftone ++*Defaulthalftone: default ++*halftone default/Default: "%% FoomaticRIPOptionSetting: halftone=default" ++*FoomaticRIPOptionSetting halftone=default: " " ++*halftone as/Accurate Screens (better): "%% FoomaticRIPOptionSetting: halftone=as" ++*FoomaticRIPOptionSetting halftone=as: " -qas " ++*halftone standard/Standard: "%% FoomaticRIPOptionSetting: halftone=standard" ++*FoomaticRIPOptionSetting halftone=standard: " -q1 " ++*halftone wts/Well Tempered Screens (best): "%% FoomaticRIPOptionSetting: halftone=wts" ++*FoomaticRIPOptionSetting halftone=wts: " -qwts " ++*CloseUI: *halftone ++ ++*OpenUI *ICM/ICM Color Profile: PickOne ++*FoomaticRIPOption ICM: enum CmdLine A ++*OrderDependency: 300 AnySetup *ICM ++*DefaultICM: none ++*ICM none/No ICM color correction: "%% FoomaticRIPOptionSetting: ICM=none" ++*FoomaticRIPOptionSetting ICM=none: "-C10 -Gnone.icm " ++*ICM testing/File testing.icm: "%% FoomaticRIPOptionSetting: ICM=testing" ++*FoomaticRIPOptionSetting ICM=testing: "-C10 -Gtesting.icm " ++*ICM testing2/File testing2.icm: "%% FoomaticRIPOptionSetting: ICM=testing2" ++*FoomaticRIPOptionSetting ICM=testing2: "-C10 -Gtesting2.icm " ++*ICM testing3/File testing3.icm: "%% FoomaticRIPOptionSetting: ICM=testing3" ++*FoomaticRIPOptionSetting ICM=testing3: "-C10 -Gtesting3.icm " ++*CloseUI: *ICM ++ ++*CloseGroup: Adjustment ++ ++*OpenGroup: Miscellaneous/Miscellaneous ++ ++*OpenUI *NupOrient/N-up Orientation: PickOne ++*FoomaticRIPOption NupOrient: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupOrient ++*DefaultNupOrient: port ++*NupOrient land/Landscape: "%% FoomaticRIPOptionSetting: NupOrient=land" ++*FoomaticRIPOptionSetting NupOrient=land: "-ol " ++*NupOrient port/Portrait: "%% FoomaticRIPOptionSetting: NupOrient=port" ++*FoomaticRIPOptionSetting NupOrient=port: " " ++*NupOrient sea/Seascape: "%% FoomaticRIPOptionSetting: NupOrient=sea" ++*FoomaticRIPOptionSetting NupOrient=sea: "-os " ++*CloseUI: *NupOrient ++ ++*OpenUI *NupPages/N-up Printing: PickOne ++*FoomaticRIPOption NupPages: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupPages ++*DefaultNupPages: 1up ++*NupPages 1up/1-up: "%% FoomaticRIPOptionSetting: NupPages=1up" ++*FoomaticRIPOptionSetting NupPages=1up: " " ++*NupPages 2up/2-up: "%% FoomaticRIPOptionSetting: NupPages=2up" ++*FoomaticRIPOptionSetting NupPages=2up: "-2 " ++*NupPages 3up/3-up: "%% FoomaticRIPOptionSetting: NupPages=3up" ++*FoomaticRIPOptionSetting NupPages=3up: "-3 " ++*NupPages 4up/4-up: "%% FoomaticRIPOptionSetting: NupPages=4up" ++*FoomaticRIPOptionSetting NupPages=4up: "-4 " ++*NupPages 6up/6-up: "%% FoomaticRIPOptionSetting: NupPages=6up" ++*FoomaticRIPOptionSetting NupPages=6up: "-6 " ++*NupPages 8up/8-up: "%% FoomaticRIPOptionSetting: NupPages=8up" ++*FoomaticRIPOptionSetting NupPages=8up: "-8 " ++*NupPages 10up/10-up: "%% FoomaticRIPOptionSetting: NupPages=10up" ++*FoomaticRIPOptionSetting NupPages=10up: "-10 " ++*NupPages 12up/12-up: "%% FoomaticRIPOptionSetting: NupPages=12up" ++*FoomaticRIPOptionSetting NupPages=12up: "-12 " ++*NupPages 14up/14-up: "%% FoomaticRIPOptionSetting: NupPages=14up" ++*FoomaticRIPOptionSetting NupPages=14up: "-14 " ++*NupPages 15up/15-up: "%% FoomaticRIPOptionSetting: NupPages=15up" ++*FoomaticRIPOptionSetting NupPages=15up: "-15 " ++*NupPages 16up/16-up: "%% FoomaticRIPOptionSetting: NupPages=16up" ++*FoomaticRIPOptionSetting NupPages=16up: "-16 " ++*NupPages 18up/18-up: "%% FoomaticRIPOptionSetting: NupPages=18up" ++*FoomaticRIPOptionSetting NupPages=18up: "-18 " ++*CloseUI: *NupPages ++ ++*CloseGroup: Miscellaneous ++ ++ ++*% Generic boilerplate PPD stuff as standard PostScript fonts and so on ++ ++*DefaultFont: Courier ++*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM ++*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM ++*Font Bookman-Demi: Standard "(001.004S)" Standard ROM ++*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM ++*Font Bookman-Light: Standard "(001.004S)" Standard ROM ++*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM ++*Font Courier: Standard "(002.004S)" Standard ROM ++*Font Courier-Bold: Standard "(002.004S)" Standard ROM ++*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM ++*Font Courier-Oblique: Standard "(002.004S)" Standard ROM ++*Font Helvetica: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM ++*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM ++*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM ++*Font Palatino-Bold: Standard "(001.005S)" Standard ROM ++*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Italic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Roman: Standard "(001.005S)" Standard ROM ++*Font Symbol: Special "(001.007S)" Special ROM ++*Font Times-Bold: Standard "(001.007S)" Standard ROM ++*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM ++*Font Times-Italic: Standard "(001.007S)" Standard ROM ++*Font Times-Roman: Standard "(001.007S)" Standard ROM ++*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM ++*Font ZapfDingbats: Special "(001.004S)" Standard ROM ++ +--- foo2zjs/PPD/Epson-AcuLaser_C1700.ppd 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/PPD/Epson-AcuLaser_C1700.ppd 2014-04-01 11:06:31.000000000 +0000 +@@ -0,0 +1,433 @@ ++*PPD-Adobe: "4.3" ++*% ++*% For information on using this, and to obtain the required backend ++*% script, consult http://www.openprinting.org/ ++*% ++*% This file is published under the GNU General Public License ++*% ++*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with ++*% all programs and environments which use PPD files for dealing with ++*% printer capability information. The printer must be configured with the ++*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This ++*% file and "foomatic-rip" work together to support PPD-controlled printer ++*% driver option access with arbitrary free software printer drivers and ++*% printing spoolers. ++*% ++*% To save this file on your disk, wait until the download has completed ++*% (the animation of the browser logo must stop) and then use the ++*% "Save as..." command in the "File" menu of your browser or in the ++*% pop-up manu when you click on this document with the right mouse button. ++*% DO NOT cut and paste this file into an editor with your mouse. This can ++*% introduce additional line breaks which lead to unexpected results. ++*% ++*% You may save this file as 'Epson-AcuLaser_C1700-foo2hbpl1.ppd' ++*% ++*% ++*FormatVersion: "4.3" ++*FileVersion: "1.1" ++*LanguageVersion: English ++*LanguageEncoding: ISOLatin1 ++*PCFileName: "FOO2HBPL.PPD" ++*Manufacturer: "Epson" ++*Product: "(AcuLaser C1700)" ++*cupsVersion: 1.0 ++*cupsManualCopies: True ++*cupsModelNumber: 2 ++*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" ++*%pprRIP: foomatic-rip other ++*ModelName: "Epson AcuLaser C1700" ++*ShortNickName: "Epson AcuLaser C1700 foo2hbpl1" ++*NickName: "Epson AcuLaser C1700 Foomatic/foo2hbpl1 (recommended)" ++*PSVersion: "(3010.000) 550" ++*PSVersion: "(3010.000) 651" ++*PSVersion: "(3010.000) 652" ++*PSVersion: "(3010.000) 653" ++*PSVersion: "(3010.000) 704" ++*PSVersion: "(3010.000) 705" ++*PSVersion: "(3010.000) 800" ++*LanguageLevel: "3" ++*ColorDevice: True ++*DefaultColorSpace: RGB ++*FileSystem: False ++*Throughput: "1" ++*LandscapeOrientation: Plus90 ++*TTRasterizer: Type42 ++*1284DeviceID: "DRV:Dfoo2hbpl1,R1,M0,TF;" ++ ++*driverName foo2hbpl1/foo2hbpl1: "" ++*driverType F/Filter: "" ++*driverUrl: "http://foo2hbpl.rkkda.com/" ++*driverObsolete: False ++ ++ ++ ++ ++*HWMargins: 9 12.00 9 12 ++*VariablePaperSize: True ++*MaxMediaWidth: 100000 ++*MaxMediaHeight: 100000 ++*NonUIOrderDependency: 135 AnySetup *CustomPageSize ++*CustomPageSize True: "pop pop pop pop pop ++%% FoomaticRIPOptionSetting: PageSize=Custom" ++*End ++*FoomaticRIPOptionSetting PageSize=Custom: "-pCustom.%0x%1 " ++*ParamCustomPageSize Width: 1 points 36 100000 ++*ParamCustomPageSize Height: 2 points 36 100000 ++*ParamCustomPageSize Orientation: 3 int 0 0 ++*ParamCustomPageSize WidthOffset: 4 points 0 0 ++*ParamCustomPageSize HeightOffset: 5 points 0 0 ++ ++*FoomaticIDs: Epson-AcuLaser_C1700 foo2hbpl1 ++*FoomaticRIPCommandLine: "foo2hbpl1-wrapper %A" ++ ++*OpenGroup: General/General ++ ++*OpenUI *Quality/Printing Quality: PickOne ++*FoomaticRIPOption Quality: enum CmdLine A ++*OrderDependency: 110 AnySetup *Quality ++*DefaultQuality: normal ++*Quality draft/Draft: "%% FoomaticRIPOptionSetting: Quality=draft" ++*FoomaticRIPOptionSetting Quality=draft: " -t " ++*Quality normal/Normal: "%% FoomaticRIPOptionSetting: Quality=normal" ++*FoomaticRIPOptionSetting Quality=normal: " " ++*CloseUI: *Quality ++ ++*OpenUI *ColorMode/Color Mode: PickOne ++*FoomaticRIPOption ColorMode: enum CmdLine A ++*OrderDependency: 120 AnySetup *ColorMode ++*DefaultColorMode: Monochrome ++*ColorMode Color/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" ++*FoomaticRIPOptionSetting ColorMode=Color: "-c " ++*ColorMode Monochrome/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" ++*FoomaticRIPOptionSetting ColorMode=Monochrome: " " ++*CloseUI: *ColorMode ++ ++*OpenUI *PageSize/Page Size: PickOne ++*FoomaticRIPOption PageSize: enum CmdLine A ++*OrderDependency: 135 AnySetup *PageSize ++*DefaultPageSize: Letter ++*PageSize Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*FoomaticRIPOptionSetting PageSize=Letter: "-p4 " ++*PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*FoomaticRIPOptionSetting PageSize=A4: "-p1 " ++*PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*FoomaticRIPOptionSetting PageSize=B5jis: "-p2 " ++*PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*FoomaticRIPOptionSetting PageSize=Env10: "-p9 " ++*PageSize EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*FoomaticRIPOptionSetting PageSize=EnvC5: "-p11 " ++*PageSize EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*FoomaticRIPOptionSetting PageSize=EnvDL: "-p12 " ++*PageSize EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*FoomaticRIPOptionSetting PageSize=EnvMonarch: "-p10 " ++*PageSize Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*FoomaticRIPOptionSetting PageSize=Executive: "-p5 " ++*PageSize FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*FoomaticRIPOptionSetting PageSize=FanfoldGermanLegal: "-p6 " ++*PageSize Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*FoomaticRIPOptionSetting PageSize=Folio: "-p6 " ++*PageSize Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*FoomaticRIPOptionSetting PageSize=Legal: "-p7 " ++*CloseUI: *PageSize ++ ++*OpenUI *PageRegion: PickOne ++*OrderDependency: 135 AnySetup *PageRegion ++*DefaultPageRegion: Letter ++*PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*PageRegion EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*PageRegion EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*PageRegion Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*PageRegion FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*PageRegion Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*PageRegion Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*CloseUI: *PageRegion ++ ++*DefaultImageableArea: Letter ++*ImageableArea Letter/Letter: "9 12.00 603 780.00" ++*ImageableArea A4/A4: "9 12.00 586 830.00" ++*ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00" ++*ImageableArea Env10/Env #10: "9 12.00 288 672.00" ++*ImageableArea EnvC5/Env C5: "9 12.00 450 637.00" ++*ImageableArea EnvDL/Env DL: "9 12.00 302 611.00" ++*ImageableArea EnvMonarch/Env Monarch: "9 12.00 270 528.00" ++*ImageableArea Executive/Executive: "9 12.00 513 744.00" ++*ImageableArea FanfoldGermanLegal/Fanfold German Legal: "9 12.00 603 996.00" ++*ImageableArea Folio/Folio: "9 12.00 603 924.00" ++*ImageableArea Legal/Legal: "9 12.00 603 996.00" ++ ++*DefaultPaperDimension: Letter ++*PaperDimension Letter/Letter: "612 792" ++*PaperDimension A4/A4: "595 842" ++*PaperDimension B5jis/B5 (JIS): "518 727" ++*PaperDimension Env10/Env #10: "297 684" ++*PaperDimension EnvC5/Env C5: "459 649" ++*PaperDimension EnvDL/Env DL: "311 623" ++*PaperDimension EnvMonarch/Env Monarch: "279 540" ++*PaperDimension Executive/Executive: "522 756" ++*PaperDimension FanfoldGermanLegal/Fanfold German Legal: "612 1008" ++*PaperDimension Folio/Folio: "612 936" ++*PaperDimension Legal/Legal: "612 1008" ++ ++*OpenUI *MediaType/Media Type: PickOne ++*FoomaticRIPOption MediaType: enum CmdLine A ++*OrderDependency: 150 AnySetup *MediaType ++*DefaultMediaType: plain ++*MediaType plain/Plain Paper: "%% FoomaticRIPOptionSetting: MediaType=plain" ++*FoomaticRIPOptionSetting MediaType=plain: "-m1 " ++*MediaType plain2/Plain Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=plain2" ++*FoomaticRIPOptionSetting MediaType=plain2: "-m8 " ++*MediaType bond/Bond: "%% FoomaticRIPOptionSetting: MediaType=bond" ++*FoomaticRIPOptionSetting MediaType=bond: "-m2 " ++*MediaType bond2/Bond Side 2: "%% FoomaticRIPOptionSetting: MediaType=bond2" ++*FoomaticRIPOptionSetting MediaType=bond2: "-m9 " ++*MediaType envelope/Envelope: "%% FoomaticRIPOptionSetting: MediaType=envelope" ++*FoomaticRIPOptionSetting MediaType=envelope: "-m6 " ++*MediaType labels/Labels: "%% FoomaticRIPOptionSetting: MediaType=labels" ++*FoomaticRIPOptionSetting MediaType=labels: "-m5 " ++*MediaType lwcard/Light Weight Card: "%% FoomaticRIPOptionSetting: MediaType=lwcard" ++*FoomaticRIPOptionSetting MediaType=lwcard: "-m3 " ++*MediaType lwcard2/Light Weight Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwcard2" ++*FoomaticRIPOptionSetting MediaType=lwcard2: "-m10 " ++*MediaType lwgcard/Light Weight Glossy Card: "%% FoomaticRIPOptionSetting: MediaType=lwgcard" ++*FoomaticRIPOptionSetting MediaType=lwgcard: "-m4 " ++*MediaType lwgcard2/Light Weight Glossy Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwgcard2" ++*FoomaticRIPOptionSetting MediaType=lwgcard2: "-m11 " ++*MediaType recycled/Recycled Paper: "%% FoomaticRIPOptionSetting: MediaType=recycled" ++*FoomaticRIPOptionSetting MediaType=recycled: "-m7 " ++*MediaType recycled2/Recycled Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=recycled2" ++*FoomaticRIPOptionSetting MediaType=recycled2: "-m12 " ++*CloseUI: *MediaType ++ ++*OpenUI *Copies/Copies: PickOne ++*FoomaticRIPOption Copies: int CmdLine A ++*FoomaticRIPOptionPrototype Copies: "-n%s " ++*FoomaticRIPOptionRange Copies: 1 100 ++*OrderDependency: 220 AnySetup *Copies ++*DefaultCopies: 1 ++*FoomaticRIPDefaultCopies: 1 ++*Copies 1/1: "%% FoomaticRIPOptionSetting: Copies=1" ++*Copies 2/2: "%% FoomaticRIPOptionSetting: Copies=2" ++*Copies 3/3: "%% FoomaticRIPOptionSetting: Copies=3" ++*Copies 4/4: "%% FoomaticRIPOptionSetting: Copies=4" ++*Copies 5/5: "%% FoomaticRIPOptionSetting: Copies=5" ++*Copies 6/6: "%% FoomaticRIPOptionSetting: Copies=6" ++*Copies 7/7: "%% FoomaticRIPOptionSetting: Copies=7" ++*Copies 8/8: "%% FoomaticRIPOptionSetting: Copies=8" ++*Copies 9/9: "%% FoomaticRIPOptionSetting: Copies=9" ++*Copies 10/10: "%% FoomaticRIPOptionSetting: Copies=10" ++*Copies 11/11: "%% FoomaticRIPOptionSetting: Copies=11" ++*Copies 12/12: "%% FoomaticRIPOptionSetting: Copies=12" ++*Copies 13/13: "%% FoomaticRIPOptionSetting: Copies=13" ++*Copies 14/14: "%% FoomaticRIPOptionSetting: Copies=14" ++*Copies 15/15: "%% FoomaticRIPOptionSetting: Copies=15" ++*Copies 16/16: "%% FoomaticRIPOptionSetting: Copies=16" ++*Copies 17/17: "%% FoomaticRIPOptionSetting: Copies=17" ++*Copies 18/18: "%% FoomaticRIPOptionSetting: Copies=18" ++*Copies 19/19: "%% FoomaticRIPOptionSetting: Copies=19" ++*Copies 20/20: "%% FoomaticRIPOptionSetting: Copies=20" ++*Copies 21/21: "%% FoomaticRIPOptionSetting: Copies=21" ++*Copies 22/22: "%% FoomaticRIPOptionSetting: Copies=22" ++*Copies 23/23: "%% FoomaticRIPOptionSetting: Copies=23" ++*Copies 24/24: "%% FoomaticRIPOptionSetting: Copies=24" ++*Copies 25/25: "%% FoomaticRIPOptionSetting: Copies=25" ++*Copies 26/26: "%% FoomaticRIPOptionSetting: Copies=26" ++*Copies 27/27: "%% FoomaticRIPOptionSetting: Copies=27" ++*Copies 28/28: "%% FoomaticRIPOptionSetting: Copies=28" ++*Copies 29/29: "%% FoomaticRIPOptionSetting: Copies=29" ++*Copies 30/30: "%% FoomaticRIPOptionSetting: Copies=30" ++*Copies 31/31: "%% FoomaticRIPOptionSetting: Copies=31" ++*Copies 32/32: "%% FoomaticRIPOptionSetting: Copies=32" ++*Copies 33/33: "%% FoomaticRIPOptionSetting: Copies=33" ++*Copies 34/34: "%% FoomaticRIPOptionSetting: Copies=34" ++*Copies 35/35: "%% FoomaticRIPOptionSetting: Copies=35" ++*Copies 36/36: "%% FoomaticRIPOptionSetting: Copies=36" ++*Copies 37/37: "%% FoomaticRIPOptionSetting: Copies=37" ++*Copies 38/38: "%% FoomaticRIPOptionSetting: Copies=38" ++*Copies 39/39: "%% FoomaticRIPOptionSetting: Copies=39" ++*Copies 40/40: "%% FoomaticRIPOptionSetting: Copies=40" ++*Copies 41/41: "%% FoomaticRIPOptionSetting: Copies=41" ++*Copies 42/42: "%% FoomaticRIPOptionSetting: Copies=42" ++*Copies 43/43: "%% FoomaticRIPOptionSetting: Copies=43" ++*Copies 44/44: "%% FoomaticRIPOptionSetting: Copies=44" ++*Copies 45/45: "%% FoomaticRIPOptionSetting: Copies=45" ++*Copies 46/46: "%% FoomaticRIPOptionSetting: Copies=46" ++*Copies 47/47: "%% FoomaticRIPOptionSetting: Copies=47" ++*Copies 48/48: "%% FoomaticRIPOptionSetting: Copies=48" ++*Copies 49/49: "%% FoomaticRIPOptionSetting: Copies=49" ++*Copies 50/50: "%% FoomaticRIPOptionSetting: Copies=50" ++*Copies 51/51: "%% FoomaticRIPOptionSetting: Copies=51" ++*Copies 52/52: "%% FoomaticRIPOptionSetting: Copies=52" ++*Copies 53/53: "%% FoomaticRIPOptionSetting: Copies=53" ++*Copies 54/54: "%% FoomaticRIPOptionSetting: Copies=54" ++*Copies 55/55: "%% FoomaticRIPOptionSetting: Copies=55" ++*Copies 56/56: "%% FoomaticRIPOptionSetting: Copies=56" ++*Copies 57/57: "%% FoomaticRIPOptionSetting: Copies=57" ++*Copies 58/58: "%% FoomaticRIPOptionSetting: Copies=58" ++*Copies 59/59: "%% FoomaticRIPOptionSetting: Copies=59" ++*Copies 60/60: "%% FoomaticRIPOptionSetting: Copies=60" ++*Copies 61/61: "%% FoomaticRIPOptionSetting: Copies=61" ++*Copies 62/62: "%% FoomaticRIPOptionSetting: Copies=62" ++*Copies 63/63: "%% FoomaticRIPOptionSetting: Copies=63" ++*Copies 64/64: "%% FoomaticRIPOptionSetting: Copies=64" ++*Copies 65/65: "%% FoomaticRIPOptionSetting: Copies=65" ++*Copies 66/66: "%% FoomaticRIPOptionSetting: Copies=66" ++*Copies 67/67: "%% FoomaticRIPOptionSetting: Copies=67" ++*Copies 68/68: "%% FoomaticRIPOptionSetting: Copies=68" ++*Copies 69/69: "%% FoomaticRIPOptionSetting: Copies=69" ++*Copies 70/70: "%% FoomaticRIPOptionSetting: Copies=70" ++*Copies 71/71: "%% FoomaticRIPOptionSetting: Copies=71" ++*Copies 72/72: "%% FoomaticRIPOptionSetting: Copies=72" ++*Copies 73/73: "%% FoomaticRIPOptionSetting: Copies=73" ++*Copies 74/74: "%% FoomaticRIPOptionSetting: Copies=74" ++*Copies 75/75: "%% FoomaticRIPOptionSetting: Copies=75" ++*Copies 76/76: "%% FoomaticRIPOptionSetting: Copies=76" ++*Copies 77/77: "%% FoomaticRIPOptionSetting: Copies=77" ++*Copies 78/78: "%% FoomaticRIPOptionSetting: Copies=78" ++*Copies 79/79: "%% FoomaticRIPOptionSetting: Copies=79" ++*Copies 80/80: "%% FoomaticRIPOptionSetting: Copies=80" ++*Copies 81/81: "%% FoomaticRIPOptionSetting: Copies=81" ++*Copies 82/82: "%% FoomaticRIPOptionSetting: Copies=82" ++*Copies 83/83: "%% FoomaticRIPOptionSetting: Copies=83" ++*Copies 84/84: "%% FoomaticRIPOptionSetting: Copies=84" ++*Copies 85/85: "%% FoomaticRIPOptionSetting: Copies=85" ++*Copies 86/86: "%% FoomaticRIPOptionSetting: Copies=86" ++*Copies 87/87: "%% FoomaticRIPOptionSetting: Copies=87" ++*Copies 88/88: "%% FoomaticRIPOptionSetting: Copies=88" ++*Copies 89/89: "%% FoomaticRIPOptionSetting: Copies=89" ++*Copies 90/90: "%% FoomaticRIPOptionSetting: Copies=90" ++*Copies 91/91: "%% FoomaticRIPOptionSetting: Copies=91" ++*Copies 92/92: "%% FoomaticRIPOptionSetting: Copies=92" ++*Copies 93/93: "%% FoomaticRIPOptionSetting: Copies=93" ++*Copies 94/94: "%% FoomaticRIPOptionSetting: Copies=94" ++*Copies 95/95: "%% FoomaticRIPOptionSetting: Copies=95" ++*Copies 96/96: "%% FoomaticRIPOptionSetting: Copies=96" ++*Copies 97/97: "%% FoomaticRIPOptionSetting: Copies=97" ++*Copies 98/98: "%% FoomaticRIPOptionSetting: Copies=98" ++*Copies 99/99: "%% FoomaticRIPOptionSetting: Copies=99" ++*Copies 100/100: "%% FoomaticRIPOptionSetting: Copies=100" ++*CloseUI: *Copies ++ ++*CloseGroup: General ++ ++*OpenGroup: Adjustment/Adjustment ++ ++*OpenUI *halftone/Halftone Algorithm: PickOne ++*FoomaticRIPOption halftone: enum CmdLine A ++*OrderDependency: 110 AnySetup *halftone ++*Defaulthalftone: default ++*halftone default/Default: "%% FoomaticRIPOptionSetting: halftone=default" ++*FoomaticRIPOptionSetting halftone=default: " " ++*halftone as/Accurate Screens (better): "%% FoomaticRIPOptionSetting: halftone=as" ++*FoomaticRIPOptionSetting halftone=as: " -qas " ++*halftone standard/Standard: "%% FoomaticRIPOptionSetting: halftone=standard" ++*FoomaticRIPOptionSetting halftone=standard: " -q1 " ++*halftone wts/Well Tempered Screens (best): "%% FoomaticRIPOptionSetting: halftone=wts" ++*FoomaticRIPOptionSetting halftone=wts: " -qwts " ++*CloseUI: *halftone ++ ++*OpenUI *ICM/ICM Color Profile: PickOne ++*FoomaticRIPOption ICM: enum CmdLine A ++*OrderDependency: 300 AnySetup *ICM ++*DefaultICM: none ++*ICM none/No ICM color correction: "%% FoomaticRIPOptionSetting: ICM=none" ++*FoomaticRIPOptionSetting ICM=none: "-C10 -Gnone.icm " ++*ICM testing/File testing.icm: "%% FoomaticRIPOptionSetting: ICM=testing" ++*FoomaticRIPOptionSetting ICM=testing: "-C10 -Gtesting.icm " ++*ICM testing2/File testing2.icm: "%% FoomaticRIPOptionSetting: ICM=testing2" ++*FoomaticRIPOptionSetting ICM=testing2: "-C10 -Gtesting2.icm " ++*ICM testing3/File testing3.icm: "%% FoomaticRIPOptionSetting: ICM=testing3" ++*FoomaticRIPOptionSetting ICM=testing3: "-C10 -Gtesting3.icm " ++*CloseUI: *ICM ++ ++*CloseGroup: Adjustment ++ ++*OpenGroup: Miscellaneous/Miscellaneous ++ ++*OpenUI *NupOrient/N-up Orientation: PickOne ++*FoomaticRIPOption NupOrient: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupOrient ++*DefaultNupOrient: port ++*NupOrient land/Landscape: "%% FoomaticRIPOptionSetting: NupOrient=land" ++*FoomaticRIPOptionSetting NupOrient=land: "-ol " ++*NupOrient port/Portrait: "%% FoomaticRIPOptionSetting: NupOrient=port" ++*FoomaticRIPOptionSetting NupOrient=port: " " ++*NupOrient sea/Seascape: "%% FoomaticRIPOptionSetting: NupOrient=sea" ++*FoomaticRIPOptionSetting NupOrient=sea: "-os " ++*CloseUI: *NupOrient ++ ++*OpenUI *NupPages/N-up Printing: PickOne ++*FoomaticRIPOption NupPages: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupPages ++*DefaultNupPages: 1up ++*NupPages 1up/1-up: "%% FoomaticRIPOptionSetting: NupPages=1up" ++*FoomaticRIPOptionSetting NupPages=1up: " " ++*NupPages 2up/2-up: "%% FoomaticRIPOptionSetting: NupPages=2up" ++*FoomaticRIPOptionSetting NupPages=2up: "-2 " ++*NupPages 3up/3-up: "%% FoomaticRIPOptionSetting: NupPages=3up" ++*FoomaticRIPOptionSetting NupPages=3up: "-3 " ++*NupPages 4up/4-up: "%% FoomaticRIPOptionSetting: NupPages=4up" ++*FoomaticRIPOptionSetting NupPages=4up: "-4 " ++*NupPages 6up/6-up: "%% FoomaticRIPOptionSetting: NupPages=6up" ++*FoomaticRIPOptionSetting NupPages=6up: "-6 " ++*NupPages 8up/8-up: "%% FoomaticRIPOptionSetting: NupPages=8up" ++*FoomaticRIPOptionSetting NupPages=8up: "-8 " ++*NupPages 10up/10-up: "%% FoomaticRIPOptionSetting: NupPages=10up" ++*FoomaticRIPOptionSetting NupPages=10up: "-10 " ++*NupPages 12up/12-up: "%% FoomaticRIPOptionSetting: NupPages=12up" ++*FoomaticRIPOptionSetting NupPages=12up: "-12 " ++*NupPages 14up/14-up: "%% FoomaticRIPOptionSetting: NupPages=14up" ++*FoomaticRIPOptionSetting NupPages=14up: "-14 " ++*NupPages 15up/15-up: "%% FoomaticRIPOptionSetting: NupPages=15up" ++*FoomaticRIPOptionSetting NupPages=15up: "-15 " ++*NupPages 16up/16-up: "%% FoomaticRIPOptionSetting: NupPages=16up" ++*FoomaticRIPOptionSetting NupPages=16up: "-16 " ++*NupPages 18up/18-up: "%% FoomaticRIPOptionSetting: NupPages=18up" ++*FoomaticRIPOptionSetting NupPages=18up: "-18 " ++*CloseUI: *NupPages ++ ++*CloseGroup: Miscellaneous ++ ++ ++*% Generic boilerplate PPD stuff as standard PostScript fonts and so on ++ ++*DefaultFont: Courier ++*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM ++*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM ++*Font Bookman-Demi: Standard "(001.004S)" Standard ROM ++*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM ++*Font Bookman-Light: Standard "(001.004S)" Standard ROM ++*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM ++*Font Courier: Standard "(002.004S)" Standard ROM ++*Font Courier-Bold: Standard "(002.004S)" Standard ROM ++*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM ++*Font Courier-Oblique: Standard "(002.004S)" Standard ROM ++*Font Helvetica: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM ++*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM ++*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM ++*Font Palatino-Bold: Standard "(001.005S)" Standard ROM ++*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Italic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Roman: Standard "(001.005S)" Standard ROM ++*Font Symbol: Special "(001.007S)" Special ROM ++*Font Times-Bold: Standard "(001.007S)" Standard ROM ++*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM ++*Font Times-Italic: Standard "(001.007S)" Standard ROM ++*Font Times-Roman: Standard "(001.007S)" Standard ROM ++*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM ++*Font ZapfDingbats: Special "(001.004S)" Standard ROM ++ +--- foo2zjs/PPD/Fuji_Xerox-DocuPrint_CP105.ppd 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/PPD/Fuji_Xerox-DocuPrint_CP105.ppd 2014-04-01 11:06:31.000000000 +0000 +@@ -0,0 +1,433 @@ ++*PPD-Adobe: "4.3" ++*% ++*% For information on using this, and to obtain the required backend ++*% script, consult http://www.openprinting.org/ ++*% ++*% This file is published under the GNU General Public License ++*% ++*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with ++*% all programs and environments which use PPD files for dealing with ++*% printer capability information. The printer must be configured with the ++*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This ++*% file and "foomatic-rip" work together to support PPD-controlled printer ++*% driver option access with arbitrary free software printer drivers and ++*% printing spoolers. ++*% ++*% To save this file on your disk, wait until the download has completed ++*% (the animation of the browser logo must stop) and then use the ++*% "Save as..." command in the "File" menu of your browser or in the ++*% pop-up manu when you click on this document with the right mouse button. ++*% DO NOT cut and paste this file into an editor with your mouse. This can ++*% introduce additional line breaks which lead to unexpected results. ++*% ++*% You may save this file as 'Fuji_Xerox-DocuPrint_CP105-foo2hbpl1.ppd' ++*% ++*% ++*FormatVersion: "4.3" ++*FileVersion: "1.1" ++*LanguageVersion: English ++*LanguageEncoding: ISOLatin1 ++*PCFileName: "FOO2HBPL.PPD" ++*Manufacturer: "Fuji Xerox" ++*Product: "(DocuPrint CP105)" ++*cupsVersion: 1.0 ++*cupsManualCopies: True ++*cupsModelNumber: 2 ++*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" ++*%pprRIP: foomatic-rip other ++*ModelName: "Fuji Xerox DocuPrint CP105" ++*ShortNickName: "Fuji Xerox D.P. CP105 foo2hbpl1" ++*NickName: "Fuji Xerox DocuPrint CP105 Foomatic/foo2hbpl1 (recommended)" ++*PSVersion: "(3010.000) 550" ++*PSVersion: "(3010.000) 651" ++*PSVersion: "(3010.000) 652" ++*PSVersion: "(3010.000) 653" ++*PSVersion: "(3010.000) 704" ++*PSVersion: "(3010.000) 705" ++*PSVersion: "(3010.000) 800" ++*LanguageLevel: "3" ++*ColorDevice: True ++*DefaultColorSpace: RGB ++*FileSystem: False ++*Throughput: "1" ++*LandscapeOrientation: Plus90 ++*TTRasterizer: Type42 ++*1284DeviceID: "DRV:Dfoo2hbpl1,R1,M0,TF;" ++ ++*driverName foo2hbpl1/foo2hbpl1: "" ++*driverType F/Filter: "" ++*driverUrl: "http://foo2hbpl.rkkda.com/" ++*driverObsolete: False ++ ++ ++ ++ ++*HWMargins: 9 12.00 9 12 ++*VariablePaperSize: True ++*MaxMediaWidth: 100000 ++*MaxMediaHeight: 100000 ++*NonUIOrderDependency: 135 AnySetup *CustomPageSize ++*CustomPageSize True: "pop pop pop pop pop ++%% FoomaticRIPOptionSetting: PageSize=Custom" ++*End ++*FoomaticRIPOptionSetting PageSize=Custom: "-pCustom.%0x%1 " ++*ParamCustomPageSize Width: 1 points 36 100000 ++*ParamCustomPageSize Height: 2 points 36 100000 ++*ParamCustomPageSize Orientation: 3 int 0 0 ++*ParamCustomPageSize WidthOffset: 4 points 0 0 ++*ParamCustomPageSize HeightOffset: 5 points 0 0 ++ ++*FoomaticIDs: Fuji_Xerox-DocuPrint_CP105 foo2hbpl1 ++*FoomaticRIPCommandLine: "foo2hbpl1-wrapper %A" ++ ++*OpenGroup: General/General ++ ++*OpenUI *Quality/Printing Quality: PickOne ++*FoomaticRIPOption Quality: enum CmdLine A ++*OrderDependency: 110 AnySetup *Quality ++*DefaultQuality: normal ++*Quality draft/Draft: "%% FoomaticRIPOptionSetting: Quality=draft" ++*FoomaticRIPOptionSetting Quality=draft: " -t " ++*Quality normal/Normal: "%% FoomaticRIPOptionSetting: Quality=normal" ++*FoomaticRIPOptionSetting Quality=normal: " " ++*CloseUI: *Quality ++ ++*OpenUI *ColorMode/Color Mode: PickOne ++*FoomaticRIPOption ColorMode: enum CmdLine A ++*OrderDependency: 120 AnySetup *ColorMode ++*DefaultColorMode: Monochrome ++*ColorMode Color/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" ++*FoomaticRIPOptionSetting ColorMode=Color: "-c " ++*ColorMode Monochrome/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" ++*FoomaticRIPOptionSetting ColorMode=Monochrome: " " ++*CloseUI: *ColorMode ++ ++*OpenUI *PageSize/Page Size: PickOne ++*FoomaticRIPOption PageSize: enum CmdLine A ++*OrderDependency: 135 AnySetup *PageSize ++*DefaultPageSize: Letter ++*PageSize Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*FoomaticRIPOptionSetting PageSize=Letter: "-p4 " ++*PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*FoomaticRIPOptionSetting PageSize=A4: "-p1 " ++*PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*FoomaticRIPOptionSetting PageSize=B5jis: "-p2 " ++*PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*FoomaticRIPOptionSetting PageSize=Env10: "-p9 " ++*PageSize EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*FoomaticRIPOptionSetting PageSize=EnvC5: "-p11 " ++*PageSize EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*FoomaticRIPOptionSetting PageSize=EnvDL: "-p12 " ++*PageSize EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*FoomaticRIPOptionSetting PageSize=EnvMonarch: "-p10 " ++*PageSize Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*FoomaticRIPOptionSetting PageSize=Executive: "-p5 " ++*PageSize FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*FoomaticRIPOptionSetting PageSize=FanfoldGermanLegal: "-p6 " ++*PageSize Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*FoomaticRIPOptionSetting PageSize=Folio: "-p6 " ++*PageSize Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*FoomaticRIPOptionSetting PageSize=Legal: "-p7 " ++*CloseUI: *PageSize ++ ++*OpenUI *PageRegion: PickOne ++*OrderDependency: 135 AnySetup *PageRegion ++*DefaultPageRegion: Letter ++*PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" ++*PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" ++*PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" ++*PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" ++*PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" ++*PageRegion EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" ++*PageRegion EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" ++*PageRegion Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" ++*PageRegion FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" ++*PageRegion Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" ++*PageRegion Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" ++*CloseUI: *PageRegion ++ ++*DefaultImageableArea: Letter ++*ImageableArea Letter/Letter: "9 12.00 603 780.00" ++*ImageableArea A4/A4: "9 12.00 586 830.00" ++*ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00" ++*ImageableArea Env10/Env #10: "9 12.00 288 672.00" ++*ImageableArea EnvC5/Env C5: "9 12.00 450 637.00" ++*ImageableArea EnvDL/Env DL: "9 12.00 302 611.00" ++*ImageableArea EnvMonarch/Env Monarch: "9 12.00 270 528.00" ++*ImageableArea Executive/Executive: "9 12.00 513 744.00" ++*ImageableArea FanfoldGermanLegal/Fanfold German Legal: "9 12.00 603 996.00" ++*ImageableArea Folio/Folio: "9 12.00 603 924.00" ++*ImageableArea Legal/Legal: "9 12.00 603 996.00" ++ ++*DefaultPaperDimension: Letter ++*PaperDimension Letter/Letter: "612 792" ++*PaperDimension A4/A4: "595 842" ++*PaperDimension B5jis/B5 (JIS): "518 727" ++*PaperDimension Env10/Env #10: "297 684" ++*PaperDimension EnvC5/Env C5: "459 649" ++*PaperDimension EnvDL/Env DL: "311 623" ++*PaperDimension EnvMonarch/Env Monarch: "279 540" ++*PaperDimension Executive/Executive: "522 756" ++*PaperDimension FanfoldGermanLegal/Fanfold German Legal: "612 1008" ++*PaperDimension Folio/Folio: "612 936" ++*PaperDimension Legal/Legal: "612 1008" ++ ++*OpenUI *MediaType/Media Type: PickOne ++*FoomaticRIPOption MediaType: enum CmdLine A ++*OrderDependency: 150 AnySetup *MediaType ++*DefaultMediaType: plain ++*MediaType plain/Plain Paper: "%% FoomaticRIPOptionSetting: MediaType=plain" ++*FoomaticRIPOptionSetting MediaType=plain: "-m1 " ++*MediaType plain2/Plain Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=plain2" ++*FoomaticRIPOptionSetting MediaType=plain2: "-m8 " ++*MediaType bond/Bond: "%% FoomaticRIPOptionSetting: MediaType=bond" ++*FoomaticRIPOptionSetting MediaType=bond: "-m2 " ++*MediaType bond2/Bond Side 2: "%% FoomaticRIPOptionSetting: MediaType=bond2" ++*FoomaticRIPOptionSetting MediaType=bond2: "-m9 " ++*MediaType envelope/Envelope: "%% FoomaticRIPOptionSetting: MediaType=envelope" ++*FoomaticRIPOptionSetting MediaType=envelope: "-m6 " ++*MediaType labels/Labels: "%% FoomaticRIPOptionSetting: MediaType=labels" ++*FoomaticRIPOptionSetting MediaType=labels: "-m5 " ++*MediaType lwcard/Light Weight Card: "%% FoomaticRIPOptionSetting: MediaType=lwcard" ++*FoomaticRIPOptionSetting MediaType=lwcard: "-m3 " ++*MediaType lwcard2/Light Weight Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwcard2" ++*FoomaticRIPOptionSetting MediaType=lwcard2: "-m10 " ++*MediaType lwgcard/Light Weight Glossy Card: "%% FoomaticRIPOptionSetting: MediaType=lwgcard" ++*FoomaticRIPOptionSetting MediaType=lwgcard: "-m4 " ++*MediaType lwgcard2/Light Weight Glossy Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwgcard2" ++*FoomaticRIPOptionSetting MediaType=lwgcard2: "-m11 " ++*MediaType recycled/Recycled Paper: "%% FoomaticRIPOptionSetting: MediaType=recycled" ++*FoomaticRIPOptionSetting MediaType=recycled: "-m7 " ++*MediaType recycled2/Recycled Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=recycled2" ++*FoomaticRIPOptionSetting MediaType=recycled2: "-m12 " ++*CloseUI: *MediaType ++ ++*OpenUI *Copies/Copies: PickOne ++*FoomaticRIPOption Copies: int CmdLine A ++*FoomaticRIPOptionPrototype Copies: "-n%s " ++*FoomaticRIPOptionRange Copies: 1 100 ++*OrderDependency: 220 AnySetup *Copies ++*DefaultCopies: 1 ++*FoomaticRIPDefaultCopies: 1 ++*Copies 1/1: "%% FoomaticRIPOptionSetting: Copies=1" ++*Copies 2/2: "%% FoomaticRIPOptionSetting: Copies=2" ++*Copies 3/3: "%% FoomaticRIPOptionSetting: Copies=3" ++*Copies 4/4: "%% FoomaticRIPOptionSetting: Copies=4" ++*Copies 5/5: "%% FoomaticRIPOptionSetting: Copies=5" ++*Copies 6/6: "%% FoomaticRIPOptionSetting: Copies=6" ++*Copies 7/7: "%% FoomaticRIPOptionSetting: Copies=7" ++*Copies 8/8: "%% FoomaticRIPOptionSetting: Copies=8" ++*Copies 9/9: "%% FoomaticRIPOptionSetting: Copies=9" ++*Copies 10/10: "%% FoomaticRIPOptionSetting: Copies=10" ++*Copies 11/11: "%% FoomaticRIPOptionSetting: Copies=11" ++*Copies 12/12: "%% FoomaticRIPOptionSetting: Copies=12" ++*Copies 13/13: "%% FoomaticRIPOptionSetting: Copies=13" ++*Copies 14/14: "%% FoomaticRIPOptionSetting: Copies=14" ++*Copies 15/15: "%% FoomaticRIPOptionSetting: Copies=15" ++*Copies 16/16: "%% FoomaticRIPOptionSetting: Copies=16" ++*Copies 17/17: "%% FoomaticRIPOptionSetting: Copies=17" ++*Copies 18/18: "%% FoomaticRIPOptionSetting: Copies=18" ++*Copies 19/19: "%% FoomaticRIPOptionSetting: Copies=19" ++*Copies 20/20: "%% FoomaticRIPOptionSetting: Copies=20" ++*Copies 21/21: "%% FoomaticRIPOptionSetting: Copies=21" ++*Copies 22/22: "%% FoomaticRIPOptionSetting: Copies=22" ++*Copies 23/23: "%% FoomaticRIPOptionSetting: Copies=23" ++*Copies 24/24: "%% FoomaticRIPOptionSetting: Copies=24" ++*Copies 25/25: "%% FoomaticRIPOptionSetting: Copies=25" ++*Copies 26/26: "%% FoomaticRIPOptionSetting: Copies=26" ++*Copies 27/27: "%% FoomaticRIPOptionSetting: Copies=27" ++*Copies 28/28: "%% FoomaticRIPOptionSetting: Copies=28" ++*Copies 29/29: "%% FoomaticRIPOptionSetting: Copies=29" ++*Copies 30/30: "%% FoomaticRIPOptionSetting: Copies=30" ++*Copies 31/31: "%% FoomaticRIPOptionSetting: Copies=31" ++*Copies 32/32: "%% FoomaticRIPOptionSetting: Copies=32" ++*Copies 33/33: "%% FoomaticRIPOptionSetting: Copies=33" ++*Copies 34/34: "%% FoomaticRIPOptionSetting: Copies=34" ++*Copies 35/35: "%% FoomaticRIPOptionSetting: Copies=35" ++*Copies 36/36: "%% FoomaticRIPOptionSetting: Copies=36" ++*Copies 37/37: "%% FoomaticRIPOptionSetting: Copies=37" ++*Copies 38/38: "%% FoomaticRIPOptionSetting: Copies=38" ++*Copies 39/39: "%% FoomaticRIPOptionSetting: Copies=39" ++*Copies 40/40: "%% FoomaticRIPOptionSetting: Copies=40" ++*Copies 41/41: "%% FoomaticRIPOptionSetting: Copies=41" ++*Copies 42/42: "%% FoomaticRIPOptionSetting: Copies=42" ++*Copies 43/43: "%% FoomaticRIPOptionSetting: Copies=43" ++*Copies 44/44: "%% FoomaticRIPOptionSetting: Copies=44" ++*Copies 45/45: "%% FoomaticRIPOptionSetting: Copies=45" ++*Copies 46/46: "%% FoomaticRIPOptionSetting: Copies=46" ++*Copies 47/47: "%% FoomaticRIPOptionSetting: Copies=47" ++*Copies 48/48: "%% FoomaticRIPOptionSetting: Copies=48" ++*Copies 49/49: "%% FoomaticRIPOptionSetting: Copies=49" ++*Copies 50/50: "%% FoomaticRIPOptionSetting: Copies=50" ++*Copies 51/51: "%% FoomaticRIPOptionSetting: Copies=51" ++*Copies 52/52: "%% FoomaticRIPOptionSetting: Copies=52" ++*Copies 53/53: "%% FoomaticRIPOptionSetting: Copies=53" ++*Copies 54/54: "%% FoomaticRIPOptionSetting: Copies=54" ++*Copies 55/55: "%% FoomaticRIPOptionSetting: Copies=55" ++*Copies 56/56: "%% FoomaticRIPOptionSetting: Copies=56" ++*Copies 57/57: "%% FoomaticRIPOptionSetting: Copies=57" ++*Copies 58/58: "%% FoomaticRIPOptionSetting: Copies=58" ++*Copies 59/59: "%% FoomaticRIPOptionSetting: Copies=59" ++*Copies 60/60: "%% FoomaticRIPOptionSetting: Copies=60" ++*Copies 61/61: "%% FoomaticRIPOptionSetting: Copies=61" ++*Copies 62/62: "%% FoomaticRIPOptionSetting: Copies=62" ++*Copies 63/63: "%% FoomaticRIPOptionSetting: Copies=63" ++*Copies 64/64: "%% FoomaticRIPOptionSetting: Copies=64" ++*Copies 65/65: "%% FoomaticRIPOptionSetting: Copies=65" ++*Copies 66/66: "%% FoomaticRIPOptionSetting: Copies=66" ++*Copies 67/67: "%% FoomaticRIPOptionSetting: Copies=67" ++*Copies 68/68: "%% FoomaticRIPOptionSetting: Copies=68" ++*Copies 69/69: "%% FoomaticRIPOptionSetting: Copies=69" ++*Copies 70/70: "%% FoomaticRIPOptionSetting: Copies=70" ++*Copies 71/71: "%% FoomaticRIPOptionSetting: Copies=71" ++*Copies 72/72: "%% FoomaticRIPOptionSetting: Copies=72" ++*Copies 73/73: "%% FoomaticRIPOptionSetting: Copies=73" ++*Copies 74/74: "%% FoomaticRIPOptionSetting: Copies=74" ++*Copies 75/75: "%% FoomaticRIPOptionSetting: Copies=75" ++*Copies 76/76: "%% FoomaticRIPOptionSetting: Copies=76" ++*Copies 77/77: "%% FoomaticRIPOptionSetting: Copies=77" ++*Copies 78/78: "%% FoomaticRIPOptionSetting: Copies=78" ++*Copies 79/79: "%% FoomaticRIPOptionSetting: Copies=79" ++*Copies 80/80: "%% FoomaticRIPOptionSetting: Copies=80" ++*Copies 81/81: "%% FoomaticRIPOptionSetting: Copies=81" ++*Copies 82/82: "%% FoomaticRIPOptionSetting: Copies=82" ++*Copies 83/83: "%% FoomaticRIPOptionSetting: Copies=83" ++*Copies 84/84: "%% FoomaticRIPOptionSetting: Copies=84" ++*Copies 85/85: "%% FoomaticRIPOptionSetting: Copies=85" ++*Copies 86/86: "%% FoomaticRIPOptionSetting: Copies=86" ++*Copies 87/87: "%% FoomaticRIPOptionSetting: Copies=87" ++*Copies 88/88: "%% FoomaticRIPOptionSetting: Copies=88" ++*Copies 89/89: "%% FoomaticRIPOptionSetting: Copies=89" ++*Copies 90/90: "%% FoomaticRIPOptionSetting: Copies=90" ++*Copies 91/91: "%% FoomaticRIPOptionSetting: Copies=91" ++*Copies 92/92: "%% FoomaticRIPOptionSetting: Copies=92" ++*Copies 93/93: "%% FoomaticRIPOptionSetting: Copies=93" ++*Copies 94/94: "%% FoomaticRIPOptionSetting: Copies=94" ++*Copies 95/95: "%% FoomaticRIPOptionSetting: Copies=95" ++*Copies 96/96: "%% FoomaticRIPOptionSetting: Copies=96" ++*Copies 97/97: "%% FoomaticRIPOptionSetting: Copies=97" ++*Copies 98/98: "%% FoomaticRIPOptionSetting: Copies=98" ++*Copies 99/99: "%% FoomaticRIPOptionSetting: Copies=99" ++*Copies 100/100: "%% FoomaticRIPOptionSetting: Copies=100" ++*CloseUI: *Copies ++ ++*CloseGroup: General ++ ++*OpenGroup: Adjustment/Adjustment ++ ++*OpenUI *halftone/Halftone Algorithm: PickOne ++*FoomaticRIPOption halftone: enum CmdLine A ++*OrderDependency: 110 AnySetup *halftone ++*Defaulthalftone: default ++*halftone default/Default: "%% FoomaticRIPOptionSetting: halftone=default" ++*FoomaticRIPOptionSetting halftone=default: " " ++*halftone as/Accurate Screens (better): "%% FoomaticRIPOptionSetting: halftone=as" ++*FoomaticRIPOptionSetting halftone=as: " -qas " ++*halftone standard/Standard: "%% FoomaticRIPOptionSetting: halftone=standard" ++*FoomaticRIPOptionSetting halftone=standard: " -q1 " ++*halftone wts/Well Tempered Screens (best): "%% FoomaticRIPOptionSetting: halftone=wts" ++*FoomaticRIPOptionSetting halftone=wts: " -qwts " ++*CloseUI: *halftone ++ ++*OpenUI *ICM/ICM Color Profile: PickOne ++*FoomaticRIPOption ICM: enum CmdLine A ++*OrderDependency: 300 AnySetup *ICM ++*DefaultICM: none ++*ICM none/No ICM color correction: "%% FoomaticRIPOptionSetting: ICM=none" ++*FoomaticRIPOptionSetting ICM=none: "-C10 -Gnone.icm " ++*ICM testing/File testing.icm: "%% FoomaticRIPOptionSetting: ICM=testing" ++*FoomaticRIPOptionSetting ICM=testing: "-C10 -Gtesting.icm " ++*ICM testing2/File testing2.icm: "%% FoomaticRIPOptionSetting: ICM=testing2" ++*FoomaticRIPOptionSetting ICM=testing2: "-C10 -Gtesting2.icm " ++*ICM testing3/File testing3.icm: "%% FoomaticRIPOptionSetting: ICM=testing3" ++*FoomaticRIPOptionSetting ICM=testing3: "-C10 -Gtesting3.icm " ++*CloseUI: *ICM ++ ++*CloseGroup: Adjustment ++ ++*OpenGroup: Miscellaneous/Miscellaneous ++ ++*OpenUI *NupOrient/N-up Orientation: PickOne ++*FoomaticRIPOption NupOrient: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupOrient ++*DefaultNupOrient: port ++*NupOrient land/Landscape: "%% FoomaticRIPOptionSetting: NupOrient=land" ++*FoomaticRIPOptionSetting NupOrient=land: "-ol " ++*NupOrient port/Portrait: "%% FoomaticRIPOptionSetting: NupOrient=port" ++*FoomaticRIPOptionSetting NupOrient=port: " " ++*NupOrient sea/Seascape: "%% FoomaticRIPOptionSetting: NupOrient=sea" ++*FoomaticRIPOptionSetting NupOrient=sea: "-os " ++*CloseUI: *NupOrient ++ ++*OpenUI *NupPages/N-up Printing: PickOne ++*FoomaticRIPOption NupPages: enum CmdLine A ++*OrderDependency: 200 AnySetup *NupPages ++*DefaultNupPages: 1up ++*NupPages 1up/1-up: "%% FoomaticRIPOptionSetting: NupPages=1up" ++*FoomaticRIPOptionSetting NupPages=1up: " " ++*NupPages 2up/2-up: "%% FoomaticRIPOptionSetting: NupPages=2up" ++*FoomaticRIPOptionSetting NupPages=2up: "-2 " ++*NupPages 3up/3-up: "%% FoomaticRIPOptionSetting: NupPages=3up" ++*FoomaticRIPOptionSetting NupPages=3up: "-3 " ++*NupPages 4up/4-up: "%% FoomaticRIPOptionSetting: NupPages=4up" ++*FoomaticRIPOptionSetting NupPages=4up: "-4 " ++*NupPages 6up/6-up: "%% FoomaticRIPOptionSetting: NupPages=6up" ++*FoomaticRIPOptionSetting NupPages=6up: "-6 " ++*NupPages 8up/8-up: "%% FoomaticRIPOptionSetting: NupPages=8up" ++*FoomaticRIPOptionSetting NupPages=8up: "-8 " ++*NupPages 10up/10-up: "%% FoomaticRIPOptionSetting: NupPages=10up" ++*FoomaticRIPOptionSetting NupPages=10up: "-10 " ++*NupPages 12up/12-up: "%% FoomaticRIPOptionSetting: NupPages=12up" ++*FoomaticRIPOptionSetting NupPages=12up: "-12 " ++*NupPages 14up/14-up: "%% FoomaticRIPOptionSetting: NupPages=14up" ++*FoomaticRIPOptionSetting NupPages=14up: "-14 " ++*NupPages 15up/15-up: "%% FoomaticRIPOptionSetting: NupPages=15up" ++*FoomaticRIPOptionSetting NupPages=15up: "-15 " ++*NupPages 16up/16-up: "%% FoomaticRIPOptionSetting: NupPages=16up" ++*FoomaticRIPOptionSetting NupPages=16up: "-16 " ++*NupPages 18up/18-up: "%% FoomaticRIPOptionSetting: NupPages=18up" ++*FoomaticRIPOptionSetting NupPages=18up: "-18 " ++*CloseUI: *NupPages ++ ++*CloseGroup: Miscellaneous ++ ++ ++*% Generic boilerplate PPD stuff as standard PostScript fonts and so on ++ ++*DefaultFont: Courier ++*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM ++*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM ++*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM ++*Font Bookman-Demi: Standard "(001.004S)" Standard ROM ++*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM ++*Font Bookman-Light: Standard "(001.004S)" Standard ROM ++*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM ++*Font Courier: Standard "(002.004S)" Standard ROM ++*Font Courier-Bold: Standard "(002.004S)" Standard ROM ++*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM ++*Font Courier-Oblique: Standard "(002.004S)" Standard ROM ++*Font Helvetica: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM ++*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM ++*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM ++*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM ++*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM ++*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM ++*Font Palatino-Bold: Standard "(001.005S)" Standard ROM ++*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Italic: Standard "(001.005S)" Standard ROM ++*Font Palatino-Roman: Standard "(001.005S)" Standard ROM ++*Font Symbol: Special "(001.007S)" Special ROM ++*Font Times-Bold: Standard "(001.007S)" Standard ROM ++*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM ++*Font Times-Italic: Standard "(001.007S)" Standard ROM ++*Font Times-Roman: Standard "(001.007S)" Standard ROM ++*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM ++*Font ZapfDingbats: Special "(001.004S)" Standard ROM ++ +--- foo2zjs/README 2014-04-03 19:49:11.000000000 +0000 ++++ foo2zjs/README 2014-03-25 10:49:40.000000000 +0000 +@@ -128,6 +128,17 @@ + - Oki C5100n/C5150n/C5200n + - Oki C5500n/C5600n/C5800n + ++ FOO2HBPL1 ++ --------- ++ foo2hbpl1 converts Ghostscript pbmraw, pgmraw, ppmraw, or pamcmyk32 ++ output formats to monochrome or color HBPL version 1 streams. ++ ++ - Dell 1250c ++ - Dell C1660 ++ - Dell C1760 ++ - Epson AcuLaser C1700 ++ - Fuji-Xerox DocuPrint CP105 ++ + FOO2HBPL2 + --------- + foo2hbpl2 converts Ghostscript pbmraw, bitcmyk, or pksmraw output for‐ +--- foo2zjs/README.in 2014-04-03 19:43:10.000000000 +0000 ++++ foo2zjs/README.in 2014-03-25 10:49:27.000000000 +0000 +@@ -128,6 +128,17 @@ + - Oki C5100n/C5150n/C5200n + - Oki C5500n/C5600n/C5800n + ++ FOO2HBPL1 ++ --------- ++ foo2hbpl1 converts Ghostscript pbmraw, pgmraw, ppmraw, or pamcmyk32 ++ output formats to monochrome or color HBPL version 1 streams. ++ ++ - Dell 1250c ++ - Dell C1660 ++ - Dell C1760 ++ - Epson AcuLaser C1700 ++ - Fuji-Xerox DocuPrint CP105 ++ + FOO2HBPL2 + --------- + foo2hbpl2 converts Ghostscript pbmraw, bitcmyk, or pksmraw output for‐ +--- foo2zjs/foo2hbpl1-wrapper.1in 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foo2hbpl1-wrapper.1in 2014-03-24 12:30:14.000000000 +0000 +@@ -0,0 +1,240 @@ ++'\" t ++.TH foo2hbpl1-wrapper 1 "${MODpage}" "foo2hbpl1-wrapper ${MODver}" ++#ifndef OLDGROFF ++#include "macros.man" ++#endif ++'\"========================================================================== ++'\" MANUAL PAGE SOURCE ++'\"========================================================================== ++.SH NAME ++foo2hbpl1-wrapper \- Convert Postscript into a ZJS printer stream ++.SH SYNOPSIS ++.B foo2hbpl1-wrapper ++.RI [ options "] [" ps-file ] ++.SH DESCRIPTION ++.B foo2hbpl1-wrapper ++is a Foomatic compatible printer wrapper for the \fBfoo2hbpl1\fP printer driver. ++This script reads a Postscript \fIps-file\fP or standard input ++and converts it to Zenographics ZjStream printer format ++for driving the ++Dell 1250c, Dell C1660w, Dell C1760w, ++Epson AcuLaser C1700, ++and Fuji-Xerox CP105b printers. ++.P ++This script can be used in a standalone fashion, but is intended to ++be called from a printer spooler system which uses the Foomatic ++printer database. ++ ++.SH COMMAND LINE OPTIONS ++.SS Normal Options ++These are the options used to select the parameters of a ++print job that are usually controlled on a per job basis. ++.TP ++.BI \-c ++Print in color (else monochrome). ++.TP ++.BI \-C\0 colormode ++Color correction mode [0]. ++.TS ++n l . ++10 ICM color profile (using -G *.icm file) ++.TE ++.TP ++.BI \-d\0 duplex ++Duplex code to send to printer [1]. ++.TS ++| n l | n l | n l . ++1 off 2 long edge 3 short edge ++.TE ++.TP ++.BI \-m\0 media ++Media code to send to printer [1]. ++.TS ++l r. ++_ ++Media HBPL ++_ ++plain 1 ++bond 2 ++lwcard 3 ++lwgcard 4 ++labels 5 ++envelope 6 ++recycled 7 ++plain2 8 ++bond2 9 ++lwcard2 10 ++lwgcard2 11 ++recycled2 12 ++.TE ++.TP ++.BI \-p\0 paper ++Paper size code to send to printer [1]. ++.TS ++l r. ++_ ++Paper HBPL ++_ ++A4 1 ++B5jis 2 ++letter 4 ++executive 5 ++fanfold german legal 6 ++folio 6 ++legal 7 ++env#10 9 ++envMonarch 10 ++envC5 11 ++envDL 12 ++.TE ++.TP ++.BI \-n\0 copies ++Number of copies [1]. ++.TP ++.BI \-r\0 xres x yres ++Set device resolution in pixels/inch [1200x600]. ++.TP ++.BI \-s\0 source ++Source (Input Slot) code to send to printer [7]. ++.TS ++| n l | n l. ++1 upper 4 manual ++2 lower 7 auto ++.TE ++.TP ++.BI \-t ++Draft mode. Every other pixel is white. ++.TP ++.BI \-T\0 density ++Print density (1-5). The default is 3 (medium). ++.TP ++.BI "\-2 \-3 \-4 \-5 \-6 \-8 \-9 \-10 \-12 \-14 \-15 \-16 \-18" ++Print in N-up. Requires the \fBpsutils\fP package. ++.TP ++.BI \-o\0 orient ++Orientation used for N-up. ++.TS ++l l l. ++Portrait -op (normal) ++Landscape -ol (rotated 90 degrees anticlockwise) ++Seascape -os (rotated 90 degrees clockwise) ++.TE ++.SS Printer Tweaking Options ++These are the options used to customize the operation of \fBfoo2hbpl1\fP ++for a particular printer. ++.TP ++.BI \-u\0 xoff x yoff ++Set the offset of the start of the printable region from the ++upper left corner, in pixels [varies with paper size]. ++The defaults should work on the 2200DL and 2300DL, and have not ++been tested on any other printers. ++.TP ++.BI \-l\0 xoff x yoff ++Set the offset of the end of the printable region from the ++lower right corner, in pixels [varies with paper size]. ++The defaults should work on the 2200DL and 2300DL, and have not ++been tested on any other printers. ++.TP ++.BI \-L\0 mask ++Send the logical clipping values from -u/-l in the ZjStream. ++\fBfoo2hbpl1-wrapper\fP always runs Ghostscript with the ideal page dimensions, ++so that the scale of the image is correct, ++regardless whether or not the printer has unprintable regions. ++This option is used to move the position of the clipped image ++back to where it belongs on the page. The default is to send ++the amount which was clipped by -u and -l, and should be ++good in most cases. ++.TS ++l l. ++0 don't send any logical clipping amounts ++1 only send Y clipping amount ++2 only send X clipping amount ++3 send both X and Y clipping amounts ++.TE ++.TP ++.BI \-P ++Do not send START_PLANE codes on monochrome output. May be ++needed by some monochrome-only printers, such as the ++HP LaserJet 1000. ++.TP ++.BI \-X\0 padlen ++Add extra zero padding to the end of BID segments. The default is ++16 bytes. Padding 16 bytes of zeroes ++is needed for older ZjStream printers, such as the Minolta 2200DL ++and HP LaserJet 1000, and seems harmless to newer ones, such as ++the Minolta 2300DL. So the default should be good for all cases. ++.SS Color Tweaking Options ++These are the options used to control the quality of color output. ++Color correction is currently a WORK IN PROGRESS. ++.TP ++.BI \-g\0 gsopts ++Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, ++etc. This option may appear more than once. ++.TP ++.BI \-G\0 profile.icm ++Convert \fIprofile.icm\fP to a Postscript color rendering ++dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and ++adjust the printer colors by using the Postscript \fBsetcolorrendering\fP ++operator. (WORK IN PROGRESS). ++.TP ++.BI \-G\0 gamma-file.ps ++Prepend \fIgamma-file.ps\fP to the Postscript input to perform ++color correction using the \fBsetcolortransfer\fP Postscript operator. ++For example, the file might contain: ++.br ++{0.333 exp} {0.333 exp} {0.333 exp} {0.333 exp} setcolortransfer ++.TP ++.BI \-I\0 intent ++Select profile intent from the ICM file. ++0=Perceptual, 1=Colorimetric, 2=Saturation, 3=Absolute. ++Default is 0 (perceptual). ++.SS Debugging Options ++These options are used for debugging \fBfoo2hbpl1\fP and its wrapper. ++.TP ++.BI \-S\0 plane ++Output just a single color plane from a color print and print it ++on the black plane. The default is to output all color planes. ++.TS ++l l. ++1 Cyan ++2 Magenta ++3 Yellow ++4 Black ++.TE ++.TP ++.BI \-D\0 level ++Set Debug level [0]. ++ ++.SH EXAMPLES ++Create a monochrome ZjStream from a Postscript document, ++examine it, and then print it using a RAW print queue: ++ ++.RS ++.nf ++foo2hbpl1-wrapper testpage.ps > testpage.prn ++hbpl1decode < testpage.prn ++lpr -P raw testpage.prn ++.fi ++.RE ++.P ++Create a color ZjStream stream from a Postscript document: ++ ++.RS ++.nf ++foo2hbpl1-wrapper -c testpage.ps > testpage.prn ++.fi ++.RE ++ ++.SH FILES ++.BR /usr/bin/foo2hbpl1-wrapper ++.SH SEE ALSO ++.BR foo2hbpl1 (1), ++.BR hbpldecode (1) ++.SH "AUTHOR" ++Rick Richardson ++.br ++${URLHBPL}/ ++'\" ++'\" ++'\" ++.em pdf_outline +--- foo2zjs/foo2hbpl1-wrapper.in 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foo2hbpl1-wrapper.in 2014-04-04 19:06:24.048060000 +0000 +@@ -0,0 +1,577 @@ ++#!/bin/sh ++ ++#* Copyright (C) 2013 Rick Richardson ++#* ++#* This program is free software; you can redistribute it and/or modify ++#* it under the terms of the GNU General Public License as published by ++#* the Free Software Foundation; either version 2 of the License, or ++#* (at your option) any later version. ++#* ++#* This program is distributed in the hope that it will be useful, ++#* but WITHOUT ANY WARRANTY; without even the implied warranty of ++#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++#* GNU General Public License for more details. ++#* ++#* You should have received a copy of the GNU General Public License ++#* along with this program; if not, write to the Free Software ++#* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++#* ++#* Authors: Rick Richardson ++ ++VERSION='$Id: foo2hbpl1-wrapper.in,v 1.3 2014/03/24 23:14:24 rick Exp $' ++ ++# ++# Printer Notes: ++# ++# Dell 1250c ++# Dell C1660w ++# Dell C1760w ++# Epson AcuLaser C1700 ++# Fuji-Xerox DocuPrint CP105b ++# ++ ++PROGNAME="$0" ++BASENAME=`basename $PROGNAME` ++PREFIX=/usr ++SHARE=$PREFIX/share/foo2hbpl ++PATH=$PATH:/sw/bin:/opt/local/bin ++ ++# ++# Log the command line, for debugging and problem reports ++# ++if [ -x /usr/bin/logger -o -x /bin/logger ]; then ++ logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" &2 ++ exit 1 ++} ++ ++dbgcmd() { ++ if [ $DEBUG -ge 1 ]; then ++ echo "$@" >&2 ++ fi ++ "$@" ++} ++ ++# ++# N-up-ify the job. Requires psnup from psutils package ++# ++nup() { ++ case "$NUP" in ++ [2368]|1[0458]) ++ tr '\r' '\n' | psnup $NUP_ORIENT -d2 -$NUP -m.3in -p$paper -q ++ ;; ++ [49]|1[26]) ++ tr '\r' '\n' | psnup $NUP_ORIENT -d2 -$NUP -m.5in -p$paper -q ++ ;; ++ *) ++ error "Illegal call to nup()." ++ ;; ++ esac ++} ++ ++# ++# Process the options ++# ++ ++# Try to use a local copy of GhostScript 8.54, if available. Otherwise, ++# fallback to whatever the Linux distro has installed (usually 7.07) ++# ++# N.B. := operator used here, when :- would be better, because "ash" ++# doesn't have :- ++if eval gs.foo -v >/dev/null 2>&1; then ++ GSBIN=${GSBIN:-gs.foo} ++else ++ GSBIN=${GSBIN:-gs} ++fi ++ ++CMDLINE="$*" ++DEBUG=0 ++COLOR= ++COLORMODE=default ++MODEL=0 ++MEDIA=1 # plain ++COPIES=1 ++PAPER=letter ++RES=600x600 # do not change this ++SOURCE=1 ++NUP= ++CLIP_ALL= ++BC= ++AIB= ++NOPLANES= ++COLOR2MONO= ++GAMMAFILE=default ++INTENT=0 ++GSOPTS= ++EXTRAPAD= ++SAVETONER= ++NUP_ORIENT= ++GSDEV=-sDEVICE=pgmraw ++# What mode to use if the user wants us to pick the "best" mode ++case `$GSBIN --version` in ++7*) DEFAULTCOLORMODE=10 ++ DEFAULTCOLORMODE=1 ++ ;; ++8.1*) ++ DEFAULTCOLORMODE=1 ++ QUALITY=1 ++ ;; ++*) DEFAULTCOLORMODE=1 ++ ;; ++esac ++while getopts "1:23456789o:b:cC:d:g:l:u:L:m:n:p:q:s:tz:ABS:D:G:I:PX:Vh?" opt ++do ++ case $opt in ++ b) GSBIN="$OPTARG";; ++ c) COLOR=-c;; ++ d) DUPLEX="$OPTARG";; ++ g) GSOPTS="$GSOPTS $OPTARG";; ++ m) MEDIA="$OPTARG";; ++ n) COPIES="$OPTARG";; ++ p) PAPER="$OPTARG";; ++ q) QUALITY="$OPTARG";; ++ s) SOURCE="$OPTARG";; ++ t) SAVETONER="-t";; ++ z) MODEL="$OPTARG";; ++ u) CLIP_ALL="-u $OPTARG";; ++ A) AIB=-A;; ++ B) BC=-B;; ++ C) COLORMODE="$OPTARG";; ++ S) COLOR2MONO="-S$OPTARG";; ++ D) DEBUG="$OPTARG";; ++ G) GAMMAFILE="$OPTARG";; ++ I) INTENT="$OPTARG";; ++ P) NOPLANES=-P;; ++ X) EXTRAPAD="-X $OPTARG";; ++ [234689]) NUP="$opt";; ++ [57]) error "Can't find acceptable layout for $opt-up";; ++ 1) case "$OPTARG" in ++ [024568]) NUP="1$OPTARG";; ++ *) error "Can't find acceptable layout for 1$OPTARG-up";; ++ esac ++ ;; ++ o) case "$OPTARG" in ++ l*) NUP_ORIENT=-l;; ++ s*) NUP_ORIENT=-r;; ++ p*|*) NUP_ORIENT=;; ++ esac;; ++ V) echo "$VERSION"; foo2hbpl -V; foo2zjs-pstops -V; exit 0;; ++ h|\?) ++ if [ "$CMDLINE" != "-?" -a "$CMDLINE" != -h ]; then ++ echo "Illegal command:" ++ echo " $0 $CMDLINE" ++ echo ++ fi ++ usage;; ++ esac ++done ++shift `expr $OPTIND - 1` ++ ++# ++# If there is an argument left, take it as the file to print. ++# Else, the input comes from stdin. ++# ++if [ $# -ge 1 ]; then ++ if [ "$LPJOB" = "" ]; then ++ : # LPJOB="$1" ++ fi ++ exec < $1 ++fi ++ ++# ++# Validate media code ++# ++case "$MEDIA" in ++1|plain) MEDIA=1;; ++2|bond) MEDIA=2;; ++3|lwcard) MEDIA=3;; ++4|lwgcard) MEDIA=4;; ++5|labels) MEDIA=5;; ++6|envelope) MEDIA=6;; ++7|recycled) MEDIA=7;; ++8|plain2) MEDIA=8;; ++9|bond2) MEDIA=9;; ++10|lwcard2) MEDIA=10;; ++11|lwgcard2) MEDIA=11;; ++12|recycled2) MEDIA=12;; ++[0-9]*) ;; ++*) error "Unknown media code $MEDIA";; ++esac ++ ++# ++# Validate source (InputSlot) code ++# ++case "$SOURCE" in ++1|auto) SOURCE=1;; ++2|manual) SOURCE=2;; ++3|multi) SOURCE=3;; ++4|tray1) SOURCE=4;; ++[0-9]*) ;; ++*) error "Unknown source code $SOURCE";; ++esac ++ ++# ++# Figure out the paper dimensions in pixels/inch, and set the ++# default clipping region. Unfortunately, this is a trouble ++# area for ZjStream printers. Various versions of ZjS print ++# engines react differently when asked to print into their ++# unprintable regions. ++# ++set_clipping() { ++ ++ # Set clipping region if it isn't already set ++ if [ "$CLIP_ALL" = "" ]; then ++ CLIP_ALL="-u $1,$2,$3,$4" ++ fi ++} ++ ++case "$PAPER" in ++Custom*x*) ++ # Command line only ++ XDIM=`echo "$PAPER" | sed -e "s/Custom.//" -e "s/x.*//" ` ++ YDIM=`echo "$PAPER" | sed -e "s/.*x//" ` ++ if [ "$XDIM" = "" -o "$YDIM" = "" ]; then ++ error "Custom page size '$PAPER' != 1-99999" ++ fi ++ if [ "$XDIM" -eq 0 -o "$YDIM" -eq 0 ]; then ++ error "Custom page size '$PAPER' != 1-99999" ++ fi ++ XDIM=`dc -e "$XDIM 600* 72/p"` ++ YDIM=`dc -e "$YDIM 600* 72/p"` ++ PAPER=21; paper=letter; ++ DIM="${XDIM}x${YDIM}" ++ ;; ++Custom*) ++ #%%BeginFeature: *CustomPageSize True ++ #216 ++ #360 ++ #0 ++ #0 ++ #0 ++ #pop pop pop pop pop ++ ++ #%%BeginFeature: *CustomPageSize True ++ #792.000000 612.000000 1 0.000000 0.000000 ++ #pop pop pop pop pop ++ ++ if [ $DEBUG = 0 ]; then ++ TMPFILE=/tmp/cus$$ ++ else ++ TMPFILE=/tmp/custom.ps ++ fi ++ cat >$TMPFILE ++ exec <$TMPFILE ++ ++ tmp=`head -n 10000 $TMPFILE \ ++ | sed -n '/CustomPageSize/{n;p;n;p;}' \ ++ | tr '\n' ' '` ++ case "$tmp" in ++ [0-9]*\ [0-9]*) ++ XDIM=`echo "$tmp" | sed 's/ .*//'` ++ YDIM=`echo "$tmp" | sed -e 's/^[^ ]* //' -e 's/ .*//'` ++ ;; ++ *) ++ if [ $DEBUG = 0 ]; then rm -f $TMPFILE; fi ++ error "Custom page size [XY]DIM != 1-99999" ++ ;; ++ esac ++ XDIM=`dc -e "$XDIM 600* 72/p"` ++ YDIM=`dc -e "$YDIM 600* 72/p"` ++ PAPER=21; paper=letter; ++ DIM="${XDIM}x${YDIM}" ++ ;; ++ ++# Use names that Ghostscript recognizes, referring to ++# /usr/share/ghostscript/9.10/Resource/Init/gs_statd.ps ++# foo2hbpl1 will provide the appropriate numeric value ++ ++letter) DIM=5100x6600 ;; ++legal) DIM=5100x8400 ;; ++a4) DIM=4961x7016 ;; ++executive) DIM=4350x6300 ;; ++env10) DIM=2475x5700 ;; ++monarch) DIM=2325x4500 ;; ++c5) DIM=3827x5409 ;; ++envDL) DIM=2599x5197 ;; ++isob5|b5) DIM=4158x5906 ;; ++jisb5) DIM=4299x6071 ;; ++a5) DIM=3496x4961 ;; ++folio) DIM=5100x7800 ;; ++pa4) DIM=4961x6600 ;; ++archA) DIM=5400x7200 ;; ++*) error "Unimplemented paper code $PAPER";; ++esac ++ ++#set_clipping 47 48 51 46 # exact values for Dell C1660w on letter paper ++ set_clipping 51 51 51 51 # default is 0.085 inches all around ++ ++PAPERSIZE="-sPAPERSIZE=$PAPER"; ++ ++# ++# Filter thru psnup if N-up printing has been requested ++# ++case $NUP in ++[234689]|1[024568]) PREFILTER="nup";; ++*) PREFILTER=cat;; ++esac ++if [ "$DEBUG" -ge 9 ]; then ++ PREFILTER="tee /tmp/$BASENAME.ps" ++fi ++ ++# ++# Overload -G. If the file name ends with ".icm" or ".ICM" ++# then convert the ICC color profile to a Postscript CRD, ++# then prepend it to the users job. Select the intent ++# using the -I option. ++# ++ ++create_crd() { ++ # ++ # Create a Postscript CRD ++ # ++ ICC2PS=$PREFIX/bin/foo2zjs-icc2ps ++ if [ -x $ICC2PS ]; then ++ case "$GAMMAFILE" in ++ none | none.icm | */none.icm) ++ ;; ++ *) ++ if [ -x /usr/bin/logger ]; then ++ logger -t "$BASENAME" -p lpr.info -- \ ++ "`basename $ICC2PS` -o $GAMMAFILE -t$INTENT > $ICCTMP.crd.ps" ++ fi ++ $ICC2PS -o $GAMMAFILE -t$INTENT > $ICCTMP.crd.ps 2>$ICCTMP.log \ ++ || error "Problem converting .ICM file to Postscript" ++ ;; ++ esac ++ ++ PSTOPS_OPTS="$PSTOPS_OPTS -c" ++ cat > $ICCTMP.usecie.ps <<-EOF ++ %!PS-Adobe-3.0 ++ <>setpagedevice ++ EOF ++ if [ "$QUALITY" = wts -o "$QUALITY" = as ]; then ++ if [ "$QUALITY" = wts ]; then ++ cat >> $ICCTMP.usecie.ps <<-EOF ++ << /UseWTS true >> setuserparams ++ EOF ++ else ++ cat >> $ICCTMP.usecie.ps <<-EOF ++ << /UseWTS false >> setuserparams ++ EOF ++ fi ++ cat >> $ICCTMP.usecie.ps <<-EOF ++ << ++ /AccurateScreens true ++ /HalftoneType 1 ++ /HalftoneName (Round Dot Screen) cvn ++ /SpotFunction { 180 mul cos exch 180 mul cos add 2 div} ++ /Frequency 137 ++ /Angle 37 ++ >> sethalftone ++ EOF ++ fi ++ cat > $ICCTMP.selcrd.ps <<-EOF ++ /Current /ColorRendering findresource setcolorrendering ++ EOF ++ case "$GAMMAFILE" in ++ none | none.icm | */none.icm) GAMMAFILE="$ICCTMP.usecie.ps";; ++ *) GAMMAFILE="$ICCTMP.usecie.ps $ICCTMP.crd.ps $ICCTMP.selcrd.ps";; ++ esac ++ else ++ GAMMAFILE= ++ fi ++} ++ ++if [ $DEBUG -gt 0 ]; then ++ ICCTMP=/tmp/icc ++else ++ ICCTMP=/tmp/icc$$ ++fi ++ ++if [ "" = "$COLOR" ]; then ++ COLORMODE= ++ GAMMAFILE= ++else ++ case "$COLORMODE" in ++ default) COLORMODE=$DEFAULTCOLORMODE;; ++ esac ++ case "$GAMMAFILE" in ++ default) GAMMAFILE=samclp300-0.icm;; ++ esac ++fi ++ ++CRDBASE="$PREFIX/share/foo2hbpl/crd" ++case "$MODEL" in ++ 0) model=CLP-300;; ++ 1) model=CLP-600;; ++ 2) model=CLP-600;; ++ 3) model=CLP-600;; ++esac ++ ++PSTOPS_OPTS="-n" ++ ++case "$COLORMODE" in ++0|"") ++ # Monochrome ++ ;; ++10|icm) ++ # Use old ICM method ++ AIB=-A ++ BC=-B ++ case "$GAMMAFILE" in ++ none | none.icm | */none.icm) ++ create_crd ++ ;; ++ *.icm|*.ICM|*.icc|*.ICC) ++ # ++ # Its really an .ICM file, not a gamma file. ++ # ++ # The file can be a full path name, or the name of a file in $SHARE/icm/ ++ # ++ if [ -r "$GAMMAFILE" ]; then ++ create_crd ++ elif [ -r "$SHARE/icm/$GAMMAFILE" ]; then ++ GAMMAFILE="$SHARE/icm/$GAMMAFILE" ++ create_crd ++ else ++ GAMMAFILE= ++ fi ++ ;; ++ esac ++ ;; ++1|crd) ++ # CRD ++ GAMMAFILE="" ++ GAMMAFILE="$GAMMAFILE $CRDBASE/${model}cms" ++ GAMMAFILE="$GAMMAFILE $CRDBASE/$SCREEN" ++ # Black text... ++ TMPFILE2=/tmp/black$$ ++ cat $CRDBASE/black-text.ps - >$TMPFILE2 ++ exec <$TMPFILE2 ++ ;; ++*.crd) ++ GAMMAFILE="$CRDBASE/prolog.ps" ++ if [ -f $COLORMODE ]; then ++ GAMMAFILE="$GAMMAFILE $COLORMODE" ++ elif [ -f $CRDBASE/$COLORMODE ]; then ++ GAMMAFILE="$GAMMAFILE $CRDBASE/$COLORMODE" ++ else ++ error "Can't find CRD '$COLORMODE' in . or in $CRDBASE" ++ fi ++ GAMMAFILE="$GAMMAFILE $CRDBASE/$SCREEN" ++ ;; ++*) ++ error "Unknown color method '$COLORMODE'" ++ ;; ++esac ++ ++if [ "" != "$COLOR" ]; then ++ GSDEV=-sDEVICE=pamcmyk32 ++ $GSBIN --help | grep -q pamcmyk32 || GSDEV=-sDEVICE=ppmraw ++fi ++ ++# ++# Figure out USERNAME ++# ++if [ "$LPUSER" != "" ]; then ++ USER="$LPUSER@$LPHOST" ++else ++ USER="" ++fi ++ ++# ++# Main Program, just cobble together the pipeline and run it ++# ++# The malarky with file descriptors 1 and 3 is to avoid a bug in ++# (some versions?) of Ghostscript where Postscript's stdout gets ++# intermingled with the printer drivers output, resulting in ++# corrupted image data. ++# ++GS="$GSBIN -q -dBATCH -dSAFER -dQUIET -dNOPAUSE" ++ ++foo2zjs-pstops $PSTOPS_OPTS | \ ++$PREFILTER \ ++| ($GS $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS \ ++ -sOutputFile="|cat 1>&3" $GAMMAFILE -_ >/dev/null) 3>&1 \ ++| foo2hbpl1 -m$MEDIA $CLIP_ALL -J "$LPJOB" -U "$USER" ++ ++# ++# Log the command line, for debugging and problem reports ++# ++if [ -x /usr/bin/logger ]; then ++ logger -t "$BASENAME" -p lpr.info -- \ ++ "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE" ++ logger -t "$BASENAME" -p lpr.info -- \ ++ "foo2hbpl1 -m$MEDIA $CLIP_ALL" ++fi ++ ++# ++# Remove cruft ++# ++if [ $DEBUG -eq 0 ]; then ++ for i in crd.ps log usecie.ps selcrd.ps ++ do ++ file="$ICCTMP.$i" ++ [ -f $file ] && rm -f $file ++ done ++ [ -f "$TMPFILE" ] && rm -f $TMPFILE ++ [ -f "$TMPFILE2" ] && rm -f $TMPFILE2 ++fi ++ ++exit 0 +--- foo2zjs/foo2hbpl1.1in 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foo2hbpl1.1in 2014-03-24 12:30:14.000000000 +0000 +@@ -0,0 +1,68 @@ ++'\" t ++.TH foo2hbpl1 1 "${MODpage}" "foo2hbpl1 ${MODver}" ++#ifndef OLDGROFF ++#include "macros.man" ++#endif ++'\"========================================================================== ++'\" MANUAL PAGE SOURCE ++'\"========================================================================== ++.SH NAME ++foo2hbpl1 \- Convert Ghostscript output to an HBPLv1 printer stream ++.SH SYNOPSIS ++.B foo2hbpl1 ++.RI [ options "] <" pnm-or-pam-file " >" hbpl1-file ++.SH DESCRIPTION ++.B foo2hbpl1 ++converts Ghostscript pbmraw, pgmraw, ppmraw, or pamcmyk32 output ++formats to monochrome or color HBPL version 1 streams, to drive the ++Dell 1250c, Dell C1660w, Dell C1760w, ++Epson AcuLaser C1700, ++and Fuji-Xerox CP105b printers. ++ ++.SH COMMAND LINE OPTIONS ++.TP ++.BI \-J\0 filename ++Filename string to send to printer. ++.TP ++.BI \-U\0 username ++Username string to send to printer. ++.SH EXAMPLES ++Create a black and white ZJS stream: ++ ++.RS ++.nf ++gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ ++ -sPAPERSIZE=letter -r600x600 -sDEVICE=pgmraw \ ++ -sOutputFile=- - < testpage.ps \ ++| foo2hbpl1 >testpage.zm ++.fi ++.RE ++.P ++Create a color ZJS stream: ++ ++.RS ++.nf ++gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ ++ -sPAPERSIZE=letter -g5100x6600 -r600x600 -sDEVICE=pamcmyk32 \ ++ -sOutputFile=- - < testpage.ps \ ++| foo2hbpl1 >testpage.zc ++.fi ++.RE ++ ++.SH FILES ++.BR /usr/bin/foo2hbpl1 ++.SH SEE ALSO ++.BR foo2hbpl1-wrapper (1), ++.BR hbpldecode (1) ++.SH "AUTHOR" ++Rick Richardson ++.br ++Peter Korf ++.br ++Dave Coffin ++.br ++${URLHBPL}/ ++'\" ++'\" ++'\" ++.em pdf_outline +--- foo2zjs/foo2hbpl1.c 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foo2hbpl1.c 2014-04-04 18:18:29.692060000 +0000 +@@ -0,0 +1,692 @@ ++/* ++ ++GENERAL ++This program converts bilevel PBM, 8-bit PGM, 24-bit PPM, and 32-bit ++CMYK PAM files (output by Ghostscript as "pbmraw", "pgmraw", "ppmraw", ++and "pamcmyk32" respectively) to HBPL version 1 for the consumption ++of various Dell, Epson, and Fuji-Xerox printers. ++ ++With this utility, you can print to some Dell and Fuji printers, such as these: ++ - Dell 1250c B/W and Color ++ - Dell C1660 B/W and Color ++ - Dell C1760 B/W and Color ++ - Epson AcuLaser C1700 B/W and Color ++ - Fuji-Xerox DocuPrint CP105 B/W and Color ++ ++AUTHORS ++This program was originally written by Dave Coffin in March 2014. ++ ++LICENSE ++This program is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 2 of the License, or (at ++your option) any later version. ++ ++This program is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with this program; if not, write to the Free Software ++Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ ++If you want to use this program under different license conditions, ++then contact the author for an arrangement. ++ ++*/ ++ ++static char Version[] = "$Id: foo2hbpl1.c,v 1.3 2014/03/30 05:08:32 rick Exp $"; ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef linux ++ #include ++#endif ++ ++/* ++ * Command line options ++ */ ++int MediaCode = 0; ++char *Username = NULL; ++char *Filename = NULL; ++int Clip[] = { 8,8,8,8 }; ++ ++void ++usage(void) ++{ ++ fprintf(stderr, ++"Usage:\n" ++" foo2hbpl1 [options] hbpl-file\n" ++"\n" ++" Convert Ghostscript pbmraw, pgmraw, ppmraw, or pamcmyk32\n" ++" format to HBPLv1, for the Dell C1660w and other printers.\n" ++"\n" ++" gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \\ \n" ++" -sPAPERSIZE=letter -r600x600 -sDEVICE=pamcmyk32 \\ \n" ++" -sOutputFile=- - < testpage.ps \\ \n" ++" | foo2hbpl1 >testpage.zc\n" ++"\n" ++"Options:\n" ++"-m media Media code to send to printer [1 or 6]\n" ++" 1=plain, 2=bond, 3=lwcard, 4=lwgcard, 5=labels,\n" ++" 6=envelope, 7=recycled, 8=plain2, 9=bond2,\n" ++" 10=lwcard2, 11=lwgcard2, 12=recycled2\n" ++"-u left,top,right,bottom\n" ++" Erase margins of specified width [%d,%d,%d,%d]\n" ++"-J filename Filename string to send to printer\n" ++"-U username Username string to send to printer\n" ++"-V Version %s\n" ++ , Clip[0], Clip[1], Clip[2], Clip[3] ++ , Version); ++} ++ ++void ++error(int fatal, char *fmt, ...) ++{ ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vfprintf(stderr, fmt, ap); ++ va_end(ap); ++ ++ if (fatal) exit(fatal); ++} ++ ++struct stream ++{ ++ unsigned char *buf; ++ int size, off, bits; ++}; ++ ++void ++putbits(struct stream *s, unsigned val, int nbits) ++{ ++ if (s->off + 16 > s->size && ++ !(s->buf = realloc(s->buf, s->size += 0x100000))) ++ error (1, "Out of memory\n"); ++ if (s->bits) ++ { ++ s->off--; ++ val |= s->buf[s->off] >> (8-s->bits) << nbits; ++ nbits += s->bits; ++ } ++ s->bits = nbits & 7; ++ while ((nbits -= 8) > 0) ++ s->buf[s->off++] = val >> nbits; ++ s->buf[s->off++] = val << -nbits; ++} ++ ++/* ++ Runlengths are integers between 1 and 17057 encoded as follows: ++ ++ 1 00 ++ 2 01 0 ++ 3 01 1 ++ 4 100 0 ++ 5 100 1 ++ 6 101 00 ++ 7 101 01 ++ 8 101 10 ++ 9 101 11 ++ 10 110 0000 ++ 11 110 0001 ++ 12 110 0010 ++ ... ++ 25 110 1111 ++ 26 111 000 000 ++ 27 111 000 001 ++ 28 111 000 010 ++ 29 111 000 011 ++ ... ++ 33 111 000 111 ++ 34 111 001 000 ++ ... ++ 41 111 001 111 ++ 42 111 010 000 ++ 50 111 011 0000 ++ 66 111 100 00000 ++ 98 111 101 000000 ++ 162 111 110 000000000 ++ 674 111 111 00000000000000 ++ 17057 111 111 11111111111111 ++*/ ++void ++put_len(struct stream *s, unsigned val) ++{ ++ unsigned code[] = ++ { ++ 1, 0, 2, ++ 2, 2, 3, ++ 4, 8, 4, ++ 6, 0x14, 5, ++ 10, 0x60, 7, ++ 26, 0x1c0, 9, ++ 50, 0x3b0, 10, ++ 66, 0x780, 11, ++ 98, 0xf40, 12, ++ 162, 0x7c00, 15, ++ 674, 0xfc000, 20, ++ 17058 ++ }; ++ int c = 0; ++ ++ if (val < 1 || val > 17057) return; ++ while (val >= code[c+3]) c += 3; ++ putbits(s, val-code[c] + code[c+1], code[c+2]); ++} ++ ++/* ++ CMYK byte differences are encoded as follows: ++ ++ 0 000 ++ +1 001 ++ -1 010 ++ 2 011s0 s = 0 for +, 1 for - ++ 3 011s1 ++ 4 100s00 ++ 5 100s01 ++ 6 100s10 ++ 7 100s11 ++ 8 101s000 ++ 9 101s001 ++ ... ++ 14 101s110 ++ 15 101s111 ++ 16 110s00000 ++ 17 110s00001 ++ 18 110s00010 ++ ... ++ 46 110s11110 ++ 47 110s11111 ++ 48 1110s00000 ++ 49 1110s00001 ++ ... ++ 78 1110s11110 ++ 79 1110s11111 ++ 80 1111s000000 ++ 81 1111s000001 ++ ... ++ 126 1111s101110 ++ 127 1111s101111 ++ 128 11111110000 ++*/ ++void ++put_diff(struct stream *s, signed char val) ++{ ++ static unsigned short code[] = ++ { ++ 2, 3, 3, 1, ++ 4, 4, 3, 2, ++ 8, 5, 3, 3, ++ 16, 6, 3, 5, ++ 48, 14, 4, 5, ++ 80, 15, 4, 6, ++ 129 ++ }; ++ int sign, abs, c = 0; ++ ++ switch (val) ++ { ++ case 0: putbits(s, 0, 3); return; ++ case 1: putbits(s, 1, 3); return; ++ case -1: putbits(s, 2, 3); return; ++ } ++ abs = ((sign = val < 0)) ? -val:val; ++ while (abs >= code[c+4]) c += 4; ++ putbits(s, code[c+1], code[c+2]); ++ putbits(s, sign, 1); ++ putbits(s, abs-code[c], code[c+3]); ++} ++ ++void ++setle(unsigned char *c, int s, int i) ++{ ++ while (s--) ++ { ++ *c++ = i; ++ i >>= 8; ++ } ++} ++ ++void ++start_doc(int color) ++{ ++ char reca[] = { 0x41,0x81,0xa1,0x00,0x82,0xa2,0x07,0x00,0x83,0xa2,0x01,0x00 }; ++ time_t t; ++ struct tm *tmp; ++ char datestr[16], timestr[16]; ++ char cname[128] = "My Computer"; ++ char *mname[] = ++ { "", ++ "NORMAL", ++ "THICK", ++ "HIGHQUALITY", ++ "COAT2", ++ "LABEL", ++ "ENVELOPE", ++ "RECYCLED", ++ "NORMALREV", ++ "THICKSIDE2", ++ "HIGHQUALITYREV", ++ "COATEDPAPER2REV", ++ "RECYCLEREV", ++ }; ++ ++ t = time(NULL); ++ tmp = localtime(&t); ++ strftime(datestr, sizeof datestr, "%m/%d/%Y", tmp); ++ strftime(timestr, sizeof timestr, "%H:%M:%S", tmp); ++ ++ #ifdef linux ++ { ++ struct utsname u; ++ ++ uname(&u); ++ strncpy(cname, u.nodename, 128); ++ cname[127] = 0; ++ } ++ #endif ++ ++/* Lines end with \n, not \r\n */ ++ ++ printf( ++ "\033%%-12345X@PJL SET STRINGCODESET=UTF8\n" ++ "@PJL COMMENT DATE=%s\n" ++ "@PJL COMMENT TIME=%s\n" ++ "@PJL COMMENT DNAME=%s\n" ++ "@PJL JOB MODE=PRINTER\n" ++ "@PJL SET JOBATTR=\"@LUNA=%s\"\n" ++ "@PJL SET JOBATTR=\"@TRCH=OFF\"\n" ++ "@PJL SET DUPLEX=OFF\n" ++ "@PJL SET BINDING=LONGEDGE\n" ++ "@PJL SET IWAMANUALDUP=OFF\n" ++ "@PJL SET JOBATTR=\"@MSIP=%s\"\n" ++ "@PJL SET RENDERMODE=%s\n" ++ "@PJL SET ECONOMODE=OFF\n" ++ "@PJL SET RET=ON\n" ++ "@PJL SET JOBATTR=\"@IREC=OFF\"\n" ++ "@PJL SET JOBATTR=\"@TRAP=ON\"\n" ++ "@PJL SET JOBATTR=\"@JOAU=%s\"\n" ++ "@PJL SET JOBATTR=\"@CNAM=%s\"\n" ++ "@PJL SET COPIES=1\n" ++ "@PJL SET QTY=1\n" ++ "@PJL SET PAPERDIRECTION=SEF\n" ++ "@PJL SET RESOLUTION=600\n" ++ "@PJL SET BITSPERPIXEL=8\n" ++ "@PJL SET JOBATTR=\"@DRDM=XRC\"\n" ++ "@PJL SET JOBATTR=\"@TSCR=11\"\n" ++ "@PJL SET JOBATTR=\"@GSCR=11\"\n" ++ "@PJL SET JOBATTR=\"@ISCR=12\"\n" ++ "@PJL SET JOBATTR=\"@TTRC=11\"\n" ++ "@PJL SET JOBATTR=\"@GTRC=11\"\n" ++ "@PJL SET JOBATTR=\"@ITRC=12\"\n" ++ "@PJL SET JOBATTR=\"@TCPR=11\"\n" ++ "@PJL SET JOBATTR=\"@GCPR=11\"\n" ++ "@PJL SET JOBATTR=\"@ICPR=12\"\n" ++ "@PJL SET JOBATTR=\"@TUCR=11\"\n" ++ "@PJL SET JOBATTR=\"@GUCR=11\"\n" ++ "@PJL SET JOBATTR=\"@IUCR=12\"\n" ++ "@PJL SET JOBATTR=\"@BSPM=OFF\"\n" ++ "@PJL SET JOBATTR=\"@TDFT=0\"\n" ++ "@PJL SET JOBATTR=\"@GDFT=0\"\n" ++ "@PJL SET JOBATTR=\"@IDFT=0\"\n" ++ "@PJL ENTER LANGUAGE=HBPL\n" ++ , datestr, timestr ++ , Filename ? Filename : "" ++ , Username ? Username : "" ++ , mname[MediaCode] ++ , color ? "COLOR" : "GRAYSCALE" ++ , Username ? Username : "" ++ , cname); ++ fwrite (reca, 1, sizeof reca, stdout); ++} ++ ++#define IP (((int *)image) + off) ++#define CP (((char *)image) + off) ++#define DP (((char *)image) + off*deep) ++#define BP(x) ((blank[(off+x) >> 3] << ((off+x) & 7)) & 128) ++#define put_token(s,x) putbits(s, huff[hsel][x] >> 4, huff[hsel][x] & 15) ++ ++void ++encode_page(int color, int width, int height, char *image) ++{ ++ unsigned char head[90] = ++ { ++ 0x43,0x91,0xa1,0x00,0x92,0xa1,0x01,0x93,0xa1,0x01,0x94,0xa1, ++ 0x00,0x95,0xc2,0x00,0x00,0x00,0x00,0x96,0xa1,0x00,0x97,0xc3, ++ 0x00,0x00,0x00,0x00,0x98,0xa1,0x00,0x99,0xa4,0x01,0x00,0x00, ++ 0x00,0x9a,0xc4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9b, ++ 0xa1,0x00,0x9c,0xa1,0x01,0x9d,0xa1,0x00,0x9e,0xa1,0x02,0x9f, ++ 0xa1,0x05,0xa0,0xa1,0x08,0xa1,0xa1,0x00,0xa2,0xc4,0x00,0x00, ++ 0x00,0x00,0x00,0x00,0x00,0x00,0x51,0x52,0xa3,0xa1,0x00,0xa4, ++ 0xb1,0xa4 ++ }; ++ unsigned char body[52] = ++ { ++ 0x20,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x10,0x32,0x04,0x00, ++ 0xa1,0x42,0x00,0x00,0x00,0x00,0xff ++ }; ++ static short papers[] = ++ { // Official sizes to nearest 1/600 inch ++ // will accept +-1.5mm (35/600 inch) tolerance ++ 0, 5100, 6600, // Letter ++ 2, 5100, 8400, // Legal ++ 4, 4961, 7016, // A4 ++ 6, 4350, 6300, // Executive ++ 13, 2475, 5700, // #10 envelope ++ 15, 2325, 4500, // Monarch envelope ++ 17, 3827, 5409, // C5 envelope ++ 19, 2599, 5197, // DL envelope ++// ??, 4158, 5906, // B5 ISO ++ 22, 4299, 6071, // B5 JIS ++ 30, 3496, 4961, // A5 ++ 410, 5100, 7800, // Folio ++ }; ++ static const unsigned short huff[2][8] = ++ { ++ { 0x01,0x63,0x1c5,0x1d5,0x1e5,0x22,0x3e6 }, // for text & graphics ++ { 0x22,0x63,0x1c5,0x1d5,0x1e5,0x01,0x3e6 }, // for images ++ }; ++ unsigned char *blank; ++ static int pagenum = 0; ++ struct stream stream[5] = { { 0 } }; ++ int dirs[] = { -1,0,-1,1,2 }, rotor[] = { 0,1,2,3,4 }; ++ int i, j, row, col, deep, dir, run, try, bdir, brun, total; ++ int paper = 510, hsel = 0, off = 0, bit = 0, stat = 0; ++ int margin = width-96; ++ ++ for (i = 0; i < sizeof papers / sizeof *papers; i++) ++ if (abs(width-papers[i+1]) < 36 && abs(height-papers[i+2]) < 36) ++ paper = papers[i]; ++ if (!MediaCode) ++ MediaCode = paper & 1 ? 6 : 1; ++ if (!pagenum) ++ start_doc(color); ++ head[12] = paper >> 1; ++ if (paper == 510) ++ { ++ setle (head+15, 2, (width*254+300)/600); // units of 0.1mm ++ setle (head+17, 2, (height*254+300)/600); ++ head[21] = 2; ++ } ++ width = -(-width & -8); ++ setle (head+33, 4, ++pagenum); ++ setle (head+39, 4, width); ++ setle (head+43, 4, height); ++ setle (head+70, 4, width); ++ setle (head+74, 4, height); ++ head[55] = 9 + color*130; ++ if (color) body[6] = 1; ++ else body[4] = 8; ++ ++ deep = 1 + color*3; ++ for (i=1; i < 5; i++) ++ dirs[i] -= width; ++ if (!color) dirs[4] = -8; ++ ++ blank = calloc(height+2, width/8); ++ memset (blank++, -color, width/8+1); ++ for (row = 1; row <= height; row++) ++ { ++ for (col = deep; col < deep*2; col++) ++ image[row*width*deep + col] = -1; ++ for (col = 8; col < width*deep; col += 4) ++ if (*(int *)(image + row*width*deep + col)) ++ { ++ for (col = 12; col < margin/8; col++) ++ blank[row*(width/8)+col] = -1; ++ blank[row*(width/8)+col] = -2 << (~margin & 7); ++ break; ++ } ++ } ++ memset (image, -color, (width+1)*deep); ++ image += (width+1)*deep; ++ blank += width/8; ++ ++ while (off < width * height) ++ { ++ for (bdir = brun = dir = 0; dir < 5; dir++) ++ { ++ try = dirs[rotor[dir]]; ++ for (run = 0; run < 17057; run++, try++) ++ { ++ if (color) ++ { ++ if (IP[run] != IP[try]) break; ++ } ++ else ++ if (CP[run] != CP[try]) break; ++ ++ if (BP(run) != BP(try)) break; ++ } ++ if (run > brun) ++ { ++ bdir = dir; ++ brun = run; ++ } ++ } ++ if (brun == 0) ++ { ++ put_token(stream, 5); ++ for (i = 0; i < deep; i++) ++ put_diff(stream+1+i, DP[i] - DP[i-deep]); ++ bit = 0; ++ off++; ++ stat--; ++ continue; ++ } ++ if (brun > width * height - off) ++ brun = width * height - off; ++ if (bdir) ++ { ++ j = rotor[bdir]; ++ for (i = bdir; i; i--) ++ rotor[i] = rotor[i-1]; ++ rotor[0] = j; ++ } ++ if ((off-1+brun)/width != (off-1)/width) ++ { ++ if (abs(stat) > 8 && ((stat >> 31) & 1) != hsel) ++ { ++ hsel ^= 1; ++ put_token(stream, 6); ++ } ++ stat = 0; ++ } ++ stat += bdir == bit; ++ put_token(stream, bdir - bit); ++ put_len(stream, brun); ++ bit = brun < 17057; ++ off += brun; ++ } ++ ++ putbits(stream, 0xff, 8); ++ for (total = 48, i = 0; i <= deep; i++) ++ { ++ putbits(stream+i, 0xff, 8); ++ stream[i].off--; ++ setle (body+32 + i*4, 4, stream[i].off); ++ total += stream[i].off; ++ } ++ head[85] = 0xa2 + (total > 0xffff)*2; ++ setle (head+86, 4, total); ++ fwrite(head, 1, 88+(total > 0xffff)*2, stdout); ++ fwrite(body, 1, 48, stdout); ++ for (i = 0; i <= deep; i++) ++ { ++ fwrite(stream[i].buf, 1, stream[i].off, stdout); ++ free(stream[i].buf); ++ } ++ free(blank-width/8-1); ++ printf("SD"); ++} ++#undef IP ++#undef CP ++#undef DP ++#undef BP ++#undef put_token ++ ++int ++getint(FILE *fp) ++{ ++ int c, ret; ++ ++ for (;;) ++ { ++ while (isspace(c = fgetc(fp))); ++ if (c == '#') ++ while (fgetc(fp) != '\n'); ++ else break; ++ } ++ if (!isdigit(c)) return -1; ++ for (ret = c-'0'; isdigit(c = fgetc(fp)); ) ++ ret = ret*10 + c-'0'; ++ return ret; ++} ++ ++void ++do_file(FILE *fp) ++{ ++ int type, iwide, ihigh, ideep, imax, ibyte; ++ int wide, deep, byte, row, col, i, k; ++ char tupl[128], line[128]; ++ unsigned char *image, *sp, *dp; ++ ++ while ((type = fgetc(fp)) != EOF) ++ { ++ type = ((type - 'P') << 8) | fgetc(fp); ++ tupl[0] = iwide = ihigh = ideep = deep = imax = ibyte = -1; ++ switch (type) ++ { ++ case '4': ++ deep = 1 + (ideep = 0); ++ goto six; ++ case '5': ++ deep = ideep = 1; ++ goto six; ++ case '6': ++ deep = 1 + (ideep = 3); ++six: iwide = getint(fp); ++ ihigh = getint(fp); ++ imax = type == '4' ? 255 : getint(fp); ++ break; ++ case '7': ++ do ++ { ++ if (!fgets(line, 128, fp)) goto fail; ++ if (!strncmp(line, "WIDTH ",6)) ++ iwide = atoi(line + 6); ++ if (!strncmp(line, "HEIGHT ",7)) ++ ihigh = atoi(line + 7); ++ if (!strncmp(line, "DEPTH ",6)) ++ deep = ideep = atoi(line + 6); ++ if (!strncmp(line, "MAXVAL ",7)) ++ imax = atoi(line + 7); ++ if (!strncmp(line, "TUPLTYPE ",9)) ++ strcpy (tupl, line + 9); ++ } while (strcmp(line, "ENDHDR\n")); ++ if (ideep != 4 || strcmp(tupl, "CMYK\n")) goto fail; ++ break; ++ default: ++ goto fail; ++ } ++ if (iwide <= 0 || ihigh <= 0 || imax != 255) goto fail; ++ wide = -(-iwide & -8); ++ if (ideep) ++ ibyte = iwide * ideep; ++ else ++ ibyte = wide >> 3; ++ byte = wide * deep; ++ image = calloc (ihigh+2, byte); ++ for (row = 1; row <= ihigh; row++) ++ { ++ i = fread (image, ibyte, 1, fp); ++ sp = image; ++ dp = image + row*byte; ++ for (col = 0; col < iwide; col++) ++ { ++ dp += deep; ++ switch (ideep) ++ { ++ case 0: ++ *dp = ((image[col >> 3] >> (~col & 7)) & 1) * 255; ++ break; ++ case 1: ++ *dp = ~*sp; ++ break; ++ case 3: ++ for (k = sp[2], i = 0; i < 2; i++) ++ if (k < sp[i]) k = sp[i]; ++ *dp = ~k; ++ for (i = 0; i < 3; i++) ++ dp[i+1] = k ? (k - sp[i]) * 255 / k : 255; ++ break; ++ case 4: ++ for (i=0; i < 4; i++) ++ dp[i] = sp[((i-1) & 3)]; ++ break; ++ } ++ sp += ideep; ++ } ++ for (i = 0; i < deep*Clip[0]; i++) ++ image[row*byte + deep+i] = 0; ++ for (i = deep*(iwide-Clip[2]); i < byte; i++) ++ image[row*byte + deep+i] = 0; ++ } ++ memset(image+deep, 0, byte*(Clip[1]+1)); ++ memset(image+deep + byte*(ihigh-Clip[3]+1), 0, byte*Clip[3]); ++ encode_page(deep > 1, iwide, ihigh, (char *) image); ++ free(image); ++ } ++ return; ++fail: ++ fprintf (stderr, "Not an acceptable PBM, PPM or PAM file!!!\n"); ++} ++ ++int ++main(int argc, char *argv[]) ++{ ++ int c, i; ++ ++ while ( (c = getopt(argc, argv, "m:u:J:U:V")) != EOF) ++ switch (c) ++ { ++ case 'm': MediaCode = atoi(optarg); break; ++ case 'u': if (sscanf(optarg, "%d,%d,%d,%d", ++ Clip, Clip+1, Clip+2, Clip+3) != 4) ++ error(1, "Must specify four clipping margins!\n"); ++ break; ++ case 'J': if (optarg[0]) Filename = optarg; break; ++ case 'U': if (optarg[0]) Username = optarg; break; ++ case 'V': printf("%s\n", Version); return 0; ++ default: usage(); return 1; ++ } ++ ++ argc -= optind; ++ argv += optind; ++ ++ if (argc == 0) ++ { ++ do_file(stdin); ++ } ++ else ++ { ++ for (i = 0; i < argc; ++i) ++ { ++ FILE *ifp; ++ ++ if (!(ifp = fopen(argv[i], "r"))) ++ error(1, "Can't open '%s' for reading\n", argv[i]); ++ do_file(ifp); ++ fclose(ifp); ++ } ++ } ++ puts("B\033%-12345X@PJL EOJ"); ++ return 0; ++} +--- foo2zjs/foomatic-db/driver/foo2hbpl1.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/driver/foo2hbpl1.xml 2014-03-24 16:18:13.000000000 +0000 +@@ -0,0 +1,21 @@ ++ ++ foo2hbpl1 ++ http://foo2hbpl.rkkda.com/ ++ ++ ++ foo2hbpl1-wrapper %A ++ ++ ++ ++ This is a driver developed for the Dell 1250c, Dell C1660, Dell C1760, ++ Epson AcuLaser C1700, and the Fuji-Xerox DocuPrint cp105. ++ ++ ++ ++ printer/Dell-1250c ++ printer/Dell-C1660 ++ printer/Dell-C1760 ++ printer/Epson-AcuLaser_C1700 ++ printer/Fuji_Xerox-DocuPrint_CP105 ++ ++ +--- foo2zjs/foomatic-db/opt/foo2hbpl1-ColorMode.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/opt/foo2hbpl1-ColorMode.xml 2014-03-24 15:31:46.000000000 +0000 +@@ -0,0 +1,38 @@ ++ +--- foo2zjs/foomatic-db/opt/foo2hbpl1-ICM.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/opt/foo2hbpl1-ICM.xml 2014-03-25 10:14:22.000000000 +0000 +@@ -0,0 +1,52 @@ ++ +--- foo2zjs/foomatic-db/opt/foo2hbpl1-MediaType.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/opt/foo2hbpl1-MediaType.xml 2014-03-24 15:50:56.000000000 +0000 +@@ -0,0 +1,82 @@ ++ +--- foo2zjs/foomatic-db/opt/foo2hbpl1-PageSize.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/opt/foo2hbpl1-PageSize.xml 2014-04-01 11:05:46.000000000 +0000 +@@ -0,0 +1,80 @@ ++ +--- foo2zjs/foomatic-db/opt/foo2xxx-Copies.xml 2014-04-03 22:23:27.000000000 +0000 ++++ foo2zjs/foomatic-db/opt/foo2xxx-Copies.xml 2014-03-24 15:32:48.000000000 +0000 +@@ -65,6 +65,10 @@ + 1 + + ++ foo2hbpl1 ++ 1 ++ ++ + foo2hbpl2 + 1 + +--- foo2zjs/foomatic-db/opt/foo2xxx-Halftone.xml 2014-04-03 22:23:40.000000000 +0000 ++++ foo2zjs/foomatic-db/opt/foo2xxx-Halftone.xml 2014-03-25 10:16:58.000000000 +0000 +@@ -68,6 +68,10 @@ + ev/foo2xxx-Halftone-Default + + ++ foo2hbpl1 ++ ev/foo2xxx-Halftone-Default ++ ++ + foo2hbpl2 + ev/foo2xxx-Halftone-Default + +--- foo2zjs/foomatic-db/opt/foo2xxx-Nup.xml 2014-04-03 22:24:01.000000000 +0000 ++++ foo2zjs/foomatic-db/opt/foo2xxx-Nup.xml 2014-03-24 15:34:43.000000000 +0000 +@@ -65,6 +65,10 @@ + ev/foo2xxx-Nup-1 + + ++ foo2hbpl1 ++ ev/foo2xxx-Nup-1 ++ ++ + foo2hbpl2 + ev/foo2xxx-Nup-1 + +--- foo2zjs/foomatic-db/opt/foo2xxx-NupOrient.xml 2014-04-03 22:23:50.000000000 +0000 ++++ foo2zjs/foomatic-db/opt/foo2xxx-NupOrient.xml 2014-03-24 15:35:10.000000000 +0000 +@@ -65,6 +65,10 @@ + ev/foo2xxx-NupOrient-port + + ++ foo2hbpl1 ++ ev/foo2xxx-NupOrient-port ++ ++ + foo2hbpl2 + ev/foo2xxx-NupOrient-port + +--- foo2zjs/foomatic-db/opt/foo2xxx-Quality.xml 2014-04-03 22:24:12.000000000 +0000 ++++ foo2zjs/foomatic-db/opt/foo2xxx-Quality.xml 2014-03-24 15:35:36.000000000 +0000 +@@ -68,6 +68,10 @@ + ev/foo2xxx-Quality-Normal + + ++ foo2hbpl1 ++ ev/foo2xxx-Quality-Normal ++ ++ + foo2hbpl2 + ev/foo2xxx-Quality-Normal + +--- foo2zjs/foomatic-db/printer/Dell-1250c.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/printer/Dell-1250c.xml 2014-03-24 15:58:32.000000000 +0000 +@@ -0,0 +1,70 @@ ++ ++ Dell ++ 1250c ++ ++ ++ ++ ++ ++ 600 ++ 600 ++ ++ ++ ++ ++ inch ++ 0.085 ++ 0.085 ++ 0.085 ++ 0.085 ++ ++ ++ ++ ++ http://www.pcmag.com/article2/0,2817,2380920,00.asp ++ ++ ++ ++ ++ ++ ++ ++ Dell 1250c ++ ++ ++ C ++ foo2hbpl1 ++ ++ ++ ++ The Dell 1250c is color printer with a 2014 street price of $200. ++ ++ These printers are supported by the foo2hbpl1 open software printer ++ driver. ++ ++ ++ +--- foo2zjs/foomatic-db/printer/Dell-C1660.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/printer/Dell-C1660.xml 2014-03-24 15:27:13.000000000 +0000 +@@ -0,0 +1,70 @@ ++ ++ Dell ++ C1660 ++ ++ ++ ++ ++ ++ 600 ++ 600 ++ ++ ++ ++ ++ inch ++ 0.085 ++ 0.085 ++ 0.085 ++ 0.085 ++ ++ ++ ++ ++ http://accessories.us.dell.com/sna/productdetail.aspx?c=us&cs=04&l=en&s=bsd&sku=225-411 ++ ++ ++ ++ ++ ++ ++ ++ Dell C1660 ++ ++ ++ C ++ foo2hbpl1 ++ ++ ++ ++ The Dell C1660 is color printer with a 2014 street price of $200. ++ ++ These printers are supported by the foo2hbpl1 open software printer ++ driver. ++ ++ ++ +--- foo2zjs/foomatic-db/printer/Dell-C1760.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/printer/Dell-C1760.xml 2014-03-24 16:04:23.000000000 +0000 +@@ -0,0 +1,70 @@ ++ ++ Dell ++ C1760 ++ ++ ++ ++ ++ ++ 600 ++ 600 ++ ++ ++ ++ ++ inch ++ 0.085 ++ 0.085 ++ 0.085 ++ 0.085 ++ ++ ++ ++ ++ http://accessories.us.dell.com/sna/productdetail.aspx?c=us&cs=04&l=en&s=bsd&sku=225-4111 ++ ++ ++ ++ ++ ++ ++ ++ Dell C1760 ++ ++ ++ C ++ foo2hbpl1 ++ ++ ++ ++ The Dell C1760 is color printer with a 2014 street price of $300. ++ ++ These printers are supported by the foo2hbpl1 open software printer ++ driver. ++ ++ ++ +--- foo2zjs/foomatic-db/printer/Epson-AcuLaser_C1700.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/printer/Epson-AcuLaser_C1700.xml 2014-03-24 16:13:45.000000000 +0000 +@@ -0,0 +1,71 @@ ++ ++ Epson ++ AcuLaser C1700 ++ ++ ++ ++ ++ ++ 600 ++ 600 ++ ++ ++ ++ ++ inch ++ 0.085 ++ 0.085 ++ 0.085 ++ 0.085 ++ ++ ++ ++ ++ http://www.epson.co.uk/gb/en/viewcon/corporatesite/products/mainunits/overview/10816 ++ ++ ++ ++ ++ ++ ++ ++ Epson AcuLaser C1700 ++ ++ ++ C ++ foo2hbpl1 ++ ++ ++ ++ The Epson AcuLaser C1700 is color printer with a 2014 street price ++ of $200. ++ ++ These printers are supported by the foo2hbpl1 open software printer ++ driver. ++ ++ ++ +--- foo2zjs/foomatic-db/printer/Fuji_Xerox-DocuPrint_CP105.xml 1970-01-01 00:00:00.000000000 +0000 ++++ foo2zjs/foomatic-db/printer/Fuji_Xerox-DocuPrint_CP105.xml 2014-03-24 16:17:06.000000000 +0000 +@@ -0,0 +1,71 @@ ++ ++ Fuji Xerox ++ DocuPrint CP105 ++ ++ ++ ++ ++ ++ 600 ++ 600 ++ ++ ++ ++ ++ inch ++ 0.085 ++ 0.085 ++ 0.085 ++ 0.085 ++ ++ ++ ++ ++ http://accessories.us.dell.com/sna/productdetail.aspx?c=us&cs=04&l=en&s=bsd&sku=225-411 ++ ++ ++ ++ ++ ++ ++ ++ Fuji Xerox DocuPrint CP105 ++ ++ ++ C ++ foo2hbpl1 ++ ++ ++ ++ The Fuji-Xerox DocuPrint CP105 is color printer with a 2014 street ++ price of $200. ++ ++ These printers are supported by the foo2hbpl1 open software printer ++ driver. ++ ++ ++ diff --git a/pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch b/pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch new file mode 100644 index 000000000000..fb38fc206c98 --- /dev/null +++ b/pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch @@ -0,0 +1,101 @@ +From 29ac95ac76a9d9977561cef352f8b803579fea2a Mon Sep 17 00:00:00 2001 +From: Shinbar +Date: Thu, 26 Mar 2020 19:33:39 +0000 +Subject: [PATCH 1/3] PPDs (e.g. Del-1660.ppd) are specifying paper sizes as + parameters e.g. -p1 which are then being picked up as an invalid paper size + In cups error_log manifesting as: foo2hbpl1-wrapper: Unimplemented paper code + 1 + +Have amended foo2hbpl1-wrapper.in to intepret paper sizes +paper parameters are also now being interpreted. +This has fixed for a Dell 1660w printer, running on Ubuntu 18.04 +--- + foo2hbpl1-wrapper.in | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/foo2hbpl1-wrapper.in b/foo2hbpl1-wrapper.in +index 567e891..bb20ed5 100644 +--- a/foo2hbpl1-wrapper.in ++++ b/foo2hbpl1-wrapper.in +@@ -341,20 +341,20 @@ Custom*) + # /usr/share/ghostscript/9.10/Resource/Init/gs_statd.ps + # foo2hbpl1 will provide the appropriate numeric value + +-letter) DIM=5100x6600 ;; +-legal) DIM=5100x8400 ;; +-a4) DIM=4961x7016 ;; +-executive) DIM=4350x6300 ;; +-env10) DIM=2475x5700 ;; +-monarch) DIM=2325x4500 ;; +-c5) DIM=3827x5409 ;; +-envDL) DIM=2599x5197 ;; +-isob5|b5) DIM=4158x5906 ;; +-jisb5) DIM=4299x6071 ;; +-a5) DIM=3496x4961 ;; +-folio) DIM=5100x7800 ;; +-pa4) DIM=4961x6600 ;; +-archA) DIM=5400x7200 ;; ++4|letter|Letter) DIM=5100x6600 ;; ++7|legal|Legal) DIM=5100x8400 ;; ++1|a4|A4) DIM=4961x7016 ;; ++5|executive|Executive) DIM=4350x6300 ;; ++9|env10|Env10) DIM=2475x5700 ;; ++10|monarch|EnvMonarch) DIM=2325x4500 ;; ++11|c5|EnvC5) DIM=3827x5409 ;; ++12|envDL|EnvDL) DIM=2599x5197 ;; ++isob5|b5) DIM=4158x5906 ;; ++2|jisb5|B5jis) DIM=4299x6071 ;; ++a5) DIM=3496x4961 ;; ++6|folio|Folio) DIM=5100x7800 ;; ++pa4) DIM=4961x6600 ;; ++archA) DIM=5400x7200 ;; + *) error "Unimplemented paper code $PAPER";; + esac + + +From 289d55ded5af7d84a91b0ecf26bbea18f3cb2d9e Mon Sep 17 00:00:00 2001 +From: Shinbar +Date: Fri, 27 Mar 2020 09:19:40 +0000 +Subject: [PATCH 2/3] Added A5 paper size parameter + +--- + foo2hbpl1-wrapper.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/foo2hbpl1-wrapper.in b/foo2hbpl1-wrapper.in +index bb20ed5..474972d 100644 +--- a/foo2hbpl1-wrapper.in ++++ b/foo2hbpl1-wrapper.in +@@ -351,7 +351,7 @@ Custom*) + 12|envDL|EnvDL) DIM=2599x5197 ;; + isob5|b5) DIM=4158x5906 ;; + 2|jisb5|B5jis) DIM=4299x6071 ;; +-a5) DIM=3496x4961 ;; ++3|a5|A5) DIM=3496x4961 ;; + 6|folio|Folio) DIM=5100x7800 ;; + pa4) DIM=4961x6600 ;; + archA) DIM=5400x7200 ;; + +From 393f7a7c70bbf9fa0c39ac1504b220793670d201 Mon Sep 17 00:00:00 2001 +From: Shinbar +Date: Sun, 29 Mar 2020 10:01:31 +0100 +Subject: [PATCH 3/3] Makefile now works in FreeBSD + +--- + osx-hotplug/Makefile | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/osx-hotplug/Makefile b/osx-hotplug/Makefile +index 4165085..a9aa06a 100644 +--- a/osx-hotplug/Makefile ++++ b/osx-hotplug/Makefile +@@ -64,8 +64,5 @@ clean: + rm -f *.o *.1 + + uninstall: +- ( \ +- echo "g/osx-hplj-hotplug/d"; \ +- echo "w"; \ +- ) | ex $(RC) ++ -(echo "g/osx-hplj-hotplug/d"; echo "w") | ex $(RC) + -rm -f $(BIN)/osx-hplj-hotplug From 62b541455d2cef0f43defcf6ce8ce72561797be8 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 20 Nov 2021 13:46:58 +0000 Subject: [PATCH 56/83] =?UTF-8?q?ccache:=204.5=20=E2=86=92=204.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 6e6f71b6fbea..10e11391cd35 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -15,13 +15,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.5"; + version = "4.5.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-RRQso5j249PinoWznix4x4/NURe3TrwYlKOF4q8dc5U="; + sha256 = "sha256-AmzfBuase3RDoRVswyIgBnyL5TK0LXEGmYIpDzsCwgs="; }; outputs = [ "out" "man" ]; From f3ae4d9cc3e537b03a21fd8c8575af43a2377b8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Nov 2021 15:34:08 +0100 Subject: [PATCH 57/83] python3Packages.restrictedpython: 5.1 -> 5.2 --- .../restrictedpython/default.nix | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index d7005e154504..6e782b1bd336 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -1,34 +1,34 @@ { lib , buildPythonPackage , fetchPypi - -# Test dependencies -, pytest, pytest-mock +, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { - pname = "RestrictedPython"; - version = "5.1"; + pname = "restrictedpython"; + version = "5.2"; + format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "9ae16e500782b41bd1abefd8554ccb26330817bba9ce090d385aa226f1ca83e8"; + pname = "RestrictedPython"; + inherit version; + sha256 = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs="; }; - #propagatedBuildInputs = [ xmltodict requests ifaddr ]; - checkInputs = [ - pytest pytest-mock + pytestCheckHook + pytest-mock ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "RestrictedPython" + ]; - meta = { + meta = with lib; { + description = "Restricted execution environment for Python to run untrusted code"; homepage = "https://github.com/zopefoundation/RestrictedPython"; - description = "A restricted execution environment for Python to run untrusted code"; - license = lib.licenses.zpl21; - maintainers = with lib.maintainers; [ juaningan ]; + license = licenses.zpl21; + maintainers = with maintainers; [ juaningan ]; }; } From 241c145226ce031543c4580acfa7feef993d7463 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 20 Nov 2021 17:22:43 +0100 Subject: [PATCH 58/83] chromiumDev: 97.0.4692.20 -> 98.0.4710.4 --- .../browsers/chromium/upstream-info.json | 12 +++---- .../signal-desktop/default.nix | 35 ------------------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d35d3fa75175..37546ecc8715 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "97.0.4692.20", - "sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372", - "sha256bin64": "06vsmzz8nvmx7hfqwvqfmq4h000dw22srxdrgrdfgh7mry0yvf4a", + "version": "98.0.4710.4", + "sha256": "0ay4bn9963k7bbv31wfc1iy2z6n6jjk1h2mn7m7893i81raisk8m", + "sha256bin64": "0n4kb6iiv9aih7yzrnr9m7znqb2p37grlj8by6gpjfikx3fxf5gg", "deps": { "gn": { - "version": "2021-11-03", + "version": "2021-11-16", "url": "https://gn.googlesource.com/gn", - "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", - "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" + "rev": "4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", + "sha256": "0jwjfbxlbqxlz7wm46vyrxn3pgwyyd03as6gy5mcvvk9aialqh9f" } } }, diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c8797423bedb..14de83785434 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,7 +10,6 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' -, sqlcipher }: let @@ -23,39 +22,6 @@ let --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ --set LC_MESSAGES "${spellcheckerLanguage}"''); - sqlcipher-signal = sqlcipher.overrideAttrs (_: { - # Using the same features as the upstream signal sqlcipher build - # https://github.com/signalapp/better-sqlite3/blob/2fa02d2484e9f9a10df5ac7ea4617fb2dff30006/deps/defines.gypi - CFLAGS = [ - "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS" - "-DSQLITE_THREADSAFE=2" - "-DSQLITE_USE_URI=0" - "-DSQLITE_DEFAULT_MEMSTATUS=0" - "-DSQLITE_OMIT_DEPRECATED" - "-DSQLITE_OMIT_GET_TABLE" - "-DSQLITE_OMIT_TCL_VARIABLE" - "-DSQLITE_OMIT_PROGRESS_CALLBACK" - "-DSQLITE_OMIT_SHARED_CACHE" - "-DSQLITE_TRACE_SIZE_LIMIT=32" - "-DSQLITE_DEFAULT_CACHE_SIZE=-16000" - "-DSQLITE_DEFAULT_FOREIGN_KEYS=1" - "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1" - "-DSQLITE_ENABLE_COLUMN_METADATA" - "-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" - "-DSQLITE_ENABLE_STAT4" - "-DSQLITE_ENABLE_FTS5" - "-DSQLITE_ENABLE_JSON1" - "-DSQLITE_ENABLE_RTREE" - "-DSQLITE_INTROSPECTION_PRAGMAS" - - # SQLCipher-specific options - "-DSQLITE_HAS_CODEC" - "-DSQLITE_TEMP_STORE=2" - "-DSQLITE_SECURE_DELETE" - ]; - - LDFLAGS = [ "-lm" ]; - }); in stdenv.mkDerivation rec { pname = "signal-desktop"; version = "5.23.1"; # Please backport all updates to the stable channel. @@ -153,7 +119,6 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" - --prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so" ${customLanguageWrapperArgs} ) From 48e70f34bf47d0651b0e1b718507b1e368e8c079 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 10:12:20 +0100 Subject: [PATCH 59/83] python3Packages.py-nightscout: init at 1.3.2 --- .../python-modules/py-nightscout/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/py-nightscout/default.nix diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix new file mode 100644 index 000000000000..e633e6ce81bf --- /dev/null +++ b/pkgs/development/python-modules/py-nightscout/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, python-dateutil +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "py-nightscout"; + version = "1.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "marciogranzotto"; + repo = pname; + rev = "v${version}"; + sha256 = "06i8vc7ykk5112y66cjixbrks46mdx3r0ygkmyah6gfgq1ddc39j"; + }; + + propagatedBuildInputs = [ + python-dateutil + pytz + aiohttp + ]; + + checkInputs = [ + aioresponses + pytestCheckHook + pytest-asyncio + ]; + + + pythonImportsCheck = [ + "py_nightscout" + ]; + + meta = with lib; { + description = "Python library that provides an interface to Nightscout"; + homepage = "https://github.com/marciogranzotto/py-nightscout"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 14feb421cf36..3a42fa1a3ea9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6127,6 +6127,8 @@ in { py-dmidecode = callPackage ../development/python-modules/py-dmidecode { }; + py-nightscout = callPackage ../development/python-modules/py-nightscout { }; + py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { }; py-ubjson = callPackage ../development/python-modules/py-ubjson { }; From 23b94ff04dd6535f75647f9bd3a10cde02f3e99d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Nov 2021 17:35:34 +0100 Subject: [PATCH 60/83] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 19714e9a33b6..70c803b810ae 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -572,7 +572,7 @@ "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext "nextcloud" = ps: with ps; [ nextcloudmonitor ]; "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv - "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout + "nightscout" = ps: with ps; [ py-nightscout ]; "niko_home_control" = ps: with ps; [ niko-home-control ]; "nilu" = ps: with ps; [ niluclient ]; "nissan_leaf" = ps: with ps; [ pycarwings2 ]; From 72da520e40dd0c767ebe0e689f396191de25effe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Nov 2021 17:36:03 +0100 Subject: [PATCH 61/83] home-assistant: enable nightscout tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7f4c7d65a445..8fc7acc9972e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -538,6 +538,7 @@ in with py.pkgs; buildPythonApplication rec { "neato" "netatmo" "nexia" + "nightscout" "no_ip" "notify" "notion" From 67c0df93ead69f20418853fdbd1356671e869ed6 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 20 Nov 2021 16:48:52 +0000 Subject: [PATCH 62/83] gimp: fix build on darwin despite us currently having a gtk2 without `GDK_OSX_BIGSUR` defined, gimp have gone and spelt it `GDK_OSX_BIG_SUR` so define this manually anyway --- pkgs/applications/graphics/gimp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 86550b873719..11a9382c94c8 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -148,6 +148,8 @@ in stdenv.mkDerivation rec { # test-eevl.c:64:36: error: initializer element is not a compile-time constant doCheck = !stdenv.isDarwin; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; + # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; From be2bc44d0e12d0fbb5f89fe410fa6c3baa64ef3c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 20 Nov 2021 17:55:59 +0100 Subject: [PATCH 63/83] Partially revert "chromiumDev: 97.0.4692.20 -> 98.0.4710.4" This partially reverts commit 241c145226ce031543c4580acfa7feef993d7463. It embarrassingly included Signal-Desktop changes/tests that it shouldn't and I somehow noticed it too late... :o Sorry! --- .../signal-desktop/default.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 14de83785434..c8797423bedb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,6 +10,7 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' +, sqlcipher }: let @@ -22,6 +23,39 @@ let --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ --set LC_MESSAGES "${spellcheckerLanguage}"''); + sqlcipher-signal = sqlcipher.overrideAttrs (_: { + # Using the same features as the upstream signal sqlcipher build + # https://github.com/signalapp/better-sqlite3/blob/2fa02d2484e9f9a10df5ac7ea4617fb2dff30006/deps/defines.gypi + CFLAGS = [ + "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS" + "-DSQLITE_THREADSAFE=2" + "-DSQLITE_USE_URI=0" + "-DSQLITE_DEFAULT_MEMSTATUS=0" + "-DSQLITE_OMIT_DEPRECATED" + "-DSQLITE_OMIT_GET_TABLE" + "-DSQLITE_OMIT_TCL_VARIABLE" + "-DSQLITE_OMIT_PROGRESS_CALLBACK" + "-DSQLITE_OMIT_SHARED_CACHE" + "-DSQLITE_TRACE_SIZE_LIMIT=32" + "-DSQLITE_DEFAULT_CACHE_SIZE=-16000" + "-DSQLITE_DEFAULT_FOREIGN_KEYS=1" + "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1" + "-DSQLITE_ENABLE_COLUMN_METADATA" + "-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" + "-DSQLITE_ENABLE_STAT4" + "-DSQLITE_ENABLE_FTS5" + "-DSQLITE_ENABLE_JSON1" + "-DSQLITE_ENABLE_RTREE" + "-DSQLITE_INTROSPECTION_PRAGMAS" + + # SQLCipher-specific options + "-DSQLITE_HAS_CODEC" + "-DSQLITE_TEMP_STORE=2" + "-DSQLITE_SECURE_DELETE" + ]; + + LDFLAGS = [ "-lm" ]; + }); in stdenv.mkDerivation rec { pname = "signal-desktop"; version = "5.23.1"; # Please backport all updates to the stable channel. @@ -119,6 +153,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" + --prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so" ${customLanguageWrapperArgs} ) From 3c20fe4ffc93096dc389cd93c2f59a8c6d161e4f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 20 Nov 2021 18:09:05 +0100 Subject: [PATCH 64/83] signal-desktop: 5.23.1 -> 5.24.0 Thanks to [0] we don't need the LD_PRELOAD hack anymore. Now, SQLCipher will correctly get loaded without having to preload it. With version 5.23.1 this doesn't work (can be verified via the NixOS VM test). [0]: https://github.com/signalapp/better-sqlite3/commit/917a6f5cf8b84d5ef4b8fe6dc0f4b8f59ca45bea --- .../signal-desktop/default.nix | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c8797423bedb..20e589813381 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,7 +10,6 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' -, sqlcipher }: let @@ -23,42 +22,9 @@ let --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ --set LC_MESSAGES "${spellcheckerLanguage}"''); - sqlcipher-signal = sqlcipher.overrideAttrs (_: { - # Using the same features as the upstream signal sqlcipher build - # https://github.com/signalapp/better-sqlite3/blob/2fa02d2484e9f9a10df5ac7ea4617fb2dff30006/deps/defines.gypi - CFLAGS = [ - "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS" - "-DSQLITE_THREADSAFE=2" - "-DSQLITE_USE_URI=0" - "-DSQLITE_DEFAULT_MEMSTATUS=0" - "-DSQLITE_OMIT_DEPRECATED" - "-DSQLITE_OMIT_GET_TABLE" - "-DSQLITE_OMIT_TCL_VARIABLE" - "-DSQLITE_OMIT_PROGRESS_CALLBACK" - "-DSQLITE_OMIT_SHARED_CACHE" - "-DSQLITE_TRACE_SIZE_LIMIT=32" - "-DSQLITE_DEFAULT_CACHE_SIZE=-16000" - "-DSQLITE_DEFAULT_FOREIGN_KEYS=1" - "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1" - "-DSQLITE_ENABLE_COLUMN_METADATA" - "-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" - "-DSQLITE_ENABLE_STAT4" - "-DSQLITE_ENABLE_FTS5" - "-DSQLITE_ENABLE_JSON1" - "-DSQLITE_ENABLE_RTREE" - "-DSQLITE_INTROSPECTION_PRAGMAS" - - # SQLCipher-specific options - "-DSQLITE_HAS_CODEC" - "-DSQLITE_TEMP_STORE=2" - "-DSQLITE_SECURE_DELETE" - ]; - - LDFLAGS = [ "-lm" ]; - }); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.23.1"; # Please backport all updates to the stable channel. + version = "5.24.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -68,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0scbnkkbaqyqiz6bfvhdrc0yqnccjsf66iggjpa7kjyk3cy61s6c"; + sha256 = "1p19vs4wxlghv8cbsq5k4bl8h9fzr9izp4k4qs5fcnqiy1z92ycy"; }; nativeBuildInputs = [ @@ -153,7 +119,6 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" - --prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so" ${customLanguageWrapperArgs} ) From 454a8706ca6aadb820890a0b8126d307a89d85c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rasmus=20Pr=C3=A9centh?= Date: Fri, 19 Nov 2021 20:25:23 +0100 Subject: [PATCH 65/83] pythonPackages.dogpile-core: remove Broken on python2.7 and 3.7+. Upstream notes (2016-05-30): > The dogpile.core package has been rolled into dogpile.cache > directly. dogpile.core as a separate package is effectively EOL. https://bitbucket.org/zzzeek/dogpile.core/src/master/ --- .../python-modules/dogpile-core/default.nix | 23 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/development/python-modules/dogpile-core/default.nix diff --git a/pkgs/development/python-modules/dogpile-core/default.nix b/pkgs/development/python-modules/dogpile-core/default.nix deleted file mode 100644 index 32a1f59e9270..000000000000 --- a/pkgs/development/python-modules/dogpile-core/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "dogpile-core"; - version = "0.4.1"; - - src = fetchPypi { - pname = "dogpile.core"; - inherit version; - sha256 = "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy"; - }; - - doCheck = false; - - pythonImportsCheck = [ "dogpile.core" ]; - - meta = with lib; { - description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; - homepage = "https://bitbucket.org/zzzeek/dogpile.core"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 54885b48abf5..838d33e25512 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -48,6 +48,7 @@ mapAliases ({ django_taggit = django-taggit; # added 2021-10-11 dns = dnspython; # added 2017-12-10 dogpile_cache = dogpile-cache; # added 2021-10-28 + dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7b7e9017fac..3f2eabb3035d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2293,8 +2293,6 @@ in { dogpile-cache = callPackage ../development/python-modules/dogpile-cache { }; - dogpile-core = callPackage ../development/python-modules/dogpile-core { }; - dogtail = callPackage ../development/python-modules/dogtail { }; doit = callPackage ../development/python-modules/doit { }; From 30632db50a85e51088d3465ae77315b1215b76d7 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 20 Nov 2021 13:46:22 -0500 Subject: [PATCH 66/83] f3d: 1.1.0 -> 1.1.1 --- pkgs/applications/graphics/f3d/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 92875bcaeee6..bcf707bcced6 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitLab, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: +{ lib, stdenv, fetchFromGitHub, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: stdenv.mkDerivation rec { pname = "f3d"; - version = "1.1.0"; + version = "1.1.1"; - src = fetchFromGitLab { - domain = "gitlab.kitware.com"; - owner = "f3d"; + src = fetchFromGitHub { + owner = "f3d-app"; repo = "f3d"; rev = "v${version}"; - sha256 = "0lj20k5qyw9z85k3wsp05f7dcv7v7asrnppi8i1jm32dzxjm4siw"; + sha256 = "sha256-ToFP2Q+Oi+MEU9FEe5CNp0pD0bQUBQh34B9guajnqgI="; }; nativeBuildInputs = [ cmake ]; From e2ab6321ed156e0bc9479c118c80db691bff935a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 20 Nov 2021 20:34:06 +0200 Subject: [PATCH 67/83] vmTools: set msize to 128KiB 500KiB was causing issues https://github.com/NixOS/nixpkgs/pull/142577 --- pkgs/build-support/vm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a0f3b5efbaeb..e403b27d9690 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1177,6 +1177,7 @@ rec { # The default 9P msize value is 8 KiB, which according to QEMU is # insufficient and would degrade performance. # See: https://wiki.qemu.org/Documentation/9psetup#msize - # Use 500 KiB as a conservative default, see also https://github.com/NixOS/nixpkgs/pull/142577#issuecomment-953848731 - default9PMsizeBytes = 512000; + # Use 128KiB which is the default in linux 5.15+ + # https://github.com/torvalds/linux/commit/9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe + default9PMsizeBytes = 128 * 1024; } From ff7045f01839bb299311bcb463e732f4f52888b3 Mon Sep 17 00:00:00 2001 From: Jonathan Fishbein Date: Sat, 20 Nov 2021 14:56:16 -0500 Subject: [PATCH 68/83] vscode-extensions.haskell.haskell: 1.6.1 -> 1.7.1 (#146528) Co-authored-by: Sandro --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index f1107d866cc2..f8f892613bac 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -866,8 +866,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "1.6.1"; - sha256 = "1l6nrbqkq1p62dkmzs4sy0rxbid3qa1104s3fd9fzkmc1sldzgsn"; + version = "1.7.1"; + sha256 = "sha256-UWdj2J5z5cTUsfvlU++LRil0tEiAH2AFb1AwBsfMvoY="; }; meta = with lib; { license = licenses.mit; From 9387303e393e4da1e4f38caa51fc6f77a74e2edc Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Sun, 21 Nov 2021 01:47:33 +0530 Subject: [PATCH 69/83] broot: 1.7.1 -> 1.7.3 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 9817df780ea2..6a8ace3b2a98 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.7.1"; + version = "1.7.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Gg60jeDfHNKUYynJRgN4oLWhcdApWUdO5kRwl5hrFMM="; + sha256 = "sha256-qu8COcMuReV8zbDK5lm378SQY+TwDy/lo9T/ldNMfz0="; }; - cargoHash = "sha256-xsTlFfgX3Np3M/RqmK30DZBCrY1OXnEkjqBDI+ffd/U="; + cargoHash = "sha256-ndFymXT2hA4ZztePDFhAYlMh8Iwxi1/ULZYGq+W5vpE="; nativeBuildInputs = [ installShellFiles From 471183f245c3dd85221f5821d570d4fb84c52d5a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 20 Nov 2021 22:21:39 +0200 Subject: [PATCH 70/83] nixos/tests/hibernate: set memorySize to 2G --- nixos/tests/hibernate.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 4f05b99a5a11..fc6857e2fd02 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -51,6 +51,7 @@ in makeTest { connect-timeout = 1 ''; + virtualisation.memorySize = 2048; virtualisation.diskSize = 8 * 1024; virtualisation.emptyDiskImages = [ # Small root disk for installer From 24cfd348b1b2cadc81080f72ed7aad55730c2a82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Nov 2021 21:36:52 +0100 Subject: [PATCH 71/83] python3Packages.aiovlc: init at 0.1.0 --- .../python-modules/aiovlc/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/aiovlc/default.nix diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix new file mode 100644 index 000000000000..c41a39023706 --- /dev/null +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, pytest-asyncio +, pytest-timeout +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiovlc"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "MartinHjelmare"; + repo = pname; + rev = "v${version}"; + sha256 = "jB2V/Wpxmp92wba41mWZAeO63wy3NrkupllGxJMNkFM="; + }; + + propagatedBuildInputs = [ + click + ]; + + checkInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiovlc" + ]; + + meta = with lib; { + description = "Python module to control VLC"; + homepage = "https://github.com/MartinHjelmare/aiovlc"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87b06b9eb148..9d6cecf85cb4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -399,6 +399,8 @@ in { aiounittest = callPackage ../development/python-modules/aiounittest { }; + aiovlc = callPackage ../development/python-modules/aiovlc { }; + aiowatttime = callPackage ../development/python-modules/aiowatttime { }; aiowinreg = callPackage ../development/python-modules/aiowinreg { }; From 2bfbd302b229dacbb16e868a1f77623b53beb4c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Nov 2021 21:38:46 +0100 Subject: [PATCH 72/83] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a84ad21775fc..f96dd6cb6fb6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -945,7 +945,7 @@ "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek "vizio" = ps: with ps; [ pyvizio ]; "vlc" = ps: with ps; [ python-vlc ]; - "vlc_telnet" = ps: with ps; [ ]; # missing inputs: aiovlc + "vlc_telnet" = ps: with ps; [ aiovlc ]; "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ volkszaehler ]; "volumio" = ps: with ps; [ pyvolumio ]; From 96d27b27c5d50e08b44adf5a2bd81f8dcf5200c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Nov 2021 21:40:53 +0100 Subject: [PATCH 73/83] home-assistant: enable vlc_telnet tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 688afc5baa0a..8612415dd073 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -723,6 +723,7 @@ in with py.pkgs; buildPythonApplication rec { "vesync" "vilfo" "vizio" + "vlc_telnet" "voicerss" "volumio" # disabled, becaused AttributeError: does not have the attribute 'server_list' From 110930ee32c8572cedd46eebeb26e643e1e4c179 Mon Sep 17 00:00:00 2001 From: genofire Date: Sat, 20 Nov 2021 11:44:43 +0100 Subject: [PATCH 74/83] maintainers: add genofire (me) --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bc9aaed9c80a..cbed76919bdb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4187,6 +4187,16 @@ githubId = 313929; name = "Gabriel Ebner"; }; + genofire = { + name = "genofire"; + email = "geno+dev@fireorbit.de"; + github = "genofire"; + githubId = 6905586; + keys = [{ + longkeyid = "rsa4096/0xFC83907C125BC2BC"; + fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; + }]; + }; georgewhewell = { email = "georgerw@gmail.com"; github = "georgewhewell"; From 39d1d1893bbdb4af6119efd65331980ed7aa86f6 Mon Sep 17 00:00:00 2001 From: genofire Date: Sat, 20 Nov 2021 11:47:57 +0100 Subject: [PATCH 75/83] gotify-desktop: add maintainer genofire (me) --- pkgs/tools/misc/gotify-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/tools/misc/gotify-desktop/default.nix index 350f29ec52b0..1da729c706d4 100644 --- a/pkgs/tools/misc/gotify-desktop/default.nix +++ b/pkgs/tools/misc/gotify-desktop/default.nix @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { description = "Small Gotify daemon to send messages as desktop notifications"; homepage = "https://github.com/desbma/gotify-desktop"; license = licenses.gpl3Plus; - maintainers = [ maintainers.bryanasdev000 ]; + maintainers = with maintainers; [ bryanasdev000 genofire ]; }; } From b054a8594a1f5136e4ae7aa5f4e76bea95d7aab9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 20 Nov 2021 18:06:30 +0100 Subject: [PATCH 76/83] chromium: update.py: Download files from the main repository The tag 98.0.4710.4 is missing on the official GitHub mirror. As a result the download of the DEPS file was failing (HTTP Error 404: Not Found). Using the upstream repository is obviously better anyway, it's just less obvious how to fetch a file from there (?format=TEXT). --- pkgs/applications/networking/browsers/chromium/update.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 72d6df055b38..f13bda6f5075 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -5,6 +5,7 @@ via upstream-info.json.""" # Usage: ./update.py [--commit] +import base64 import csv import json import re @@ -48,9 +49,10 @@ def nix_prefetch_git(url, rev): def get_file_revision(revision, file_path): """Fetches the requested Git revision of the given Chromium file.""" - url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' + url = f'https://chromium.googlesource.com/chromium/src/+/refs/tags/{revision}/{file_path}?format=TEXT' with urlopen(url) as http_response: - return http_response.read() + resp = http_response.read() + return base64.b64decode(resp) def get_matching_chromedriver(version): From a94464d58554aa02dc144431fcface13829cd039 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 20 Nov 2021 22:30:25 +0100 Subject: [PATCH 77/83] intel-gmmlib: 21.3.2 -> 21.3.3 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 1304607b3175..59aaeb6ad928 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.3.2"; + version = "21.3.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "0whi7dmdv36d5l90yhjyv2raj2j165q82h7df9a6wf2abvsaqvdh"; + sha256 = "0hvly3fykhy4m7mzaa7xadaz7jz8krnfgj3zgzl2a2rpzja6frdn"; }; nativeBuildInputs = [ cmake ]; From a88446e324ce48d244a9e2866325b00ab0729b11 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 15 Nov 2021 21:20:02 -0500 Subject: [PATCH 78/83] zynaddsubfx: fix aarch64-linux build --- pkgs/applications/audio/zynaddsubfx/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 4b3cbb171bd0..e738a0fbcbe5 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -89,6 +89,19 @@ in stdenv.mkDerivation rec { doCheck = true; checkInputs = [ cxxtest ]; + # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 + checkPhase = let + # Tests fail on aarch64 + disabledTests = lib.optionals stdenv.isAarch64 [ + "MessageTest" + "UnisonTest" + ]; + in '' + runHook preCheck + ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' + runHook postCheck + ''; + # When building with zest GUI, patch plugins # and standalone executable to properly locate zest postFixup = lib.optionalString (guiModule == "zest") '' From a66592d763bff6da755495e18d1f1dc68508c44e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 20 Nov 2021 18:11:50 +0000 Subject: [PATCH 79/83] gimpPlugins.fourier: fix build on clang --- pkgs/applications/graphics/gimp/plugins/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 1715542adce4..17d87b60fece 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -125,6 +125,8 @@ in buildInputs = with pkgs; [ fftw ]; postPatch = '' + substituteInPlace Makefile --replace '$(GCC)' '$(CC)' + # The tarball contains a prebuilt binary. make clean ''; From 09b01aa435a5214376d71a787717c07bed60ed4c Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Sun, 21 Nov 2021 07:17:03 +0900 Subject: [PATCH 80/83] vector: 0.17.3 -> 0.18.0 (#146523) --- pkgs/tools/misc/vector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 9f06c858b48a..ab75f4349ccd 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -28,7 +28,7 @@ let pname = "vector"; - version = "0.17.3"; + version = "0.18.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -37,10 +37,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Z2GtzWkS7cxzCs+RBKMtWbzIIt4aeS1Iy9kMBEeDMw="; + sha256 = "sha256-vkiTvJevslXEF2lDTr2IL2vFBQ+dj1N636Livncsso4="; }; - cargoSha256 = "sha256-UEGdvyRPPh5Kb9+0qFyv8UBFslOKn5/R/ineawFA91w="; + cargoSha256 = "sha256-u7GzqQex5pqU7DuueMfbxMSOpAzd+uLQTZ2laG/aC+4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From 8886aa29fa0c359964d8644ab572509921725263 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 20 Nov 2021 18:06:38 -0500 Subject: [PATCH 81/83] oil: 0.9.3 -> 0.9.4 --- pkgs/shells/oil/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 3d9a2ec24e68..76680c3c3c43 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-YvNgcvafM3jgO3nY1SVcHRNglOwRQQ208W7oLxZg79o="; + sha256 = "sha256-+sYbzWtowLvy44aqhLEH8mUYUn1DJr9HOgKq3YXlPQI="; }; postPatch = '' @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { asl20 # Licence for Oil itself ]; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ lheckemann alva ]; changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; From d1c3a49fdd110aee082467af8e9ae8213613971e Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 21 Nov 2021 00:55:19 +0200 Subject: [PATCH 82/83] vmTools: set msize to 16KiB temporarily hopefully this will reduce the ram usage enough --- pkgs/build-support/vm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index e403b27d9690..09a56fda7b7f 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1179,5 +1179,6 @@ rec { # See: https://wiki.qemu.org/Documentation/9psetup#msize # Use 128KiB which is the default in linux 5.15+ # https://github.com/torvalds/linux/commit/9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe - default9PMsizeBytes = 128 * 1024; + # TODO: actually set it to 128KiB, it was causing failures in many tests due to memory usage + default9PMsizeBytes = 16 * 1024; } From 42133e84517a8aef0de2788160055494284a0447 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 20 Nov 2021 20:27:30 +0000 Subject: [PATCH 83/83] python3Packages.python-crontab: skip test test_03_usage to my knowledge this test only fails on darwin, but assuming /tmp is writable is a Bad Thing anyway so skipping on all platforms. don't think it covers anything not otherwise covered. --- pkgs/development/python-modules/python-crontab/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix index d91418fc1d0e..9de0801d5375 100644 --- a/pkgs/development/python-modules/python-crontab/default.nix +++ b/pkgs/development/python-modules/python-crontab/default.nix @@ -10,7 +10,11 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook ]; - disabledTests = [ "test_07_non_posix_shell"]; + disabledTests = [ + "test_07_non_posix_shell" + # doctest that assumes /tmp is writeable, awkward to patch + "test_03_usage" + ]; propagatedBuildInputs = [ python-dateutil ];