Unverified Commit a31eb10d authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #268196 from SuperSandro2000/modprobe-blacklist

parents 317484b1 ce6dfe84

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

+2 −3
Original line number Diff line number Diff line 
{ 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 \

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

+4 −5
Original line number Diff line number Diff line
@@ -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; {