From 13bc7f0011692f40b0674441d29c20a3acc9c03f Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:18:15 -0400
Subject: [PATCH 1/5] libopus: migrate to by-name

---
 .../libopus/default.nix => by-name/li/libopus/package.nix}      | 0
 .../libraries => by-name/li}/libopus/test-timeout.patch         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/libopus/default.nix => by-name/li/libopus/package.nix} (100%)
 rename pkgs/{development/libraries => by-name/li}/libopus/test-timeout.patch (100%)

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/by-name/li/libopus/package.nix
similarity index 100%
rename from pkgs/development/libraries/libopus/default.nix
rename to pkgs/by-name/li/libopus/package.nix
diff --git a/pkgs/development/libraries/libopus/test-timeout.patch b/pkgs/by-name/li/libopus/test-timeout.patch
similarity index 100%
rename from pkgs/development/libraries/libopus/test-timeout.patch
rename to pkgs/by-name/li/libopus/test-timeout.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a425eafd46c3..8558120c5ee6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22665,8 +22665,6 @@ with pkgs;
 
   libopenglrecorder = callPackage ../development/libraries/libopenglrecorder { };
 
-  libopus = callPackage ../development/libraries/libopus { };
-
   libopusenc = callPackage ../development/libraries/libopusenc { };
 
   libosinfo = callPackage ../development/libraries/libosinfo { };

From 3b8afbd09644c296931f1c2ff721094aeb7cc907 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:18:45 -0400
Subject: [PATCH 2/5] libopus: format with nixfmt

---
 pkgs/by-name/li/libopus/package.nix | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix
index a841d1cfa903..dc199538671c 100644
--- a/pkgs/by-name/li/libopus/package.nix
+++ b/pkgs/by-name/li/libopus/package.nix
@@ -1,18 +1,19 @@
-{ lib
-, stdenv
-, fetchurl
-, gitUpdater
-, meson
-, python3
-, ninja
-, fixedPoint ? false
-, withCustomModes ? true
-, withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86
-, withAsm ? false
+{
+  lib,
+  stdenv,
+  fetchurl,
+  gitUpdater,
+  meson,
+  python3,
+  ninja,
+  fixedPoint ? false,
+  withCustomModes ? true,
+  withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86,
+  withAsm ? false,
 
-# tests
-, ffmpeg-headless
-, testers
+  # tests
+  ffmpeg-headless,
+  testers,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,7 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs meson/
   '';
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   nativeBuildInputs = [
     meson

From 9beb441b1542a997cacf77a724cfc137d846d9b3 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:19:30 -0400
Subject: [PATCH 3/5] libopus: adopt

---
 pkgs/by-name/li/libopus/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix
index dc199538671c..8525de7a4bdd 100644
--- a/pkgs/by-name/li/libopus/package.nix
+++ b/pkgs/by-name/li/libopus/package.nix
@@ -78,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}";
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = [ ];
+    maintainers = with maintainers; [ getchoo ];
   };
 })

From 6fb27aeca46e7ebf32915d48bc63533694c5ee9d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:19:54 -0400
Subject: [PATCH 4/5] libopus: don't overuse `with lib`

https://github.com/NixOS/nixpkgs/issues/208242
---
 pkgs/by-name/li/libopus/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix
index 8525de7a4bdd..5d03f25b4760 100644
--- a/pkgs/by-name/li/libopus/package.nix
+++ b/pkgs/by-name/li/libopus/package.nix
@@ -72,12 +72,12 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open, royalty-free, highly versatile audio codec";
     homepage = "https://opus-codec.org/";
     changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}";
-    license = licenses.bsd3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ getchoo ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ getchoo ];
   };
 })

From 436cf3aae3647c8ee98855a12a36fb8d3d9fae42 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 03:45:39 -0400
Subject: [PATCH 5/5] libopus: add jopejoe1 to maintainers

---
 pkgs/by-name/li/libopus/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix
index 5d03f25b4760..cdf00a244ba4 100644
--- a/pkgs/by-name/li/libopus/package.nix
+++ b/pkgs/by-name/li/libopus/package.nix
@@ -78,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ getchoo ];
+    maintainers = with lib.maintainers; [ getchoo jopejoe1 ];
   };
 })