Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: update nix lock file #1018

Merged
merged 5 commits into from
Nov 19, 2024
Merged

deps: update nix lock file #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44d159b
deps: update nix lock file
renovate[bot] Nov 19, 2024
534f11a
overlays: drop dtc override
katexochen Nov 19, 2024
52e92d6
overlays: drop uplosi override
katexochen Nov 19, 2024
f71df38
treefmt: fix linter issues after golangci-lint update
katexochen Nov 19, 2024
7bcad43
treewide: update proto code after protoc update
katexochen Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/genpolicy/genpolicy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func TestRunner(t *testing.T) {

yamlPath, err := os.ReadFile(yamlPathFile)
require.NoError(err)
assert.Equal(expectedYAMLPath, string(yamlPath))
assert.YAMLEq(expectedYAMLPath, string(yamlPath))

require.NoError(r.Teardown())
}
4 changes: 2 additions & 2 deletions e2e/internal/contrasttest/contrasttest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ func (ct *ContrastTest) Init(t *testing.T, resources []any) {
require := require.New(t)

f, err := os.Open(ct.ImageReplacementsFile)
require.NoError(err, fmt.Sprintf("Image replacements %s file not found", ct.ImageReplacementsFile))
require.NoError(err, "Image replacements %s file not found", ct.ImageReplacementsFile)
ct.ImageReplacements, err = kuberesource.ImageReplacementsFromFile(f)
require.NoError(err, fmt.Sprintf("Parsing image replacements from %s failed", ct.ImageReplacementsFile))
require.NoError(err, "Parsing image replacements from %s failed", ct.ImageReplacementsFile)

// If available, acquire a fifo ticket to synchronize cluster access with
// other running e2e tests. We request a ticket and wait for our turn.
Expand Down
18 changes: 9 additions & 9 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/meshapi/meshapi.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/meshapi/meshapi_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/userapi/userapi.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/userapi/userapi_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 0 additions & 20 deletions overlays/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@ final: prev:
withExtensions = with final.azure-cli.extensions; [ aks-preview ];
};

# Use a newer uplosi that has fixes for private galleries.
uplosi = prev.uplosi.overrideAttrs (prev: {
src = final.fetchFromGitHub {
owner = "edgelesssys";
repo = prev.pname;
rev = "fb292c23ed805cb4005fca41159d0f54bb0a5bcc";
hash = "sha256-MsZ4Bl8sW1dZUB9cYPsaLtc8P8RRx4hafSbNB4vXqi4=";
};
});

erofs-utils = prev.erofs-utils.overrideAttrs (prev: {
patches = final.lib.optionals (prev ? patches) prev.patches ++ [
./erofs-utils-reproducibility.patch
Expand All @@ -44,14 +34,4 @@ final: prev:
--set SOURCE_DATE_EPOCH 0
'';
});

# Upstream PR is currently in staging: https://github.com/NixOS/nixpkgs/pull/349201.
dtc = prev.dtc.overrideAttrs (prev: {
patches = final.lib.optionals (prev ? patches) prev.patches ++ [
(final.fetchpatch2 {
url = "https://github.com/dgibson/dtc/commit/56a7d0cb3be5f2f7604bc42299e24d13a39c72d8.patch";
hash = "sha256-GmAyk/K2OolH/Z8SsgwCcq3/GOlFuSpnVPr7jsy8Cs0=";
})
];
});
}