public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

certmgr: move selfsigned patch into a separate attribute

Browse Source
This commit is contained in:
Franz Pletz 2019-01-24 12:10:33 +01:00
parent 72eb82b687
commit 016128dd93
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
pkgs/tools/security/certmgr/default.nix
View File

@ -1,33 +1,43 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
buildGoPackage rec { let
version = "1.6.1"; generic = { patches ? [] }:
name = "certmgr-${version}"; buildGoPackage rec {
version = "1.6.1";
name = "certmgr-${version}";
goPackagePath = "github.com/cloudflare/certmgr/"; goPackagePath = "github.com/cloudflare/certmgr/";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudflare"; owner = "cloudflare";
repo = "certmgr"; repo = "certmgr";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ky2pw1wxrb2fxfygg50h0mid5l023x6xz9zj5754a023d01qqr2"; sha256 = "1ky2pw1wxrb2fxfygg50h0mid5l023x6xz9zj5754a023d01qqr2";
}; };
# The following patch makes it possible to use a self-signed x509 cert inherit patches;
# for the cfssl apiserver.
# TODO: remove patch when PR is merged.
patches = [
(fetchpatch {
url = "https://github.com/cloudflare/certmgr/pull/51.patch";
sha256 = "0jhsw159d2mgybvbbn6pmvj4yqr5cwcal5fjwkcn9m4f4zlb6qrs";
})
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://cfssl.org/; homepage = https://cfssl.org/;
description = "Cloudflare's certificate manager"; description = "Cloudflare's certificate manager";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ johanot srhb ]; maintainers = with maintainers; [ johanot srhb ];
};
};
in
{
certmgr = generic {};
certmgr-selfsigned = generic {
# The following patch makes it possible to use a self-signed x509 cert
# for the cfssl apiserver.
# TODO: remove patch when PR is merged.
patches = [
(fetchpatch {
url = "https://github.com/cloudflare/certmgr/pull/51.patch";
sha256 = "0jhsw159d2mgybvbbn6pmvj4yqr5cwcal5fjwkcn9m4f4zlb6qrs";
})
];
}; };
} }

3
pkgs/top-level/all-packages.nix
View File

@ -1877,7 +1877,8 @@ in
}; };
ceph-dev = ceph; ceph-dev = ceph;
certmgr = callPackage ../tools/security/certmgr { }; inherit (callPackages ../tools/security/certmgr { })
certmgr certmgr-selfsigned;
cfdg = callPackage ../tools/graphics/cfdg { cfdg = callPackage ../tools/graphics/cfdg {
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;