1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-05 20:12:52 +00:00
Commit graph

115 commits

Author SHA1 Message Date
Dmitry Kalinkin c457d983c7
cups: remove assert that breaks systemd = null deep override
This is another case of #73102
2021-01-28 15:56:25 -05:00
Ben Siraphob fce00d15c2 pkgs/misc: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Martin Milata 4ea28e76c2 cups: 2.3.1 -> 2.3.3
https://github.com/apple/cups/releases/tag/v2.3.3

Fixes:

https://nvd.nist.gov/vuln/detail/CVE-2019-8842
https://nvd.nist.gov/vuln/detail/CVE-2020-3898
2020-05-01 08:48:02 +02:00
Florian Klink 2c621ff4f4 cups: request libusb1 directly 2020-04-27 12:19:12 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM 84457be75a cups: 2.3.0 -> 2.3.1 2020-01-06 00:17:30 -08:00
markuskowa c683b19886
Merge pull request #70969 from doronbehar/update-cups
cups: 2.2.12 -> 2.3.0
2019-11-02 14:56:10 +01:00
(cdep)illabout 664823c11c cups: enable compiling with musl
When compiling `cups` with `pkgsMusl`, `cups` can't depend on `systemd`
because `systemd` is not able to be built with musl.
2019-10-28 18:30:32 +01:00
Doron Behar e25b5910a1 cups: 2.2.12 -> 2.3.0 2019-10-11 14:15:42 +03:00
worldofpeace 061ea7d1cc cups: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 13:59:08 -04:00
Will Dietz 772e2aa94b cups: 2.2.11 -> 2.2.12 (security!)
https://github.com/apple/cups/releases/tag/v2.2.12
2019-09-06 19:33:43 +02:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Matthew Bauer e9b7085ff8 cups: add myself as maintainer 2019-08-14 11:47:48 -04:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
R. RyanTM 0e13c900e8 cups: 2.2.10 -> 2.2.11
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cups/versions
2019-04-01 00:57:23 -07:00
Jascha Geerds ffedc3e4a9 misc: Remove myself from list of maintainers
Unfortunately I don't have the time anymore to maintain those
packages.
2019-03-12 23:50:52 +01:00
Matthew Bauer bb874163fd cups: use v2.2.6 on darwin
This is the last version known to build.

Fixes #53609.
2019-01-07 19:41:12 -06:00
Will Dietz ec040d9b22 cups: drop patches
(cherry picked from commit 085a74cb42074384958c23bd762af589da570042)
2018-12-20 10:43:36 -06:00
Will Dietz 61e9fc2e52 cups: 2.2.9 -> 2.2.10
https://www.cups.org/blog/2018-12-07-cups-2.2.10.html
2018-12-19 09:21:54 +01:00
Will Dietz bf174887e5 cups: 2.2.6 -> 2.2.9
https://github.com/apple/cups/releases/tag/v2.2.9
https://github.com/apple/cups/releases/tag/v2.2.8
https://github.com/apple/cups/releases/tag/v2.2.7
2018-12-19 09:21:54 +01:00
Robin Gloster adaffa3c01
cups: fix cross 2018-11-29 04:58:35 +01:00
Jan Malakhovski a12d40eb7e cups: fix tests 2018-08-11 09:35:22 +00:00
Vladimír Čunát 514e3e8a07
cups: fix patch download without a rebuild
One needs to specify git commit to make the fetch always work.
Close #38113.
2018-03-30 21:35:09 +02:00
Vladimír Čunát e719327694
Merge #35113: cups: upstream patch for a bug 2018-02-24 22:30:18 +01:00
Nikolay Amiantov 998fdfdc94 cups: fix path to socket and run directory
We use default /var/run/cups/cups.sock in NixOS but here it's misdefined to be
/run/cups.sock. Return it to default.
2018-02-23 18:51:37 +03:00
Ambroz Bizjak 965ddac92f cups: Add patch for bug where CUPS fails to save files to disk
Upstream report: https://github.com/apple/cups/issues/5118

In addition to not saving files, this results in spam messages in the log once per second (Expiring subscriptions...)
which is what led me to discover this bug. The patch was made by hand because the patch from the commit does not apply.
2018-02-18 14:46:01 +01:00
Orivej Desh bf0d121aed cups: fix configure flags 2017-12-07 07:22:39 +00:00
Peter Hoeg e5715d9464 cups: 2.2.2 -> 2.2.6 2017-12-07 07:22:39 +00: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
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