Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
 pkgs/tools/networking/xh/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-22 18:19:10 -07:00
157 changed files with 1479 additions and 591 deletions

View File

@@ -102,7 +102,7 @@ let ccache = stdenv.mkDerivation rec {
homepage = "https://ccache.dev";
downloadPage = "https://ccache.dev/download.html";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ metadark r-burns ];
maintainers = with maintainers; [ kira-bruneau r-burns ];
platforms = platforms.unix;
};
};

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = pname;
rev = "v${version}";
hash = "sha256-jOxneMqeyvMQWKPNha59H6qWSFmx+Z71SU2+M5VWMsA=";
hash = "sha256-hiz3dMEYNKKd9dZiGghAhGqoXXKJiZG6sECfsCYVscU=";
};
cargoHash = "sha256-H6czxSTw93RNTaN0OJyv0RfwmGAiFkpDgUtXHCD+jrY=";
cargoHash = "sha256-sCvQFU9/ENVi1RHV3QDngzI/S1xuHvpWxsrxT73jdI0=";
outputs = [ "out" "man" ];
@@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec {
description = "An implementation of the Language Server Protocol for LaTeX";
homepage = "https://texlab.netlify.app";
license = licenses.mit;
maintainers = with maintainers; [ doronbehar metadark ];
maintainers = with maintainers; [ doronbehar kira-bruneau ];
platforms = platforms.all;
};
}