From 10dd18a42a52dda0c336bc65ae63f76a570d4858 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 25 Sep 2023 14:37:58 +0000 Subject: [PATCH] flake: remove nix-serve even though upstream issue remains open, i observe a successful build via the nix-serve cache --- flake.lock | 34 ---------------------------------- flake.nix | 13 ------------- 2 files changed, 47 deletions(-) diff --git a/flake.lock b/flake.lock index 07d40c35..14fce428 100644 --- a/flake.lock +++ b/flake.lock @@ -34,39 +34,6 @@ "type": "github" } }, - "nix-serve": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1687251388, - "narHash": "sha256-E9cVlgeCvzPbA/G3mCDCzz8TdRwXyGYzIjmwcvIfghg=", - "owner": "edolstra", - "repo": "nix-serve", - "rev": "d6df5bd8584f37e22cff627db2fc4058a4aab5ee", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "nix-serve", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1606086654, - "narHash": "sha256-VFl+3eGIMqNp7cyOMJ6TjM/+UcsLKtodKoYexrlTJMI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "19db3e5ea2777daa874563b5986288151f502e27", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-20.09", - "type": "indirect" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1694908564, @@ -102,7 +69,6 @@ "root": { "inputs": { "mobile-nixos": "mobile-nixos", - "nix-serve": "nix-serve", "nixpkgs-unpatched": "nixpkgs-unpatched", "sops-nix": "sops-nix", "uninsane-dot-org": "uninsane-dot-org" diff --git a/flake.nix b/flake.nix index 8625c092..d07046ec 100644 --- a/flake.nix +++ b/flake.nix @@ -65,10 +65,6 @@ # inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs-unpatched"; }; - nix-serve = { - # - url = "github:edolstra/nix-serve"; - }; }; outputs = { @@ -77,7 +73,6 @@ mobile-nixos, sops-nix, uninsane-dot-org, - nix-serve, ... }@inputs: let @@ -206,17 +201,9 @@ let mobile = (import "${mobile-nixos}/overlay/overlay.nix"); uninsane = uninsane-dot-org.overlay; - # nix-serve' = nix-serve.overlay; - nix-serve' = next: prev: { - # XXX(2023/03/02): upstream isn't compatible with modern `nix`. probably the perl bindings. - # - we use the package built against `nixpkgs` specified in its flake rather than use its overlay, - # to get around this. - inherit (nix-serve.packages."${next.system}") nix-serve; - }; in (mobile final prev) // (uninsane final prev) - // (nix-serve' final prev) ; };