Update flake
This commit is contained in:
parent
606b45b96a
commit
83904ca3e6
10
flake.lock
10
flake.lock
|
@ -16,14 +16,14 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"narHash": "sha256-NGbS2bymVuCQcanlBO41I6ZjSAZSLXhACK3qQU25zUs=",
|
"narHash": "sha256-NGbS2bymVuCQcanlBO41I6ZjSAZSLXhACK3qQU25zUs=",
|
||||||
"originalUri": "git+https://git.sr.ht/~ehmry/dhall-haskell?ref=flake",
|
"originalUri": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake",
|
||||||
"uri": "git+https://git.sr.ht/~ehmry/dhall-haskell?ref=flake&rev=256810cd5adf1ae5862eed0ffdaab4cf49f6fe67"
|
"uri": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake&rev=256810cd5adf1ae5862eed0ffdaab4cf49f6fe67"
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"inputs": {},
|
"inputs": {},
|
||||||
"narHash": "sha256-v6oDxjvJ7c0BWZJ/fd4L1gtnctQvkkFjL41lEt37vLg=",
|
"narHash": "sha256-1pvSqpPbcREIGI7BF6A29b81bH/dZvywTPwYhrMaRa0=",
|
||||||
"originalUri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genodeFlake",
|
"originalUri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git",
|
||||||
"uri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genodeFlake&rev=28f37882fbb71230d6947af244a34cd3d42b280a"
|
"uri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=master&rev=ff59349d99ff0ff2496e85278c596df3a14ef3ec"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"version": 3
|
"version": 3
|
||||||
|
|
17
flake.nix
17
flake.nix
|
@ -4,17 +4,13 @@
|
||||||
description = "Genode package overlay";
|
description = "Genode package overlay";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs = {
|
nixpkgs.uri = "git+https://gitea.c3d2.de/ehmry/nixpkgs.git";
|
||||||
uri = "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genodeFlake";
|
dhall-haskell.uri =
|
||||||
flake = false;
|
"git+https://github.com/dhall-lang/dhall-haskell?ref=flake";
|
||||||
};
|
|
||||||
|
|
||||||
dhall-haskell = { uri = "git+https://git.sr.ht/~ehmry/dhall-haskell?ref=flake"; };
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, dhall-haskell }:
|
outputs = { self, nixpkgs, dhall-haskell }:
|
||||||
let fullPkgs = import ./packages.nix { inherit nixpkgs; };
|
let fullPkgs = import ./packages.nix { nixpkgs = import nixpkgs; };
|
||||||
in {
|
in {
|
||||||
|
|
||||||
packages = with fullPkgs; {
|
packages = with fullPkgs; {
|
||||||
|
@ -22,7 +18,7 @@
|
||||||
genode-base-linux solo5;
|
genode-base-linux solo5;
|
||||||
};
|
};
|
||||||
|
|
||||||
defaultPackage = self.packages.solo5;
|
defaultPackage = self.packages.genode-os;
|
||||||
|
|
||||||
hydraJobs = {
|
hydraJobs = {
|
||||||
build.x86_64 = {
|
build.x86_64 = {
|
||||||
|
@ -35,6 +31,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
checks = self.hydraJobs.tests.x86_64.nova.solo5;
|
checks = { inherit (self.hydraJobs.tests.x86_64.nova) pci; };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,9 +27,9 @@ let
|
||||||
toolchainOverlay = import ./toolchain-overlay;
|
toolchainOverlay = import ./toolchain-overlay;
|
||||||
# Overlay of toolchain patches
|
# Overlay of toolchain patches
|
||||||
|
|
||||||
in { nixpkgs, extraOverlays ? [ ] }:
|
in { nixpkgs ? import <nixpkgs>, extraOverlays ? [ ] }:
|
||||||
|
|
||||||
import nixpkgs {
|
nixpkgs {
|
||||||
# Evaluate an overlayed Nixpkgs for a Genode target
|
# Evaluate an overlayed Nixpkgs for a Genode target
|
||||||
localSystem = "x86_64-linux";
|
localSystem = "x86_64-linux";
|
||||||
crossSystem = "x86_64-genode";
|
crossSystem = "x86_64-genode";
|
||||||
|
|
Loading…
Reference in New Issue