Skip to content

Commit fca89d8

Browse files
authored
Merge pull request #168 from input-output-hk/nomad132-pkg
bump: nomad 1.2.6 -> 1.3.2, move to pkg decl w/ patch
2 parents f1106df + d42a6df commit fca89d8

File tree

5 files changed

+397
-125
lines changed

5 files changed

+397
-125
lines changed

flake.lock

Lines changed: 18 additions & 121 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
utils.url = "github:numtide/flake-utils";
2424
blank.url = "github:divnix/blank";
2525

26-
nomad.url = "github:input-output-hk/nomad/release-1.2.6";
2726
nomad-driver-nix.url = "github:input-output-hk/nomad-driver-nix";
2827

2928
# Vector >= 0.20.0 versions require nomad-follower watch-config format fix

overlay.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ in
5252
haproxy-auth-request = prev.callPackage ./pkgs/haproxy-auth-request.nix {};
5353
haproxy-cors = prev.callPackage ./pkgs/haproxy-cors.nix {};
5454
mill = prev.callPackage ./pkgs/mill.nix {};
55-
nomad = inputs.nomad.defaultPackage.${final.system};
55+
nomad = prev.callPackage ./pkgs/nomad.nix {buildGoModule = prev.buildGo117Module;};
5656
nomad-autoscaler = prev.callPackage ./pkgs/nomad-autoscaler.nix {};
5757
nomad-follower = inputs.nomad-follower.defaultPackage.${prev.system};
5858
oauth2-proxy = final.callPackage ./pkgs/oauth2_proxy.nix {};
@@ -62,10 +62,10 @@ in
6262
spire = prev.callPackage ./pkgs/spire.nix {};
6363
spire-server = spire.server;
6464
spire-systemd-attestor = prev.callPackage ./pkgs/spire-systemd-attestor.nix {};
65-
traefik = prev.callPackage ./pkgs/traefik.nix {buildGoModule = final.buildGo117Module;};
65+
traefik = prev.callPackage ./pkgs/traefik.nix {buildGoModule = prev.buildGo117Module;};
6666
vault-backend = final.callPackage ./pkgs/vault-backend.nix {};
6767
vault-bin = prev.callPackage ./pkgs/vault-bin.nix {};
68-
victoriametrics = prev.callPackage ./pkgs/victoriametrics.nix {buildGoModule = final.buildGo117Module;};
68+
victoriametrics = prev.callPackage ./pkgs/victoriametrics.nix {buildGoModule = prev.buildGo117Module;};
6969

7070
scaler-guard = let
7171
deps = with final; [awscli bash curl jq nomad];

pkgs/nomad.nix

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
lib,
3+
buildGoModule,
4+
fetchFromGitHub,
5+
nixosTests,
6+
}:
7+
buildGoModule rec {
8+
pname = "nomad";
9+
version = "1.3.2";
10+
11+
subPackages = ["."];
12+
13+
src = fetchFromGitHub {
14+
owner = "hashicorp";
15+
repo = pname;
16+
rev = "v${version}";
17+
sha256 = "sha256-GJul7slXNLEp+3l3OQ43ALVH3IscoCDDL7FG2UFtLG8=";
18+
};
19+
20+
patches = [
21+
./nomad/nomad-exec-nix-driver.patch
22+
];
23+
24+
vendorSha256 = "sha256-MqtkYHGIgeCFnbwE09xHgPMuJBSVHL0hB9RbwNX+K40=";
25+
26+
# ui:
27+
# Nomad release commits include the compiled version of the UI, but the file
28+
# is only included if we build with the ui tag.
29+
tags = ["ui"];
30+
31+
passthru.tests.nomad = nixosTests.nomad;
32+
33+
meta = with lib; {
34+
homepage = "https://www.nomadproject.io/";
35+
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
36+
platforms = platforms.unix;
37+
license = licenses.mpl20;
38+
maintainers = with maintainers; [rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick];
39+
};
40+
}

0 commit comments

Comments
 (0)