Merge branch 'master' into add-missing-licenses

Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus

pkgs/tools/security/ccid/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.27";
+  version = "1.4.29";
   name = "ccid-${version}";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/4218/ccid-1.4.27.tar.bz2";
-    sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56";
+    url = "https://ccid.apdu.fr/files/${name}.tar.bz2";
+    sha256 = "0kdqmbma6sclsrbxy9w85h7cs0v11if4nc2r9v09613k8pl2lhx5";
   };
 
   postPatch = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "ccid drivers for pcsclite";
-    homepage = http://pcsclite.alioth.debian.org/;
+    homepage = https://ccid.apdu.fr/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.linux;

pkgs/tools/security/certmgr/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  version = "1.6.1";
+  name = "certmgr-${version}";
+
+  goPackagePath = "github.com/cloudflare/certmgr/";
+
+  src = fetchFromGitHub {
+    owner = "cloudflare";
+    repo = "certmgr";
+    rev = "v${version}";
+    sha256 = "1ky2pw1wxrb2fxfygg50h0mid5l023x6xz9zj5754a023d01qqr2";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://cfssl.org/;
+    description = "Cloudflare's certificate manager";
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ johanot srhb ];
+  };
+}

pkgs/tools/security/pius/default.nix

@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, pythonPackages, gnupg }:
+{ fetchFromGitHub, stdenv, pythonPackages, gnupg, perl }:
 
 let version = "2.2.6"; in
 pythonPackages.buildPythonApplication {
@@ -18,6 +18,8 @@ pythonPackages.buildPythonApplication {
     done
   '';
 
+  buildInputs = [ perl ];
+
   meta = {
     homepage = https://www.phildev.net/pius/;