summary refs log tree commit diff
path: root/pkgs/misc/cups
Commit message (Collapse)AuthorAge
...
* Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
|\ | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
| * Merge pull request #14010 from yochai/masterjoachifm2016-03-18
| |\ | | | | | | mfcj470dw: fix missing file error
| | * mfcj470dw: fix missing file errorYochai2016-03-18
| | |
| * | splix: revert of revert of "2.0.0 -> svn-r315 version update"Peter Simons2016-03-18
| |/ | | | | | | | | | | | | | | | | | | | | | | This reverts commit e338d6a0fc1293c1d5b63d9e38e690526fc7d1b1. 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.
| * Merge pull request #7596 from jraygauthier/jrg/brother_mfc7860dwjoachifm2016-03-15
| |\ | | | | | | Brother MFC7860DW cups lpr wrapper drivers.
| | * brgenml1cupswrapper: init at 3.1.0-1Raymond Gauthier2016-03-14
| | | | | | | | | | | | | | | Brother generic cups wrapper over lpr driver `brgenml1lpr` init at same version.
* | | Merge master into closure-sizeVladimír Čunát2016-03-08
|\| | | | | | | | | | | | | | The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
| * | splix: revert "2.0.0 -> svn-r315" version updatePeter Simons2016-03-07
| |/ | | | | | | | | This reverts commit 6ea526462b1a1adf and a9f8613dae32b10d to fix https://github.com/NixOS/nixpkgs/issues/13734.
| * splix: cleanupzimbatm2016-02-27
| | | | | | | | | | | | * remove commented code * remove unused patch * fix package naming
| * Merge pull request #13365 from abbradar/cups-second-attemptDomen Kožar2016-02-26
| |\ | | | | | | CUPS update (second attempt)
| | * cups: 2.0.4 -> 2.1.3Nikolay Amiantov2016-02-22
| | | | | | | | | | | | Also enable parallel building and don't install rc.d scripts.
| * | Merge pull request #12532 from bendlas/update-splixzimbatm2016-02-24
| |\ \ | | |/ | |/| splix: 2.0.0 -> svn-r315
| | * splix: 2.0.0 -> svn-r315Herwig Hochleitner2016-02-16
| | | | | | | | | | | | r315 has been in use for several years, but was never officially released
| * | cups: add a comment about updatesLuca Bruno2016-02-21
| | |
| * | Revert "cups: 2.0.4 -> 2.1.2"Domen Kožar2016-02-20
| | | | | | | | | | | | This reverts commit 35e1f4954555f465fb4499880dcb6a68417fb959.
* | | Merge recent 'staging' into closure-sizeVladimír Čunát2016-02-03
|\| | | | | | | | | | | Let's get rid of those merge conflicts.
| * | Merge branch 'master' into stagingVladimír Čunát2016-01-29
| |\ \
| | * | samsung-unified-linux-driver: add 1.00.37Tobias Geerinckx-Rice2016-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Very experimental. Probably very broken. Adds support for newer models but removes it for some older ones. Hence not the default yet, if ever.
| | * | Add version attribute where maintainers |= nckxTobias Geerinckx-Rice2016-01-25
| | |/ | | | | | | | | | | | | | | | | | | 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.
| * | cups_filters: 1.0.71 -> 1.5.0Nikolay Amiantov2016-01-17
| | | | | | | | | | | | Also wrap filters adding necessary utils to PATH and enable parallel building.
| * | cups: 2.0.4 -> 2.1.2Nikolay Amiantov2016-01-17
| |/ | | | | | | Also enable parallel building and don't install rc.d scripts.
* | treewide: Mass replace 'glibc}/lib' to refer the 'out' outputTuomas Tynkkynen2016-01-24
| |
* | Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
|\|
| * phantomjs2: build on darwinJude Taylor2016-01-12
| |
| * cups-bjnp: add meta.descriptionBjørn Forsman2016-01-02
| |
| * cups-pk-helper: init at 0.2.5Bjørn Forsman2016-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge staging into closure-sizeVladimír Čunát2015-11-20
|\| | | | | | | | | | | 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.
| * mfcj470dw: tidy upCillian de Róiste2015-10-24
| |
| * mfcj470dw: init at 3.0.0-1Yochai2015-10-23
| |
| * cups-filters: make shell string longer (close #10493)Brandon Dimcheff2015-10-20
| | | | | | | | | | | | | | | | | | | | 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
* | dbus: split into multiple outputs and fix referrersVladimír Čunát2015-10-13
| |
* | just add comments about outputs (cups, gdk-pixbuf)Vladimír Čunát2015-10-13
| |
* | gtk3: split into multiple outputsVladimír Čunát2015-10-13
| | | | | | | | All references OK, hopefully. Seems surprisingly smooth.
* | libxml2,libxslt: split into multiple outputsVladimír Čunát2015-10-05
| | | | | | | | | | Fixed all references, hopefully. libxml2Python is slightly hacky now, but it seems to work.
* | Merge commit staging+systemd into closure-sizeVladimír Čunát2015-10-03
|\| | | | | | | Many non-conflict problems weren't (fully) resolved in this commit yet.
| * cups: 2.0.3 -> 2.0.4, fix transient failureDomen Kožar2015-09-06
| | | | | | | | | | (cherry picked from commit cc06f9c0be051f7ef2e1fcbd2ce13b902acc8adc) Signed-off-by: Domen Kožar <domen@dev.si>
| * Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-08-19
| |\
| | * canon-cups-ufr2: init at 2.90Thomas Strobel2015-08-20
| | |
| * | cups: remove xdg_utils dependencyJan Malakhovski2015-08-16
| |/ | | | | | | | | | | | | | | | | | | `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).
| * cups: Don't depend on OpenSSLEelco Dolstra2015-07-26
| | | | | | | | Afaict, it doesn't use OpenSSL, just GNU/TLS.
| * cups-filters: update, including security fixesVladimír Čunát2015-07-21
| | | | | | | | | | | | | | - NEWS claims to fix CVE-2015-{3258,3279} - shell path is now directly configurable /cc maintainer @ttuegel.
| * cups: 2.0.2 -> 2.0.3William A. Kennington III2015-07-07
| |
| * cups: Use systemd files provided by CUPSJascha Geerds2015-05-10
| |
| * cups: Add xdg_utils to build inputsJascha Geerds2015-05-10
| |
| * cups: Refactor meta attributesJascha Geerds2015-05-10
| |
| * cups: 1.7.5 -> 2.0.2William A. Kennington III2015-05-10
| |
* | Merge staging into closure-sizeVladimír Čunát2015-05-05
|\|
| * cups-browsed: build with AvahiKirill Elagin2015-04-13
| | | | | | | | Fixes 5409.
| * cups-filters: fix build on non-NixOSKirill Elagin2015-04-13
| |
* | Merge 'staging' into closure-sizeVladimír Čunát2015-04-18
|\| | | | | | | | | | | | | | | - 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.