JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-03 06:18:15 +00:00 committed by GitHub
commit d867b6f9eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.116";
version = "0.0.118";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "14kg85gz91f9mvvnl5p1lwz40rm47bca3a8dwv4618zv6vncgmkp";
sha256 = "1ar4d6mgn248h6pqcw5ra787padsxyzfkgf9yf62ypn1zrxa9sxq";
};
};
}.${branch}

4
pkgs/applications/science/robotics/mavproxy/default.nix
View File

@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.30";
version = "1.8.31";
src = fetchPypi {
inherit pname version;
sha256 = "fe046481b793b592334749249620fce8a463f4c46b394ff744645975465d677b";
sha256 = "51d4a21372fcac615a0191cb29c444889ecfede402e95c847346842400a86273";
};
postPatch = ''

6
pkgs/development/tools/analysis/tflint/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
version = "0.24.0";
version = "0.24.1";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "18alpz29i0w44xnrpw82h16k99q01dd0gkp7ap5cqcf2cyjgzb06";
sha256 = "00v6d1ffj1f4djbdf41bw4ymy2fhph1b5kfi50fp9c3c7319sqwr";
};
vendorSha256 = "1r58nchag97fs0c7rxxxfa8y0vg9df76mmvn4hdc8vzi4h1025nd";
vendorSha256 = "1xy1vg34nv6v77sx13d3663v7xfm0f2kimdsjqzwpkzz8a6q6g2m";
doCheck = false;

5
pkgs/os-specific/linux/pam/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4, gettext
, nixosTests
}:
@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" "man" /* "modules" */ ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ flex ];
nativeBuildInputs = [ flex ]
++ lib.optional stdenv.buildPlatform.isDarwin gettext;
buildInputs = [ cracklib db4 ];

6
pkgs/tools/misc/starship/default.nix
View File

@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.49.0";
version = "0.50.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
sha256 = "0mchjxlhrw73846acj99s6pig93infkbdgrmym6yzk8dg0ynx5gw";
sha256 = "1bnnqrxsmp3z2qksd8h4lfbq4kxxy1cg4yynadz66lxyzabv2v21";
};
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
done
'';
cargoSha256 = "0w17nv3zgczaznf1pkpj26ppxzv1arlva8zdg6b3l7m8qkkz8jn2";
cargoSha256 = "0plk47i2xrn3x5yr3gw3pq74maqf4krb8d6i4sf8gil4mnpcgxir";
preCheck = ''
HOME=$TMPDIR