From fb876141d3248b44e1245896b027178944e954aa Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Sun, 17 Jan 2021 15:35:34 +0100 Subject: [PATCH 1/5] linux-pam: fix cross compilation on Darwin A build-time tool is created, which requires libintl.h. On Linux, libintl.h comes with glibc, but on Darwin, gettext is needed. --- pkgs/os-specific/linux/pam/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index d42ced5ad55..c972f13adc9 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4, gettext , nixosTests }: @@ -28,7 +28,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 ]; From abd53951841e986d60a7c610b1796a5639d420c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 28 Jan 2021 00:24:12 +0000 Subject: [PATCH 2/5] mavproxy: 1.8.30 -> 1.8.31 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 22a32f89bde..e8c801ff374 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -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 = '' From e24036c9a02f9ed138655e3a269b97eb8942fad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 17:11:48 +0000 Subject: [PATCH 3/5] discord-canary: 0.0.116 -> 0.0.118 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 570fe463c5a..874a764a8c7 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -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} From 1f10898600d485ed15026df42a916dddda8425bc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 2 Feb 2021 04:20:00 +0000 Subject: [PATCH 4/5] tflint: 0.24.0 -> 0.24.1 https://github.com/terraform-linters/tflint/releases/tag/v0.24.1 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index b7e6225a717..aa5223ce3f8 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -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; From d55f694798b74f80036501b4380c5c9fddf2060c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 2 Feb 2021 04:20:00 +0000 Subject: [PATCH 5/5] starship: 0.49.0 -> 0.50.0 https://github.com/starship/starship/releases/tag/v0.50.0 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 7f58e357091..a3543c433ae 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -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