ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117032 from sternenseemann/sks-newer-ocaml

Browse Source 
sks: 1.1.6 -> unstable-2021-02-04; use ocaml 4.10
This commit is contained in:
Jörg Thalheim 2021-09-24 12:07:56 +01:00 committed by GitHub
commit cbdfc16b98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/servers/sks/default.nix
View File

@ -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 ];
};

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

@ -9119,7 +9119,7 @@ with pkgs;
skippy-xd = callPackage ../tools/X11/skippy-xd {};
sks = callPackage ../servers/sks { inherit (ocaml-ng.ocamlPackages_4_02) ocaml camlp4; };
sks = callPackage ../servers/sks { };
skydns = callPackage ../servers/skydns { };