Dedupe duplicated dependencies
This commit is contained in:
parent
b321255cfe
commit
e9c011cd87
GPG Key ID:
3AF5A43A3EECC2E5
161
flake.lock
161
flake.lock
|
|
@ -22,32 +22,14 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"heliwatch",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1643264637,
|
||||
"narHash": "sha256-jR8Cke8Ukj0ZcpmHaz+TcpUzL5O1xtiEinzbvx4PMfU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "51cf29a5c001389a5781b4115315dd2012590551",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"heliwatch": {
|
||||
"inputs": {
|
||||
"fenix": "fenix_2",
|
||||
"naersk": "naersk",
|
||||
"fenix": [
|
||||
"fenix"
|
||||
],
|
||||
"naersk": [
|
||||
"naersk"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -68,27 +50,6 @@
|
|||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"heliwatch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1639947939,
|
||||
"narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
|
||||
"owner": "nmattia",
|
||||
"repo": "naersk",
|
||||
"rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nmattia",
|
||||
"repo": "naersk",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
|
|
@ -141,15 +102,15 @@
|
|||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1646163513,
|
||||
"narHash": "sha256-zIrQEi+iXEWVfCsGQqqTiYSrkCYGTCXxSL6TF5Rqwlk=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1650227249,
|
||||
"narHash": "sha256-4mbH9TNyvZPJfYIisuOX6mg+6RlCvffizZPdx5aQm1Y=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0a0255ddd063bc5d902fcd31c88319347c4383d4",
|
||||
"rev": "63f81838e2c858d8c6ca330483421ac0b62526a3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -186,69 +147,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1648367989,
|
||||
"narHash": "sha256-D9h82fq5qCZiX6iCrp38Na6xyDijC8yORD7XlWBdi44=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "adb84433920286660e7ca3627b1b090e3fd6e9c6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1637209424,
|
||||
"narHash": "sha256-oXw75hkCOVtoB+CEElWiTmkC1gNdL3jf0tG2GInytHA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "42d32516400c1d821d275a5460900bbaef3d3bf1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1638097282,
|
||||
"narHash": "sha256-EXCzj9b8X/lqDPJapxZThIOKL5ASbpsJZ+8L1LnY1ig=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "78cb77b29d37a9663e05b61abb4fa09465da4b70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1646162891,
|
||||
"narHash": "sha256-Yoyur5LD3nRKFZRwVi2lHZi2HKoWUJFAHgIFcYsRhho=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b099eaa0e01a45fc3459bbe987c3405c425ef05c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-21.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"openwrt": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -270,12 +168,12 @@
|
|||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"heliwatch": "heliwatch",
|
||||
"naersk": "naersk_2",
|
||||
"naersk": "naersk",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"nixpkgs-mobilizon": "nixpkgs-mobilizon",
|
||||
"nixpkgs-openwebrx": "nixpkgs-openwebrx",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"scrapers": "scrapers",
|
||||
"secrets": "secrets",
|
||||
"sops-nix": "sops-nix",
|
||||
|
|
@ -303,23 +201,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1643220707,
|
||||
"narHash": "sha256-XMBer+U/1WqPu25aJs/LkMxrnJnEKiezsAtfSpkkPik=",
|
||||
"owner": "rust-analyzer",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "e149a15edd354dd0f995532d16a3e8dc21367e06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-analyzer",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"scrapers": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -338,7 +219,9 @@
|
|||
},
|
||||
"secrets": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"sops-nix": [
|
||||
"sops-nix"
|
||||
]
|
||||
|
|
@ -359,7 +242,9 @@
|
|||
},
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1647279403,
|
||||
|
|
@ -461,8 +346,12 @@
|
|||
},
|
||||
"zentralwerk": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-master": [
|
||||
"nixpkgs-master"
|
||||
],
|
||||
"openwrt": "openwrt"
|
||||
},
|
||||
"locked": {
|
||||
|
|
|
|||
43
flake.nix
43
flake.nix
|
|
@ -5,11 +5,22 @@
|
|||
nixpkgs.url = "github:nixos/nixpkgs/release-21.11";
|
||||
nixpkgs-mobilizon.url = "github:minijackson/nixpkgs/mobilizon";
|
||||
nixpkgs-openwebrx.url = "github:astro/nixpkgs/openwebrx";
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs";
|
||||
secrets.url = "git+ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git";
|
||||
secrets.inputs.sops-nix.follows = "sops-nix";
|
||||
nixpkgs-master.url = "github:nixos/nixpkgs";
|
||||
secrets = {
|
||||
url = "git+ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
sops-nix.follows = "sops-nix";
|
||||
};
|
||||
};
|
||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||
zentralwerk.url = "git+https://gitea.c3d2.de/zentralwerk/network.git";
|
||||
zentralwerk = {
|
||||
url = "git+https://gitea.c3d2.de/zentralwerk/network.git";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
nixpkgs-master.follows = "nixpkgs-master";
|
||||
};
|
||||
};
|
||||
yammat.url = "git+https://gitea.c3d2.de/astro/yammat.git?ref=nix";
|
||||
yammat.inputs.nixpkgs.follows = "nixpkgs";
|
||||
scrapers.url = "git+https://gitea.c3d2.de/astro/scrapers.git";
|
||||
|
|
@ -19,10 +30,20 @@
|
|||
tigger.url = "github:astro/tigger";
|
||||
tigger.flake = false;
|
||||
ticker.url = "git+https://gitea.c3d2.de/astro/ticker.git";
|
||||
ticker.flake = false;
|
||||
heliwatch.url = "git+https://gitea.c3d2.de/astro/heliwatch.git";
|
||||
heliwatch.inputs.nixpkgs.follows = "nixpkgs";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
heliwatch = {
|
||||
url = "git+https://gitea.c3d2.de/astro/heliwatch.git";
|
||||
inputs = {
|
||||
fenix.follows = "fenix";
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
naersk.follows = "naersk";
|
||||
};
|
||||
};
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
naersk.url = "github:mhuesch/naersk";
|
||||
naersk.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# TODO: https://github.com/nix-community/fenix/pull/68
|
||||
|
|
@ -253,7 +274,7 @@
|
|||
};
|
||||
|
||||
gitea = nixosSystem' {
|
||||
nixpkgs = inputs.nixpkgs-unstable;
|
||||
nixpkgs = inputs.nixpkgs-master;
|
||||
modules = [
|
||||
./config/lxc-container.nix
|
||||
./hosts/containers/gitea
|
||||
|
|
@ -303,7 +324,7 @@
|
|||
};
|
||||
|
||||
nncp = nixosSystem' {
|
||||
nixpkgs = inputs.nixpkgs-unstable;
|
||||
nixpkgs = inputs.nixpkgs-master;
|
||||
modules = [
|
||||
self.nixosModules.nncp
|
||||
./config/lxc-container.nix
|
||||
|
|
@ -459,7 +480,7 @@
|
|||
};
|
||||
|
||||
c3d2-web = nixosSystem' {
|
||||
nixpkgs = inputs.nixpkgs-unstable;
|
||||
nixpkgs = inputs.nixpkgs-master;
|
||||
modules = [
|
||||
./config/lxc-container.nix
|
||||
./hosts/containers/c3d2-web
|
||||
|
|
|
|||
Loading…
Reference in New Issue