mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
Code Issues Wiki Activity
116012 commits 339 branches 124 tags 6.9 GiB
Commit graph

84 commits

Author SHA1 Message Date
Dan Peebles aa31d4b803 cups: fix on Darwin 
Kinda fix, anyway. Enough to proceed with other stuff :)
 2017-04-06 20:13:33 -04:00
Dan Peebles 8b65437aae Merge branch 'master' into staging 2017-03-30 12:54:41 -04: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
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Nikolay Amiantov b64924b0d5 cups: 2.1.3 -> 2.1.4 2016-08-18 16:09:34 +03: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
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
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
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
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 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01: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
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 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 cc06f9c0be)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-09-06 16:01:22 +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
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 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
Domen Kožar 146eb665d0 Revert "cups: 1.7.5 -> 2.0.2" 
This reverts commit 032859faba.

Conflicts:
	pkgs/misc/cups/default.nix

Breaks nixos printing tests, see
032859faba (commitcomment-10495609)
 2015-03-31 16:51:07 +02:00
William A. Kennington III b91bac282d cups: Fix gmp linking by propagating 2015-03-26 16:18:17 -07:00
William A. Kennington III 032859faba cups: 1.7.5 -> 2.0.2 2015-03-26 13:30:54 -07:00
Eelco Dolstra be0e73b938 cups: Build with SERVERROOT set to /etc/cups 2014-12-16 18:23:41 +01:00
Eelco Dolstra ffdabf02b9 cups: Get rid of obsolete banners 
These use bannertops, which no longer exists. And they conflicted with
the working banners in cups-filters.
 2014-12-16 18:23:41 +01:00
Edward Tjörnhammar 45c4d68960
cups: bump 1.5.4 -> 1.7.5 2014-11-22 04:26:17 +01:00
Michael Raskin ba77c90161 Revert "cups: update package" 
This reverts commit aa548af5a5.
 2014-11-15 17:00:15 +03:00
Nikolay Amiantov aa548af5a5 cups: update package 2014-11-14 13:51:26 +03:00
Aristid Breitkreuz e6277bd958 the sha256 of cups 1.5.4 was that of a HTML (broken in md5->sha256 update) 2014-10-12 16:52:54 +02:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Eelco Dolstra 7c8518c194 Cleanup 2013-08-23 10:02:07 +02:00
Mathijs Kwik 6ced9298c7 cups: keep versioning in all-packages.nix, as it is in master 2013-08-22 08:24:13 +02:00
Eelco Dolstra 10de0529b4 Oops 2013-08-21 17:10:39 +02:00
Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
 2013-08-21 17:05:30 +02:00
Mathijs Kwik fe622f6523 upgrade some packages to libusb1 
on my systems, I can now override "libusb = libusb1" in all of nixpkgs
so perhaps we can soon drop libusb 0.1 support?
 2013-07-01 07:52:13 +02:00
Eelco Dolstra 552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-25 18:42:56 +02:00
Eelco Dolstra 2cfeca153c openssl, cups: Fix stripping libraries 2013-06-12 16:10:54 +02:00