diff --git a/default.nix b/default.nix index 6e3c55b..b2b4032 100644 --- a/default.nix +++ b/default.nix @@ -1,12 +1,6 @@ let inputs = import ./lon.nix; - patches = import inputs.nix-patches { patchFile = ./patches; }; - inputs_final = inputs // { - nixpkgs_patched = patches.mkNixpkgsSrc { - src = inputs.unstable; - version = "nixos-unstable"; - }; - }; + inputs_final = inputs; dnsLib = (import inputs.dns).lib; lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib inputs_final self.profiles dnsLib); mkLibForMachine = diff --git a/lon.lock b/lon.lock index b49dd5b..2d05759 100644 --- a/lon.lock +++ b/lon.lock @@ -151,15 +151,6 @@ "url": "https://github.com/mic92/nix-index-database/archive/f4a5ca5771ba9ca31ad24a62c8d511a405303436.tar.gz", "hash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=" }, - "nix-patches": { - "type": "Git", - "fetchType": "git", - "branch": "main", - "revision": "b0e5962d93bc6193a65c137d8578c1faa7381480", - "url": "https://git.hubrecht.ovh/hubrecht/nix-patches.git", - "hash": "sha256-o6Mt6K2wPz9BciWSRvE1sYN9/91opbCMSyGltR5x7FY=", - "submodules": false - }, "nixos-anywhere": { "type": "GitHub", "fetchType": "tarball", diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix index 6d398ea..0f2176e 100644 --- a/machines/fischer/default.nix +++ b/machines/fischer/default.nix @@ -13,7 +13,7 @@ machine.meta = { arch = "x86_64-linux"; - nixpkgs_version = inputs.nixpkgs_patched; + nixpkgs_version = inputs.unstable; hm_version = inputs.home-manager-unstable; # TODO: Fix colmena deployment ips.public.ipv4 = "127.0.0.1"; diff --git a/patches/default.nix b/patches/default.nix deleted file mode 100644 index 2c63c08..0000000 --- a/patches/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ -}