Przeglądaj źródła

Move Genode flake input into overlay

dabus
Emery Hemingway 9 miesięcy temu
rodzic
commit
48ac203acb
3 zmienionych plików z 8 dodań i 25 usunięć
  1. 0
    17
      flake.lock
  2. 1
    6
      flake.nix
  3. 7
    2
      packages/genodelabs/default.nix

+ 0
- 17
flake.lock Wyświetl plik

@@ -1,21 +1,5 @@
1 1
 {
2 2
   "nodes": {
3
-    "genode": {
4
-      "flake": false,
5
-      "locked": {
6
-        "lastModified": 1606482107,
7
-        "narHash": "sha256-XgN1fBUsmX8oKk4ZBvROwEWlpILRlJz+UuK4kMDSI1Y=",
8
-        "owner": "genodelabs",
9
-        "repo": "genode",
10
-        "rev": "3fac8b106d83721914797c202793ec1d8ea02d2f",
11
-        "type": "github"
12
-      },
13
-      "original": {
14
-        "owner": "genodelabs",
15
-        "repo": "genode",
16
-        "type": "github"
17
-      }
18
-    },
19 3
     "nixpkgs": {
20 4
       "locked": {
21 5
         "lastModified": 1608384842,
@@ -34,7 +18,6 @@
34 18
     },
35 19
     "root": {
36 20
       "inputs": {
37
-        "genode": "genode",
38 21
         "nixpkgs": "nixpkgs"
39 22
       }
40 23
     }

+ 1
- 6
flake.nix Wyświetl plik

@@ -1,14 +1,9 @@
1 1
 {
2 2
   description = "Genode packages";
3 3
 
4
-  inputs.genode = {
5
-    url = "github:genodelabs/genode";
6
-    flake = false;
7
-  };
8
-
9 4
   inputs.nixpkgs.url = "github:ehmry/nixpkgs/genodepkgs";
10 5
 
11
-  outputs = { self, genode, nixpkgs }:
6
+  outputs = { self, nixpkgs }:
12 7
     let
13 8
       localSystems = [ "x86_64-linux" ];
14 9
       crossSystems = [ "aarch64-genode" "x86_64-genode" ];

+ 7
- 2
packages/genodelabs/default.nix Wyświetl plik

@@ -13,7 +13,12 @@ let
13 13
     else
14 14
       throw "unknown Genode arch for platform ${platform.system}";
15 15
 
16
-  upstreamSources = flake.inputs.genode;
16
+  upstreamSources = pkgs.fetchFromGitHub {
17
+    owner = "genodelabs";
18
+    repo = "genode";
19
+    rev = "3fac8b106d83721914797c202793ec1d8ea02d2f";
20
+    hash = "sha256-XgN1fBUsmX8oKk4ZBvROwEWlpILRlJz+UuK4kMDSI1Y=";
21
+  };
17 22
 
18 23
   genodeSources =
19 24
     # The Genode source repository
@@ -27,7 +32,7 @@ let
27 32
     in with buildPackages;
28 33
     stdenvNoCC.mkDerivation {
29 34
       pname = "genode-sources";
30
-      version = upstreamSources.lastModifiedDate;
35
+      version = builtins.substring 0 7 upstreamSources.rev;
31 36
       src = upstreamSources;
32 37
       nativeBuildInputs = [ expect gnumake tcl ];
33 38
       patches = [ ./patches/binary-labels.patch ./patches/label-fail.patch ];

Ładowanie…
Anuluj
Zapisz