3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

369 commits

Author SHA1 Message Date
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Bryan Gardiner 60df55c9fb
hplip: fix hp-setup crash by adding proper NixOS PPD search path
HPLIP's getSystemPPDs() function relies on searching for PPDs below common FHS
paths.  None of these exist on NixOS, but the code assumes that at least one of
the directories will be found, and crashes when it doesn't (cups_ppd_path is
None and the code passes that to os.path.join).

A usable PPD search path for the running system on NixOS is
/var/lib/cups/path/share, so this patches the source to check this path as well.
This should fix the NixOS case and keep non-NixOS cases working too.
2021-01-09 17:07:30 -08:00
Sandro Jäckel 1abf8fae01
steamcontroller: Disable tests, cleanup 2021-01-07 10:42:10 +01:00
Doron Behar b6270a2d90 hplip: 3.20.5 -> 3.20.11 2021-01-05 10:23:16 +02:00
wucke13 f438340d3a utsushi: unstable-2020-11-10 -> unstable-2021-01-01 2021-01-01 17:02:00 +01:00
rys ostrovid 357e0703f8
epkowa: add support for 'Perfection V37/V370' scanners (#107584) 2020-12-25 21:10:36 +01:00
R. RyanTM 7a1e1053bb gutenprint: 5.2.14 -> 5.3.4 2020-12-12 03:37:53 +00:00
Orivej Desh 35e26f9a85 sc-controller: unbreak 2020-12-06 23:20:03 +00:00
Graham Christensen bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Max Wilson 713b47e815 add self to utsushi 2020-11-18 12:00:31 -08:00
wucke13 f89b4dc450 utsushi: 3.59.2 -> unstable-2020-11-10
+ master should be roughly equivalent to 3.62.0
+ moving to the community repo because they are way better at fixing
  things, while upstream epson almost never merges fixes
+ great thanks to @mwilsoncoding for debugging the problem:
   + `autoconf-archive` was missing
2020-11-14 15:50:19 +01:00
Maximilian Bosch f94859f199
epson-escpr2: 1.1.23 -> 1.1.24 2020-11-12 19:41:37 +01:00
Jan Tojnar eaeafe60f4
sc-controller: mark as broken
Python 3 is not supported but PyGObject no longer supports Python 2.

https://github.com/kozec/sc-controller/issues/498
2020-10-24 01:18:45 +02:00
Maximilian Bosch b6f990947c
epson-escpr2: 1.1.17 -> 1.1.23 2020-10-19 17:48:27 +02:00
Ben Siraphob 683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
rnhmjoj 65cbea4563
sc-controller: fix broken svg icons
The gdk-pixbuf module exposed by librsvg wasn't detected
due to strictDeps being enabled by default in python packages.
2020-10-12 08:10:18 +02:00
Timothée Jourde 81c2d88d7a sc-controller: fixing missing icons (librsvg) 2020-09-16 19:12:16 +02:00
Maximilian Bosch 5998a16b14
epson-escpr2: 1.1.15 -> 1.1.17 2020-09-06 11:23:23 +02:00
symphorien 5e6fe939df
epkowa: update hashes (#93846) 2020-08-05 20:23:30 +02:00
Maximilian Bosch 479db270fb
epson-escpr2: 1.1.13 -> 1.1.15 2020-07-26 11:48:27 +02:00
Michael Weiss 5b14758d31
Merge pull request #92920 from primeos/scons
scons: 3.1.2 -> 4.0.0
2020-07-18 13:36:29 +02:00
Michael Weiss 595a36d846
scons.py2: Replace with sconsPackages.scons_3_1_2
Required since SCons 4.0.0 doesn't support Python 2.7 anymore.
2020-07-18 10:48:20 +02:00
Doron Behar 359f2345c0 hplip: Remove all python related gcc references
Use in stripDebugList python sitePackages directory used by the build,
and don't hard code python3.7's sitePackages path.
2020-07-12 14:24:05 +03:00
Maximilian Bosch 9884165283
epson-escpr2: 1.1.12 -> 1.1.13 2020-06-29 19:46:02 +02:00
Jan Solanti 6b529db329 xow: 0.4 -> 0.5 2020-06-25 12:49:26 +03:00
Florian Klink 907353b1e4 hplip: use wrapQtApp
Otherwise, things like hp-setup segfault if you run them from another
nixpkgs checkout:

```
HP Linux Imaging and Printing System (ver. 3.20.5)
Printer/Fax Setup Utility ver. 9.0

Copyright (c) 2001-18 HP Development Company, LP
This software comes with ABSOLUTELY NO WARRANTY.
This is free software, and you are welcome to distribute it
under certain conditions. See COPYING file for more details.

qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

[1]    4543 abort (core dumped)  result/bin/hp-setup
```
2020-06-16 20:34:30 +02:00
Bastian Köcher 88f749545c hplip: Add missing library
Otherwise, things like `hp-setup` fail finding gi:

```
HP Linux Imaging and Printing System (ver. 3.20.5)
Printer/Fax Setup Utility ver. 9.0

Copyright (c) 2001-18 HP Development Company, LP
This software comes with ABSOLUTELY NO WARRANTY.
This is free software, and you are welcome to distribute it
under certain conditions. See COPYING file for more details.

Traceback (most recent call last):
  File "/nix/store/rmzq8c4n47s4q4p31w18waz0zrba2ljl-hplip-3.20.5/share/hplip/setup.py", line 314, in <module>
    ui = import_module(ui_package + ".setupdialog")
  File "/nix/store/n0b076p351ma864q38if4yglsg99hw2s-python3-3.8.3/lib/python3.8/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
  File "<frozen importlib._bootstrap>", line 991, in _find_and_load
  File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 783, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/nix/store/rmzq8c4n47s4q4p31w18waz0zrba2ljl-hplip-3.20.5/share/hplip/ui5/setupdialog.py", line 31, in <module>
    from base import device, utils, models, pkit
  File "/nix/store/rmzq8c4n47s4q4p31w18waz0zrba2ljl-hplip-3.20.5/share/hplip/base/pkit.py", line 38, in <module>
    from gi import _gobject as gobject
ModuleNotFoundError: No module named 'gi'
```
2020-06-16 20:26:40 +02:00
Florian Klink fd2627babf
Merge pull request #89120 from dasj19/hplip-update
Upgrade hplip & hplip plugin to 3.20.5
2020-06-16 01:33:06 +02:00
Daniel Șerbănescu 37583e45a2 hplip: 3.20.3 -> 3.20.5 2020-06-16 01:31:14 +02:00
Doron Behar c59e8d3fb3 hplip: don't reference gcc in binaries from /share and other locations 2020-06-03 20:32:32 +03:00
Maximilian Bosch 3ddc56ca14
epson-escpr2: 1.1.11 -> 1.1.12 2020-05-24 00:49:25 +02:00
Martin Weinelt e24f5eab66
treewide: add CVE identifiers to patches
This allows tools like broken.sh to correctly identify the patched
status.
2020-05-06 23:18:09 +02:00
Dmitry Kalinkin f46cbbc540
Merge pull request #86666 from IvarWithoutBones/pentablet-driver
xp-pen-g430: rename to pentablet-driver & 20190820 -> 1.2.13.1
2020-05-06 12:34:19 -04:00
Ivar daf860d9fe pentablet-driver: 20190820 -> 1.2.13.1 2020-05-03 21:53:06 +02:00
Ivar 780b171301 xp-pen-g430: rename to pentablet-driver 2020-05-03 21:53:06 +02:00
Jan Tojnar e89e2edc73
libusb-compat-0_1: rename from libusb 2020-04-28 05:33:41 +02:00
Maximilian Bosch f5f85d16d1
epson-escpr2: 1.1.1 -> 1.1.11 2020-04-25 17:49:11 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar 0851f48a02
utsushi: fix build
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
2020-04-04 12:49:23 +02:00
Frederik Rietdijk 92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
Ivar 318f05f776 xp-pen-g430: init at 20190820 2020-04-02 14:51:43 +02:00
Jan Tojnar b036be7c81
xow: fix build
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
2020-04-02 07:54:14 +02:00
Jan Tojnar 3e0f4e202f
Merge branch 'master' into staging-next 2020-03-31 21:32:15 +02:00
Jan Solanti 081ed8f012 xow: 0.2 -> 0.4 2020-03-31 17:24:37 +03:00
Philipp Middendorf 35035a543c xow: init at 0.2 2020-03-30 00:16:21 +03:00
Frederik Rietdijk a36be028f5 Merge staging-next into staging 2020-03-28 21:15:15 +01:00
Michael Weiss 0950324466 scons: Add passthru.py2 for backward compatibility
Not all packages build with Python 3, see #75877. The goal is to get rid
of Python 2 but this approach ensures a smoother transition.
2020-03-27 10:49:52 -07:00
Daniel Șerbănescu d7d3b0deff hplip: 3.19.12 -> 3.20.3 2020-03-24 22:17:40 +01:00
Dominik Honnef baa4798f56 epkowa: add dominikh as maintainer 2020-03-20 20:02:21 +01:00
Dominik Honnef 55e85a0d62 epkowa: add the GT-S650 plugin
This plugin adds support for the GT-S650, Perfection V19 and
Perfection V39 scanners. I've tested it personally with an Epson
Perfection V39.

This plugin uses the ISCAN_FIRMWARE_DIR environment variable, not
ISCAN_FW_DIR. A quick grep didn't find any use of ISCAN_FW_DIR in the
currently packaged plugins, but a quick Google suggests that this
variable does (or at least used to) exist, so I'm not touching it.
2020-03-20 17:44:20 +01:00
Dominik Honnef e22eb2d7b5
epkowa: fix parsing of interpreters (#82909)
Building with -std=c99 breaks the obsolete "%as" format string, which
completely breaks the parsing of epkowa interpreters. This means that
no scanner requiring plugins worked.
2020-03-19 13:40:45 -04:00
Silvan Mosberger 80a2740991
Merge pull request #78265 from Synthetica9/https-homepages
treewide: fix redirected urls
2020-01-27 15:00:53 +01:00
Patrick Hilhorst 593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
talyz c4f58aba47 hplip: Fix plugin url and hash 2020-01-22 10:23:01 +01:00
Thomas Tuegel c6bed9f7dd
Merge pull request #76128 from Mic92/hplip
hplip: 3.19.6 -> 3.19.12
2020-01-16 10:01:10 -06:00
Robin Gloster 755db0b689
treewide: installTargets is a list 2019-12-31 00:25:26 +01:00
Robin Gloster 313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster 2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Jörg Thalheim 725f85e271
net-snmp: rename from net_snmp 2019-12-21 22:56:08 +00:00
Jörg Thalheim 4d7ae1e646
hplip: 3.19.6 -> 3.19.12 2019-12-21 07:39:09 +00:00
Graham Christensen 821d50e304
hplip: add dbus-python to the deps 2019-12-18 23:12:23 -05:00
Graham Christensen 34e63b4615
hplip: python2 -> python3
Tested with a local HP printer
2019-12-18 23:12:19 -05:00
Mateusz Kowalczyk 1451a52a38 Remove myself (fuuzetsu) from maintainer lists
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
2019-12-05 16:29:48 +09:00
Frederik Rietdijk 8ea50952b2 hplip: use python2Packages
While Python 3 is (partially) supported, it requires more effort to fix
it.
2019-11-13 16:27:37 +01:00
wucke13 3a58913421 epson-workforce-635-nx625-series: added mirror url for src
+ added webarchive source for reliable builds in the future
2019-10-13 19:23:54 +02:00
wucke13 4db74946ac epson-escpr2: added mirror url for src
+ added webarchive source for reliable builds in the future
+ removed `${version}` from url, as it actually adds more hassle to
  have it in there and no benefits whatsoever, since the url keeps
  changing other parts too
2019-10-13 19:23:54 +02:00
wucke13 bbb71bfd76 epson-escpr: 1.6.16 -> 1.7.3
+ added webarchive source for reliable builds in the future
2019-10-13 19:23:54 +02:00
wucke13 25d6f87dcd epson_201207w: added mirror url for src
+ added webarchive source for reliable builds in the future
2019-10-13 19:23:54 +02:00
wucke13 e7f3fb9326 epson-201106w: added mirror url for src
+ added webarchive source for reliable builds in the future
2019-10-13 19:23:54 +02:00
wucke13 959930f7fd epkowa: added mirror url for src
+ added webarchive source for reliable builds in the future
2019-10-13 19:23:54 +02:00
wucke13 9eb00acbbe utsushi: 3.57.0 -> 3.59.2
+ building from gitlab source
+ reorderd dependencies to be in logical/alphabetical order
+ replaced patches with substituteInPlace, as patches broke the installChecks
  and substituteInPlace may be more robust than making new patches for each
  release. Also the compiled source is now closer to upstream than
  before.
+ added installChecks
+ added all supported devices as listed on epson.net
2019-10-11 22:22:58 +02:00
Linus Heckemann 5aa4b19946 treewide: mark some broken packages as broken
Refs:
e675498026
1e9cc5b984
793a2fe1e8
c19cf65261
f6544d618f
2019-10-08 17:14:26 +02:00
Linus Heckemann 91ceb6b997 treewide: fix dead anonscm.debian.org links 2019-10-04 12:42:21 +02:00
Dima e33810594d epson-escpr2: 1.0.29 -> 1.1.1
The build was failing because the source rpm does not exist
on epsons servers anymore.

Thus bumping it to an existing version
https://hydra.nixos.org/build/101990975/nixlog/5
2019-10-01 01:34:17 -04:00
symphorien 8772a1dfbc epkowa: update (#68225) 2019-09-08 13:39:21 -04:00
Niklas Hambüchen 9e78f76ade treewide: Remove unnecessary --disable-static (#66759)
* freetype: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes freetype not being overridable to have static libs.

* treewide: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes these packages not being overridable to have static libs.
2019-08-31 08:10:53 -04:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00: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
symphorien 757ac88383 utsushi: init at 3.57.0 (#65223) 2019-08-14 08:37:19 +00:00
Thomas Tuegel e740b88c00
Merge pull request #64722 from Yarny0/hplip
hplip: update version to 3.19.6, fix `hpcups` segfault, enable udev rule file
2019-07-17 14:27:16 -05:00
R. RyanTM 1cf88a612a sc-controller: 0.4.6.1 -> 0.4.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sc-controller/versions
2019-07-16 12:02:15 -07:00
Yarny0 2daea2c81f hplip: retain udev rules in WithPlugin version
Beginning with commit 8ffd6af27e,
the build recipe for `hplipWithPlugin` explicitely drops a
udev rule file that is delivered with the sources.
In `hplip` (without plugin), the rule file is retained.

The udev rules takes care of uploading firmware
to certain printers (and maybe of other things),
e.g. to HP LaserJet 1000.

This commit reinstates the rule file and
expands the fixup script so that the rules
are also patched in the WithPlugin version.
2019-07-14 10:15:38 +02:00
Yarny0 5aafd1d0db hplip: udev rule: drop nohup instead of patching it
hplip's udev rule uses `nohup` to attempt to detach
its printer configuration script from the udev process.
However, this attempt is futile as udev
tracks its child processes with cgroups:
https://unix.stackexchange.com/a/243648

The hardcoded path to `nohup` was patched to use Nix' `nohup`.
This commit alters the patch script so
that it simply drops the call to `nohup`.
2019-07-14 10:15:38 +02:00
Yarny0 60311e0957 hplip: patch imageProcessor segfault in hpcups (#58949)
Beginning with version 3.18.7, `hpcups` fails with
> DEBUG: imageProcessorStartPage failed
and segfaults (tested with HP LaserJet 1000 printer).

Upstream bug reports:
* https://bugs.launchpad.net/hplip/+bug/1788706
* https://bugs.launchpad.net/hplip/+bug/1787289

There is a patch available in one of the reports:
https://bugs.launchpad.net/hplip/+bug/1787289/+attachment/5176026/+files/hplip.patch
It applies to 3.18.7, but not to later versions.

This commit adds a slight adaption of
the patch that applies to versions 3.18.9 -- 3.19.6.
The patch fixes https://github.com/NixOS/nixpkgs/issues/58949 .

Note that the patch is merely a workaround:
It simply removes all calls into the
ImageProcessor library from `HPCupsFilter.cpp`.
2019-07-14 10:15:06 +02:00
Yarny0 15aacfb450 hplip: 3.19.1 -> 3.19.6
Release notes:
https://developers.hp.com/hp-linux-imaging-and-printing/release_notes
2019-07-13 09:48:44 +02:00
Yarny0 1323930b7b hplip: add meta.downloadPage 2019-07-13 09:48:40 +02:00
Ihar Hrachyshka 35ee15ded8 epkowa: add support for network scanners (#60568) 2019-06-12 14:46:57 -04:00
Robert Djubek 9c6185f20b
hplip: add old version (from 18.09) with aarch64 support 2019-06-01 04:28:01 +00:00
Robert Djubek e69d8844b6
hplip-3.16.11: add aarch64-linux to platforms 2019-06-01 04:28:00 +00:00
c0bw3b 9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02:00
Joachim F 3ceb958cef
Merge pull request #54906 from furrycatherder/epson-escpr2
epson-escpr2: init at 1.0.29
2019-04-12 15:36:53 +00:00
hhm0 edb323117d hplip: add missing dependency (#58515)
Graphical programs (e.g. hp-setup) error with:

error: No module named enum

This adds the enum module which fixes the error
2019-03-31 00:20:17 +01: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
xeji 969cff2691
Merge pull request #55401 from xtruder/pkgs/hplip/3.19.1
hplip: 3.18.5 -> 3.19.1
2019-02-21 23:23:33 +01:00
Vladimír Čunát 32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Benedikt Heine fa82ebccf6 epkowa: support Epson Perfection V330 Photo 2019-02-19 20:45:31 -05:00
Frederik Rietdijk 815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00