Merge remote-tracking branch 'origin/master' into staging-next
Fix cargo-flash build
This commit is contained in:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Issue tracking and project management tool for developers";
|
||||
maintainers = with maintainers; [ yorickvp ];
|
||||
maintainers = teams.serokell.members;
|
||||
# https://www.jetbrains.com/youtrack/buy/license.html
|
||||
license = licenses.unfree;
|
||||
};
|
||||
|
||||
@@ -20,6 +20,6 @@ buildGoModule rec {
|
||||
description = "A reverse proxy that provides authentication with Google, Github, or other providers";
|
||||
homepage = "https://github.com/oauth2-proxy/oauth2-proxy/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ yorickvp knl ];
|
||||
maintainers = with maintainers; teams.serokell.members ++ [ knl ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,12 +7,12 @@ with builtins;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ttyd";
|
||||
version = "1.6.1";
|
||||
version = "1.6.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsl0922";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1ifgw93g8jaaa6fgfqjnn83n5ccr6l72ynwwwa97hfwjk90r14fg";
|
||||
sha256 = "ErWd99js2EldkRNWFdgZw/X3DIz266kM3lLlC34Deno=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake xxd ];
|
||||
|
||||
Reference in New Issue
Block a user