movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

envfs: 1.0.3 -> 1.0.6

Browse source 
Diff: https://github.com/Mic92/envfs/compare/1.0.3...1.0.6
This commit is contained in:
Jörg Thalheim 2024-03-19 11:06:21 +01:00
parent b36fb37731
commit 3a8e8369a6
2 changed files with 7 additions and 3 deletions
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"; device = "none";
fsType = "envfs"; fsType = "envfs";
options = [ options = [
"bind-mount=/bin"
"fallback-path=${pkgs.runCommand "fallback-path" {} ('' "fallback-path=${pkgs.runCommand "fallback-path" {} (''
mkdir -p $out mkdir -p $out
ln -s ${config.environment.usrbinenv} $out/env ln -s ${config.environment.usrbinenv} $out/env
@ -15,6 +16,9 @@ let
"nofail" "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" = { "/bin" = {
device = "/usr/bin"; device = "/usr/bin";
fsType = "none"; fsType = "none";

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

@ -1,14 +1,14 @@
{ rustPlatform, lib, fetchFromGitHub, nixosTests }: { rustPlatform, lib, fetchFromGitHub, nixosTests }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "envfs"; pname = "envfs";
version = "1.0.3"; version = "1.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mic92"; owner = "Mic92";
repo = "envfs"; repo = "envfs";
rev = version; rev = version;
hash = "sha256-WbMqh/MzEMfZmKl/DNBGnzG3l8unFmAYbG6feSiMz+Y="; hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08=";
}; };
cargoHash = "sha256-RoreNBZvTsVY87nbVibJBy4gsafFwAMctVncAhhiaP8="; cargoHash = "sha256-isx4jBsA3HX6124R3qtwTqH5fLTAP7xdQD5bTzCAybo=";
passthru.tests = { passthru.tests = {
envfs = nixosTests.envfs; envfs = nixosTests.envfs;