Merge pull request #121476 from siraben/knightos-updates

knightos-mkrom : 1.0.3 -> 1.0.4, knightos-scas: 0.5.3 -> 0.5.5
This commit is contained in:
Daniël de Kok 2021-05-02 12:43:37 +02:00 committed by GitHub
commit 219cbedb69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions

View File

@ -1,25 +1,27 @@
{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }:
{ lib, stdenv, fetchFromGitHub, libxslt, asciidoc }:
stdenv.mkDerivation rec {
pname = "mkrom";
version = "1.0.3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "mkrom";
rev = version;
sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2";
sha256 = "sha256-YFrh0tOGiM90uvU9ZWopW1+9buHDQtetuOtPDSYYaXw=";
};
strictDeps = true;
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
nativeBuildInputs = [ asciidoc libxslt.bin ];
hardeningDisable = [ "format" ];
installFlags = [ "DESTDIR=$(out)" ];
installTargets = [ "install" "install_man" ];
meta = with lib; {
homepage = "https://knightos.org/";
description = "Packages KnightOS distribution files into a ROM";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
platforms = platforms.all;
};
}

View File

@ -2,14 +2,13 @@
stdenv.mkDerivation rec {
pname = "scas";
version = "0.5.3";
version = "0.5.5";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "scas";
rev = version;
sha256 = "0z6r07cl92kq860ddas5p88l990ih9cfqlzy5y4mk5hrmjzya60j";
sha256 = "sha256-JGQE+orVDKKJsTt8sIjPX+3yhpZkujISroQ6g19+MzU=";
};
cmakeFlags = [ "-DSCAS_LIBRARY=1" ];