From 7f7f2ef93a601eca84a0958f3b76d2b3f9db3391 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 9 Jun 2021 22:15:45 -0300 Subject: [PATCH] alsa-project: a small refactor Now, all ALSA projects reside in a dedicated directory, namely, pkgs/os-specific/linux/alsa-project/ --- .../alsa-firmware/cross.patch | 0 .../alsa-firmware/default.nix | 0 .../alsa-lib/alsa-plugin-conf-multilib.patch | 0 .../{ => alsa-project}/alsa-lib/default.nix | 0 .../{ => alsa-project}/alsa-oss/default.nix | 0 .../alsa-plugins/default.nix | 0 .../alsa-plugins/wrapper.nix | 0 .../{ => alsa-project}/alsa-tools/default.nix | 0 .../alsa-topology-conf/default.nix | 0 .../alsa-ucm-conf/default.nix | 0 .../{ => alsa-project}/alsa-utils/default.nix | 0 pkgs/top-level/all-packages.nix | 26 +++++++------------ 12 files changed, 9 insertions(+), 17 deletions(-) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-firmware/cross.patch (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-firmware/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-lib/alsa-plugin-conf-multilib.patch (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-lib/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-oss/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-plugins/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-plugins/wrapper.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-tools/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-topology-conf/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-ucm-conf/default.nix (100%) rename pkgs/os-specific/linux/{ => alsa-project}/alsa-utils/default.nix (100%) diff --git a/pkgs/os-specific/linux/alsa-firmware/cross.patch b/pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch similarity index 100% rename from pkgs/os-specific/linux/alsa-firmware/cross.patch rename to pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-firmware/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix diff --git a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch similarity index 100% rename from pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch rename to pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-lib/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-oss/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-plugins/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix diff --git a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-plugins/wrapper.nix rename to pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-tools/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-topology-conf/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-ucm-conf/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-utils/default.nix rename to pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e316fbcd0..90cd0eeb052 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20102,23 +20102,15 @@ in alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; - alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { }; - - alsaLib = callPackage ../os-specific/linux/alsa-lib { }; - - alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { }; - - alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; - - alsaUtils = callPackage ../os-specific/linux/alsa-utils { - fftw = fftwFloat; - }; - alsaOss = callPackage ../os-specific/linux/alsa-oss { }; - alsaTools = callPackage ../os-specific/linux/alsa-tools { }; - - alsa-ucm-conf = callPackage ../os-specific/linux/alsa-ucm-conf { }; - - alsa-topology-conf = callPackage ../os-specific/linux/alsa-topology-conf { }; + alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; + alsaLib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; + alsaPlugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; + alsaPluginWrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; + alsaUtils = callPackage ../os-specific/linux/alsa-project/alsa-utils { fftw = fftwFloat; }; + alsaOss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; + alsaTools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; + alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; + alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware