diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-07-05 13:04:01 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-07-05 13:04:01 +0200 |
commit | fda13875da5b4b8f9b354325b6daaef0ec6878fd (patch) | |
tree | 1a0884e21270fb6aafdaf674cb971346f76175f5 /pkgs/os-specific | |
parent | 7c74b9f09680fa617343d8fb3365966f0c25a131 (diff) | |
parent | 4ae00589aa2bc2d6de217d90888a2069707deacc (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/deebot-client/default.nix - pkgs/development/python-modules/pytest-examples/default.nix - pkgs/development/python-modules/w3lib/default.nix
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 15 | ||||
-rw-r--r-- | pkgs/os-specific/linux/oxtools/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rtl8821ce/default.nix | 35 |
3 files changed, 30 insertions, 24 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 88a4f33b2f3f0..e3b8bc97e4d7b 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent , sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages, nixosTests, rpcsvc-proto -, enablePython ? true +, python3, buildPackages, nixosTests, rpcsvc-proto, openldap +, enablePython ? true, enableLdap ? true }: let @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "nfs-utils"; - version = "2.6.2"; + version = "2.6.4"; src = fetchurl { url = "mirror://kernel/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-UgCHPoHE1hDiRi/CYv4YE18tvni3l5+VrM0VmuZNUBE="; + hash = "sha256-AbOw+5x9C7q/URTHNlQgMHSMeI7C/Zc0dEIB6bChEZ0="; }; # libnfsidmap is built together with nfs-utils from the same source, @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ libtirpc libcap libevent sqlite lvm2 libuuid keyutils libkrb5 tcp_wrappers - ] ++ lib.optional enablePython python3; + ] ++ lib.optional enablePython python3 + ++ lib.optional enableLdap openldap; enableParallelBuilding = true; @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen" "--with-modprobedir=${placeholder "out"}/etc/modprobe.d" - ]; + ] ++ lib.optional enableLdap "--with-ldap"; patches = lib.optionals stdenv.hostPlatform.isMusl [ # http://openwall.com/lists/musl/2015/08/18/10 @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { substituteInPlace systemd/nfs-utils.service \ --replace "/bin/true" "${coreutils}/bin/true" - substituteInPlace tools/nfsrahead/Makefile.in \ + substituteInPlace tools/nfsrahead/Makefile.in systemd/Makefile.in \ --replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/" substituteInPlace utils/mount/Makefile.in \ diff --git a/pkgs/os-specific/linux/oxtools/default.nix b/pkgs/os-specific/linux/oxtools/default.nix index c16e12ab5e142..fcb5d17dee152 100644 --- a/pkgs/os-specific/linux/oxtools/default.nix +++ b/pkgs/os-specific/linux/oxtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "0xtools"; - version = "1.2.4"; + version = "2.0.2"; src = fetchFromGitHub { owner = "tanelpoder"; repo = "0xtools"; rev = "v${finalAttrs.version}"; - hash = "sha256-h0/HIbwb1CvFUh/NpozDUCjYGCH647lC7JhbpDCvaLk="; + hash = "sha256-S2jGF6wyjE9okbren/+p37zDr+eHUE8gJe/sbsXX4f4="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index b82a9e6816345..434397ebc7c1a 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,19 +1,20 @@ -{ lib -, stdenv -, fetchFromGitHub -, kernel -, bc +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + bc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2024-01-20"; + version = "${kernel.version}-unstable-2024-03-26"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "66983b69120a13699acf40a12979317f29012111"; - hash = "sha256-Zxb9cOgP67QdCeTNEme0tAsBqd9j/2k+gcE1QKkUQU4="; + rev = "f119398d868b1a3395f40c1df2e08b57b2c882cd"; + hash = "sha256-EfpKa5ZRBVM5T8EVim3cVX1PP1UM9CyG6tN5Br8zYww="; }; hardeningDisable = [ "pic" ]; @@ -34,12 +35,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Realtek rtl8821ce driver"; homepage = "https://github.com/tomaspinho/rtl8821ce"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ hhm ]; - broken = stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + hhm + defelo + ]; + broken = + stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; -} +}) |