From 8d49cec11caa2d3d39540577e452f05a92206640 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jun 2021 15:15:04 +0000 Subject: [PATCH 1/4] horizon-eda: 1.4.0 -> 2.0.0 --- pkgs/applications/science/electronics/horizon-eda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index dee0a851bf8c..c1ff99a2c3a3 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -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 = [ From 389f628c08eea2c2301a7eaca22c4f0a90d15072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 11 Jun 2021 20:39:06 +0200 Subject: [PATCH 2/4] knot-resolver: skip tests on aarch64-darwin (for now) It used to build in a previous iteration https://hydra.nixos.org/job/nixpkgs/aarch64-darwin/knot-resolver.aarch64-darwin so I expect it will work without these tests (I have no access to a darwin machine). --- pkgs/servers/dns/knot-resolver/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 791de67e52dc..b0f9dfd6c910 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -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 From b06a0d409e8e7b4f56b9661b0cc5538180b80289 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 5 Jun 2021 21:53:12 +0800 Subject: [PATCH 3/4] linuxPackages.lttng-modules: 2.10.5 -> 2.12.6 --- pkgs/os-specific/linux/lttng-modules/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 8e20ffda346e..7f4036c775ff 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -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; }; - } From 2c8871a7dbc9db0753fdea004ef264ed249d9791 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Fri, 11 Jun 2021 00:29:59 +0000 Subject: [PATCH 4/4] vscode: 1.56.2 -> 1.57.0 --- pkgs/applications/editors/vscode/vscode.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index fd1cb7153ebf..41f5f79de78c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -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";