Commit 34a23a8a authored by fpletz's avatar fpletz 🚧
Browse files

switch to current nixpkgs master

parent f09d4ca9
......@@ -18,15 +18,15 @@
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs_master"
"nixpkgs"
]
},
"locked": {
"lastModified": 1644534280,
"narHash": "sha256-Gzf/Jq/F1vvTp6XkzPU+pBCj3OSAFLiR7f0ptwRseiI=",
"lastModified": 1644706973,
"narHash": "sha256-xOyxrhc5V79u0ZNmnPmJbY3ngtp43dNISEmrb8Ie6wQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6d9d9294d09b5e88df65f8c6651efb8a4d7d2476",
"rev": "7c2ae0bdd20ddcaafe41ef669226a1df67f8aa06",
"type": "github"
},
"original": {
......@@ -58,27 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1644472683,
"narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7adc9c14ec74b27358a8df9b973087e351425a79",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_master": {
"locked": {
"lastModified": 1644626624,
"narHash": "sha256-WSfoxlSY0S/eRp/IzeGH+QC3UpwOcJMmLrFl+Vl2xHk=",
"lastModified": 1644951967,
"narHash": "sha256-j+l8bt++dsYTJSGABuqeBEom5aNpD4n0BsOTdewFYuU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8f89db32523ac1a7105a8d439ff1cb8173a4c314",
"rev": "05e1f8a2c7797b0d9f9e07ab2aaeccecdcf9b7da",
"type": "github"
},
"original": {
......@@ -93,7 +77,6 @@
"home-manager": "home-manager",
"muccc-api": "muccc-api",
"nixpkgs": "nixpkgs",
"nixpkgs_master": "nixpkgs_master",
"utils": "utils"
}
},
......
......@@ -2,16 +2,15 @@
description = "MuCCC Infrastructure Deployment";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
nixpkgs_master.url = "github:NixOS/nixpkgs/master";
nixpkgs.url = "github:NixOS/nixpkgs/master";
utils.url = "github:numtide/flake-utils";
muccc-api.url = "git+https://gitlab.muc.ccc.de/muCCC/api";
muccc-api.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs_master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, nixpkgs, nixpkgs_master, utils, muccc-api, home-manager, ... }: let
outputs = { self, nixpkgs, utils, muccc-api, home-manager, ... }: let
supportedSystems = utils.lib.defaultSystems;
in utils.lib.eachSystem supportedSystems (system: let
pkgs = import nixpkgs { inherit system; };
......@@ -24,9 +23,6 @@
colmena = {
meta = {
nixpkgs = import nixpkgs { };
nodeNixpkgs = {
loungepi = import nixpkgs_master { };
};
};
defaults = { name, pkgs, lib, ... }: {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment