From 2301e01d48c90b60751005317de7a84a51a87eb6 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Sun, 18 Jun 2023 22:43:01 +0200 Subject: [PATCH] pkgs: update talloc and proot --- modules/environment/login/default.nix | 2 +- pkgs/cross-compiling/talloc-static.nix | 6 +++--- pkgs/proot-termux/default.nix | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix index 701dc41..e51fa6c 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/ri1shq027hlwsjk94vv82fdvdv37n69x-proot-termux-static-aarch64-unknown-linux-android-unstable-2022-05-03"; + prootStatic = "/nix/store/yrrs22jsl1y8niwzs2vvk0vblicr3903-proot-termux-static-aarch64-unknown-linux-android-unstable-2023-05-13"; }; }; diff --git a/pkgs/cross-compiling/talloc-static.nix b/pkgs/cross-compiling/talloc-static.nix index a155636..ffb8eb3 100644 --- a/pkgs/cross-compiling/talloc-static.nix +++ b/pkgs/cross-compiling/talloc-static.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. { callPackage , nixpkgs @@ -14,11 +14,11 @@ in pkgsCross.stdenv.mkDerivation rec { pname = "talloc"; - version = "2.3.4"; + version = "2.4.0"; src = fetchurl { url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "sha256-F5+eviZeZ+SrLCbK0rfeS2p3xsIS+WaQM4KGnwa+ZQU="; + sha256 = "sha256-bfNoYsQkZu+I82BERROHDvRpNPkBbIQ4PMQAin0MRro="; }; nativeBuildInputs = [ pkg-config python3 wafHook ]; diff --git a/pkgs/proot-termux/default.nix b/pkgs/proot-termux/default.nix index e09cc5e..f14c4ef 100644 --- a/pkgs/proot-termux/default.nix +++ b/pkgs/proot-termux/default.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. { stdenv , fetchFromGitHub @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "proot-termux"; - version = "unstable-2022-05-03"; + version = "unstable-2023-05-13"; src = fetchFromGitHub { repo = "proot"; owner = "termux"; - rev = "5c462a6ecfddd629b1439f38fbb61216d6fcb359"; - sha256 = "sha256-XS4js80NsAN2C4jMuISSqMm/DwYpH/stbABaxzoqZcE="; + rev = "2d7c70eec7e2688e465c7bfba60c927fad0abfb1"; + sha256 = "sha256-FgK5Rvl95yfH+aqTsJZ8HzSsCYIE3iLiQMFIlw0Z6oc="; }; # ashmem.h is rather small, our needs are even smaller, so just define these: @@ -27,6 +27,7 @@ stdenv.mkDerivation { #define ASHMEM_NAME_LEN 256 #define ASHMEM_SET_NAME _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN]) #define ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, size_t) + #define ASHMEM_GET_SIZE _IO(__ASHMEMIOC, 4) EOF '';