Merge pull request NixOS#270735 from enbyspace/sfr-nbsp

khaneliman · Nov 29, 2023 · 3f83e9f · 3f83e9f
2 parents 10ee18c + 7071bf2
commit 3f83e9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -12740,6 +12740,13 @@
     githubId = 1386642;
     name = "Noah Brenowitz";
   };
+  nbsp = {
+    email = "[email protected]";
+    matrix = "@nbsp:enby.space";
+    github = "enbyspace";
+    githubId = 57151943;
+    name = "aoife cassidy";
+  };
   ncfavier = {
     email = "[email protected]";
     matrix = "@ncfavier:matrix.org";
@@ -16354,13 +16361,6 @@
       fingerprint = "7246 B6E1 ABB9 9A48 4395  FD11 DC26 B921 A9E9 DBDE";
     }];
   };
-  sfr = {
-    email = "[email protected]";
-    matrix = "@sfr:enby.space";
-    github = "solfisher";
-    githubId = 57151943;
-    name = "Sol Fisher Romanoff";
-  };
   sfrijters = {
     email = "[email protected]";
     github = "SFrijters";

diff --git a/pkgs/applications/audio/mus/default.nix → pkgs/by-name/mu/mus/package.nix b/pkgs/applications/audio/mus/default.nix → pkgs/by-name/mu/mus/package.nix
@@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.2.0";
 
   src = fetchFromSourcehut {
-    owner = "~sfr";
+    owner = "~nbsp";
     repo = pname;
     rev = version;
     hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs=";
@@ -15,9 +15,9 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "a pretty good mpd client";
-    homepage = "https://sr.ht/~sfr/mus";
+    homepage = "https://sr.ht/~nbsp/mus";
     license = licenses.mit;
-    maintainers = with maintainers; [ sfr ];
+    maintainers = with maintainers; [ nbsp ];
     mainProgram = "mus";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -40568,8 +40568,6 @@ with pkgs;
 
   morph = callPackage ../tools/package-management/morph { };
 
-  mus = callPackage ../applications/audio/mus { };
-
   muse = libsForQt5.callPackage ../applications/audio/muse { };
 
   museeks = callPackage ../applications/audio/museeks { };