diff --git a/flake.lock b/flake.lock index 1519732..acd49ab 100644 --- a/flake.lock +++ b/flake.lock @@ -60,17 +60,17 @@ }, "nixpkgs-for-bootstrap": { "locked": { - "lastModified": 1656265786, - "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=", + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd90e773eae83ba7733d2377b6cdf84d45558780", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd90e773eae83ba7733d2377b6cdf84d45558780", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", "type": "github" } }, diff --git a/flake.nix b/flake.nix index ae85c31..d037aee 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,9 @@ nixpkgs.url = "github:NixOS/nixpkgs"; # for bootstrap zip ball creation and proot-termux builds, we use a fixed version of nixpkgs to ease maintanence. - # head of nixos-22.05 as of 2022-06-27 + # head of nixos-22.11 as of 2022-12-01 # note: when updating nixpkgs-for-bootstrap, update store paths of proot-termux in modules/environment/login/default.nix - nixpkgs-for-bootstrap.url = "github:NixOS/nixpkgs/cd90e773eae83ba7733d2377b6cdf84d45558780"; + nixpkgs-for-bootstrap.url = "github:NixOS/nixpkgs/596a8e828c5dfa504f91918d0fa4152db3ab5502"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/modules/environment/login/default.nix b/modules/environment/login/default.nix index a89cf3f..fb45f2d 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/wsgnxpmrdmjy7qrsxvp7r5jandbabzjl-proot-termux-static-aarch64-unknown-linux-android-unstable-2022-05-03"; + prootStatic = "/nix/store/8xg8jnaczivjjrd9nq38qvrp9z7avib1-proot-termux-static-aarch64-unknown-linux-android-unstable-2022-05-03"; }; }; diff --git a/overlays/lib/nixpkgs.nix b/overlays/lib/nixpkgs.nix index 2ad1437..720dab7 100644 --- a/overlays/lib/nixpkgs.nix +++ b/overlays/lib/nixpkgs.nix @@ -3,12 +3,12 @@ { super }: let - # head of nixos-22.05 as of 2022-06-27 + # head of nixos-22.11 as of 2022-12-01 pinnedPkgsSrc = super.fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs"; - rev = "cd90e773eae83ba7733d2377b6cdf84d45558780"; - sha256 = "1b2wn1ncx9x4651vfcgyqrm93pd7ghnrgqjbkf6ckkpidah69m03"; + rev = "596a8e828c5dfa504f91918d0fa4152db3ab5502"; + sha256 = "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg="; }; in diff --git a/pkgs/nix-directory.nix b/pkgs/nix-directory.nix index 619660c..d9178ff 100644 --- a/pkgs/nix-directory.nix +++ b/pkgs/nix-directory.nix @@ -8,6 +8,7 @@ let prootCommand = lib.concatStringsSep " " [ "${proot}/bin/proot" "-b ${pkgsStatic.nix}:/static-nix" + "-b /proc:/proc" # needed because tries to access /proc/self/exe "-r ${buildRootDirectory}" "-w /" ]; @@ -30,7 +31,8 @@ stdenv.mkDerivation { PROOT_NO_SECCOMP = 1; # see https://github.com/proot-me/PRoot/issues/106 buildPhase = '' - mkdir --parents ${buildRootDirectory}/nix + # create nix state directory to satisfy nix heuristics to recognize the manual create /nix directory as valid nix store + mkdir --parents ${buildRootDirectory}/nix/var/nix/db cp --recursive store ${buildRootDirectory}/nix/store CACERT=$(find ${buildRootDirectory}/nix/store -path '*-nss-cacert-*/ca-bundle.crt' | sed 's,^${buildRootDirectory},,')