Skip to content

Commit

Permalink
Revert "rm zon2nix from master"
Browse files Browse the repository at this point in the history
This reverts commit d1485a9.
  • Loading branch information
azuline committed May 18, 2024
1 parent 623800c commit 81723ae
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 1 deletion.
45 changes: 44 additions & 1 deletion flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -80,6 +85,7 @@
pkgs.zig
pkgs.zls
python-with-deps
zon2nix
];
})
];
Expand Down

0 comments on commit 81723ae

Please sign in to comment.