From 159c3e5888d842a3132ea46fc2de45054dddf098 Mon Sep 17 00:00:00 2001 From: Roxy Light Date: Wed, 9 Oct 2024 09:46:05 -0700 Subject: [PATCH] Upgrade to Go 1.23.2 Fixes #55 --- README.md | 2 +- flake.nix | 20 ++++++++++++++------ go.mod | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 186e4a8..894d7f1 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Other examples: Prerequisites: - Knowledge of using the command-line for your OS (e.g. Terminal.app, Command Prompt, etc.) -- [Go](https://go.dev/dl/) 1.23 or later. +- [Go](https://go.dev/dl/) 1.23.2 or later. ### Linux or macOS diff --git a/flake.nix b/flake.nix index 1a7add0..c58be7d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,13 @@ flake-utils.url = "flake-utils"; }; - outputs = { nixpkgs, flake-utils, ... }: + outputs = { self, nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { inherit system; }; + pkgs = import nixpkgs { + inherit system; + overlays = [ self.overlays.default ]; + }; in { devShells.default = pkgs.mkShell { @@ -23,9 +26,14 @@ }; } ) // { - lib = {}; - overlays = {}; - nixosModules = {}; - nixosConfigurations = {}; + overlays.default = final: prev: { + go_1_23 = prev.go_1_23.overrideAttrs { + version = "1.23.2"; + src = prev.fetchurl { + url = "https://go.dev/dl/go1.23.2.src.tar.gz"; + hash = "sha256-NpMBYqk99BfZC9IsbhTa/0cFuqwrAkGO3aZxzfqc0H8="; + }; + }; + }; }; } diff --git a/go.mod b/go.mod index 4564cae..1c13a2f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module zb.256lights.llc/pkg -go 1.23.1 +go 1.23.2 require ( github.com/google/go-cmp v0.5.9