Skip to content

Commit 14fbd35

Browse files
saschagrunertk8s-ci-robot
authored andcommitted
Update nixpkgs
Signed-off-by: Sascha Grunert <[email protected]>
1 parent 2030bdd commit 14fbd35

7 files changed

+22
-22
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ LINT_BUILDTAGS := $(LINT_BUILDTAGS),apparmor
7878
endif
7979

8080
ifeq ($(BPF_ENABLED), 1)
81-
CGO_LDFLAGS := $(CGO_LDFLAGS) -lelf -lz -lbpf
81+
CGO_LDFLAGS := $(CGO_LDFLAGS) -lelf -lz -lbpf -lzstd
8282
else
8383
BUILDTAGS := $(BUILDTAGS) no_bpf
8484
LINT_BUILDTAGS := $(LINT_BUILDTAGS),no_bpf

hack/install-packages

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
# assume a Debian based golang image
5+
apt-get update
6+
apt-get install -y \
7+
libapparmor-dev \
8+
libelf-dev \
9+
libseccomp-dev \
10+
libzstd-dev
11+
12+
./hack/install-libbpf.sh
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
# assume a Debian based golang image, like: golang:1.16
5-
apt-get update
6-
apt-get install -y libseccomp-dev libelf-dev libapparmor-dev
7-
./hack/install-libbpf.sh
4+
./hack/install-packages
85

96
make
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
# assume a Debian based golang image, like: golang:1.16
5-
apt-get update
6-
apt-get install -y libseccomp-dev libelf-dev libapparmor-dev
7-
./hack/install-libbpf.sh
4+
./hack/install-packages
85

96
make test-unit

hack/pull-security-profiles-operator-verify

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
# assume a Debian based golang image, like: golang:1.19
5-
apt-get update
6-
apt-get install -y \
7-
libapparmor-dev \
8-
libelf-dev \
9-
libseccomp-dev \
10-
software-properties-common
11-
12-
./hack/install-libbpf.sh
4+
./hack/install-packages
135

146
CLANG_VERSION=15
7+
apt-get install -y software-properties-common
158
curl -sSfL --retry 5 --retry-delay 3 https://apt.llvm.org/llvm.sh | bash -s -- $CLANG_VERSION all
169
ln -sf /usr/bin/clang-format-$CLANG_VERSION /usr/bin/clang-format
1710

nix/derivation.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ with pkgs; buildGo120Module rec {
1818
libbpf_1
1919
libseccomp
2020
zlib.static
21+
(zstd.override { static = true; })
2122
];
2223
buildPhase = ''
2324
make

nix/nixpkgs.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"url": "https://github.com/nixos/nixpkgs",
3-
"rev": "d69bb82f566b1af133c13c941ad6f9ca312b0f6b",
4-
"date": "2023-02-20T09:35:54+01:00",
5-
"path": "/nix/store/csw4kmk1krwy3d3ac7wp18sypv3vmqbn-nixpkgs",
6-
"sha256": "0crq3h8fi78y7gngk6jgrzg4f3c04f0bppfr96rv60frykhlh258",
3+
"rev": "101bc33b43fc36ca5fc831f09b74270a8f0ad63a",
4+
"date": "2023-04-06T08:50:54-03:00",
5+
"path": "/nix/store/4jd2p4zm620xr42r8wwbxld99lazn534-nixpkgs",
6+
"sha256": "1g3s4qkw6jlfq136v2ihdj5z7alnz9hnj12arhqy697hpy9az49n",
77
"fetchLFS": false,
88
"fetchSubmodules": false,
99
"deepClone": false,

0 commit comments

Comments
 (0)