Skip to content

Commit

Permalink
Update dependency: kmultiversx/src/kmultiversx/kdist/plugin (#318)
Browse files Browse the repository at this point in the history
* kmultiversx/src/kmultiversx/kdist/plugin: Set Version 3eefb763b85c33fed80da6c7cdeb4c7dd297668c

* Set Version: 0.1.108

* kmultiversx/: sync poetry files 0.1.95

* deps/blockchain-k-plugin_release: sync release file version 3eefb763b85c33fed80da6c7cdeb4c7dd297668c

* flake.{nix,lock}: update Nix derivations

* kmultiversx/src/kmultiversx/kdist/plugin: Set Version 7a480319603205bee3d28c4ea058d917c1920760

* kmultiversx/: sync poetry files 0.1.95

* deps/blockchain-k-plugin_release: sync release file version 7a480319603205bee3d28c4ea058d917c1920760

* flake.{nix,lock}: update Nix derivations

* kmultiversx/src/kmultiversx/kdist/plugin: Set Version 64bb64b6c908c15b3dfe67ace70936b7d3913672

* Set Version: 0.1.109

* kmultiversx/: sync poetry files 0.1.95

* deps/blockchain-k-plugin_release: sync release file version 64bb64b6c908c15b3dfe67ace70936b7d3913672

* flake.{nix,lock}: update Nix derivations

* Simplify `plugin` build

* kmultiversx/: sync poetry files 0.1.95

* fix cmd2 deps & format flake

* Add `boost` to `flake.nix`

---------

Co-authored-by: devops <devops@runtimeverification.com>
Co-authored-by: Tamás Tóth <tothtamas28@users.noreply.github.com>
Co-authored-by: Sam Balco <goodlyrottenapple@gmail.com>
  • Loading branch information
4 people authored Aug 20, 2024
1 parent 2e8b3ed commit c1b7623
Show file tree
Hide file tree
Showing 10 changed files with 218 additions and 221 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ RUN apt-get update \
curl \
wget \
libcrypto++-dev \
libprocps-dev \
libsecp256k1-dev \
libssl-dev \
pandoc \
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ sudo apt-get install --yes \
curl \
wget \
libcrypto++-dev \
libprocps-dev \
libsecp256k1-dev \
libssl-dev \
python3 \
Expand All @@ -45,7 +44,7 @@ bash <(curl https://kframework.org/install)
```
Once `kup` is installed, to get the correct version of K run:
```bash
kup install k.openssl.procps.secp256k1 --version v$(cat deps/k_release)
kup install k.openssl.secp256k1 --version v$(cat deps/k_release)
```

#### Poetry
Expand Down
2 changes: 1 addition & 1 deletion deps/blockchain-k-plugin_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
415b8ce8fa594f41ce3a3f29fc83e954284f81cf
64bb64b6c908c15b3dfe67ace70936b7d3913672
32 changes: 16 additions & 16 deletions flake.lock

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

62 changes: 33 additions & 29 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
poetry2nix.follows = "pyk/poetry2nix";
blockchain-k-plugin = {
url =
"github:runtimeverification/blockchain-k-plugin/415b8ce8fa594f41ce3a3f29fc83e954284f81cf";
"github:runtimeverification/blockchain-k-plugin/64bb64b6c908c15b3dfe67ace70936b7d3913672";
inputs.flake-utils.follows = "k-framework/flake-utils";
inputs.nixpkgs.follows = "k-framework/nixpkgs";
};
};

outputs =
{ self, k-framework, nixpkgs, flake-utils, rv-utils, pyk, nixpkgs-pyk, poetry2nix, wasm-semantics, blockchain-k-plugin }@inputs:
outputs = { self, k-framework, nixpkgs, flake-utils, rv-utils, pyk
, nixpkgs-pyk, poetry2nix, wasm-semantics, blockchain-k-plugin }@inputs:
let
overlay = (final: prev:
let
Expand All @@ -38,18 +38,18 @@

python310-pyk = nixpkgs-pyk.python310;

poetry2nix = inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = nixpkgs-pyk; };
poetry2nix =
inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = nixpkgs-pyk; };
in {
kmultiversx-src = prev.stdenv.mkDerivation {
name = "kmultiversx-${self.rev or "dirty"}-src";
src = prev.lib.cleanSource
(prev.nix-gitignore.gitignoreSourcePure [
./.gitignore
".github/"
"result*"
"*.nix"
"deps/"
] ./.);
src = prev.lib.cleanSource (prev.nix-gitignore.gitignoreSourcePure [
./.gitignore
".github/"
"result*"
"*.nix"
"deps/"
] ./.);
dontBuild = true;

installPhase = ''
Expand All @@ -70,13 +70,13 @@
secp256k1
nixpkgs-pyk.pyk-python310
k-framework.packages.${system}.k
kmultiversx-pyk
kmultiversx-pyk
boost
cmake
openssl.dev
clang
mpfr
pkg-config
procps
llvmPackages.llvm
];

Expand Down Expand Up @@ -111,21 +111,28 @@
cleaner = poetry2nix.cleanPythonSources;
};
overrides = poetry2nix.overrides.withDefaults
(finalPython: prevPython: {
kframework = nixpkgs-pyk.pyk-python310.overridePythonAttrs
(old: {
(finalPython: prevPython: {
cmd2 = prevPython.cmd2.overridePythonAttrs (old: {
propagatedBuildInputs = prev.lib.filter
(x: !(prev.lib.strings.hasInfix "hypothesis" x.name))
old.propagatedBuildInputs ++ [ finalPython.hypothesis ];
(x: !(prev.lib.strings.hasInfix "attrs" x.name))
old.propagatedBuildInputs ++ [ finalPython.attrs ];
});
pykwasm =
wasm-semantics.packages.${prev.system}.kwasm-pyk.overridePythonAttrs
kframework = nixpkgs-pyk.pyk-python310.overridePythonAttrs
(old: {
propagatedBuildInputs = prev.lib.filter (x:
!(prev.lib.strings.hasInfix "hypothesis" x.name)
&& !(prev.lib.strings.hasInfix "cmd2" x.name))
old.propagatedBuildInputs
++ [ finalPython.hypothesis finalPython.cmd2 ];
});
pykwasm =
wasm-semantics.packages.${prev.system}.kwasm-pyk.overridePythonAttrs
(old: {
propagatedBuildInputs = prev.lib.filter
(x: !(prev.lib.strings.hasInfix "kframework" x.name))
old.propagatedBuildInputs ++ [ finalPython.kframework ];
});
});
});
groups = [ ];
checkGroups = [ ];
postInstall = ''
Expand All @@ -143,17 +150,14 @@
let
pkgs = import nixpkgs {
inherit system;
overlays = [
blockchain-k-plugin.overlay
overlay
];
overlays = [ blockchain-k-plugin.overlay overlay ];
};
in {
packages = rec {
inherit (pkgs) kmultiversx kmultiversx-pyk;
default = pkgs.kmultiversx;
};
}) // {
overlays.default = overlay;
};
}) // {
overlays.default = overlay;
};
}
Loading

0 comments on commit c1b7623

Please sign in to comment.