diff options
| author | Azat Bahawi <azat@bahawi.net> | 2023-04-01 17:49:26 +0300 |
|---|---|---|
| committer | Azat Bahawi <azat@bahawi.net> | 2023-04-01 17:49:26 +0300 |
| commit | c78a121316abfea8164196a9abd5e570090a20b7 (patch) | |
| tree | 930b0565adb064502b7cd68a01c86d17870768e2 /pkgs/tools/security/please | |
| parent | 710635f625fec5967ec51e865e0e0c3173df324c (diff) | |
| download | nixpkgs-c78a121316abfea8164196a9abd5e570090a20b7.tar nixpkgs-c78a121316abfea8164196a9abd5e570090a20b7.tar.gz nixpkgs-c78a121316abfea8164196a9abd5e570090a20b7.tar.bz2 nixpkgs-c78a121316abfea8164196a9abd5e570090a20b7.tar.lz nixpkgs-c78a121316abfea8164196a9abd5e570090a20b7.tar.xz nixpkgs-c78a121316abfea8164196a9abd5e570090a20b7.tar.zst nixpkgs-c78a121316abfea8164196a9abd5e570090a20b7.zip | |
please: 0.5.3 -> 0.5.4
Diffstat (limited to 'pkgs/tools/security/please')
| -rw-r--r-- | pkgs/tools/security/please/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/security/please/nixos-specific.patch | 18 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/tools/security/please/default.nix b/pkgs/tools/security/please/default.nix index 40640ba4ed8..2ecbc9ab303 100644 --- a/pkgs/tools/security/please/default.nix +++ b/pkgs/tools/security/please/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "please"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitLab { owner = "edneville"; repo = "please"; rev = "v${version}"; - hash = "sha256-YL0yKIDoFD6Q5gVXOjHiqH2ub7jlhlE/uDKLK1FlE74="; + hash = "sha256-GW2t3pTX06mqEwFTpiLe3mlzFTmb5Fep5R0yHooRmig="; }; - cargoHash = "sha256-noZsnFL6G1KcxGY0sn0PvY5nIdx5aOAMErMViIY/7bE="; + cargoHash = "sha256-bd3Pc8QPyPjE+xVcwASDILTXvMCioId/n6dXSr/KDOQ="; nativeBuildInputs = [ installShellFiles ]; @@ -29,6 +29,9 @@ rustPlatform.buildRustPackage rec { installManPage man/* ''; + # Unit tests are broken on NixOS. + doCheck = false; + passthru.tests = { inherit (nixosTests) please; }; meta = with lib; { diff --git a/pkgs/tools/security/please/nixos-specific.patch b/pkgs/tools/security/please/nixos-specific.patch index 926f815cbfb..890434532a5 100644 --- a/pkgs/tools/security/please/nixos-specific.patch +++ b/pkgs/tools/security/please/nixos-specific.patch @@ -1,13 +1,13 @@ diff --git i/src/lib.rs w/src/lib.rs -index fdd69f2..07c794e 100644 +index 5e98cfa..539434f 100644 --- i/src/lib.rs +++ w/src/lib.rs -@@ -1667,7 +1667,7 @@ pub fn search_path(binary: &str) -> Option<String> { - } - } - -- for dir in "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin".split(':') { -+ for dir in "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin".split(':') { - let path_name = format!("{}/{}", &dir, &binary); - let p = Path::new(&path_name); +@@ -1755,7 +1755,7 @@ pub fn search_path(ro: &mut RunOptions, item: &EnvOptions) -> Option<String> { + let dirs = if item.search_path.is_some() { + item.search_path.as_ref().unwrap() + } else { +- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ++ "/run/wrappers/bin:/run/current-system/sw/sbin:/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + }; + for dir in dirs.split(':') { |