From 0390e201048c8ff1f6a18d09f4a6eb11eded487b Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 23 Apr 2023 14:34:21 +0200 Subject: tv imagescan-plugin-networkscan: add old comments --- tv/5pkgs/simple/imagescan-plugin-networkscan.nix | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix index 4f9b84b2..0bd1c5e1 100644 --- a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix +++ b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix @@ -4,14 +4,39 @@ stdenv.mkDerivation rec { pname = "imagescan-plugin-networkscan"; version = "1.1.3"; + # TODO mirror://epson/imagescanv3/debian/latest1/deb/x86/imagescan-bundle-debian-9-${utsushiVersion}.x86.deb.tar.gz using NIX_MIRRORS_epson= + # TODO http://support.epson.net/linux/en/imagescanv3.php#debian + # TODO https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=imagescan-plugin-networkscan is using the RPM file + #src = let + # add = a: b: a + b; + # append = rhs: lhs: lhs + rhs; + # mirrors.i686-linux = [ + # "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x86" + # "http://ni.r/~tv/mirrors/epson" + # ]; + # mirrors.x86_64-linux = [ + # "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64" + # "http://ni.r/~tv/mirrors/epson" + # ]; + #in 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.62.0.x64.deb.tar.gz" + # "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-10-3.62.0.x64.deb.tar.gz" + #]; + #hash = "sha256:1ha1h7xw23p96mpixgcg1sy8lzv8q414rr9n8h4vli0bdkl8i6x9"; 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"; + #urls = [ + # "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-10-3.65.0.x64.deb.tar.gz" + # "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-10-3.65.0.x64.deb.tar.gz" + #]; + #hash = "sha256:0ad4kx20fsw5j7fhcvmlpyxr44imy9x6g36zpr8z0ghwqg17ljm5"; } else throw "${pname} is not supported on ${stdenv.system}; supported systems: x86_64-linux"; -- cgit v1.2.3 From 57072433742bc07847d7f7a3b2d3033c8efdf8b2 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 23 Apr 2023 14:34:27 +0200 Subject: tv imagescan-plugin-networkscan: RIP --- tv/5pkgs/simple/imagescan-plugin-networkscan.nix | 80 ------------------------ 1 file changed, 80 deletions(-) delete mode 100644 tv/5pkgs/simple/imagescan-plugin-networkscan.nix diff --git a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix deleted file mode 100644 index 0bd1c5e1..00000000 --- a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ fetchurl, lib, pkgs, stdenv }: - -stdenv.mkDerivation rec { - pname = "imagescan-plugin-networkscan"; - version = "1.1.3"; - - # TODO mirror://epson/imagescanv3/debian/latest1/deb/x86/imagescan-bundle-debian-9-${utsushiVersion}.x86.deb.tar.gz using NIX_MIRRORS_epson= - # TODO http://support.epson.net/linux/en/imagescanv3.php#debian - # TODO https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=imagescan-plugin-networkscan is using the RPM file - #src = let - # add = a: b: a + b; - # append = rhs: lhs: lhs + rhs; - # mirrors.i686-linux = [ - # "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x86" - # "http://ni.r/~tv/mirrors/epson" - # ]; - # mirrors.x86_64-linux = [ - # "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64" - # "http://ni.r/~tv/mirrors/epson" - # ]; - #in - 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.62.0.x64.deb.tar.gz" - # "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-10-3.62.0.x64.deb.tar.gz" - #]; - #hash = "sha256:1ha1h7xw23p96mpixgcg1sy8lzv8q414rr9n8h4vli0bdkl8i6x9"; - 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"; - #urls = [ - # "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-10-3.65.0.x64.deb.tar.gz" - # "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-10-3.65.0.x64.deb.tar.gz" - #]; - #hash = "sha256:0ad4kx20fsw5j7fhcvmlpyxr44imy9x6g36zpr8z0ghwqg17ljm5"; - } - 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; - }; -} -- cgit v1.2.3 From 23ea133db94ec1da4454438fb33ce670747be59f Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 25 Apr 2023 13:10:39 +0200 Subject: tv xp-332: RIP --- tv/1systems/querel/config.nix | 1 - tv/1systems/xu/config.nix | 1 - tv/2configs/xp-332.nix | 42 ------------------------------------------ 3 files changed, 44 deletions(-) delete mode 100644 tv/2configs/xp-332.nix diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index 8df29f75..7ba7d162 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -3,7 +3,6 @@ with import ./lib; imports = [ - ]; krebs.build.host = config.krebs.hosts.querel; diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index b83d01f0..80d16e68 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -17,7 +17,6 @@ with import ./lib; - diff --git a/tv/2configs/xp-332.nix b/tv/2configs/xp-332.nix deleted file mode 100644 index 51fd1ae8..00000000 --- a/tv/2configs/xp-332.nix +++ /dev/null @@ -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; - }; - -} -- cgit v1.2.3 From 72de0dd65937dde91c9926bac3ba053d69e0769e Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 25 Apr 2023 12:56:06 +0200 Subject: kartei tv pi: init --- kartei/tv/hosts/pi.nix | 4 ++++ kartei/tv/wiregrill/pi.pub | 1 + 2 files changed, 5 insertions(+) create mode 100644 kartei/tv/hosts/pi.nix create mode 100644 kartei/tv/wiregrill/pi.pub diff --git a/kartei/tv/hosts/pi.nix b/kartei/tv/hosts/pi.nix new file mode 100644 index 00000000..991bc008 --- /dev/null +++ b/kartei/tv/hosts/pi.nix @@ -0,0 +1,4 @@ +{ + nets.wiregrill.ip4.addr = "10.244.3.102"; + syncthing.id = "NLR6FLV-2MJQSZ6-4M5QBBB-X2UM225-YGB6IYW-F2EGFV6-D7ZDCWY-27EQAAM"; +} diff --git a/kartei/tv/wiregrill/pi.pub b/kartei/tv/wiregrill/pi.pub new file mode 100644 index 00000000..8d5b3f10 --- /dev/null +++ b/kartei/tv/wiregrill/pi.pub @@ -0,0 +1 @@ +HlKTr86mTywYtRIQNhxs8jeSw5hwVTeKFiSUYglc4T8= -- cgit v1.2.3