Skip to content

Commit e10c4ff

Browse files
Merge pull request #125 from StackVista/stac-24106
STAC-24106: Pin the openapi generator to the version we used to have …
2 parents 440952a + 1f1cd54 commit e10c4ff

37 files changed

+672
-526
lines changed

flake.lock

Lines changed: 24 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
nixConfig.bash-prompt = "STS CLI 2 $ ";
55

66
inputs = {
7-
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
7+
nixpkgs.url = "github:nixos/nixpkgs";
88
flake-utils.url = "github:numtide/flake-utils";
99
};
1010

@@ -14,14 +14,22 @@
1414
pkgs = import nixpkgs { inherit system; overlays = [ ]; };
1515
pkgs-linux = import nixpkgs { system = "x86_64-linux"; overlays = [ ]; };
1616

17+
# Pin ONLY openapi-generator-cli to the old nixpkgs commit
18+
openapiPinnedPkgs = import (builtins.fetchTarball {
19+
url = "https://github.com/NixOS/nixpkgs/archive/4baef62b8eef25c97ac3e00804dce6920b2b850e.tar.gz";
20+
sha256 = "sha256-uIcstZ0D5lEi6pDYupfsKLRLgC6ZmwdxsWzCE3li+IQ=";
21+
}) {
22+
inherit system;
23+
};
24+
1725
# Dependencies used for both development and CI/CD
1826
sharedDeps = pkgs: (with pkgs; [
1927
bash
20-
go_1_22
28+
go_1_24
2129
gotools
2230
diffutils # Required for golangci-lint
2331
golangci-lint
24-
openapi-generator-cli
32+
openapiPinnedPkgs.openapi-generator-cli
2533
]);
2634

2735
# Dependencies used only by CI/CD
@@ -54,16 +62,16 @@
5462
devShell = self.devShells."${system}".dev;
5563

5664
packages = {
57-
sts = pkgs.buildGo122Module {
65+
sts = pkgs.buildGo124Module {
5866
pname = "sts";
5967
version = "2.0.0";
6068

6169
src = ./.;
6270

63-
vendorHash = "sha256-2WKvk8eD5nhq1QEgKsZZrRs8yHv1YkbVjoTzrTqvmb4=";
71+
vendorHash = "sha256-aXTDHT1N+4Qpkuxb8vvBvP2VPyS5ofCgX6XFhJ5smUQ=";
6472

6573
postInstall = ''
66-
mv $out/bin/stackstate-cli $out/bin/sts
74+
mv $out/bin/stackstate-cli2 $out/bin/sts
6775
'';
6876
};
6977

generated/stackstate_api/api_agent_leases.go

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generated/stackstate_api/api_agent_registrations.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generated/stackstate_api/api_api_token.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generated/stackstate_api/api_component.go

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generated/stackstate_api/api_dashboards.go

Lines changed: 26 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generated/stackstate_api/api_dummy.go

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)