We can just stringify the normal nixpkgs flake.

This commit is contained in:
r-vdp 2023-03-24 17:02:59 +01:00
parent 6c318867c1
commit 92ac83f22a
No known key found for this signature in database
2 changed files with 1 additions and 26 deletions

18
flake.lock generated
View file

@ -121,23 +121,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-nonflake": {
"flake": false,
"locked": {
"lastModified": 1679437018,
"narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1678872516, "lastModified": 1678872516,
@ -186,7 +169,6 @@
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-nonflake": "nixpkgs-nonflake",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"

View file

@ -1,12 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# We re-use the systemd lib from NixOS, this input allows to import the needed modules.
# TODO: is there a better way to do this?
nixpkgs-nonflake = {
url = "github:NixOS/nixpkgs/nixos-unstable";
flake = false;
};
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
devshell = { devshell = {
url = "github:numtide/devshell"; url = "github:numtide/devshell";
@ -47,7 +41,6 @@
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, nixpkgs-nonflake
, flake-utils , flake-utils
, rust-overlay , rust-overlay
, crane , crane
@ -189,7 +182,7 @@
{ {
lib = import ./nix/lib.nix { lib = import ./nix/lib.nix {
inherit nixpkgs self; inherit nixpkgs self;
nixosModules = "${nixpkgs-nonflake}/nixos"; nixosModules = "${nixpkgs}/nixos";
}; };
systemConfigs.default = self.lib.makeSystemConfig { systemConfigs.default = self.lib.makeSystemConfig {