Skip to content

Commit

Permalink
Update poetry2nix (#4620)
Browse files Browse the repository at this point in the history
Update poetry2nix as it was pinned to a version that's almost 1 year
old. This gets rid of the annoying warning

```
trace: warning: `pythonForBuild` (from `python*`) has been renamed to `pythonOnBuildForHost`
```

Also remove the pyk flake, remnant of the merger of pyk back into k
  • Loading branch information
goodlyrottenapple authored Sep 3, 2024
1 parent 9658422 commit dc4e8d9
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 215 deletions.
8 changes: 4 additions & 4 deletions flake.lock

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

21 changes: 12 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
};

poetry2nix = {
url =
"github:nix-community/poetry2nix/626111646fe236cb1ddc8191a48c75e072a82b7c";
url = "github:nix-community/poetry2nix/2024.9.219347";
inputs.nixpkgs.follows = "llvm-backend/nixpkgs";
};

Expand Down Expand Up @@ -94,9 +93,8 @@
"org.checkerframework:checker-qual:3.33.0"
"com.google.errorprone:error_prone_annotations:2.18.0"
];
manualMvnSourceArtifacts = [
"org.scala-sbt:compiler-bridge_2.13:1.8.0"
];
manualMvnSourceArtifacts =
[ "org.scala-sbt:compiler-bridge_2.13:1.8.0" ];
inherit (final) maven;
inherit (prev) llvm-backend;
clang = prev."clang_${toString final.llvm-version}";
Expand Down Expand Up @@ -210,13 +208,18 @@
};
};
defaultPackage = packages.k;
devShells.kore-integration-tests = pkgs.kore-tests (pkgs.mk-k-framework {
inherit (pkgs) haskell-backend-bins;
llvm-kompile-libs = { };
});
devShells.kore-integration-tests = pkgs.kore-tests
(pkgs.mk-k-framework {
inherit (pkgs) haskell-backend-bins;
llvm-kompile-libs = { };
});
}) // {
overlays.llvm-backend = llvm-backend.overlays.default;
overlays.z3 = haskell-backend.overlays.z3;
overlays.pyk = (import ./nix/pyk-overlay.nix {
inherit poetry2nix;
projectDir = ./pyk;
});

overlay = nixpkgs.lib.composeManyExtensions allOverlays;
};
Expand Down
168 changes: 0 additions & 168 deletions pyk/flake.lock

This file was deleted.

34 changes: 0 additions & 34 deletions pyk/flake.nix

This file was deleted.

0 comments on commit dc4e8d9

Please sign in to comment.