Skip to content

Commit ffb3a16

Browse files
saschagrunertk8s-ci-robot
authored andcommitted
Update nixpkgs and nix
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
1 parent 8b0fe6b commit ffb3a16

File tree

5 files changed

+9
-22
lines changed

5 files changed

+9
-22
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
types: [published]
88
pull_request:
99
env:
10-
NIX_VERSION: '2.25.0'
10+
NIX_VERSION: '2.30.1'
1111
BOM_VERSION: v0.6.0
1212
concurrency:
1313
group: ${{ github.workflow }}-${{ github.ref }}

Dockerfile.build-image

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN apt-get update && \
2424

2525
ENV USER=root
2626

27-
ARG NIX_VERSION=2.25.0
27+
ARG NIX_VERSION=2.30.1
2828

2929
RUN \
3030
export ARCH=x86_64 && \

dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ dependencies:
9696
match: tag
9797

9898
- name: nix
99-
version: 2.25.0
99+
version: 2.30.1
100100
refPaths:
101101
- path: Dockerfile.build-image
102102
match: NIX_VERSION

nix/nixpkgs.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"url": "https://github.com/nixos/nixpkgs",
3-
"rev": "a57bc47b7485adedf0750aec58ffea6863100a52",
4-
"date": "2025-03-24T14:09:03Z",
5-
"path": "/nix/store/ny1i1gsr7mdzaynbwdsw6pg4krqi3nwx-nixpkgs",
6-
"sha256": "1s64s1dfc5aj36i5lc3rj5hqj7mfqy3b9yd1q4ai3pvr7vpdyj3q",
7-
"hash": "sha256-eEjf7j553xEVwaH5tIbHrh6JYZF5MFqiGVIV5lrQxOg=",
3+
"rev": "65ba69b31ec792c8c572af5c3ff08f15ce5bf1e2",
4+
"date": "2025-07-24T14:52:54+02:00",
5+
"path": "/nix/store/sd2vnxdghznp96wxk4hjsgia0vqakryp-nixpkgs",
6+
"sha256": "1ngaxq4sv767d6b1pz85imcxsjlmrnibwrd8k8iddzdma7pm41pg",
7+
"hash": "sha256-7wZS71G1/dYimqhlvqLNlUrdWY0F/RuWacecrQnu6tk=",
88
"fetchLFS": false,
99
"fetchSubmodules": false,
1010
"deepClone": false,
11+
"fetchTags": false,
1112
"leaveDotGit": false
1213
}

nix/overlay.nix

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
self: super:
22
{
3-
# TODO: remove when go 1.24 is the standard in nixpkgs
4-
buildGoModule = super.buildGo124Module;
5-
6-
# TODO: remove when https://github.com/NixOS/nixpkgs/issues/373516 got resolved
7-
elfutils = super.elfutils.overrideAttrs (x: {
8-
version = "0.191";
9-
src = super.fetchurl {
10-
url = "https://sourceware.org/elfutils/ftp/0.191/elfutils-0.191.tar.bz2";
11-
hash = "sha256-33bbcTZtHXCDZfx6bGDKSDmPFDZ+sriVTvyIlxR62HE=";
12-
};
13-
doCheck = false;
14-
doInstallCheck = false;
15-
});
16-
173
libseccomp = super.libseccomp.overrideAttrs (x: {
184
doCheck = false;
195
dontDisableStatic = true;

0 commit comments

Comments
 (0)