go,buildGoModule: 1.25 -> 1.26; go_1_24,buildGo124Module: remove (#490142)
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo124Module,
|
||||
buildGo125Module,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
@@ -96,7 +95,7 @@ rec {
|
||||
};
|
||||
|
||||
nomad_1_10 = generic {
|
||||
buildGoModule = buildGo124Module;
|
||||
buildGoModule = buildGo125Module;
|
||||
version = "1.10.5";
|
||||
hash = "sha256-NFH++oYWb6vQN6cOPByscI/ZBWDNy4YbcLiBMO3/jVU=";
|
||||
vendorHash = "sha256-QcTw9kKwoHIvXZoxfDohFG+sBs8OLvYPeygygDClsn8=";
|
||||
@@ -108,7 +107,7 @@ rec {
|
||||
};
|
||||
|
||||
nomad_1_9 = generic {
|
||||
buildGoModule = buildGo124Module;
|
||||
buildGoModule = buildGo125Module;
|
||||
version = "1.9.7";
|
||||
hash = "sha256-U02H6DPr1friQ9EwqD/wQnE2Fm20OE5xNccPDJfnsqI=";
|
||||
vendorHash = "sha256-9GnwqkexJAxrhW9yJFaDTdSaZ+p+/dcMuhlusp4cmyw=";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
pnpmConfigHook,
|
||||
pnpm,
|
||||
fetchFromGitHub,
|
||||
buildGo124Module,
|
||||
buildGo125Module,
|
||||
installShellFiles,
|
||||
callPackage,
|
||||
nixosTests,
|
||||
@@ -22,7 +22,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
buildGoModule = buildGo124Module;
|
||||
buildGoModule = buildGo125Module;
|
||||
|
||||
inherit (import ./sources.nix { inherit fetchFromGitHub; })
|
||||
pname
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGo124Module rec {
|
||||
pname = "criticality-score";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ossf";
|
||||
repo = "criticality_score";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-p2ZXNpPFwIKPWDKCdEUZQvt/hvLQS9xjZaaquNTaUB0=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-mKCwyAE/fI9ateKcrTLDAdULbT6pUpV0cMZ0X5bqT1M=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.version=${version}"
|
||||
"-X=main.commit=${src.tag}"
|
||||
"-X=main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
subPackages = [
|
||||
"cmd/collect_signals"
|
||||
"cmd/criticality_score"
|
||||
"cmd/csv_transfer"
|
||||
"cmd/enumerate_github"
|
||||
"cmd/scorer"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
|
||||
|
||||
meta = {
|
||||
description = "Gives criticality score for an open source project";
|
||||
homepage = "https://github.com/ossf/criticality_score";
|
||||
changelog = "https://github.com/ossf/criticality_score/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ wamserma ];
|
||||
mainProgram = "criticality_score";
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildGo124Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "etcd";
|
||||
version = "3.4.39";
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
k3s,
|
||||
lib,
|
||||
@@ -35,7 +35,7 @@ let
|
||||
platforms = lib.platforms.darwin ++ lib.platforms.linux;
|
||||
};
|
||||
|
||||
etcdserver = buildGo124Module {
|
||||
etcdserver = buildGoModule {
|
||||
pname = "etcdserver";
|
||||
|
||||
inherit
|
||||
@@ -62,7 +62,7 @@ let
|
||||
ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
|
||||
};
|
||||
|
||||
etcdutl = buildGo124Module {
|
||||
etcdutl = buildGoModule {
|
||||
pname = "etcdutl";
|
||||
|
||||
inherit
|
||||
@@ -77,7 +77,7 @@ let
|
||||
modRoot = "./etcdutl";
|
||||
};
|
||||
|
||||
etcdctl = buildGo124Module {
|
||||
etcdctl = buildGoModule {
|
||||
pname = "etcdctl";
|
||||
|
||||
inherit
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
applyPatches,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
k3s,
|
||||
@@ -39,7 +39,7 @@ let
|
||||
platforms = lib.platforms.darwin ++ lib.platforms.linux;
|
||||
};
|
||||
|
||||
etcdserver = buildGo124Module {
|
||||
etcdserver = buildGoModule {
|
||||
pname = "etcdserver";
|
||||
|
||||
inherit
|
||||
@@ -66,7 +66,7 @@ let
|
||||
ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
|
||||
};
|
||||
|
||||
etcdutl = buildGo124Module {
|
||||
etcdutl = buildGoModule {
|
||||
pname = "etcdutl";
|
||||
|
||||
inherit
|
||||
@@ -92,7 +92,7 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
etcdctl = buildGo124Module {
|
||||
etcdctl = buildGoModule {
|
||||
pname = "etcdctl";
|
||||
|
||||
inherit
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildGo124Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "gci";
|
||||
version = "0.13.7";
|
||||
|
||||
@@ -21,5 +21,6 @@ buildGo124Module rec {
|
||||
homepage = "https://github.com/daixiang0/gci";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ krostar ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGo125Module,
|
||||
fetchFromGitLab,
|
||||
}:
|
||||
|
||||
buildGo124Module rec {
|
||||
buildGo125Module rec {
|
||||
pname = "gitlab-container-registry";
|
||||
version = "4.36.0";
|
||||
rev = "v${version}-gitlab";
|
||||
|
||||
@@ -1,21 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
# Build fails with Go 1.25, with the following error:
|
||||
# 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)'
|
||||
# Wait for upstream to update their vendored dependencies before unpinning.
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
applyPatches,
|
||||
}:
|
||||
|
||||
buildGo124Module (finalAttrs: {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gobusybox";
|
||||
version = "0.2.0-unstable-2024-03-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "u-root";
|
||||
repo = "gobusybox";
|
||||
rev = "d8fbaca23e26beab648c86c8a67335ad65d0d15c";
|
||||
hash = "sha256-hS6YwN6eekyDjp7E6sisW+8HO5WHTEC68XyKZFPihK4=";
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "u-root";
|
||||
repo = "gobusybox";
|
||||
rev = "d8fbaca23e26beab648c86c8a67335ad65d0d15c";
|
||||
hash = "sha256-hS6YwN6eekyDjp7E6sisW+8HO5WHTEC68XyKZFPihK4=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/u-root/gobusybox/commit/4204bda4af46406562e377e23ec6f9c87bfbda84.patch";
|
||||
hash = "sha256-3AOl/sxBZVLhLnSnqY3H8V6BBEjh+3gW3aPS5Wqob4s=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
@@ -30,7 +37,7 @@ buildGo124Module (finalAttrs: {
|
||||
|
||||
env.CGO_ENABLED = "0";
|
||||
|
||||
vendorHash = "sha256-s4bQLXNFhyAk+UNI1xJXQABjBXtPFXiWvmdttV/6Bm8=";
|
||||
vendorHash = "sha256-xezqzOPTCIdoT2t0rFqYa/1uO1YIIEeXSUV62YLUeOQ=";
|
||||
|
||||
ldflags = [ "-s" ];
|
||||
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
# Build fails with Go 1.25, with the following error:
|
||||
# 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)'
|
||||
# Wait for upstream to update their vendored dependencies before unpinning.
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGo124Module {
|
||||
buildGoModule {
|
||||
pname = "gomacro";
|
||||
version = "2.7-unstable-2024-01-07";
|
||||
|
||||
@@ -28,5 +25,6 @@ buildGo124Module {
|
||||
homepage = "https://github.com/cosmos72/gomacro";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ shofius ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,26 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
# Build fails with Go 1.25, with the following error:
|
||||
# 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)'
|
||||
# Wait for upstream to update their vendored dependencies before unpinning.
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildGo124Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "gorm-gentool";
|
||||
version = "0.0.1";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-gorm";
|
||||
repo = "gen";
|
||||
rev = "tools/gentool/v${version}";
|
||||
hash = "sha256-JOecNYEIL8vbc7znkKbaSrTkGyAva3ZzKzxducDtTx0=";
|
||||
hash = "sha256-8xuprFktGflx/5BR3Sbzx/MWerSp57q2Ky2Yn5P6Y28=";
|
||||
};
|
||||
|
||||
modRoot = "tools/gentool";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-8xUJcsZuZ1KpFDM1AMTRggl7A7C/YaXYDzRKNFKE+ww=";
|
||||
vendorHash = "sha256-0VU+zGQb6Ob9V2zOsUO5+ObUFdQO26236Ei2/TqjTBs=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/go-gorm/gen";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchFromCodeberg,
|
||||
buildGo124Module,
|
||||
buildGo125Module,
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
@@ -16,7 +16,7 @@ let
|
||||
hash = "sha256-Xh4SgzBG2Cm4SaMb9lebW/gBv94HuVXNSjd8L+bowUg=";
|
||||
};
|
||||
in
|
||||
buildGo124Module rec {
|
||||
buildGo125Module rec {
|
||||
inherit version;
|
||||
pname = repo;
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGo124Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "gowebly";
|
||||
version = "3.0.5";
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
nodejs,
|
||||
go_1_24,
|
||||
go,
|
||||
git,
|
||||
cacert,
|
||||
nixosTests,
|
||||
@@ -30,7 +30,7 @@ buildGoModule {
|
||||
# Since we do pnpm thing in those it fails if we don't explicitly remove them
|
||||
overrideModAttrs = _: {
|
||||
nativeBuildInputs = [
|
||||
go_1_24
|
||||
go
|
||||
git
|
||||
cacert
|
||||
];
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGo124Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "hubble";
|
||||
version = "1.18.6";
|
||||
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGo125Module,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGo124Module (finalAttrs: {
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "ipfs-cluster";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
|
||||
vendorHash = "sha256-VVejr6B7eDNNQF34PS/PaQ50mBNZgzJS50aNzbLJgCg=";
|
||||
vendorHash = "sha256-ARzpn/LzFIA+3ghW+xdQvFFiFwxT79dk4vpgEKoEBzk=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipfs-cluster";
|
||||
repo = "ipfs-cluster";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mdLrLiRNudpQ8i0lvwoNAqhSWJ8VMEC1ZRxXHWHpqLY=";
|
||||
hash = "sha256-TOUntNZtTj6cS+6+MwIwKdUZ/gB5D63osn4+fpGGkDY=";
|
||||
};
|
||||
|
||||
checkFlags =
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
zsh,
|
||||
fish,
|
||||
nixosTests,
|
||||
go_1_24,
|
||||
buildGo124Module,
|
||||
go,
|
||||
buildGoModule,
|
||||
nix-update-script,
|
||||
makeBinaryWrapper,
|
||||
darwin,
|
||||
@@ -62,7 +62,7 @@ buildPythonApplication rec {
|
||||
};
|
||||
|
||||
goModules =
|
||||
(buildGo124Module {
|
||||
(buildGoModule {
|
||||
pname = "kitty-go-modules";
|
||||
inherit src version;
|
||||
vendorHash = "sha256-aLl9hPfRmUE8VARwkwXhxjzDPKUGNGD+yzxY5pUIcgs=";
|
||||
@@ -110,7 +110,7 @@ buildPythonApplication rec {
|
||||
sphinx-copybutton
|
||||
sphinxext-opengraph
|
||||
sphinx-inline-tabs
|
||||
go_1_24
|
||||
go
|
||||
fontconfig
|
||||
makeBinaryWrapper
|
||||
]
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGo124Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "legitify";
|
||||
version = "1.0.11";
|
||||
|
||||
@@ -34,5 +34,6 @@ buildGo124Module rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "legitify";
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
# Build fails with Go 1.25, with the following error:
|
||||
# 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)'
|
||||
# Wait for upstream to update their vendored dependencies before unpinning.
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
coreutils,
|
||||
bash,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildGo124Module {
|
||||
buildGoModule {
|
||||
pname = "mkuimage";
|
||||
version = "0-unstable-2025-09-05";
|
||||
|
||||
@@ -56,5 +53,6 @@ buildGo124Module {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ katexochen ];
|
||||
mainProgram = "mkuimage";
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
}:
|
||||
|
||||
buildGo124Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "otpauth";
|
||||
version = "0.6.0";
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGo124Module {
|
||||
buildGoModule {
|
||||
pname = "pinecone";
|
||||
version = "0.11.0-unstable-2025-03-04";
|
||||
|
||||
@@ -23,5 +23,6 @@ buildGo124Module {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ networkexception ];
|
||||
mainProgram = "pinecone";
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGo124Module,
|
||||
buildGo125Module,
|
||||
fetchFromGitHub,
|
||||
libredirect,
|
||||
iana-etc,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGo124Module (finalAttrs: {
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "scip";
|
||||
version = "0.6.1";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
buildTeleport,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
wasm-bindgen-cli_0_2_99,
|
||||
withRdpClient ? true,
|
||||
extPatches ? [ ],
|
||||
@@ -14,6 +14,6 @@ buildTeleport {
|
||||
cargoHash = "sha256-tp+xxa+sYQpvgD2Yv/W0hegRpUubBeFpdngRyByNxJc=";
|
||||
|
||||
wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;
|
||||
buildGoModule = buildGo124Module;
|
||||
buildGoModule = buildGoModule;
|
||||
inherit withRdpClient extPatches;
|
||||
}
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
# Build fails with Go 1.25, with the following error:
|
||||
# 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)'
|
||||
# Wait for upstream to update their vendored dependencies before unpinning.
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGo124Module (finalAttrs: {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "terraform-docs";
|
||||
version = "0.21.0";
|
||||
|
||||
|
||||
@@ -181,7 +181,6 @@ u-root.overrideAttrs (prevAttrs: {
|
||||
"cmds/exp/watch"
|
||||
"cmds/exp/zbi"
|
||||
"cmds/exp/zimage"
|
||||
"cmds/extra/tsort"
|
||||
"cmds/fwtools/flash"
|
||||
"cmds/fwtools/spidev"
|
||||
];
|
||||
|
||||
@@ -1,30 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
# Build fails with Go 1.25, with the following error:
|
||||
# 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)'
|
||||
# Wait for upstream to update their vendored dependencies before unpinning.
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
coreutils,
|
||||
bash,
|
||||
nix-update-script,
|
||||
fetchpatch,
|
||||
|
||||
linuxManualConfig,
|
||||
fetchurl,
|
||||
linux_latest,
|
||||
}:
|
||||
|
||||
buildGo124Module (finalAttrs: {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "u-root";
|
||||
version = "0.15.0";
|
||||
version = "0.15.0-unstable-2026-02-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "u-root";
|
||||
repo = "u-root";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8B2H3AwGo9friveBk4bijOph9bSSNR7PPKJYEuywgm4=";
|
||||
rev = "0f23b8374acf4f00b457c69c13c3fe73dd5bab86";
|
||||
hash = "sha256-RwEegwzBpw0r0fPyNhB35hyaAcqSt8dUmYf2N5WrpQQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/u-root/u-root/commit/aeeb2aafd6a35416d5941b496e44a94594021424.patch";
|
||||
hash = "sha256-h+b/s9NkreQfFWezEup1DpQjfyiJpHQGTD/RyKmkF8s=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildGo124Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
|
||||
nix-update-script,
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
# fails with go 1.25, downgrade to 1.24
|
||||
# error tls.ConnectionState: struct field count mismatch: 17 vs 16
|
||||
buildGo124Module (finalAttrs: {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "warp-plus";
|
||||
version = "1.2.6-unstable-2025-11-17";
|
||||
|
||||
@@ -57,5 +57,6 @@ buildGo124Module (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ phanirithvij ];
|
||||
mainProgram = "warp-plus";
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,203 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
tzdata,
|
||||
replaceVars,
|
||||
iana-etc,
|
||||
mailcap,
|
||||
buildPackages,
|
||||
pkgsBuildTarget,
|
||||
targetPackages,
|
||||
buildGo124Module,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
let
|
||||
goBootstrap = buildPackages.callPackage ./bootstrap122.nix { };
|
||||
|
||||
# We need a target compiler which is still runnable at build time,
|
||||
# to handle the cross-building case where build != host == target
|
||||
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
|
||||
|
||||
isCross = stdenv.buildPlatform != stdenv.targetPlatform;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "go";
|
||||
version = "1.24.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-Y5piBMJIaxN98etueO4+0Dj5h30OS1pGXnlqIVP4WNc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
buildInputs =
|
||||
[ ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
|
||||
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
|
||||
|
||||
depsBuildTarget = lib.optional isCross targetCC;
|
||||
|
||||
depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(replaceVars ./iana-etc-1.17.patch {
|
||||
iana = iana-etc;
|
||||
})
|
||||
# Patch the mimetype database location which is missing on NixOS.
|
||||
# but also allow static binaries built with NixOS to run outside nix
|
||||
(replaceVars ./mailcap-1.17.patch {
|
||||
inherit mailcap;
|
||||
})
|
||||
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
|
||||
# that run outside a nix server
|
||||
(replaceVars ./tzdata-1.19.patch {
|
||||
inherit tzdata;
|
||||
})
|
||||
./remove-tools-1.11.patch
|
||||
./go_no_vendor_checks-1.23.patch
|
||||
./go-env-go_ldso.patch
|
||||
];
|
||||
|
||||
env = {
|
||||
inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM;
|
||||
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
|
||||
# Go will nevertheless build a for host system that we will copy over in
|
||||
# the install phase.
|
||||
GOHOSTOS = stdenv.buildPlatform.go.GOOS;
|
||||
GOHOSTARCH = stdenv.buildPlatform.go.GOARCH;
|
||||
|
||||
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
|
||||
# Wasi does not support CGO
|
||||
# ppc64/linux CGO is incomplete/borked, and will likely not receive any further improvements
|
||||
# https://github.com/golang/go/issues/8912
|
||||
# https://github.com/golang/go/issues/13192
|
||||
CGO_ENABLED =
|
||||
if
|
||||
(
|
||||
stdenv.targetPlatform.isWasi
|
||||
|| (stdenv.targetPlatform.isPower64 && stdenv.targetPlatform.isBigEndian)
|
||||
)
|
||||
then
|
||||
0
|
||||
else
|
||||
1;
|
||||
|
||||
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
|
||||
}
|
||||
// lib.optionalAttrs isCross {
|
||||
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
|
||||
# to be different from CC/CXX
|
||||
CC_FOR_TARGET = "${targetCC}/bin/${targetCC.targetPrefix}cc";
|
||||
CXX_FOR_TARGET = "${targetCC}/bin/${targetCC.targetPrefix}c++";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
if [ -f "$NIX_CC/nix-support/dynamic-linker" ]; then
|
||||
export GO_LDSO=$(cat $NIX_CC/nix-support/dynamic-linker)
|
||||
fi
|
||||
|
||||
export PATH=$(pwd)/bin:$PATH
|
||||
|
||||
${lib.optionalString isCross ''
|
||||
# Independent from host/target, CC should produce code for the building system.
|
||||
# We only set it when cross-compiling.
|
||||
export CC=${buildPackages.stdenv.cc}/bin/cc
|
||||
# Prefer external linker for cross when CGO is supported, since
|
||||
# we haven't taught go's internal linker to pick the correct ELF
|
||||
# interpreter for cross
|
||||
# When CGO is not supported we rely on static binaries being built
|
||||
# since they don't need an ELF interpreter
|
||||
export GO_EXTLINK_ENABLED=${toString finalAttrs.env.CGO_ENABLED}
|
||||
''}
|
||||
ulimit -a
|
||||
|
||||
pushd src
|
||||
./make.bash
|
||||
popd
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# Contains the wrong perl shebang when cross compiling,
|
||||
# since it is not used for anything we can deleted as well.
|
||||
rm src/regexp/syntax/make_perl_groups.pl
|
||||
''
|
||||
+ (
|
||||
if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then
|
||||
''
|
||||
mv bin/*_*/* bin
|
||||
rmdir bin/*_*
|
||||
${lib.optionalString
|
||||
(
|
||||
!(
|
||||
finalAttrs.env.GOHOSTARCH == finalAttrs.env.GOARCH && finalAttrs.env.GOOS == finalAttrs.env.GOHOSTOS
|
||||
)
|
||||
)
|
||||
''
|
||||
rm -rf pkg/${finalAttrs.env.GOHOSTOS}_${finalAttrs.env.GOHOSTARCH} pkg/tool/${finalAttrs.env.GOHOSTOS}_${finalAttrs.env.GOHOSTARCH}
|
||||
''
|
||||
}
|
||||
''
|
||||
else
|
||||
lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
|
||||
rm -rf bin/*_*
|
||||
${lib.optionalString
|
||||
(
|
||||
!(
|
||||
finalAttrs.env.GOHOSTARCH == finalAttrs.env.GOARCH && finalAttrs.env.GOOS == finalAttrs.env.GOHOSTOS
|
||||
)
|
||||
)
|
||||
''
|
||||
rm -rf pkg/${finalAttrs.env.GOOS}_${finalAttrs.env.GOARCH} pkg/tool/${finalAttrs.env.GOOS}_${finalAttrs.env.GOARCH}
|
||||
''
|
||||
}
|
||||
''
|
||||
);
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/go
|
||||
cp -a bin pkg src lib misc api doc go.env VERSION $out/share/go
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/share/go/bin/* $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
passthru = {
|
||||
inherit goBootstrap;
|
||||
tests = callPackage ./tests.nix {
|
||||
go = finalAttrs.finalPackage;
|
||||
buildGoModule = buildGo124Module;
|
||||
};
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}";
|
||||
description = "Go Programming language";
|
||||
homepage = "https://go.dev/";
|
||||
license = lib.licenses.bsd3;
|
||||
teams = [ lib.teams.golang ];
|
||||
platforms =
|
||||
lib.platforms.darwin ++ lib.platforms.linux ++ lib.platforms.wasi ++ lib.platforms.freebsd;
|
||||
badPlatforms = [
|
||||
# Support for big-endian POWER < 8 was dropped in 1.9, but POWER8 users have less of a reason to run in big-endian mode than pre-POWER8 ones
|
||||
# So non-LE ppc64 is effectively unsupported, and Go SIGILLs on affordable ppc64 hardware
|
||||
# https://github.com/golang/go/issues/19074 - Dropped support for big-endian POWER < 8, with community pushback
|
||||
# https://github.com/golang/go/issues/73349 - upstream will not accept submissions to fix this
|
||||
"powerpc64-linux"
|
||||
];
|
||||
mainProgram = "go";
|
||||
};
|
||||
})
|
||||
@@ -1,27 +0,0 @@
|
||||
{ callPackage }:
|
||||
callPackage ./binary.nix {
|
||||
version = "1.21.0";
|
||||
hashes = {
|
||||
# Use `print-hashes.sh ${version}` to generate the list below
|
||||
darwin-amd64 = "b314de9f704ab122c077d2ec8e67e3670affe8865479d1f01991e7ac55d65e70";
|
||||
darwin-arm64 = "3aca44de55c5e098de2f406e98aba328898b05d509a2e2a356416faacf2c4566";
|
||||
freebsd-386 = "312a0065714a50862af714e7a5b3fbbd70fe68f905ffb9bcc56d42eadf6bffab";
|
||||
freebsd-amd64 = "b8eaa36654625df799654f77f4af0ea7bd9e5e760ebe86e68fe7c484748ae995";
|
||||
freebsd-arm64 = "bca5be1a9934fc522cb1a2e4849bb9f12ee6b480b48949e36a4dfb8e755a4b25";
|
||||
freebsd-armv6l = "f4c9c91fa9c37d6d6b7644f3f6b67167b2a44bd48c0cba1d2a5ff5fd50ceb364";
|
||||
freebsd-riscv64 = "45b99a9884dcd0dd4c8e4c0f99a4dc2901b8e9628dd8091ae5c0620afd536f0a";
|
||||
linux-386 = "0e6f378d9b072fab0a3d9ff4d5e990d98487d47252dba8160015a61e6bd0bcba";
|
||||
linux-amd64 = "d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742";
|
||||
linux-arm64 = "f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3";
|
||||
linux-armv6l = "e377a0004957c8c560a3ff99601bce612330a3d95ba3b0a2ae144165fc87deb1";
|
||||
linux-loong64 = "e484cdc55221f7e7853666ed4f0ef462eef46b52253f84df60a7b908416060cb";
|
||||
linux-mips = "6311d8ccd6ff9ce3cc8ecc72017d651d23e7325943fa72f4b65cd750be8aacd8";
|
||||
linux-mips64 = "6d9cb425dc61f60bff41e2dec873abbcc5b8dbd1d32997f994d707b662f3c363";
|
||||
linux-mips64le = "92f7933d997c589b4f506c6b3cc5b27ff43b294c3a2d40bf4d7eeaf375f92afb";
|
||||
linux-mipsle = "9bb9f938457411042074a57284d40a086e63f7778f86e1632e018bbc38948c92";
|
||||
linux-ppc64 = "e34dcc1df804bf8bac035ace3304f23696a9138a79a398dce981d89072d3ae23";
|
||||
linux-ppc64le = "e938ffc81d8ebe5efc179240960ba22da6a841ff05d5cab7ce2547112b14a47f";
|
||||
linux-riscv64 = "87b21c06573617842ca9e00b954bc9f534066736a0778eae594ac54b45a9e8b7";
|
||||
linux-s390x = "be7338df8e5d5472dfa307b0df2b446d85d001b0a2a3cdb1a14048d751b70481";
|
||||
};
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/src/net/lookup_unix.go b/src/net/lookup_unix.go
|
||||
index 8030e3d99e..5a7472d933 100644
|
||||
--- a/src/net/lookup_unix.go
|
||||
+++ b/src/net/lookup_unix.go
|
||||
@@ -21,7 +21,7 @@ var onceReadProtocols sync.Once
|
||||
// readProtocols loads contents of /etc/protocols into protocols map
|
||||
// for quick access.
|
||||
func readProtocols() {
|
||||
- file, err := open("/etc/protocols")
|
||||
+ file, err := open("@iana@/etc/protocols")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
diff --git a/src/net/port_unix.go b/src/net/port_unix.go
|
||||
index a9a96a2323..0df6efe9e5 100644
|
||||
--- a/src/net/port_unix.go
|
||||
+++ b/src/net/port_unix.go
|
||||
@@ -17,7 +17,7 @@ import (
|
||||
var onceReadServices sync.Once
|
||||
|
||||
func readServices() {
|
||||
- file, err := open("/etc/services")
|
||||
+ file, err := open("@iana@/etc/services")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
@@ -540,6 +540,7 @@ mapAliases {
|
||||
cringify = throw "'cringify' has been removed as it is unmaintained"; # Added 2025-12-16
|
||||
crispyDoom = throw "'crispyDoom' has been renamed to/replaced by 'crispy-doom'"; # Converted to throw 2025-10-27
|
||||
critcl = throw "'critcl' has been renamed to/replaced by 'tclPackages.critcl'"; # Converted to throw 2025-10-27
|
||||
criticality-score = throw "'criticality-score' has been removed, as it is unmaintained upstream"; # Added 2026-02-18
|
||||
cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
|
||||
crossLibcStdenv = throw "'crossLibcStdenv' has been renamed to/replaced by 'stdenvNoLibc'"; # Converted to throw 2025-10-27
|
||||
crystal_1_11 = throw "'crystal_1_11' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-09-04
|
||||
|
||||
@@ -7791,17 +7791,12 @@ with pkgs;
|
||||
### DEVELOPMENT / GO
|
||||
|
||||
# the unversioned attributes should always point to the same go version
|
||||
go = go_1_25;
|
||||
buildGoModule = buildGo125Module;
|
||||
go = go_1_26;
|
||||
buildGoModule = buildGo126Module;
|
||||
|
||||
go_latest = go_1_26;
|
||||
buildGoLatestModule = buildGo126Module;
|
||||
|
||||
go_1_24 = callPackage ../development/compilers/go/1.24.nix { };
|
||||
buildGo124Module = callPackage ../build-support/go/module.nix {
|
||||
go = buildPackages.go_1_24;
|
||||
};
|
||||
|
||||
go_1_25 = callPackage ../development/compilers/go/1.25.nix { };
|
||||
buildGo125Module = callPackage ../build-support/go/module.nix {
|
||||
go = buildPackages.go_1_25;
|
||||
|
||||
Reference in New Issue
Block a user