mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge pull request #68194 from adisbladis/drop-go-1_10
Drop unsupported go version 1.10
This commit is contained in:
Frederik Rietdijk
GitHub
commit
9b92496429
11 changed files with 144 additions and 310 deletions
|
|
@ -1,24 +0,0 @@
|
|||
{ lib, buildGoPackage, fetchgit }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "go-ethereum-classic";
|
||||
version = "4.0.0";
|
||||
|
||||
goPackagePath = "github.com/ethereumproject/go-ethereum";
|
||||
subPackages = [ "cmd/evm" "cmd/geth" ];
|
||||
|
||||
src = fetchgit {
|
||||
rev = "v${version}";
|
||||
url = "https://github.com/ethereumproject/go-ethereum";
|
||||
sha256 = "06f1w7s45q4zva1xjrx92xinsdrixl0m6zhx5hvdjmg3xqcbwr79";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = {
|
||||
description = "Golang implementation of Ethereum Classic";
|
||||
homepage = https://github.com/ethereumproject/go-ethereum;
|
||||
license = with lib.licenses; [ lgpl3 gpl3 ];
|
||||
maintainers = with lib.maintainers; [ sorpaas ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/maruel/panicparse";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/maruel/panicparse";
|
||||
rev = "ae43f192cef2add653fe1481a3070ed00a4a6981";
|
||||
sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
|
||||
sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/go-wordwrap";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/go-wordwrap";
|
||||
rev = "ad45545899c7b13c020ea92b2072220eefad42b8";
|
||||
sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/nsf/termbox-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/nsf/termbox-go";
|
||||
rev = "4163cd39dda1c0dda883a713640bc01e08951c24";
|
||||
sha256 = "1vzrhxf8823lrnwf1bfyxwlm52pph5iq2hgr1d0n07v8kjgqkrmx";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -1,18 +1,37 @@
|
|||
{ buildGo110Package, fetchzip, lib }:
|
||||
{ buildGoPackage, fetchurl, fetchFromGitHub, lib }:
|
||||
|
||||
buildGo110Package rec {
|
||||
let
|
||||
gouiJS = fetchurl {
|
||||
url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js";
|
||||
sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g";
|
||||
};
|
||||
|
||||
publisherJS = fetchurl {
|
||||
url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js";
|
||||
sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2";
|
||||
};
|
||||
|
||||
in buildGoPackage rec {
|
||||
name = "perkeep-${version}";
|
||||
version = "0.10.1";
|
||||
version = "unstable-2019-07-29";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://perkeep.org/dl/perkeep-${version}-src.zip";
|
||||
sha256 = "0rqibc6w4m1r50i2pjcgz1k9dxh18v7jwj4s29y470bc526wv422";
|
||||
src = fetchFromGitHub {
|
||||
owner = "perkeep";
|
||||
repo = "perkeep";
|
||||
rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41";
|
||||
sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg";
|
||||
};
|
||||
|
||||
goPackagePath = "perkeep.org";
|
||||
|
||||
buildPhase = ''
|
||||
cd "$NIX_BUILD_TOP/go/src/$goPackagePath"
|
||||
|
||||
# Skip network fetches
|
||||
sed -i '/fetchAllJS/a if true { return nil }' make.go
|
||||
cp ${publisherJS} app/publisher/publisher.js
|
||||
cp ${gouiJS} server/perkeepd/ui/goui.js
|
||||
|
||||
go run make.go
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,187 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
|
||||
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
inherit (stdenv.lib) optionals optionalString;
|
||||
|
||||
clangHack = writeScriptBin "clang" ''
|
||||
#!${stdenv.shell}
|
||||
exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
|
||||
'';
|
||||
|
||||
goBootstrap = runCommand "go-bootstrap" {} ''
|
||||
mkdir $out
|
||||
cp -rf ${go_bootstrap}/* $out/
|
||||
chmod -R u+w $out
|
||||
find $out -name "*.c" -delete
|
||||
cp -rf $out/bin/* $out/share/go/bin/
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.10.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "go";
|
||||
rev = "go${version}";
|
||||
sha256 = "1yynv105wh8pwiq61v4yg5i50k13g3x634x60mhxhv4gj9cq06cx";
|
||||
};
|
||||
|
||||
GOCACHE = "off";
|
||||
|
||||
# perl is used for testing go vet
|
||||
nativeBuildInputs = [ perl which pkgconfig patch procps ];
|
||||
buildInputs = [ cacert pcre ]
|
||||
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
|
||||
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
|
||||
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs ./ # replace /bin/bash
|
||||
|
||||
# This source produces shell script at run time,
|
||||
# and thus it is not corrected by patchShebangs.
|
||||
substituteInPlace misc/cgo/testcarchive/carchive_test.go \
|
||||
--replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
|
||||
|
||||
# Disabling the 'os/http/net' tests (they want files not available in
|
||||
# chroot builds)
|
||||
rm src/net/{listen,parse}_test.go
|
||||
rm src/syscall/exec_linux_test.go
|
||||
|
||||
# !!! substituteInPlace does not seems to be effective.
|
||||
# The os test wants to read files in an existing path. Just don't let it be /usr/bin.
|
||||
sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
|
||||
sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
|
||||
# Disable the unix socket test
|
||||
sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
|
||||
# Disable the hostname test
|
||||
sed -i '/TestHostname/areturn' src/os/os_test.go
|
||||
# ParseInLocation fails the test
|
||||
sed -i '/TestParseInSydney/areturn' src/time/format_test.go
|
||||
# Remove the api check as it never worked
|
||||
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
|
||||
# Remove the coverage test as we have removed this utility
|
||||
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
|
||||
# Remove the timezone naming test
|
||||
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
|
||||
# Remove disable setgid test
|
||||
sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
|
||||
# Remove cert tests that conflict with NixOS's cert resolution
|
||||
sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
|
||||
# TestWritevError hangs sometimes
|
||||
sed -i '/TestWritevError/areturn' src/net/writev_test.go
|
||||
# TestVariousDeadlines fails sometimes
|
||||
sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
|
||||
|
||||
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
|
||||
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
|
||||
|
||||
# Disable cgo lookup tests not works, they depend on resolver
|
||||
rm src/net/cgo_unix_test.go
|
||||
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
|
||||
'' + optionalString stdenv.isAarch32 ''
|
||||
sed -i '/TestCurrent/areturn' src/os/user/user_test.go
|
||||
echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/race.bash --replace \
|
||||
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
|
||||
sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
|
||||
sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
|
||||
sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
|
||||
|
||||
sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
|
||||
sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go
|
||||
sed -i '/TestCurrent/areturn' src/os/user/user_test.go
|
||||
sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
|
||||
sed -i '/TestRead0/areturn' src/os/os_test.go
|
||||
sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
|
||||
|
||||
sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
|
||||
sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
|
||||
|
||||
sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
|
||||
|
||||
sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
|
||||
|
||||
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./remove-tools-1.9.patch
|
||||
./ssl-cert-file-1.9.patch
|
||||
./remove-test-pie.patch
|
||||
./creds-test.patch
|
||||
./go-1.9-skip-flaky-19608.patch
|
||||
./go-1.9-skip-flaky-20072.patch
|
||||
(fetchpatch {
|
||||
name = "missing_cpuHog_in_pprof_output.diff";
|
||||
url = "https://github.com/golang/go/commit/33110e2c.diff";
|
||||
sha256 = "04vh9lflbpz9xjvymyzhd91gkxiiwwz4lhglzl3r8z0lk45p96qn";
|
||||
})
|
||||
];
|
||||
|
||||
GOOS = if stdenv.isDarwin then "darwin" else "linux";
|
||||
GOARCH = if stdenv.isDarwin then "amd64"
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then "386"
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
|
||||
else if stdenv.isAarch32 then "arm"
|
||||
else if stdenv.isAarch64 then "arm64"
|
||||
else throw "Unsupported system";
|
||||
GOARM = optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
|
||||
GO386 = 387; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
|
||||
# Hopefully avoids test timeouts on Hydra
|
||||
GO_TEST_TIMEOUT_SCALE = 3;
|
||||
|
||||
# The go build actually checks for CC=*/clang and does something different, so we don't
|
||||
# just want the generic `cc` here.
|
||||
CC = if stdenv.isDarwin then "clang" else "cc";
|
||||
|
||||
configurePhase = ''
|
||||
mkdir -p $out/share/go/bin
|
||||
export GOROOT=$out/share/go
|
||||
export GOBIN=$GOROOT/bin
|
||||
export PATH=$GOBIN:$PATH
|
||||
ulimit -a
|
||||
'';
|
||||
|
||||
postConfigure = optionalString stdenv.isDarwin ''
|
||||
export PATH=${clangHack}/bin:$PATH
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
cp -r . $GOROOT
|
||||
( cd $GOROOT/src && ./all.bash )
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
rm -r $out/share/go/pkg/bootstrap
|
||||
ln -s $out/share/go/bin $out/bin
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
disallowedReferences = [ go_bootstrap ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
branch = "1.10";
|
||||
homepage = http://golang.org/;
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ cstrahan orivej velovix mic92 ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,15 +4,17 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "fscrypt";
|
||||
version = "0.2.4";
|
||||
version = "unstable-2019-08-29";
|
||||
|
||||
goPackagePath = "github.com/google/fscrypt";
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "fscrypt";
|
||||
rev = "v${version}";
|
||||
sha256 = "10gbyqzgi30as1crvqbb4rc5p8zzbzk1q5j080h1gnz56qzwivr8";
|
||||
rev = "8a3acda2011e9a080ee792c1e11646e6118a4930";
|
||||
sha256 = "17h6r5lqiz0cw9vsixv48a1p78nd7bs1kncg6p4lfagl7kr5hpls";
|
||||
};
|
||||
|
||||
buildInputs = [ pam ];
|
||||
|
|
|
|||
66
pkgs/os-specific/linux/fscrypt/deps.nix
generated
Normal file
66
pkgs/os-specific/linux/fscrypt/deps.nix
generated
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "v1.2.0";
|
||||
sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pkg/errors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/errors";
|
||||
rev = "v0.8.0";
|
||||
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/urfave/cli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "v1.20.0";
|
||||
sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "614d502a4dac";
|
||||
sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "8a410e7b638d";
|
||||
sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sync";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sync";
|
||||
rev = "1d60e4601c6f";
|
||||
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "d99a578cf41b";
|
||||
sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "snmp_exporter";
|
||||
version = "0.13.0";
|
||||
version = "0.15.0";
|
||||
|
||||
goPackagePath = "github.com/prometheus/snmp_exporter";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "prometheus";
|
||||
repo = "snmp_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "071v9qqhp2hcbgml94dm1l212qi18by88r9755npq9ycrsmawkll";
|
||||
sha256 = "1cnz1wapxs3fkghzy6v90s56vd0ngynypyapcpbmx5y66rlpdxx6";
|
||||
};
|
||||
|
||||
buildInputs = [ net_snmp ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "diskrsync";
|
||||
version = "unstable-2018-02-03";
|
||||
version = "unstable-2019-01-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dop251";
|
||||
repo = pname;
|
||||
rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730";
|
||||
sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn";
|
||||
rev = "e8598ef71038527a8a77d1a6cf2a73cfd96d9139";
|
||||
sha256 = "1dqpmc4hp81knhdk3mrmwdr66xiibsvj5lagbm5ciajg9by45mcs";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/dop251/diskrsync";
|
||||
|
|
|
|||
37
pkgs/tools/backup/diskrsync/deps.nix
generated
37
pkgs/tools/backup/diskrsync/deps.nix
generated
|
|
@ -1,12 +1,12 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/dop251/spgz";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/dop251/spgz";
|
||||
rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5";
|
||||
sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx";
|
||||
rev = "b86304a2b188";
|
||||
sha256 = "1zss1z523qagk99plb0my8m8ng0danl372iyk1pr4i2skp2bf5z7";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -14,8 +14,35 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "1875d0a70c90e57f11972aefd42276df65e895b9";
|
||||
sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q";
|
||||
rev = "9756ffdc2472";
|
||||
sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "eb5bcb51f2a3";
|
||||
sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "97732733099d";
|
||||
sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "v0.3.0";
|
||||
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ buildGoPackage rec {
|
|||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cd go/src/github.com/theupdateframework/notary
|
||||
make client GITCOMMIT=${gitcommit}
|
||||
SKIPENVCHECK=1 make client GITCOMMIT=${gitcommit}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1704,9 +1704,7 @@ in
|
|||
|
||||
gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { };
|
||||
|
||||
goa = callPackage ../development/tools/goa {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
goa = callPackage ../development/tools/goa { };
|
||||
|
||||
gohai = callPackage ../tools/system/gohai { };
|
||||
|
||||
|
|
@ -2612,17 +2610,13 @@ in
|
|||
|
||||
dev86 = callPackage ../development/compilers/dev86 { };
|
||||
|
||||
diskrsync = callPackage ../tools/backup/diskrsync {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
diskrsync = callPackage ../tools/backup/diskrsync { };
|
||||
|
||||
djbdns = callPackage ../tools/networking/djbdns { };
|
||||
|
||||
dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { };
|
||||
|
||||
dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { };
|
||||
|
||||
dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
|
||||
|
||||
|
|
@ -4023,9 +4017,7 @@ in
|
|||
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
|
||||
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
|
||||
|
||||
ipget = callPackage ../applications/networking/ipget {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
ipget = callPackage ../applications/networking/ipget { };
|
||||
|
||||
ipmitool = callPackage ../tools/system/ipmitool {
|
||||
openssl = openssl_1_0_2;
|
||||
|
|
@ -5098,9 +5090,7 @@ in
|
|||
|
||||
nnn = callPackage ../applications/misc/nnn { };
|
||||
|
||||
notary = callPackage ../tools/security/notary {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
notary = callPackage ../tools/security/notary { };
|
||||
|
||||
notify-osd = callPackage ../applications/misc/notify-osd { };
|
||||
|
||||
|
|
@ -6524,9 +6514,7 @@ in
|
|||
|
||||
tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
|
||||
|
||||
tmsu = callPackage ../tools/filesystems/tmsu {
|
||||
go = go_1_10;
|
||||
};
|
||||
tmsu = callPackage ../tools/filesystems/tmsu { };
|
||||
|
||||
toilet = callPackage ../tools/misc/toilet { };
|
||||
|
||||
|
|
@ -7900,10 +7888,6 @@ in
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
go_1_10 = callPackage ../development/compilers/go/1.10.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
||||
};
|
||||
|
||||
go_1_11 = callPackage ../development/compilers/go/1.11.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
||||
};
|
||||
|
|
@ -14361,9 +14345,6 @@ in
|
|||
|
||||
### DEVELOPMENT / GO MODULES
|
||||
|
||||
buildGo110Package = callPackage ../development/go-packages/generic {
|
||||
go = buildPackages.go_1_10;
|
||||
};
|
||||
buildGo111Package = callPackage ../development/go-packages/generic {
|
||||
go = buildPackages.go_1_11;
|
||||
};
|
||||
|
|
@ -14744,9 +14725,7 @@ in
|
|||
|
||||
mediatomb = callPackage ../servers/mediatomb { };
|
||||
|
||||
meguca = callPackage ../servers/meguca {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
meguca = callPackage ../servers/meguca { };
|
||||
|
||||
memcached = callPackage ../servers/memcached {};
|
||||
|
||||
|
|
@ -15035,9 +15014,7 @@ in
|
|||
|
||||
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
|
||||
|
||||
inherit (callPackage ../servers/monitoring/prometheus {
|
||||
buildGoPackage = buildGo110Package;
|
||||
}) prometheus_1;
|
||||
inherit (callPackage ../servers/monitoring/prometheus { }) prometheus_1;
|
||||
|
||||
inherit (callPackage ../servers/monitoring/prometheus { })
|
||||
prometheus_2;
|
||||
|
|
@ -15069,9 +15046,7 @@ in
|
|||
prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { };
|
||||
prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
|
||||
prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { };
|
||||
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
|
||||
prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { };
|
||||
prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
|
||||
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
|
||||
|
|
@ -15515,9 +15490,7 @@ in
|
|||
dstat = callPackage ../os-specific/linux/dstat { };
|
||||
|
||||
# unstable until the first 1.x release
|
||||
fscrypt-experimental = callPackage ../os-specific/linux/fscrypt {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
|
||||
fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { };
|
||||
|
||||
fwupd = callPackage ../os-specific/linux/firmware/fwupd { };
|
||||
|
|
@ -21715,9 +21688,6 @@ in
|
|||
inherit (darwin) libobjc;
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit;
|
||||
};
|
||||
go-ethereum-classic = callPackage ../applications/blockchains/go-ethereum-classic {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
|
||||
jormungandr = callPackage ../applications/blockchains/jormungandr { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue