From f7cb50a2fb56f6d328ecf3045e9c7fae3baaf696 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 7 Jun 2025 20:46:25 +0200 Subject: [PATCH 1/3] alsa-ucm-conf: 1.2.12 -> 1.2.14 --- pkgs/by-name/al/alsa-ucm-conf/package.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index ea27eed8fbc6..e250448adf76 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "alsa-ucm-conf"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { url = "mirror://alsa/lib/alsa-ucm-conf-${finalAttrs.version}.tar.bz2"; - hash = "sha256-Fo58BUm3v4mRCS+iv7kDYx33edxMQ+6PQnf8t3LYwDU="; + hash = "sha256-MumAn1ktkrl4qhAy41KTwzuNDx7Edfk3Aiw+6aMGnCE="; }; dontBuild = true; @@ -25,21 +25,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ucm2/lib/card-init.conf \ --replace-fail "/bin/rm" "${coreutils}/bin/rm" \ --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir" - - files=( - "ucm2/HDA/HDA.conf" - "ucm2/codecs/rt715/init.conf" - "ucm2/codecs/rt715-sdca/init.conf" - "ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf" - "ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf" - ) - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - for file in "''${files[@]}"; do - substituteInPlace "$file" \ - --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe' - done + substituteInPlace ucm2/common/ctl/led.conf \ + --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe' '' + '' From eb11defad7ffc4724a3ac4308cc2c970aaa9a397 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 7 Jun 2025 20:52:54 +0200 Subject: [PATCH 2/3] alsa-ucm-conf: Build using stdenvNoCC --- pkgs/by-name/al/alsa-ucm-conf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index e250448adf76..32d683877c74 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -2,12 +2,12 @@ directoryListingUpdater, fetchurl, lib, - stdenv, + stdenvNoCC, coreutils, kmod, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "alsa-ucm-conf"; version = "1.2.14"; @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "/bin/rm" "${coreutils}/bin/rm" \ --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir" '' - + lib.optionalString stdenv.hostPlatform.isLinux '' + + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' substituteInPlace ucm2/common/ctl/led.conf \ --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe' '' From 23f824ccf6bfb7090f7bd8ead00d041612a709fa Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 18 Jul 2025 20:03:09 +0200 Subject: [PATCH 3/3] alsa-ucm-conf: add mvs as maintainer --- pkgs/by-name/al/alsa-ucm-conf/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 32d683877c74..d11c9b878e7e 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -52,7 +52,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.roastiek ]; + maintainers = with lib.maintainers; [ + roastiek + mvs + ]; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; })