diff --git a/flake.lock b/flake.lock index be3e63a..f2094e9 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,17 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", + "lastModified": 1690228878, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", "owner": "ryantm", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", "type": "github" }, "original": { @@ -21,29 +22,6 @@ "type": "github" } }, - "archivebox": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1648612759, - "narHash": "sha256-SJwlpD2Wz3zFoX2mIYCQfwIOYHaOdeiWGFeDXsLGM84=", - "ref": "refs/heads/master", - "rev": "39d338b9b24159d8ef3309eecc0d32a2a9f102b5", - "revCount": 2, - "type": "git", - "url": "https://git.neet.dev/zuckerberg/archivebox.git" - }, - "original": { - "type": "git", - "url": "https://git.neet.dev/zuckerberg/archivebox.git" - } - }, "blobs": { "flake": false, "locked": { @@ -117,11 +95,11 @@ ] }, "locked": { - "lastModified": 1682063650, - "narHash": "sha256-VaDHh2z6xlnTHaONlNVHP7qEMcK5rZ8Js3sT6mKb2XY=", + "lastModified": 1686747123, + "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "c2ea4e642dc50fd44b537e9860ec95867af30d39", + "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", "type": "github" }, "original": { @@ -151,11 +129,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -164,6 +142,27 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -171,11 +170,11 @@ ] }, "locked": { - "lastModified": 1682417654, - "narHash": "sha256-XtUhq1GTRzV7QebHkxjd7Z58E6lVEk6Iv1/pF/GnBB4=", + "lastModified": 1691292840, + "narHash": "sha256-NA+o/NoOOQhzAQwB2JpeKoG+iYQ6yn/XXVxaGd5HSQI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e3e320b19c192f40a5b98e8776e3870df62dee8a", + "rev": "6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4", "type": "github" }, "original": { @@ -186,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682818264, - "narHash": "sha256-EPr900C3WaYulOdWRF3BMQrjF2Ao5Jf8xUOnFvZDTXE=", + "lastModified": 1691550298, + "narHash": "sha256-gR1u5VYwufp/FWN7BjXLWS+vHIit4+gcQY62k21RDPw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "297187b30a19f147ef260abb5abd93b0706af238", + "rev": "43b03482680169dab7ed2f60f370fb23178cbd78", "type": "github" }, "original": { @@ -215,18 +214,6 @@ "type": "indirect" } }, - "nixpkgs-hostapd-pr": { - "flake": false, - "locked": { - "narHash": "sha256-35+g1EJMcDFhb3UP15fyR1aD4AX1ifz2EqaYItITZ7U=", - "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/222536.patch" - }, - "original": { - "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/222536.patch" - } - }, "radio": { "inputs": { "flake-utils": [ @@ -271,13 +258,11 @@ "root": { "inputs": { "agenix": "agenix", - "archivebox": "archivebox", "dailybuild_modules": "dailybuild_modules", "deploy-rs": "deploy-rs", "flake-utils": "flake-utils", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", - "nixpkgs-hostapd-pr": "nixpkgs-hostapd-pr", "radio": "radio", "radio-web": "radio-web", "simple-nixos-mailserver": "simple-nixos-mailserver" diff --git a/flake.nix b/flake.nix index 4fb02b8..324c547 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,6 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/master"; - # nixpkgs-patch-howdy.url = "https://github.com/NixOS/nixpkgs/pull/216245.diff"; - # nixpkgs-patch-howdy.flake = false; flake-utils.url = "github:numtide/flake-utils"; @@ -26,11 +24,6 @@ dailybuild_modules.inputs.nixpkgs.follows = "nixpkgs"; dailybuild_modules.inputs.flake-utils.follows = "flake-utils"; - # archivebox - archivebox.url = "git+https://git.neet.dev/zuckerberg/archivebox.git"; - archivebox.inputs.nixpkgs.follows = "nixpkgs"; - archivebox.inputs.flake-utils.follows = "flake-utils"; - # nixos config deployment deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; @@ -39,9 +32,6 @@ # prebuilt nix-index database nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - - nixpkgs-hostapd-pr.url = "https://github.com/NixOS/nixpkgs/pull/222536.patch"; - nixpkgs-hostapd-pr.flake = false; }; outputs = { self, nixpkgs, ... }@inputs: @@ -60,7 +50,6 @@ simple-nixos-mailserver.nixosModule agenix.nixosModules.default dailybuild_modules.nixosModule - archivebox.nixosModule nix-index-database.nixosModules.nix-index ({ lib, ... }: { config = { @@ -86,7 +75,7 @@ name = "nixpkgs-patched"; src = nixpkgs; patches = [ - inputs.nixpkgs-hostapd-pr + # currently no patches to nixpkgs ]; }; patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });