Merge pull request #297142 from Mic92/envfs

envfs: 1.0.3 -> 1.0.6

authored by Jörg Thalheim and committed by GitHub 2724e182 283fa362

+7 -3
+4
nixos/modules/tasks/filesystems/envfs.nix
··· 7 7 device = "none"; 8 8 fsType = "envfs"; 9 9 options = [ 10 + "bind-mount=/bin" 10 11 "fallback-path=${pkgs.runCommand "fallback-path" {} ('' 11 12 mkdir -p $out 12 13 ln -s ${config.environment.usrbinenv} $out/env ··· 15 16 "nofail" 16 17 ]; 17 18 }; 19 + # We need to bind-mount /bin to /usr/bin, because otherwise upgrading 20 + # from envfs < 1.0.5 will cause having the old envs with no /bin bind mount. 21 + # Systemd is smart enough to not mount /bin if it's already mounted. 18 22 "/bin" = { 19 23 device = "/usr/bin"; 20 24 fsType = "none";
+3 -3
pkgs/tools/filesystems/envfs/default.nix
··· 1 1 { rustPlatform, lib, fetchFromGitHub, nixosTests }: 2 2 rustPlatform.buildRustPackage rec { 3 3 pname = "envfs"; 4 - version = "1.0.3"; 4 + version = "1.0.6"; 5 5 src = fetchFromGitHub { 6 6 owner = "Mic92"; 7 7 repo = "envfs"; 8 8 rev = version; 9 - hash = "sha256-WbMqh/MzEMfZmKl/DNBGnzG3l8unFmAYbG6feSiMz+Y="; 9 + hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08="; 10 10 }; 11 - cargoHash = "sha256-RoreNBZvTsVY87nbVibJBy4gsafFwAMctVncAhhiaP8="; 11 + cargoHash = "sha256-isx4jBsA3HX6124R3qtwTqH5fLTAP7xdQD5bTzCAybo="; 12 12 13 13 passthru.tests = { 14 14 envfs = nixosTests.envfs;