summaryrefslogtreecommitdiffstats
path: root/tv/5pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'tv/5pkgs')
-rw-r--r--tv/5pkgs/override/default.nix8
-rw-r--r--tv/5pkgs/rpi/433Utils/default.nix4
-rw-r--r--tv/5pkgs/rpi/WiringPi/default.nix4
-rw-r--r--tv/5pkgs/simple/diff-so-fancy.nix6
-rw-r--r--tv/5pkgs/simple/fzmenu/default.nix9
-rw-r--r--tv/5pkgs/simple/hc.nix6
-rw-r--r--tv/5pkgs/simple/imagescan-plugin-networkscan.nix55
-rw-r--r--tv/5pkgs/simple/rox-filer.nix5
-rw-r--r--tv/5pkgs/simple/utsushi.nix217
9 files changed, 81 insertions, 233 deletions
diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix
index e6aae0f26..4fb2e8061 100644
--- a/tv/5pkgs/override/default.nix
+++ b/tv/5pkgs/override/default.nix
@@ -4,14 +4,16 @@ self: super: {
# XXX cannot use `patches` because fzf has a custom patchPhase
patchPhase = ''
patch -Np1 < ${./fzf.complete1.patch}
- ${old.patchPhase}
+ ${old.patchPhase or ""}
'';
});
input-fonts = super.input-fonts.overrideAttrs (old: rec {
- src = self.fetchurl {
+ src = self.fetchzip {
url = "http://xu.r/~tv/mirrors/input-fonts/Input-Font-2.zip";
- sha256 = "1vvipqcflz4ximy7xpqy9idrdpq3a0c490hp5137r2dq03h865y0";
+ sha256 = "1q58x92nm7dk9ylp09pvgj74nxkywvqny3xmfighnsl30dv42fcr";
+ stripRoot = false;
};
+ sourceRoot = null;
outputHash = null;
outputHashAlgo = null;
outputHashMode = null;
diff --git a/tv/5pkgs/rpi/433Utils/default.nix b/tv/5pkgs/rpi/433Utils/default.nix
index 78be6de35..136e3dbca 100644
--- a/tv/5pkgs/rpi/433Utils/default.nix
+++ b/tv/5pkgs/rpi/433Utils/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv
+{ fetchFromGitHub, lib, stdenv
, wiringPi ? WiringPi.wiringPi
, wiringPiDev ? WiringPi.wiringPiDev
, WiringPi ? rpiPackages.WiringPi
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
pname = "433Utils-RPi_utils";
version = "2018-06-07";
- src = fetchFromGitHub (stdenv.lib.importJSON ./src.json);
+ src = fetchFromGitHub (lib.importJSON ./src.json);
patches = [
./rc-switch.protocols.patch
diff --git a/tv/5pkgs/rpi/WiringPi/default.nix b/tv/5pkgs/rpi/WiringPi/default.nix
index 61c43556d..40fcaeae4 100644
--- a/tv/5pkgs/rpi/WiringPi/default.nix
+++ b/tv/5pkgs/rpi/WiringPi/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, runCommand, stdenv }:
+{ fetchFromGitHub, lib, runCommand, stdenv }:
let
generic = name: extraAttrs:
@@ -6,7 +6,7 @@ let
pname = "WiringPi-${name}";
version = "2020-09-14";
- src = fetchFromGitHub (stdenv.lib.importJSON ./src.json);
+ src = fetchFromGitHub (lib.importJSON ./src.json);
buildPhase = ''
runHook postBuild
diff --git a/tv/5pkgs/simple/diff-so-fancy.nix b/tv/5pkgs/simple/diff-so-fancy.nix
index 9ce6d9234..d57e6e75c 100644
--- a/tv/5pkgs/simple/diff-so-fancy.nix
+++ b/tv/5pkgs/simple/diff-so-fancy.nix
@@ -1,4 +1,6 @@
-{stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}:
+{ fetchFromGitHub, lib, stdenv
+, coreutils, git, makeWrapper, ncurses, perl
+}:
stdenv.mkDerivation rec {
name = "diff-so-fancy-${version}";
@@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
--prefix PATH : "${ncurses.out}/bin"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/so-fancy/diff-so-fancy;
description = "Good-looking diffs filter for git";
license = licenses.mit;
diff --git a/tv/5pkgs/simple/fzmenu/default.nix b/tv/5pkgs/simple/fzmenu/default.nix
index 35918ff77..1f1b82848 100644
--- a/tv/5pkgs/simple/fzmenu/default.nix
+++ b/tv/5pkgs/simple/fzmenu/default.nix
@@ -1,4 +1,7 @@
-{ coreutils, dash, gnused, fzf, pass-otp, runCommand, rxvt_unicode, stdenv, utillinux, xdotool }:
+{ lib, stdenv
+, runCommand
+, coreutils, dash, gnused, fzf, pass-otp, rxvt_unicode, utillinux, xdotool
+}:
runCommand "fzmenu" {
} /* sh */ ''
@@ -8,7 +11,7 @@ runCommand "fzmenu" {
substituteInPlace $out/bin/otpmenu \
--replace '#! /bin/sh' '#! ${dash}/bin/dash' \
- --replace '#PATH=' PATH=${stdenv.lib.makeBinPath [
+ --replace '#PATH=' PATH=${lib.makeBinPath [
coreutils
dash
fzf
@@ -21,7 +24,7 @@ runCommand "fzmenu" {
substituteInPlace $out/bin/passmenu \
--replace '#! /bin/sh' '#! ${dash}/bin/dash' \
- --replace '#PATH=' PATH=${stdenv.lib.makeBinPath [
+ --replace '#PATH=' PATH=${lib.makeBinPath [
coreutils
dash
fzf
diff --git a/tv/5pkgs/simple/hc.nix b/tv/5pkgs/simple/hc.nix
index 4d325e16c..086445ec0 100644
--- a/tv/5pkgs/simple/hc.nix
+++ b/tv/5pkgs/simple/hc.nix
@@ -1,4 +1,6 @@
-{ coreutils, fetchgit, findutils, gawk, gnugrep, makeWrapper, qrencode, stdenv, texlive, utillinux, zbar }:
+{ fetchgit, lib, makeWrapper, stdenv
+, coreutils, findutils, gawk, gnugrep, qrencode, texlive, utillinux, zbar
+}:
stdenv.mkDerivation rec {
name = "hc-${meta.version}";
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
cp $src/bin/hc $out/bin/hc
wrapProgram $out/bin/hc \
- --prefix PATH : ${stdenv.lib.makeBinPath [
+ --prefix PATH : ${lib.makeBinPath [
coreutils
findutils
gawk
diff --git a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix
new file mode 100644
index 000000000..c3f2deaca
--- /dev/null
+++ b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix
@@ -0,0 +1,55 @@
+{ 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 \
+ ${stdenv.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;
+ };
+}
diff --git a/tv/5pkgs/simple/rox-filer.nix b/tv/5pkgs/simple/rox-filer.nix
index bce89cacd..b380bdff9 100644
--- a/tv/5pkgs/simple/rox-filer.nix
+++ b/tv/5pkgs/simple/rox-filer.nix
@@ -1,4 +1,5 @@
-{ autoconf, stdenv, fetchFromGitLab, pkgconfig, libxml2, libSM, shared-mime-info
+{ fetchFromGitLab, lib, stdenv
+, autoconf, pkgconfig, libxml2, libSM, shared-mime-info
, libxslt, docbook_xml_dtd_412, docbook_xsl
, gtk ? gtk2, gtk2
}:
@@ -84,7 +85,7 @@ stdenv.mkDerivation {
ln -sv application-{msword,rtf}.png
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Fast, lightweight, gtk2 file manager";
homepage = "http://rox.sourceforge.net/desktop";
license = with licenses; [ gpl2 lgpl2 ];
diff --git a/tv/5pkgs/simple/utsushi.nix b/tv/5pkgs/simple/utsushi.nix
deleted file mode 100644
index 0414eae09..000000000
--- a/tv/5pkgs/simple/utsushi.nix
+++ /dev/null
@@ -1,217 +0,0 @@
-{ boost, fetchurl, file, imagemagick, libudev, libusb, pkgconfig, stdenv
-, coreutils, dash, patchelf, writeScriptBin # for add-rpath
-
-, guiSupport ? false, gtkmm2 ? null
-, jpegSupport ? true
-, networkSupport ? false, dpkg ? null
-, ocrSupport ? false, tesseract ? null
-, saneSupport ? true, saneBackends ? null
-, tiffSupport ? true, libtiff ? null
-
-# Logging defaults copied from Utsushi source (lib/log.cpp)
-, logCategory ? "NOTHING"
-, logLevel ? "FATAL"
-}:
-
-# Logging possibilities copied from Utsushi source (utsushi/log.hpp)
-assert builtins.elem logCategory [
- "NOTHING"
- "SANE_BACKEND"
- "ALL"
-];
-assert builtins.elem logLevel [
- "FATAL" # famous last words
- "ALERT" # outside intervention required
- "ERROR" # something went wrong
- "BRIEF" # short informational notes
- "TRACE" # more chattery feedback
- "DEBUG" # the gory details
- "QUARK" # stack tracing feedback
-];
-
-let
-
- # usage: add-rpath LIBPATH [SOFILE...]
- # Adds LIBPATH to each SOFILE's RPATH
- add-rpath = writeScriptBin "add-rpath" ''
- #! ${dash}/bin/dash
- set -efu
- path=$1; shift
- for file; do
- file=$(${coreutils}/bin/readlink -f "$file")
- old_rpath=$(${patchelf}/bin/patchelf --print-rpath "$file")
- new_rpath=''${old_rpath+$old_rpath:}$path
- ${patchelf}/bin/patchelf --set-rpath "$new_rpath" "$file"
- done
- '';
-
- imagescan-plugin-networkscan = stdenv.mkDerivation rec {
- pname = "imagescan-plugin-networkscan";
- version = "1.1.3";
-
- src =
- if stdenv.system == "i686-linux" then
- fetchurl {
- urls = [
- "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x86/imagescan-bundle-debian-9-3.59.2.x86.deb.tar.gz"
- "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-9-3.59.2.x86.deb.tar.gz"
- ];
- sha256 = "1whw96kcfj65h2jnk72xgyr9jj05fa07d0xjxpaqb0zwdag3465g";
- }
- else if stdenv.system == "x86_64-linux" then
- fetchurl {
- urls = [
- "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-9-3.59.2.x64.deb.tar.gz"
- "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-9-3.59.2.x64.deb.tar.gz"
- ];
- sha256 = "0kd6mrs48wwss54gw4v9fm7ss5ma2xpn6gd1pz26cgjvp6n8hknn";
- }
- else throw "${pname} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
-
- dontBuild = true;
-
- installPhase = ''
- # Wildcard * stand for either i386 or amd64
- ${dpkg}/bin/dpkg -x \
- plugins/imagescan-plugin-networkscan_${version}-1epson4debian9_*.deb \
- tmp
-
- mv tmp/usr $out
- '';
-
- preFixup = ''
- patchelf --set-interpreter \
- ${stdenv.glibc}/lib/ld-linux${stdenv.lib.optionalString stdenv.is64bit "-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 = stdenv.lib.licenses.eapl;
- maintainers = [ stdenv.lib.maintainers.tv ];
- platforms = stdenv.lib.platforms.linux;
- };
- };
-
-in
-
-stdenv.mkDerivation rec {
- pname = "utsushi";
- version = "3.59.2";
-
- src = fetchurl {
- urls = [
- "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${version}.orig.tar.gz"
- "http://ni.r/~tv/mirrors/epson/imagescan_${version}.orig.tar.gz"
- ];
- sha256 = "1mns10mpyjprkrh2bjcg2nda9iyrnd0pf1did9py84glpapkzrdq";
- };
-
- preConfigure = ''
- substituteInPlace configure \
- --replace /usr/bin/file ${file}/bin/file
-
- substituteInPlace lib/log.cpp \
- --replace FATAL ${logLevel} \
- --replace NOTHING ${logCategory}
- '';
-
- postInstall = ''
- # Allow configuration to be done via /etc/utsushi.conf
- ln -s /etc/utsushi.conf $out/etc/utsushi/utsushi.conf
-
- ${stdenv.lib.optionalString saneSupport ''
- # Make this package compatible with hardware.sane.extraBackends
- mkdir $out/etc/sane.d
- echo utsushi > $out/etc/sane.d/dll.conf
- mkdir $out/lib/sane
- ln -s $out/lib/utsushi/sane/libsane-utsushi.* $out/lib/sane
- ''}
-
- ${stdenv.lib.optionalString networkSupport ''
- ln -s ${imagescan-plugin-networkscan}/lib/utsushi/networkscan \
- $out/libexec/utsushi/
- ''}
- '';
-
- # Fixup libraries which otherwise would end up broken like this:
- #
- # $ ldd .../blah.so | grep libboost_system
- # libboost_system.so.X.Y.Z => not found
- # libboost_system.so.X.Y.Z => /nix/store/.../libboost_system.so.X.Y.Z (...)
- #
- preFixup = ''
- add-rpath ${boost}/lib $out/lib/utsushi/libdrv-esci.so
- ${stdenv.lib.optionalString saneSupport ''
- add-rpath ${boost}/lib $out/lib/utsushi/sane/libsane-utsushi.so
- ''}
- '';
-
- nativeBuildInputs = [
- add-rpath
- pkgconfig
- ];
-
- buildInputs = [
- boost
- imagemagick
- libudev
- libusb
- ]
- ++ stdenv.lib.optional guiSupport gtkmm2
- ++ stdenv.lib.optional ocrSupport tesseract
- ++ stdenv.lib.optional saneSupport saneBackends
- ++ stdenv.lib.optional tiffSupport libtiff
- ;
-
- NIX_CFLAGS_COMPILE = [
- "-Wno-error=deprecated-declarations"
- "-Wno-error=unused-variable"
- ];
-
- configureFlags = [
- "--with-boost=${boost}"
- "--with-magick"
- "--with-magick-pp"
- "--with-udev-confdir=$(out)/etc/udev"
- ]
- ++ stdenv.lib.optionals guiSupport [
- "--with-gtkmm"
- ]
- ++ stdenv.lib.optionals jpegSupport [
- "--with-jpeg"
- ]
- ++ stdenv.lib.optionals saneSupport [
- "--with-sane"
- ]
- ++ stdenv.lib.optionals tiffSupport [
- "--with-tiff"
- ]
- ;
-
- meta = {
- description = "Utsushi - Next Generation Image Acquisition";
- longDescription = ''
- This software provides applications to easily turn hard-copy
- documents and imagery into formats that are more amenable to
- computer processing.
-
- Included are a native driver for a number of EPSON scanners
- and a compatibility driver to interface with software built
- around the SANE standard.
- '';
- homepage = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX;
- license = stdenv.lib.licenses.gpl3;
- maintainers = [ stdenv.lib.maintainers.tv ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 19:05:20 +0000