Skip to content

Commit 88815ca

Browse files
committed
adjust follow structure of flake inputs
1 parent 559106b commit 88815ca

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

{{cookiecutter.project_slug}}/flake.nix

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,19 @@
33
inputs = {
44
nixpkgs.url = "nixpkgs/nixos-unstable";
55
flake-utils.url = "github:numtide/flake-utils";
6-
pyproject-nix = {
7-
url = "github:pyproject-nix/pyproject.nix";
8-
inputs.nixpkgs.follows = "uv2nix/nixpkgs";
9-
# inputs.uv2nix.follows = "nixpkgs";
10-
};
6+
uv2nix.url = "github:pyproject-nix/uv2nix/680e2f8e637bc79b84268949d2f2b2f5e5f1d81c";
7+
# stale nixpkgs is missing the alias `lib.match` -> `builtins.match`
8+
# therefore point uv2nix to a patched nixpkgs, which introduces this alias
9+
# this is a temporary solution until nixpkgs us up-to-date again
10+
uv2nix.inputs.nixpkgs.url = "github:runtimeverification/nixpkgs/libmatch";
11+
# inputs.nixpkgs.follows = "nixpkgs";
12+
pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs/7dba6dbc73120e15b558754c26024f6c93015dd7";
1113
pyproject-build-systems = {
12-
url = "github:pyproject-nix/build-system-pkgs";
13-
inputs.pyproject-nix.follows = "pyproject-nix";
14-
inputs.uv2nix.follows = "uv2nix";
1514
inputs.nixpkgs.follows = "uv2nix/nixpkgs";
16-
# inputs.uv2nix.follows = "nixpkgs";
17-
};
18-
uv2nix = {
19-
url = "github:pyproject-nix/uv2nix";
20-
inputs.pyproject-nix.follows = "pyproject-nix";
21-
# stale nixpkgs is missing the alias `lib.match` -> `builtins.match`
22-
# therefore point uv2nix to a patched nixpkgs, which introduces this alias
23-
# this is a temporary solution until nixpkgs us up-to-date again
24-
inputs.nixpkgs.url = "github:runtimeverification/nixpkgs/libmatch";
25-
# inputs.uv2nix.follows = "nixpkgs";
15+
inputs.uv2nix.follows = "uv2nix";
16+
inputs.pyproject-nix.follows = "uv2nix/pyproject-nix";
2617
};
18+
pyproject-nix.follows = "uv2nix/pyproject-nix";
2719
};
2820
outputs = { self, nixpkgs, flake-utils, pyproject-nix, pyproject-build-systems, uv2nix }:
2921
let

0 commit comments

Comments
 (0)