Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2023-04-28 17:27:07 +02:00
commit 33bed40187
6 changed files with 5 additions and 99 deletions

4
kartei/tv/hosts/pi.nix Normal file
View File

@ -0,0 +1,4 @@
{
nets.wiregrill.ip4.addr = "10.244.3.102";
syncthing.id = "NLR6FLV-2MJQSZ6-4M5QBBB-X2UM225-YGB6IYW-F2EGFV6-D7ZDCWY-27EQAAM";
}

View File

@ -0,0 +1 @@
HlKTr86mTywYtRIQNhxs8jeSw5hwVTeKFiSUYglc4T8=

View File

@ -3,7 +3,6 @@ with import ./lib;
imports = [ imports = [
<stockholm/tv> <stockholm/tv>
<stockholm/tv/2configs/retiolum.nix> <stockholm/tv/2configs/retiolum.nix>
<stockholm/tv/2configs/xp-332.nix>
]; ];
krebs.build.host = config.krebs.hosts.querel; krebs.build.host = config.krebs.hosts.querel;

View File

@ -17,7 +17,6 @@ with import ./lib;
<stockholm/tv/2configs/retiolum.nix> <stockholm/tv/2configs/retiolum.nix>
<stockholm/tv/2configs/binary-cache> <stockholm/tv/2configs/binary-cache>
<stockholm/tv/2configs/br.nix> <stockholm/tv/2configs/br.nix>
<stockholm/tv/2configs/xp-332.nix>
<stockholm/tv/2configs/xserver> <stockholm/tv/2configs/xserver>
<stockholm/tv/2configs/xsessions> <stockholm/tv/2configs/xsessions>
<stockholm/tv/2configs/xserver/xkiller.nix> <stockholm/tv/2configs/xserver/xkiller.nix>

View File

@ -1,42 +0,0 @@
with import ./lib;
{ config, pkgs, ... }: {
environment.etc."utsushi.conf".text = ''
[devices]
dev1.udi = esci:networkscan://ep.hkw:1865
dev1.model = XP-332
dev1.vendor = EPSON
'';
hardware.sane = {
enable = true;
extraBackends = [
pkgs.utsushi-customized
];
};
krebs.nixpkgs.allowUnfreePredicate = pkg:
packageName pkg == "imagescan-plugin-networkscan";
nixpkgs.overlays = singleton (self: super: {
utsushi-customized = self.utsushi.overrideAttrs (old: {
postInstall = ''
${old.postInstall or ""}
ln -s /etc/utsushi.conf $out/etc/utsushi/utsushi.conf
ln -s ${pkgs.imagescan-plugin-networkscan}/lib/utsushi/networkscan \
$out/libexec/utsushi/
'';
});
});
services = {
printing = {
drivers = [
pkgs.epson-escpr
];
enable = true;
};
saned.enable = true;
};
}

View File

@ -1,55 +0,0 @@
{ fetchurl, lib, pkgs, stdenv }:
stdenv.mkDerivation rec {
pname = "imagescan-plugin-networkscan";
version = "1.1.3";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
urls = [
"https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-10-3.63.0.x64.deb.tar.gz"
"http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-10-3.63.0.x64.deb.tar.gz"
];
hash = "sha256:1rbz6mjfinag7c2vnyl7lls3gpn8n91sv0p18ilnbw0vaddssn4j";
}
else throw "${pname} is not supported on ${stdenv.system}; supported systems: x86_64-linux";
dontBuild = true;
nativeBuildInputs = [
pkgs.dpkg
];
installPhase = ''
# Wildcard * stand for either i386 or amd64
dpkg -x \
plugins/imagescan-plugin-networkscan_${version}-1epson4debian10_*.deb \
tmp
mv tmp/usr $out
'';
preFixup = ''
patchelf --set-interpreter \
${pkgs.pkgsi686Linux.glibc}/lib/ld-linux-x86-64.so.2 \
$out/lib/utsushi/networkscan
# libstdc++.so.6
patchelf --set-rpath \
${stdenv.cc.cc.lib}/lib \
$out/lib/utsushi/networkscan
'';
meta = {
description = "Epson Image Scan v3 networkscan plugin";
longDescription = ''
This package provides the unfree networkscan plugin from the Epson
Image Scan v3 scanner driver bundle, which can be used by Utsushi.
'';
homepage = "http://support.epson.net/linux/en/imagescanv3.php?version=${version}";
license = lib.licenses.eapl;
maintainers = [ lib.maintainers.tv ];
platforms = lib.platforms.linux;
};
}