From 058b34d2e99a08105c02e6018e1221e5fc096c7e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 12 Nov 2023 17:28:49 -0300 Subject: [PATCH] alsa-project: migrate to by-name --- .../al/alsa-firmware/package.nix} | 0 .../al}/alsa-lib/alsa-plugin-conf-multilib.patch | 0 .../al/alsa-lib/package.nix} | 0 .../al/alsa-oss/package.nix} | 0 .../al/alsa-plugins-wrapper/package.nix} | 0 .../al/alsa-plugins/package.nix} | 0 .../al/alsa-tools/package.nix} | 0 .../al/alsa-topology-conf/package.nix} | 0 .../al/alsa-ucm-conf/package.nix} | 0 .../al/alsa-utils/package.nix} | 0 pkgs/os-specific/linux/alsa-project/default.nix | 13 ------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 14 +++----------- 13 files changed, 4 insertions(+), 24 deletions(-) rename pkgs/{os-specific/linux/alsa-project/alsa-firmware/default.nix => by-name/al/alsa-firmware/package.nix} (100%) rename pkgs/{os-specific/linux/alsa-project => by-name/al}/alsa-lib/alsa-plugin-conf-multilib.patch (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-lib/default.nix => by-name/al/alsa-lib/package.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-oss/default.nix => by-name/al/alsa-oss/package.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-plugins/wrapper.nix => by-name/al/alsa-plugins-wrapper/package.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-plugins/default.nix => by-name/al/alsa-plugins/package.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-tools/default.nix => by-name/al/alsa-tools/package.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-topology-conf/default.nix => by-name/al/alsa-topology-conf/package.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-ucm-conf/default.nix => by-name/al/alsa-ucm-conf/package.nix} (100%) rename pkgs/{os-specific/linux/alsa-project/alsa-utils/default.nix => by-name/al/alsa-utils/package.nix} (100%) delete mode 100644 pkgs/os-specific/linux/alsa-project/default.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/by-name/al/alsa-firmware/package.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix rename to pkgs/by-name/al/alsa-firmware/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/by-name/al/alsa-lib/alsa-plugin-conf-multilib.patch similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch rename to pkgs/by-name/al/alsa-lib/alsa-plugin-conf-multilib.patch diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/by-name/al/alsa-lib/package.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix rename to pkgs/by-name/al/alsa-lib/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix b/pkgs/by-name/al/alsa-oss/package.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix rename to pkgs/by-name/al/alsa-oss/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix b/pkgs/by-name/al/alsa-plugins-wrapper/package.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix rename to pkgs/by-name/al/alsa-plugins-wrapper/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix b/pkgs/by-name/al/alsa-plugins/package.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix rename to pkgs/by-name/al/alsa-plugins/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix b/pkgs/by-name/al/alsa-tools/package.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix rename to pkgs/by-name/al/alsa-tools/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix b/pkgs/by-name/al/alsa-topology-conf/package.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix rename to pkgs/by-name/al/alsa-topology-conf/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix rename to pkgs/by-name/al/alsa-ucm-conf/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/by-name/al/alsa-utils/package.nix similarity index 100% rename from pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix rename to pkgs/by-name/al/alsa-utils/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/default.nix b/pkgs/os-specific/linux/alsa-project/default.nix deleted file mode 100644 index 15077cc8d77a..000000000000 --- a/pkgs/os-specific/linux/alsa-project/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, pkgs }: - -lib.makeScope pkgs.newScope (self: { - alsa-firmware = self.callPackage ./alsa-firmware { }; - alsa-lib = self.callPackage ./alsa-lib { }; - alsa-oss = self.callPackage ./alsa-oss { }; - alsa-plugins = self.callPackage ./alsa-plugins { }; - alsa-plugins-wrapper = self.callPackage ./alsa-plugins/wrapper.nix { }; - alsa-tools = self.callPackage ./alsa-tools { }; - alsa-topology-conf = self.callPackage ./alsa-topology-conf { }; - alsa-ucm-conf = self.callPackage ./alsa-ucm-conf { }; - alsa-utils = self.callPackage ./alsa-utils { fftw = pkgs.fftwFloat; }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0c1acad2e8e9..69ff0e39f6f1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -60,6 +60,7 @@ mapAliases ({ aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream" ; # Added 2023-07-28 + alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 alsaLib = alsa-lib; # Added 2021-06-09 alsaOss = alsa-oss; # Added 2021-06-10 alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86500fdaa4cb..c61f3468de1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27578,17 +27578,9 @@ with pkgs; tinyalsa = callPackage ../os-specific/linux/tinyalsa { }; - alsa-project = callPackage ../os-specific/linux/alsa-project { }; - inherit (alsa-project) - alsa-firmware - alsa-lib - alsa-oss - alsa-plugins - alsa-plugins-wrapper - alsa-tools - alsa-topology-conf - alsa-ucm-conf - alsa-utils; + alsa-utils = callPackage ../by-name/al/alsa-utils/package.nix { + fftw = fftwFloat; + }; apparency = callPackage ../os-specific/darwin/apparency { };