1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 00:54:11 +00:00
Commit graph

271 commits

Author SHA1 Message Date
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