Commit graph

233 commits

Author SHA1 Message Date
Steve Trout 8bc74a908d cnijfilter2: specify --datadir for cnijlgmon3
If --datadir is not given, it uses '${datarootdir}/cnijlgmon3',
with the unsubstituted variable.
2017-11-28 11:26:42 -06:00
Patrick Chilton 8bfa14f5a7 cnijfilter: add 4.00 2017-11-24 21:02:40 +01:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04: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
Guillaume Maudoux 548033285c cups-filters: 0.15.0 -> 0.16.0 2017-07-28 14:01:49 +02:00
Guillaume Maudoux 6b286fa339 cups-filters: 0.14.0 -> 0.15.0 2017-07-25 19:00:06 +02:00
Peter Hoeg 0345aed90c mfcj6510dwlpr: use new xxd package instead of vim 2017-07-24 09:37:58 +08:00
Benno Fünfstück 99fbd867ef Merge pull request #27031 from jerith666/cnijfilter-2-80
cnijfilter: init at 2.80
2017-07-18 14:37:32 +02:00
Matt McHenry 67d02cd60a cnijfilter: init at 2.80
this driver reads support files from lib/bjlib as well as lib/cups,
which is why the path in cupsd.nix is tweaked
2017-07-17 07:32:23 -04:00
Jörg Thalheim fc44b573ca mfcl2700dnlpr: remove meta.version 2017-07-14 08:44:20 +01:00
Jörg Thalheim 30223dd334 Merge pull request #25654 from 4z3/mfcl2700dn
Add support for Brother MFC-L2700DN
2017-07-13 21:48:48 +01:00
Emmanuel Rosa 7ec7aa0bb1 Revert "splix: enable JBIG" (#27054)
This reverts commit 0878ca7ab4.

My change to enable JBIG for splix did not work correctly. I was unable to get to the bottom of it because the build never completed. Given that it's also timing out in Hydra (see https://hydra.nixos.org/eval/1372226) I think it's best to simply back it out.
2017-07-03 08:09:54 +01:00
Emmanuel Rosa 0878ca7ab4 splix: enable JBIG
Enables JBIG given that according to OpenPrinting.org, the patents have expired.
See https://www.openprinting.org/driver/splix/license/

Closes #25929
2017-07-01 19:36:12 -04:00
Gabriel Ebner 798e256dcd cups-filters: fix path to pdftops
This is hardcoded to /usr/bin/pdftops by default.
2017-06-12 11:19:40 +02:00
Guillaume Maudoux dacfe8109e cups_filters: 1.11.1 -> 1.14.0 2017-05-24 12:51:24 +02:00
David Waern 3a084a80e7
samsung-unified-linux-drive: Fix sane driver by patching rpaths
fixes #25779
2017-05-20 15:35:00 +01:00
tv 6fdcc7f5b4 mfcl2700dncupswrapper: init at 3.2.0-1 2017-05-10 00:20:45 +02:00
tv ba096d8ddf mfcl2700dnlpr: init at 3.2.0-1 2017-05-10 00:20:45 +02:00
Dan Peebles aa31d4b803 cups: fix on Darwin
Kinda fix, anyway. Enough to proceed with other stuff :)
2017-04-06 20:13:33 -04:00
Jean Potier 09b1414acd cups-toshiba-estudio: init at 7.51 (#24676) 2017-04-06 15:00:02 +01:00
Dan Peebles 8b65437aae Merge branch 'master' into staging 2017-03-30 12:54:41 -04:00
Vladimír Čunát 72bb7b399a
Merge #24392: cups-dymo: patch upstream for cups 2.2 2017-03-29 13:57:07 +02:00
makefu 892c418f5d
cups-dymo: patch upstream for cups 2.2 2017-03-27 23:27:47 +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
Vladimír Čunát 036f4b2f04
cups: fix #24339: broken paths in cups-config
Note: this doesn't fix cups-dymo by itself.
It causes a slightly nontrivial rebuild on Linux.
2017-03-27 18:56:59 +02:00
Vladimír Čunát 50fadc8b18
cups: split the $lib output
This saves > 10 MB from most closures.
Printing test succeeds on x86_64-linux.
2017-03-12 18:36:30 +01:00
Vladimír Čunát 2e4c5711a2
cups: minor expression refactoring 2017-03-12 16:43:26 +01:00
Vladimír Čunát b8685ddf68
cups: 2.1.4 -> 2.2.2
The changelog seems safe, test succeeds on x86_64-linux.
2017-03-12 16:43:02 +01:00
Franz Pletz 99ef5c84b4
cups-pk-helper: 0.2.5 -> 0.2.6 2017-03-07 11:27:18 +01:00
makefu 76da40e5a7
cups-dymo: init at 1.4.0.5 2017-02-15 09:07:40 +01:00
Kier Davis 9f4114a740
samsung-unified-linux-driver_1_00_37: fix build failing due to upstream change in 'cups'
This commit should fix the package building to build due to https://github.com/NixOS/nixpkgs/issues/16238

Printing tested on M2875FD and M2675FN models. Scanning not tested yet due to lack of access of Samsung scanning devices.

All work in this commit is attributed to @jokogr. Content of this commit is basically copied+pasted from c41e771a38
2016-11-02 15:13:46 +00:00
Ioannis Koutras 270365a1ee samsung-unified-linux-driver: add 4.01.17 2016-11-01 19:19:53 +02:00
Ram Kromberg 1e290ae75f mfcj6510dw: init at 3.0.0-1 2016-10-15 18:57:37 +03:00
Jörg Thalheim 4059854351
cups-kyocera: fix downloading of source
the site blocked use of curl
fixes #14167
2016-10-01 23:41:46 +02:00
Ivan Solyankin 226f62317c
cups-kyocera: init at 1.1203 2016-10-01 23:41:46 +02:00
Joachim F 81f47f7982 Merge pull request #18700 from yochai/master
mfcj470dw: split into mfcj470dwlpr and mfcj470dwcupswrapper
2016-09-27 12:56:05 +02:00
Yochai 3b548dacf4 mfcj470dw: split into mfcj470dwlpr and mfcj470dwcupswrapper 2016-09-26 18:26:52 +03:00
Charles Strahan 358232f68a
cnijfilter2: fix build 2016-09-17 15:54:07 -04:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Tuomas Tynkkynen f410ec16c4 treewide: Fix output references to cups 2016-08-23 04:52:13 +03:00
Tuomas Tynkkynen 51ad423716 treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls 2016-08-23 00:04:39 +03:00
Nikolay Amiantov b8e3560504 cups_filters: 1.5.0 -> 1.11.1 2016-08-18 16:09:34 +03:00
Nikolay Amiantov b64924b0d5 cups: 2.1.3 -> 2.1.4 2016-08-18 16:09:34 +03: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
Charles Strahan 4e84c6fc7c cnijfilter2: init at 5.30 (#17048)
Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600,
MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490,
E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series.
2016-07-21 01:09:36 +02:00
pngwjpgh 17e8032adb samsung-UnifiedLinuxDriver: fix multi-output cups (#16421) 2016-07-01 00:29:56 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Luca Bruno cd8b383f62 cups: do not split doc output
The DocumentRoot is under doc/ which is looked up in
.out. So for now let doc/ directory in .out.
Not the right fix, but the easiest fix.

cc @vcunat
2016-04-17 21:09:34 +02:00
Joachim Fasting 7d32d92464
cups: add systemd to build inputs on linux
Otherwise, cups will be built without systemd support. The upstream
systemd service unit expects cups to have systemd support however. When
cups is built without systemd support, the daemon will fork to the
background. Consequently, systemd will think the service is done and
enter inactive state.

Along with 9de93be6cd and
47330b1732 this patch fixes the nixos
printer test timing out in `waitForUnit("cups.service")`; see
NixOS/nixpkgs#14748
2016-04-16 22:07:21 +02:00
Raymond Gauthier dbe2c50a66 brgenml1cupswrapper: fix regression and improvements
`cp`, `grep`, `chmod`, `sed` executables
no longer found when upgrading from nixos
15.09 to 16.03. Fixed by use of wrapper
script that brings these executables into
`PATH`.

Also fix lpd binaries on 64 bits machines
by use of `callPackage_i686`.
2016-04-16 00:25:17 -04:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03: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
joachifm 25a1e5d5f2 Merge pull request #14010 from yochai/master
mfcj470dw: fix missing file error
2016-03-18 22:08:23 +00:00
Yochai e6b85e6b78 mfcj470dw: fix missing file error 2016-03-18 19:56:27 +02:00
Peter Simons 6c935046a7 splix: revert of revert of "2.0.0 -> svn-r315 version update"
This reverts commit e338d6a0fc. I originally
reverted the update because it broke my Samsung printer. Now, it turns out that
this issue can be fixed by deleting and then re-creating the printer in CUPS to
update the driver.

It's possible that Gutenprints 'cups-genppdupdates' could remedy the situation
as well, but I had no chance to verify that since I don't use Gutenprint.

Closes https://github.com/NixOS/nixpkgs/issues/13734.
2016-03-18 11:36:58 +01:00
joachifm e1d451c8c5 Merge pull request #7596 from jraygauthier/jrg/brother_mfc7860dw
Brother MFC7860DW cups lpr wrapper drivers.
2016-03-15 02:06:59 +00:00
Raymond Gauthier f4cc2c6fb7 brgenml1cupswrapper: init at 3.1.0-1
Brother generic cups wrapper over lpr driver
`brgenml1lpr` init at same version.
2016-03-14 21:54:57 -04: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
Peter Simons e338d6a0fc splix: revert "2.0.0 -> svn-r315" version update
This reverts commit 6ea526462b and a9f8613dae to fix
https://github.com/NixOS/nixpkgs/issues/13734.
2016-03-07 13:37:54 +01:00
zimbatm 6ea526462b splix: cleanup
* remove commented code
* remove unused patch
* fix package naming
2016-02-27 17:36:10 +00:00
Domen Kožar a469681a51 Merge pull request #13365 from abbradar/cups-second-attempt
CUPS update (second attempt)
2016-02-26 11:13:30 +00:00
zimbatm bd8f383f15 Merge pull request #12532 from bendlas/update-splix
splix: 2.0.0 -> svn-r315
2016-02-24 00:02:28 +00:00
Nikolay Amiantov 1a025a4a96 cups: 2.0.4 -> 2.1.3
Also enable parallel building and don't install rc.d scripts.
2016-02-22 12:42:01 +03:00
Luca Bruno dc3a1bff57 cups: add a comment about updates 2016-02-21 13:51:08 +01:00
Domen Kožar 410107cf76 Revert "cups: 2.0.4 -> 2.1.2"
This reverts commit 35e1f49545.
2016-02-20 22:32:26 +00:00
Herwig Hochleitner a9f8613dae splix: 2.0.0 -> svn-r315
r315 has been in use for several years, but was never officially released
2016-02-16 22:21:23 +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
Vladimír Čunát de0af30716 Merge branch 'master' into staging 2016-01-29 10:19:48 +01:00
Tobias Geerinckx-Rice af911744fd samsung-unified-linux-driver: add 1.00.37
Very experimental. Probably very broken. Adds support for newer
models but removes it for some older ones.

Hence not the default yet, if ever.
2016-01-26 04:09:36 +01:00
Tobias Geerinckx-Rice 9fb8020e4e Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Tuomas Tynkkynen a1909d7380 treewide: Mass replace 'glibc}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Nikolay Amiantov eaaf988d45 cups_filters: 1.0.71 -> 1.5.0
Also wrap filters adding necessary utils to PATH and enable parallel building.
2016-01-17 15:50:40 +03:00
Nikolay Amiantov 35e1f49545 cups: 2.0.4 -> 2.1.2
Also enable parallel building and don't install rc.d scripts.
2016-01-17 15:50:40 +03:00
Jude Taylor e6a892bb55 phantomjs2: build on darwin 2016-01-12 21:52:49 -08:00
Bjørn Forsman a1ddb32a45 cups-bjnp: add meta.description 2016-01-02 23:14:31 +01:00
Bjørn Forsman 92a0140ff8 cups-pk-helper: init at 0.2.5
Adding this package to environment.systemPackages stops the
"Add new printer" button in gnome-control-center from being grayed out
and stops it from printing:

  (gnome-control-center:16664): printers-cc-panel-WARNING **: Your system does not have the cups-pk-helper's policy "org.opensuse.cupspkhelper.mechanism.all-edit" installed. Please check your installation

But completing the printer setup requires some additional packaging
work. This is what happens when trying to _add_ a printer:

  (gnome-control-center:18733): printers-cc-panel-WARNING **: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.fedoraproject.Config.Printing was not provided by any .service files
  (gnome-control-center:18733): printers-cc-panel-WARNING **: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.PackageKit was not provided by any .service files
2016-01-01 23:33:11 +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
Cillian de Róiste eacf656d6a mfcj470dw: tidy up 2015-10-24 22:29:11 +02:00
Yochai 837cdb03d3 mfcj470dw: init at 3.0.0-1 2015-10-23 19:51:05 +03:00
Brandon Dimcheff c0a963e3cc cups-filters: make shell string longer (close #10493)
The cstring for the shell path is too short for nixos in cups-filters,
causing it to be truncated.  This was previously fixed in #5428, but
regressed.

This is a permanent solution accepted even upstream
https://bugs.linuxfoundation.org/show_bug.cgi?id=1325
http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7401
2015-10-20 17:09:42 +02:00
Vladimír Čunát 783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát 194f0e880f just add comments about outputs (cups, gdk-pixbuf) 2015-10-13 20:18:58 +02:00
Vladimír Čunát a6e4c87391 gtk3: split into multiple outputs
All references OK, hopefully. Seems surprisingly smooth.
2015-10-13 20:18:45 +02:00
Vladimír Čunát 38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +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
Domen Kožar 264a83c707 cups: 2.0.3 -> 2.0.4, fix transient failure
(cherry picked from commit cc06f9c0be051f7ef2e1fcbd2ce13b902acc8adc)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-06 16:01:22 +02:00
William A. Kennington III 4f22eadf2c Merge branch 'master.upstream' into staging.upstream 2015-08-19 20:52:17 -07:00
Thomas Strobel 26ef514981 canon-cups-ufr2: init at 2.90 2015-08-20 01:22:10 +02:00
Jan Malakhovski c88e9deff4 cups: remove xdg_utils dependency
`cups.desktop` that depends on some fixed version of `xdg-open` is not
particularly useful; it should use `xdg-open` from the environment
it's being run from.

As a side effect, one can now fiddle with `xdg_utils` package without
rebuilding pretty much every single one of graphical packages (they
all depend on `cups` through their graphical toolkits).
2015-08-16 20:23:01 +02:00
Eelco Dolstra 689897088c cups: Don't depend on OpenSSL
Afaict, it doesn't use OpenSSL, just GNU/TLS.
2015-07-26 22:46:23 +02:00
Vladimír Čunát 9147dee57f cups-filters: update, including security fixes
- NEWS claims to fix CVE-2015-{3258,3279}
- shell path is now directly configurable

/cc maintainer @ttuegel.
2015-07-21 20:57:49 +02:00
William A. Kennington III afd532f7cb cups: 2.0.2 -> 2.0.3 2015-07-07 00:30:25 -07:00
Jascha Geerds 4ac95ab328 cups: Use systemd files provided by CUPS 2015-05-10 12:41:20 +02:00
Jascha Geerds 5f5ba7dda0 cups: Add xdg_utils to build inputs 2015-05-10 12:41:20 +02:00
Jascha Geerds 0a090d80ac cups: Refactor meta attributes 2015-05-10 12:41:20 +02:00
William A. Kennington III d6edaea4f7 cups: 1.7.5 -> 2.0.2 2015-05-10 12:41:20 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00