From 8972aef306e52a6af328901ada56a948c6dfa987 Mon Sep 17 00:00:00 2001 From: budimanjojo Date: Fri, 27 Dec 2024 11:04:03 +0700 Subject: [PATCH] fix(go): update go builder version for image-factory Signed-off-by: budimanjojo --- flake.lock | 20 ++++++++++---------- flake.nix | 27 ++++++++++++++++----------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 69f54b1d..745c63b1 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -36,14 +36,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "root": { diff --git a/flake.nix b/flake.nix index e0a152b5..d3e3c3c3 100644 --- a/flake.nix +++ b/flake.nix @@ -17,23 +17,28 @@ inputs.flake-parts.flakeModules.easyOverlay ]; perSystem = - { config, system, pkgs, ... }: + { + config, + system, + pkgs, + ... + }: { overlayAttrs = { inherit (config.packages) talhelper; }; _module.args.pkgs = import inputs.nixpkgs { inherit system; - # overlays = [ - # (final: prev: { - # go_1_22 = prev.go_1_22.overrideAttrs (old: { - # src = prev.fetchurl { - # url = "https://go.dev/dl/go1.22.3.src.tar.gz"; - # hash = "sha256-gGSO80+QMZPXKlnA3/AZ9fmK4MmqE63gsOy/+ZGnb2g="; - # }; - # }); - # }) - # ]; + overlays = [ + (final: prev: { + go_1_23 = prev.go_1_23.overrideAttrs (old: { + src = prev.fetchurl { + url = "https://go.dev/dl/go1.23.4.src.tar.gz"; + hash = "sha256-rTRaxCHpCBQpOpaZzKGd1SOCUcP2h5gLvK4oSVsmNTE="; + }; + }); + }) + ]; }; packages = rec { default = talhelper;