aboutsummaryrefslogtreecommitdiff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/exfat/default.nix19
-rw-r--r--pkgs/os-specific/linux/hyperv-daemons/default.nix37
-rw-r--r--pkgs/os-specific/linux/kernel/linux-rpi.nix1
-rw-r--r--pkgs/os-specific/linux/libratbag/default.nix9
-rw-r--r--pkgs/os-specific/linux/piper/default.nix12
-rw-r--r--pkgs/os-specific/linux/ply/default.nix4
-rw-r--r--pkgs/os-specific/linux/radeontools/default.nix42
-rw-r--r--pkgs/os-specific/linux/rtl8812au/default.nix8
-rw-r--r--pkgs/os-specific/linux/rtl8821au/default.nix8
-rw-r--r--pkgs/os-specific/linux/rtlwifi_new/default.nix6
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix5
11 files changed, 75 insertions, 76 deletions
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index 036cd3f28a1..e66ac4d65ab 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -6,13 +6,13 @@ assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.versi
stdenv.mkDerivation rec {
name = "exfat-nofuse-${version}-${kernel.version}";
- version = "2018-04-16";
+ version = "2019-09-06";
src = fetchFromGitHub {
- owner = "dorimanx";
+ owner = "AdrianBan";
repo = "exfat-nofuse";
- rev = "01c30ad52625a7261e1b0d874553b6ca7af25966";
- sha256 = "0n1ibamf1yj8iqapc86lfscnky9p07ngsi4f2kpv3d5r2s6mzsh6";
+ rev = "5536f067373c196f152061f5000fe0032dc07c48";
+ sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k";
};
hardeningDisable = [ "pic" ];
@@ -27,18 +27,9 @@ stdenv.mkDerivation rec {
install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko
'';
- patches = [
- # fix compile-errors in 4.18 and 4.20
- # ref: https://github.com/dorimanx/exfat-nofuse/pull/137
- (fetchpatch {
- url = https://github.com/dorimanx/exfat-nofuse/compare/01c30ad52625a7261e1b0d874553b6ca7af25966...f93a47e6414d567a1e7f6ab7f34b015b20f9a050.patch ;
- sha256 = "0w57pi9h6dwjxfgc3zpwy6sr4zw42hn1zj72f7wgfpqrx6d8xkh5";
- } )
- ];
-
meta = {
description = "exfat kernel module";
- homepage = https://github.com/dorimanx/exfat-nofuse;
+ inherit (src.meta) homepage;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ makefu ];
platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix
index a209f1ab4bb..1a111a295a4 100644
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, lib, python, kernel, makeWrapper, writeText }:
+{ stdenv, lib, python, kernel, makeWrapper, writeText
+, gawk, iproute }:
let
- daemons = stdenv.mkDerivation {
+ libexec = "libexec/hypervkvpd";
+
+ daemons = stdenv.mkDerivation rec {
pname = "hyperv-daemons-bin";
inherit (kernel) src version;
@@ -10,10 +13,15 @@ let
# as of 4.9 compilation will fail due to -Werror=format-security
hardeningDisable = [ "format" ];
- preConfigure = ''
+ postPatch = ''
cd tools/hv
+ substituteInPlace hv_kvp_daemon.c \
+ --replace /usr/libexec/hypervkvpd/ $out/${libexec}/
'';
+ # We don't actually need the hv_get_{dhcp,dns}_info scripts on NixOS in
+ # their current incarnation but with them in place, we stop the spam of
+ # errors in the log.
installPhase = ''
runHook preInstall
@@ -21,7 +29,9 @@ let
install -Dm755 hv_''${f}_daemon -t $out/bin
done
- install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin
+ install -Dm755 lsvmbus $out/bin/lsvmbus
+ install -Dm755 hv_get_dhcp_info.sh $out/${libexec}/hv_get_dhcp_info
+ install -Dm755 hv_get_dns_info.sh $out/${libexec}/hv_get_dns_info
# I don't know why this isn't being handled automatically by fixupPhase
substituteInPlace $out/bin/lsvmbus \
@@ -31,8 +41,8 @@ let
'';
postFixup = ''
- # kvp needs to be able to find the script(s)
- wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin
+ wrapProgram $out/bin/hv_kvp_daemon \
+ --prefix PATH : $out/bin:${lib.makeBinPath [ gawk iproute ]}
'';
};
@@ -56,24 +66,19 @@ let
in stdenv.mkDerivation {
pname = "hyperv-daemons";
-
inherit (kernel) version;
# we just stick the bins into out as well as it requires "out"
outputs = [ "bin" "lib" "out" ];
- phases = [ "installPhase" ];
-
buildInputs = [ daemons ];
- installPhase = ''
+ buildCommand = ''
system=$lib/lib/systemd/system
- mkdir -p $system
-
- cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service
- cp ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service
- cp ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service
+ install -Dm444 ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service
+ install -Dm444 ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service
+ install -Dm444 ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service
cat > $system/hyperv-daemons.target <<EOF
[Unit]
@@ -102,7 +107,7 @@ in stdenv.mkDerivation {
Microsoft calls their guest agents "Integration Services" which is why
we use that name here.
'';
- homepage = https://kernel.org;
+ homepage = "https://kernel.org";
maintainers = with maintainers; [ peterhoeg ];
platforms = kernel.meta.platforms;
};
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 1b4700a2e39..6c24311338a 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -54,6 +54,7 @@ lib.overrideDerivation (buildLinux (args // {
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
'' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) ''
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
+ copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
'';
diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
index a09bb2a6ceb..f2bf5c94970 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -1,15 +1,16 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
-, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }:
+, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3
+, json-glib, libunistring }:
stdenv.mkDerivation rec {
pname = "libratbag";
- version = "0.9.905";
+ version = "0.10";
src = fetchFromGitHub {
owner = "libratbag";
repo = "libratbag";
rev = "v${version}";
- sha256 = "0bh1nf9sv7wka0vh5bz9krf2cfxz0rr64hrpdm7imsb6cn39k01y";
+ sha256 = "10hahpv2n48b5z35d2draka7cz1a9vw53rvwfmpp5dibwnmi81jb";
};
nativeBuildInputs = [
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- glib systemd udev libevdev
+ glib systemd udev libevdev json-glib libunistring
(python3.withPackages (ps: with ps; [ evdev pygobject3 ]))
];
diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index e177b284bbd..1229c442fa2 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -4,7 +4,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "piper";
- version = "0.2.903";
+ version = "0.3";
format = "other";
@@ -12,12 +12,16 @@ python3.pkgs.buildPythonApplication rec {
owner = "libratbag";
repo = "piper";
rev = version;
- sha256 = "0zh4lm074x5gwvx663bapdyv8lf84yjwfg8cpf77rszyja1hx13a";
+ sha256 = "1vz7blhx6qsfrk5znwr0fj1k8vahnlaz6rn7ifcgxmq398mmz8z7";
};
nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
- buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ];
- propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
+ buildInputs = [
+ gtk3 glib gnome3.adwaita-icon-theme python3
+ ];
+ propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [
+ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
+ ];
postPatch = ''
chmod +x meson_install.sh # patchShebangs requires executable file
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 24213cd2fb5..42739e53fda 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip }:
+{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }:
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
@@ -7,7 +7,7 @@ let
in stdenv.mkDerivation {
pname = "ply";
inherit version;
- nativeBuildInputs = [ autoreconfHook flex yacc p7zip ];
+ nativeBuildInputs = [ autoreconfHook flex yacc p7zip rsync ];
src = fetchFromGitHub {
owner = "iovisor";
diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix
index 81e5a2af9cd..d2c3c11c939 100644
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/pkgs/os-specific/linux/radeontools/default.nix
@@ -1,33 +1,25 @@
-{ stdenv, fetchurl, pciutils }:
+{ stdenv, fetchurl
+, autoreconfHook
+, pciutils
+, pkgconfig
+, xorg
+}:
-stdenv.mkDerivation {
- name = "radeontool-1.5";
-
- inherit pciutils;
-
- # Don't know wether it's a good idea to hardcode the lspci path..
- # But it will work on nix..
- postUnpack = ''
- cd $sourceRoot
- sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c
- cd ..
- '';
+stdenv.mkDerivation rec {
+ pname = "radeontool";
+ version = "1.6.3";
src = fetchurl {
- url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
- sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
+ url = "https://people.freedesktop.org/~airlied/radeontool/${pname}-${version}.tar.gz";
+ sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za";
};
- installPhase = ''
- mkdir -p $out/bin
- chmod +x lightwatch.pl
- cp radeontool lightwatch.pl $out/bin
- '';
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ xorg.libpciaccess ];
- meta = {
- description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
- homepage = http://fdd.com/software/radeon/;
- license = stdenv.lib.licenses.zlib;
- broken = true;
+ meta = with stdenv.lib; {
+ description = "Lowlevel tools to tweak register and dump state on radeon GPUs";
+ homepage = "https://airlied.livejournal.com/";
+ license = licenses.zlib;
};
}
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 81c1f8ab0f5..68364580346 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel, bc }:
+{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }:
stdenv.mkDerivation rec {
name = "rtl8812au-${kernel.version}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr";
};
- nativeBuildInputs = [ bc ];
+ nativeBuildInputs = [ bc nukeReferences ];
buildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" "format" ];
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
+ postInstall = ''
+ nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
+ '';
+
meta = with stdenv.lib; {
description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20;
diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix
index ca63c5c6a8d..1829bd6763f 100644
--- a/pkgs/os-specific/linux/rtl8821au/default.nix
+++ b/pkgs/os-specific/linux/rtl8821au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel, bc }:
+{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }:
stdenv.mkDerivation rec {
name = "rtl8821au-${kernel.version}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q";
};
- nativeBuildInputs = [ bc ];
+ nativeBuildInputs = [ bc nukeReferences ];
buildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" "format" ];
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
+ postInstall = ''
+ nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
+ '';
+
meta = with stdenv.lib; {
description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware";
homepage = https://github.com/zebulon2/rtl8812au;
diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix
index 447f9127d60..94ba31d59e1 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix
@@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec {
pname = "rtlwifi_new";
- version = "2018-02-17";
+ version = "2019-08-21";
src = fetchFromGitHub {
owner = "lwfinger";
repo = "rtlwifi_new";
- rev = "0588ac0cc5f530e7764705416370b70d3c2afedc";
- sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m";
+ rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348";
+ sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k";
};
hardeningDisable = [ "pic" "format" ];
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 083166848f2..a7ed32ab696 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -15,10 +15,7 @@
, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
}:
-let
- pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
version = "243";
pname = "systemd";
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 16:11:23 +0000