forked from pub-solar/os
nix: don't use nix flake
I originally wanted to use the nix flake to allow users to take advantage of the latest changes. Just so happened that nixpkgs was recently updated with a new version around the same time, and this just adds complexity for no real gain.
This commit is contained in:
parent
9ba1e7f9bc
commit
44623b5979
1
extern/default.nix
vendored
1
extern/default.nix
vendored
|
@ -9,7 +9,6 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
overlays = [
|
overlays = [
|
||||||
nix.overlay
|
|
||||||
nur.overlay
|
nur.overlay
|
||||||
devshell.overlay
|
devshell.overlay
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
|
|
20
flake.lock
20
flake.lock
|
@ -152,25 +152,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixos"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1615911544,
|
|
||||||
"narHash": "sha256-2V0qJ9EaPjOetEzEx0vxP+dxKOX8ZXJi7PIlLjkxymA=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nix",
|
|
||||||
"rev": "66fa1c7375e4b3073a16df4678cf1d37446ed20b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nix",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixos": {
|
"nixos": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615797423,
|
"lastModified": 1615797423,
|
||||||
|
@ -270,7 +251,6 @@
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"home": "home",
|
"home": "home",
|
||||||
"naersk": "naersk",
|
"naersk": "naersk",
|
||||||
"nix": "nix",
|
|
||||||
"nixos": "nixos",
|
"nixos": "nixos",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
|
|
|
@ -22,14 +22,13 @@
|
||||||
home.inputs.nixpkgs.follows = "nixos";
|
home.inputs.nixpkgs.follows = "nixos";
|
||||||
naersk.url = "github:nmattia/naersk";
|
naersk.url = "github:nmattia/naersk";
|
||||||
naersk.inputs.nixpkgs.follows = "override";
|
naersk.inputs.nixpkgs.follows = "override";
|
||||||
nix.inputs.nixpkgs.follows = "nixos";
|
|
||||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||||
utils.url = "github:numtide/flake-utils/flatten-tree-system";
|
utils.url = "github:numtide/flake-utils/flatten-tree-system";
|
||||||
pkgs.url = "path:./pkgs";
|
pkgs.url = "path:./pkgs";
|
||||||
pkgs.inputs.nixpkgs.follows = "nixos";
|
pkgs.inputs.nixpkgs.follows = "nixos";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ deploy, nixos, nur, nix, self, utils, ... }:
|
outputs = inputs@{ deploy, nixos, nur, self, utils, ... }:
|
||||||
let
|
let
|
||||||
inherit (self) lib;
|
inherit (self) lib;
|
||||||
inherit (lib) os;
|
inherit (lib) os;
|
||||||
|
|
Loading…
Reference in a new issue