Compare commits
2 commits
0557daaff1
...
9fe3608d15
Author | SHA1 | Date | |
---|---|---|---|
|
9fe3608d15 | ||
|
9bd51f9318 |
1362
flake.lock
Normal file
1362
flake.lock
Normal file
File diff suppressed because it is too large
Load diff
|
@ -7,11 +7,7 @@
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
nixpkgs-master.url = "github:nixos/nixpkgs/master";
|
nixpkgs-master.url = "github:nixos/nixpkgs/master";
|
||||||
<<<<<<< HEAD
|
|
||||||
nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/d941e9aa2d89f377d45516c5edd765fef15ea90a";
|
nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/d941e9aa2d89f377d45516c5edd765fef15ea90a";
|
||||||
=======
|
|
||||||
nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/19493dc0ad16ffd5414ac9b4e12179d0e1b98468";
|
|
||||||
>>>>>>> d1ad881e (misc forgot to commit)
|
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/master";
|
||||||
|
|
Loading…
Reference in a new issue