diff options
| -rw-r--r-- | cmd/hakurei/json_test.go | 2 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | internal/report/report_test.go | 2 | ||||
| -rw-r--r-- | test/flake.lock | 12 | ||||
| -rw-r--r-- | test/flake.nix | 4 | ||||
| -rw-r--r-- | test/package.nix | 12 |
6 files changed, 17 insertions, 17 deletions
diff --git a/cmd/hakurei/json_test.go b/cmd/hakurei/json_test.go index c6649567..433a514b 100644 --- a/cmd/hakurei/json_test.go +++ b/cmd/hakurei/json_test.go @@ -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()`}, } @@ -1,3 +1,3 @@ module hakurei.app -go 1.26 +go 1.27 diff --git a/internal/report/report_test.go b/internal/report/report_test.go index 6c7a4046..15abf13e 100644 --- a/internal/report/report_test.go +++ b/internal/report/report_test.go @@ -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}, diff --git a/test/flake.lock b/test/flake.lock index ce9fe45f..5537506a 100644 --- a/test/flake.lock +++ b/test/flake.lock @@ -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": { diff --git a/test/flake.nix b/test/flake.nix index 6c8cf100..01a07f78 100644 --- a/test/flake.nix +++ b/test/flake.nix @@ -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 { diff --git a/test/package.nix b/test/package.nix index 46567b69..e68420e3 100644 --- a/test/package.nix +++ b/test/package.nix @@ -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 |