From 0f0b20ac0cad34a86acdc9c04cad4008d4828159 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Sep 2015 12:45:03 +0200 Subject: [PATCH] eid-mw: 4.1.5 -> 4.1.6 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- pkgs/tools/security/eid-mw/eid-nssdb.in | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index c814e7094a9f..fbb8f0321ef9 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite , pkgconfig }: -let version = "4.1.5"; in +let version = "4.1.6"; in stdenv.mkDerivation { name = "eid-mw-${version}"; src = fetchFromGitHub { - sha256 = "0m2awjfj2vs3aahy1ygrxi7mx12bhr1a621kiiszzai38crpgwbj"; + sha256 = "006s7093wqmk36mrlakjv89bqddyh599rvmgv0zgsp15vf9160zi"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/eid-mw/eid-nssdb.in b/pkgs/tools/security/eid-mw/eid-nssdb.in index 934c0256da78..fc05a20a6758 100644 --- a/pkgs/tools/security/eid-mw/eid-nssdb.in +++ b/pkgs/tools/security/eid-mw/eid-nssdb.in @@ -59,6 +59,9 @@ fi dbdir="sql:$dbdir" +echo "NSS database: $dbdir" +echo "BEID library: $libfile" + case "$1" in add) echo "Adding $dbentry to database:" modutil -dbdir "$dbdir" -add "$dbentry" -libfile "$libfile" || @@ -75,9 +78,6 @@ esac ret=$? -echo "NSS database: $dbdir" -echo "BEID library: $libfile" - modutil -dbdir "$dbdir" -list "$dbentry" 2>/dev/null exit $ret