diff options
| -rw-r--r-- | container/syscall.go | 2 | ||||
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | package.nix | 34 | ||||
| -rw-r--r-- | test/default.nix | 2 |
6 files changed, 30 insertions, 26 deletions
diff --git a/container/syscall.go b/container/syscall.go index 4af60366..1b85b91a 100644 --- a/container/syscall.go +++ b/container/syscall.go @@ -64,7 +64,7 @@ const ( ) var _ encoding.TextMarshaler = _SCHED_LAST -var _ encoding.TextUnmarshaler = new(SchedPolicy) +var _ encoding.TextUnmarshaler = new(_SCHED_LAST) // String returns a unique representation of policy, also used in encoding. func (policy SchedPolicy) String() string { @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1765384171, - "narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=", + "lastModified": 1772985280, + "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", "owner": "nix-community", "repo": "home-manager", - "rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8", + "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1772822230, + "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", "type": "github" }, "original": { @@ -99,7 +99,7 @@ hakurei = pkgs.pkgsStatic.callPackage ./package.nix { inherit (pkgs) # passthru.buildInputs - go + go_1_26 clang # nativeBuildInputs @@ -182,7 +182,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 { - buildGoModule = previousArgs: pkgs.pkgsStatic.buildGoModule (previousArgs // { doCheck = false; }); + buildGo126Module = previousArgs: pkgs.pkgsStatic.buildGo126Module (previousArgs // { doCheck = false; }); }; in { @@ -1,3 +1,3 @@ module hakurei.app -go 1.25 +go 1.26 diff --git a/package.nix b/package.nix index 099d2425..68e3b2cd 100644 --- a/package.nix +++ b/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - buildGoModule, + buildGo126Module, makeBinaryWrapper, xdg-dbus-proxy, pkg-config, @@ -17,7 +17,7 @@ fuse3, # for passthru.buildInputs - go, + go_1_26, clang, # for check @@ -28,7 +28,7 @@ withStatic ? stdenv.hostPlatform.isStatic, }: -buildGoModule rec { +buildGo126Module rec { pname = "hakurei"; version = "0.3.6"; @@ -51,7 +51,7 @@ buildGoModule rec { ]; nativeBuildInputs = [ - go + go_1_26 pkg-config wayland-scanner ]; @@ -125,16 +125,20 @@ buildGoModule rec { --inherit-argv0 --prefix PATH : ${lib.makeBinPath appPackages} ''; - passthru.targetPkgs = [ - go - clang - xorg.xorgproto - util-linux + passthru = { + go = go_1_26; - # for go generate - wayland-protocols - wayland-scanner - ] - ++ buildInputs - ++ nativeBuildInputs; + targetPkgs = [ + go_1_26 + clang + xorg.xorgproto + util-linux + + # for go generate + wayland-protocols + wayland-scanner + ] + ++ buildInputs + ++ nativeBuildInputs; + }; } diff --git a/test/default.nix b/test/default.nix index 15614cc5..964e47be 100644 --- a/test/default.nix +++ b/test/default.nix @@ -34,7 +34,7 @@ testers.nixosTest { (writeShellScriptBin "hakurei-test" '' # Assert hst CGO_ENABLED=0: ${ with pkgs; - runCommand "hakurei-hst-cgo" { nativeBuildInputs = [ go ]; } '' + runCommand "hakurei-hst-cgo" { nativeBuildInputs = [ self.packages.${system}.hakurei.go ]; } '' cp -r ${options.environment.hakurei.package.default.src} "$out" chmod -R +w "$out" cp ${writeText "hst_cgo_test.go" ''package hakurei_test;import("testing";"hakurei.app/hst");func TestTemplate(t *testing.T){hst.Template()}''} "$out/hst_cgo_test.go" |