Revert "rm zon2nix from master"

This reverts commit d1485a9.
azuline · May 18, 2024 · 81723ae · 81723ae
1 parent 623800c
commit 81723ae
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,12 +4,16 @@
   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
@@ -52,6 +56,7 @@
       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 {
@@ -80,6 +85,7 @@
               pkgs.zig
               pkgs.zls
               python-with-deps
+              zon2nix
             ];
           })
         ];