Skip to content
This repository was archived by the owner on Sep 29, 2025. It is now read-only.

Commit c3e517f

Browse files
committed
asd
1 parent f7b64ec commit c3e517f

6 files changed

Lines changed: 37 additions & 39 deletions

File tree

.github/workflows/push_build_devShells.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
artifacts:
1111
strategy:
1212
matrix:
13-
os: [blacksmith-8vcpu-ubuntu-2204, blacksmith-8vcpu-ubuntu-2204-arm]
13+
os: [blacksmith-16vcpu-ubuntu-2204, blacksmith-16vcpu-ubuntu-2204-arm]
1414
fail-fast: true
1515

1616
runs-on: ${{ matrix.os }}

flake.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,10 @@
5252

5353
devShells = flake-utils.lib.flattenTree {
5454
default = pkgs.mkShell {
55-
buildInputs = with pkgs;
56-
[
57-
gh
58-
gnused
59-
];
55+
buildInputs = with pkgs;[
56+
gh
57+
gnused
58+
];
6059
};
6160

6261
ci = pkgs.mkShell {

lib/go/example/flake.lock

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

lib/go/example/flake.nix

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
devShells = flake-utils.lib.flattenTree rec {
4747
default = nixops-lib.go.devShell {
4848
buildInputs = with pkgs; [
49-
mockgen
50-
gqlgen
51-
gqlgenc
52-
oapi-codegen
49+
# mockgen
50+
# gqlgen
51+
# gqlgenc
52+
# oapi-codegen
5353
];
5454
};
5555
};
@@ -59,21 +59,21 @@
5959
inherit name src version ldflags buildInputs nativeBuildInputs;
6060
};
6161

62-
example-arm64-darwin = (nixops-lib.go.package {
63-
inherit name src version ldflags buildInputs nativeBuildInputs;
64-
}).overrideAttrs (old: old // { GOOS = "darwin"; GOARCH = "arm64"; CGO_ENABLED = "0"; });
62+
# example-arm64-darwin = (nixops-lib.go.package {
63+
# inherit name src version ldflags buildInputs nativeBuildInputs;
64+
# }).overrideAttrs (old: old // { GOOS = "darwin"; GOARCH = "arm64"; CGO_ENABLED = "0"; });
6565

66-
example-amd64-darwin = (nixops-lib.go.package {
67-
inherit name src version ldflags buildInputs nativeBuildInputs;
68-
}).overrideAttrs (old: old // { GOOS = "darwin"; GOARCH = "amd64"; GO_ENABLED = "0"; });
66+
# example-amd64-darwin = (nixops-lib.go.package {
67+
# inherit name src version ldflags buildInputs nativeBuildInputs;
68+
# }).overrideAttrs (old: old // { GOOS = "darwin"; GOARCH = "amd64"; GO_ENABLED = "0"; });
6969

70-
example-arm64-linux = (nixops-lib.go.package {
71-
inherit name src version ldflags buildInputs nativeBuildInputs;
72-
}).overrideAttrs (old: old // { GOOS = "linux"; GOARCH = "arm64"; CGO_ENABLED = "0"; });
70+
# example-arm64-linux = (nixops-lib.go.package {
71+
# inherit name src version ldflags buildInputs nativeBuildInputs;
72+
# }).overrideAttrs (old: old // { GOOS = "linux"; GOARCH = "arm64"; CGO_ENABLED = "0"; });
7373

74-
example-amd64-linux = (nixops-lib.go.package {
75-
inherit name src version ldflags buildInputs nativeBuildInputs;
76-
}).overrideAttrs (old: old // { GOOS = "linux"; GOARCH = "amd64"; CGO_ENABLED = "0"; });
74+
# example-amd64-linux = (nixops-lib.go.package {
75+
# inherit name src version ldflags buildInputs nativeBuildInputs;
76+
# }).overrideAttrs (old: old // { GOOS = "linux"; GOARCH = "amd64"; CGO_ENABLED = "0"; });
7777

7878
docker-image = nixops-lib.go.docker-image {
7979
inherit name version buildInputs;

lib/go/go.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ in
9191
, buildInputs
9292
, nativeBuildInputs
9393
, postInstall ? ""
94-
}: (pkgs.buildGoModule {
94+
}: (pkgs.buildGoModule.override { go = pkgs.go; } {
9595
inherit src version ldflags buildInputs nativeBuildInputs;
9696

9797
pname = name;

overlays/go.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
final: prev: rec {
1+
final: prev: {
22
go = prev.go_1_24.overrideAttrs
33
(finalAttrs: previousAttrs: rec {
44
version = "1.24.4";
@@ -10,7 +10,7 @@ final: prev: rec {
1010

1111
});
1212

13-
buildGoModule = prev.buildGoModule.override { go = go; };
13+
# buildGoModule = prev.buildGoModule.override { go = go; };
1414

1515
golangci-lint = prev.golangci-lint.override {
1616
buildGo124Module = args: final.buildGo124Module (args // rec {

0 commit comments

Comments
 (0)