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
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Cillian de Róiste
21753791b1
hplip: fix typo in license
2014-11-20 14:23:19 +01:00
Thomas Tuegel
4e11748886
hplip: update license attribute
2014-11-20 05:14:02 -06:00
Thomas Tuegel
ac696769af
Revert "Merge pull request #4693 from flosse/hplip-update"
...
This reverts commit 1b064645ed
, reversing
changes made to 14cef95e84
.
As discussed in the comments to the aforementioned pull request, while
the new version supports many new printer models, many components of the
driver are broken because of some corner cases in the Python wrapper. In
particular, the loader for the binary binary driver needed by many
middle- and high-end printers is broken, negating most of the value in
updating!
2014-11-20 05:14:01 -06:00
Nikolay Amiantov
a75d294516
foomatic-filters: fix building with cups-2
2014-11-14 22:52:04 +03:00
Pascal Wittmann
8df0e0b151
Fixed many descriptions
2014-11-11 14:36:34 +01:00
Cray Elliott
6349ff15b1
add xwiimote, a linux-only userspace driver for wiimotes
2014-11-08 20:44:25 -08:00
Jascha Geerds
9381f4ffc3
Update hplip maintainer list
2014-10-28 20:19:58 +01:00
Markus Kohlhase
6c1b113342
hplip: update to v3.14.10
2014-10-28 02:45:56 +01:00
Mateusz Kowalczyk
d8798a62b7
gutenprint: update from 5.2.9 to 5.2.10
2014-09-30 10:56:12 +01:00
Pascal Wittmann
8d67b9a240
transformed meta.maintainers of some packages into lists
2014-09-13 13:52:02 +02:00
Eelco Dolstra
50f548771e
Fix broken use of builtins.currentSystem
...
Packages should never use builtins.currentSystem.
2014-07-28 11:28:35 +02:00
Mateusz Kowalczyk
82a30be74a
xboxdrv: 0.8.5
2014-05-29 04:22:34 +02:00
Thomas Tuegel
8ffd6af27e
hplip: don't use udev rules to change device owner
2014-05-20 16:43:59 -05:00
Thomas Tuegel
4fb9c3700a
hplip: avoid name collision with sane config files
2014-05-11 14:01:07 -05:00
Thomas Tuegel
56994ce2eb
hplip: add pillow and reportlab dependencies
2014-05-10 23:44:03 -05:00
Thomas Tuegel
2666dcd218
hplip: assume maintainership
2014-05-10 21:57:17 -05:00
Thomas Tuegel
a0dc20719b
hplip: add binary plugin
2014-05-10 21:57:05 -05:00
Thomas Tuegel
4971bdc930
hplip version bump 3.11.1 -> 3.14.4
2014-05-10 17:00:24 -05:00
Nixpkgs Monitor
c47477d06e
foomatic_filters: update from 4.0.12 to 4.0.17
2013-12-18 18:18:27 +02:00
Cillian de Róiste
72aae985ae
gutenprint: wrap sbin/cups-genppd.5.2
...
This is used to generate ppd files for cups:
$ cups-genppd.5.2 -M | grep p50
canon-cp500
escp2-p50
$ cups-genppd.5.2 -p . escp2-p50
This will create the relevant ppd file in the current directory. This
can then be used by cups after setting services.drivers.drivers =
[pkgs.gutenprint]; and configuring the printer to use this ppd e.g.
via the web interface on http://localhost:631
2013-11-10 16:32:05 +01:00
Cillian de Róiste
80e2706e51
gutenprint: fix the cupsd driver
2013-11-10 00:38:42 +01:00
Cillian de Róiste
78c76daf16
gutenprint: upgrade to 5.2.9
2013-11-10 00:38:42 +01:00
Aristid Breitkreuz
b2afb45b8d
hplip: make pyqt4 dependency conditional on qtSupport
2013-02-08 00:27:07 +01:00
Aristid Breitkreuz
b73dff89f7
enable networking support for hplip, net_snmp is available now
2013-02-06 14:08:27 +01:00
Aristid Breitkreuz
b5e2a027c4
hplip: now hp-setup actually shows a dialog
2013-02-06 13:44:39 +01:00
Aristid Breitkreuz
f590891ac2
hplip: start work on making python programs work
2013-02-06 13:44:38 +01:00
Ambrus Kaposi
0fc2fd5bfb
Create a symbolic link to cups/lib so that gutenprintBin can be specified as a driver in services.printing.drivers in /etc/nixos/configuration.nix
2012-11-30 12:43:00 +01:00
Eelco Dolstra
a779d2ba18
foomatic-filters: Update to 4.0.12
2012-10-08 14:52:06 -04:00
Yury G. Kudryashov
94726d19e7
gutenprint-5.2.7, fix FTBFS
...
svn path=/nixpkgs/trunk/; revision=34409
2012-06-09 20:10:35 +00:00
Eelco Dolstra
c556a6ea46
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
...
function, so obsolete it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
7e320a7043
State qt version (3/4) in packages, not in all-packages.nix
...
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Eelco Dolstra
614e5a525c
* Clean up foomatic-filters.
...
svn path=/nixpkgs/trunk/; revision=27470
2011-06-15 12:40:58 +00:00
Yury G. Kudryashov
ba3c547f6d
Fixing hardcoded paths in foo2zjs. Still no firmware
...
svn path=/nixpkgs/trunk/; revision=26332
2011-03-15 23:08:59 +00:00
Yury G. Kudryashov
da4447afd7
foo2zjs: less hardcoded paths
...
svn path=/nixpkgs/trunk/; revision=26179
2011-03-06 16:07:53 +00:00
Yury G. Kudryashov
513ee9fc4f
hplip-3.11.1, enable polkit support
...
svn path=/nixpkgs/trunk/; revision=26178
2011-03-06 16:07:47 +00:00
Yury G. Kudryashov
d1d9da2ff3
Trying to fix foo2zjs
...
There are still some hardcoded paths
svn path=/nixpkgs/trunk/; revision=26177
2011-03-06 16:07:43 +00:00
Cillian de Roiste
42f818969d
Bumping to version 5.2.6 and fixing the url
...
svn path=/nixpkgs/trunk/; revision=25858
2011-02-09 20:34:52 +00:00
Michael Raskin
c6ee103fc3
Update paths - does not fix all the problems, apparently
...
svn path=/nixpkgs/trunk/; revision=25714
2011-01-28 10:22:30 +00:00
Michael Raskin
2990b8fb5a
Install PPD files, too
...
svn path=/nixpkgs/trunk/; revision=25713
2011-01-28 09:06:21 +00:00
Michael Raskin
1cd5efa338
Trying to add foomatic-filters and foo2zjs
...
svn path=/nixpkgs/trunk/; revision=25712
2011-01-28 08:44:31 +00:00
Evgeny Egorochkin
3a6c172b77
HPLiP: Fix compilation. Had to move the comment out of configure flags. Very sneaky!
...
Make hydra compile it.
svn path=/nixpkgs/trunk/; revision=23878
2010-09-21 01:24:00 +00:00
Eelco Dolstra
6609710409
* Get rid of many instances of "args: with args;", and other coding
...
guidelines violations.
* Updated libsamplerate to 0.1.7.
svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Lluís Batlle i Rossell
583ca54705
Fixing the hplip meta info, so nixpkgs can be evaluated again by hydra (and nix-env -qa)
...
svn path=/nixpkgs/trunk/; revision=22323
2010-06-18 09:45:23 +00:00
Lluís Batlle i Rossell
034005647b
Adding hplip (HP's driver suite for printers and multi-function devices), which builds
...
but I have not tried to do anything with it
svn path=/nixpkgs/trunk/; revision=22321
2010-06-18 08:16:17 +00:00
Ludovic Courtès
87a62e5409
gutenprint: Fix name, improve style.
...
svn path=/nixpkgs/trunk/; revision=18532
2009-11-22 19:11:27 +00:00
Eelco Dolstra
a54fc7e7f7
svn path=/nixpkgs/trunk/; revision=17083
2009-09-13 10:54:47 +00:00
Eelco Dolstra
f560f49faa
* Fix nix-env evaluation.
...
svn path=/nixpkgs/trunk/; revision=16931
2009-09-02 13:22:34 +00:00
Marc Weber
8ff2647169
adding gutenprint (former gimp-print) and gutenprintBin. I still haven't
...
found the source of the binary package containing the .ppd files
Still impure but works. See comment.
svn path=/nixpkgs/trunk/; revision=16881
2009-08-27 23:32:13 +00:00