diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix index 83edf63ce93a..f112b9b1309a 100644 --- a/pkgs/by-name/su/sudo-rs/package.nix +++ b/pkgs/by-name/su/sudo-rs/package.nix @@ -12,24 +12,25 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sudo-rs"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "trifectatechfoundation"; repo = "sudo-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-DGoEHeVs7EbzpfbmJQEIsL/eWXBvUCbaSPAGD65Op7k="; + hash = "sha256-F1JwVP2GDzKCfiJXh8PXTBghNwWeD8a+TMiEaPx6wGg="; }; - cargoHash = "sha256-fn97cKdaIsbozI794CAeWQooC7evTErRJOg6cEjzvjY="; + cargoHash = "sha256-6NhyPdOAk2va8Vibsfpfq3xGLIzDBRmqxj4bZhQT9bY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ pam ]; postPatch = '' - substituteInPlace build.rs \ - --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + substituteInPlace src/system/audit.rs \ + --replace-fail '/usr/share/zoneinfo' '/etc/zoneinfo' \ + --replace-fail '/usr/share/lib/zoneinfo' '${tzdata}/share/zoneinfo' ''; postInstall = '' @@ -62,6 +63,11 @@ rustPlatform.buildRustPackage (finalAttrs: { "system::interface::test::test_unix_user" "system::tests::test_get_user_and_group_by_id" + # Store paths are not owned by root in the build sandbox, so the zoneinfo path + # doesn't pass the validations done by sudo-rs. + # This is not an issue at runtime, since there the zoneinfo path is owned by root. + "sudo::env::environment::tests::test_tzinfo" + # Unsure why those are failing "env::tests::test_environment_variable_filtering" "su::context::tests::invalid_shell" @@ -80,11 +86,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; passthru = { - updateScript = nix-update-script { - extraArgs = [ - "--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9])$" - ]; - }; + updateScript = nix-update-script { }; tests = nixosTests.sudo-rs; };