Commit graph

117 commits

Author SHA1 Message Date
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