Skip to content

Commit

Permalink
Remove pyk from nix (#2864)
Browse files Browse the repository at this point in the history
* remove pyk from nix

* update flake.lock
  • Loading branch information
goodlyrottenapple authored and tothtamas28 committed Sep 13, 2022
1 parent a26d314 commit 663f280
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 60 deletions.
50 changes: 0 additions & 50 deletions flake.lock

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

12 changes: 2 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@
url = "github:edolstra/flake-compat";
flake = false;
};
poetry2nix.url = "github:nix-community/poetry2nix";
};

outputs = { self, nixpkgs, flake-utils, rv-utils, haskell-backend
, llvm-backend, mavenix, flake-compat, poetry2nix }:
, llvm-backend, mavenix, flake-compat }:
let
allOverlays = [
poetry2nix.overlay
mavenix.overlay
llvm-backend.overlays.default
haskell-backend.overlay # used only to override the z3 version to the same one as used by the haskell backend.
Expand Down Expand Up @@ -66,11 +64,6 @@
prev.gdb;
version = "${k-version}-${self.rev or "dirty"}";
};

pyk = prev.poetry2nix.mkPoetryApplication {
python = prev.python39;
projectDir = ./pyk;
};
})
];
in flake-utils.lib.eachSystem [
Expand Down Expand Up @@ -105,12 +98,11 @@
in rec {

packages = rec {
inherit (pkgs) pyk;
k = pkgs.k-framework haskell-backend-bins;

# This is a copy of the `nix/update-maven.sh` script, which should be
# eventually removed. Having this inside the flake provides a uniform
# interface, i.e. we have `update-maven`/`update-python` in k and
# interface, i.e. we have `update-maven` in k and
# `update-cabal` in the haskell-backend.
# The first `nix-build` command below ensures k source is loaded into the Nix store.
# This command will fail, but only after loading the source.
Expand Down

0 comments on commit 663f280

Please sign in to comment.