From 53f8966627efafe24c3705ef0bab4d319dc8465c Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Wed, 21 Feb 2024 22:49:06 +0100 Subject: [PATCH] pkgs: update proot and talloc --- modules/environment/login/default.nix | 2 +- pkgs/cross-compiling/talloc-static.nix | 4 ++-- pkgs/proot-termux/default.nix | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix index 437dff3..9409c4c 100644 --- a/modules/environment/login/default.nix +++ b/modules/environment/login/default.nix @@ -82,7 +82,7 @@ in environment.files = { inherit login loginInner; - prootStatic = "/nix/store/42q6yf0x0ka6jxxbprmrkzimqi4rvi6d-proot-termux-static-aarch64-unknown-linux-android-unstable-2023-05-13"; + prootStatic = "/nix/store/7w09z1kw62wg7nv3q3z2p6kxf1ihk178-proot-termux-static-aarch64-unknown-linux-android-unstable-2023-11-11"; }; }; diff --git a/pkgs/cross-compiling/talloc-static.nix b/pkgs/cross-compiling/talloc-static.nix index 9c7f159..d8dff54 100644 --- a/pkgs/cross-compiling/talloc-static.nix +++ b/pkgs/cross-compiling/talloc-static.nix @@ -13,11 +13,11 @@ in pkgsCross.stdenv.mkDerivation rec { pname = "talloc"; - version = "2.4.0"; + version = "2.4.2"; src = fetchurl { url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "sha256-bfNoYsQkZu+I82BERROHDvRpNPkBbIQ4PMQAin0MRro="; + sha256 = "sha256-hez55GXiD5j5lQpS6aQR4UMgvFVfolfYdpe356mx2KY="; }; nativeBuildInputs = [ pkg-config python3 wafHook ]; diff --git a/pkgs/proot-termux/default.nix b/pkgs/proot-termux/default.nix index 51b5aa1..06e4b4d 100644 --- a/pkgs/proot-termux/default.nix +++ b/pkgs/proot-termux/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "proot-termux"; - version = "unstable-2023-05-13"; + version = "unstable-2023-11-11"; src = fetchFromGitHub { repo = "proot"; owner = "termux"; - rev = "2d7c70eec7e2688e465c7bfba60c927fad0abfb1"; - sha256 = "sha256-FgK5Rvl95yfH+aqTsJZ8HzSsCYIE3iLiQMFIlw0Z6oc="; + rev = "4af79603dae7a12d8767b61937d9e7e41e517701"; + sha256 = "sha256-7N2szHcjMB76GfzsQbn3eAkpLomd9FKSB2qU9d7L4Uw="; }; # ashmem.h is rather small, our needs are even smaller, so just define these: