Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rex: 1.13.4 -> 1.14.0 #218686

Merged
merged 1 commit into from
Jun 6, 2023
Merged

rex: 1.13.4 -> 1.14.0 #218686

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions pkgs/tools/system/rex/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,50 @@
{ pkgs, lib, fetchurl, perlPackages, rsync, installShellFiles, ... }:

{ pkgs, lib, fetchurl, fetchpatch, perl, perlPackages, rsync, which, installShellFiles, ... }:
perlPackages.buildPerlPackage rec {
pname = "Rex";
version = "1.13.4";
version = "1.14.0";
src = fetchurl {
url = "mirror://cpan/authors/id/F/FE/FERKI/Rex-${version}.tar.gz";
sha256 = "a86e9270159b41c9a8fce96f9ddc97c5caa68167ca4ed33e97908bfce17098cf";
hash = "sha256-RHxJbkaEjKF9lkl6JYFp2pvcKQurRGUU7FfM/m5lSz8=";
};

buildInputs = with perlPackages; [
FileShareDirInstall
ParallelForkManager
StringEscape
TestDeep
TestOutput
TestWarnings
TestUseAllModules
TestException
SubOverride

rsync
which
];

# These are part of a greater effort to add better support upstream:
# https://github.com/RexOps/Rex/compare/master...nixos
patches = [
# Fix rex's ability to execute things on NixOS managed hosts
(fetchpatch {
url = "https://github.com/RexOps/Rex/commit/c71f3b255dac8f929abea46913798f132566af55.patch";
hash = "sha256-S2tF3IZ96QrxDN3HfBk7RWDZcEwukQYAkSId51dATiU=";
})
# Fix explicit calls to /bin/mv and /bin/rm
(fetchpatch {
url = "https://github.com/RexOps/Rex/commit/2782e80bb9789d3afb42e08904c28a4366a58334.patch";
hash = "sha256-htm39fF2tumG5b5E1ZBRX5n3vRaZZZzn2lfSN1omP8s=";
})
# Fix for PATH assumptions
(fetchpatch {
url = "https://github.com/RexOps/Rex/commit/ec72c8d1fdddf9116afdb21091100fe7cc20f41a.patch";
hash = "sha256-a/Sns2f596dbAWbuIveNldc/V3MwR08/ocXVgx0Tbcw=";
})
# Fix explicit path in Sudo.pm
(fetchpatch {
url = "https://github.com/RexOps/Rex/commit/f0b312f42178e7e4271b5b010c00efb5cdba2970.patch";
hash = "sha256-n/+huVCM8zpgx2LZgMB41PPIYgNhF6AK8+4FGPQH+FU=";
})
];

nativeBuildInputs = with perlPackages; [ installShellFiles ParallelForkManager ];
Expand All @@ -42,8 +71,6 @@ perlPackages.buildPerlPackage rec {
YAML
];

doCheck = false;

outputs = [ "out" ];

fixupPhase = ''
Expand Down