Compare commits
21
Commits
e58b6eb171
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d9803e5be7
|
||
|
|
a28e01b863
|
||
|
|
84ab8daf6a
|
||
|
|
2ca57764a3
|
||
|
|
f189cc25c6
|
||
|
|
fa7e06ebd6
|
||
|
|
142152f6b8
|
||
|
|
b3ac03059f
|
||
|
|
cbd95294ba
|
||
|
|
ace59607f2
|
||
|
|
692c28ad29
|
||
|
|
df04ad592e
|
||
|
|
7737fd03ae
|
||
|
|
476945da23
|
||
|
|
85860c858a
|
||
|
|
60a62ae5f7
|
||
|
|
5313ea627b
|
||
|
|
5352598c68
|
||
|
|
9331a5cbeb
|
||
|
|
9b675c45ff
|
||
|
|
5cf1d70c7b
|
Vendored
+1
-1
@@ -1 +1 @@
|
||||
v0.4.6
|
||||
v0.4.7
|
||||
|
||||
@@ -66,7 +66,7 @@ func TestEncodeJSON(t *testing.T) {
|
||||
want string
|
||||
}{
|
||||
{"marshaler", errorJSONMarshaler{},
|
||||
`cannot encode json for main.errorJSONMarshaler: unique error 3735928559 injected by the test suite`},
|
||||
`cannot encode json for *main.errorJSONMarshaler: unique error 3735928559 injected by the test suite`},
|
||||
{"default", func() {},
|
||||
`cannot write json: json: unsupported type: func()`},
|
||||
}
|
||||
|
||||
@@ -36,6 +36,12 @@ func TestDecompress(t *testing.T) {
|
||||
return (pkg.Checksum)(h.Sum(nil))
|
||||
}()
|
||||
|
||||
gh := pkg.NewDecompress(pkg.NewHTTPGet(
|
||||
&client,
|
||||
"file:///testdata",
|
||||
testdataChecksum,
|
||||
), pkg.Gzip)
|
||||
|
||||
checkWithCache(t, []cacheTestCase{
|
||||
{"decompress", 0, nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
|
||||
cureMany(t, c, []cureStep{
|
||||
@@ -48,11 +54,7 @@ func TestDecompress(t *testing.T) {
|
||||
Want: pkg.Checksum{0xfd},
|
||||
}},
|
||||
|
||||
{"gzip", pkg.NewDecompress(pkg.NewHTTPGet(
|
||||
&client,
|
||||
"file:///testdata",
|
||||
testdataChecksum,
|
||||
), pkg.Gzip), ignorePathname, expectsChecksum(sha512.Sum384([]byte{0})), pkg.WNew, nil},
|
||||
{"gzip", gh, ignorePathname, expectsChecksum(sha512.Sum384([]byte{0})), pkg.WNew, nil},
|
||||
})
|
||||
}, expectsFS{
|
||||
".": {Mode: fs.ModeDir | 0700},
|
||||
@@ -61,7 +63,7 @@ func TestDecompress(t *testing.T) {
|
||||
"checksum/" + pkg.Encode(sha512.Sum384([]byte{0})): {Mode: 0400, Data: []byte{0}},
|
||||
|
||||
"identifier": {Mode: fs.ModeDir | 0700},
|
||||
"identifier/mae-iR_9LFT_BOEJ2IRzKsAlI754SalMjjt95fZeMd3gEyAzsrvuOXnXN0bFZJi4": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/vsAhtPNo4waRNOASwrQwcIPTqb3SBuJOXw2G4T1mNmVZM-wrQTRllmgXqcIIoRcX")},
|
||||
"identifier/" + pkg.Encode(pkg.NewIR().Ident(gh).Value()): {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/vsAhtPNo4waRNOASwrQwcIPTqb3SBuJOXw2G4T1mNmVZM-wrQTRllmgXqcIIoRcX")},
|
||||
|
||||
"substitute": {Mode: fs.ModeDir | 0700},
|
||||
"work": {Mode: fs.ModeDir | 0700},
|
||||
|
||||
+10
-29
@@ -3,7 +3,6 @@ package pkg_test
|
||||
import (
|
||||
"archive/tar"
|
||||
"bytes"
|
||||
"compress/gzip"
|
||||
"crypto/sha512"
|
||||
"errors"
|
||||
"io/fs"
|
||||
@@ -80,8 +79,8 @@ func TestTar(t *testing.T) {
|
||||
"checksum/" + wantEncode + "/work": {Mode: fs.ModeDir | 0500},
|
||||
|
||||
"identifier": {Mode: fs.ModeDir | 0700},
|
||||
"identifier/7OZ5ErCxUJyRnaaFvUKhTryjsJAoOBUR2MZpUB1DD57jRa09Xxsh9BUs0dM9z5uH": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantEncode)},
|
||||
"identifier/paWdPW_BowV3345c4GP4xxSNgxVs_7F09m9m7OaH5XbyuI3dTGZ-kFPOXFbwgr5O": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantEncode)},
|
||||
"identifier/snWp53xxNdx6cV5KSJqzyVWzLlTsFd8udOisIu8Rgxly09mGcxufYCoQ5CQrHDyZ": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantEncode)},
|
||||
"identifier/v9DUj2R4YK_3ae0m9VuUYI-HJysDDCENu1k10thxioycRzFH1Qejw5bBGukm4IdL": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantEncode)},
|
||||
|
||||
"substitute": {Mode: fs.ModeDir | 0700},
|
||||
|
||||
@@ -104,8 +103,8 @@ func TestTar(t *testing.T) {
|
||||
"checksum/" + wantExpandEncode + "/libedac.so": {Mode: fs.ModeSymlink | 0777, Data: []byte("/proc/nonexistent/libedac.so")},
|
||||
|
||||
"identifier": {Mode: fs.ModeDir | 0700},
|
||||
"identifier/1g2Tcg7pOJkZFxlKploBm4U0vIyMYbxDkcwwydwsF9BMs-w-knFJS41jnqOt16jT": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantExpandEncode)},
|
||||
"identifier/7OZ5ErCxUJyRnaaFvUKhTryjsJAoOBUR2MZpUB1DD57jRa09Xxsh9BUs0dM9z5uH": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantExpandEncode)},
|
||||
"identifier/1SuvgGltcsgqps9tWqjULG8RCdpx_6KVWXdsMd5xPKvdtysOxqpE-3bLu4j0WpGk": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantExpandEncode)},
|
||||
"identifier/snWp53xxNdx6cV5KSJqzyVWzLlTsFd8udOisIu8Rgxly09mGcxufYCoQ5CQrHDyZ": {Mode: fs.ModeSymlink | 0777, Data: []byte("../checksum/" + wantExpandEncode)},
|
||||
|
||||
"substitute": {Mode: fs.ModeDir | 0700},
|
||||
|
||||
@@ -132,16 +131,7 @@ func checkTarHTTP(
|
||||
if err := w.Close(); err != nil {
|
||||
t.Fatalf("Close: error = %v", err)
|
||||
}
|
||||
|
||||
var zbuf bytes.Buffer
|
||||
gw := gzip.NewWriter(&zbuf)
|
||||
if _, err := gw.Write(buf.Bytes()); err != nil {
|
||||
t.Fatalf("Write: error = %v", err)
|
||||
}
|
||||
if err := gw.Close(); err != nil {
|
||||
t.Fatalf("Close: error = %v", err)
|
||||
}
|
||||
testdata = zbuf.String()
|
||||
testdata = buf.String()
|
||||
}
|
||||
|
||||
testdataChecksum := func() pkg.Checksum {
|
||||
@@ -208,28 +198,19 @@ func checkTarHTTP(
|
||||
defer newDestroyArtifactFunc(&tarDirType)(t, base, c)
|
||||
|
||||
cureMany(t, c, []cureStep{
|
||||
{"file", pkg.NewTar(pkg.NewDecompress(pkg.NewHTTPGet(
|
||||
{"file", pkg.NewTar(pkg.NewHTTPGet(
|
||||
&client,
|
||||
"file:///testdata",
|
||||
testdataChecksum,
|
||||
), pkg.Gzip)), ignorePathname, want, pkg.WNew, nil},
|
||||
|
||||
{"directory", pkg.NewTar(pkg.NewDecompress(
|
||||
&tarDir,
|
||||
pkg.Gzip,
|
||||
)), ignorePathname, want, pkg.WNew, nil},
|
||||
|
||||
{"multiple entries", pkg.NewTar(pkg.NewDecompress(
|
||||
&tarDirMulti,
|
||||
pkg.Gzip,
|
||||
)), nil, nil, pkg.WNew, errors.New(
|
||||
{"directory", pkg.NewTar(&tarDir), ignorePathname, want, pkg.WNew, nil},
|
||||
|
||||
{"multiple entries", pkg.NewTar(&tarDirMulti), nil, nil, pkg.WNew, errors.New(
|
||||
"input directory does not contain a single regular file",
|
||||
)},
|
||||
|
||||
{"bad type", pkg.NewTar(pkg.NewDecompress(
|
||||
&tarDirType,
|
||||
pkg.Gzip,
|
||||
)), nil, nil, pkg.WNew, errors.New(
|
||||
{"bad type", pkg.NewTar(&tarDirType), nil, nil, pkg.WNew, errors.New(
|
||||
"input directory does not contain a single regular file",
|
||||
)},
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ func TestDispatch(t *testing.T) {
|
||||
}),
|
||||
},
|
||||
}, true, []string{`{"kind":"fatal","message":"rejecting coldboot loop","error":"unique error 51966 injected by the test suite"}
|
||||
`, `{"kind":"inconsistent","message":"processed inconsistent uevent","error":{"fault":1,"event":{"action":"add","devpath":"\u0000","env":{"V":"\ufffd"},"seqnum":2,"subsystem":""},"object":{"state":1,"devpath":"\u0000","subsystem":"","env":{"V":"\ufffd"}}}}
|
||||
`, `{"kind":"inconsistent","message":"processed inconsistent uevent","error":{"fault":1,"event":{"action":"add","devpath":"\u0000","env":{"V":"` + "\ufffd" + `"},"seqnum":2,"subsystem":""},"object":{"state":1,"devpath":"\u0000","subsystem":"","env":{"V":"` + "\ufffd" + `"}}}}
|
||||
`}, `dispatch: rejecting coldboot loop: unique error 51966 injected by the test suite
|
||||
dispatch: processed inconsistent uevent: duplicate add event on devpath "\x00"
|
||||
`, nil},
|
||||
|
||||
+2
-2
@@ -56,8 +56,8 @@ ln -s \
|
||||
|
||||
func init() {
|
||||
const (
|
||||
version = "1.25.12"
|
||||
checksum = "XNrGD_boJl2-El_a_T3BuTcMin_WPoU-FGddcNG8dcXA8n2QuxZB7kaUaCWu60QX"
|
||||
version = "1.25.14"
|
||||
checksum = "QKYjKzziCmD1eboU__Oi8VjqbPjaHrHAI9ceWyF3D9ORm7cPHN8muZuiGsoLKjCJ"
|
||||
)
|
||||
meta := Metadata{
|
||||
Name: "go-bootstrap",
|
||||
|
||||
@@ -62,6 +62,7 @@ disable_test t4200-rerere
|
||||
disable_test t5515-fetch-merge-logic
|
||||
disable_test t4124-apply-ws-rule
|
||||
disable_test t3404-rebase-interactive
|
||||
disable_test t7527-builtin-fsmonitor
|
||||
`;
|
||||
|
||||
check = [
|
||||
|
||||
@@ -3,18 +3,13 @@ package go {
|
||||
website = "https://go.dev";
|
||||
anitya = 1227;
|
||||
|
||||
version# = "1.26.6";
|
||||
version# = "1.27.0";
|
||||
source = remoteTar {
|
||||
url = "https://go.dev/dl/go"+version+".src.tar.gz";
|
||||
checksum = "BJQz9rGJ7ElMsZGURH7lw48Hw0x88RwdQJpINMomtgGCMK3AtwGCxDRkLE9REh5r";
|
||||
checksum = "Ookl2vP6KMfJuxaxX6nXZ1gnL43wZPl5GjpVsrI7IJiB4b3xr1PbnbYIOJ8v5jzG";
|
||||
compress = gzip;
|
||||
};
|
||||
|
||||
patches = [
|
||||
// https://go.dev/issue/77674
|
||||
"746640.patch",
|
||||
];
|
||||
|
||||
env = [
|
||||
"CC=cc",
|
||||
"GOCACHE=/tmp/gocache",
|
||||
@@ -1,29 +0,0 @@
|
||||
From 45929774c3d5c084cc478afba63c77cf67a68bd7 Mon Sep 17 00:00:00 2001
|
||||
From: khr@golang.org <khr@golang.org>
|
||||
Date: Wed, 18 Feb 2026 09:09:57 -0800
|
||||
Subject: [PATCH] internal/runtime/gc/scan: require popcnt for x86
|
||||
|
||||
The GOAMD64=v1 test disables popcnt instructions, which is a feature
|
||||
this package's amd64 assembly uses.
|
||||
|
||||
Fixes #77674
|
||||
|
||||
Change-Id: I7be9bb665838f5da50275f96ef3df398412bb44a
|
||||
Reviewed-on: https://go-review.googlesource.com/c/go/+/746640
|
||||
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
|
||||
Reviewed-by: Michael Knyszek <mknyszek@google.com>
|
||||
Reviewed-by: Keith Randall <khr@google.com>
|
||||
Auto-Submit: Keith Randall <khr@golang.org>
|
||||
---
|
||||
|
||||
diff --git a/src/internal/runtime/gc/scan/scan_amd64.go b/src/internal/runtime/gc/scan/scan_amd64.go
|
||||
index c03021c7d4..544b237770 100644
|
||||
--- a/src/internal/runtime/gc/scan/scan_amd64.go
|
||||
+++ b/src/internal/runtime/gc/scan/scan_amd64.go
|
||||
@@ -39,4 +39,5 @@ var avx512ScanPackedReqsMet = cpu.X86.HasAVX512VL &&
|
||||
cpu.X86.HasGFNI &&
|
||||
cpu.X86.HasAVX512BITALG &&
|
||||
cpu.X86.HasAVX512DQ && // for kmovb, see #79871
|
||||
- cpu.X86.HasAVX512VBMI
|
||||
+ cpu.X86.HasAVX512VBMI &&
|
||||
+ cpu.X86.HasPOPCNT
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 6.18.44 Kernel Configuration
|
||||
# Linux/x86 6.18.45 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="clang version 22.1.8"
|
||||
CONFIG_GCC_VERSION=0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 6.18.44 Kernel Configuration
|
||||
# Linux/arm64 6.18.45 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="clang version 22.1.8"
|
||||
CONFIG_GCC_VERSION=0
|
||||
|
||||
@@ -3,11 +3,11 @@ package kernel-source {
|
||||
website = "https://kernel.org";
|
||||
exclude = true;
|
||||
|
||||
version# = "6.18.44";
|
||||
version# = "6.18.45";
|
||||
output = remoteTar {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/"+
|
||||
"snapshot/linux-"+version+".tar.gz";
|
||||
checksum = "yNPGMl3A-EgU6LgD37PAcXIa9iUtP-AmoJuQozfGRSq6Eg1Eq4fdbpKy3iWewU9_";
|
||||
checksum = "yI15OXBcDSWVnozq7ilLiiKMbn2xGIuZWa73luYAjcHK12e8R9n_n_am43hnhNAZ";
|
||||
compress = gzip;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/riscv 6.18.44 Kernel Configuration
|
||||
# Linux/riscv 6.18.45 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="clang version 22.1.8"
|
||||
CONFIG_GCC_VERSION=0
|
||||
|
||||
@@ -3,12 +3,12 @@ package libevdev {
|
||||
website = "https://www.freedesktop.org/software/libevdev";
|
||||
anitya = 20540;
|
||||
|
||||
version# = "1.13.6";
|
||||
version# = "1.13.7";
|
||||
source = remoteGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
suffix = "libevdev/libevdev";
|
||||
ref = "libevdev-"+version;
|
||||
checksum = "HJbLafbpqPaKvQitt0t484DiHPeg3t_CNv-45MluNUT66vYIdF7FSfrK0vSpUCdi";
|
||||
checksum = "zmN9kkbYkrwr1YdzeMxlZIuiMkRQ9-mZ9DTcBufMckYWUq2IutSt9ZtRE4Agl75D";
|
||||
};
|
||||
|
||||
exec = meson {
|
||||
|
||||
@@ -3,12 +3,12 @@ package libpsl {
|
||||
website = "https://rockdaboot.github.io/libpsl";
|
||||
anitya = 7305;
|
||||
|
||||
version# = "0.23.2";
|
||||
version# = "0.23.3";
|
||||
source = remoteGitHubRelease {
|
||||
suffix = "rockdaboot/libpsl";
|
||||
tag = version;
|
||||
name = "libpsl-"+version+".tar.gz";
|
||||
checksum = "-XIKaQK0QoyzXpwezyvGzDdIBCUTqPyd8jU6axIusrnma-qsYxhLUO1Oycwcelr2";
|
||||
checksum = "DlEm2FHGDe3KaZxWxTgApEVIvxN5nTVs5-XsfomnO9a0EfsS46l7hZZPKGCS2uIf";
|
||||
compress = gzip;
|
||||
};
|
||||
|
||||
|
||||
@@ -4,12 +4,12 @@ package mesa {
|
||||
anitya = 1970;
|
||||
latest = anityaFallback;
|
||||
|
||||
version# = "26.2.0";
|
||||
version# = "26.2.1";
|
||||
source = remoteGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
suffix = "mesa/mesa";
|
||||
ref = "mesa-"+version;
|
||||
checksum = "UPnIdpo5wUsE938GXY-YyYDzfF62enRoEzCYRyLLPvzBhBbP4wZ8nDiKsjivcs5v";
|
||||
checksum = "WZYAysQFZt8KMFAxQheKFZHarR1isgOeSw4LyfqAcmaHwXMCLiVao6eGuEuhJTJv";
|
||||
};
|
||||
|
||||
exec = meson {
|
||||
|
||||
@@ -17,7 +17,7 @@ package nss {
|
||||
website = "https://firefox-source-docs.mozilla.org/security/nss/index.html";
|
||||
anitya = 2503;
|
||||
|
||||
version# = "3.126.1";
|
||||
version# = "3.127";
|
||||
source = remoteGitHub {
|
||||
suffix = "nss-dev/nss";
|
||||
tag = "NSS_"+join {
|
||||
@@ -28,7 +28,7 @@ package nss {
|
||||
};
|
||||
sep = "_";
|
||||
}+"_RTM";
|
||||
checksum = "3J7o7P3KlE8Cen4fzHLwvDKA1rrcJ84yBTniJHcIBw59LPT-7Q0NxL2CC4BKGW3F";
|
||||
checksum = "lzeKROXahSWqIgxYtm29lTxIfo-nmNYaS-cE-FFKp1C58wIBhmGhwVsRh-4xiQi7";
|
||||
};
|
||||
extra = [ nspr ];
|
||||
|
||||
|
||||
@@ -197,11 +197,11 @@ package python-vcs-versioning {
|
||||
website = "https://setuptools-scm.readthedocs.io/en/latest";
|
||||
anitya = 389421;
|
||||
|
||||
version# = "2.2.4";
|
||||
version# = "2.3.1";
|
||||
source = remoteGitHub {
|
||||
suffix = "pypa/setuptools-scm";
|
||||
tag = "vcs-versioning-v"+version;
|
||||
checksum = "HJ63LCMRd-KkXI1dWwBzK1AwkmjNZGISbhaJ7TbAlbI2eC55aX6i640n3Rt4RUMY";
|
||||
checksum = "rcbu8LlWlY6jmhC95pfnEKgGQuRxHY8_Pvo2jjmlJWSlyHSs1tFIRQ_FoMfi8YXo";
|
||||
};
|
||||
|
||||
env = [
|
||||
@@ -449,11 +449,11 @@ package python-pygments {
|
||||
website = "https://pygments.org";
|
||||
anitya = 3986;
|
||||
|
||||
version# = "2.20.0";
|
||||
version# = "2.21.0";
|
||||
source = remoteGitHub {
|
||||
suffix = "pygments/pygments";
|
||||
tag = version;
|
||||
checksum = "L-2P6vn7c_CNZYliE5CJAWLxO1ziDQVVkf8bnZbHj8aSCQ43oWv11wC9KzU9MeCa";
|
||||
checksum = "a9lSiHKLk_wA_rhaSaegYFhslE7L8GdqtIsbU3nbAk9A0xxkw0KvZOSNle4FZENu";
|
||||
};
|
||||
|
||||
exec = pip {
|
||||
@@ -568,6 +568,7 @@ package python-mako {
|
||||
checksum = "OYVVx9PxvZLSvA1C-lX-xElq5TvThYRElzDDKUHYU1tZMM7XlCtHSMGmdgqlbYxd";
|
||||
};
|
||||
|
||||
early = "rm test/test_exceptions.py";
|
||||
exec = pip {};
|
||||
|
||||
inputs = [
|
||||
|
||||
@@ -3,11 +3,11 @@ package strace {
|
||||
website = "https://strace.io";
|
||||
anitya = 4897;
|
||||
|
||||
version# = "7.1";
|
||||
version# = "7.2";
|
||||
source = remoteGit {
|
||||
url = "https://github.com/strace/strace.git";
|
||||
tag = "v"+version;
|
||||
checksum = "vGwgAAi_mGsoICDYHK9Vhbn2hBR0JIoUEkCKhLA2JHFg8NFvGsYEWGIafdnsN0_v";
|
||||
checksum = "_vIfkx9C8Q-F4Q1WE1jBMPFeDv3f2h-L1BTCokKqw3G993H2i5NYtBArIDo2Sx_O";
|
||||
};
|
||||
patches = [
|
||||
"tests-musl.patch",
|
||||
|
||||
@@ -3,11 +3,11 @@ package tamago {
|
||||
website = "https://github.com/usbarmory/tamago-go";
|
||||
anitya = 388872;
|
||||
|
||||
version# = "1.26.5";
|
||||
version# = "1.27.0";
|
||||
source = remoteGitHub {
|
||||
suffix = "usbarmory/tamago-go";
|
||||
tag = "tamago-go"+version;
|
||||
checksum = "QESl24dveM1jniFx_PkPGbxQe7daHcnMlMQXC1MXz6EEmxSeYyrI-tMLi0NEu8QE";
|
||||
checksum = "PV8a5fccqZifVUG7HJ6jTFk_0x6YIu1BSgYByCdJoTllm4NuQc9-Ngk_nuS7Nb3i";
|
||||
};
|
||||
|
||||
env = [
|
||||
@@ -29,9 +29,6 @@ chmod -R +w ..
|
||||
sed -i \
|
||||
's,/lib/ld-musl-` + linuxArch + `.so.1,/system/bin/linker,' \
|
||||
cmd/link/internal/` + arch + `/obj.go
|
||||
sed -i \
|
||||
's/cpu.X86.HasAVX512VBMI/& \&\& cpu.X86.HasPOPCNT/' \
|
||||
internal/runtime/gc/scan/scan_amd64.go
|
||||
|
||||
rm \
|
||||
os/root_unix_test.go \
|
||||
|
||||
@@ -695,12 +695,12 @@ package xserver {
|
||||
website = "https://gitlab.freedesktop.org/xorg/xserver";
|
||||
anitya = 5250;
|
||||
|
||||
version# = "21.1.24";
|
||||
version# = "26.0.99.901";
|
||||
source = remoteGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
suffix = "xorg/xserver";
|
||||
ref = "xorg-server-"+version;
|
||||
checksum = "ueBiwKIOHZkSmJPzxAeze_SJHt4QxEHQTk1kMkic-GYxC7Fs41ckwgVzcwr2N3ca";
|
||||
checksum = "2Liwqj-tu_NuD8BuWZR0PyYVJ_A0nj_sgx-LZWtdVpKAKQHtN-dSWCl-IPVOlcHG";
|
||||
};
|
||||
|
||||
exec = meson {
|
||||
@@ -773,12 +773,12 @@ package xwayland {
|
||||
website = "https://gitlab.freedesktop.org/xorg/xserver";
|
||||
anitya = 180949;
|
||||
|
||||
version# = "24.1.13";
|
||||
version# = "26.0.99.901";
|
||||
source = remoteGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
suffix = "xorg/xserver";
|
||||
ref = "xwayland-"+version;
|
||||
checksum = "dZpEGlcPJ72TBCtnR1mvquvN4iUypGvGJ4tN9hpa-ljux28EkSCQRlQHLPRijz36";
|
||||
checksum = "Vgtnwme2HU3CCeLE_xNScV_uJ55kPMremaOyVWRUFaRpwpaOQxsNB2fde_9Rx5zm";
|
||||
};
|
||||
|
||||
bin = [ "bash" ];
|
||||
|
||||
Generated
+6
-6
@@ -7,11 +7,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780361225,
|
||||
"narHash": "sha256-wnV9ttf4fPWNonBIQmvlrSlNpQYgx5HgWWd007mwIFA=",
|
||||
"lastModified": 1787146702,
|
||||
"narHash": "sha256-YbRcLdU/yK4gWsQg7V8WTKZHfXL33g8+wSFUX3wyevs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e28654b71096e08c019d4861ca26acb646f583d8",
|
||||
"rev": "173b7e8d40fdc8c296a9c99854314f17a3a1704c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -23,11 +23,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1780453794,
|
||||
"narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=",
|
||||
"lastModified": 1787101114,
|
||||
"narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338",
|
||||
"rev": "b18a4b905f8d028dc4476412e6d6891728695379",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
+2
-2
@@ -99,7 +99,7 @@
|
||||
hakurei = pkgs.pkgsStatic.callPackage ./package.nix {
|
||||
inherit (pkgs)
|
||||
# passthru.buildInputs
|
||||
go_1_26
|
||||
go_1_27
|
||||
clang
|
||||
|
||||
# nativeBuildInputs
|
||||
@@ -180,7 +180,7 @@
|
||||
let
|
||||
# this is used for interactive vm testing during development, where tests might be broken
|
||||
package = self.packages.${pkgs.stdenv.hostPlatform.system}.hakurei.override {
|
||||
buildGo126Module = previousArgs: pkgs.pkgsStatic.buildGo126Module (previousArgs // { doCheck = false; });
|
||||
buildGo127Module = previousArgs: pkgs.pkgsStatic.buildGo127Module (previousArgs // { doCheck = false; });
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
+6
-6
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGo126Module,
|
||||
buildGo127Module,
|
||||
makeBinaryWrapper,
|
||||
xdg-dbus-proxy,
|
||||
pkg-config,
|
||||
@@ -20,7 +20,7 @@
|
||||
fuse3,
|
||||
|
||||
# for passthru.buildInputs
|
||||
go_1_26,
|
||||
go_1_27,
|
||||
clang,
|
||||
xorgproto,
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
withStatic ? stdenv.hostPlatform.isStatic,
|
||||
}:
|
||||
|
||||
buildGo126Module rec {
|
||||
buildGo127Module rec {
|
||||
pname = "hakurei";
|
||||
version = with lib.strings; removePrefix "v" (trim (builtins.readFile ../cmd/dist/VERSION));
|
||||
|
||||
@@ -55,7 +55,7 @@ buildGo126Module rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
go_1_26
|
||||
go_1_27
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
@@ -126,10 +126,10 @@ buildGo126Module rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
go = go_1_26;
|
||||
go = go_1_27;
|
||||
|
||||
targetPkgs = [
|
||||
go_1_26
|
||||
go_1_27
|
||||
clang
|
||||
xorgproto
|
||||
util-linux
|
||||
|
||||
@@ -46,8 +46,10 @@ def wait_for_window(pattern):
|
||||
|
||||
def collect_state_ui(name):
|
||||
swaymsg(f"exec hakurei ps > '/tmp/{name}.ps'")
|
||||
machine.wait_for_file(f"/tmp/{name}.ps")
|
||||
machine.copy_from_vm(f"/tmp/{name}.ps", "")
|
||||
swaymsg(f"exec hakurei --json ps > '/tmp/{name}.json'")
|
||||
machine.wait_for_file(f"/tmp/{name}.json")
|
||||
machine.copy_from_vm(f"/tmp/{name}.json", "")
|
||||
machine.screenshot(name)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user