From a5459c371efb6fad343afe7c5a8295e445b34657 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 25 May 2021 20:09:18 +0200 Subject: ircd: add oper:general for umode addon --- krebs/2configs/ircd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix index d4ac9e42a..d26aa5962 100644 --- a/krebs/2configs/ircd.nix +++ b/krebs/2configs/ircd.nix @@ -61,7 +61,7 @@ }; privset "op" { - privs = oper:admin; + privs = oper:admin, oper:general; }; operator "aids" { -- cgit v1.2.3 From 1365fd2c7f435562dc194e0c0910aa3d4032d75f Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 25 May 2021 20:10:21 +0200 Subject: news: bind brockman to solanum for mutual restart --- krebs/2configs/news.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix index 2da3e6fcc..84a39f95b 100644 --- a/krebs/2configs/news.nix +++ b/krebs/2configs/news.nix @@ -68,6 +68,7 @@ wantedBy = [ "multi-user.target" ]; }; + systemd.services.brockman.bindsTo = [ "solanum.service" ]; systemd.services.brockman.serviceConfig.LimitNOFILE = 16384; systemd.services.brockman.environment.BROCKMAN_LOG_LEVEL = "DEBUG"; krebs.brockman = { -- cgit v1.2.3 From 721946e1f08aaf7c0fcd913a49a6c97fb36b0282 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 27 May 2021 15:14:50 +0200 Subject: external: add nxnx.r (rtjure) --- krebs/3modules/external/default.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 7a2075702..123bbac47 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -563,6 +563,32 @@ in { }; }; }; + nxnx = { + owner = config.krebs.users.rtjure; + nets = { + retiolum = { + ip4.addr = "10.243.122.126"; + aliases = [ + "nxnx.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEA2JWNe54YaFM+flK3LlPwgOSgVRmZi+e+Qhc6uJYIxkQcAvJKpKJQ + 1M4h7OE7eiJLdDp/aGaHe4BuII15/0lFJwYf1Zt8E1zN54QtwuELkDgOhgkhgvVb + tO+maHh10xsQMFlhpUztEk8oQuBu5toC795nKY7lBR2o6V2dPbbVo1+qr7qArOWo + cBlshRhEDjuzJUMHLlUGu43/miWeDewAq4O7U/nNNEz/v8KbESqP9HtTjelAeWz6 + zGha8hSn+Snkt76kP15drgn1L8MMFvnm5EeJ5VkehnpOi8Vi9Yqln+VGwlvbhEdK + ST0gxNBKoSvLITS1P/ypfiEXARUOffgq+kLA2Hyet0DfBjCMD+WkTBlj1QyXLs10 + 3/xBntlOQqBcLIdpi/yRs7miyQlyblqsyiQOCukIvibdHB1RLdVBhUE3A7hgw4R+ + +3ug/mQR+fDOpNB/sOkorcTVgA04KENUHc+6OqA0dvoAYr8l7N4+az3AtyHDNr5x + 4otjxOq4fmu80sbm5Ry9SoNYMc4fOuWIZDHZ/ntDKqzHw3BaNB9vNkpKj22nArI4 + cwAMPPJMJJ+Ef7tIzZ+NKtPudqztoLa5AYNllV7K9gS6NG0Yzk6iIQ42bKgfsZFn + 9AkCdv8EycNIAIbBomPv2XIKYlKs3RfWEjRcSl3TQl4b3bilCicgnLECAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; ada = { owner = config.krebs.users.filly; nets = { -- cgit v1.2.3 From 3b601871b7b73c917275ac4f0a19c575a7744b7f Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 1 Jun 2021 19:05:58 +0200 Subject: external: add nxnv (rtjure) --- krebs/3modules/external/default.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 123bbac47..31cd9e2c3 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -589,6 +589,32 @@ in { }; }; }; + nxnv = { + owner = config.krebs.users.rtjure; + nets = { + retiolum = { + ip4.addr = "10.243.122.127"; + aliases = [ + "nxnv.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAxEs92W/wRl3wlB6fNS2KUS+ubFAPLkgQYhk4JXeEeTpUq1H27oxB + ZWgWOlLMqnvn3w+aHQviWWPl5F6jXCxDOWCwyLhZU4cs45+ub9KKezCeE8IN+gAt + NKDqmRFzao9EXoT7sR65BblqEUR/Aqpykv7n4JdL5pGDbw1GGJ6Xf5QZo2sYm4wp + wdqOROn/V2Sm8NgmD1K6Sa2i6BLHSvHqunI4qoTyMfGXl8sbw6I2iclpQy8td9bt + 1WA7F9kVTZdhaWgfpiZ8sKQ9LoFKoy6jnoppQcl/E8V2XNnjPy8obaLX9rTJ/deT + eW9qmfZeYiFSaDLLWEIZjhaU2l9z72oWyUW8w8GZQD+ypGi+UDMkbAhRHiaVGOZy + S7AodiEL2Ebzj6XJaNYC3LYm5R8U6XlvcHwn4FDtgKkqwXz08cZsPwQLoBjXUEi/ + 9/A5WEwrmp62TJ/ZRcRwV8/dBklrc/4FT0q0CiMuCWcbjF891d68TvcXlVU3gCwN + ld80CS17o2dOsBBW4nft7+9tL545p7mMjw6Oa4kRUTo2n1mYkMdTGZR+tOCD6hvW + 45IG7vGq5EnRwolekGoMRf8RthajU2RXcIoNWnVon0so0Rja+AU9G7dobd/2qila + jta1Mou2vzUSAbdwXtBwJHlV9882p1utMlU9XVEZwQXfWSt488tQqzsCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; ada = { owner = config.krebs.users.filly; nets = { -- cgit v1.2.3 From b7f6bab7aea34848ebcc5fd3b5c31a9cac0d8c1c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Jun 2021 17:59:12 +0200 Subject: ergo: init at 2.7.0-rc1 --- krebs/5pkgs/simple/ergo.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 krebs/5pkgs/simple/ergo.nix diff --git a/krebs/5pkgs/simple/ergo.nix b/krebs/5pkgs/simple/ergo.nix new file mode 100644 index 000000000..1c84cb4a6 --- /dev/null +++ b/krebs/5pkgs/simple/ergo.nix @@ -0,0 +1,23 @@ +{ buildGo116Module , fetchFromGitHub, lib }: + +buildGo116Module rec { + pname = "ergo"; + version = "2.7.0-rc1"; + + src = fetchFromGitHub { + owner = "ergochat"; + repo = "ergo"; + rev = "v${version}"; + sha256 = "0vdrvr991an6f6zsadpsy0npmb4058b278xgc7rh8vhp12m501b4"; + }; + + vendorSha256 = null; + + meta = { + description = "A modern IRC server (daemon/ircd) written in Go"; + homepage = "https://github.com/ergochat/ergo"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.linux; + }; +} -- cgit v1.2.3 From f558f1bc0c779cc310ff8a712d4f178db73de6ef Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:11:38 +0200 Subject: *: set isSystemUser or isNormalUser This is a requirement for nixpkgs 21.05, or else evaluation will fail with: Exactly one of users.users.${name}.isSystemUser and users.users.${name}.isNormalUser must be set. --- krebs/3modules/exim.nix | 1 + krebs/3modules/git.nix | 2 ++ krebs/3modules/htgen.nix | 1 + krebs/3modules/tinc.nix | 1 + tv/2configs/pulse.nix | 1 + 5 files changed, 6 insertions(+) diff --git a/krebs/3modules/exim.nix b/krebs/3modules/exim.nix index 83d88cb0d..972c7f437 100644 --- a/krebs/3modules/exim.nix +++ b/krebs/3modules/exim.nix @@ -78,6 +78,7 @@ in { inherit (cfg.user) home name uid; createHome = true; group = cfg.group.name; + isSystemUser = true; }; }; }; diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 4eb881341..d31d91b7c 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -366,6 +366,7 @@ let # To allow running cgit-clear-cache via hooks. cfg.cgit.fcgiwrap.group.name ]; + isSystemUser = true; shell = "/bin/sh"; openssh.authorizedKeys.keys = unique @@ -384,6 +385,7 @@ let users.${cfg.cgit.fcgiwrap.user.name} = { inherit (cfg.cgit.fcgiwrap.user) home name uid; group = cfg.cgit.fcgiwrap.group.name; + isSystemUser = true; }; }; diff --git a/krebs/3modules/htgen.nix b/krebs/3modules/htgen.nix index 70c4fcd2b..063bccc68 100644 --- a/krebs/3modules/htgen.nix +++ b/krebs/3modules/htgen.nix @@ -66,6 +66,7 @@ let nameValuePair htgen.user.name { inherit (htgen.user) home name uid; createHome = true; + isSystemUser = true; } ) cfg; diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index 4252c8d3b..a8a78a43e 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -236,6 +236,7 @@ let nameValuePair "${netname}" { inherit (cfg.user) home name uid; createHome = true; + isSystemUser = true; } ) config.krebs.tinc; diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix index 79c31e9ec..f720ad473 100644 --- a/tv/2configs/pulse.nix +++ b/tv/2configs/pulse.nix @@ -116,6 +116,7 @@ in group = "pulse"; extraGroups = [ "audio" ]; home = "${runDir}/home"; + isSystemUser = true; }; }; } -- cgit v1.2.3 From ef24dd03e1b67353b23227f85aded6f007d23a09 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:13:33 +0200 Subject: tv: remove security.hideProcessInformation It's broken in nixpkgs 21.05 --- tv/2configs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 07e7ff11d..19e191b7b 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -38,7 +38,6 @@ with import ; } { i18n.defaultLocale = mkDefault "C.UTF-8"; - security.hideProcessInformation = true; security.sudo.extraConfig = '' Defaults env_keep+="SSH_CLIENT XMONAD_SPAWN_WORKSPACE" Defaults mailto="${config.krebs.users.tv.mail}" -- cgit v1.2.3 From 539fb1f899cdd1924ffd6a7e9547a3728f602057 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:40:51 +0200 Subject: tv gitrepos: use python3 for markdown2 For nixpkgs 21.05 --- tv/2configs/gitrepos.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index 2e73640ff..1586f3b33 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -33,7 +33,7 @@ let { cgit = { settings = { about-filter = pkgs.exec "krebs.cgit.about-filter" rec { - filename = "${pkgs.pythonPackages.markdown2}/bin/markdown2"; + filename = "${pkgs.python3Packages.markdown2}/bin/markdown2"; argv = [ filename "--extras=fenced-code-blocks" -- cgit v1.2.3 From f0660185cb669fa8635653904ccef27f3fe2cb45 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:15:33 +0200 Subject: tv overrides input-fonts: use fetchzip --- tv/5pkgs/override/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix index e6aae0f26..3f76a4c6e 100644 --- a/tv/5pkgs/override/default.nix +++ b/tv/5pkgs/override/default.nix @@ -8,10 +8,12 @@ self: super: { ''; }); 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; -- cgit v1.2.3 From 1132a21b94423535a75ee80daafc8afd7a43d30b Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:18:10 +0200 Subject: tv fzf: allow unset patchPhase For nixpkgs 21.05 --- tv/5pkgs/override/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix index 3f76a4c6e..4fb2e8061 100644 --- a/tv/5pkgs/override/default.nix +++ b/tv/5pkgs/override/default.nix @@ -4,7 +4,7 @@ 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 { -- cgit v1.2.3 From 6b8c4dbe8cdc46f17cfa0cb7c8cd7f7c7bd4d1d2 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:21:51 +0200 Subject: tv utsushi: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- tv/5pkgs/simple/utsushi.nix | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/tv/5pkgs/simple/utsushi.nix b/tv/5pkgs/simple/utsushi.nix index 0414eae09..678cdc56c 100644 --- a/tv/5pkgs/simple/utsushi.nix +++ b/tv/5pkgs/simple/utsushi.nix @@ -1,4 +1,6 @@ -{ boost, fetchurl, file, imagemagick, libudev, libusb, pkgconfig, stdenv +{ fetchurl, lib, stdenv + +, boost, file, imagemagick, libudev, libusb, pkgconfig , coreutils, dash, patchelf, writeScriptBin # for add-rpath , guiSupport ? false, gtkmm2 ? null @@ -81,7 +83,7 @@ let preFixup = '' patchelf --set-interpreter \ - ${stdenv.glibc}/lib/ld-linux${stdenv.lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.glibc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ $out/lib/utsushi/networkscan # libstdc++.so.6 @@ -96,9 +98,9 @@ let 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; + license = lib.licenses.eapl; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.linux; }; }; @@ -129,7 +131,7 @@ stdenv.mkDerivation rec { # Allow configuration to be done via /etc/utsushi.conf ln -s /etc/utsushi.conf $out/etc/utsushi/utsushi.conf - ${stdenv.lib.optionalString saneSupport '' + ${lib.optionalString saneSupport '' # Make this package compatible with hardware.sane.extraBackends mkdir $out/etc/sane.d echo utsushi > $out/etc/sane.d/dll.conf @@ -137,7 +139,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/utsushi/sane/libsane-utsushi.* $out/lib/sane ''} - ${stdenv.lib.optionalString networkSupport '' + ${lib.optionalString networkSupport '' ln -s ${imagescan-plugin-networkscan}/lib/utsushi/networkscan \ $out/libexec/utsushi/ ''} @@ -151,7 +153,7 @@ stdenv.mkDerivation rec { # preFixup = '' add-rpath ${boost}/lib $out/lib/utsushi/libdrv-esci.so - ${stdenv.lib.optionalString saneSupport '' + ${lib.optionalString saneSupport '' add-rpath ${boost}/lib $out/lib/utsushi/sane/libsane-utsushi.so ''} ''; @@ -167,10 +169,10 @@ stdenv.mkDerivation rec { libudev libusb ] - ++ stdenv.lib.optional guiSupport gtkmm2 - ++ stdenv.lib.optional ocrSupport tesseract - ++ stdenv.lib.optional saneSupport saneBackends - ++ stdenv.lib.optional tiffSupport libtiff + ++ lib.optional guiSupport gtkmm2 + ++ lib.optional ocrSupport tesseract + ++ lib.optional saneSupport saneBackends + ++ lib.optional tiffSupport libtiff ; NIX_CFLAGS_COMPILE = [ @@ -184,16 +186,16 @@ stdenv.mkDerivation rec { "--with-magick-pp" "--with-udev-confdir=$(out)/etc/udev" ] - ++ stdenv.lib.optionals guiSupport [ + ++ lib.optionals guiSupport [ "--with-gtkmm" ] - ++ stdenv.lib.optionals jpegSupport [ + ++ lib.optionals jpegSupport [ "--with-jpeg" ] - ++ stdenv.lib.optionals saneSupport [ + ++ lib.optionals saneSupport [ "--with-sane" ] - ++ stdenv.lib.optionals tiffSupport [ + ++ lib.optionals tiffSupport [ "--with-tiff" ] ; @@ -210,8 +212,8 @@ stdenv.mkDerivation rec { 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; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.linux; }; } -- cgit v1.2.3 From 291dabd3d7fb1ac90b62889c1e54354ad49efd3a Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:23:55 +0200 Subject: tv 433Utils: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- tv/5pkgs/rpi/433Utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From d91cf6bfaa62255db5885f078dddfcc29d484a97 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:24:34 +0200 Subject: tv WiringPi: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- tv/5pkgs/rpi/WiringPi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From 4297b6b3bdee73c24903f6c3150436cd1213e92d Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:26:03 +0200 Subject: tv diff-so-fancy: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- tv/5pkgs/simple/diff-so-fancy.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- cgit v1.2.3 From ea902ce405d6ed0e8160bc46d8a03344d1ae3094 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:27:17 +0200 Subject: tv fzmenu: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- tv/5pkgs/simple/fzmenu/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 -- cgit v1.2.3 From 124925bb780bbfdbf3578ad772ea75dbae437242 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:28:38 +0200 Subject: tv hc: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- tv/5pkgs/simple/hc.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From 1462d2e534525792b300136d0071d665db03df86 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:29:38 +0200 Subject: tv rox-filer: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- tv/5pkgs/simple/rox-filer.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 ]; -- cgit v1.2.3 From 24aa4fc14673adfd419e7219eebfb0eb39c19ce4 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:30:39 +0200 Subject: shack/worlddomination: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/2configs/shack/worlddomination.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/2configs/shack/worlddomination.nix b/krebs/2configs/shack/worlddomination.nix index 61b72d9a8..4bdb095f1 100644 --- a/krebs/2configs/shack/worlddomination.nix +++ b/krebs/2configs/shack/worlddomination.nix @@ -58,7 +58,7 @@ let src = pkgs.fetchurl { url = "https://pypi.python.org/packages/9c/f6/d839e4b14258d76e74a39810829c13f8dd31de2bfe0915579b2a609d1bbe/aiocoap-0.3.tar.gz"; sha256 = "402d4151db6d8d0b1d66af5b6e10e0de1521decbf12140637e5b8d2aa9c5aef6"; }; propagatedBuildInputs = [ ]; doCheck = false; # 2 errors, dunnolol - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { homepage = ""; license = licenses.mit; description = "Python CoAP library"; @@ -68,7 +68,7 @@ let name = "LinkHeader-0.4.3"; src = pkgs.fetchurl { url = "https://files.pythonhosted.org/packages/27/d4/eb1da743b2dc825e936ef1d9e04356b5701e3a9ea022c7aaffdf4f6b0594/LinkHeader-0.4.3.tar.gz"; sha256 = "7fbbc35c0ba3fbbc530571db7e1c886e7db3d718b29b345848ac9686f21b50c3"; }; propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { + meta = with pkgs.lib; { homepage = ""; license = licenses.bsdOriginal; description = "Parse and format link headers according to RFC 5988 \"Web Linking\""; -- cgit v1.2.3 From 6106fe993d5b23ab3ab2b40ea49ae22932d1c00a Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:32:57 +0200 Subject: airdcpp-webclient: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/airdcpp-webclient/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/airdcpp-webclient/default.nix b/krebs/5pkgs/simple/airdcpp-webclient/default.nix index 2bc6cdca9..754fecf9c 100644 --- a/krebs/5pkgs/simple/airdcpp-webclient/default.nix +++ b/krebs/5pkgs/simple/airdcpp-webclient/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, which +{ fetchurl, lib, makeWrapper, stdenv +, which }: stdenv.mkDerivation rec { name = "airdcpp-webclient-${version}"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeWrapper ]; - meta = with stdenv.lib; { + meta = with lib; { # to start it: airdcpp -p= -c= --configure description = "dcpp client (statically precompiled)"; homepage = http://fixme; -- cgit v1.2.3 From 4ec068373a0fba511a3ebddad35fac9e5a4c4ced Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:33:55 +0200 Subject: cac-api: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/cac-api/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/cac-api/default.nix b/krebs/5pkgs/simple/cac-api/default.nix index e2bd8c148..5f37f6682 100644 --- a/krebs/5pkgs/simple/cac-api/default.nix +++ b/krebs/5pkgs/simple/cac-api/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchgit, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass, ... }: +{ fetchgit, lib, stdenv +, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass +}: stdenv.mkDerivation { name = "cac-api-1.1.2"; @@ -18,7 +20,7 @@ stdenv.mkDerivation { mkdir -p $out/bin { cat <<\EOF #! ${dash}/bin/dash - export PATH=${stdenv.lib.makeBinPath [ + export PATH=${lib.makeBinPath [ bc coreutils curl -- cgit v1.2.3 From 51b94e51008ee17ee5e4754e451083fc1d31bcd6 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 00:34:31 +0200 Subject: dic: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/dic/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/dic/default.nix b/krebs/5pkgs/simple/dic/default.nix index a74899630..1825e4ee7 100644 --- a/krebs/5pkgs/simple/dic/default.nix +++ b/krebs/5pkgs/simple/dic/default.nix @@ -1,4 +1,6 @@ -{ coreutils, curl, fetchgit, gnugrep, gnused, stdenv, utillinux }: +{ fetchgit, lib, stdenv +, coreutils, curl, gnugrep, gnused, utillinux +}: stdenv.mkDerivation { name = "dic"; @@ -16,7 +18,7 @@ stdenv.mkDerivation { installPhase = let - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ coreutils curl gnused -- cgit v1.2.3 From ad49be2ed59d45295321227a8619514ea5186e0f Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:17:34 +0200 Subject: drivedroid-gen-repo: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/drivedroid-gen-repo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix b/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix index de8046c4a..dee96d784 100644 --- a/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix +++ b/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix @@ -1,10 +1,10 @@ -{stdenv,fetchurl,pkgs,python3Packages, ... }: +{ fetchurl, lib, stdenv, python3Packages }: python3Packages.buildPythonPackage rec { name = "drivedroid-gen-repo-${version}"; version = "0.4.4"; - propagatedBuildInputs = with pkgs;[ + propagatedBuildInputs = [ python3Packages.docopt ]; @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { meta = { homepage = http://krebsco.de/; description = "Generate Drivedroid repos"; - license = stdenv.lib.licenses.wtfpl; + license = lib.licenses.wtfpl; }; } -- cgit v1.2.3 From 935355a0af2717e1ba07cf55f530ec3e36a45cfd Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:18:07 +0200 Subject: ftb: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/ftb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/ftb/default.nix b/krebs/5pkgs/simple/ftb/default.nix index ab7d6e651..8007eaa52 100644 --- a/krebs/5pkgs/simple/ftb/default.nix +++ b/krebs/5pkgs/simple/ftb/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl +{ fetchurl, lib, stdenv , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm , openjdk , mesa_glu, openal , useAlsa ? false, alsaOss ? null }: -with stdenv.lib; +with lib; assert useAlsa -> alsaOss != null; -- cgit v1.2.3 From b6aac83d6ea510a4de3476626ee7190c72156137 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:18:49 +0200 Subject: get: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/get/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/get/default.nix b/krebs/5pkgs/simple/get/default.nix index 83f6b0228..5c024a00d 100644 --- a/krebs/5pkgs/simple/get/default.nix +++ b/krebs/5pkgs/simple/get/default.nix @@ -1,4 +1,6 @@ -{ coreutils, gnugrep, gnused, fetchgit, jq, nix, stdenv, ... }: +{ fetchgit, lib, stdenv +, coreutils, gnugrep, gnused, jq, nix +}: stdenv.mkDerivation { name = "get-1.4.1"; @@ -16,7 +18,7 @@ stdenv.mkDerivation { installPhase = let - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ coreutils gnugrep gnused -- cgit v1.2.3 From edb81b99e641e6bdb3947b1ff2c682caca8f24c2 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:19:18 +0200 Subject: github-hosts-sync: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/github-hosts-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/github-hosts-sync/default.nix b/krebs/5pkgs/simple/github-hosts-sync/default.nix index fbc48fa3f..60dd58ee7 100644 --- a/krebs/5pkgs/simple/github-hosts-sync/default.nix +++ b/krebs/5pkgs/simple/github-hosts-sync/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, ... }: +{ lib, pkgs, stdenv }: stdenv.mkDerivation rec { name = "github-hosts-sync-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ pkgs.git pkgs.nettools pkgs.openssh -- cgit v1.2.3 From e5aafcc72305dda83e879721cd1678cdc5816597 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:19:52 +0200 Subject: internetarchive: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/internetarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/internetarchive/default.nix b/krebs/5pkgs/simple/internetarchive/default.nix index 3c83093be..dfe93befd 100644 --- a/krebs/5pkgs/simple/internetarchive/default.nix +++ b/krebs/5pkgs/simple/internetarchive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, ... }: +{ lib, pkgs, stdenv, pkgs }: with pkgs.python3Packages; buildPythonPackage rec { pname = "internetarchive"; @@ -32,7 +32,7 @@ buildPythonPackage rec { sed -i "s/'schema.*'/'schema>=0.4.0'/" setup.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "python library and cli for uploading files to internet archive"; license = licenses.agpl3; }; -- cgit v1.2.3 From 7867885f3918b18c5254a596d63ec8f612fdadfa Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:20:36 +0200 Subject: passwdqc-utils: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/passwdqc-utils/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/krebs/5pkgs/simple/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix index 53e7f5482..4cc8d5b21 100644 --- a/krebs/5pkgs/simple/passwdqc-utils/default.nix +++ b/krebs/5pkgs/simple/passwdqc-utils/default.nix @@ -1,7 +1,7 @@ -{ stdenv, pam, - fetchurl, lib, - wordset-file ? null, # set your own wordset-file - ... }: +{ fetchurl, lib, stdenv +, pam +, wordset-file ? null, # set your own wordset-file +}: stdenv.mkDerivation rec { name = "passwdqc-utils-${version}"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "passwdqc utils (pwqgen,pwqcheck) and library"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.makefu ]; - patforms = stdenv.lib.platforms.linux; # more installFlags must be set for Darwin,Solaris + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.makefu ]; + patforms = lib.platforms.linux; # more installFlags must be set for Darwin,Solaris }; } -- cgit v1.2.3 From 7ea3136475c614d0b717f86f696dc7e414c30adf Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:30:52 +0200 Subject: populate: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/populate/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix index e35423b49..ef9ff04bf 100644 --- a/krebs/5pkgs/simple/populate/default.nix +++ b/krebs/5pkgs/simple/populate/default.nix @@ -1,8 +1,9 @@ -{ coreutils, fetchgit, findutils, git, gnused, jq, openssh, pass, rsync, stdenv +{ fetchgit, lib, stdenv +, coreutils, findutils, git, gnused, jq, openssh, pass, rsync }: let - PATH = stdenv.lib.makeBinPath [ + PATH = lib.makeBinPath [ coreutils findutils git -- cgit v1.2.3 From cb11e10d956d520bd724d427ae63832243b7f431 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:32:00 +0200 Subject: slog: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/slog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/slog/default.nix b/krebs/5pkgs/simple/slog/default.nix index c74a2ad80..bd10bac5e 100644 --- a/krebs/5pkgs/simple/slog/default.nix +++ b/krebs/5pkgs/simple/slog/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub }: +{ fetchFromGitHub, lib, pkgs, stdenv }: ## use with: # . $(command -v slog.sh) @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -m755 slog.sh $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "POSIX shell logging"; license = licenses.mit; }; -- cgit v1.2.3 From 842bb7a98ad8b7cca3b64554fb44b7d355910456 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:32:40 +0200 Subject: ssh-audit: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/ssh-audit.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/5pkgs/simple/ssh-audit.nix b/krebs/5pkgs/simple/ssh-audit.nix index 7d2e6fb34..4574eb644 100644 --- a/krebs/5pkgs/simple/ssh-audit.nix +++ b/krebs/5pkgs/simple/ssh-audit.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, python3Packages, stdenv }: +{ fetchFromGitHub, lib, python3Packages, stdenv }: python3Packages.buildPythonPackage rec { inherit (meta) version; @@ -46,9 +46,9 @@ python3Packages.buildPythonPackage rec { meta = { description = "tool for ssh server auditing"; homepage = "https://github.com/arthepsy/ssh-audit"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; maintainers = [ - stdenv.lib.maintainers.tv + lib.maintainers.tv ]; version = "1.7.0"; }; -- cgit v1.2.3 From 5b83edb2a526b35f4814d71701a52fe8bf0eff76 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:33:24 +0200 Subject: tinc_graphs: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/tinc_graphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/tinc_graphs/default.nix b/krebs/5pkgs/simple/tinc_graphs/default.nix index 025e85df0..d281c9b50 100644 --- a/krebs/5pkgs/simple/tinc_graphs/default.nix +++ b/krebs/5pkgs/simple/tinc_graphs/default.nix @@ -1,4 +1,4 @@ -{stdenv,fetchurl,pkgs,python3Packages, ... }: +{ fetchurl, lib, pkgs, python3Packages, stdenv }: python3Packages.buildPythonPackage rec { name = "tinc_graphs-${version}"; @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { meta = { homepage = http://krebsco.de/; description = "Create Graphs from Tinc Stats"; - license = stdenv.lib.licenses.wtfpl; + license = lib.licenses.wtfpl; }; } -- cgit v1.2.3 From 7e045768bf86f31ecbfd5c5e5289d582632002a8 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:34:03 +0200 Subject: translate-shell: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/translate-shell/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/krebs/5pkgs/simple/translate-shell/default.nix b/krebs/5pkgs/simple/translate-shell/default.nix index 00ab226e5..cd698a2bd 100644 --- a/krebs/5pkgs/simple/translate-shell/default.nix +++ b/krebs/5pkgs/simple/translate-shell/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl,pkgs,... }: +{ fetchurl, lib, pkgs, stdenv }: let s = rec { @@ -8,7 +8,7 @@ let url=https://github.com/soimort/translate-shell/archive/v0.9.0.9.tar.gz; sha256="1269j4yr9dr1d8c5kmysbzfplbgdg8apqnzs5w57d29sd7gz2i34"; }; - searchpath = with pkgs; stdenv.lib.makeSearchPath "bin" [ + searchpath = with pkgs; lib.makeSearchPath "bin" [ fribidi gawk bash @@ -35,9 +35,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''translate using google api''; - license = stdenv.lib.licenses.free; - maintainers = [stdenv.lib.maintainers.makefu]; - platforms = stdenv.lib.platforms.linux ; + license = lib.licenses.free; + maintainers = [ lib.maintainers.makefu ]; + platforms = lib.platforms.linux ; }; } -- cgit v1.2.3 From 5c613bd73a1d91ee3d08d62950bf86822f4fece6 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:34:43 +0200 Subject: whatsupnix: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/simple/whatsupnix/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/whatsupnix/default.nix b/krebs/5pkgs/simple/whatsupnix/default.nix index 62ef597c8..61972bb05 100644 --- a/krebs/5pkgs/simple/whatsupnix/default.nix +++ b/krebs/5pkgs/simple/whatsupnix/default.nix @@ -1,4 +1,6 @@ -{ bash, coreutils, gawk, makeWrapper, nix, openssh, stdenv }: +{ lib, makeWrapper, stdenv +, bash, coreutils, gawk, nix, openssh +}: stdenv.mkDerivation { name = "whatsupnix"; @@ -8,7 +10,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cat - ${./whatsupnix.bash} > $out/bin/whatsupnix <<\EOF #! ${bash}/bin/bash - export PATH=${stdenv.lib.makeBinPath [ coreutils gawk nix openssh ]} + export PATH=${lib.makeBinPath [ coreutils gawk nix openssh ]} EOF chmod +x $out/bin/whatsupnix ''; -- cgit v1.2.3 From 12dbb95b1b6d74addc0d9d70e599a56af60c3bea Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:35:56 +0200 Subject: infest-cac-centos7: stdenv.lib -> lib Deprecated since nixpkgs 21.05 --- krebs/5pkgs/test/infest-cac-centos7/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/krebs/5pkgs/test/infest-cac-centos7/default.nix b/krebs/5pkgs/test/infest-cac-centos7/default.nix index 9b14bf486..c3fc0ee2b 100644 --- a/krebs/5pkgs/test/infest-cac-centos7/default.nix +++ b/krebs/5pkgs/test/infest-cac-centos7/default.nix @@ -1,6 +1,6 @@ -{ stdenv, coreutils, makeWrapper, - cac-api, cac-cert, cac-panel, gnumake, gnused, jq, openssh, sshpass, proot, - ... }: +{ lib, makeWrapper, stdenv +, cac-api, cac-cert, cac-panel, coreutils, gnumake, gnused, jq, openssh, proot, sshpass +}: stdenv.mkDerivation rec { name = "${shortname}-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - path = stdenv.lib.makeSearchPath "bin" [ + path = lib.makeSearchPath "bin" [ coreutils cac-api cac-panel @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { --set REQUESTS_CA_BUNDLE ${cac-cert} \ --set SSL_CERT_FILE ${cac-cert} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://krebsco.de; description = "infest a CaC box with stockholm"; license = licenses.wtfpl; -- cgit v1.2.3 From c4c40afca5cd83917376804ae6e8259cbfc571d9 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Jun 2021 01:06:58 +0200 Subject: flameshot: add imgur patch for 0.9.0 For nixpkgs 21.05 --- krebs/5pkgs/override/default.nix | 46 ++++------------------ .../override/flameshot/flameshot_imgur_0.6.0.patch | 34 ++++++++++++++++ .../override/flameshot/flameshot_imgur_0.9.0.patch | 35 ++++++++++++++++ 3 files changed, 77 insertions(+), 38 deletions(-) create mode 100644 krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch create mode 100644 krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch diff --git a/krebs/5pkgs/override/default.nix b/krebs/5pkgs/override/default.nix index 926e9dccd..4cb6a1cb4 100644 --- a/krebs/5pkgs/override/default.nix +++ b/krebs/5pkgs/override/default.nix @@ -11,44 +11,14 @@ self: super: { }); flameshot = super.flameshot.overrideAttrs (old: rec { - patches = old.patches or [] ++ [ - (self.writeText "flameshot-imgur.patch" /* diff */ '' ---- a/src/tools/imgur/imguruploader.cpp -+++ b/src/tools/imgur/imguruploader.cpp -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) : - QWidget(parent), m_pixmap(capture) -@@ -74,7 +75,10 @@ void ImgurUploader::handleReply(QNetworkReply *reply) { - QJsonObject json = response.object(); - QJsonObject data = json["data"].toObject(); - m_imageURL.setUrl(data["link"].toString()); -- m_deleteImageURL.setUrl(QString("https://imgur.com/delete/%1").arg( -+ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL"); -+ if (deleteImageURLPattern == NULL) -+ deleteImageURLPattern = "https://imgur.com/delete/%1"; -+ m_deleteImageURL.setUrl(QString(deleteImageURLPattern).arg( - data["deletehash"].toString())); - onUploadOk(); - } else { -@@ -105,7 +109,10 @@ void ImgurUploader::upload() { - QString description = FileNameHandler().parsedPattern(); - urlQuery.addQueryItem("description", description); - -- QUrl url("https://api.imgur.com/3/image"); -+ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL"); -+ if (createImageURLPattern == NULL) -+ createImageURLPattern = "https://api.imgur.com/3/image"; -+ QUrl url(createImageURLPattern); - url.setQuery(urlQuery); - QNetworkRequest request(url); - request.setHeader(QNetworkRequest::ContentTypeHeader, - '') - ]; + patches = old.patches or [] ++ { + "0.6.0" = [ + ./flameshot/flameshot_imgur_0.6.0.patch + ]; + "0.9.0" = [ + ./flameshot/flameshot_imgur_0.9.0.patch + ]; + }.${old.version}; }); # https://github.com/proot-me/PRoot/issues/106 diff --git a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch new file mode 100644 index 000000000..92023554a --- /dev/null +++ b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch @@ -0,0 +1,34 @@ +--- a/src/tools/imgur/imguruploader.cpp ++++ b/src/tools/imgur/imguruploader.cpp +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) : + QWidget(parent), m_pixmap(capture) +@@ -74,7 +75,10 @@ void ImgurUploader::handleReply(QNetworkReply *reply) { + QJsonObject json = response.object(); + QJsonObject data = json["data"].toObject(); + m_imageURL.setUrl(data["link"].toString()); +- m_deleteImageURL.setUrl(QString("https://imgur.com/delete/%1").arg( ++ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL"); ++ if (deleteImageURLPattern == NULL) ++ deleteImageURLPattern = "https://imgur.com/delete/%1"; ++ m_deleteImageURL.setUrl(QString(deleteImageURLPattern).arg( + data["deletehash"].toString())); + onUploadOk(); + } else { +@@ -105,7 +109,10 @@ void ImgurUploader::upload() { + QString description = FileNameHandler().parsedPattern(); + urlQuery.addQueryItem("description", description); + +- QUrl url("https://api.imgur.com/3/image"); ++ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL"); ++ if (createImageURLPattern == NULL) ++ createImageURLPattern = "https://api.imgur.com/3/image"; ++ QUrl url(createImageURLPattern); + url.setQuery(urlQuery); + QNetworkRequest request(url); + request.setHeader(QNetworkRequest::ContentTypeHeader, diff --git a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch new file mode 100644 index 000000000..c4c0bf38a --- /dev/null +++ b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch @@ -0,0 +1,35 @@ +--- a/src/tools/imgur/imguruploader.cpp ++++ b/src/tools/imgur/imguruploader.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent) + : QWidget(parent) +@@ -79,8 +80,11 @@ void ImgurUploader::handleReply(QNetworkReply* reply) + m_imageURL.setUrl(data[QStringLiteral("link")].toString()); + + auto deleteToken = data[QStringLiteral("deletehash")].toString(); ++ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL"); ++ if (deleteImageURLPattern == NULL) ++ deleteImageURLPattern = "https://imgur.com/delete/%1"; + m_deleteImageURL.setUrl( +- QStringLiteral("https://imgur.com/delete/%1").arg(deleteToken)); ++ QString::fromUtf8(deleteImageURLPattern).arg(deleteToken)); + + // save history + QString imageName = m_imageURL.toString(); +@@ -133,7 +137,10 @@ void ImgurUploader::upload() + QString description = FileNameHandler().parsedPattern(); + urlQuery.addQueryItem(QStringLiteral("description"), description); + +- QUrl url(QStringLiteral("https://api.imgur.com/3/image")); ++ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL"); ++ if (createImageURLPattern == NULL) ++ createImageURLPattern = "https://api.imgur.com/3/image"; ++ QUrl url(QString::fromUtf8(createImageURLPattern)); + url.setQuery(urlQuery); + QNetworkRequest request(url); + request.setHeader(QNetworkRequest::ContentTypeHeader, -- cgit v1.2.3 From d4c67bfb14f48ef8783284d4079191ae10982137 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 3 Jun 2021 19:44:48 +0200 Subject: nixpkgs: 33824cd -> eaba787 --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 06b865cc8..803b11d32 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "33824cdf8e4fec30c5b9ddc91b18991c3c375227", - "date": "2021-05-18T19:08:44-04:00", - "path": "/nix/store/s3f1q2a5hn60jdnz8h66z7yahrmzifin-nixpkgs", - "sha256": "1sad0x998k3iid2vp57kv4skvf90yh4gbs61dv3p45c2qi3sql46", + "rev": "eaba7870ffc3400eca4407baa24184b7fe337ec1", + "date": "2021-06-02T10:22:59+02:00", + "path": "/nix/store/lcr7kwnx934b1z6wmb1zlqjycdlbaw9x-nixpkgs", + "sha256": "115disiz4b08iw46cidc7lm0advrxn5g2ldmlrxd53zf03skyb2w", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From 75d139b0bee8a60af81d1477dd1d4f8c4ef5167d Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 3 Jun 2021 19:45:09 +0200 Subject: nixpkgs: 20.09 -> 21.05 --- krebs/update-nixpkgs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/update-nixpkgs.sh b/krebs/update-nixpkgs.sh index 9a0ea7ed4..368a3ecb3 100755 --- a/krebs/update-nixpkgs.sh +++ b/krebs/update-nixpkgs.sh @@ -3,7 +3,7 @@ dir=$(dirname $0) oldrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') nix-shell -p nix-prefetch-git --run 'nix-prefetch-git \ --url https://github.com/NixOS/nixpkgs \ - --rev refs/heads/nixos-20.09' \ + --rev refs/heads/nixos-21.05' \ > $dir/nixpkgs.json newrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') git commit $dir/nixpkgs.json -m "nixpkgs: $oldrev -> $newrev" -- cgit v1.2.3 From a4a29163c5f54006cdf56f1021b594c3bc33f7bf Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 3 Jun 2021 20:02:42 +0200 Subject: l security: remove deprecated hideProcessInformation --- lass/2configs/htop.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lass/2configs/htop.nix b/lass/2configs/htop.nix index d9307347e..629d74235 100644 --- a/lass/2configs/htop.nix +++ b/lass/2configs/htop.nix @@ -3,7 +3,6 @@ with import ; { - security.hideProcessInformation = true; nixpkgs.config.packageOverrides = super: { htop = pkgs.symlinkJoin { name = "htop"; -- cgit v1.2.3 From ddb9edc6eeb66e2c37244e7ab9c58dfa96e39d5d Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 3 Jun 2021 20:15:00 +0200 Subject: l xjail: set isNormalUser --- lass/3modules/xjail.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/3modules/xjail.nix b/lass/3modules/xjail.nix index 37f90ee1c..526e12db7 100644 --- a/lass/3modules/xjail.nix +++ b/lass/3modules/xjail.nix @@ -147,6 +147,7 @@ with import ; useDefaultShell = true; createHome = true; extraGroups = cfg.groups; + isNormalUser = true; } ) config.lass.xjail; -- cgit v1.2.3 From a400657702a75f928aae7ee5328068a3c8331d27 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 3 Jun 2021 20:15:42 +0200 Subject: fetchWallpaper: set isSystemUser --- krebs/3modules/fetchWallpaper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix index e89b86e32..852c8f630 100644 --- a/krebs/3modules/fetchWallpaper.nix +++ b/krebs/3modules/fetchWallpaper.nix @@ -57,6 +57,7 @@ let description = "fetchWallpaper user"; home = cfg.stateDir; createHome = true; + isSystemUser = true; }; systemd.timers.fetchWallpaper = { -- cgit v1.2.3 From 9d7abe58bb842ef59d5a1132ac1d3c4c9eaac98d Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 3 Jun 2021 20:18:42 +0200 Subject: l: set isNormalUser --- lass/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 7b6f01148..2d8da72b4 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -32,6 +32,7 @@ with import ; group = "users"; createHome = true; useDefaultShell = true; + isNormalUser = true; extraGroups = [ "audio" "fuse" -- cgit v1.2.3 From 6068c4f75ba4a371841c22581c022bcf930cc964 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 3 Jun 2021 21:33:42 +0200 Subject: l power-action: set isNormalUser --- lass/2configs/power-action.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lass/2configs/power-action.nix b/lass/2configs/power-action.nix index c7bdb525d..648ffc784 100644 --- a/lass/2configs/power-action.nix +++ b/lass/2configs/power-action.nix @@ -32,9 +32,12 @@ in { user = "lass"; }; - users.users.power-action.extraGroups = [ - "audio" - ]; + users.users.power-action = { + isNormalUser = true; + extraGroups = [ + "audio" + ]; + }; security.sudo.extraConfig = '' ${config.krebs.power-action.user} ALL= (root) NOPASSWD: ${suspend} -- cgit v1.2.3 From 7f74d85f8c0574e281fa247be39949e8e670991f Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 5 Jun 2021 00:39:33 +0200 Subject: tv imagescan-plugin-networkscan: init at 1.1.3 --- tv/5pkgs/simple/imagescan-plugin-networkscan.nix | 55 ++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create 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 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; + }; +} -- cgit v1.2.3 From 42f704a4d9dbe57fa3f5417a4c1d1b6f019b5480 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 5 Jun 2021 00:46:13 +0200 Subject: tv utsushi-customized: use upstream package --- tv/2configs/xp-332.nix | 19 ++-- tv/5pkgs/simple/utsushi.nix | 219 -------------------------------------------- 2 files changed, 8 insertions(+), 230 deletions(-) delete mode 100644 tv/5pkgs/simple/utsushi.nix diff --git a/tv/2configs/xp-332.nix b/tv/2configs/xp-332.nix index a66b884c8..daabe5b6b 100644 --- a/tv/2configs/xp-332.nix +++ b/tv/2configs/xp-332.nix @@ -19,17 +19,14 @@ with import ; packageName pkg == "imagescan-plugin-networkscan"; nixpkgs.overlays = singleton (self: super: { - utsushi-customized = self.utsushi.override { - guiSupport = false; - jpegSupport = false; - networkSupport = true; - ocrSupport = false; - saneSupport = true; - tiffSupport = true; - - logCategory = "ALL"; - logLevel = "BRIEF"; - }; + 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 = { diff --git a/tv/5pkgs/simple/utsushi.nix b/tv/5pkgs/simple/utsushi.nix deleted file mode 100644 index 678cdc56c..000000000 --- a/tv/5pkgs/simple/utsushi.nix +++ /dev/null @@ -1,219 +0,0 @@ -{ fetchurl, lib, stdenv - -, boost, file, imagemagick, libudev, libusb, pkgconfig -, 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${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 = lib.licenses.eapl; - maintainers = [ lib.maintainers.tv ]; - platforms = 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 - - ${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 - ''} - - ${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 - ${lib.optionalString saneSupport '' - add-rpath ${boost}/lib $out/lib/utsushi/sane/libsane-utsushi.so - ''} - ''; - - nativeBuildInputs = [ - add-rpath - pkgconfig - ]; - - buildInputs = [ - boost - imagemagick - libudev - libusb - ] - ++ lib.optional guiSupport gtkmm2 - ++ lib.optional ocrSupport tesseract - ++ lib.optional saneSupport saneBackends - ++ 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" - ] - ++ lib.optionals guiSupport [ - "--with-gtkmm" - ] - ++ lib.optionals jpegSupport [ - "--with-jpeg" - ] - ++ lib.optionals saneSupport [ - "--with-sane" - ] - ++ 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 = lib.licenses.gpl3; - maintainers = [ lib.maintainers.tv ]; - platforms = lib.platforms.linux; - }; -} -- cgit v1.2.3 From a461078f13d01693c0da08eb9fd53612b68170eb Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 5 Jun 2021 11:36:05 +0200 Subject: tv xp-332: update hostname --- tv/2configs/xp-332.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/xp-332.nix b/tv/2configs/xp-332.nix index daabe5b6b..a97fb3679 100644 --- a/tv/2configs/xp-332.nix +++ b/tv/2configs/xp-332.nix @@ -3,7 +3,7 @@ with import ; environment.etc."utsushi.conf".text = '' [devices] - dev1.udi = esci:networkscan://EPSON79678C.fritz.box:1865 + dev1.udi = esci:networkscan://ep.hkw:1865 dev1.model = XP-332 dev1.vendor = EPSON ''; -- cgit v1.2.3 From d854866c188bcc299564f413ddbf89acf3b1b243 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 5 Jun 2021 12:07:43 +0200 Subject: l coaxmetal: update config --- lass/1systems/coaxmetal/config.nix | 40 +++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/lass/1systems/coaxmetal/config.nix b/lass/1systems/coaxmetal/config.nix index 3e0b1674a..4fa22e293 100644 --- a/lass/1systems/coaxmetal/config.nix +++ b/lass/1systems/coaxmetal/config.nix @@ -16,27 +16,36 @@ - + # + +