diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/go/1.14.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/go/1.14.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/compilers/go/1.14.nix b/nixpkgs/pkgs/development/compilers/go/1.14.nix index 34b37926ea6f..0811e4bc7013 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.14.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.14.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages , pkgsBuildTarget @@ -8,7 +8,7 @@ let - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -36,15 +36,15 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.13"; + version = "1.14.14"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0xxins5crcgghgvnzplmp0qyv2gbmh36v1fpl15d03jwdd6287ds"; + sha256 = "0vx7r0bb1a500znnnh7v3wgw22ly3p2x06vzyi9hiblgylrby132"; }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; + nativeBuildInputs = [ perl which pkg-config patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { else null; - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; # Hopefully avoids test timeouts on Hydra @@ -246,8 +246,7 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; - meta = with stdenv.lib; { - branch = "1.14"; + meta = with lib; { homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; |