Merge branch 'main' into dependabot/go_modules/go_modules-04410ef4b4

Author: hilmarf

flake.lock

@@ -16,15 +16,9 @@
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
 
       # Nixpkgs instantiated for supported system types.
-      nixpkgsFor = forAllSystems (system: import (builtins.fetchGit {
-        # https://lazamar.co.uk/nix-versions/?package=go&channel=nixpkgs-unstable
-        # https://lazamar.co.uk/nix-versions/?package=go&version=1.24rc2&fullName=go-1.24rc2&keyName=go_1_24&revision=21808d22b1cda1898b71cf1a1beb524a97add2c4&channel=nixpkgs-unstable
-        name = "1.24.0";
-        url = "https://github.com/NixOS/nixpkgs.git";
-        ref = "refs/heads/nixos-unstable";
-        # take latest commit sha from https://github.com/NixOS/nixpkgs/commits/nixos-unstable/
-        rev = "73cf49b8ad837ade2de76f87eb53fc85ed5d4680";
-      }) { inherit system; });
+      nixpkgsFor = forAllSystems (system: import nixpkgs {
+        inherit system;
+      });
 
     in
     {
@@ -54,7 +48,9 @@
             # "-X ocm.software/ocm/api/version.buildDate=1970-01-01T0:00:00+0000"
             ];
 
-            CGO_ENABLED = 0;
+            env = {
+              CGO_ENABLED = "0";
+            };
 
             subPackages = [
               "cmds/ocm"