Unverified Commit 68e8cb6b authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents aa40c958 5df53e86

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -9934,12 +9934,6 @@ 
    githubId = 2041764;

    name = "Andreas Wendleder";

  };

  Gonzih = {

    email = "gonzih@gmail.com";

    github = "Gonzih";

    githubId = 266275;

    name = "Max Gonzih";

  };

  goodrone = {

    email = "goodrone@gmail.com";

    github = "goodrone";

pkgs/applications/audio/mopidy/mopify.nix

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ pythonPackages.buildPythonApplication (finalAttrs: { 
    homepage = "https://github.com/dirkgroenen/mopidy-mopify";

    description = "Mopidy webclient based on the Spotify webbased interface";

    license = lib.licenses.gpl3;

    maintainers = [ lib.maintainers.Gonzih ];

    maintainers = [ ];

  };

})

pkgs/applications/networking/cluster/linkerd/generic.nix

+1 −2
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ buildGoModule rec { 
    downloadPage = "https://github.com/linkerd/linkerd2/";

    homepage = "https://linkerd.io/";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [

      Gonzih

    maintainers = [

    ];

  };

}

pkgs/by-name/ai/air/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ buildGoModule (finalAttrs: { 
    mainProgram = "air";

    homepage = "https://github.com/air-verse/air";

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ Gonzih ];

    maintainers = [ ];

  };

})

pkgs/by-name/al/all-the-package-names/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ 


buildNpmPackage rec {

  pname = "all-the-package-names";

  version = "2.0.2405";

  version = "2.0.2413";



  src = fetchFromGitHub {

    owner = "nice-registry";

    repo = "all-the-package-names";

    tag = "v${version}";

    hash = "sha256-dimap7vybYHNGSAWn6K8uMUMymrV8Ek5Vc27bbJo22w=";

    hash = "sha256-loI9wKz0EcePvM2kXqmxNx9rfC/VaMCmJtm0dTjWoOk=";

  };



  npmDepsHash = "sha256-13u+UoTckxKAmthuaxOCaGSW4BaAgWaz6/4dBcO+3VI=";

  npmDepsHash = "sha256-6XLDdamRG+IVq/zdyKKlIsnfUVD8pKES7K7hm+yTQ78=";



  passthru.updateScript = nix-update-script { };