jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
379,072 Commits 266 Branches 122 Tags 5.3 GiB
b833efbcd7
Commit Graph

124 Commits

Author SHA1 Message Date
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 9de93be6cd448bdce64e7ef5cf80ff8d81592140 and
47330b1732b67e7d5fee283685b48fdcafdc91e6 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 35e1f4954555f465fb4499880dcb6a68417fb959.
 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 cc06f9c0be051f7ef2e1fcbd2ce13b902acc8adc)
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 032859faba7174ef69f96b53bc07d544fba5e871.

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 aa548af5a5e997b94df41b1da57232bd10b76612.
 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
Eelco Dolstra
5787ac6364 cups: Split into multiple outputs 
However, splitting off the client library from the server-side stuff
still remains to be done.
 2013-06-11 14:52:36 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
7e5286db50 cups: fix reference to dbus.libs 2013-04-11 16:02:24 +02:00
Eelco Dolstra
5d6da38d33 cups: Don't build on Darwin 2013-01-29 12:43:53 +01:00
Eelco Dolstra
c961c840f6 cups: Update to 1.5.4 2012-10-08 14:50:19 -04:00
Eelco Dolstra
f5e0a05f80 Revert "cups: Update to 1.6.1" 
This reverts commit 5046d0628f1ec187b56fd847fd5dc1a41d04df50.
 2012-10-08 14:43:49 -04:00
Eelco Dolstra
f32979e2d8 Revert "cups: Drop unused dependencies and add libusb1 dependency" 
This reverts commit 6f700142c4a5794b349e6233c3e964a3de15407e.
 2012-10-08 14:43:42 -04:00
Eelco Dolstra
6f700142c4 cups: Drop unused dependencies and add libusb1 dependency 2012-09-28 23:20:59 -04:00
Eelco Dolstra
5046d0628f cups: Update to 1.6.1 2012-09-26 18:11:23 -04:00
Peter Simons
0be4183bd5 cups: updated to version 1.5.2 
svn path=/nixpkgs/trunk/; revision=32829
 2012-03-06 16:02:04 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
 2012-01-26 15:27:03 +00:00
Peter Simons
33cfa26445 cups: don't build with dbus support on non-Linux platforms 
svn path=/nixpkgs/trunk/; revision=31769
 2012-01-21 18:46:09 +00:00
Peter Simons
9c55349494 cups: cosmetic, no functional change 
svn path=/nixpkgs/trunk/; revision=31746
 2012-01-20 18:08:54 +00:00
Peter Simons
c99249d0c2 cups: blind attempt to fix the CUPS build for non-Linux platforms, particularly Darwin 
svn path=/nixpkgs/trunk/; revision=31745
 2012-01-20 18:08:50 +00:00
Peter Simons
f68e44a602 cups: updated to version 1.5.0 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29681
 2011-10-06 09:57:32 +00:00
Peter Simons
f74e361e45 added myself as maintainer 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29618
 2011-10-03 20:50:08 +00:00
Russell O'Connor
eaa3e31695 Reverting CUPS update. 
svn path=/nixpkgs/trunk/; revision=29282
 2011-09-14 17:57:49 +00:00
Russell O'Connor
15293fa398 Upgrading cups to 1.5.0 
(this fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634325)


svn path=/nixpkgs/trunk/; revision=29237
 2011-09-13 13:57:46 +00:00
Yury G. Kudryashov
385ae7d2c4 Let cups-pdf-filter use cups.src 
svn path=/nixpkgs/trunk/; revision=28652
 2011-08-18 12:52:22 +00:00
Eelco Dolstra
5caed864e5 * CUPS updated to 1.4.7. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27620
 2011-07-07 13:11:51 +00:00
Eelco Dolstra
b8e7238254 * CUPS updated to 1.4.6. 
svn path=/nixpkgs/branches/x-updates/; revision=25823
 2011-02-09 10:45:45 +00:00
Yury G. Kudryashov
a28a75f737 cups-1.4.5, add acl support 
svn path=/nixpkgs/trunk/; revision=25123
 2010-12-14 13:30:12 +00:00
Eelco Dolstra
32a8fbde4f * CUPS updated to 1.4.4. 
svn path=/nixpkgs/branches/x-updates/; revision=22636
 2010-07-18 21:52:25 +00:00
Lluís Batlle i Rossell
20d949a6f5 Adding libusb to cups, so it can access usb printers. 
svn path=/nixpkgs/trunk/; revision=22163
 2010-06-07 08:24:06 +00:00
Peter Simons
1981322cc5 pkgs/misc/cups/default.nix: don't install files to /etc or /usr 
The cups build tries to install files into global system directories.
This patch changes those paths to locations underneath of $out.

svn path=/nixpkgs/trunk/; revision=18134
 2009-11-05 13:33:36 +00:00
Eelco Dolstra
404007aab3 * Build CUPS with dbus support, plus some purity fixes. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18051
 2009-10-30 12:33:34 +00:00
Eelco Dolstra
78648561c5 * Updated CUPS to 1.4.1. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18048
 2009-10-30 09:46:51 +00:00
Eelco Dolstra
b5e67e699b * CUPS 1.3.10. 
svn path=/nixpkgs/trunk/; revision=15472
 2009-05-06 14:05:32 +00:00
Eelco Dolstra
f45ed4b74e * Remove obsolete comment. 
svn path=/nixpkgs/trunk/; revision=13977
 2009-02-03 22:15:02 +00:00
Eelco Dolstra
6c107b6706 * CUPS 1.3.9. 
svn path=/nixpkgs/trunk/; revision=13217
 2008-11-07 13:36:57 +00:00
Eelco Dolstra
5298c1f4c2 * Some disgusting DESTDIR hacking to make sure that state ends up 
under /var instead of $out/var.

svn path=/nixpkgs/trunk/; revision=8533
 2007-04-02 17:30:11 +00:00
Eelco Dolstra
f5daf2b700 * Latest CUPS. 
svn path=/nixpkgs/trunk/; revision=8532
 2007-04-02 16:22:10 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=4623
 2006-01-30 16:04:03 +00:00
Armijn Hemel
d5b2a3cfe2 add cups. This is not complete, it misses PAM, SSL and a lot of other support... 
svn path=/nixpkgs/trunk/; revision=4113
 2005-10-21 13:06:08 +00:00