about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-12-25 14:38:16 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-12-26 19:50:17 +0100
commitf3048aed1d8b1461a89a2fcd60e7d2994d80d429 (patch)
treefa9e337731f3910729c507e6195d2d64e91fcde2
parentd623916494772649d8868f496210605544024a17 (diff)
downloadnixlib-f3048aed1d8b1461a89a2fcd60e7d2994d80d429.tar
nixlib-f3048aed1d8b1461a89a2fcd60e7d2994d80d429.tar.gz
nixlib-f3048aed1d8b1461a89a2fcd60e7d2994d80d429.tar.bz2
nixlib-f3048aed1d8b1461a89a2fcd60e7d2994d80d429.tar.lz
nixlib-f3048aed1d8b1461a89a2fcd60e7d2994d80d429.tar.xz
nixlib-f3048aed1d8b1461a89a2fcd60e7d2994d80d429.tar.zst
nixlib-f3048aed1d8b1461a89a2fcd60e7d2994d80d429.zip
eid-viewer: 4.1.4 -> 4.1.9
-rw-r--r--pkgs/tools/security/eid-viewer/default.nix16
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index c96632537615..ac6dee4beaa3 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -1,16 +1,12 @@
-{ stdenv, fetchurl, jre, makeWrapper, pcsclite }:
-
-let
-  # TODO: find out what the version components actually mean, if anything:
-  major = "4.1.4-v4.1.4";
-  minor = "tcm406-270732";
-  version = "${major}-${minor}";
-in stdenv.mkDerivation rec {
+{ stdenv, fetchurl, makeWrapper, jre, pcsclite }:
+
+let version = "4.1.9"; in
+stdenv.mkDerivation rec {
   name = "eid-viewer-${version}";
 
   src = fetchurl {
-    url = "http://eid.belgium.be/en/binaries/eid-viewer-${major}.src.tar_${minor}.gz";
-    sha256 = "06kda45y7c3wvvqby153zcasgz4jibjypv8gvfwvrwvn4ag2z934";
+    url = "https://downloads.services.belgium.be/eid/eid-viewer-${version}-v${version}.src.tar.gz";
+    sha256 = "0bq9jl4kl97j0dfhz4crcb1wqhn420z5vpg510zadvrmqjhy1x4g";
   };
 
   buildInputs = [ jre pcsclite ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index baadc405537c..c8def0b907a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17993,8 +17993,6 @@ in modules // {
 
     propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ];
     buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite libvpx ];
-
-    doCheck = false;
   };