Commit Graph

199 Commits

Author SHA1 Message Date
Thomas Tuegel
1e2ebee42a
hplip: fix Python wrappers
We cannot rely on wrapPythonPrograms to wrap the installed executables because
they are symlinks (which it ignores). Instead, we have to emulate it to make
the wrappers ourselves.
2017-09-20 17:03:12 -05:00
Thomas Tuegel
5ab37fb913
hplip: install PPDs where CUPS will find them 2017-09-20 14:04:55 -05:00
Joachim F
9580bafbb1 Merge pull request #25525 from emanueleperuffo/alc1100
epson-alc1100: init at version 1.2-0
2017-09-13 21:12:34 +00:00
Michael Weiss
ea23f8bb07 cups service: Automatically detect Gutenprint in drivers
Additional CUPS drivers can be added via "services.printing.drivers" but
Gutenprint was an exception. It was possible to add a Gutenprint
derivation to that list and it would work at first but unlike the other
drivers Gutenprint requires a script to be run after each update or any
attempt to print something would simply fail and an error would show up
in the jobs queue (http://localhost:631/jobs/):
"The PPD version (5.2.11) is not compatible with Gutenprint 5.2.13.
Please run
`/nix/store/7762kpyhfkcgmr3q81v1bbyy0bjhym80-gutenprint-5.2.13/sbin/cups-genppdupdate'
as administrator."
This is due to state in "/var/lib/cups/ppd" and one would need to run
"/nix/store/.../bin/cups-genppdupdate -p /var/lib/cups/ppd" manually.
The alternative was to enable the following option:
"services.printing.gutenprint" but this had two disadvantages:
1) It is an exception that one could be unaware of or that could
potentially cause some confusion.
2) One couldn't use a customized Gutenprint derivation in
"services.printing.drivers" but would instead have to overwrite
"pkgs.gutenprint".

This new approach simply detects a Gutenprint derivation in
"services.printing.gutenprint" by checking if the meta set of a
derivation contains "isGutenprint = true". Therefore no special
exception for Gutenprint would be required and it could easily be
applied to other drivers if they would require such a script to be run.
2017-08-29 05:25:12 +04:00
Symphorien Gibol
2dfba8529b epkowa: init at 2.30.3-1 2017-08-15 11:41:55 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
André-Patrick Bubel
30f96ed2ba
gutenprint: 5.2.11 -> 5.2.13 2017-08-02 10:57:31 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Tim Jäger
0c54a292fb hplip: introduce nettools dependency (#26439)
* hplip: introduce nettools dependency

Some HP printers (notably a HP MFP M477fnw) need to run `hostname` as part of
the printing process. This executable is provided by the "nettools" package.

* hplip: prepend nettools to PATH
2017-06-10 10:04:33 +01:00
Emanuele Peruffo
03187c3e15 epson-alc1100: init at version 1.2-0
Driver for printer Epson AcuLaser C1100
2017-05-05 08:41:19 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Frederik Rietdijk
94eb74eaad Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-21 13:04:37 +01:00
Frederik Rietdijk
3760c8c7fd Python: replace mkPythonDerivation with buildPythonPackage and format="other";
This way all Python packages use the same function,
`buildPythonPackage`.
2017-03-21 13:01:49 +01:00
Jörg Thalheim
c031adedba
hplip: 3.16.5 -> 3.16.11
fixes #24109
2017-03-20 11:18:41 +01:00
Vi Po
133245f961
epson-escpr: 1.6.8 -> 1.6.12
Improve documentation
2017-03-06 08:31:36 -05:00
Nikolay Amiantov
be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
Frederik Rietdijk
d9c7a14c6a hplip: use mkPythonDerivation
since hplip is a Python package that doesn't use setuptools. Note that a
setup.py is provided, however, using buildPythonPackage fails.
2016-10-26 10:46:53 +02:00
Joachim F
3177dd89bb Merge pull request #19008 from artuuge/epson-escpr
epson-escpr: 1.6.5 -> 1.6.8
2016-09-28 01:44:49 +02:00
artuuge
2168f2bf1b epson-escpr: 1.6.5 -> 1.6.8 2016-09-27 16:02:10 +02:00
Tobias Geerinckx-Rice
0a2f4e4d56 Merge pull request #17850 from regnat/hplip
hplip: Allow building with plugins on arm
2016-09-23 21:39:36 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Chris Martin
66f05a9b72 dell-530cdn: md5->sha256 2016-09-05 20:08:31 -04:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Bjørn Forsman
35c20440ca treewide: foomatic_filters -> foomatic-filters 2016-08-26 08:46:17 +02:00
Franz Pletz
1054399bef moltengamepad: disable format hardening 2016-08-25 03:55:20 +02:00
Théophane Hufschmitt
2bee86d435 hplip: Allow building with plugins on arm 2016-08-19 19:14:50 +02:00
Nikolay Amiantov
526a8acb57 m33-linux: rename from m3d-linux, 2016-01-20 -> 2016-06-23 2016-08-14 22:37:10 +03:00
Frederik Rietdijk
6842a24b21 Remove top-level pyqt4
See #11567.
2016-08-14 12:38:01 +02:00
Robert Helgesson
cc9547dcf9 foo2zjs: remove use of builderDefsPackage (#17459) 2016-08-03 00:41:47 +02:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Shea Levy
52b787b0cd Add dell-530cdn printer driver 2016-08-01 08:32:38 -04:00
yawnt
fe1f3b70bc postscript-lexmark: add package 2016-05-30 11:42:10 +02:00
Tuomas Tynkkynen
9d5ba6ba68 treewide: Make explicit that 'dev' output of libusb1 is used 2016-05-19 10:00:47 +02:00
Rommel M. Martinez
7d06d451c3 moltengamepad-git: init at 2016-05-04 (#15462) 2016-05-17 08:09:33 +02:00
Tobias Geerinckx-Rice
628ac272da
hplip{,WithPlugin}: 3.16.3 -> 3.16.5 2016-05-08 00:45:08 +02:00
Tobias Geerinckx-Rice
f72d3b2bbf
hplip{,WithPlugin}: 3.15.11 -> 3.16.3 2016-04-30 14:15:33 +02:00
artuuge
03912a2761 epson-escpr: 1.6.4 -> 1.6.5 2016-04-29 12:16:30 +02:00
Théophane Hufschmitt
5059511324 hplip : add openssl as buildInput 2016-04-18 13:47:15 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Tobias Geerinckx-Rice
d54bc765b5 hplip: canonicalise 56-hpmud.rules' paths if installed
Fixes #14338.
2016-04-04 22:14:21 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
José Romildo Malaquias
e57f1eb6d0 epson_201207w: init at 1.0.0 2016-03-09 15:25:53 -03:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
artuuge
edfb2e7ccb update epson-escpr meta 2016-03-03 14:59:40 +01:00
artuuge
7ddd6fc1c3 epson-escpr: 1.6.3 -> 1.6.4 2016-03-02 14:49:23 +01:00
Nikolay Amiantov
d9c10d6f56 gutenprint: fix cups and gimp paths
Also disable GIMP support by default to reduce closure
2016-02-26 18:27:41 +03:00
zimbatm
16f95fd8e2 Merge pull request #12875 from artuuge/epson-escpr
epson-escpr: init at version 1.6.3
2016-02-23 23:57:53 +00:00
Pascal Wittmann
7dc93ebdff Merge pull request #13090 from ebzzry/xboxdrv-0.8.8
xboxdrv: 0.8.5 -> 0.8.8
2016-02-19 13:13:57 +01:00
Nikolay Amiantov
aeee93faf3 m3d-linux: init at 2016-01-20 2016-02-17 16:56:14 +03:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Rommel M. Martinez
4b6eafa884 xboxdrv: 0.8.5 -> 0.8.8 2016-02-10 11:45:01 +08:00
artuuge
f7d88238cd epson-escpr: init at version 1.6.3 2016-02-08 14:21:39 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Franz Pletz
dbb01a863b Merge pull request #12699 from simonvandel/sundtek
sundtek: 2015-12-12 -> 2016-01-26 + service change
2016-01-30 20:41:04 +01:00
Simon Vandel Sillesen
81e99998f7 sundtek: 2015-12-12 -> 2016-01-26 + service change
* There is no need for hydra to build this, hence preferLocal
* service change: do not hardcode a wait time of 5 seconds
2016-01-30 20:08:52 +01:00
Vladimír Čunát
de0af30716 Merge branch 'master' into staging 2016-01-29 10:19:48 +01:00
Tobias Geerinckx-Rice
ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Nikolay Amiantov
a8b3e686d0 gutenprint: 5.2.10 -> 5.2.11
Rework gutenprint derivation:

* Convert to regular stdenv.mkDerivation;
* Enable IJS driver;
* Fix cups-genppdupdate;
* Move things around to the proper directories;
* Enable parallel building;
* Clean from old hacks.
2016-01-17 15:50:40 +03:00
Tobias Geerinckx-Rice
99075fb402 saneBackends{,Git} -> sane-backends{,-git}
Fixes xsane evaluation.
2016-01-03 03:31:38 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Simon Vandel Sillesen
f7e2f8844d sundtek: 2015-09-07 -> 2015-12-12 2015-12-14 18:01:59 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
3cc1f8dd15 hplip 3.15.9 -> 3.15.11
Keep 3.15.9 available as hplip{,WithPlugin}_3_15_9 in case this
breaks someone's printer/day job.
2015-11-27 01:45:53 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
ec980c7b1e hplip: fix evaluation errors on unsupported platforms
Evidently, `abort` is unrecoverable, and `throw` should be used instead.
Only partially tested, as I don't have enough RAM right now for it.
2015-11-23 15:42:22 +01:00
Tobias Geerinckx-Rice
15324dc7d4 hplip: remove duplicate platform definitions 2015-11-21 01:35:34 +01:00
Tobias Geerinckx-Rice
2e248040a6 hplip: fix broken platforms hack 2015-11-21 01:35:34 +01:00
Tobias Geerinckx-Rice
729b764c53 hplip: use lib.optionals for clarity 2015-11-21 01:34:48 +01:00
Tobias Geerinckx-Rice
612a0f248b hplip: under_scores -> camelCase 2015-11-21 01:34:29 +01:00
Tobias Geerinckx-Rice
97597d4f75 hplip: clean up & remove unused arguments 2015-11-21 01:33:15 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Jude Taylor
d63f0d3a6b hplip: fix evaluation 2015-10-20 15:54:33 -07:00
Vladimír Čunát
b44d846990 udev: complete rework
- systemd puts all into one output now (except for man),
  because I wasn't able to fix all systemd/udev refernces
  for NixOS to work well
- libudev is now by default *copied* into another path,
  which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
  references that just put `udev` into build inputs (to rewrite them all),
  also this made "${udev}/foo" fail at *evaluation* time
  so it's easier to catch and change to something more specific
2015-10-04 10:03:53 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Tobias Geerinckx-Rice
7eba250f55 hplip & plugin: 3.15.6 -> 3.15.9 2015-09-18 02:04:05 +02:00
Simon Vandel Sillesen
d14669b9dc sundtek: 28-07-2015 -> 2015-09-07 (close #9723) 2015-09-09 09:04:37 +02:00
Simon Vandel Sillesen
a7648a2226 sundtek: 30-06-2015 -> 28-07-2015
Tested on local machine.
2015-08-12 17:25:08 +02:00
Tobias Geerinckx-Rice
b62debe042 hplip: 3.15.7 -> 3.15.6
Version 3.15.7 breaks certain (but not all) PCL-based printers:
b0e46fc3ea

Forgetting to revert a failed patch hunk certainly didn't help. Grr.
2015-08-04 20:00:20 +02:00
Thomas Tuegel
b0e46fc3ea hplip: remove ttuegel from maintainers
I no longer commit my changes to Nixpkgs because they are usually broken
by other maintainers.
2015-08-03 21:31:44 -05:00
Tobias Geerinckx-Rice
aebb3ec0f4 hplip: patch shebangs in $out/share
A full wrap isn't needed as these scripts are only run from within
hplip's own environment, and unwanted because they are imported
as Python modules.

Also fix a reference to /etc in $out/etc/hp/hplip.conf, though I've no
idea whether it is actually used.
2015-07-23 03:12:24 +02:00
Tobias Geerinckx-Rice
603b146979 hplip: 3.15.6 -> 3.15.7 2015-07-23 03:12:23 +02:00
Tobias Geerinckx-Rice
1bad2fa611 hplip: fix scanning for USB devices 2015-07-23 03:12:23 +02:00
Tobias Geerinckx-Rice
72f6a797fa hplip: fix (Python) tools again
Something changed in the generic fixupPhase magic exposing a bug
in the previous fix (wrapPythonPrograms where I should have used
wrapPythonProgramsIn).

Also move buildInputs and friends to a more conventional spot.
2015-07-23 03:12:23 +02:00
Simon Vandel Sillesen
e85dac137e sundtek init at 30-06-2015 2015-07-07 10:58:58 +02:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Tobias Geerinckx-Rice
9f5b9de559 hplip 3.15.4 -> 3.15.6 2015-06-13 16:14:40 +02:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Tobias Geerinckx-Rice
ff7dd3e3b1 hplip: do wrap Python scripts in $out/lib 2015-05-17 23:39:58 +02:00
Tobias Geerinckx-Rice
393219d000 hplip: stop installing corrupted tools
None of the installed tools like hp-align or hp-toolbox could
work, because they tried to import wrapped Python scripts (i.e.
shell code) as Python modules. Fix this by:

- Substituting `dbus` for the defective `pythonDBus`.

- No longer blindly wrapping all python files, but replacing
  the original symlinks in $out/bin with wrapper scripts.
  These wrappers then `exec` the unmodified Python scripts in
  $out/share/hplip directly, instead of the .<name>-wrapped
  copy that wrapPythonProgramsIn creates. The latter are simply
  removed.

Sure, it's a bit ugly. It's also 2015 and I couldn't use my
printer :-/
2015-05-17 21:11:36 +02:00
Thomas Tuegel
c59c20ca0f Update HPLIP to 3.15.4 2015-05-16 14:12:11 -05:00
Simon Jagoe
691a65cb41 Update SHA256 for hplip plugin 2015-05-15 13:04:11 +01:00
Tobias Geerinckx-Rice
5f7f793d4e hplip: coalesce find -exec sed invocations
No need to scan the (biggish) source tree six times, forking a separate
process for every file each time. This was slowing down testing.
2015-05-13 15:09:43 +02:00
Vladimír Čunát
b7c3c25218 fix ${udev} references (and a few others) 2015-05-05 11:52:08 +02:00
Thomas Tuegel
18e594eddb hplip: update to 3.15.2 2015-02-21 20:19:21 -06:00
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Thomas Tuegel
28b55a318a hplip: ensure plugin version always up-to-date 2015-01-21 07:57:05 -06:00
Thomas Tuegel
7a20c4cae4 hplip: version 3.14.10 2015-01-21 07:57:05 -06:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00