From 4adbb4e8e185f58197d6a9723ccdd8e048cb88ce Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Fri, 22 Jan 2021 13:45:49 +0100 Subject: [PATCH] ci: use same pinned nixpkgs for hardware tests --- ci/hardware_tests/{default.nix => shell.nix} | 2 +- ci/nixpkgs.nix | 5 +++++ ci/shell.nix | 9 +-------- 3 files changed, 7 insertions(+), 9 deletions(-) rename ci/hardware_tests/{default.nix => shell.nix} (88%) create mode 100644 ci/nixpkgs.nix diff --git a/ci/hardware_tests/default.nix b/ci/hardware_tests/shell.nix similarity index 88% rename from ci/hardware_tests/default.nix rename to ci/hardware_tests/shell.nix index fb10f7949..6ad754cd5 100644 --- a/ci/hardware_tests/default.nix +++ b/ci/hardware_tests/shell.nix @@ -1,4 +1,4 @@ -with import {}; +with import ../nixpkgs.nix; stdenv.mkDerivation rec { name = "trezor-firmware-hardware-tests"; diff --git a/ci/nixpkgs.nix b/ci/nixpkgs.nix new file mode 100644 index 000000000..c88990e09 --- /dev/null +++ b/ci/nixpkgs.nix @@ -0,0 +1,5 @@ +# the last successful build of nixpkgs-unstable as of 2020-12-30 +import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/bea44d5ebe332260aa34a1bd48250b6364527356.tar.gz"; + sha256 = "14sfk04iyvyh3jl1s2wayw1y077dwpk2d712nhjk1wwfjkdq03r3"; +}) { } diff --git a/ci/shell.nix b/ci/shell.nix index b66666545..ff851a50c 100644 --- a/ci/shell.nix +++ b/ci/shell.nix @@ -1,13 +1,6 @@ { fullDeps ? false }: -# the last successful build of nixpkgs-unstable as of 2020-12-30 -with import - (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/bea44d5ebe332260aa34a1bd48250b6364527356.tar.gz"; - sha256 = "14sfk04iyvyh3jl1s2wayw1y077dwpk2d712nhjk1wwfjkdq03r3"; - }) -{ }; - +with import ./nixpkgs.nix; let moneroTests = fetchurl { url = "https://github.com/ph4r05/monero/releases/download/v0.17.1.9-tests/trezor_tests";