nixos-module/server: remove outdated nixpkgs-master overwrite for collectd
This commit is contained in:
parent
966442a327
commit
03c2b37596
16
flake.lock
16
flake.lock
|
@ -16,21 +16,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1655733700,
|
||||
"narHash": "sha256-e2KqgIixRPF0K/u9xCtzrmZd3hIdrR72RqaIkItIQys=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac186b3797113a84b1e721cacfc4ed158b41356b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"openwrt": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -71,7 +56,6 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"openwrt": "openwrt",
|
||||
"openwrt-imagebuilder": "openwrt-imagebuilder"
|
||||
}
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
|
||||
nixpkgs-master.url = "github:NixOS/nixpkgs";
|
||||
openwrt = {
|
||||
url = "git+https://git.openwrt.org/openwrt/openwrt.git?ref=openwrt-21.02";
|
||||
flake = false;
|
||||
|
@ -14,7 +13,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = inputs@{ self, nixpkgs, nixpkgs-master, openwrt, openwrt-imagebuilder }:
|
||||
outputs = inputs@{ self, nixpkgs, openwrt, openwrt-imagebuilder }:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
systems = [ system ];
|
||||
|
@ -28,7 +27,6 @@
|
|||
specialArgs.lib = self.lib;
|
||||
specialArgs.self = self;
|
||||
specialArgs.inputs = inputs;
|
||||
specialArgs.nixpkgs-master = nixpkgs-master;
|
||||
};
|
||||
in {
|
||||
# Config, and utilities
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, nixpkgs-master, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
boot.kernelModules = [ "kvm-intel" "pppoe" ];
|
||||
boot.kernelParams = [ "nomodeset" ];
|
||||
|
@ -17,7 +17,5 @@
|
|||
# additional config for bare metal
|
||||
services.collectd = {
|
||||
plugins.ipmi = "";
|
||||
# FIXME: IPMI is only available with nixpkgs-21.11 onwards
|
||||
package = nixpkgs-master.legacyPackages.${pkgs.system}.collectd;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue