From 80f4cce6fa2a21f04260eebbafd630a70d471a2c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 7 Apr 2021 21:08:25 +0200 Subject: [PATCH 1/7] chromiumDev: Fix the patch phase --- pkgs/applications/networking/browsers/chromium/common.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1c3da1c86078..3e823a561637 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -170,7 +170,10 @@ let ) ]; - postPatch = '' + postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' + # Required for patchShebangs (unsupported): + chmod -x third_party/webgpu-cts/src/tools/deno + '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then From 951e888cbda0f2c21e817ef84d62a0a2f66f4ac5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 21 Apr 2021 14:59:50 +0200 Subject: [PATCH 2/7] chromiumBeta: 90.0.4430.72 -> 90.0.4430.85 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index dd22d9899633..61b2b0fc2168 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "90.0.4430.72", - "sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55", - "sha256bin64": "1ddj2pk4m26dpl1ja0r56fvm67c1z1hq5rq5an8px6ixy78s2760", + "version": "90.0.4430.85", + "sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81", + "sha256bin64": "0aw76phm8r9k2zlqywyggzdqa467c8naqa717m24dk3nvv2rfkg2", "deps": { "gn": { "version": "2021-02-09", From f36aca9e821a083f31a11d2fa8eb4afc4a32c478 Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 19 Apr 2021 01:24:14 +0900 Subject: [PATCH 3/7] nnn: don't make supported tools a requirement Fixes #119728. --- pkgs/applications/misc/nnn/default.nix | 36 +++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 6fd68779f4ff..3b482e95d9dd 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,6 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, ncurses, readline -, archivemount, atool, fzf, libarchive, rclone, sshfs, unzip, vlock -, conf ? null, withIcons ? false, withNerdIcons ? false }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, makeWrapper +, pkg-config +, file +, ncurses +, readline +, which +# options +, conf ? null +, withIcons ? false +, withNerdIcons ? false +}: # Mutually exclusive options assert withIcons -> withNerdIcons == false; @@ -20,21 +32,21 @@ stdenv.mkDerivation rec { configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h"; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; buildInputs = [ readline ncurses ]; - makeFlags = [ "PREFIX=$(out)" ] + makeFlags = [ "PREFIX=${placeholder "out"}" ] ++ lib.optional withIcons [ "O_ICONS=1" ] ++ lib.optional withNerdIcons [ "O_NERD=1" ]; - # shell completions - postInstall = '' - install -Dm555 misc/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash - install -Dm555 misc/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions - install -Dm555 misc/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d + binPath = lib.makeBinPath [ file which ]; - wrapProgram $out/bin/nnn \ - --prefix PATH : ${lib.makeBinPath [ archivemount atool fzf libarchive rclone sshfs unzip vlock ]} + postInstall = '' + installShellCompletion --bash --name nnn.bash misc/auto-completion/bash/nnn-completion.bash + installShellCompletion --fish misc/auto-completion/fish/nnn.fish + installShellCompletion --zsh misc/auto-completion/zsh/_nnn + + wrapProgram $out/bin/nnn --prefix PATH : "$binPath" ''; meta = with lib; { From b14062b75c4e8ef4dd4110282f7105be87f681d7 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Mon, 19 Apr 2021 09:28:25 +0200 Subject: [PATCH 4/7] zfsUnstable: 2.0.4 -> 2.1.0-rc3 In https://github.com/openzfs/zfs/commit/658fb802 OpenZFS introduced a new compatibility feature. This is accompanied by some default profiles which are located in the $out output of the Nix derivation. However, these compatibility profiles are used by both the zpool executable located in $out and the libzfs library located in $lib. This inadvertently creates a cycle, because zpool refers to $lib to link against libzfs but libzfs refers back to $out for the compatibility profiles. There are two possible routes to rectify this problem: 1. Patch the zpool source code to not read the compatibility profiles and adjust the build system to put them into the $lib output. 2. Simply remove the $out/$lib split. Since no other derivation in nixpkgs refers to the $lib output explicitly we opt for the latter, because this is also in accordance with upstream. --- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 15c8df3cb137..845593e2665f 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -157,7 +157,7 @@ let done ''; - outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; + outputs = [ "out" ] ++ optionals buildUser [ "dev" ]; passthru = { inherit enableMail; @@ -210,9 +210,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.4"; + version = "2.1.0-rc3"; - sha256 = "sha256-ySTt0K3Lc0Le35XTwjiM5l+nIf9co7wBn+Oma1r8YHo="; + sha256 = "sha256-ARRUuyu07dWwEuXerTz9KBmclhlmsnnGucfBxxn0Zsw="; isUnstable = true; }; From 23372dc07992fba7df92250400daa281b38620d3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 09:19:45 -0700 Subject: [PATCH 5/7] Revert "python37Packages.poetry-core: fix build" This reverts commit 50ddbc8590cd800d5931afcbb0bd4081908f4281. This is a pre-release, and causes poetry to fail --- pkgs/development/python-modules/poetry-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 72c02b4c1e70..cc1724024add 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.1.0a3"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "sha256-GlRTtnxnc4slS4q1I7UTHUYGUJkzU9ew2NpJwSX7KYA="; + sha256 = "sha256-OE6oc/3HYrMmgPnINxvSZ27m8YeZk5Gnn9ok8GlSIZ0="; }; nativeBuildInputs = [ From 93e27be68cc220fb777f5b9ab43c724b9ba87847 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 09:25:59 -0700 Subject: [PATCH 6/7] poetry-core: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/poetry-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index cc1724024add..bec70aacca72 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "sha256-OE6oc/3HYrMmgPnINxvSZ27m8YeZk5Gnn9ok8GlSIZ0="; + sha256 = "07x0zagf9cfr7g3132jjd5byywkbnzpfbxjfjzpzpj70fqw70qrc"; }; nativeBuildInputs = [ From a24bac685793063190bda89fb2e717543cc27652 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 09:26:22 -0700 Subject: [PATCH 7/7] python3Packages.poetry: 1.1.5 -> 1.1.6 --- pkgs/development/python-modules/poetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index a04f4a1d8c12..51e95efbee50 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.5"; + version = "1.1.6"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0bv6irpscpak6pldkzrx4j12dqnpfz5h8fy5lliglizv0avh60hf"; + sha256 = "sha256-3Nx9xuQMIho+oRjqskHL9eQGKDAWntEGZcWe7evnmNU="; }; postPatch = ''