From 38d4a0e7d8fd80877dfb869aba628cf3af025b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 18 Nov 2023 00:47:00 +0100 Subject: [PATCH 1/2] kmod-debian-aliases: 22-1.1 -> 30+20230601-2 --- pkgs/os-specific/linux/kmod-debian-aliases/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index 15f7251f9961..a4474f7c08fa 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -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; { From ce6dfe84f3dd7fc77301f5ef52bf4fbc8cdeb6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 18 Nov 2023 00:46:38 +0100 Subject: [PATCH 2/2] kmod-blacklist-ubuntu: 28-1ubuntu4 -> 30+20230519-1ubuntu3 --- pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 3964538a4096..464b77ce969e 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -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 \