lol

Merge pull request #14709 from davidak/caddy-go16

caddy: build only with go 1.6

joachifm dfc6d428 f5ec0984

+3 -2
+2 -2
pkgs/top-level/all-packages.nix
··· 639 640 cabal2nix = self.haskellPackages.cabal2nix; 641 642 - caddy = goPackages.caddy.bin // { outputs = [ "bin" ]; }; 643 644 capstone = callPackage ../development/libraries/capstone { }; 645 ··· 696 cpulimit = callPackage ../tools/misc/cpulimit { }; 697 698 contacts = callPackage ../tools/misc/contacts { }; 699 - 700 daemontools = callPackage ../tools/admin/daemontools { }; 701 702 datamash = callPackage ../tools/misc/datamash { };
··· 639 640 cabal2nix = self.haskellPackages.cabal2nix; 641 642 + caddy = go16Packages.caddy.bin // { outputs = [ "bin" ]; }; 643 644 capstone = callPackage ../development/libraries/capstone { }; 645 ··· 696 cpulimit = callPackage ../tools/misc/cpulimit { }; 697 698 contacts = callPackage ../tools/misc/contacts { }; 699 + 700 daemontools = callPackage ../tools/admin/daemontools { }; 701 702 datamash = callPackage ../tools/misc/datamash { };
+1
pkgs/top-level/go-packages.nix
··· 421 acme blackfriday crypto go-humanize go-shlex go-syslog 422 http-authentication lumberjack-v2 toml websocket yaml-v2 423 ]; 424 }; 425 426 cascadia = buildGoPackage rec {
··· 421 acme blackfriday crypto go-humanize go-shlex go-syslog 422 http-authentication lumberjack-v2 toml websocket yaml-v2 423 ]; 424 + disabled = isGo14 || isGo15; 425 }; 426 427 cascadia = buildGoPackage rec {