diff options
author | William A. Kennington III <william@wkennington.com> | 2015-08-29 12:55:52 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-08-29 12:58:03 -0700 |
commit | 83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748 (patch) | |
tree | b22fa9e634231c129b415c66c66f5fe573afa194 /nixos | |
parent | 0b4bcaad9519d6971f99356a778cd1cb369f6309 (diff) | |
download | nixlib-83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748.tar nixlib-83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748.tar.gz nixlib-83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748.tar.bz2 nixlib-83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748.tar.lz nixlib-83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748.tar.xz nixlib-83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748.tar.zst nixlib-83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748.zip |
goPackages: Split into multiple derivations
This should reduce the closure size for end users who only need go binaries as well as reduce the size of closures hydra builders consume.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/misc/confd.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/monitoring/grafana.nix | 6 | ||||
-rw-r--r-- | nixos/modules/services/security/hologram.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix index 98738b6497bf..50532a8a16fb 100644 --- a/nixos/modules/services/misc/confd.nix +++ b/nixos/modules/services/misc/confd.nix @@ -63,7 +63,7 @@ in { package = mkOption { description = "Confd package to use."; - default = pkgs.goPackages.confd; + default = pkgs.confd; type = types.package; }; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 6a1799dedc8e..f987c4792e93 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -200,13 +200,13 @@ in { staticRootPath = mkOption { description = "Root path for static assets."; - default = "${cfg.package}/share/go/src/github.com/grafana/grafana/public"; + default = "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public"; type = types.str; }; package = mkOption { description = "Package to use."; - default = pkgs.goPackages.grafana; + default = pkgs.grafana-backend; type = types.package; }; @@ -319,7 +319,7 @@ in { wantedBy = ["multi-user.target"]; after = ["networking.target"]; serviceConfig = { - ExecStart = "${cfg.package}/bin/grafana --config ${cfgFile} web"; + ExecStart = "${cfg.package-backend}/bin/grafana --config ${cfgFile} web"; WorkingDirectory = cfg.dataDir; User = "grafana"; }; diff --git a/nixos/modules/services/security/hologram.nix b/nixos/modules/services/security/hologram.nix index f9abf38942f4..58f308df7a21 100644 --- a/nixos/modules/services/security/hologram.nix +++ b/nixos/modules/services/security/hologram.nix @@ -95,7 +95,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.goPackages.hologram}/bin/hologram-server --debug --conf ${cfgFile}"; + ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}"; }; }; }; |