Merge pull request #64565 from jtobin/master

kjv: init at unstable-2018-12-25
This commit is contained in:
worldofpeace 2019-07-24 17:19:55 -04:00 committed by GitHub
commit 2e869f71a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 0 deletions

View File

@ -2601,6 +2601,11 @@
github = "jraygauthier";
name = "Raymond Gauthier";
};
jtobin = {
email = "jared@jtobin.io";
github = "jtobin";
name = "Jared Tobin";
};
jtojnar = {
email = "jtojnar@gmail.com";
github = "jtojnar";

View File

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, fetchpatch }:
let
patch-base = https://github.com/LukeSmithxyz/kjv/commit/;
add-apocrypha = fetchpatch {
url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch";
sha256 = "0n4sj8p9m10fcair4msc129jxkkx5whqzhjbr5k4lfgp6nb1zk8k";
};
add-install-target = fetchpatch {
url = patch-base + "f4ad73539eb73f1890f4b791d8d38dd95900a4a4.patch";
sha256 = "1yzj72i5fkzn2i4wl09q6jx7nwn2h4jwm49fc23nxfwchzar9m1q";
};
in
stdenv.mkDerivation rec {
pname = "kjv";
version = "unstable-2018-12-25";
src = fetchFromGitHub {
owner = "bontibon";
repo = pname;
rev = "fda81a610e4be0e7c5cf242de655868762dda1d4";
sha256 = "1favfcjvd3pzz1ywwv3pbbxdg7v37s8vplgsz8ag016xqf5ykqqf";
};
patches = [ add-apocrypha add-install-target ];
makeFlags = [
"PREFIX=${placeholder ''out''}"
];
meta = with stdenv.lib; {
description = "The Bible, King James Version";
homepage = "https://github.com/bontibon/kjv";
license = licenses.publicDomain;
maintainers = [ maintainers.jtobin ];
};
}

View File

@ -858,6 +858,8 @@ in
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
kjv = callPackage ../applications/misc/kjv { };
luigi = callPackage ../applications/networking/cluster/luigi { };
m-cli = callPackage ../os-specific/darwin/m-cli { };