From cbd95294ba1f6c0a54fe8510814359e4a774cd67 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 20 Aug 2026 18:23:21 +0900 Subject: go: 1.27 This fixes test cases affected by jsonv2 changes. Signed-off-by: Ophestra --- test/flake.lock | 12 ++++++------ test/flake.nix | 4 ++-- test/package.nix | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'test') 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 -- cgit v1.3.1