flake.nix: set openwrt-imagebuilder.input.nixpkgs.follows
This commit is contained in:
parent
a0eb8a5f82
commit
eb71e5be69
18
flake.lock
18
flake.lock
|
@ -31,20 +31,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1651024496,
|
|
||||||
"narHash": "sha256-uKSrrw/neSkxX6TXPSaMyfu7iKzFrK7F6HOt6vQefGY=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "d9e593ed5889f3906dc72811c45bf684be8865cf",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"openwrt": {
|
"openwrt": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -64,7 +50,9 @@
|
||||||
},
|
},
|
||||||
"openwrt-imagebuilder": {
|
"openwrt-imagebuilder": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1654715602,
|
"lastModified": 1654715602,
|
||||||
|
|
11
flake.nix
11
flake.nix
|
@ -4,9 +4,14 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
|
||||||
nixpkgs-master.url = "github:NixOS/nixpkgs";
|
nixpkgs-master.url = "github:NixOS/nixpkgs";
|
||||||
openwrt.url = "git+https://git.openwrt.org/openwrt/openwrt.git?ref=openwrt-21.02";
|
openwrt = {
|
||||||
openwrt.flake = false;
|
url = "git+https://git.openwrt.org/openwrt/openwrt.git?ref=openwrt-21.02";
|
||||||
openwrt-imagebuilder.url = "github:astro/nix-openwrt-imagebuilder";
|
flake = false;
|
||||||
|
};
|
||||||
|
openwrt-imagebuilder = {
|
||||||
|
url = "github:astro/nix-openwrt-imagebuilder";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, nixpkgs-master, openwrt, openwrt-imagebuilder }:
|
outputs = inputs@{ self, nixpkgs, nixpkgs-master, openwrt, openwrt-imagebuilder }:
|
||||||
|
|
Loading…
Reference in New Issue