From 281023968e9f5a59fa1552564e23f5a6544df3d8 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Wed, 8 Dec 2021 23:25:18 +0100 Subject: [PATCH] pkgs/cross-compiling/proot-termux: update --- modules/environment/login/default.nix | 4 ++-- pkgs/cross-compiling/proot-termux.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix index 5096904f..e9d2aad6 100644 --- a/modules/environment/login/default.nix +++ b/modules/environment/login/default.nix @@ -85,8 +85,8 @@ in prootStatic = let crossCompiledPaths = { - aarch64 = "/nix/store/7j051wmlb19l8f89v78kmv52bbsz5b6l-proot-termux-aarch64-unknown-linux-android-unstable-2021-05-19"; - i686 = "/nix/store/nbgaw5xm6q5iv43p374h0p0qfdm1cmcz-proot-termux-i686-unknown-linux-android-unstable-2021-05-19"; + aarch64 = "/nix/store/45jqhgc0cg1l6vrl95p3qg3j4wh6w59y-proot-termux-aarch64-unknown-linux-android-unstable-2021-11-21"; + i686 = "/nix/store/8nww78ndkbxqhi4h9f0ly9zkwixa0cd9-proot-termux-i686-unknown-linux-android-unstable-2021-11-21"; }; in "${crossCompiledPaths.${config.build.arch}}"; diff --git a/pkgs/cross-compiling/proot-termux.nix b/pkgs/cross-compiling/proot-termux.nix index 2c790ee3..8baac434 100644 --- a/pkgs/cross-compiling/proot-termux.nix +++ b/pkgs/cross-compiling/proot-termux.nix @@ -10,13 +10,13 @@ in stdenv.mkDerivation { pname = "proot-termux"; - version = "unstable-2021-05-19"; + version = "unstable-2021-11-21"; src = fetchFromGitHub { repo = "proot"; owner = "termux"; - rev = "3b7369b8eb8b2a879aade2b403b3ac0eb848b9ed"; # the one with make fix - sha256 = "1wrrar08axfwrma7yp2zlf61cz4crypr3m1jnhkqng7p1pry1cay"; + rev = "7d6bdd9f6cf31144e11ce65648dab2a1e495a7de"; + sha256 = "sha256-sbueMoqhOw0eChgp6KOZbhwRnSmDZhHq+jm06mGqxC4="; # 1 step behind 6f12fbee "Implement shmat", use if ashmem.h is missing #rev = "ffd811ee726c62094477ed335de89fc107cadf17";