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