Unverified Commit 3f83e9f1 authored by ckie's avatar ckie Committed by GitHub
Browse files

Merge pull request #270735 from enbyspace/sfr-nbsp

parents 10ee18ca 7071bf24

maintainers/maintainer-list.nix

+7 −7
Original line number Diff line number Diff line
@@ -12740,6 +12740,13 @@ 
    githubId = 1386642;

    name = "Noah Brenowitz";

  };

  nbsp = {

    email = "aoife@enby.space";

    matrix = "@nbsp:enby.space";

    github = "enbyspace";

    githubId = 57151943;

    name = "aoife cassidy";

  };

  ncfavier = {

    email = "n@monade.li";

    matrix = "@ncfavier:matrix.org";
@@ -16354,13 +16361,6 @@ 
      fingerprint = "7246 B6E1 ABB9 9A48 4395  FD11 DC26 B921 A9E9 DBDE";

    }];

  };

  sfr = {

    email = "sol@solfisher.com";

    matrix = "@sfr:enby.space";

    github = "solfisher";

    githubId = 57151943;

    name = "Sol Fisher Romanoff";

  };

  sfrijters = {

    email = "sfrijters@gmail.com";

    github = "SFrijters";

pkgs/applications/audio/mus/default.nix→pkgs/by-name/mu/mus/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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";

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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 { };