From 9ac422310167d94452e18f361ebbcbd99198ce43 Mon Sep 17 00:00:00 2001 From: Cedric Lewe <0skillallluck@pm.me> Date: Thu, 7 May 2026 11:56:36 +0200 Subject: [PATCH 1/4] Update Go and module hashes --- assets/meta/go.mod.yml | 16 ++++++++-------- assets/meta/modules.txt | 12 ++++++------ flake.nix | 2 +- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/assets/meta/go.mod.yml b/assets/meta/go.mod.yml index ed268eb..8fd61b4 100644 --- a/assets/meta/go.mod.yml +++ b/assets/meta/go.mod.yml @@ -8,10 +8,10 @@ type: archive url: https://proxy.golang.org/codeberg.org/dergs/tonearm/@v/v1.4.1-0.20260423094524-7e92b9bac909.zip - dest: vendor/codeberg.org/puregotk/puregotk - sha256: e7fded6b4e364e3f2926d9470a991de1e422a712849008a24c347b2ccd96b5cf + sha256: 7ac1577ad2869e1ce0189987e547f9ba41a875453a6ae935b51bf3316c4baa25 strip-components: 3 type: archive - url: https://proxy.golang.org/codeberg.org/puregotk/puregotk/@v/v0.0.0-20260420231554-98419d54d2d2.zip + url: https://proxy.golang.org/codeberg.org/puregotk/puregotk/@v/v0.0.0-20260428084216-6e5c8f15d61c.zip - dest: vendor/github.com/go-gst/go-glib sha256: 1c930b6f74dfee655c66a89d64d692a2ebcb704f367ffe18b91fa478ee0187b8 strip-components: 3 @@ -53,10 +53,10 @@ type: archive url: https://proxy.golang.org/github.com/yeqown/go-qrcode/writer/standard/@v/v1.3.0.zip - dest: vendor/golang.org/x/sync - sha256: a35481e5ae73e51ef01cf42bcad09c3b73bb3a4abb67d495d4a575021541ed02 + sha256: 7179d4d68800f6fdcadb9d4bbf11cbb5df9b40360c89305c203fe20723cbd375 strip-components: 3 type: archive - url: https://proxy.golang.org/golang.org/x/sync/@v/v0.12.0.zip + url: https://proxy.golang.org/golang.org/x/sync/@v/v0.20.0.zip - dest: vendor/codeberg.org/puregotk/purego sha256: 0d5fb9e11934b151ac357a9c0660e4dcd287d2f93db0829356415f6e6a8ef84b strip-components: 3 @@ -88,15 +88,15 @@ type: archive url: https://proxy.golang.org/github.com/yeqown/reedsolomon/@v/v1.0.0.zip - dest: vendor/golang.org/x/exp - sha256: 447a436882177a2a9fc281116f1858d6e0533c790a90f55cf3a64f1cafb752c6 + sha256: de285d08489fcd4d420a8561501e75b5124db0a48121dfc26e811959f518db4e strip-components: 3 type: archive - url: https://proxy.golang.org/golang.org/x/exp/@v/v0.0.0-20240909161429-701f63a606c0.zip + url: https://proxy.golang.org/golang.org/x/exp/@v/v0.0.0-20260410095643-746e56fc9e2f.zip - dest: vendor/golang.org/x/image - sha256: f494b7080958495072b8e2ea236a068983d97c41d4ee0ab268f282710e831469 + sha256: 80cf8b03c19e3000eda524c98c5bba6513b2691daba943b8ba6b800295104696 strip-components: 3 type: archive - url: https://proxy.golang.org/golang.org/x/image/@v/v0.38.0.zip + url: https://proxy.golang.org/golang.org/x/image/@v/v0.39.0.zip - dest: vendor/golang.org/x/sys sha256: cb8b073934cf7e579c9f80c4d12619d5f96fcf97af6f07fdc649e7acec0aaddf strip-components: 3 diff --git a/assets/meta/modules.txt b/assets/meta/modules.txt index 82043b7..8daf90d 100644 --- a/assets/meta/modules.txt +++ b/assets/meta/modules.txt @@ -18,7 +18,7 @@ codeberg.org/puregotk/purego/internal/cgo codeberg.org/puregotk/purego/internal/fakecgo codeberg.org/puregotk/purego/internal/strings codeberg.org/puregotk/purego/internal/xreflect -# codeberg.org/puregotk/puregotk v0.0.0-20260420231554-98419d54d2d2 +# codeberg.org/puregotk/puregotk v0.0.0-20260428084216-6e5c8f15d61c ## explicit; go 1.24.0 codeberg.org/puregotk/puregotk/internal/core codeberg.org/puregotk/puregotk/pkg/core @@ -80,18 +80,18 @@ github.com/yeqown/go-qrcode/writer/standard/shapes ## explicit github.com/yeqown/reedsolomon github.com/yeqown/reedsolomon/binary -# golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 -## explicit; go 1.22.0 +# golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f +## explicit; go 1.25.0 golang.org/x/exp/constraints -# golang.org/x/image v0.38.0 +# golang.org/x/image v0.39.0 ## explicit; go 1.25.0 golang.org/x/image/draw golang.org/x/image/font golang.org/x/image/font/basicfont golang.org/x/image/math/f64 golang.org/x/image/math/fixed -# golang.org/x/sync v0.12.0 -## explicit; go 1.23.0 +# golang.org/x/sync v0.20.0 +## explicit; go 1.25.0 golang.org/x/sync/singleflight # golang.org/x/sys v0.43.0 ## explicit; go 1.25.0 diff --git a/flake.nix b/flake.nix index 3ab14c2..8b39b18 100644 --- a/flake.nix +++ b/flake.nix @@ -113,7 +113,7 @@ pname = "scanline"; version = "0.4.0"; src = pkgs.lib.cleanSource ./.; - vendorHash = "sha256-zp+DQoo5jwJJrvC6KGdWBAvWtR55+6jslVlAAkfcU1U="; + vendorHash = "sha256-RQn9pK/JkzvpJTG9xADz91W40Ss19JEtZf+0N+zLUA="; ldflags = [ "-X \"github.com/0skillallluck/scanline/app/dialogs/about.Commit=${ diff --git a/go.mod b/go.mod index 69d93b3..eb67b1e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26.0 require ( codeberg.org/dergs/tonearm v1.4.1-0.20260423094524-7e92b9bac909 - codeberg.org/puregotk/puregotk v0.0.0-20260420231554-98419d54d2d2 + codeberg.org/puregotk/puregotk v0.0.0-20260428084216-6e5c8f15d61c github.com/go-gst/go-glib v1.4.0 github.com/go-gst/go-gst v1.4.0 github.com/google/uuid v1.6.0 @@ -13,7 +13,7 @@ require ( github.com/leonelquinteros/gotext v1.7.2 github.com/yeqown/go-qrcode/v2 v2.2.5 github.com/yeqown/go-qrcode/writer/standard v1.3.0 - golang.org/x/sync v0.12.0 + golang.org/x/sync v0.20.0 ) require ( @@ -23,7 +23,7 @@ require ( github.com/mattn/go-pointer v0.0.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/yeqown/reedsolomon v1.0.0 // indirect - golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect - golang.org/x/image v0.38.0 // indirect + golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect + golang.org/x/image v0.39.0 // indirect golang.org/x/sys v0.43.0 // indirect ) diff --git a/go.sum b/go.sum index 95e488e..9dbb5b1 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ codeberg.org/dergs/tonearm v1.4.1-0.20260423094524-7e92b9bac909 h1:FcEkczk1EFQ8n codeberg.org/dergs/tonearm v1.4.1-0.20260423094524-7e92b9bac909/go.mod h1:Qi5NGNFaMtp8NWwtGtbCGWLJ3LpvDTWxcv3aC0iEhFI= codeberg.org/puregotk/purego v0.0.0-20260224095105-2513c838cb80 h1:y5ZxMLLOjl4xc2tBl02olxZQ06xbbKiR+2ipBfDrVcs= codeberg.org/puregotk/purego v0.0.0-20260224095105-2513c838cb80/go.mod h1:hVVM4ddvYRlc3IcK3CXJPlMwd/vaLj7gdDBZ6oPgT8w= -codeberg.org/puregotk/puregotk v0.0.0-20260420231554-98419d54d2d2 h1:i2Z8LWUE+bunEy9O43+CeQeFj3SvAtkiIzJibDp0XxY= -codeberg.org/puregotk/puregotk v0.0.0-20260420231554-98419d54d2d2/go.mod h1:KDQjaDscQiL2OiLWuBFBF4l/x/1DW+M0lPcQTa0Id0o= +codeberg.org/puregotk/puregotk v0.0.0-20260428084216-6e5c8f15d61c h1:wJFtOk8n7LFVxrd1l20GLul52QZyOJblV0CSawGtsz4= +codeberg.org/puregotk/puregotk v0.0.0-20260428084216-6e5c8f15d61c/go.mod h1:KDQjaDscQiL2OiLWuBFBF4l/x/1DW+M0lPcQTa0Id0o= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= @@ -36,12 +36,12 @@ github.com/yeqown/go-qrcode/writer/standard v1.3.0 h1:chdyhEfRtUPgQtuPeaWVGQ/TQx github.com/yeqown/go-qrcode/writer/standard v1.3.0/go.mod h1:O4MbzsotGCvy8upYPCR91j81dr5XLT7heuljcNXW+oQ= github.com/yeqown/reedsolomon v1.0.0 h1:x1h/Ej/uJnNu8jaX7GLHBWmZKCAWjEJTetkqaabr4B0= github.com/yeqown/reedsolomon v1.0.0/go.mod h1:P76zpcn2TCuL0ul1Fso373qHRc69LKwAw/Iy6g1WiiM= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= -golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE= -golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY= -golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= -golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM= +golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80= +golang.org/x/image v0.39.0 h1:skVYidAEVKgn8lZ602XO75asgXBgLj9G/FE3RbuPFww= +golang.org/x/image v0.39.0/go.mod h1:sIbmppfU+xFLPIG0FoVUTvyBMmgng1/XAMhQ2ft0hpA= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= From 536d7d59d9f1aac9586ce1649e6fa9d0391c9f0a Mon Sep 17 00:00:00 2001 From: Cedric Lewe <0skillallluck@pm.me> Date: Thu, 7 May 2026 11:56:39 +0200 Subject: [PATCH 2/4] Update flake lock file --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 88e712f..ae76b78 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { From a2217b72b559debce8ff19d1afccefb7aef9149d Mon Sep 17 00:00:00 2001 From: Cedric Lewe <0skillallluck@pm.me> Date: Thu, 7 May 2026 11:56:41 +0200 Subject: [PATCH 3/4] Update workflow runtime pin --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f213ee4..3e672b4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: name: Flatpak Build (${{ matrix.target.arch }}) runs-on: ${{ matrix.target.runner }} container: - image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-49 + image: ghcr.io/flathub-infra/flatpak-github-actions@sha256:9a7383aad71e6e966f120330d5a16ed99a2f41a68e36cc2fd1625bc635420707 # gnome-50 options: --privileged strategy: matrix: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5e1253a..8d03ae4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: name: Flatpak Build (${{ matrix.target.arch }}) runs-on: ${{ matrix.target.runner }} container: - image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-49 + image: ghcr.io/flathub-infra/flatpak-github-actions@sha256:9a7383aad71e6e966f120330d5a16ed99a2f41a68e36cc2fd1625bc635420707 # gnome-50 options: --privileged strategy: matrix: From 8914e3649419e975b92d1f07eac85147edcd88d1 Mon Sep 17 00:00:00 2001 From: Cedric Lewe <0skillallluck@pm.me> Date: Thu, 7 May 2026 12:07:05 +0200 Subject: [PATCH 4/4] Fix Nix vendor hash --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8b39b18..fc5e872 100644 --- a/flake.nix +++ b/flake.nix @@ -113,7 +113,7 @@ pname = "scanline"; version = "0.4.0"; src = pkgs.lib.cleanSource ./.; - vendorHash = "sha256-RQn9pK/JkzvpJTG9xADz91W40Ss19JEtZf+0N+zLUA="; + vendorHash = "sha256-RQn9pK/jfkzvpJTG9xADz91W40Ss19JEtZf+0N+zLUA="; ldflags = [ "-X \"github.com/0skillallluck/scanline/app/dialogs/about.Commit=${