From 3a8e8369a67cb68e0e267413c36d997e9e3f670c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 19 Mar 2024 11:06:21 +0100 Subject: [PATCH] envfs: 1.0.3 -> 1.0.6 Diff: https://github.com/Mic92/envfs/compare/1.0.3...1.0.6 --- nixos/modules/tasks/filesystems/envfs.nix | 4 ++++ pkgs/tools/filesystems/envfs/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/envfs.nix b/nixos/modules/tasks/filesystems/envfs.nix index 365cb46ff2fe..6719a03610d1 100644 --- a/nixos/modules/tasks/filesystems/envfs.nix +++ b/nixos/modules/tasks/filesystems/envfs.nix @@ -7,6 +7,7 @@ let device = "none"; fsType = "envfs"; options = [ + "bind-mount=/bin" "fallback-path=${pkgs.runCommand "fallback-path" {} ('' mkdir -p $out ln -s ${config.environment.usrbinenv} $out/env @@ -15,6 +16,9 @@ let "nofail" ]; }; + # We need to bind-mount /bin to /usr/bin, because otherwise upgrading + # from envfs < 1.0.5 will cause having the old envs with no /bin bind mount. + # Systemd is smart enough to not mount /bin if it's already mounted. "/bin" = { device = "/usr/bin"; fsType = "none"; diff --git a/pkgs/tools/filesystems/envfs/default.nix b/pkgs/tools/filesystems/envfs/default.nix index e91df03f7da1..c5de89fdfffd 100644 --- a/pkgs/tools/filesystems/envfs/default.nix +++ b/pkgs/tools/filesystems/envfs/default.nix @@ -1,14 +1,14 @@ { rustPlatform, lib, fetchFromGitHub, nixosTests }: rustPlatform.buildRustPackage rec { pname = "envfs"; - version = "1.0.3"; + version = "1.0.6"; src = fetchFromGitHub { owner = "Mic92"; repo = "envfs"; rev = version; - hash = "sha256-WbMqh/MzEMfZmKl/DNBGnzG3l8unFmAYbG6feSiMz+Y="; + hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08="; }; - cargoHash = "sha256-RoreNBZvTsVY87nbVibJBy4gsafFwAMctVncAhhiaP8="; + cargoHash = "sha256-isx4jBsA3HX6124R3qtwTqH5fLTAP7xdQD5bTzCAybo="; passthru.tests = { envfs = nixosTests.envfs;