From d1485a964de78d58ac8365f2519465066e3f20ca Mon Sep 17 00:00:00 2001 From: blissful Date: Sat, 18 May 2024 16:57:41 -0400 Subject: [PATCH] rm zon2nix from master --- flake.lock | 45 +-------------------------------------------- flake.nix | 6 ------ 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index d3848f9..488bea8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "zon2nix-src", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -58,8 +37,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "zon2nix-src": "zon2nix-src" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -76,27 +54,6 @@ "repo": "default", "type": "github" } - }, - "zon2nix-src": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715536407, - "narHash": "sha256-ow/4w6dV2fpi/dY2SHksDg2pZZwam3dH29bCyR92pmI=", - "owner": "azuline", - "repo": "zon2nix", - "rev": "88a009e478480c313ed9c013d3efac411557c9ae", - "type": "github" - }, - "original": { - "owner": "azuline", - "repo": "zon2nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 78f6039..8f669e5 100644 --- a/flake.nix +++ b/flake.nix @@ -4,16 +4,12 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; - # Bug in upstream: https://github.com/nix-community/zon2nix/pull/8. - zon2nix-src.url = "github:azuline/zon2nix"; - zon2nix-src.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self , nixpkgs , flake-utils - , zon2nix-src }: flake-utils.lib.eachDefaultSystem (system: let @@ -55,7 +51,6 @@ python-with-deps = python-pin.withPackages (_: pkgs.lib.attrsets.mapAttrsToList (a: b: b) py-deps ); - zon2nix = zon2nix-src.packages.${system}.default; in { devShells.default = pkgs.mkShell { @@ -81,7 +76,6 @@ pkgs.nodePackages.pyright pkgs.nodePackages.prettier python-with-deps - zon2nix ]; }) ];