public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

goPackages: use Go 1.6 by default

Browse Source
This commit is contained in:
rushmorem 2016-06-07 14:19:03 +02:00
parent 0264d34058
commit c9e315861e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/consul/ui.nix
View File

@ -1,4 +1,4 @@
{ stdenv, go16Packages, ruby, bundlerEnv, zip }: { stdenv, goPackages, ruby, bundlerEnv, zip }:
let let
# `sass` et al # `sass` et al
@ -11,9 +11,9 @@ let
in in
stdenv.mkDerivation { 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 ]; buildInputs = [ ruby gems zip ];

20
pkgs/top-level/all-packages.nix
View File

@ -666,7 +666,7 @@ in
cabal2nix = self.haskellPackages.cabal2nix; cabal2nix = self.haskellPackages.cabal2nix;
caddy = go16Packages.caddy.bin // { outputs = [ "bin" ]; }; caddy = goPackages.caddy.bin // { outputs = [ "bin" ]; };
capstone = callPackage ../development/libraries/capstone { }; capstone = callPackage ../development/libraries/capstone { };
@ -702,13 +702,13 @@ in
clib = callPackage ../tools/package-management/clib { }; 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-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 { }; corosync = callPackage ../servers/corosync { };
@ -811,7 +811,7 @@ in
gist = callPackage ../tools/text/gist { }; gist = callPackage ../tools/text/gist { };
glide = go16Packages.glide.bin // { outputs = [ "bin" ]; }; glide = goPackages.glide.bin // { outputs = [ "bin" ]; };
gmic = callPackage ../tools/graphics/gmic { }; gmic = callPackage ../tools/graphics/gmic { };
@ -9603,7 +9603,7 @@ in
overrides = (config.goPackageOverrides or (p: {})) pkgs; overrides = (config.goPackageOverrides or (p: {})) pkgs;
}; };
goPackages = go15Packages; goPackages = go16Packages;
go2nix = goPackages.go2nix.bin // { outputs = [ "bin" ]; }; go2nix = goPackages.go2nix.bin // { outputs = [ "bin" ]; };
@ -14257,7 +14257,7 @@ in
syncthing = callPackage ../applications/networking/syncthing { }; syncthing = callPackage ../applications/networking/syncthing { };
syncthing012 = go15Packages.syncthing012.bin // { outputs = [ "bin" ]; }; syncthing012 = goPackages.syncthing012.bin // { outputs = [ "bin" ]; };
# linux only by now # linux only by now
synergy = callPackage ../applications/misc/synergy { }; synergy = callPackage ../applications/misc/synergy { };
@ -14842,7 +14842,7 @@ in
GConf2 = gnome2.GConf; 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 { }; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
@ -16732,7 +16732,7 @@ in
sqsh = callPackage ../development/tools/sqsh { }; 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; }; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
@ -16814,7 +16814,7 @@ in
utf8proc = callPackage ../development/libraries/utf8proc { }; utf8proc = callPackage ../development/libraries/utf8proc { };
vault = go16Packages.vault.bin // { outputs = [ "bin" ]; }; vault = goPackages.vault.bin // { outputs = [ "bin" ]; };
vbam = callPackage ../misc/emulators/vbam {}; vbam = callPackage ../misc/emulators/vbam {};