From 51119d2f3565f6180849c22751fc949803e29097 Mon Sep 17 00:00:00 2001 From: davidak Date: Thu, 14 Apr 2016 21:23:06 +0200 Subject: [PATCH] caddy: build only with go 1.6 --- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/go-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c56eb7ec36..2ca48d77287 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -639,7 +639,7 @@ in cabal2nix = self.haskellPackages.cabal2nix; - caddy = goPackages.caddy.bin // { outputs = [ "bin" ]; }; + caddy = go16Packages.caddy.bin // { outputs = [ "bin" ]; }; capstone = callPackage ../development/libraries/capstone { }; @@ -696,7 +696,7 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; contacts = callPackage ../tools/misc/contacts { }; - + daemontools = callPackage ../tools/admin/daemontools { }; datamash = callPackage ../tools/misc/datamash { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index c0277e54dbf..a8d9f59e19f 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -421,6 +421,7 @@ let acme blackfriday crypto go-humanize go-shlex go-syslog http-authentication lumberjack-v2 toml websocket yaml-v2 ]; + disabled = isGo14 || isGo15; }; cascadia = buildGoPackage rec {