diff --git a/hack/flakes/flake.lock b/hack/flakes/flake.lock index cbc81c895..0a801e9cd 100644 --- a/hack/flakes/flake.lock +++ b/hack/flakes/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708847675, - "narHash": "sha256-RUZ7KEs/a4EzRELYDGnRB6i7M1Izii3JD/LyzH0c6Tg=", + "lastModified": 1709386671, + "narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a34566b67bef34c551f204063faeecc444ae9da", + "rev": "fa9a51752f1b5de583ad5213eb621be071806663", "type": "github" }, "original": { diff --git a/hack/flakes/flake.nix b/hack/flakes/flake.nix index a73f6d28e..5864ffa50 100644 --- a/hack/flakes/flake.nix +++ b/hack/flakes/flake.nix @@ -57,19 +57,29 @@ ldflags = [ "-s" "-w" ]; }; - clusterawsadm = buildGo120Module rec { + clusterawsadm = buildGo122Module rec { name = "clusterawsadm"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api-provider-aws"; rev = "v${version}"; - hash = "sha256-5SWi23h7Wvkbha2RTE8gMec7sKnHVTrbtTwF646Mml0="; + hash = "sha256-va11PBwLh0IcMV4kvXqxAOr9owezYdqvoenIaJPWsDo="; }; doCheck = false; subPackages = [ "cmd/clusterawsadm" ]; - vendorHash = "sha256-1osn61l9f6lGiDSnvFZJbFXD4dxWKB6qH2ETop9hQRU="; - ldflags = [ "-s" "-w" ]; + vendorHash = "sha256-YoIeRVYnQHG9dYGlSmLsDY1ACbAlXB1t063UFhaJG1w="; + ldflags = [ + "-s" + "-w" + "-X" "sigs.k8s.io/cluster-api-provider-aws/v2/version.gitVersion=v${version}" + "-X" "sigs.k8s.io/cluster-api-provider-aws/v2/version.gitCommit=v${version}" + "-X" "sigs.k8s.io/cluster-api-provider-aws/v2/version.gitReleaseCommit=v${version}" + "-X" "sigs.k8s.io/cluster-api-provider-aws/v2/version.gitMajor=${lib.versions.major version}" + "-X" "sigs.k8s.io/cluster-api-provider-aws/v2/version.gitMinor=${lib.versions.minor version}" + "-X" "sigs.k8s.io/cluster-api-provider-aws/v2/version.buildDate=19700101-00:00:00" + "-X" "sigs.k8s.io/cluster-api-provider-aws/v2/version.gitTreeState=clean" + ]; }; };