From 38a6281fbd8d34c0404c8f2bfffe55be431ba73d Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 27 Oct 2016 14:47:21 +0200 Subject: [PATCH] pkgs.go -> pkgs.go-shortener --- krebs/3modules/go.nix | 4 ++-- krebs/5pkgs/{go => go-shortener}/default.nix | 2 +- krebs/5pkgs/{go => go-shortener}/packages.nix | 0 lass/2configs/go.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename krebs/5pkgs/{go => go-shortener}/default.nix (97%) rename krebs/5pkgs/{go => go-shortener}/packages.nix (100%) 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 similarity index 97% rename from krebs/5pkgs/go/default.nix rename to 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 similarity index 100% rename from krebs/5pkgs/go/packages.nix rename to krebs/5pkgs/go-shortener/packages.nix diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix index 7d694c173..f6ddbe96d 100644 --- a/lass/2configs/go.nix +++ b/lass/2configs/go.nix @@ -3,7 +3,7 @@ with import ; { environment.systemPackages = [ - pkgs.go + pkgs.go-shortener ]; krebs.go = { enable = true;