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

Merge master into staging-next

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

10
pkgs/applications/editors/vscode/vscode.nix
View File

@ -13,16 +13,16 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "08qrag9nzmngzzvs2cgbmc4zzxlb9kwn183v8caj6dvcrjvfqgbv";
x86_64-darwin = "0rlyr08lla3xadlh373xqcks8a9akk3x2cmakgn17q2b16988fmq";
aarch64-linux = "1m277940xsasqac4i88s05xrqsab99jhl3ka0zzfbixrgr2dj8q1";
armv7l-linux = "1qm4cggjj50vdnrx848x810gz3ahh0hndra22lsvcjdbsw8g35rk";
x86_64-linux = "1bj954kjwrk0nx8griy2y8gp7dys0wf610ki0jrby46mlvrmszs1";
x86_64-darwin = "1dqpz7qpnycd4b7iqg639rab3ds4m06m15rmyp7r70053qaw1s61";
aarch64-linux = "04ifmw39swdl6ybz6jpan2krsqli1kjyjnicjaisww8vhvhr2lzk";
armv7l-linux = "0y1rzn2jy4wrn2yr95v7zzyl36pj9mbz4dgvazvy465wzk5ai7b4";
}.${system};
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.56.2";
version = "1.57.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

4
pkgs/applications/science/electronics/horizon-eda/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "horizon-eda";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "horizon-eda";
repo = "horizon";
rev = "v${version}";
sha256 = "0mra6kf1c2qixfzqva6r01qms5kdabbhhblhk5is6h6nq78i8640";
sha256 = "sha256-FS24B/ySKeF8r7Tro+mf5P0ALtlPwwJCU3YdDNYLe6o=";
};
buildInputs = [

12
pkgs/os-specific/linux/lttng-modules/default.nix
View File

@ -1,13 +1,12 @@
{ lib, stdenv, fetchurl, kernel }:
stdenv.mkDerivation rec {
pname = "lttng-modules-${version}";
name = "${pname}-${kernel.version}";
version = "2.10.5";
pname = "lttng-modules-${kernel.version}";
version = "2.12.6";
src = fetchurl {
url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq";
sha256 = "sha256-lawqLPkthdI/+9rKah7A18FnIR0eD7hQq5AASj9HXqo=";
};
buildInputs = kernel.moduleBuildDependencies;
@ -28,11 +27,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Linux kernel modules for LTTng tracing";
homepage = "https://lttng.org/";
license = with licenses; [ lgpl21 gpl2 mit ];
license = with licenses; [ lgpl21Only gpl2Only mit ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
broken = builtins.compareVersions kernel.version "3.18" == -1
|| builtins.compareVersions kernel.version "4.16" == 1;
};
}

3
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -79,7 +79,8 @@ unwrapped = stdenv.mkDerivation rec {
rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
'';
doInstallCheck = with stdenv; hostPlatform == buildPlatform;
doInstallCheck = with stdenv; hostPlatform == buildPlatform
&& !(isDarwin && isAarch64); # avoid luarocks, as it's broken ATM on the platform
installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ];
installCheckPhase = ''
meson test --print-errorlogs