Follow nixpkgs on all inputs

This commit is contained in:
Malte Tammena 2021-12-26 21:49:18 +01:00
parent 919a6fca43
commit a3c69b8893
2 changed files with 123 additions and 157 deletions

View file

@ -51,7 +51,9 @@
"colmena": { "colmena": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs", "nixpkgs": [
"nixpkgs"
],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -172,7 +174,7 @@
}, },
"fenix": { "fenix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
@ -191,7 +193,9 @@
}, },
"fenix_2": { "fenix_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6", "nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src_2" "rust-analyzer-src": "rust-analyzer-src_2"
}, },
"locked": { "locked": {
@ -210,7 +214,7 @@
}, },
"fenix_3": { "fenix_3": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_6",
"rust-analyzer-src": "rust-analyzer-src_3" "rust-analyzer-src": "rust-analyzer-src_3"
}, },
"locked": { "locked": {
@ -295,7 +299,9 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_8" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1638571010, "lastModified": 1638571010,
@ -333,7 +339,7 @@
}, },
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1623927034, "lastModified": 1623927034,
@ -352,7 +358,7 @@
"nixCargoIntegration": { "nixCargoIntegration": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"rustOverlay": "rustOverlay" "rustOverlay": "rustOverlay"
}, },
"locked": { "locked": {
@ -372,7 +378,7 @@
"nixCargoIntegration_2": { "nixCargoIntegration_2": {
"inputs": { "inputs": {
"devshell": "devshell_2", "devshell": "devshell_2",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_5",
"rustOverlay": "rustOverlay_2" "rustOverlay": "rustOverlay_2"
}, },
"locked": { "locked": {
@ -392,7 +398,7 @@
"nixCargoIntegration_3": { "nixCargoIntegration_3": {
"inputs": { "inputs": {
"devshell": "devshell_3", "devshell": "devshell_3",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_7",
"rustOverlay": "rustOverlay_3" "rustOverlay": "rustOverlay_3"
}, },
"locked": { "locked": {
@ -426,24 +432,23 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1638397275, "lastModified": 1624024598,
"narHash": "sha256-2Jos1CJFTMO9IbulbM4PTKn24nISIDQCAG/AqYQ8rmg=", "narHash": "sha256-X++38oH5MKEmPW4/2WdMaHQvwJzO8pJfbnzMD7DbG1E=",
"owner": "NixOS", "path": "/nix/store/6zl4j413gbg98slcqkhhyi5fnw8ri8ra-source",
"repo": "nixpkgs", "rev": "33d42ad7cf2769ce6364ed4e52afa8e9d1439d58",
"rev": "391f93a83c3a486475d60eb4a569bb6afbf306ad", "type": "path"
"type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "nixpkgs-unstable", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-wayland": { "nixpkgs-wayland": {
"inputs": { "inputs": {
"cachix": "cachix", "cachix": "cachix",
"nixpkgs": "nixpkgs_12" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1638622184, "lastModified": 1638622184,
@ -459,83 +464,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_10": {
"locked": {
"lastModified": 1634782485,
"narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1638535497,
"narHash": "sha256-tk5LNbdkUhALp00+r5ZmQ3t7n2d5M7YUQB+MznWvVOg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c71f061c68ba8ce53471b767d5049cbd0f3d8490",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1638376152,
"narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_13": {
"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_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1624024598,
"narHash": "sha256-X++38oH5MKEmPW4/2WdMaHQvwJzO8pJfbnzMD7DbG1E=",
"path": "/nix/store/6zl4j413gbg98slcqkhhyi5fnw8ri8ra-source",
"rev": "33d42ad7cf2769ce6364ed4e52afa8e9d1439d58",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1617325113, "lastModified": 1617325113,
"narHash": "sha256-GksR0nvGxfZ79T91UUtWjjccxazv6Yh/MvEJ82v1Xmw=", "narHash": "sha256-GksR0nvGxfZ79T91UUtWjjccxazv6Yh/MvEJ82v1Xmw=",
@ -550,7 +479,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1635403963, "lastModified": 1635403963,
"narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=", "narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=",
@ -566,39 +495,23 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1635403963,
"narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": { "nixpkgs_5": {
"locked": {
"lastModified": 1635403963,
"narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1638376152,
"narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1636976544, "lastModified": 1636976544,
"narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=",
@ -614,20 +527,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_6": {
"locked": {
"lastModified": 1636267212,
"narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=",
"path": "/nix/store/94hsmqk3nrx26yd46crlw5aygiya6pj4-source",
"rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1634782485, "lastModified": 1634782485,
"narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=",
@ -643,6 +543,37 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": {
"locked": {
"lastModified": 1634782485,
"narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1638535497,
"narHash": "sha256-tk5LNbdkUhALp00+r5ZmQ3t7n2d5M7YUQB+MznWvVOg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c71f061c68ba8ce53471b767d5049cbd0f3d8490",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"pkgs": { "pkgs": {
"locked": { "locked": {
"lastModified": 1624977608, "lastModified": 1624977608,
@ -689,7 +620,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"mensa": "mensa", "mensa": "mensa",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_8",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"rip": "rip", "rip": "rip",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@ -749,7 +680,7 @@
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1625192067, "lastModified": 1625192067,
@ -815,7 +746,9 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_13" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1638188662, "lastModified": 1638188662,

View file

@ -3,16 +3,46 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware = {
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; url = "github:NixOS/nixos-hardware";
home-manager.url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs";
emulator-2a.url = "github:MalteT/2a-emulator/develop"; };
mensa.url = "github:MalteT/mensa/main"; nixpkgs-wayland = {
custom-udev-rules.url = "github:MalteT/custom-udev-rules"; url = "github:nix-community/nixpkgs-wayland";
fenix.url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs";
colmena.url = "github:zhaofengli/colmena"; };
sops-nix.url = "github:Mic92/sops-nix"; emulator-2a = {
glados.url = "git+https://git.sr.ht/~megamanmalte/GLaDOS?ref=main"; url = "github:MalteT/2a-emulator/develop";
inputs.nixpkgs.follows = "nixpkgs";
};
mensa = {
url = "github:MalteT/mensa/main";
inputs.nixpkgs.follows = "nixpkgs";
};
custom-udev-rules = {
url = "github:MalteT/custom-udev-rules";
inputs.nixpkgs.follows = "nixpkgs";
};
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
colmena = {
url = "github:zhaofengli/colmena";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
glados = {
url = "git+https://git.sr.ht/~megamanmalte/GLaDOS?ref=main";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
gruvbox-material-gtk = { gruvbox-material-gtk = {
url = "github:sainnhe/gruvbox-material-gtk"; url = "github:sainnhe/gruvbox-material-gtk";
flake = false; flake = false;
@ -29,7 +59,10 @@
url = "github:CleverRaven/Cataclysm-DDA"; url = "github:CleverRaven/Cataclysm-DDA";
flake = false; flake = false;
}; };
"fend" = { url = "github:MalteT/fend/flake"; }; "fend" = {
url = "github:MalteT/fend/flake";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs, nixos-hardware, home-manager, ... }@inputs: { outputs = { self, nixpkgs, nixos-hardware, home-manager, ... }@inputs: {