From 0112d0135aab05913b128eec04107e0200b780c6 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 20 Jun 2022 15:35:18 +0200 Subject: [PATCH] ci(nix): update to latest nixpkgs-unstable Uses new implementation of autoPatchelf which only works on directories. --- ci/shell.nix | 8 ++++---- tests/download_emulators.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/shell.nix b/ci/shell.nix index 1a523b429..1d33e40e6 100644 --- a/ci/shell.nix +++ b/ci/shell.nix @@ -8,10 +8,10 @@ let url = "https://github.com/oxalica/rust-overlay/archive/2eae19e246433530998cbf239d5505b7b87bc854.tar.gz"; sha256 = "0panx24sqcvx52wza02zsxmpkhg6xld7hklrv7dybc59akqm2ira"; }); - # the last successful build of nixpkgs-unstable as of 2022-02-10 + # the last successful build of nixpkgs-unstable as of 2022-06-20 nixpkgs = import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/1882c6b7368fd284ad01b0a5b5601ef136321292.tar.gz"; - sha256 = "0zg7ak2mcmwzi2kg29g4v9fvbvs0viykjsg2pwaphm1fi13s7s0i"; + url = "https://github.com/NixOS/nixpkgs/archive/e0a42267f73ea52adc061a64650fddc59906fc99.tar.gz"; + sha256 = "0r1dsj51x2rm016xwvdnkm94v517jb1rpn4rk63k6krc4d0n3kh9"; }) { overlays = [ rustOverlay ]; }; # commit before python36 was removed python36nixpkgs = import (builtins.fetchTarball { @@ -88,7 +88,7 @@ stdenvNoCC.mkDerivation ({ openssl pkgconfig poetry - protobuf3_6 + protobuf pyright rustfmt rustStable diff --git a/tests/download_emulators.sh b/tests/download_emulators.sh index ba5cdd244..a205193ea 100755 --- a/tests/download_emulators.sh +++ b/tests/download_emulators.sh @@ -21,4 +21,4 @@ chmod u+x emulators/trezor-emu-* cd .. # are we in Nix(OS)? -command -v nix-shell >/dev/null && nix-shell --run "autoPatchelf tests/emulators/trezor-emu-*" +command -v nix-shell >/dev/null && nix-shell --run "autoPatchelf tests/emulators"