From acb01916db9c3f1730b21589d8b98b8035d1e70b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 9 Jul 2021 11:47:57 +0200 Subject: [PATCH] ci(nix): update nixpkgs, use latest stable rust (1.53.0) --- ci/shell.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ci/shell.nix b/ci/shell.nix index b45f4fcf3..560a0de34 100644 --- a/ci/shell.nix +++ b/ci/shell.nix @@ -3,14 +3,15 @@ }: let + # the last commit from master as of 2021-07-09 rustOverlay = import (builtins.fetchTarball { - url = "https://github.com/oxalica/rust-overlay/archive/4d5d8e4288a8e0efd074e56a448e450b0f8df975.tar.gz"; - sha256 = "1v3xlpna3q5klnhrn3p43bdh24ynaf31s2980r98ypvdpi2wi018"; + url = "https://github.com/oxalica/rust-overlay/archive/76732f3ddba766b1fe772fca80aafbc9cccd78dd.tar.gz"; + sha256 = "0lqwxn28malsjxw8hxp4iwax5v0mlwi4l5q0cxfacq153gi6j0f8"; }); - # the last successful build of nixpkgs-unstable as of 2021-05-07 + # the last successful build of nixpkgs-unstable as of 2021-07-09 nixpkgs = import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/e62feb3bf4a603e26755238303bda0c24651e155.tar.gz"; - sha256 = "1gkamm044jrksjrisr7h9grg8p2y6rk01x6391asrx988hm2rh9s"; + url = "https://github.com/NixOS/nixpkgs/archive/7b4ff2184e4cab274ecb2b2eb49d20ef2142ddf1.tar.gz"; + sha256 = "1gdjm0qv5x9jx3zps7vz6yh10rkhmrbk7vf0b2hx5x6wi8yngfnb"; }) { overlays = [ rustOverlay ]; }; moneroTests = nixpkgs.fetchurl { url = "https://github.com/ph4r05/monero/releases/download/v0.17.1.9-tests/trezor_tests"; @@ -22,7 +23,7 @@ let ${nixpkgs.patchelf}/bin/patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out" chmod -w $out ''; - rustStable = nixpkgs.rust-bin.stable."1.52.1".default.override { + rustStable = nixpkgs.rust-bin.stable."1.53.0".default.override { targets = [ "thumbv7em-none-eabihf" # TT "thumbv7m-none-eabi" # T1 @@ -94,7 +95,7 @@ stdenv.mkDerivation ({ SOURCE_DATE_EPOCH = 1600000000; # Used by rust bindgen - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; } // (lib.optionalAttrs fullDeps) { TREZOR_MONERO_TESTS_PATH = moneroTestsPatched; })