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.

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

spread: init at 0-unstable-2023-03-01 #351434

Merged
merged 1 commit into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions pkgs/by-name/sp/spread/local-script-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/spread/client.go b/spread/client.go
index c72d48a..e927567 100644
--- a/spread/client.go
+++ b/spread/client.go
@@ -791,7 +791,7 @@ func (s *localScript) run() (stdout, stderr []byte, err error) {
buf.WriteString("NOMATCH() { { set +xu; } 2> /dev/null; local stdin=$(cat); if echo $stdin | grep -q -E \"$@\"; then echo \"NOMATCH pattern='$@' found in:\n$stdin\">&2; return 1; fi }\n")
buf.WriteString("export DEBIAN_FRONTEND=noninteractive\n")
buf.WriteString("export DEBIAN_PRIORITY=critical\n")
- buf.WriteString("export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin\n")
+ buf.WriteString(fmt.Sprintf("export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:%s\n", os.Getenv("PATH")))

for _, k := range s.env.Keys() {
v := s.env.Get(k)
66 changes: 66 additions & 0 deletions pkgs/by-name/sp/spread/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
bash,
coreutils,
gnutar,
gzip,
makeWrapper,
}:

buildGoModule {
pname = "spread";
version = "0-unstable-2023-03-01";

src = fetchFromGitHub {
owner = "snapcore";
repo = "spread";
rev = "ded9133cdbceaf01f8a1c9decf6ff9ea56e194d6";
hash = "sha256-uHBzVABfRCyBAGP9f+2GS49Qc8R9d1HaRr6bYPeVSU4=";
};

vendorHash = "sha256-SULAfCLtNSnuUXvA33I48hnhU0Ixq79HhADPIKYkWNU=";

subPackages = [ "cmd/spread" ];

nativeBuildInputs = [ makeWrapper ];

patches = [
# The upstream project statically assigns a PATH when running scripts in the
# local machine context. This patch keeps that static PATH assignment, but also
# appends the PATH from the environment context in which spread was run, so
# that nix-installed binaries are also available.
./local-script-path.patch
];

postPatch = ''
# Replace direct calls to /bin/bash
substituteInPlace spread/lxd.go --replace-fail '"/bin/bash", ' '"/usr/bin/env", "bash", '
substituteInPlace spread/client.go --replace-fail '"/bin/bash", ' '"/usr/bin/env", "bash", '
substituteInPlace spread/project.go --replace-fail '"/bin/bash", ' '"/usr/bin/env", "bash", '
'';

postInstall = ''
wrapProgram $out/bin/spread --prefix PATH : ${
lib.makeBinPath [
bash
coreutils
gnutar
gzip
]
}
'';

passthru.updateScript = nix-update-script { };

meta = {
mainProgram = "spread";
license = lib.licenses.gpl3Only;
description = "Convenient full-system test (task) distribution";
homepage = "https://github.com/snapcore/spread";
maintainers = with lib.maintainers; [ jnsgruk ];
platforms = lib.platforms.linux;
};
}