From 04f6ca5b5cb85675bc7b0c89279c26d59f33e8f0 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 8 Apr 2019 19:05:25 +0200 Subject: tv pulse: use pkgs.pkgsi686Linux --- tv/2configs/pulse.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix index 2e679bd..ea39701 100644 --- a/tv/2configs/pulse.nix +++ b/tv/2configs/pulse.nix @@ -1,10 +1,12 @@ -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs, ... }: with import ; let pkg = pkgs.pulseaudioLight; runDir = "/run/pulse"; + pkgs_i686 = pkgs.pkgsi686Linux; + support32Bit = pkgs.stdenv.isx86_64 && pkgs_i686.alsaLib != null && -- cgit v1.2.3 From 09ecf0deedb17da9adb2875aa6222e9456036466 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 8 Apr 2019 19:30:06 +0200 Subject: tv mail-client: kill alot due to python 2 relation --- tv/2configs/mail-client.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/tv/2configs/mail-client.nix b/tv/2configs/mail-client.nix index 0caf526..fc8fc81 100644 --- a/tv/2configs/mail-client.nix +++ b/tv/2configs/mail-client.nix @@ -3,7 +3,6 @@ pkgs.haskellPackages.much pkgs.msmtp pkgs.notmuch - pkgs.pythonPackages.alot pkgs.qprint pkgs.w3m ]; -- cgit v1.2.3 From 513444e93d3854fef70b7c80e5c254dfd0bf87d8 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 8 Apr 2019 19:05:25 +0200 Subject: tv pulse: use pkgs.pkgsi686Linux --- tv/2configs/pulse.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix index 2e679bd..ea39701 100644 --- a/tv/2configs/pulse.nix +++ b/tv/2configs/pulse.nix @@ -1,10 +1,12 @@ -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs, ... }: with import ; let pkg = pkgs.pulseaudioLight; runDir = "/run/pulse"; + pkgs_i686 = pkgs.pkgsi686Linux; + support32Bit = pkgs.stdenv.isx86_64 && pkgs_i686.alsaLib != null && -- cgit v1.2.3 From 3af43eda89b433fd59e3e2b4ac7b24a62f19c5ec Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Apr 2019 20:28:11 +0200 Subject: tv pass: add 19.03 compatibility --- tv/5pkgs/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 605d827..8f960dd 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -45,10 +45,9 @@ foldl' mergeAttrs {} self.callPackage ./compat/18.03/pass { pass-otp = self.callPackage ./compat/18.03/pass-otp {}; }; - "18.09" = + }.${versions.majorMinor nixpkgsVersion} or super.pass.withExtensions (ext: [ ext.pass-otp ]); - }.${versions.majorMinor nixpkgsVersion}; } -- cgit v1.2.3 From f1169b8e71c61106be4e9bb1d4df7bbd590837fe Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 13 Apr 2019 12:28:47 +0200 Subject: tv utsushi: 3.54.0 -> 3.55.0 --- tv/5pkgs/simple/utsushi.nix | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/tv/5pkgs/simple/utsushi.nix b/tv/5pkgs/simple/utsushi.nix index 55e8800..0ae4ed8 100644 --- a/tv/5pkgs/simple/utsushi.nix +++ b/tv/5pkgs/simple/utsushi.nix @@ -51,13 +51,19 @@ let src = if stdenv.system == "i686-linux" then fetchurl { - url = "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-9-1.3.21.x86.deb.tar.gz"; - sha256 = "16xv1pdfm2ryis815fawb7zqg6c4swww726g272ssx044r5dp80r"; + urls = [ + "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x86/imagescan-bundle-debian-9-3.55.0.x86.deb.tar.gz" + "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-9-3.55.0.x86.deb.tar.gz" + ]; + sha256 = "12syk4y8z22hm9r1lgxqp81vd24jbqgmq83b7yiyqfd4wfxb6k3s"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-9-1.3.21.x64.deb.tar.gz"; - sha256 = "0zik35h2jwrvkwcmq55wc72imidwdnmn1bayhypzhjcz61rasjg2"; + urls = [ + "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-9-3.55.0.x64.deb.tar.gz" + "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-9-3.55.0.x64.deb.tar.gz" + ]; + sha256 = "1wp372hqhzdar6ldxy7s9js2s872x8c5nwq3608dwg9gca11ppc5"; } else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; @@ -92,7 +98,7 @@ let license = stdenv.lib.licenses.eapl; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.linux; - version = "1.1.0"; + version = "1.1.2"; }; }; @@ -102,8 +108,11 @@ stdenv.mkDerivation rec { name = "utsushi-${meta.version}"; src = fetchurl { - url = "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${meta.version}.orig.tar.gz"; - sha256 = "1gmiimwkcyzbkfr25vzqczjhgh90fgxd96agbnkpf9gah1mpd6qj"; + urls = [ + "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${meta.version}.orig.tar.gz" + "http://ni.r/~tv/mirrors/epson/imagescan_${meta.version}.orig.tar.gz" + ]; + sha256 = "0xwl4xp07cigslbi1qc52jsjvxcyvjlx54g812mn7211p01v2h4l"; }; preConfigure = '' @@ -203,6 +212,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.linux; - version = "3.54.0"; + version = "3.55.0"; }; } -- cgit v1.2.3 From f0c85f305f662b96033dbbe896e399e5a58a28dd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 13 Apr 2019 14:06:36 +0200 Subject: types.syncthing.id: string -> str --- lib/types.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 9001bc7..23919af 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -89,7 +89,7 @@ rec { syncthing.id = mkOption { # TODO syncthing id type - type = nullOr string; + type = nullOr str; default = null; }; }; -- cgit v1.2.3 From 6af3ac9271d9e082351f3e043301fc4b00188900 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 17 Apr 2019 20:19:12 +0200 Subject: =?UTF-8?q?lib:=20POSIX.1=E2=80=902013=20->=20POSIX.1=E2=80=902017?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/types.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 23919af..2efa5a6 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -542,21 +542,21 @@ rec { merge = mergeOneOption; }; - # POSIX.1‐2013, 3.278 Portable Filename Character Set + # POSIX.1‐2017, 3.281 Portable Filename filename = mkOptionType { - name = "POSIX filename"; + name = "POSIX portable filename"; check = test "[0-9A-Za-z._][0-9A-Za-z._-]*"; merge = mergeOneOption; }; - # POSIX.1‐2013, 3.2 Absolute Pathname + # POSIX.1‐2017, 3.2 Absolute Pathname absolute-pathname = mkOptionType { name = "POSIX absolute pathname"; check = x: isString x && substring 0 1 x == "/" && pathname.check x; merge = mergeOneOption; }; - # POSIX.1‐2013, 3.267 Pathname + # POSIX.1-2017, 3.271 Pathname pathname = mkOptionType { name = "POSIX pathname"; check = x: @@ -570,9 +570,9 @@ rec { merge = mergeOneOption; }; - # POSIX.1-2013, 3.431 User Name + # POSIX.1-2017, 3.216 Login Name username = mkOptionType { - name = "POSIX username"; + name = "POSIX login name"; check = filename.check; merge = mergeOneOption; }; -- cgit v1.2.3 From 7104abdb98661ba4831871112b6e03f6ee0d3c96 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 17 Apr 2019 20:19:39 +0200 Subject: =?UTF-8?q?lib:=20add=20POSIX.1=E2=80=902017,=203.190=20Group=20Na?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/types.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index 2efa5a6..ffae8c7 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -542,6 +542,13 @@ rec { merge = mergeOneOption; }; + # POSIX.1‐2017, 3.190 Group Name + groupname = mkOptionType { + name = "POSIX group name"; + check = filename.check; + merge = mergeOneOption; + }; + # POSIX.1‐2017, 3.281 Portable Filename filename = mkOptionType { name = "POSIX portable filename"; -- cgit v1.2.3