Skip to content

Commit

Permalink
Update poetry2nix (runtimeverification/pyk#706)
Browse files Browse the repository at this point in the history
The pyk update job in evm semantics is currently failing due to mismatch
with nixpkgs. The latest version of poetry2nix lets us choose which
nixpkgs get used to build poetry packages, by introducing `mkPoetry2Nix
{ pkgs = <my nixpkgs version here>; })`. This will allow us to use a
separate version of nixpkgs to build pyk vs the rest of k-framework, at
least until at least the time nixpkgs stable catches up with changes
described here: nix-community/poetry2nix#1291.
However, we may always want to use a custom version of nixpkgs for
poetry projects downstream, pinned to the version here. This should
ensure that if pyk builds in this repository, it will also build in all
the downstream projects which use it.

---------

Co-authored-by: devops <[email protected]>
  • Loading branch information
2 people authored and Baltoli committed Apr 10, 2024
1 parent 123243a commit 1ea8ef5
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 51 deletions.
56 changes: 13 additions & 43 deletions pyk/flake.lock

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

17 changes: 11 additions & 6 deletions pyk/flake.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
{
description = "Application packaged using poetry2nix";

inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.nixpkgs.url = "github:NixOS/nixpkgs";
inputs.poetry2nix.url = "github:nix-community/poetry2nix/master";
inputs.poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs";
poetry2nix = {
url =
"github:nix-community/poetry2nix/626111646fe236cb1ddc8191a48c75e072a82b7c";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-utils.follows = "poetry2nix/flake-utils";
};

outputs = { self, nixpkgs, flake-utils, poetry2nix }:
{
# Nixpkgs overlay providing the application
overlay = final: prev:
let
mkPyk = python:
prev.poetry2nix.mkPoetryApplication {
(poetry2nix.lib.mkPoetry2Nix { pkgs = prev; }).mkPoetryApplication {
python = python;
projectDir = ./.;
groups = [ ];
Expand All @@ -28,7 +33,7 @@
let
pkgs = import nixpkgs {
inherit system;
overlays = [ poetry2nix.overlay self.overlay ];
overlays = [ self.overlay ];
};
in {
packages = {
Expand Down
2 changes: 1 addition & 1 deletion pyk/package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.485
0.1.486
2 changes: 1 addition & 1 deletion pyk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "pyk"
version = "0.1.485"
version = "0.1.486"
description = ""
authors = [
"Runtime Verification, Inc. <[email protected]>",
Expand Down

0 comments on commit 1ea8ef5

Please sign in to comment.