colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #297142 from Mic92/envfs 

envfs: 1.0.3 -> 1.0.6
This commit is contained in:
Jörg Thalheim 2024-03-25 12:36:03 +01:00 committed by GitHub
parent 283fa362e6 3a8e8369a6
commit 2724e18228
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/tasks/filesystems/envfs.nix
View File

@ -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";

6
pkgs/tools/filesystems/envfs/default.nix
View File

@ -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;