From dbdbea5bbe313934510cb6e040cc3e7a858ae253 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Sat, 17 Feb 2024 13:24:08 +0100 Subject: [PATCH] pkgs/nix-directory: update nix to 2.18.1 Co-authored-by: Tobias Happ --- pkgs/bootstrap.nix | 5 +++-- pkgs/nix-directory.nix | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/bootstrap.nix b/pkgs/bootstrap.nix index 7e76299f..74c47fa3 100644 --- a/pkgs/bootstrap.nix +++ b/pkgs/bootstrap.nix @@ -1,9 +1,10 @@ -# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE. { runCommand, nixDirectory, prootTermux, bash, pkgs, config, initialPackageInfo }: runCommand "bootstrap" { } '' - mkdir --parents $out/{.l2s,bin,dev/shm,etc,nix,root,tmp,usr/{bin,lib}} + mkdir --parents $out/{.l2s,bin,dev/shm,etc,root,tmp,usr/{bin,lib}} + mkdir --parents $out/nix/var/nix/{profiles,gcroots}/per-user/nix-on-droid cp --recursive ${nixDirectory}/store $out/nix/store cp --recursive ${nixDirectory}/var $out/nix/var diff --git a/pkgs/nix-directory.nix b/pkgs/nix-directory.nix index 99b32468..588e95d3 100644 --- a/pkgs/nix-directory.nix +++ b/pkgs/nix-directory.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE. { config, lib, stdenv, closureInfo, prootTermux, proot, pkgsStatic }: @@ -24,8 +24,8 @@ stdenv.mkDerivation { name = "nix-directory"; src = builtins.fetchurl { - url = "https://nixos.org/releases/nix/nix-2.16.1/nix-2.16.1-${config.build.arch}-linux.tar.xz"; - sha256 = "1v7k1cajyxgaq3adrzykaf0a32n5pyrd7njy0rns1fma85y8n944"; + url = "https://nixos.org/releases/nix/nix-2.18.1/nix-2.18.1-${config.build.arch}-linux.tar.xz"; + sha256 = "sha256:1m80azhagx30lpsx8lfs18q2swg8m73n2jck37cjflfwny7ghrc4"; }; PROOT_NO_SECCOMP = 1; # see https://github.com/proot-me/PRoot/issues/106