Commit Graph

169 Commits

Author SHA1 Message Date
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Philip Taron
fe193f4262
brscan5: remove with statements 2024-08-18 06:31:12 -07:00
Philip Taron
c61702920f
brscan4: remove with statements 2024-08-18 06:31:12 -07:00
Felix Buehler
04d23606b5 sane: remove 'with lib;' 2024-08-16 16:09:03 +02:00
Aleksana
84a53ad8e2
Merge pull request #328741 from Sigmanificient/remove-unused-arguments-pkgs-app
pkgs/applications: remove unused arguments
2024-07-26 22:05:49 +08:00
Sigmanificient
2ee703dccb pkgs/applications: remove unused arguments 2024-07-26 11:36:49 +02:00
Jonas Heinrich
4edef1362f sane-backends: configure and use lock dir 2024-07-22 16:46:30 +02:00
Jonas Heinrich
9ab8fb342a sane-backends: 1.2.1 -> 1.3.1 2024-07-22 11:17:27 +02:00
Pol Dellaiera
439832d6bf
Merge pull request #293022 from symphorien/nixos_module_sane_disabled_backed_word_boundary
nixos/sane: fix disabling backends which are subwords of other backends
2024-06-01 22:39:00 +02:00
teutat3s
a9cc39ca75
brscan5: 1.3.0-0 -> 1.3.1-0 2024-04-16 19:17:41 +02:00
annalee
0d7dc0efc5
treewide: throw on unsupported system src access 2024-04-05 02:30:42 +00:00
Guillaume Girol
4323d8b63d
Merge pull request #291668 from symphorien/sane_epkowa_hwdb
sane-backends: generate hwdb entries for epkowa scanners correctly
2024-03-24 17:28:20 +01:00
Siddhartha
fadc1d7ef2 sane-airscan: 0.99.27 -> 0.99.29 2024-03-19 23:18:04 +01:00
stuebinm
ff1a94e523 treewide: add meta.mainProgram to packages with a single binary
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
2024-03-19 03:14:51 +01:00
Guillaume Girol
d5850d5c60 nixos/sane: fix disabling backends which are subwords of other backends
Fixes https://github.com/NixOS/nixpkgs/issues/292159
2024-03-03 12:00:00 +00:00
Guillaume Girol
22bb14bd5d sane-backends: generate hwdb entries for epkowa scanners correctly
without patching.

Entries for these scanners are both in the doc/descriptions folder,
marked as unsupported by the epson2 backend, and in the doc/descriptions-external,
supported by the epkowa backend.
2024-02-26 12:00:00 +00:00
Guillaume Girol
996d064488
Merge pull request #278131 from symphorien/sane_test
nixos/sane: add nixos test
2024-01-30 21:00:12 +01:00
Ryan Lahfa
715fac4e39
Merge pull request #254992 from AkechiShiro/brscan5-bump-from-1.2.9-0-to-1.3.0-0
brscan5: 1.2.9-0 -> 1.3.0-0
2024-01-15 05:41:41 +01:00
Samy Lahfa
083770a4ba brscan5: 1.2.9-0 -> 1.3.0-0
* Use sha256 instead of sha512
* Correct patch offset due to the fact that the driver is hardcoded to
look in /opt/brother/scanner/brscan5/models for model metadata.
* see comments for more details : https://github.com/NixOS/nixpkgs/pull/254992#issuecomment-1826811896
2024-01-14 19:47:10 +01:00
Guillaume Girol
ff893386c5 nixos/sane: add nixos test 2024-01-02 12:00:00 +00:00
Felix Buehler
fa3d11ad3b xsane: remove override libpng 2023-11-26 22:00:41 +01:00
Guillaume Girol
f9c5b550c2 sane_backends: disable parallel install
parallel install creates a bad symlink at $out/lib/sane/libsane.so.1
which prevents finding plugins.

Fixes https://github.com/NixOS/nixpkgs/issues/224569
2023-04-10 12:00:00 +00:00
Guillaume Girol
f0ddf281c5 sane-backends: 1.1.1 -> 1.2.1
changelog: https://gitlab.com/sane-project/backends/-/tags/1.2.1

Tested by scanning in nixos-rebuild build-vm, which can be done by
passing your USB printer to the vm as follows:
QEMU_OPTS="-device usb-ehci,id=ehci -device usb-host,vendorid=0x1234,productid=0xabcd" result/bin/run-nixos-vm
where lsusb reports
Bus 003 Device 008: ID 1234:abcd The Printer
2023-02-12 12:00:00 +00:00
Matt Melling
2b6a0352c5
xsane: fix src location
Get src from GitLab as the tarball is no longer available from xsane.org. Add
passthru update script and myself as maintainer.
2023-01-31 21:02:21 +00:00
Guillaume Girol
ddf0216b22
Merge pull request #202874 from symphorien/update-sane-backends
sane-backends: 1.0.32 -> 1.1.1
2022-11-29 13:51:30 +00:00
Guillaume Girol
03365bdf54 sane-backends: 1.0.32 -> 1.1.1
and add myself as maintainer

changelog: https://gitlab.com/sane-project/backends/-/releases/1.1.1
2022-11-24 12:00:00 +00:00
Guillaume Girol
b4cbe1dac3 sane_backends: more complete hwdb files
We used to ship the pre-computed udev rules that are distributed in the
tarballs. This is problematic as it changes the group of scanners to
scanner which removes the group lp and prevents cups from using it.
(https://github.com/NixOS/nixpkgs/issues/147217)
For this reason we switched to generating udev and hwdb files as follows:

    ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules
    ./tools/sane-desc -m udev+hwdb -s doc/descriptions -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb

following what other distros do.
(https://github.com/NixOS/nixpkgs/pull/176412)

this is great, but sane-desc does not include unsupported .desc entries
like EPSON V300 PHOTO, which was present in the distributed udev rules.
So even when installing all the required unfree stuff to make the
corresponding epkowa backend work, it only works as root as there is no
corresponding hwdb entry. As the .desc entry contains the usb ids, we
can just patch sane-desc to generate hwdb entries even for unsupported
models.
2022-11-04 18:51:01 +01:00
Artturin
cf360a1095 sane-backends: fix cross
pulled patch from void-linux

MMAP is only on linux i think
2022-09-01 00:21:13 +03:00
Guillaume Girol
358dcd9dc6 sane-backends: install hwdb file
copied from debian https://jff.email/cgit/sane-backends.git/tree/debian/rules#n140
2022-08-08 12:00:00 +00:00
github-actions[bot]
5b9ee17283
Merge master into staging-next 2022-06-24 00:02:29 +00:00
Robert Scott
466c2e342a treewide/applications: add sourceType binaryNativeCode for many packages 2022-06-23 18:38:19 +01:00
7FM
fd84f6bb0c
sane-backends: fix udev rule generation 2022-06-05 18:03:11 +02:00
Artturin
c1fffdfffb treewide: change some glibc to stdenv.cc.libc 2022-05-27 05:57:43 +03:00
Artturin
0c4d65b21e treewide: stdenv.glibc -> glibc 2022-05-25 15:51:20 +03:00
Sandro
e650789e6e
Merge pull request #169510 from reckenrode/darwin-sane
sane-backends: fix build on Darwin
2022-04-27 16:56:35 +02:00
Randy Eckenrode
f6999e0cc5
sane-backends: fix build on Darwin 2022-04-21 22:01:19 -04:00
Ben Siraphob
259fa13d53 treewide: remove nativeBuildInputs that are in stdenv 2022-04-16 21:46:46 +03:00
Peter Simons
7aaef4f836
Merge pull request #161548 from Stunkymonkey/sane-backend-phases
sane-backend: deprecate phases
2022-03-30 12:28:14 +02:00
Felix Buehler
ff4d8134a2 sane-backend: deprecate phases 2022-03-30 10:14:47 +02:00
Matt Christ
c5fac1f611
brscan5: 1.2.7-0 -> 1.2.9.0 (#164903)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-27 13:43:16 +02:00
Fabian Möller
4329d79dba
nixos/tests: link tests to their packages 2022-01-23 21:08:10 +01:00
snkgak
fce2dca966
brscan5: 1.2.6-0 -> 1.2.7-0 2021-12-14 23:04:37 +08:00
Sandro Jäckel
e97c0f6281
sane: remove ? null from inputs, cleanup meta 2021-11-09 10:20:26 +01:00
Felix Bühler
fbdf78236a
pkgs/applications: rename name to pname&version part 1 (#144949)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-07 21:29:51 +01:00
R. Ryantm
0342aee969 sane-airscan: 0.99.26 -> 0.99.27 2021-10-29 04:55:41 +00:00
Peter Simons
476635afe1 Drop myself from meta.maintainers for most packages.
I'd like to reduce the number of Github notifications and
review requests I receive.
2021-10-14 11:01:27 +02:00
Artturin
813f2f11e1 sane-backends: add gawk to buildInputs 2021-08-05 15:27:40 +03:00
Profpatsch
6376458424 sane: Add support for the unfree Fujitsu ScanSnap drivers
This adds the scanner files already linked from the
`etc/sane.d/epjitsu.conf` file, which are extracted from the Windows
drivers and mirrored on GitHub.

Being a Japanese hardware vendor, Fujitsu’s software release &
licensing methods are horrifying, but their scanners are some of the
best, so we should definitly have discoverable support for them, which
this patch hopefully adds.

Inspiration was taken from the following sources:
https://www.josharcher.uk/code/install-scansnap-s1300-drivers-linux/
https://ubuntuforums.org/archive/index.php/t-1461915.html
https://github.com/stevleibelt/scansnap-firmware
2021-08-01 13:45:46 +02:00
Sandro
839713a179
Merge pull request #125096 from SebTM/update/sane-airscan_09926 2021-06-01 22:50:50 +02:00
Sebastian Sellmeier
19120ab497
sane-airscan: 0.99.24 -> 0.99.26 2021-05-31 16:36:26 +02:00