heptapod-runner: make a separate drv and stop maintaining it as a patchset on top of gitlab-runner
This commit is contained in:
parent
34fa21a171
commit
e8b2667c01
1 changed files with 18 additions and 6 deletions
|
@ -4,20 +4,32 @@
|
||||||
|
|
||||||
{ pkgs, depot, ... }:
|
{ pkgs, depot, ... }:
|
||||||
let
|
let
|
||||||
version = "hpd-0.4.0";
|
version = "hpd-0.5.0";
|
||||||
newSrc = pkgs.fetchhg {
|
newSrc = pkgs.fetchhg {
|
||||||
url = "https://mirror.octobus.net/heptapod/heptapod-runner";
|
url = "https://mirror.octobus.net/heptapod/heptapod-runner";
|
||||||
rev = "8b729b09e365";
|
rev = "5843be69a387";
|
||||||
sha256 = "1769kcpgmhnibdmhvsdnylsdk8w08c7mgxi23vrx7vjfxgij1bdr";
|
sha256 = "sha256:15iyz7rgi6rb4nf1rjd96lsgdxn2l1ivzh05my7c9zpzvl7cnw25";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
heptapod-runner = pkgs.gitlab-runner.overrideAttrs (oldAttrs: rec {
|
heptapod-runner = pkgs.buildGoModule rec {
|
||||||
|
pname = "heptapod-runner";
|
||||||
inherit version;
|
inherit version;
|
||||||
buildInputs = (oldAttrs.buildInputs or []) ++ [ pkgs.makeWrapper ];
|
|
||||||
|
commonPackagePath = "gitlab.com/gitlab-org/gitlab-runner/common";
|
||||||
|
ldflags = [
|
||||||
|
"-X ${commonPackagePath}.NAME=heptapod-runner"
|
||||||
|
"-X ${commonPackagePath}.VERSION=${version}"
|
||||||
|
"-X ${commonPackagePath}.REVISION=v${version}"
|
||||||
|
];
|
||||||
|
|
||||||
src = newSrc;
|
src = newSrc;
|
||||||
|
vendorSha256 = null;
|
||||||
|
|
||||||
patches = [ ./fix-shell-path.patch ];
|
patches = [ ./fix-shell-path.patch ];
|
||||||
});
|
|
||||||
|
doCheck = false;
|
||||||
|
};
|
||||||
heptapod-runner-mercurial = pkgs.symlinkJoin {
|
heptapod-runner-mercurial = pkgs.symlinkJoin {
|
||||||
name = pkgs.mercurial.name;
|
name = pkgs.mercurial.name;
|
||||||
paths = [ pkgs.mercurial ];
|
paths = [ pkgs.mercurial ];
|
||||||
|
|
Loading…
Reference in a new issue