diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-11-12 17:28:49 -0300 |
---|---|---|
committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-11-14 20:20:57 -0300 |
commit | 058b34d2e99a08105c02e6018e1221e5fc096c7e (patch) | |
tree | 33d825e5757949100e182cfb950abbf8a197e88b | |
parent | 3ecd815c23516757701d89505863c6d76e6059ae (diff) | |
download | nixpkgs-058b34d2e99a08105c02e6018e1221e5fc096c7e.tar nixpkgs-058b34d2e99a08105c02e6018e1221e5fc096c7e.tar.gz nixpkgs-058b34d2e99a08105c02e6018e1221e5fc096c7e.tar.bz2 nixpkgs-058b34d2e99a08105c02e6018e1221e5fc096c7e.tar.lz nixpkgs-058b34d2e99a08105c02e6018e1221e5fc096c7e.tar.xz nixpkgs-058b34d2e99a08105c02e6018e1221e5fc096c7e.tar.zst nixpkgs-058b34d2e99a08105c02e6018e1221e5fc096c7e.zip |
alsa-project: migrate to by-name
-rw-r--r-- | pkgs/by-name/al/alsa-firmware/package.nix (renamed from pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/al/alsa-lib/alsa-plugin-conf-multilib.patch (renamed from pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch) | 0 | ||||
-rw-r--r-- | pkgs/by-name/al/alsa-lib/package.nix (renamed from pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/al/alsa-oss/package.nix (renamed from pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/al/alsa-plugins-wrapper/package.nix (renamed from pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/al/alsa-plugins/package.nix (renamed from pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/al/alsa-tools/package.nix (renamed from pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/al/alsa-topology-conf/package.nix (renamed from pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/al/alsa-ucm-conf/package.nix (renamed from pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/al/alsa-utils/package.nix (renamed from pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/os-specific/linux/alsa-project/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
13 files changed, 4 insertions, 24 deletions
diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/by-name/al/alsa-firmware/package.nix index 06b6ef47d43..06b6ef47d43 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/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 index b17df9a492e..b17df9a492e 100644 --- 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 diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/by-name/al/alsa-lib/package.nix index f0eb3490607..f0eb3490607 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/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 index f600b52c5f3..f600b52c5f3 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix +++ b/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 index 992f4886e26..992f4886e26 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix +++ b/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 index ababb767955..ababb767955 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix +++ b/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 index b52e1520096..b52e1520096 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix +++ b/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 index e0dfc879fbc..e0dfc879fbc 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix +++ b/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 index 75ec2932c89..75ec2932c89 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix +++ b/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 index da559b5fcc1..da559b5fcc1 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/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 15077cc8d77..00000000000 --- 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 0c1acad2e8e..69ff0e39f6f 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 86500fdaa4c..c61f3468de1 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 { }; |