Skip to content

Commit 568702a

Browse files
rv-jenkinsrv-auditorRobertorosmaninhojuliankuners
authored
Update dependency: deps/k_release (#207)
* deps/k_release: Set Version 7.1.167 * krypto/: sync poetry files pyk version 7.1.167 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.169 * krypto/: sync poetry files pyk version 7.1.169 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.170 * krypto/: sync poetry files pyk version 7.1.170 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.173 * krypto/: sync poetry files pyk version 7.1.173 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.174 * krypto/: sync poetry files pyk version 7.1.174 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.177 * krypto/: sync poetry files pyk version 7.1.177 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.178 * krypto/: sync poetry files pyk version 7.1.178 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.179 * krypto/: sync poetry files pyk version 7.1.179 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.180 * krypto/: sync poetry files pyk version 7.1.180 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.181 * krypto/: sync poetry files pyk version 7.1.181 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.182 * krypto/: sync poetry files pyk version 7.1.182 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.183 * krypto/: sync poetry files pyk version 7.1.183 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.184 * deps/k_release: Set Version 7.1.186 * krypto/: sync poetry files pyk version 7.1.186 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.187 * krypto/: sync poetry files pyk version 7.1.187 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.190 * krypto/: sync poetry files pyk version 7.1.190 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.191 * deps/k_release: Set Version 7.1.193 * krypto/: sync poetry files pyk version 7.1.193 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.194 * krypto/: sync poetry files pyk version 7.1.194 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.195 * deps/k_release: Set Version 7.1.196 * krypto/: sync poetry files pyk version 7.1.196 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.198 * krypto/: sync poetry files pyk version 7.1.198 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.199 * krypto/: sync poetry files pyk version 7.1.199 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.201 * deps/k_release: Set Version 7.1.202 * krypto/: sync poetry files pyk version 7.1.202 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.203 * krypto/: sync poetry files pyk version 7.1.203 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.204 * krypto/: sync poetry files pyk version 7.1.204 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.205 * krypto/: sync poetry files pyk version 7.1.205 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.207 * krypto/: sync poetry files pyk version 7.1.207 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.208 * krypto/: sync poetry files pyk version 7.1.208 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.210 * krypto/: sync poetry files pyk version 7.1.210 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.211 * deps/k_release: Set Version 7.1.212 * krypto/: sync poetry files pyk version 7.1.212 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.217 * krypto/: sync poetry files pyk version 7.1.217 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.218 * krypto/: sync poetry files pyk version 7.1.218 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.219 * krypto/: sync poetry files pyk version 7.1.219 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.220 * krypto/: sync poetry files pyk version 7.1.220 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.222 * krypto/: sync poetry files pyk version 7.1.222 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.223 * krypto/: sync poetry files pyk version 7.1.223 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.224 * krypto/: sync poetry files pyk version 7.1.224 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.225 * krypto/: sync poetry files pyk version 7.1.225 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.226 * krypto/: sync poetry files pyk version 7.1.226 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.227 * krypto/: sync poetry files pyk version 7.1.227 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.228 * deps/k_release: Set Version 7.1.229 * krypto/: sync poetry files pyk version 7.1.229 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.230 * krypto/: sync poetry files pyk version 7.1.230 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.232 * krypto/: sync poetry files pyk version 7.1.232 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.235 * krypto/: sync poetry files pyk version 7.1.235 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.236 * krypto/: sync poetry files pyk version 7.1.236 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.237 * deps/k_release: Set Version 7.1.238 * deps/k_release: Set Version 7.1.240 * krypto/: sync poetry files pyk version 7.1.240 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.241 * deps/k_release: Set Version 7.1.242 * krypto/: sync poetry files pyk version 7.1.242 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.243 * krypto/: sync poetry files pyk version 7.1.243 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.244 * deps/k_release: Set Version 7.1.245 * deps/k_release: Set Version 7.1.246 * deps/k_release: Set Version 7.1.247 * deps/k_release: Set Version 7.1.248 * krypto/: sync poetry files pyk version 7.1.248 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.249 * krypto/: sync poetry files pyk version 7.1.249 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.251 * krypto/: sync poetry files pyk version 7.1.251 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.252 * krypto/: sync poetry files pyk version 7.1.252 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.253 * krypto/: sync poetry files pyk version 7.1.253 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.254 * krypto/: sync poetry files pyk version 7.1.254 * flake.{nix,lock}: update Nix derivations * Replacing C++17 with C++20 * krypto/: sync poetry files pyk version 7.1.254 * Trying to fix python isort dependency * krypto/: sync poetry files pyk version 7.1.254 * Trying to fix python isort dependency * krypto/: sync poetry files pyk version 7.1.254 * Trying to fix python isort dependency * krypto/: sync poetry files pyk version 7.1.254 * Trying to fix python isort dependency * Trying to fix python isort dependency * Trying to fix python isort dependency * Trying to fix python isort dependency * Removing tentatives to fix dependencies * krypto/: sync poetry files pyk version 7.1.254 * add build dependencies to poetry overlay * add temporary patches for nix python build systems * deps/k_release: Set Version 7.1.255 * krypto/: sync poetry files pyk version 7.1.255 * flake.{nix,lock}: update Nix derivations --------- Co-authored-by: devops <devops@runtimeverification.com> Co-authored-by: Roberto Rosmaninho <roberto.rosmaninho@pi2.network> Co-authored-by: Julian Kuners <julian.kuners@gmail.com>
1 parent c7d635c commit 568702a

10 files changed

Lines changed: 1023 additions & 335 deletions

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $(PREFIX)/libff/lib/libff.a:
7777

7878
C_KZG_4844 := $(CURDIR)/deps/c-kzg-4844
7979
C_KZG_4844_CFLAGS := -fPIC -O2 -I$(C_KZG_4844)/src -I$(C_KZG_4844)/inc
80-
C_KZG_4844_CXXFLAGS := $(C_KZG_4844_CFLAGS) -std=c++17
80+
C_KZG_4844_CXXFLAGS := $(C_KZG_4844_CFLAGS) -std=c++20
8181

8282
BLST := $(C_KZG_4844)/blst
8383

@@ -136,7 +136,7 @@ ifneq ($(APPLE_SILICON),)
136136
INCLUDES += -I $(GMP_PREFIX)/include -I $(MPFR_PREFIX)/include -I $(OPENSSL_PREFIX)/include -I $(CRYPTOPP_PREFIX)/include -I $(SECP256K1_PREFIX)/include -I $(BOOST_PREFIX)/include
137137
endif
138138

139-
CPPFLAGS += --std=c++17 -fPIC -O3 $(INCLUDES)
139+
CPPFLAGS += --std=c++20 -fPIC -O3 $(INCLUDES)
140140

141141
plugin-c/%.o: plugin-c/%.cpp $(PREFIX)/libcryptopp/lib/libcryptopp.a $(PREFIX)/libff/lib/libff.a $(PREFIX)/c-kzg-4844/lib/libckzg.a $(PREFIX)/c-kzg-4844/lib/libblst.a
142142
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<

‎deps/k_release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.166
1+
7.1.255

‎flake.lock‎

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

‎flake.nix‎

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "Blockchain K plugin";
33

44
inputs = {
5-
k-framework.url = "github:runtimeverification/k/v7.1.166";
5+
k-framework.url = "github:runtimeverification/k/v7.1.255";
66
nixpkgs.follows = "k-framework/nixpkgs";
77
flake-utils.follows = "k-framework/flake-utils";
88
rv-utils.follows = "k-framework/rv-utils";
@@ -130,11 +130,49 @@
130130
overrides = poetry2nix.overrides.withDefaults
131131
(finalPython: prevPython: {
132132
kframework = prev.pyk-python310;
133-
flake8-type-checking =
134-
prevPython.flake8-type-checking.overridePythonAttrs (old: {
135-
propagatedBuildInputs = (old.propagatedBuildInputs or [ ])
136-
++ [ finalPython.poetry ];
137-
});
133+
flake8-type-checking = prevPython.flake8-type-checking.overridePythonAttrs (old: {
134+
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [
135+
finalPython.poetry
136+
];
137+
});
138+
autoflake = prevPython.autoflake.overrideAttrs(_: super: {
139+
nativeBuildInputs = super.nativeBuildInputs ++ [ prevPython.hatchling ];
140+
});
141+
isort = prevPython.isort.overridePythonAttrs (
142+
old: {
143+
buildInputs = (old.buildInputs or [ ]) ++ [ prevPython.hatchling ];
144+
}
145+
);
146+
mypy-extensions = prevPython.mypy-extensions.overridePythonAttrs (
147+
old: {
148+
buildInputs = (old.buildInputs or [ ]) ++ [ prevPython.flit-core ];
149+
patches = (old.patches or [ ]) ++ [
150+
./nix/resources/mypy-extensions-pyproject.toml.patch
151+
];
152+
}
153+
);
154+
click = prevPython.click.overridePythonAttrs (
155+
old: {
156+
buildInputs = (old.buildInputs or [ ]) ++ [ prevPython.flit-core ];
157+
patches = (old.patches or [ ]) ++ [
158+
./nix/resources/click-pyproject.toml.patch
159+
];
160+
}
161+
);
162+
typing-extensions = prevPython.typing-extensions.overridePythonAttrs (
163+
old: {
164+
patches = (old.patches or [ ]) ++ [
165+
./nix/resources/typing-extensions-pyproject.toml.patch
166+
];
167+
}
168+
);
169+
attrs = prevPython.attrs.overridePythonAttrs (
170+
old: {
171+
patches = (old.patches or [ ]) ++ [
172+
./nix/resources/attrs-pyproject.toml.patch
173+
];
174+
}
175+
);
138176
});
139177

140178
checkPhase = ''

0 commit comments

Comments
 (0)