Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2432fb6b5a13
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: acb7c0e8114b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 21, 2020

  1. mkrom: init at 1.0.1

    siraben authored and danieldk committed Aug 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    equirosa Eduardo Quirós
    Copy the full SHA
    8c22c88 View commit details
  2. Merge pull request #95842 from siraben/mkrom

    mkrom: init at 1.0.1
    danieldk authored Aug 21, 2020
    Copy the full SHA
    acb7c0e View commit details
Showing with 31 additions and 0 deletions.
  1. +27 −0 pkgs/development/tools/misc/mkrom/default.nix
  2. +4 −0 pkgs/top-level/all-packages.nix
27 changes: 27 additions & 0 deletions pkgs/development/tools/misc/mkrom/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, cmake, asciidoc }:

stdenv.mkDerivation rec {
pname = "mkrom";
version = "unstable-2020-06-11";

src = fetchFromGitHub {
owner = "KnightOS";
repo = "mkrom";
rev = "7a735ecbe09409e74680a9dc1c50dd4db99a409f";
sha256 = "18h7a0fb5zb991iy9ljpknmk9qvl9nz3yh1zh5bm399rpxn4nzx3";
};

nativeBuildInputs = [
asciidoc
cmake
];

hardeningDisable = [ "format" ];

meta = with stdenv.lib; {
homepage = "https://knightos.org/";
description = "Packages KnightOS distribution files into a ROM";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -11047,6 +11047,10 @@ in

mkcert = callPackage ../development/tools/misc/mkcert { };

mkrom = callPackage ../development/tools/misc/mkrom {
asciidoc = asciidoc-full;
};

mkdocs = callPackage ../development/tools/documentation/mkdocs { };

mockgen = callPackage ../development/tools/mockgen { };