diff --git a/flake.lock b/flake.lock index 58e0123..4d80290 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "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": { "locked": { "lastModified": 1608384842, @@ -34,7 +18,6 @@ }, "root": { "inputs": { - "genode": "genode", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 3d4a4b7..7348653 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,9 @@ { description = "Genode packages"; - inputs.genode = { - url = "github:genodelabs/genode"; - flake = false; - }; - inputs.nixpkgs.url = "github:ehmry/nixpkgs/genodepkgs"; - outputs = { self, genode, nixpkgs }: + outputs = { self, nixpkgs }: let localSystems = [ "x86_64-linux" ]; crossSystems = [ "aarch64-genode" "x86_64-genode" ]; diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix index 8b44ad2..27dba2c 100644 --- a/packages/genodelabs/default.nix +++ b/packages/genodelabs/default.nix @@ -13,7 +13,12 @@ let else 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 = # The Genode source repository @@ -27,7 +32,7 @@ let in with buildPackages; stdenvNoCC.mkDerivation { pname = "genode-sources"; - version = upstreamSources.lastModifiedDate; + version = builtins.substring 0 7 upstreamSources.rev; src = upstreamSources; nativeBuildInputs = [ expect gnumake tcl ]; patches = [ ./patches/binary-labels.patch ./patches/label-fail.patch ];