3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request from davidak/caddy-go16

caddy: build only with go 1.6
This commit is contained in:
joachifm 2016-04-15 05:45:50 +02:00
commit dfc6d42860
2 changed files with 3 additions and 2 deletions

View file

@ -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 { };

View file

@ -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 {