all repos — homestead @ 3e55fc12922008bb362c6a5a8a5c65a8396ecf06

Code for my website

fix nix build of builder complaining about go 1.22 EOL

Alan Pearce
commit

3e55fc12922008bb362c6a5a8a5c65a8396ecf06

parent

ba317150bb59d27d0a6643942439cd55c001ce7f

2 files changed, 12 insertions(+), 29 deletions(-)

jump to
D cmd/build/default.nix
@@ -1,28 +0,0 @@
-{ pkgs ? (
-    let
-      inherit (builtins) fetchTree fromJSON readFile;
-      inherit ((fromJSON (readFile ../../flake.lock)).nodes) nixpkgs gomod2nix;
-    in
-    import (fetchTree nixpkgs.locked) {
-      overlays = [
-        (import "${fetchTree gomod2nix.locked}/overlay.nix")
-      ];
-    }
-  )
-, buildGoApplication ? pkgs.buildGoApplication
-, makeWrapper ? pkgs.makeWrapper
-}:
-
-buildGoApplication {
-  pname = "build";
-  version = "0.1";
-  pwd = ../..;
-  src = ../..;
-  modules = ../../gomod2nix.toml;
-  subPackages = [ "cmd/build" ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  postInstall = ''
-    wrapProgram $out/bin/build --set KO_DATA_PATH ${../../templates}
-  '';
-}
M flake.nix → flake.nix
@@ -79,7 +79,18 @@ };
             };
           };
           packages = {
-            build = pkgs.callPackage ./cmd/build { };
+            build = pkgs.buildGoApplication {
+              pname = "build";
+              version = "0.1";
+              src = ./.;
+              modules = ./gomod2nix.toml;
+              subPackages = [ "cmd/build" ];
+              nativeBuildInputs = with pkgs; [ makeWrapper ];
+
+              postInstall = ''
+                wrapProgram $out/bin/build --set KO_DATA_PATH ${./templates}
+              '';
+            };
           };
         });
 }