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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-01-23 12:40:13 +00:00
committed by GitHub
parent f6c56619d7 10a27d6d52
commit 58752914f4
365 changed files with 2120 additions and 1803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/go/1.14.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages
@@ -8,7 +8,7 @@
let
inherit (stdenv.lib) optionals optionalString;
inherit (lib) optionals optionalString;
goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out
@@ -180,7 +180,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
@@ -247,7 +247,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ goBootstrap ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;

8
pkgs/development/compilers/go/1.15.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages
@@ -8,7 +8,7 @@
let
inherit (stdenv.lib) optionals optionalString;
inherit (lib) optionals optionalString;
goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out
@@ -183,7 +183,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
@@ -250,7 +250,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ goBootstrap ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;

4
pkgs/development/compilers/go/1.4.nix
View File

@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
else if stdenv.isAarch32 then "arm"
else throw "Unsupported system";
GOARM = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
GOARM = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
GO386 = 387; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 0;
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
./all.bash
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;

8
pkgs/development/compilers/go/2-dev.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand
{ pkgs, lib, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages
@@ -8,7 +8,7 @@
let
inherit (stdenv.lib) optionals optionalString;
inherit (lib) optionals optionalString;
goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out
@@ -184,7 +184,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
@@ -251,7 +251,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ goBootstrap ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;