diff options
| author | makefu <github@syntax-fehler.de> | 2016-10-28 15:15:21 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-10-28 15:15:21 +0200 |
| commit | d4f36e8ff5891fee46f85fbc086dbfe5c6f6fb35 (patch) | |
| tree | 2b261ab7e8bf4d86fb9ab0132aed7167811e6b45 /krebs | |
| parent | c26a3ce4b465db07f3d94e263588b96d167e53fa (diff) | |
| parent | 98659a68c7c40bee92e851afcf5a9bebeb3e2a06 (diff) | |
Merge remote-tracking branch 'prism/lassulus'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/go.nix | 4 | ||||
| -rw-r--r-- | krebs/5pkgs/go-shortener/default.nix (renamed from krebs/5pkgs/go/default.nix) | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/go-shortener/packages.nix (renamed from krebs/5pkgs/go/packages.nix) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/krebs/3modules/go.nix b/krebs/3modules/go.nix index a86f444dc..218ac9221 100644 --- a/krebs/3modules/go.nix +++ b/krebs/3modules/go.nix @@ -44,7 +44,7 @@ let wantedBy = [ "multi-user.target" ]; path = with pkgs; [ - go + go-shortener ]; environment = { @@ -57,7 +57,7 @@ let serviceConfig = { User = "go"; Restart = "always"; - ExecStart = "${pkgs.go}/bin/go"; + ExecStart = "${pkgs.go-shortener}/bin/go"; }; }; }; diff --git a/krebs/5pkgs/go/default.nix b/krebs/5pkgs/go-shortener/default.nix index 2871e5a99..996f7072a 100644 --- a/krebs/5pkgs/go/default.nix +++ b/krebs/5pkgs/go-shortener/default.nix @@ -19,7 +19,7 @@ let }; in np.buildNodePackage { - name = "go"; + name = "go-shortener"; src = fetchgit { url = "http://cgit.lassul.us/go/"; diff --git a/krebs/5pkgs/go/packages.nix b/krebs/5pkgs/go-shortener/packages.nix index 9acfd7658..9acfd7658 100644 --- a/krebs/5pkgs/go/packages.nix +++ b/krebs/5pkgs/go-shortener/packages.nix |