Commit Graph

314 Commits

Author SHA1 Message Date
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
Michael Raskin
d86c047f9c Revert "cups-filters: add package"
This reverts commit f7ba33de56.
2014-11-15 16:59:58 +03:00
Nikolay Amiantov
f7ba33de56 cups-filters: add package 2014-11-14 13:51:26 +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
Aristid Breitkreuz
7667f3c939 cupsBjnp: update from 1.2.1 to 1.2.2, potentially fixes CVE-2014-2856 2014-10-06 22:02:40 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Nixpkgs Monitor
e4258fe1a7 cupsBjnp: update from 0.5.4 to 1.2.1 2013-12-18 18:18:23 +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 1278859d31, reversing
changes made to 0c020c98f9.

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
Evgeny Egorochkin
0eecd67d14 Package Samsung unified printer driver. i686 only but apparently can be improved to support x86_64. Based on patch by James Cook <james.cook[NOSPAM]@utoronto.ca> 2012-12-05 05:43:19 +02: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 5046d0628f.
2012-10-08 14:43:49 -04:00
Eelco Dolstra
318202951e Revert "Remove cups-pdf-filter"
This reverts commit 006002d16f.
2012-10-08 14:43:47 -04:00
Eelco Dolstra
f32979e2d8 Revert "cups: Drop unused dependencies and add libusb1 dependency"
This reverts commit 6f700142c4.
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
006002d16f Remove cups-pdf-filter
It has been obsoleted by the cups-filters package.
2012-09-28 15:09:14 -04:00
Eelco Dolstra
5046d0628f cups: Update to 1.6.1 2012-09-26 18:11:23 -04:00
Yury G. Kudryashov
70dbdd0e5b cups-bjnp: fix FTBFS
svn path=/nixpkgs/trunk/; revision=34410
2012-06-09 20:10:40 +00:00
Peter Simons
a98e6bdc29 pdf-filter.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=32950
2012-03-09 10:22:34 +00:00
Peter Simons
70fca00b78 cups-pdf-filter: register MIME conversions from PDF to PS
CUPS 1.5.x doesn't do that automatically anymore.

svn path=/nixpkgs/trunk/; revision=32949
2012-03-09 10:22:30 +00: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
Peter Simons
0be69080e8 pkgs/misc/cups/drivers/splix: added myself as a maintainer
svn path=/nixpkgs/trunk/; revision=29400
2011-09-20 20:25:26 +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
35fe5dadb1 splix-2.0.0: fix compilation with gcc-4.5
svn path=/nixpkgs/branches/stdenv-updates/; revision=25312
2010-12-28 18:47:41 +00:00
Yury G. Kudryashov
d1781e4b41 Add pdftops CUPS filter
I've packaged this as a separate expression because it depends on poppler (why
don't they look for pdftops on runtime?..).

svn path=/nixpkgs/trunk/; revision=25124
2010-12-14 13:30:17 +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
Yury G. Kudryashov
0ab619066b Add splix cups driver
svn path=/nixpkgs/trunk/; revision=21078
2010-04-14 19:27:15 +00:00
Yury G. Kudryashov
1336665f0d Typo in path, style
svn path=/nixpkgs/trunk/; revision=21077
2010-04-14 19:27:04 +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
Marc Weber
bc8a85288d cups-bjnp driver
svn path=/nixpkgs/trunk/; revision=16880
2009-08-27 23:32:10 +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