diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/cups/drivers/cnijfilter2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/documentation-highlighter/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/epkowa/default.nix | 109 | ||||
-rw-r--r-- | pkgs/misc/emulators/np2kai/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/hdt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/riscv-pk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/screensavers/betterlockscreen/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/screensavers/i3lock-pixeled/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/screensavers/xautolock/default.nix | 2 |
10 files changed, 66 insertions, 61 deletions
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index b04ef89d215..ce11f4a0551 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series."; + description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series"; homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 9b328c20b71..f6504b598cb 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation { dontPatchELF = true; meta = with lib; { - description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series."; + description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series"; homepage = "https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index 72f1da6b0de..16b47d01f24 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -1,7 +1,7 @@ { stdenv, runCommand }: runCommand "documentation-highlighter" { meta = { - description = "Highlight.js sources for the Nix Ecosystem's documentation."; + description = "Highlight.js sources for the Nix Ecosystem's documentation"; homepage = "https://highlightjs.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 6016cc779f1..eb88476432b 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -1,20 +1,27 @@ -{stdenv, fetchurl, fetchpatch, makeWrapper, symlinkJoin, -pkgconfig, libtool, -gtk2, -libxml2, -libxslt, -libusb-compat-0_1, -sane-backends, -rpm, cpio, -getopt, -patchelf, autoPatchelfHook, gcc +{ stdenv +, fetchurl +, fetchpatch +, makeWrapper +, symlinkJoin +, pkgconfig +, libtool +, gtk2 +, libxml2 +, libxslt +, libusb-compat-0_1 +, sane-backends +, rpm +, cpio +, getopt +, patchelf +, autoPatchelfHook +, gcc }: - let common_meta = { - homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; - license = with stdenv.lib.licenses; epson; - platforms = with stdenv.lib.platforms; linux; - }; + homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; + license = with stdenv.lib.licenses; epson; + platforms = with stdenv.lib.platforms; linux; +}; in ############################ # @@ -23,7 +30,6 @@ in ############################ # adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... - let plugins = { v330 = stdenv.mkDerivation rec { name = "iscan-v330-bundle"; @@ -33,7 +39,7 @@ let plugins = { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent - # version. + # version. # NOTE: Don't forget to update the webarchive link too! urls = [ "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz" @@ -49,17 +55,17 @@ let plugins = { mkdir $out{,/share,/lib} cp -r ./usr/share/{iscan-data,esci}/ $out/share/ cp -r ./usr/lib64/esci $out/lib - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin" - ''; + ''; hw = "Perfection V330 Photo"; - }; - meta = common_meta // { description = "Plugin to support "+passthru.hw+" scanner in sane."; }; + }; + meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; }; - x770 = stdenv.mkDerivation rec { + x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; version = "2.30.4"; @@ -79,20 +85,20 @@ let plugins = { cp -r usr/lib64 $out/lib mv $out/share/iscan $out/share/esci mv $out/lib/iscan $out/lib/esci - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin" - ''; + ''; hw = "Perfection V500 Photo"; - }; - meta = common_meta // { description = "iscan esci x770 plugin for "+passthru.hw; }; }; + meta = common_meta // { description = "iscan esci x770 plugin for " + passthru.hw; }; + }; f720 = stdenv.mkDerivation rec { pname = "iscan-gt-f720-bundle"; version = "2.30.4"; - nativeBuildInputs= [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gcc.cc.lib ]; src = fetchurl { urls = [ @@ -107,16 +113,16 @@ let plugins = { mkdir $out cp -r usr/share $out cp -r usr/lib64 $out/lib - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin" - ''; + ''; hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo"; - }; + }; - meta = common_meta // { description = "iscan esci f720 plugin for "+passthru.hw; }; + meta = common_meta // { description = "iscan esci f720 plugin for " + passthru.hw; }; }; s80 = stdenv.mkDerivation rec { pname = "iscan-gt-s80-bundle"; @@ -139,7 +145,7 @@ let plugins = { cp -r usr/share $out cp -r usr/lib64 $out/lib mkdir $out/share/esci - ''; + ''; passthru = { registrationCommand = '' @@ -147,11 +153,11 @@ let plugins = { $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so" $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so" - ''; + ''; hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85"; - }; + }; - meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; }; + meta = common_meta // { description = "iscan esci s80 plugin for " + passthru.hw; }; }; s650 = stdenv.mkDerivation rec { name = "iscan-gt-s650-bundle"; @@ -175,16 +181,16 @@ let plugins = { cp -r usr/lib64 $out/lib mv $out/share/iscan $out/share/esci mv $out/lib/iscan $out/lib/esci - ''; + ''; passthru = { registrationCommand = '' $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin" - ''; + ''; hw = "GT-S650, Perfection V19, Perfection V39"; }; - meta = common_meta // { description = "iscan GT-S650 for "+passthru.hw; }; + meta = common_meta // { description = "iscan GT-S650 for " + passthru.hw; }; }; network = stdenv.mkDerivation rec { pname = "iscan-nt-bundle"; @@ -209,7 +215,7 @@ let plugins = { cp -r usr/share $out cp -r usr/lib64 $out/lib mkdir $out/share/esci - ''; + ''; passthru = { registrationCommand = ""; hw = "network"; @@ -219,9 +225,6 @@ let plugins = { }; }; in - - - let fwdir = symlinkJoin { name = "esci-firmware-dir"; paths = stdenv.lib.mapAttrsToList (name: value: value + /share/esci) plugins; @@ -278,14 +281,14 @@ stdenv.mkDerivation rec { }) ./firmware_location.patch ./sscanf.patch - ]; + ]; patchFlags = [ "-p0" ]; - configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"]; + configureFlags = [ "--enable-dependency-reduction" "--disable-frontend" ]; postConfigure = '' echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h - ''; + ''; postInstall = '' mkdir -p $out/etc/sane.d @@ -294,18 +297,20 @@ stdenv.mkDerivation rec { ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data mkdir -p $out/lib/iscan ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network - ''; + ''; postFixup = '' # iscan-registry is a shell script requiring getopt wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin registry=$out/bin/iscan-registry; - '' + - stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: '' - plugin=${value}; - ${value.passthru.registrationCommand} - '') plugins); + '' + + stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList + (name: value: '' + plugin=${value}; + ${value.passthru.registrationCommand} + '') + plugins); meta = common_meta // { - description = "sane-epkowa backend for some epson scanners."; + description = "sane-epkowa backend for some epson scanners"; longDescription = '' Includes gui-less iscan (aka. Image Scan! for Linux). Supported hardware: at least : diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/misc/emulators/np2kai/default.nix index 245bad1d535..0ed47af8f5b 100644 --- a/pkgs/misc/emulators/np2kai/default.nix +++ b/pkgs/misc/emulators/np2kai/default.nix @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A PC-9801 series emulator."; + description = "A PC-9801 series emulator"; homepage = "https://github.com/AZO234/NP2kai"; license = licenses.mit; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix index 8a4c7c3e6f5..a8cf5c5d4d3 100644 --- a/pkgs/misc/hdt/default.nix +++ b/pkgs/misc/hdt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.rdfhdt.org/"; - description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns."; + description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.koslambrou ]; diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index 3e1f63e5e30..6ef50a33a5b 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { ''; meta = { - description = "RISC-V Proxy Kernel and Bootloader."; + description = "RISC-V Proxy Kernel and Bootloader"; homepage = "https://github.com/riscv/riscv-pk"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.riscv; diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 36f89819570..735a2cd3b76 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; + description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 5ffe5f72265..39497917755 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; + description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active"; homepage = "https://gitlab.com/Ma27/i3lock-pixeled"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index cefcdbc75a3..d46f772e495 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { - description = "Launch a given program when your X session has been idle for a given time."; + description = "Launch a given program when your X session has been idle for a given time"; homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; |