From 1207b8ef6bc3f6edd5cfe19380a5ea0de21c2e0e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 12 Mar 2019 21:10:27 +0100
Subject: [PATCH 1/3] tv utsushi: set udev confdir
---
tv/5pkgs/simple/utsushi.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/tv/5pkgs/simple/utsushi.nix b/tv/5pkgs/simple/utsushi.nix
index e61dd188f..db9ef4b1f 100644
--- a/tv/5pkgs/simple/utsushi.nix
+++ b/tv/5pkgs/simple/utsushi.nix
@@ -172,6 +172,7 @@ stdenv.mkDerivation rec {
"--with-boost=${boost}"
"--with-magick"
"--with-magick-pp"
+ "--with-udev-confdir=$(out)/etc/udev"
]
++ stdenv.lib.optionals guiSupport [
"--with-gtkmm"
From 7747478c82f2a456c0dfbf83dedfde96073f60eb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 12 Mar 2019 21:10:05 +0100
Subject: [PATCH 2/3] tv utsushi: 3.48.0 -> 3.54.0
---
tv/5pkgs/simple/utsushi.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tv/5pkgs/simple/utsushi.nix b/tv/5pkgs/simple/utsushi.nix
index db9ef4b1f..55e8800a6 100644
--- a/tv/5pkgs/simple/utsushi.nix
+++ b/tv/5pkgs/simple/utsushi.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${meta.version}.orig.tar.gz";
- sha256 = "12mzq3wc8gzdma84pjs5gb0gp8mga13wax5g7vjfrzq8pjyqrnmw";
+ sha256 = "1gmiimwkcyzbkfr25vzqczjhgh90fgxd96agbnkpf9gah1mpd6qj";
};
preConfigure = ''
@@ -203,6 +203,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.tv ];
platforms = stdenv.lib.platforms.linux;
- version = "3.48.0";
+ version = "3.54.0";
};
}
From 7f57b45d61a5ce784f663c0276cc24df6e19a4fb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 20 Mar 2019 18:29:51 +0100
Subject: [PATCH 3/3] nix-writers: 3.2.0 -> 3.3.0
---
submodules/nix-writers | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/submodules/nix-writers b/submodules/nix-writers
index fc8a3802a..d856f05da 160000
--- a/submodules/nix-writers
+++ b/submodules/nix-writers
@@ -1 +1 @@
-Subproject commit fc8a3802a0777a5f43a9a2fe0f5848ecaeb555a1
+Subproject commit d856f05daff9cd726d1e798f1bb9a18eecbe2f50