Skip to content

Commit 76359d7

Browse files
committed
adapt nix flake inputs for rv-nix-tools and nixpkgs
1 parent b880979 commit 76359d7

3 files changed

Lines changed: 182 additions & 38 deletions

File tree

flake.lock

Lines changed: 113 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,39 @@
11
{
22
description = "kup";
33
inputs = {
4-
nixpkgs.url = "nixpkgs/nixos-22.05";
4+
rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/854d4f05ea78547d46e807b414faad64cea10ae4";
5+
nixpkgs.follows = "rv-nix-tools/nixpkgs";
6+
57
flake-utils.url = "github:numtide/flake-utils";
68
poetry2nix.url = "github:nix-community/poetry2nix";
9+
poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
710
};
8-
outputs = { self, nixpkgs, flake-utils, poetry2nix }:
11+
outputs = { self, nixpkgs, rv-nix-tools, flake-utils, poetry2nix }:
912
let
1013
allOverlays = [
11-
poetry2nix.overlay
12-
(final: prev: {
13-
kup = prev.poetry2nix.mkPoetryApplication {
14+
poetry2nix.overlays.default
15+
(final: prev:
16+
let
17+
p2n = poetry2nix.lib.mkPoetry2Nix { pkgs = final; };
18+
in {
19+
kup = p2n.mkPoetryApplication {
1420
python = prev.python39;
1521
projectDir = ./.;
16-
groups = [];
1722
# We remove `"dev"` from `checkGroups`, so that poetry2nix does not try to resolve dev dependencies.
1823
checkGroups = [];
24+
overrides = p2n.defaultPoetryOverrides.extend
25+
(self: super: {
26+
tinynetrc = super.tinynetrc.overridePythonAttrs (
27+
old: {
28+
buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ];
29+
}
30+
);
31+
git-url-parse = super.git-url-parse.overridePythonAttrs (
32+
old: {
33+
buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ];
34+
}
35+
);
36+
});
1937
};
2038
})
2139
];

0 commit comments

Comments
 (0)