From c9e315861ec69366ecc6d22a8e8ee44448d8c811 Mon Sep 17 00:00:00 2001 From: rushmorem <rushmore@webenchanter.com> Date: Tue, 7 Jun 2016 14:19:03 +0200 Subject: [PATCH] goPackages: use Go 1.6 by default --- pkgs/servers/consul/ui.nix | 6 +++--- pkgs/top-level/all-packages.nix | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix index deadd6404eae..684412846f01 100644 --- a/pkgs/servers/consul/ui.nix +++ b/pkgs/servers/consul/ui.nix @@ -1,4 +1,4 @@ -{ stdenv, go16Packages, ruby, bundlerEnv, zip }: +{ stdenv, goPackages, ruby, bundlerEnv, zip }: let # `sass` et al @@ -11,9 +11,9 @@ let in stdenv.mkDerivation { - name = "consul-ui-${go16Packages.consul.rev}"; + name = "consul-ui-${goPackages.consul.rev}"; - src = go16Packages.consul.src; + src = goPackages.consul.src; buildInputs = [ ruby gems zip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27a935eed119..dba34976a672 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -666,7 +666,7 @@ in cabal2nix = self.haskellPackages.cabal2nix; - caddy = go16Packages.caddy.bin // { outputs = [ "bin" ]; }; + caddy = goPackages.caddy.bin // { outputs = [ "bin" ]; }; capstone = callPackage ../development/libraries/capstone { }; @@ -702,13 +702,13 @@ in clib = callPackage ../tools/package-management/clib { }; - consul = go16Packages.consul.bin // { outputs = [ "bin" ]; }; + consul = goPackages.consul.bin // { outputs = [ "bin" ]; }; consul-ui = callPackage ../servers/consul/ui.nix { }; - consul-alerts = go16Packages.consul-alerts.bin // { outputs = [ "bin" ]; }; + consul-alerts = goPackages.consul-alerts.bin // { outputs = [ "bin" ]; }; - consul-template = go16Packages.consul-template.bin // { outputs = [ "bin" ]; }; + consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; }; corosync = callPackage ../servers/corosync { }; @@ -811,7 +811,7 @@ in gist = callPackage ../tools/text/gist { }; - glide = go16Packages.glide.bin // { outputs = [ "bin" ]; }; + glide = goPackages.glide.bin // { outputs = [ "bin" ]; }; gmic = callPackage ../tools/graphics/gmic { }; @@ -9603,7 +9603,7 @@ in overrides = (config.goPackageOverrides or (p: {})) pkgs; }; - goPackages = go15Packages; + goPackages = go16Packages; go2nix = goPackages.go2nix.bin // { outputs = [ "bin" ]; }; @@ -14257,7 +14257,7 @@ in syncthing = callPackage ../applications/networking/syncthing { }; - syncthing012 = go15Packages.syncthing012.bin // { outputs = [ "bin" ]; }; + syncthing012 = goPackages.syncthing012.bin // { outputs = [ "bin" ]; }; # linux only by now synergy = callPackage ../applications/misc/synergy { }; @@ -14842,7 +14842,7 @@ in GConf2 = gnome2.GConf; }; - xmpp-client = go15Packages.xmpp-client.bin // { outputs = [ "bin" ]; }; + xmpp-client = goPackages.xmpp-client.bin // { outputs = [ "bin" ]; }; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; @@ -16732,7 +16732,7 @@ in sqsh = callPackage ../development/tools/sqsh { }; - terraform = go16Packages.terraform.bin // { outputs = [ "bin" ]; }; + terraform = goPackages.terraform.bin // { outputs = [ "bin" ]; }; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; @@ -16814,7 +16814,7 @@ in utf8proc = callPackage ../development/libraries/utf8proc { }; - vault = go16Packages.vault.bin // { outputs = [ "bin" ]; }; + vault = goPackages.vault.bin // { outputs = [ "bin" ]; }; vbam = callPackage ../misc/emulators/vbam {};