Commit 3e2aecb4 authored by Florian Franzen's avatar Florian Franzen
Browse files

flake: remove git submodule workaround

parent c7f110fb
......@@ -55,17 +55,20 @@
"polkadot-tests": {
"flake": false,
"locked": {
"lastModified": 1619441161,
"narHash": "sha256-UkJ8cTKNH4y9cJIJ1XXBwcgvEi+dsMYlAyYLyH1+Kwk=",
"owner": "w3f",
"repo": "polkadot-tests",
"rev": "b2c3b676d0dec89cc21bdfeddd98e95c152457be",
"type": "github"
"lastModified": 1624912680,
"narHash": "sha256-gILXdWRnwo93Ta5siqhaxib30vaOzbNuD1XzHSlWJx8=",
"ref": "main",
"rev": "eff73272cbbc1d331c391783118e19836ad2c892",
"revCount": 1188,
"submodules": true,
"type": "git",
"url": "https://github.com/w3f/polkadot-tests.git"
},
"original": {
"owner": "w3f",
"repo": "polkadot-tests",
"type": "github"
"ref": "main",
"submodules": true,
"type": "git",
"url": "https://github.com/w3f/polkadot-tests.git"
}
},
"root": {
......
......@@ -18,7 +18,13 @@
};
# Polkadot testsuite repo
polkadot-tests = { url = "github:w3f/polkadot-tests"; flake = false; };
polkadot-tests = {
url = "https://github.com/w3f/polkadot-tests.git";
ref = "main";
flake = false;
type = "git";
submodules = true;
};
};
outputs = { self, utils, nixpkgs, naersk, ... } @ sources :
......
......@@ -18,6 +18,7 @@
, boost_di
, prometheus-cpp
, schnorrkel_crust
, libnsl
}:
stdenv.mkDerivation rec {
......@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
patches = [
./dependencies.patch
./protobuf_path.patch
./headers.patch
];
nativeBuildInputs = [
......@@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = [
# Working upstream dependencies
protobuf
libnsl
# Patched upstream dependencies
gtest_cmake
......
......@@ -5,15 +5,10 @@
final: prev:
let
# Work-arounds for limitation of current stable nixUnstable
# Shared source inputs
sources = {
# Add submodules polkadot-tests source
polkadot-tests = builtins.fetchGit {
url = "git://github.com/w3f/polkadot-tests";
ref = "main";
inherit (polkadot-tests) rev;
submodules = true;
};
# Add polkadot-tests source
inherit polkadot-tests;
};
# Support derivations and environments used during build
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment