colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
550,313 Commits 125 Branches 0 Tags 3.4 GiB
713b8c1531
Commit Graph

492 Commits

Author SHA1 Message Date
(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
R. RyanTM
ee3b598269 cups-filters: 1.25.6 -> 1.25.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-filters/versions
 2019-10-20 23:55:38 -07:00
Doron Behar
e25b5910a1 cups: 2.2.12 -> 2.3.0 2019-10-11 14:15:42 +03:00
Frederik Rietdijk
a0c34f54cc Merge master into staging-next 2019-10-08 11:56:52 +02:00
Marcial Gaißert
43a333a1e4 cups-filters: 1.25.0 -> 1.25.6 2019-10-05 19:41:52 +02:00
Orivej Desh
dc4224bc54 Merge branch 'master' into staging 
* master: (36 commits)
  libipt: set platforms to unix
  licenses: refer to curl using spdx
  qhull: specify spdx license
  ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0
  ocamlPackages.owee: 0.2 -> 0.3
  nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05
  daemon: init at 0.6.4
  k9s: 0.7.13 -> 0.8.4
  cask: Use generated src/version from Melpa
  python.pkgs.flask_oauthlib: remove
  radeon-profile: 20170714 -> 20190903
  radeon-profile: use Qt mkDerivation
  afew: propagate setuptools
  pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0
  mutt: 1.12.1 -> 1.12.2
  unit: 1.10.0 -> 1.11.0
  emacsPackages: Update elpa
  emacsPackages: Update melpa
  cask: Fix cask usage
  git-lfs: use buildGoPackage
  ...
 2019-09-22 21:33:00 +00:00
Charles Strahan
bcddd04027
Merge pull request #58399 from aszlig/cnijfilter2-update 
cnijfilter2: 5.30 -> 5.70
 2019-09-22 15:44:03 -05:00
Jan Tojnar
f2b9f5baa5
Merge branch 'staging-next' into staging 2019-09-22 16:39:56 +02:00
worldofpeace
8e69437fee cups-pk-helper: 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:09 -04: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
Michael Hoang
f77b4c564e brlaser: 4 -> 5 2019-09-12 11:45:36 +10: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
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00: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
Delan Azabani
d6e03ca5cf fxlinuxprint: init at 1.1.2-1 2019-07-22 17:10:17 +10:00
Ryan Mulligan
7136d830f9
Merge pull request #63234 from r-ryantm/auto-update/cups-filters 
cups-filters: 1.23.0 -> 1.25.0
 2019-07-15 07:42:53 -05:00
worldofpeace
3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -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
113bb2e0d7 cups-filters: 1.23.0 -> 1.25.0 
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-filters/versions
 2019-06-16 12:23:06 -07:00
R. RyanTM
b6e40f1c34 cups-filters: 1.22.5 -> 1.23.0 
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-filters/versions
 2019-05-21 03:24:33 -07:00
Renaud
a35a3c3b4a
Merge pull request #59471 from r-ryantm/auto-update/cups-filters 
cups-filters: 1.22.2 -> 1.22.5
 2019-04-21 01:38:12 +02:00
R. RyanTM
a7c2e34d95 cups-filters: 1.22.2 -> 1.22.5 
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-filters/versions
 2019-04-14 05:53:05 -07:00
markuskowa
69178b949d
Merge pull request #58660 from r-ryantm/auto-update/cups 
cups: 2.2.10 -> 2.2.11
 2019-04-13 23:11:47 +02: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
R. RyanTM
043d233d07 cups-filters: 1.22.1 -> 1.22.2 (#58043) 
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-filters/versions
 2019-03-31 00:41:59 +01:00
aszlig
532360dd17
cnijfilter2: 5.30 -> 5.70 
Newly supported series in version 5.40:

    MB2100, MB2700, iB4100, MB5100, MB5400, TS9000, TS8000, TS6000,
    TS5000, MG3000, E470, G4000

Newly supported series in version 5.50:

    E200, E300, E3100, TR7500, TR7530, TR8500, TR8530, TR8580, TS200,
    TS300, TS3100, TS5100, TS6100, TS6130, TS6180, TS8100, TS8180,
    TS9100, TS9180, TS8130, XK70, XK50

Newly supported series in version 5.60:

    G3010, G4010

Newly supported series in version 5.70:

    TS8200, XK80, TS8230, TS8280, TS6200, TS6230, TS6280, TS9500,
    TR9530, TS9580, TR4500, E4200

Signed-off-by: aszlig <aszlig@nix.build>
 2019-03-26 19:35:31 +01:00
Joachim F
f612e3345b
Merge pull request #57449 from tohl/master 
samsung-unified-linux-driver_1_00_36, tested on nixos x86_64 with m2070w printer/scanner, fixes https://github.com/NixOS/nixpkgs/issues/27995
 2019-03-23 06:29:52 +00: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
Tomas Hlavaty
728689a336 samsung-unified-linux-driver_1_00_36: init at 1.00.36 2019-03-11 21:42:53 +01:00
R. RyanTM
390c00ee9a cups-filters: 1.22.0 -> 1.22.1 
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-filters/versions
 2019-03-01 17:15:56 -08:00
Jörg Thalheim
dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible 
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
 2019-02-26 14:10:49 +00:00
Nick Hu
2124b002c6 cups-brother-hl3140cw: init at 1.1.4-0 2019-02-26 10:09:03 +00:00
Michael Raskin
7dacb80b49
Merge pull request #56218 from hlandau/fixdrvfree 
Reclassify printer drivers erroneously marked as GPL
 2019-02-24 18:24:39 +00:00
Hugo Landau
603b8c430d
Reclassify printer drivers erroneously marked as GPL 
Some CUPS printer drivers were marked as being GPL.
This changes them to reflect their actual, unfree licence.
 2019-02-24 17:25:39 +00:00
R. RyanTM
d7d9660b4d cups-filters: 1.21.6 -> 1.22.0 (#54841) 
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-filters/versions
 2019-02-24 00:43:46 +01:00
Matthew Bauer
5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Thomas Bach
a0c9490b37 mfcl8690cdwcupswrapper: 1.3.0-0 -> 1.4.0-0 2019-01-30 13:33:06 +01:00
Thomas Bach
cec3c69837 mfcl8690cdwlpr: 1.2.0-0 -> 1.3.0-0 2019-01-30 13:33:06 +01:00
rnhmjoj
bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +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
Jan Tojnar
4c5a5dc627
Merge pull request #52715 from jtojnar/poppler-0.72 
poppler: 0.67.0 → 0.72.0
 2018-12-25 16:34:54 +01:00
Jan Tojnar
6d36caab18
cups-filters: 1.20.4 → 1.21.6 2018-12-23 02:39:47 +01: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
Jörg Thalheim
84162175a3
Merge pull request #51180 from mayflower/xorg-cross 
treewide: cross-fixes
 2018-12-01 00:43:02 +00:00
Robin Gloster
adaffa3c01
cups: fix cross 2018-11-29 04:58:35 +01:00
Alexey Muranov
7725d9de42 cups-toshiba-estudio: fix homepage 
Provide an URL that works.
 2018-11-26 22:30:58 +01:00
Profpatsch
7c4d36fc64 cups-filters: add all needed execve runtime paths 
Otherwise cupsd reports errors that e.g. `gs` cannot be
found (provided it’s not available in the system closure PATH).
 2018-11-21 12:22:46 +01:00
Jan Malakhovski
67a5c0da41 tree-wide: fix all revs of fetchsvn 2018-11-08 05:29:47 +00:00
Michael Raskin
bfd838a695
Merge pull request #49180 from symphorien/issue-49092 
brlaser: fix install dir
 2018-11-02 08:18:47 +00:00
David Costa
b4c7ff59f1 splix: add missing printer models 
Add support for ML-2160 ML-2165 ML-3310 ML-3310ND.
The PPD files were not picked up by the Makefile because they were
in the wrong directory of the original source.

Co-authored-by: Merlin Göttlinger <megoettlinger@gmail.com>
 2018-10-29 10:45:09 +01:00
Symphorien Gibol
26ee8d6479 brlaser: fix install dir 
Fixes #49092
 2018-10-26 21:08:42 +02:00
obadz
6fca3c5700 cups-googlecloudprint: init at 20160502 2018-10-11 09:19:58 +01:00
Peter Simons
929ad8e996 samsung-unified-linux-driver: update default version to 4.01.17 
* Version 4.01.17 works fine for me on NixOS, driving both a Samsung ML-2165w
   and a Samsung ML-2510 printer successfully.

 * Version 4.00.39 is broken. The build shows errors, but doesn't abort. The
   generated binaries don't work, because they are lacking rpaths to their
   library dependencies.

 * Renamed old default.nix file to 1.00.37.nix. That version wasn't the default
   and it feels like a bad idea to mix versioned and unversioned file names in
   the same directory.
 2018-10-03 10:25:46 +02:00
Will Dietz
eb91037e7b tree-wide: patchelf used during build -> nativeBuildInputs 
In a few cases it wasn't clear so I left them as-is.

While visiting these moved other things to nativeBuildInputs
when it was clear they were one of these cases:

* makeWrapper
* archive utilities (in order to unpack src)
  * a few of these might no longer be needed but leaving for another day
 2018-09-28 11:43:16 -05:00
Daiderd Jordan
04cba83e7f brlaser: cleanup and mark linux only (#46622) 
The test binaries depend use open_memstream which isn't available on
darwin.

    error: use of undeclared identifier 'open_memstream'

/cc ZHF #45961
 2018-09-13 22:47:34 +02:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system 
It is deprecated and will be removed after 18.09.
 2018-08-30 17:20:32 -04:00
Vladimír Čunát
14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Johannes Frankenau
d4f0848cae splix: install color profiles and enable JBIG 2018-08-16 15:53:00 +02:00
Jan Malakhovski
a12d40eb7e cups: fix tests 2018-08-11 09:35:22 +00:00
Thomas Bach
7e60f1c678 mfcl8690cdw: init lpdr and cupswrapper at 1.0.2/1.0.3 (#43968) 
Provide printer driver for Brother MFC-L8690CDW.
 2018-08-03 20:18:32 +02:00
Wael M. Nasreddine
347ff3238a
cups-filters: fix the build with poppler-0.67.0 
Apply the patch from https://github.com/OpenPrinting/cups-filters/pull/51

closes #44282
 2018-08-01 00:47:56 -07:00
Alan Pearce
8aecf68616 cups-toshiba-estudio: 7.51 -> 7.89 (#43850) 2018-07-29 21:51:47 +02:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Frederik Rietdijk
def387a70f
Merge pull request #43780 from r-ryantm/auto-update/cups-filters 
cups-filters: 1.20.3 -> 1.20.4
 2018-07-21 10:55:05 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
R. RyanTM
362e1702b1 cups-filters: 1.20.3 -> 1.20.4 
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-filters/versions.
 2018-07-18 16:04:53 -07:00
Matthew Bauer
bb0febf575
Merge pull request #43079 from matthewbauer/rework-extra-pkgs 
Rework stage.nix's extraPkgs
 2018-07-05 18:05:57 -04:00
Matthew Bauer
c491a99362 treewide: remove callPackage_i686 
This has been replaced with pkgsi686Linux.callPackage
 2018-07-05 14:04:52 -04:00
Michael Hoang
6b2bdc36f8 mfcl2740dwcupswrapper: init at 3.2.0-1 
CUPS wrapper for Brother MFC-L2740DW
 2018-07-04 19:43:23 +10:00
Michael Hoang
cc7fba1ce3 mfcl2740dwlpr: init at 3.2.0-1 
Brother MFC-L2740DW lpr driver
 2018-07-04 19:43:02 +10:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676) 
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
 2018-06-28 20:43:35 +02:00
Matthew Justin Bauer
98f2f08b4b
Merge pull request #41009 from matthewbauer/normalize-names 
Add versions to packages missing it
 2018-05-25 16:32:48 -05:00
Matthew Bauer
02297beade treewide: add version to packages 
Lots of packages are missing versions in their name. This adds them
where appropriate. These were found with this command:

 $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$'

See issue #41007.
 2018-05-25 15:48:05 -05:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Jörg Thalheim
3ccb77b8a2
Merge pull request #39511 from steveeJ/sj-add-kyocera-drivers 
cups-kyodialog3: init at 8.1601
 2018-04-28 19:54:06 +01:00
Jörg Thalheim
ea5787ad52 cups-kyodialog3: use autoPatchelfHook, add missing qt4 2018-04-28 13:02:20 +01:00
Stefan Junker
c600f02e43 cups-kyodialog3: init at 8.1601 2018-04-26 00:24:37 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
R. RyanTM
07900ec4aa cups-filters: 1.20.2 -> 1.20.3 
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-filters/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3/bin/foomatic-rip -h’ got 0 exit code
- ran ‘/nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3/bin/foomatic-rip --help’ got 0 exit code
- found 1.20.3 with grep in /nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3
- directory tree listing: https://gist.github.com/aa62a318dc23326b357322da3e567915
 2018-04-20 07:00:24 -07:00
Matthew Justin Bauer
bfda2d470c
Merge pull request #32605 from xrvdg/hl1110 
hl1110 : init at 3.0.1-1
 2018-04-09 14:32:35 -05:00
Matthew Justin Bauer
5df54f9e29
Merge pull request #33919 from samueldr/feature/hll2390dw-cups 
hll2390dw-cups: init at 4.0.0-1
 2018-04-09 14:28:34 -05:00
Guillaume Maudoux
f338e4c3db cups-filters: remove myself from maintainers 2018-04-03 22:46:27 +02:00
adisbladis
729cd0352d
Merge pull request #38294 from r-ryantm/auto-update/cups-filters 
cups-filters: 1.20.1 -> 1.20.2
 2018-04-03 23:56:07 +08:00
R. RyanTM
37275927ae cups-filters: 1.20.1 -> 1.20.2 
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-filters/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.2 with grep in /nix/store/zbwgknzkhih8rlcizp4s5yi5kinjfv5w-cups-filters-1.20.2
- directory tree listing: https://gist.github.com/a1bcdc4c27ed6a03fa20b81303aaa036
 2018-04-01 03:43:40 -07: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
Matthew Justin Bauer
e35105c7c8
Merge pull request #35081 from StijnDW/master 
brlaser: init from latest git
 2018-03-22 11:09:39 -05:00
Ryan Mulligan
5c0645fe94 cups-filters: 1.20.0 -> 1.20.1 
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.1 with grep in /nix/store/233chsllrfymrvizn74nf8sav0r0llrb-cups-filters-1.20.1
 2018-03-16 06:10:55 -07:00
Vladimír Čunát
e719327694
Merge #35113: cups: upstream patch for a bug 2018-02-24 22:30:18 +01:00
Tuomas Tynkkynen
ae9d4faff9 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:05:30 +02:00
Jörg Thalheim
1fbf33b78e zj-58: nitpicks 2018-02-23 16:38:26 +00: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
makefu
7ca25bdfcf
cups-zj-58: init at 2018-02-22 
Adds cups drivers for Zjiang ZJ-58
 2018-02-23 16:47:52 +01:00
xeji
6e9bc081b1 mfcl2720dwcupswrapper: init at 3.2.0-1 
Brother MFC-L2720DW CUPS wrapper driver
 2018-02-18 19:47:05 +01:00
xeji
380d759659 mfcl2720dwlpr: init at 3.2.0-1 
Brother MFC-L2720DW lpr driver
 2018-02-18 19:37:19 +01: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
Stijn DW
56c88781ee brlaser: init from latest git 2018-02-17 20:27:15 +01:00
André-Patrick Bubel
3a27c298f2
cups-kyocera: Fix spelling mistake in comment 2018-02-16 21:44:42 +01:00
Guillaume Maudoux
c70c9649ea
cups-filters: 1.16.0 -> 1.20.0 2018-02-03 00:07:11 +01:00
Samuel Dionne-Riel
22de8e1917 hll2390dw-cups: init at 4.0.0-1 2018-01-16 20:04:26 -05:00
Tobias Geerinckx-Rice
0f84673f3d
Remove nckx as a maintainer for all packages 
Goodbye, and thanks for all the Nix...
 2018-01-16 23:00:49 +01:00
Xander Remon van der Goot
cbe4805592 hl1110 : init at 3.0.1-1 
This commit adds a cups driver for the Brother HL1110 printer.
 2018-01-13 23:26:42 +01:00
Vladimír Čunát
3a110ea3f9
treewide platform checks: abort -> throw 
They aren't meant to be critical (uncatchable) errors.
Tested with nix-env + checkMeta:
[ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
 2017-12-12 18:08:10 -05: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
Steve Trout
8bc74a908d cnijfilter2: specify --datadir for cnijlgmon3 
If --datadir is not given, it uses '${datarootdir}/cnijlgmon3',
with the unsubstituted variable.
 2017-11-28 11:26:42 -06:00
Patrick Chilton
8bfa14f5a7 cnijfilter: add 4.00 2017-11-24 21:02:40 +01: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
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Guillaume Maudoux
548033285c cups-filters: 0.15.0 -> 0.16.0 2017-07-28 14:01:49 +02:00
Guillaume Maudoux
6b286fa339 cups-filters: 0.14.0 -> 0.15.0 2017-07-25 19:00:06 +02:00
Peter Hoeg
0345aed90c mfcj6510dwlpr: use new xxd package instead of vim 2017-07-24 09:37:58 +08:00
Benno Fünfstück
99fbd867ef Merge pull request #27031 from jerith666/cnijfilter-2-80 
cnijfilter: init at 2.80
 2017-07-18 14:37:32 +02:00
Matt McHenry
67d02cd60a cnijfilter: init at 2.80 
this driver reads support files from lib/bjlib as well as lib/cups,
which is why the path in cupsd.nix is tweaked
 2017-07-17 07:32:23 -04:00
Jörg Thalheim
fc44b573ca mfcl2700dnlpr: remove meta.version 2017-07-14 08:44:20 +01:00
Jörg Thalheim
30223dd334 Merge pull request #25654 from 4z3/mfcl2700dn 
Add support for Brother MFC-L2700DN
 2017-07-13 21:48:48 +01:00
Emmanuel Rosa
7ec7aa0bb1 Revert "splix: enable JBIG" (#27054) 
This reverts commit 0878ca7ab4.

My change to enable JBIG for splix did not work correctly. I was unable to get to the bottom of it because the build never completed. Given that it's also timing out in Hydra (see https://hydra.nixos.org/eval/1372226) I think it's best to simply back it out.
 2017-07-03 08:09:54 +01:00
Emmanuel Rosa
0878ca7ab4 splix: enable JBIG 
Enables JBIG given that according to OpenPrinting.org, the patents have expired.
See https://www.openprinting.org/driver/splix/license/

Closes #25929
 2017-07-01 19:36:12 -04:00
Gabriel Ebner
798e256dcd cups-filters: fix path to pdftops 
This is hardcoded to /usr/bin/pdftops by default.
 2017-06-12 11:19:40 +02:00
Guillaume Maudoux
dacfe8109e cups_filters: 1.11.1 -> 1.14.0 2017-05-24 12:51:24 +02:00
David Waern
3a084a80e7
samsung-unified-linux-drive: Fix sane driver by patching rpaths 
fixes #25779
 2017-05-20 15:35:00 +01:00
tv
6fdcc7f5b4 mfcl2700dncupswrapper: init at 3.2.0-1 2017-05-10 00:20:45 +02:00
tv
ba096d8ddf mfcl2700dnlpr: init at 3.2.0-1 2017-05-10 00:20:45 +02: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
Jean Potier
09b1414acd cups-toshiba-estudio: init at 7.51 (#24676) 2017-04-06 15:00:02 +01:00
Dan Peebles
8b65437aae Merge branch 'master' into staging 2017-03-30 12:54:41 -04:00
Vladimír Čunát
72bb7b399a
Merge #24392: cups-dymo: patch upstream for cups 2.2 2017-03-29 13:57:07 +02:00
makefu
892c418f5d
cups-dymo: patch upstream for cups 2.2 2017-03-27 23:27:47 +02: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
Franz Pletz
99ef5c84b4
cups-pk-helper: 0.2.5 -> 0.2.6 2017-03-07 11:27:18 +01:00
makefu
76da40e5a7
cups-dymo: init at 1.4.0.5 2017-02-15 09:07:40 +01:00
Kier Davis
9f4114a740
samsung-unified-linux-driver_1_00_37: fix build failing due to upstream change in 'cups' 
This commit should fix the package building to build due to https://github.com/NixOS/nixpkgs/issues/16238

Printing tested on M2875FD and M2675FN models. Scanning not tested yet due to lack of access of Samsung scanning devices.

All work in this commit is attributed to @jokogr. Content of this commit is basically copied+pasted from c41e771a38
 2016-11-02 15:13:46 +00:00
Ioannis Koutras
270365a1ee samsung-unified-linux-driver: add 4.01.17 2016-11-01 19:19:53 +02:00
Ram Kromberg
1e290ae75f mfcj6510dw: init at 3.0.0-1 2016-10-15 18:57:37 +03:00
Jörg Thalheim
4059854351
cups-kyocera: fix downloading of source 
the site blocked use of curl
fixes #14167
 2016-10-01 23:41:46 +02:00
Ivan Solyankin
226f62317c
cups-kyocera: init at 1.1203 2016-10-01 23:41:46 +02:00
Joachim F
81f47f7982 Merge pull request #18700 from yochai/master 
mfcj470dw: split into mfcj470dwlpr and mfcj470dwcupswrapper
 2016-09-27 12:56:05 +02:00
Yochai
3b548dacf4 mfcj470dw: split into mfcj470dwlpr and mfcj470dwcupswrapper 2016-09-26 18:26:52 +03:00
Charles Strahan
358232f68a
cnijfilter2: fix build 2016-09-17 15:54:07 -04:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Tuomas Tynkkynen
f410ec16c4 treewide: Fix output references to cups 2016-08-23 04:52:13 +03:00
Tuomas Tynkkynen
51ad423716 treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls 2016-08-23 00:04:39 +03:00
Nikolay Amiantov
b8e3560504 cups_filters: 1.5.0 -> 1.11.1 2016-08-18 16:09:34 +03:00
Nikolay Amiantov
b64924b0d5 cups: 2.1.3 -> 2.1.4 2016-08-18 16:09:34 +03:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Charles Strahan
4e84c6fc7c cnijfilter2: init at 5.30 (#17048) 
Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600,
MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490,
E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series.
 2016-07-21 01:09:36 +02:00
pngwjpgh
17e8032adb samsung-UnifiedLinuxDriver: fix multi-output cups (#16421) 2016-07-01 00:29:56 +02: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
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks 
changes:
 * buildPhase = "true"
 * buildPhase = ":"
 2016-05-04 10:11:04 +00: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
Raymond Gauthier
dbe2c50a66 brgenml1cupswrapper: fix regression and improvements 
`cp`, `grep`, `chmod`, `sed` executables
no longer found when upgrading from nixos
15.09 to 16.03. Fixed by use of wrapper
script that brings these executables into
`PATH`.

Also fix lpd binaries on 64 bits machines
by use of `callPackage_i686`.
 2016-04-16 00:25:17 -04:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
joachifm
25a1e5d5f2 Merge pull request #14010 from yochai/master 
mfcj470dw: fix missing file error
 2016-03-18 22:08:23 +00:00
Yochai
e6b85e6b78 mfcj470dw: fix missing file error 2016-03-18 19:56:27 +02:00
Peter Simons
6c935046a7 splix: revert of revert of "2.0.0 -> svn-r315 version update" 
This reverts commit e338d6a0fc. 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.
 2016-03-18 11:36:58 +01:00
joachifm
e1d451c8c5 Merge pull request #7596 from jraygauthier/jrg/brother_mfc7860dw 
Brother MFC7860DW cups lpr wrapper drivers.
 2016-03-15 02:06:59 +00:00
Raymond Gauthier
f4cc2c6fb7 brgenml1cupswrapper: init at 3.1.0-1 
Brother generic cups wrapper over lpr driver
`brgenml1lpr` init at same version.
 2016-03-14 21:54:57 -04: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
Peter Simons
e338d6a0fc splix: revert "2.0.0 -> svn-r315" version update 
This reverts commit 6ea526462b and a9f8613dae to fix
https://github.com/NixOS/nixpkgs/issues/13734.
 2016-03-07 13:37:54 +01:00
zimbatm
6ea526462b splix: cleanup 
* remove commented code
* remove unused patch
* fix package naming
 2016-02-27 17:36:10 +00:00
Domen Kožar
a469681a51 Merge pull request #13365 from abbradar/cups-second-attempt 
CUPS update (second attempt)
 2016-02-26 11:13:30 +00:00
zimbatm
bd8f383f15 Merge pull request #12532 from bendlas/update-splix 
splix: 2.0.0 -> svn-r315
 2016-02-24 00:02:28 +00: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
Herwig Hochleitner
a9f8613dae splix: 2.0.0 -> svn-r315 
r315 has been in use for several years, but was never officially released
 2016-02-16 22:21:23 +01: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
de0af30716 Merge branch 'master' into staging 2016-01-29 10:19:48 +01:00
Tobias Geerinckx-Rice
af911744fd samsung-unified-linux-driver: add 1.00.37 
Very experimental. Probably very broken. Adds support for newer
models but removes it for some older ones.

Hence not the default yet, if ever.
 2016-01-26 04:09:36 +01:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx 
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.
 2016-01-25 17:35:21 +01:00
Tuomas Tynkkynen
a1909d7380 treewide: Mass replace 'glibc}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Nikolay Amiantov
eaaf988d45 cups_filters: 1.0.71 -> 1.5.0 
Also wrap filters adding necessary utils to PATH and enable parallel building.
 2016-01-17 15:50:40 +03: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
Bjørn Forsman
a1ddb32a45 cups-bjnp: add meta.description 2016-01-02 23:14:31 +01:00
Bjørn Forsman
92a0140ff8 cups-pk-helper: init at 0.2.5 
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
 2016-01-01 23:33:11 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
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.
 2015-11-20 14:32:58 +01:00
Cillian de Róiste
eacf656d6a mfcj470dw: tidy up 2015-10-24 22:29:11 +02:00
Yochai
837cdb03d3 mfcj470dw: init at 3.0.0-1 2015-10-23 19:51:05 +03:00
Brandon Dimcheff
c0a963e3cc cups-filters: make shell string longer (close #10493) 
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
 2015-10-20 17:09:42 +02: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
38313d5d87 libxml2,libxslt: split into multiple outputs 
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
 2015-10-05 13:44:16 +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
William A. Kennington III
4f22eadf2c Merge branch 'master.upstream' into staging.upstream 2015-08-19 20:52:17 -07:00
Thomas Strobel
26ef514981 canon-cups-ufr2: init at 2.90 2015-08-20 01:22:10 +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
Vladimír Čunát
9147dee57f cups-filters: update, including security fixes 
- NEWS claims to fix CVE-2015-{3258,3279}
- shell path is now directly configurable

/cc maintainer @ttuegel.
 2015-07-21 20:57:49 +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
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +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
Kirill Elagin
29f431e2a4 cups-browsed: build with Avahi 
Fixes 5409.
 2015-04-13 23:21:44 +03:00
Kirill Elagin
82eed03bfa cups-filters: fix build on non-NixOS 2015-04-13 23:20:30 +03:00
Thomas Tuegel
394562655f cups_filter: fix build 2015-04-02 19:13:26 -05:00
Thomas Tuegel
01e9dfb449 cups-filters: fix build with latest poppler 2015-04-02 06:58:09 -05:00
Tobias Geerinckx-Rice
eecb59a805 samsungUnifiedLinuxDriver 0.92 -> 4.00.39 
This not the latest, but the greatest version (by number of models still
supported).

A big bump. Everything seems to work fine. Tested with a Samsung CLP-325.
Also fixed some strange things. Did this ever even work? On x86_64?
 2015-04-01 19:54:40 +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
Nikolay Amiantov
0c5169b536 samsung-UnifiedLinuxDriver: fix meta 2015-03-05 20:49:45 +03:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Brandon Dimcheff
139d7f6e1a squish cups patches all into one statement 2014-12-23 11:53:58 -05:00
Brandon Dimcheff
6a2195c3a5 Fix compiled-in /bin/bash in foomatic filters 
Foomatic filters contained a 64-char c string hardcoded to /bin/bash.
This caused some filters (at least pdftops) to fail.

I also had to increase the size of the string because nix paths are too
long.
 2014-12-21 20:47:36 -05: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
Eelco Dolstra
fb079432b0 cups-filters: Fix gstoraster 
It was trying to find "gs" via execve, so use execvpe instead. It's
probably better to use gs's absolute path, but maybe not every
cups-filters user needs it.
 2014-12-16 18:23:41 +01:00
Eelco Dolstra
6c00d9f7e4 cups-filters: Fix finding GS in several filters 2014-12-16 18:23:40 +01:00
Eelco Dolstra
0aa452e179 cups-filters: Fix banners 
It was looking in cups' prefix for the PDF templates. So for instance
printing a CUPS test page wouldn't work.
 2014-12-16 18:23:40 +01:00
Domen Kožar
5f599a3ddd remove pdf-filter 2014-11-24 08:43:43 +01:00
Domen Kožar
23567ac200 cups-pdf-filter -> cups-filters, enable by default for cups 2014-11-23 17:51:55 +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
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