Move Genode flake input into overlay

This commit is contained in:
Emery Hemingway 2020-12-20 14:14:21 +01:00
parent 7a755a9b6a
commit 5e9039f88e
3 changed files with 8 additions and 25 deletions

View File

@ -1,21 +1,5 @@
{ {
"nodes": { "nodes": {
"genode": {
"flake": false,
"locked": {
"lastModified": 1606482107,
"narHash": "sha256-XgN1fBUsmX8oKk4ZBvROwEWlpILRlJz+UuK4kMDSI1Y=",
"owner": "genodelabs",
"repo": "genode",
"rev": "3fac8b106d83721914797c202793ec1d8ea02d2f",
"type": "github"
},
"original": {
"owner": "genodelabs",
"repo": "genode",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1608384842, "lastModified": 1608384842,
@ -34,7 +18,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"genode": "genode",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

View File

@ -1,14 +1,9 @@
{ {
description = "Genode packages"; description = "Genode packages";
inputs.genode = {
url = "github:genodelabs/genode";
flake = false;
};
inputs.nixpkgs.url = "github:ehmry/nixpkgs/genodepkgs"; inputs.nixpkgs.url = "github:ehmry/nixpkgs/genodepkgs";
outputs = { self, genode, nixpkgs }: outputs = { self, nixpkgs }:
let let
localSystems = [ "x86_64-linux" ]; localSystems = [ "x86_64-linux" ];
crossSystems = [ "aarch64-genode" "x86_64-genode" ]; crossSystems = [ "aarch64-genode" "x86_64-genode" ];

View File

@ -13,7 +13,12 @@ let
else else
throw "unknown Genode arch for platform ${platform.system}"; throw "unknown Genode arch for platform ${platform.system}";
upstreamSources = flake.inputs.genode; upstreamSources = pkgs.fetchFromGitHub {
owner = "genodelabs";
repo = "genode";
rev = "3fac8b106d83721914797c202793ec1d8ea02d2f";
hash = "sha256-XgN1fBUsmX8oKk4ZBvROwEWlpILRlJz+UuK4kMDSI1Y=";
};
genodeSources = genodeSources =
# The Genode source repository # The Genode source repository
@ -27,7 +32,7 @@ let
in with buildPackages; in with buildPackages;
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "genode-sources"; pname = "genode-sources";
version = upstreamSources.lastModifiedDate; version = builtins.substring 0 7 upstreamSources.rev;
src = upstreamSources; src = upstreamSources;
nativeBuildInputs = [ expect gnumake tcl ]; nativeBuildInputs = [ expect gnumake tcl ];
patches = [ ./patches/binary-labels.patch ./patches/label-fail.patch ]; patches = [ ./patches/binary-labels.patch ./patches/label-fail.patch ];