diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-09-24 12:07:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 12:07:56 +0100 |
| commit | cbdfc16b984c5cc85909bbd0b70280fe53f086bb (patch) | |
| tree | 393cbf0c7c1e9f7d2d3265dd0fbd5471ed7a5eee /pkgs/servers/sks | |
| parent | a78925d568e884da7e7812bed09e02c750e8d3b0 (diff) | |
| parent | a1d9d4ea21ce9b134931d6387c824ec3d73042b7 (diff) | |
Merge pull request #117032 from sternenseemann/sks-newer-ocaml
sks: 1.1.6 -> unstable-2021-02-04; use ocaml 4.10
Diffstat (limited to 'pkgs/servers/sks')
| -rw-r--r-- | pkgs/servers/sks/default.nix | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index 05c4c9fcfdad3..0f21690bbee3d 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -1,22 +1,36 @@ -{ lib, stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, perl +, zlib, db +}: + +let + inherit (ocamlPackages) + ocaml + findlib + cryptokit + num + ; +in stdenv.mkDerivation rec { pname = "sks"; - version = "1.1.6"; + version = "unstable-2021-02-04"; - src = fetchFromBitbucket { - owner = "skskeyserver"; + src = fetchFromGitHub { + owner = "SKS-Keyserver"; repo = "sks-keyserver"; - rev = version; - sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; + rev = "c3ba6d5abb525dcb84745245631c410c11c07ec1"; + sha256 = "0fql07sc69hv6jy7x5svb19977cdsz0p1j8wv53k045a6v7rw1jw"; }; # pkgs.db provides db_stat, not db$major.$minor_stat - patches = [ ./adapt-to-nixos.patch ]; + patches = [ + ./adapt-to-nixos.patch + ]; outputs = [ "out" "webSamples" ]; - buildInputs = [ ocaml zlib db perl camlp4 ]; + nativeBuildInputs = [ ocaml findlib perl ]; + buildInputs = [ zlib db cryptokit num ]; makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; preConfigure = '' @@ -44,7 +58,7 @@ stdenv.mkDerivation rec { spotty connectivity, can fully synchronize with rest of the system. ''; inherit (src.meta) homepage; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin ]; }; |