diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2022-11-05 11:01:05 +0900 |
---|---|---|
committer | Dominique Martinet <asmadeus@codewreck.org> | 2022-11-05 11:09:47 +0900 |
commit | 844a08cc06b5c0703ba37f2318ef5b7d90665d04 (patch) | |
tree | f572e0b1f943b10d1e46a8f3b8d366baf656a9bf /pkgs/os-specific/linux/systemd/default.nix | |
parent | cfd5f0bddcf7ed92743bc8ebeb17d1d9d3b6bef4 (diff) | |
download | nixpkgs-844a08cc06b5c0703ba37f2318ef5b7d90665d04.tar nixpkgs-844a08cc06b5c0703ba37f2318ef5b7d90665d04.tar.gz nixpkgs-844a08cc06b5c0703ba37f2318ef5b7d90665d04.tar.bz2 nixpkgs-844a08cc06b5c0703ba37f2318ef5b7d90665d04.tar.lz nixpkgs-844a08cc06b5c0703ba37f2318ef5b7d90665d04.tar.xz nixpkgs-844a08cc06b5c0703ba37f2318ef5b7d90665d04.tar.zst nixpkgs-844a08cc06b5c0703ba37f2318ef5b7d90665d04.zip |
systemd: 251.5 -> 251.7
systemd 251.6 added support for libbpf 1.0.0, so use new libbpf version.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5e5a758f302..47dbbb21db3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -122,7 +122,7 @@ assert withHomed -> withCryptsetup; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "251.5"; + version = "251.7"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -139,7 +139,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "sha256-2MEmvFT1D+9v8OazBwjnKc7i/x7i196Eoi8bODk1cM4="; + sha256 = "sha256-Sa5diyNFyYtREo1xSCcufAW83ZZGZvueoDVuQ2r8wno="; }; # On major changes, or when otherwise required, you *must* reformat the patches, @@ -243,12 +243,14 @@ stdenv.mkDerivation { opt = condition: pkg: if condition then pkg else null; in [ - # bpf compilation support - { name = "libbpf.so.0"; pkg = opt withLibBPF libbpf; } + # bpf compilation support. We use libbpf 1 now. + { name = "libbpf.so.1"; pkg = opt withLibBPF libbpf; } + { name = "libbpf.so.0"; pkg = null; } # We did never provide support for libxkbcommon & qrencode { name = "libxkbcommon.so.0"; pkg = null; } { name = "libqrencode.so.4"; pkg = null; } + { name = "libqrencode.so.3"; pkg = null; } # We did not provide libpwquality before so it is safe to disable it for # now. |