dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #268196 from SuperSandro2000/modprobe-blacklist

Browse Source
This commit is contained in:
Artturi 2024-01-08 17:17:00 +02:00 committed by GitHub
commit a31eb10ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }:
let
version = "28-1ubuntu4"; # impish 2021-06-24
version = "30+20230519-1ubuntu3"; # mantic 2023-08-26
in stdenv.mkDerivation {
pname = "kmod-blacklist";
@ -9,7 +9,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
sha256 = "sha256-K8tWpaLmCm3Jcxw3OZ+D7Koiug7epooRn1YMfqjGAiw=";
hash = "sha256-VGw1/rUjl9/j6026ut0dvC0/8maAAz8umb0D3YGf8p4=";
};
installPhase = ''
@ -22,7 +22,6 @@ in stdenv.mkDerivation {
done
substituteInPlace "$out"/modprobe.conf \
--replace "blacklist bochs-drm" "" \
--replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \
--replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \
--replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \

9
pkgs/os-specific/linux/kmod-debian-aliases/default.nix
View File

@ -2,16 +2,15 @@
stdenv.mkDerivation rec {
pname = "kmod-debian-aliases.conf";
version = "22-1.1";
version = "30+20230601-2";
src = fetchurl {
url = "https://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz";
sha256 = "0daap2n4bvjqcnksaayy6csmdb1px4r02w3xp36bcp6w3lbnqamh";
url = "https://snapshot.debian.org/archive/debian/20231117T085632Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz";
hash = "sha256-xJMGKht8hu0aQjN9TER87Rv5EYkVMeDfX/jJ8+UjAqM=";
};
installPhase = ''
patch -i patches/aliases_conf
cp aliases.conf $out
cp extra/aliases.conf $out
'';
meta = with lib; {