From 7443049b93b6ca4c96c9ba1d610a6de3d2b4ca26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 May 2021 06:57:36 +0200
Subject: [PATCH 01/37] pyright: also add to all-packages for better visibility

---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ac69482216..be1d8ff31b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25083,6 +25083,8 @@ in
 
   ptex = callPackage ../development/libraries/ptex {};
 
+  pyright = nodePackages.pyright;
+
   qbec = callPackage ../applications/networking/cluster/qbec { };
 
   qemacs = callPackage ../applications/editors/qemacs { };

From 8c24e79c15ad83c424c36708d7d1e1b9a8fa57cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phan=20Kochen?= <git@stephank.nl>
Date: Sun, 9 May 2021 22:58:41 +0200
Subject: [PATCH 02/37] libfive: fix darwin build

---
 pkgs/development/libraries/libfive/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index 0f6ad84fe75..3833a7fe880 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -10,6 +10,7 @@
 , libpng
 , boost
 , guile
+, stdenv
 }:
 
 mkDerivation {
@@ -26,8 +27,19 @@ mkDerivation {
   nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ];
   buildInputs = [ eigen zlib libpng boost guile ];
 
-  # Link "Studio" binary to "libfive-studio" to be more obvious:
-  postFixup = ''
+  postInstall = if stdenv.isDarwin then ''
+    # No rules to install the mac app, so do it manually.
+    mkdir -p $out/Applications
+    cp -r studio/Studio.app $out/Applications/Studio.app
+
+    install_name_tool \
+      -change libfive.dylib $out/lib/libfive.dylib \
+      -change libfive-guile.dylib $out/lib/libfive-guile.dylib \
+      $out/Applications/Studio.app/Contents/MacOS/Studio
+
+    wrapQtApp $out/Applications/Studio.app/Contents/MacOS/Studio
+  '' else ''
+    # Link "Studio" binary to "libfive-studio" to be more obvious:
     ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
   '';
 

From 99396a48a5ade1b6349ecb7cb17e8cc278804545 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 May 2021 15:42:41 +0200
Subject: [PATCH 03/37] tbb: clean up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Drop compiler and stdver arguments – if someone needs to provide them, they can just use overrideAttrs
- Update repo source
- Narrow scope of `with lib` declaration
- Change optional → optionals
- Use one input per line
- Build on all unix platforms
- Re-order attributes
---
 pkgs/development/libraries/tbb/default.nix | 39 +++++++++++++---------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 97ce24a8398..93750621275 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -1,22 +1,33 @@
-{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fixDarwinDylibNames
+}:
 
-with lib; stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "tbb";
-  version = "2020_U3";
+  version = "2020.3";
 
   src = fetchFromGitHub {
-    owner = "01org";
-    repo = "tbb";
-    rev = version;
-    sha256 = "sha256-prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
+    owner = "oneapi-src";
+    repo = "oneTBB";
+    rev = "v${version}";
+    sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
   };
 
-  nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames;
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
+    ./glibc-struct-mallinfo.patch
+  ];
 
-  makeFlags = optional (compiler != null) "compiler=${compiler}"
-    ++ optional (stdver != null) "stdver=${stdver}";
+  nativeBuildInputs = lib.optionals stdenv.isDarwin [
+    fixDarwinDylibNames
+  ];
 
-  patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;
+  makeFlags = lib.optionals stdenv.cc.isClang [
+    "compiler=clang"
+  ];
+
+  enableParallelBuilding = true;
 
   installPhase = ''
     runHook preInstall
@@ -29,9 +40,7 @@ with lib; stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  enableParallelBuilding = true;
-
-  meta = {
+  meta = with lib; {
     description = "Intel Thread Building Blocks C++ Library";
     homepage = "http://threadingbuildingblocks.org/";
     license = licenses.asl20;
@@ -43,7 +52,7 @@ with lib; stdenv.mkDerivation rec {
       represents a higher-level, task-based parallelism that abstracts platform
       details and threading mechanisms for scalability and performance.
     '';
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice dizfer ];
   };
 }

From d2f30b0b11e66f8064132357892340fd814f8338 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 May 2021 15:53:44 +0200
Subject: [PATCH 04/37] pkgsMusl.tbb: fix build

Use patches from openembedded:

https://github.com/openembedded/meta-openembedded/tree/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb

Also apply the patches unconditionally so that it is obvious when they do not apply any more.
---
 pkgs/development/libraries/tbb/default.nix    | 15 ++++++-
 .../libraries/tbb/glibc-struct-mallinfo.patch | 43 -------------------
 2 files changed, 13 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch

diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 93750621275..af22361f7a2 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, fetchurl
 , fetchFromGitHub
 , fixDarwinDylibNames
 }:
@@ -15,8 +16,18 @@ stdenv.mkDerivation rec {
     sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isMusl [
-    ./glibc-struct-mallinfo.patch
+  patches = [
+    # Fixes build with Musl.
+    (fetchurl {
+      url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch";
+      sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs=";
+    })
+
+    # Fixes build with Musl.
+    (fetchurl {
+      url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch";
+      sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74=";
+    })
   ];
 
   nativeBuildInputs = lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch b/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch
deleted file mode 100644
index 64056ecb146..00000000000
--- a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001
-From: David Huffman <storedbox+alpine@outlook.com>
-Date: Wed, 6 Jan 2016 07:09:30 -0500
-Subject: [PATCH] hard-code glibc's definition of struct mallinfo
-
----
- src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h
-index 781cadc..e1ea1ae 100644
---- a/src/tbbmalloc/proxy.h
-+++ b/src/tbbmalloc/proxy.h
-@@ -32,6 +32,26 @@
- 
- #include <stddef.h>
- 
-+// The following definition was taken from /usr/include/malloc.h as provided by
-+// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is
-+// made available under the GNU Lesser General Public License v2.1 or later.
-+// See <https://www.gnu.org/licenses>.
-+//
-+// Copyright (C) 1996-2014 Free Software Foundation, Inc.
-+struct mallinfo
-+{
-+  int arena;    /* non-mmapped space allocated from system */
-+  int ordblks;  /* number of free chunks */
-+  int smblks;   /* number of fastbin blocks */
-+  int hblks;    /* number of mmapped regions */
-+  int hblkhd;   /* space in mmapped regions */
-+  int usmblks;  /* maximum total allocated space */
-+  int fsmblks;  /* space available in freed fastbin blocks */
-+  int uordblks; /* total allocated space */
-+  int fordblks; /* total free space */
-+  int keepcost; /* top-most, releasable (via malloc_trim) space */
-+};
-+
- extern "C" {
-     void * scalable_malloc(size_t size);
-     void * scalable_calloc(size_t nobj, size_t size);
--- 
-2.6.2
-

From d8258b513d6a4b0f7776876f9c5a6b406f8ec9af Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 May 2021 16:00:03 +0200
Subject: [PATCH 05/37] tbb: add pkg-config file

Gazebo does not list the tbb dependency in its pkg-config file otherwise.
---
 pkgs/development/libraries/tbb/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index af22361f7a2..7aef5ba7476 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -51,6 +51,23 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  postInstall = let
+    pcTemplate = fetchurl {
+      url = "https://github.com/oneapi-src/oneTBB/raw/master/integration/pkg-config/tbb.pc.in";
+      sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI=";
+    };
+  in ''
+    # Generate pkg-config file based on upstream template.
+    # It should not be necessary with tbb after 2021.2.
+    mkdir -p "$out/lib/pkgconfig"
+    substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \
+      --subst-var-by CMAKE_INSTALL_PREFIX "$out" \
+      --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \
+      --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \
+      --subst-var-by TBB_VERSION "${version}" \
+      --subst-var-by TBB_LIB_NAME "tbb"
+  '';
+
   meta = with lib; {
     description = "Intel Thread Building Blocks C++ Library";
     homepage = "http://threadingbuildingblocks.org/";

From 3cf4c5d09b0c972c1fe5d15c23cfc9c75276064b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phan=20Kochen?= <git@stephank.nl>
Date: Tue, 11 May 2021 21:10:57 +0200
Subject: [PATCH 06/37] swiProlog: fix darwin build

---
 pkgs/development/compilers/swi-prolog/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index addf6413801..cb4cf580a0e 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
 
   # Add the packInstall path to the swipl pack search path
   postPatch = ''
-    echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl
+    echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> boot/init.pl
   '';
 
   nativeBuildInputs = [ cmake pkg-config ];

From e5d8c19f707d6e6b2526b0457de55955dc8fee28 Mon Sep 17 00:00:00 2001
From: Bradley Walters <oss@walters.app>
Date: Tue, 11 May 2021 17:22:52 -0600
Subject: [PATCH 07/37] maintainers: add bmwalters

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7ff4d03b765..17d88872f75 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1322,6 +1322,12 @@
     github = "bmilanov";
     githubId = 30090366;
   };
+  bmwalters = {
+    name = "Bradley Walters";
+    email = "oss@walters.app";
+    github = "bmwalters";
+    githubId = 4380777;
+  };
   bobakker = {
     email = "bobakk3r@gmail.com";
     github = "bobakker";

From ffaa5312395e7ad8b84ce886eea9f67de21135d6 Mon Sep 17 00:00:00 2001
From: Bradley Walters <oss@walters.app>
Date: Tue, 11 May 2021 17:53:37 -0600
Subject: [PATCH 08/37] minipro: init at 0.5

---
 pkgs/tools/misc/minipro/default.nix | 35 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/misc/minipro/default.nix

diff --git a/pkgs/tools/misc/minipro/default.nix b/pkgs/tools/misc/minipro/default.nix
new file mode 100644
index 00000000000..95385a47e59
--- /dev/null
+++ b/pkgs/tools/misc/minipro/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, pkg-config
+, libusb1
+}:
+
+stdenv.mkDerivation rec {
+  pname = "minipro";
+  version = "0.5";
+
+  src = fetchFromGitLab {
+    owner = "DavidGriffith";
+    repo = "minipro";
+    rev = version;
+    sha256 = "sha256-Hyj2LyY7W8opjigH+QLHHbDyelC0LMgGgdN+u3nNoJc=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ libusb1 ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "UDEV_DIR=$(out)/lib/udev"
+    "COMPLETIONS_DIR=$(out)/share/bash-completion/completions"
+    "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ];
+
+  meta = with lib; {
+    homepage = "https://gitlab.com/DavidGriffith/minipro";
+    description = "An open source program for controlling the MiniPRO TL866xx series of chip programmers";
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.bmwalters ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b76f1b53f9e..37ce338a107 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6203,6 +6203,8 @@ in
 
   minidlna = callPackage ../tools/networking/minidlna { };
 
+  minipro = callPackage ../tools/misc/minipro { };
+
   minisign = callPackage ../tools/security/minisign { };
 
   ministat = callPackage ../tools/misc/ministat { };

From 67a2f545cab1c39715211e448e9b92b3f8febadd Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 10 May 2021 00:43:13 -0300
Subject: [PATCH 09/37] eterm: 0.9.6 -> 0.9.6-unstable=2020-03-03

---
 .../terminal-emulators/eterm/default.nix      | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix
index 9e2afe57907..70b8311b105 100644
--- a/pkgs/applications/terminal-emulators/eterm/default.nix
+++ b/pkgs/applications/terminal-emulators/eterm/default.nix
@@ -1,24 +1,41 @@
-{ lib, stdenv, fetchurl
-, libX11, libXext, libXaw
-, pkg-config, imlib2, libast }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, imlib2
+, libX11
+, libXaw
+, libXext
+, libast
+, pkg-config
+}:
 
 stdenv.mkDerivation rec {
   pname = "eterm";
-  version = "0.9.6";
-  srcName = "Eterm-${version}";
+  version = "0.9.6-unstable=2020-03-03";
 
-  src = fetchurl {
-    url = "http://www.eterm.org/download/${srcName}.tar.gz";
-    sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj";
+  src = fetchFromGitHub {
+    owner = "mej";
+    repo = pname;
+    rev = "e8fb85b56da21113aaf0f5f7987ae647c4413b6c";
+    sha256 = "sha256-pfXYrd6BamBTcnarvXj+C6D1WyGtj87GrW+Dl6AeiDE=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libX11 libXext libXaw imlib2 ];
-  propagatedBuildInputs = [ libast ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+  buildInputs = [
+    imlib2
+    libX11
+    libXaw
+    libXext
+    libast
+  ];
 
   meta = with lib; {
-    description = "Terminal emulator";
     homepage = "http://www.eterm.org";
+    description = "Terminal emulator";
     license = licenses.bsd2;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.linux;

From 5d8c8c6c90c2dda5d81ad9c1b2b018ad9a939dc0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 11 May 2021 09:39:22 -0300
Subject: [PATCH 10/37] icewm: 2.2.0 -> 2.3.4

---
 pkgs/applications/window-managers/icewm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 8f1a920296a..0dc962e84c5 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation rec {
   pname = "icewm";
-  version = "2.2.0";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
-    owner  = "bbidulock";
+    owner  = "ice-wm";
     repo = pname;
     rev = version;
-    hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4=";
+    hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A=";
   };
 
   nativeBuildInputs = [

From 5ad65d4eb8aac91c2e5c99f0eded39890ece37b0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 11 May 2021 11:22:51 -0300
Subject: [PATCH 11/37] emacasPackages.sunrise-commander: 6r435 ->
 0.0.0-unstable=2021-04-23

---
 .../emacs-modes/sunrise-commander/default.nix | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
index 412ed59f2ac..a45238fd191 100644
--- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
+++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
@@ -1,30 +1,42 @@
-{ lib, stdenv, fetchgit, emacs }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, emacs
+}:
 
-stdenv.mkDerivation {
-  name = "sunrise-commander-6r435";
+stdenv.mkDerivation rec {
+  pname = "sunrise-commander";
+  version = "0.0.0-unstable=2021-04-23";
 
-  src = fetchgit {
-    url = "https://github.com/escherdragon/sunrise-commander.git";
-    rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1";
-    sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "db880fbea03d2db00db1398c91918c3c6f0392e3";
+    hash = "sha256-IGHCKYQaGUapaA9vxq0xO58KCpBPOiQpHqrEaHK0usE=";
   };
 
-  buildInputs = [ emacs ];
+  buildInputs = [
+    emacs
+  ];
 
   buildPhase = ''
-    emacs -L . --batch -f batch-byte-compile *.el
+    runHook preBuild
+    emacs -q --no-splash --directory=. --batch --file=batch-byte-compile *.el
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/share/emacs/site-lisp
     install *.el* $out/share/emacs/site-lisp
+    runHook postInstall
   '';
 
-  meta = {
+  meta = with lib; {
+    homepage = "https://github.com/sunrise-commander/sunrise-commander/";
     description = "Two-pane file manager for Emacs based on Dired and inspired by MC";
-    homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander";
-    license = lib.licenses.gpl3Plus;
-
-    platforms = lib.platforms.all;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.all;
   };
 }

From 12d5b760ae519bf25d72fa9a8a7263a6584227d1 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 11 May 2021 09:10:03 -0300
Subject: [PATCH 12/37] skribilo: rewrite

---
 pkgs/tools/typesetting/skribilo/default.nix | 83 ++++++++++++---------
 1 file changed, 47 insertions(+), 36 deletions(-)

diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix
index 755909f2b33..e80c4326651 100644
--- a/pkgs/tools/typesetting/skribilo/default.nix
+++ b/pkgs/tools/typesetting/skribilo/default.nix
@@ -1,64 +1,75 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
-, pkg-config
 , gettext
-, guile
-, guile-reader
-, guile-lib
-, ploticus
-, imagemagick
 , ghostscript
-, transfig
-, enableEmacs ? false, emacs ? null
-, enableLout ? true, lout ? null
-, enableTex ? true, tex ? null
+, guile
+, guile-lib
+, guile-reader
+, imagemagick
 , makeWrapper
+, pkg-config
+, ploticus
+, transfig
+, enableEmacs ? false, emacs
+, enableLout ? true, lout
+, enableTex ? true, tex
 }:
 
 let
+  inherit (lib) optional;
+in stdenv.mkDerivation rec{
   pname = "skribilo";
   version = "0.9.5";
-  inherit (lib) optional;
-in stdenv.mkDerivation {
-  inherit pname version;
 
   src = fetchurl {
     url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz";
     sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk=";
   };
 
-  nativeBuildInputs = [ pkg-config makeWrapper ];
-
-  buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ]
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+  buildInputs = [
+    gettext
+    ghostscript
+    guile
+    guile-lib
+    guile-reader
+    imagemagick
+    ploticus
+    transfig
+  ]
   ++ optional enableEmacs emacs
   ++ optional enableLout lout
   ++ optional enableTex tex;
 
-  propagatedBuildInputs = [ guile-reader guile-lib ];
+  postInstall =
+    let
+      guileVersion = lib.versions.majorMinor guile.version;
+    in
+    ''
+      wrapProgram $out/bin/skribilo \
+        --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \
+        --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH"
+    '';
 
-  postInstall = ''
-    wrapProgram $out/bin/skribilo \
-      --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \
-      --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site"
-  '';
-
-  meta = with lib;{
+  meta = with lib; {
+    homepage = "https://www.nongnu.org/skribilo/";
     description = "The Ultimate Document Programming Framework";
     longDescription = ''
-      Skribilo is a free document production tool that takes a
-      structured document representation as its input and renders that
-      document in a variety of output formats: HTML and Info for
-      on-line browsing, and Lout and LaTeX for high-quality hard
-      copies.
+      Skribilo is a free document production tool that takes a structured
+      document representation as its input and renders that document in a
+      variety of output formats: HTML and Info for on-line browsing, and Lout
+      and LaTeX for high-quality hard copies.
 
       The input document can use Skribilo's markup language to provide
-      information about the document's structure, which is similar to
-      HTML or LaTeX and does not require expertise. Alternatively, it
-      can use a simpler, "markup-less" format that borrows from Emacs'
-      outline mode and from other conventions used in emails, Usenet
-      and text.
+      information about the document's structure, which is similar to HTML or
+      LaTeX and does not require expertise. Alternatively, it can use a simpler,
+      "markup-less" format that borrows from Emacs' outline mode and from other
+      conventions used in emails, Usenet and text.
     '';
-    homepage = "https://www.nongnu.org/skribilo/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.unix;

From 941c14f345c73cd5fc5f4ad6033fcb50cf575989 Mon Sep 17 00:00:00 2001
From: "J. Neto" <jnetod@tuta.io>
Date: Wed, 12 May 2021 04:58:25 -0300
Subject: [PATCH 13/37] sqsh: fix build with freetds

---
 pkgs/development/tools/sqsh/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index 9c56efcb59f..ba4a681a594 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -14,9 +14,6 @@ in stdenv.mkDerivation rec {
 
   preConfigure = ''
     export SYBASE=${freetds}
-
-    substituteInPlace src/cmd_connect.c \
-      --replace CS_TDS_80 CS_TDS_73
   '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace "libct.so" "libct.dylib"
   '';
@@ -27,6 +24,17 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  patches = [
+    (fetchurl {
+      # https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/databases/sqsh/patches/patch-src_cmd_connect_c
+      name = "patch-src_cmd_connect_c.patch";
+      url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/databases/sqsh/patches/patch-src_cmd_connect_c?rev=1.2&content-type=text/plain";
+      sha256 = "1dz97knr2h0a0ca1vq2mx6h8s3ns9jb1a0qraa4wkfmcdi3aqw0j";
+    })
+  ];
+
+  patchFlags = [ "-p0" ];
+
   meta = with lib; {
     description = "Command line tool for querying Sybase/MSSQL databases";
     longDescription = ''

From 89263112386467419a4ddc7bd54b39318a21d788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 12 May 2021 14:00:05 +0200
Subject: [PATCH 14/37] vsftpd: fix build with gcc9

We still use that version on aarch64.
---
 pkgs/servers/ftp/vsftpd/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 1a5bd4370d7..b87d11809b1 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -24,7 +24,11 @@ stdenv.mkDerivation rec {
   '';
 
   NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
-  NIX_CFLAGS_COMPILE = "-Wno-error=enum-conversion";
+
+  # On gcc9, this would produce
+  #   error: '-Werror=enum-conversion': no option -Wenum-conversion
+  NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast stdenv.cc.version "10")
+    "-Wno-error=enum-conversion";
 
   enableParallelBuilding = true;
 

From c8283cedb729c3849214570471553b479991d19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 12 May 2021 14:58:39 +0200
Subject: [PATCH 15/37] python3Packages.pytorch-bin: use CUDA 11 wheels

---
 .../python-modules/pytorch/binary-hashes.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix
index 3e93eb2f789..4855d135710 100644
--- a/pkgs/development/python-modules/pytorch/binary-hashes.nix
+++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix
@@ -1,17 +1,17 @@
 version: {
   x86_64-linux-37 = {
     name = "torch-${version}-cp37-cp37m-linux_x86_64.whl";
-    url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp37-cp37m-linux_x86_64.whl";
-    hash = "sha256-79JK2gGlV5Lhbim7GgPCjk++brwpUQE7g7vsrBu06eE=";
+    url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl";
+    hash = "sha256-lxj066PiB+S88GqQnXKgd9RCiKkMk3mctx/eBieZjAk=";
   };
   x86_64-linux-38 = {
     name = "torch-${version}-cp38-cp38-linux_x86_64.whl";
-    url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp38-cp38-linux_x86_64.whl";
-    hash = "sha256-16h90SdxAgFxmPpgUPA3rBGxs9dtFaCeAgeSpKmtnmQ=";
+    url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl";
+    hash = "sha256-qvTQMLz4CQPgalzUyYwz6rm+ExyWlIzI+FSMQhxM4eM=";
   };
   x86_64-linux-39 = {
     name = "torch-${version}-cp39-cp39-linux_x86_64.whl";
-    url = "https://download.pytorch.org/whl/cu102/torch-${version}%2Bcu102-cp39-cp39-linux_x86_64.whl";
-    hash = "sha256-E3RLWpGYbRuKsz0pQv7npmC7WTbdvlYFaxXQYBKT2/8=";
+    url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl";
+    hash = "sha256-z0pzEiljU+E2x2SuOEAg86dmVY1iFZSDOCfoOAFhLQo=";
   };
 }

From b02724b9038862e80e2a4a3e007e9f88d8b99095 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 May 2021 14:27:32 +0000
Subject: [PATCH 16/37] go-toml: 1.9.0 -> 1.9.1

---
 pkgs/development/tools/go-toml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix
index 9a0fa54fb2d..355f468237c 100644
--- a/pkgs/development/tools/go-toml/default.nix
+++ b/pkgs/development/tools/go-toml/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "go-toml";
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "pelletier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-m8VgjfNDxSX6fRG2/gEJlVc9hCnua+o79ttrd8P20kU=";
+    sha256 = "sha256-O3gfQon8ktObLVED4A5sCSOw8K1NIXP3a5AsLq3Svb4=";
   };
 
   goPackagePath = "github.com/pelletier/go-toml";

From 9b03a74fb5366e5b4153a0870c6ecbd97ae7f2f2 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Tue, 11 May 2021 16:21:08 -0700
Subject: [PATCH 17/37] 0verkill: fix darwin build

---
 pkgs/games/0verkill/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/0verkill/default.nix b/pkgs/games/0verkill/default.nix
index 69a371f09d9..fa654832e2e 100644
--- a/pkgs/games/0verkill/default.nix
+++ b/pkgs/games/0verkill/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+, gccStdenv
 , fetchFromGitHub
 , autoreconfHook
 , xorgproto
@@ -7,7 +7,7 @@
 , libXpm
 }:
 
-stdenv.mkDerivation rec {
+gccStdenv.mkDerivation rec {
   pname = "0verkill";
   version = "unstable-2011-01-13";
 

From ce6d0772903011fce08e347663eedf01d7b153d9 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 6 May 2021 18:55:40 -0400
Subject: [PATCH 18/37] libtorrent-jesec: init at 0.13.8-r1

---
 .../p2p/libtorrent-jesec/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/networking/p2p/libtorrent-jesec/default.nix

diff --git a/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix
new file mode 100644
index 00000000000..3858d87e7ed
--- /dev/null
+++ b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix
@@ -0,0 +1,28 @@
+{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "libtorrent-jesec";
+  version = "0.13.8-r1";
+
+  src = fetchFromGitHub {
+    owner = "jesec";
+    repo = "libtorrent";
+    rev = "v${version}";
+    sha256 = "sha256-Eh5pMkSe9uO0dPRWDg2BbbRxxuvX9FM2/OReq/61ojc=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ openssl zlib ];
+
+  # https://github.com/jesec/libtorrent/issues/1
+  doCheck = false;
+  checkInputs = [ gtest ];
+
+  meta = with lib; {
+    description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)";
+    homepage = "https://github.com/jesec/libtorrent";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ winterqt ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e57409a0b91..881c505c502 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5955,6 +5955,8 @@ in
 
   libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
 
+  libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { };
+
   libmpack = callPackage ../development/libraries/libmpack { };
 
   libiberty = callPackage ../development/libraries/libiberty { };

From 0c6b4f2c75e56798d9fd8dd1f0bd37c4fd960972 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 6 May 2021 18:57:02 -0400
Subject: [PATCH 19/37] rtorrent-jesec: init at 0.9.8-r11

---
 .../networking/p2p/rtorrent-jesec/default.nix | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/tools/networking/p2p/rtorrent-jesec/default.nix

diff --git a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix
new file mode 100644
index 00000000000..4d19a82eb3c
--- /dev/null
+++ b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, gtest
+, libtorrent-jesec
+, curl
+, ncurses
+, xmlrpc_c
+, nlohmann_json
+, xmlRpcSupport ? true
+, jsonRpcSupport ? true
+}:
+let
+  inherit (lib) optional;
+in
+stdenv.mkDerivation rec {
+  pname = "rtorrent-jesec";
+  version = "0.9.8-r10";
+
+  src = fetchFromGitHub {
+    owner = "jesec";
+    repo = "rtorrent";
+    rev = "v${version}";
+    sha256 = "sha256-Ge5W1rLaneUA7LxnBuMO/jQlqLOUKFf3gaAAlRr/qeM=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libtorrent-jesec curl ncurses ]
+    ++ optional xmlRpcSupport xmlrpc_c
+    ++ optional jsonRpcSupport nlohmann_json;
+
+  cmakeFlags = [ "-DUSE_RUNTIME_CA_DETECTION=NO" ]
+    ++ optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"
+    ++ optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO";
+
+  doCheck = true;
+  checkInputs = [ gtest ];
+
+  prePatch = ''
+    substituteInPlace src/main.cc \
+      --replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc"
+  '';
+
+  postFixup = ''
+    mkdir -p $out/etc/rtorrent
+    cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc
+  '';
+
+  meta = with lib; {
+    description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)";
+    homepage = "https://github.com/jesec/rtorrent";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ winterqt ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 881c505c502..bfbe970074b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7585,6 +7585,8 @@ in
 
   rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
 
+  rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { };
+
   rubber = callPackage ../tools/typesetting/rubber { };
 
   rubocop = callPackage ../development/tools/rubocop { };

From 5c4c71c31aa2e9285e1851afe1a8ccdbaa740144 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Wed, 12 May 2021 19:44:06 +0200
Subject: [PATCH 20/37] linux_lqx: 5.11.19 -> 5.11.20

---
 pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
index 1494508cb01..1b9dc8efc9c 100644
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
 
 let
-  version = "5.11.19";
+  version = "5.11.20";
   suffix = "lqx1";
 in
 
@@ -14,7 +14,7 @@ buildLinux (args // {
     owner = "zen-kernel";
     repo = "zen-kernel";
     rev = "v${version}-${suffix}";
-    sha256 = "17gdlkixsy68j6c7lpkkk242x71rqj78hpqg3kp01fckj633za5n";
+    sha256 = "0pdn3p9v3jasgf4xffirijlx20qp9gglzlksk2gmyzg9lmf5dygi";
   };
 
   extraMeta = {

From 8d0b9934a28901d28cfb72f01ee39ac90ca1fc93 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 12 May 2021 20:29:25 +0200
Subject: [PATCH 21/37] python3Packages.aioesphomeapi: 2.6.6 -> 2.7.0

---
 pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 7525e4dcca6..686163f3574 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "2.6.6";
+  version = "2.7.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-LdBUtU5rNoixh7DPIFkHxLMvBeI6MZH57sO0IjuOQAw=";
+    sha256 = "sha256-PCoSJnt8EptVq5u0+NgEBwY6zLkD87XqVRBDdqBziM8=";
   };
 
   propagatedBuildInputs = [ attrs protobuf zeroconf ];

From c94913045f12d52d3514a05a5eedbfe14fb345f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 12 May 2021 21:02:50 +0200
Subject: [PATCH 22/37] python37.pkgs.prettytable: Fix build

---
 pkgs/development/python-modules/prettytable/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index d349a58960a..50b9eb57630 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -4,6 +4,8 @@
 , glibcLocales
 , setuptools_scm
 , wcwidth
+, importlib-metadata
+, pythonOlder
 }:
 
 buildPythonPackage rec {
@@ -18,7 +20,11 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools_scm ];
   buildInputs = [ glibcLocales ];
 
-  propagatedBuildInputs = [ wcwidth ];
+  propagatedBuildInputs = [
+    wcwidth
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
+  ];
 
   preCheck = ''
     export LANG="en_US.UTF-8"

From ee1cfa2df1b9354cce2ffe6daea22da673666c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 12 May 2021 21:57:49 +0200
Subject: [PATCH 23/37] abcmidi: 2021.05.09 -> 2021.05.10

---
 pkgs/tools/audio/abcmidi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index cfb5ff125e2..62b45b65dc1 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "abcMIDI";
-  version = "2021.05.09";
+  version = "2021.05.10";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
-    sha256 = "sha256-LgtS7IOGkw0K70UAP2a57ghIiJujVnQO5+j4ZanPZp4=";
+    sha256 = "sha256-ID27OdtuSYtD8bOPb6b0vUDdRqJvRX5TsjRBILTom4o=";
   };
 
   meta = with lib; {

From 42ee87ee796cbd3eadb16d55477bbd280774929e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 12 May 2021 22:13:19 +0200
Subject: [PATCH 24/37] pythonPackages.django-pipeline: drop

It is marked as broken since October 2019.
---
 .../django-pipeline/default.nix               | 37 -------------------
 pkgs/top-level/python-packages.nix            |  2 -
 2 files changed, 39 deletions(-)
 delete mode 100644 pkgs/development/python-modules/django-pipeline/default.nix

diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix
deleted file mode 100644
index 92aefe4a408..00000000000
--- a/pkgs/development/python-modules/django-pipeline/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, django, futures ? null, mock ? null, jinja2, jsmin, slimit }:
-
-buildPythonPackage rec {
-  pname = "django-pipeline";
-  version = "1.6.14";
-
-  # no tests on PyPI
-  src = fetchFromGitHub {
-    owner = "jazzband";
-    repo = pname;
-    rev = version;
-    sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j";
-  };
-
-  postPatch = ''
-    substituteInPlace tests/tests/test_compiler.py \
-      --replace "/usr/bin/env" ""
-  '';
-
-  propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures;
-
-  checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock;
-
-  checkPhase = ''
-    export PYTHONPATH=.:$PYTHONPATH
-    export DJANGO_SETTINGS_MODULE=tests.settings
-    ${django}/bin/django-admin.py test tests
-  '';
-
-  meta = with lib; {
-    description = "Pipeline is an asset packaging library for Django";
-    homepage = "https://github.com/cyberdelia/django-pipeline";
-    license = licenses.mit;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0d75625019b..ee800b2490b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1928,8 +1928,6 @@ in {
 
   django-picklefield = callPackage ../development/python-modules/django-picklefield { };
 
-  django_pipeline = callPackage ../development/python-modules/django-pipeline { };
-
   django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
 
   django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { };

From 65380bc3389f6749acdc362d3f52445bf74bc32b Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Wed, 12 May 2021 14:27:28 -0600
Subject: [PATCH 25/37] steam-tui: adds missing runtime dependencies

---
 pkgs/games/steam-tui/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix
index 219bac701dc..968f529421d 100644
--- a/pkgs/games/steam-tui/default.nix
+++ b/pkgs/games/steam-tui/default.nix
@@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec {
     mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped
     cat > $out/bin/steam-tui <<EOF
     #!${runtimeShell}
-    exec steam-run $out/bin/.steam-tui-unwrapped '$@'
+    export PATH=${steamcmd}/bin:\$PATH
+    exec ${steam-run-native}/bin/steam-run $out/bin/.steam-tui-unwrapped '\$@'
     EOF
     chmod +x $out/bin/steam-tui
   '';

From 2e95877eb6d17102460ff2dedcf8a4caafd532c7 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 12 May 2021 22:09:37 +0200
Subject: [PATCH 26/37] bitwarden-cli: set meta.mainProgram

---
 pkgs/development/node-packages/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index ff9b4747e68..3654d7b5296 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -60,8 +60,9 @@ let
       };
     });
 
-    bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: {
+    bitwarden-cli = super."@bitwarden/cli".override (drv: {
       name = "bitwarden-cli-${drv.version}";
+      meta.mainProgram = "bw";
     });
 
     fast-cli = super."fast-cli-1.x".override {

From 854207d16c3c228ff42096e12af4e33233a0590a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phan=20Kochen?= <git@stephank.nl>
Date: Wed, 12 May 2021 22:33:02 +0200
Subject: [PATCH 27/37] castty: fix darwin build

---
 pkgs/tools/misc/castty/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/castty/default.nix b/pkgs/tools/misc/castty/default.nix
index ddda737c8b5..075c6d739b3 100644
--- a/pkgs/tools/misc/castty/default.nix
+++ b/pkgs/tools/misc/castty/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ libsoundio lame ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "PREFIX=$(out)"
+  ];
 
   meta = with lib; {
     description = "CLI tool to record audio-enabled screencasts of your terminal, for the web";

From e90057a4a56f6a9cc9ddb9fd7ed61ee1781e2651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phan=20Kochen?= <git@stephank.nl>
Date: Wed, 12 May 2021 22:41:50 +0200
Subject: [PATCH 28/37] chafa: fix darwin build

---
 pkgs/tools/misc/chafa/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix
index 51fbba8d706..d830b8d81fc 100644
--- a/pkgs/tools/misc/chafa/default.nix
+++ b/pkgs/tools/misc/chafa/default.nix
@@ -1,5 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }:
-
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which
+, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick
+, Foundation
+}:
 
 stdenv.mkDerivation rec {
   version = "1.6.0";
@@ -23,7 +25,8 @@ stdenv.mkDerivation rec {
                         docbook_xsl
                       ];
 
-  buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
+  buildInputs = [ glib imagemagick ]
+    ++ lib.optional stdenv.isDarwin Foundation;
 
   patches = [ ./xmlcatalog_patch.patch ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d64dcc5f176..bb1280f84b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3658,7 +3658,9 @@ in
 
   cfssl = callPackage ../tools/security/cfssl { };
 
-  chafa = callPackage ../tools/misc/chafa { };
+  chafa = callPackage ../tools/misc/chafa {
+    inherit (darwin.apple_sdk.frameworks) Foundation;
+  };
 
   checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
 

From 22da55072861c4c42b8e85a2d89a53af9024d50f Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Sun, 9 May 2021 19:28:59 -0400
Subject: [PATCH 29/37] Fast-forward PR #122399 from staging to staging-next

compiler-rt: Revert passing `COMPILER_RT_OS_DIR` and not symlinking libs
(cherry picked from commit 680b33fe37d4b6fd0bd8fe596ed438c88bfb3637)
https://github.com/NixOS/nixpkgs/pull/111487#issuecomment-840078869
---
 pkgs/development/compilers/llvm/10/compiler-rt/default.nix | 5 +++--
 pkgs/development/compilers/llvm/11/compiler-rt/default.nix | 5 +++--
 pkgs/development/compilers/llvm/12/compiler-rt/default.nix | 5 +++--
 pkgs/development/compilers/llvm/5/compiler-rt/default.nix  | 5 +++--
 pkgs/development/compilers/llvm/6/compiler-rt/default.nix  | 5 +++--
 pkgs/development/compilers/llvm/7/compiler-rt/default.nix  | 5 +++--
 pkgs/development/compilers/llvm/8/compiler-rt/default.nix  | 5 +++--
 pkgs/development/compilers/llvm/9/compiler-rt/default.nix  | 5 +++--
 8 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/llvm/10/compiler-rt/default.nix b/pkgs/development/compilers/llvm/10/compiler-rt/default.nix
index 15fb0a7b910..1f990ac433d 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DCOMPILER_RT_OS_DIR="
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
@@ -81,7 +80,9 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = lib.optionalString (useLLVM) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix
index 5ec37508c5e..257bc34092f 100644
--- a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DCOMPILER_RT_OS_DIR="
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
@@ -84,7 +83,9 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = lib.optionalString (useLLVM) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
index 7126deb8f0a..b880a0071b9 100644
--- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DCOMPILER_RT_OS_DIR="
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
@@ -84,7 +83,9 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = lib.optionalString (useLLVM) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix
index 237cea11a7c..7e85c420da0 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation {
   ];
 
   cmakeFlags = [
-    "-DCOMPILER_RT_OS_DIR="
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
@@ -78,7 +77,9 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = lib.optionalString (useLLVM) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt/default.nix b/pkgs/development/compilers/llvm/6/compiler-rt/default.nix
index c74693629d3..384305f5cf2 100644
--- a/pkgs/development/compilers/llvm/6/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/6/compiler-rt/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation {
   ];
 
   cmakeFlags = [
-    "-DCOMPILER_RT_OS_DIR="
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
@@ -80,7 +79,9 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = lib.optionalString (useLLVM) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix
index d083347dde5..75d61a51e60 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation {
   ];
 
   cmakeFlags = [
-    "-DCOMPILER_RT_OS_DIR="
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
@@ -81,7 +80,9 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = lib.optionalString (useLLVM) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt/default.nix b/pkgs/development/compilers/llvm/8/compiler-rt/default.nix
index 0f07e78dded..d370de031bb 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation {
   ];
 
   cmakeFlags = [
-    "-DCOMPILER_RT_OS_DIR="
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
@@ -81,7 +80,9 @@ stdenv.mkDerivation {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = lib.optionalString (useLLVM) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix
index f6f5a9cf806..285fe811514 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt/default.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DCOMPILER_RT_OS_DIR="
     "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
     "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
@@ -80,7 +79,9 @@ stdenv.mkDerivation rec {
   '';
 
   # Hack around weird upsream RPATH bug
-  postInstall = lib.optionalString (useLLVM) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + lib.optionalString (useLLVM) ''
     ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
     ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
     ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o

From e2adee682725044ddc24ad731a54d6f84e314066 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 8 May 2021 19:55:29 +0200
Subject: [PATCH 30/37] chromiumDev: Fix the build

python.withPackages avoids the problem with mixed Python 2 and Python 3
dependencies.
---
 .../networking/browsers/chromium/common.nix   | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index a2bc293eaaf..f84ce23309f 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -7,7 +7,7 @@
 , xdg-utils, yasm, nasm, minizip, libwebp
 , libusb1, pciutils, nss, re2
 
-, python2Packages, python3Packages, perl, pkg-config
+, python2, python3, perl, pkg-config
 , nspr, systemd, libkrb5
 , util-linux, alsaLib
 , bison, gperf
@@ -43,16 +43,12 @@ with lib;
 
 let
   jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-  # TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py"
-  # currently doesn't work due to mixed Python 2/3 dependencies:
-  pythonPackages = if chromiumVersionAtLeast "93"
-    then python3Packages
-    else python2Packages;
-  forcePython3Patch = (githubPatch
-    # Reland #8 of "Force Python 3 to be used in build."":
-    "a2d3c362802d9e6b62f895fcda75a3695b77b1b8"
-    "1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2"
-  );
+  python2WithPackages = python2.withPackages(ps: with ps; [
+    ply jinja2 setuptools
+  ]);
+  python3WithPackages = python3.withPackages(ps: with ps; [
+    ply jinja2 setuptools
+  ]);
 
   # The additional attributes for creating derivations based on the chromium
   # source tree.
@@ -138,10 +134,12 @@ let
     };
 
     nativeBuildInputs = [
+      ninja pkg-config
+      python2WithPackages perl nodejs
+      gnutar which
       llvmPackages.lldClang.bintools
-      ninja which pythonPackages.python perl pkg-config
-      pythonPackages.ply pythonPackages.jinja2 nodejs
-      gnutar pythonPackages.setuptools
+    ] ++ lib.optionals (chromiumVersionAtLeast "92") [
+      python3WithPackages
     ];
 
     buildInputs = defaultDependencies ++ [
@@ -174,8 +172,6 @@ let
     postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''
       # Required for patchShebangs (unsupported):
       chmod -x third_party/webgpu-cts/src/tools/deno
-    '' + optionalString (chromiumVersionAtLeast "92") ''
-      patch -p1 --reverse < ${forcePython3Patch}
     '' + ''
       # remove unused third-party
       for lib in ${toString gnSystemLibraries}; do
@@ -313,7 +309,7 @@ let
 
       # This is to ensure expansion of $out.
       libExecPath="${libExecPath}"
-      python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
+      ${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries}
       ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
 
       # Fail if `gn gen` contains a WARNING.

From 362bc6785a2f74de5291dd00c81eaa4a3a37668d Mon Sep 17 00:00:00 2001
From: Alexander Krimm <A.Krimm@gsi.de>
Date: Wed, 12 May 2021 16:41:18 +0200
Subject: [PATCH 31/37] Fix conan build caused by failing pyjwt

Ignore a failing thest in the downgraded pyjwt dependency.
See #122461 for another instance of the same problem.
---
 pkgs/development/tools/build-managers/conan/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index bf780985bc4..9c3e99e23ad 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -35,6 +35,9 @@ let newPython = python3.override {
         inherit version;
         sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
       };
+      disabledTests = [
+        "test_ec_verify_should_return_false_if_signature_invalid"
+      ];
     });
   };
 };

From 32ea6bfe74894e50ed919d9677c8ddb0b8da2955 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 12 May 2021 14:12:08 -0700
Subject: [PATCH 32/37] dcs: use yuicompressor instead of slimit and
 CSSMinifier (#122764)

slimit appears to be unmaintained (and broken on Python 3.9), but we have
yuicompressor packaged which supercedes both slimit and CSSMinifier. Let's use
that instead.
---
 pkgs/tools/text/dcs/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/tools/text/dcs/default.nix
index 610b494439c..511931f0380 100644
--- a/pkgs/tools/text/dcs/default.nix
+++ b/pkgs/tools/text/dcs/default.nix
@@ -1,8 +1,7 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
-, python3Packages
-, perl
+, yuicompressor
 , zopfli
 , stdenv
 }:
@@ -23,8 +22,7 @@ buildGoModule {
   doCheck = false;
 
   nativeBuildInputs = [
-    python3Packages.slimit
-    (perl.withPackages (p: [ p.CSSMinifier ]))
+    yuicompressor
     zopfli
   ];
 

From 83a8517e5a3ac9a1fb14e6f9d95bc2bf67994273 Mon Sep 17 00:00:00 2001
From: Victor Roest <victor@xirion.net>
Date: Wed, 12 May 2021 21:56:55 +0000
Subject: [PATCH 33/37] rtorrent-jesec: 0.9.8-r10 -> 0.9.8-r13

---
 pkgs/tools/networking/p2p/rtorrent-jesec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix
index 4d19a82eb3c..5b973a84ebc 100644
--- a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "rtorrent-jesec";
-  version = "0.9.8-r10";
+  version = "0.9.8-r13";
 
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "rtorrent";
     rev = "v${version}";
-    sha256 = "sha256-Ge5W1rLaneUA7LxnBuMO/jQlqLOUKFf3gaAAlRr/qeM=";
+    sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw";
   };
 
   nativeBuildInputs = [ cmake ];

From b6475a8f907053a9e742fab46d34c123876d18fd Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 5 May 2021 13:02:52 +0200
Subject: [PATCH 34/37] gonic: fix transcoding support

ffmpeg is not needed as a library at build time, but rather as an
executable at runtime.
---
 pkgs/servers/gonic/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix
index fbefca063a8..b807a1ff757 100644
--- a/pkgs/servers/gonic/default.nix
+++ b/pkgs/servers/gonic/default.nix
@@ -20,9 +20,19 @@ buildGoModule rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ taglib alsaLib ] ++ lib.optionals transcodingSupport [ ffmpeg ];
+  buildInputs = [ taglib alsaLib ];
   vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
 
+  # TODO(Profpatsch): write a test for transcoding support,
+  # since it is prone to break
+  postPatch = lib.optionalString transcodingSupport ''
+    substituteInPlace \
+      server/encode/encode.go \
+      --replace \
+        '"ffmpeg"' \
+        '"${lib.getBin ffmpeg}/bin/ffmpeg"'
+  '';
+
   meta = {
     homepage = "https://github.com/sentriz/gonic";
     description = "Music streaming server / subsonic server API implementation";

From bf434ca1a1601ac790c5bde57a7d3af5ebd48d2a Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Sun, 2 May 2021 22:04:10 +0200
Subject: [PATCH 35/37] libnixxml: fix build + support cross + enable tests

Run the symlinking of the ./bootstrap script in the preAutoreconf hook.

Remove the tests that are broken and enable testing again.

Put correct dependencies in nativeBuildInputs vs buildInputs vs
checkInputs to support cross-compilation.
---
 .../libraries/libnixxml/default.nix           | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix
index 40459dbca22..62440487e0f 100644
--- a/pkgs/development/libraries/libnixxml/default.nix
+++ b/pkgs/development/libraries/libnixxml/default.nix
@@ -11,17 +11,40 @@ stdenv.mkDerivation {
     sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ=";
   };
 
-  preConfigure = ''
-    ./bootstrap
+  postPatch = ''
+    # Remove broken test
+    substituteInPlace tests/draw/Makefile.am \
+      --replace "draw-wrong.sh" ""
+    rm tests/draw/draw-wrong.sh
+  '';
+
+  preAutoreconf = ''
+    # Copied from bootstrap script
+    ln -s README.md README
+    mkdir -p config
   '';
 
   configureFlags = [ "--with-gd" "--with-glib" ];
   CFLAGS = "-Wall";
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-  buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ];
+  strictDeps = true;
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    getopt
+    libxslt
+  ];
+  buildInputs = [
+    libxml2
+    gd.dev
+    glib
+    nix
+  ];
+  checkInputs = [
+    nix
+  ];
 
-  doCheck = false;
+  doCheck = true;
 
   meta = with lib; {
     description = "XML-based Nix-friendly data integration library";

From 3d770c1aa563923be9c1dabc5b11963c0cb3f528 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Tue, 4 May 2021 19:30:16 +0200
Subject: [PATCH 36/37] libnixxml: patch /bin/bash path

---
 pkgs/development/libraries/libnixxml/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix
index 62440487e0f..48edfbfce2c 100644
--- a/pkgs/development/libraries/libnixxml/default.nix
+++ b/pkgs/development/libraries/libnixxml/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
+{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}:
 
 stdenv.mkDerivation {
   pname = "libnixxml";
@@ -11,11 +11,15 @@ stdenv.mkDerivation {
     sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ=";
   };
 
-  postPatch = ''
+  prePatch = ''
     # Remove broken test
     substituteInPlace tests/draw/Makefile.am \
       --replace "draw-wrong.sh" ""
     rm tests/draw/draw-wrong.sh
+
+    # Fix bash path
+    substituteInPlace scripts/nixexpr2xml.in \
+      --replace "/bin/bash" "${bash}/bin/bash"
   '';
 
   preAutoreconf = ''
@@ -35,6 +39,7 @@ stdenv.mkDerivation {
     libxslt
   ];
   buildInputs = [
+    bash
     libxml2
     gd.dev
     glib

From 32c14664e8d00c5739b86aa3a534895c1c67d7ba Mon Sep 17 00:00:00 2001
From: David <dlesl@users.noreply.github.com>
Date: Tue, 11 May 2021 23:33:58 +0200
Subject: [PATCH 37/37] erlang-ls: init at 0.15.0

---
 pkgs/development/beam-modules/default.nix     |  2 +
 .../beam-modules/erlang-ls/default.nix        | 34 +++++++
 .../beam-modules/erlang-ls/rebar-deps.nix     | 90 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 127 insertions(+)
 create mode 100644 pkgs/development/beam-modules/erlang-ls/default.nix
 create mode 100644 pkgs/development/beam-modules/erlang-ls/rebar-deps.nix

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 19b5c122d9e..f63ecd95083 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -35,6 +35,8 @@ let
       fetchMixDeps = callPackage ./fetch-mix-deps.nix { };
       mixRelease = callPackage ./mix-release.nix { };
 
+      erlang-ls = callPackage ./erlang-ls { };
+
       # BEAM-based languages.
       elixir = elixir_1_11;
 
diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix
new file mode 100644
index 00000000000..3f2ae6e7e2f
--- /dev/null
+++ b/pkgs/development/beam-modules/erlang-ls/default.nix
@@ -0,0 +1,34 @@
+{ fetchFromGitHub, fetchHex, stdenv, rebar3WithPlugins, lib }:
+let
+  version = "0.15.0";
+  owner = "erlang-ls";
+  repo = "erlang_ls";
+  deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; };
+in stdenv.mkDerivation {
+  inherit version;
+  pname = "erlang-ls";
+  buildInputs = [ (rebar3WithPlugins { }) ];
+  src = fetchFromGitHub {
+    inherit owner repo;
+    sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg";
+    rev = version;
+  };
+  buildPhase = ''
+    mkdir _checkouts
+    ${toString (lib.mapAttrsToList (k: v: ''
+      cp -R ${v} _checkouts/${k}
+    '') deps)}
+    make
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp _build/default/bin/erlang_ls $out/bin/
+    cp _build/dap/bin/els_dap $out/bin/
+  '';
+  meta = with lib; {
+    homepage = "https://github.com/erlang-ls/erlang_ls";
+    description = "The Erlang Language Server";
+    platforms = platforms.unix;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
new file mode 100644
index 00000000000..9de79e52be6
--- /dev/null
+++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
@@ -0,0 +1,90 @@
+# Generated by rebar3_nix
+{ fetchHex, fetchFromGitHub }:
+{
+  getopt = fetchHex {
+    pkg = "getopt";
+    version = "1.0.1";
+    sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw=";
+  };
+  zipper = fetchHex {
+    pkg = "zipper";
+    version = "1.0.1";
+    sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0=";
+  };
+  quickrand = fetchHex {
+    pkg = "quickrand";
+    version = "2.0.1";
+    sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY=";
+  };
+  providers = fetchHex {
+    pkg = "providers";
+    version = "1.8.1";
+    sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
+  };
+  katana_code = fetchHex {
+    pkg = "katana_code";
+    version = "0.2.1";
+    sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI=";
+  };
+  bucs = fetchHex {
+    pkg = "bucs";
+    version = "1.0.16";
+    sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI=";
+  };
+  yamerl = fetchHex {
+    pkg = "yamerl";
+    version = "0.8.1";
+    sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8=";
+  };
+  uuid = fetchHex {
+    pkg = "uuid_erl";
+    version = "2.0.1";
+    sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs=";
+  };
+  tdiff = fetchHex {
+    pkg = "tdiff";
+    version = "0.1.2";
+    sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU=";
+  };
+  redbug = fetchHex {
+    pkg = "redbug";
+    version = "2.0.6";
+    sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ=";
+  };
+  rebar3_format = fetchHex {
+    pkg = "rebar3_format";
+    version = "0.8.2";
+    sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM=";
+  };
+  ranch = fetchHex {
+    pkg = "ranch";
+    version = "1.7.1";
+    sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c=";
+  };
+  jsx = fetchHex {
+    pkg = "jsx";
+    version = "3.0.0";
+    sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0=";
+  };
+  erlfmt = fetchFromGitHub {
+    owner = "whatsapp";
+    repo = "erlfmt";
+    rev = "2e93fc4a646111357642b0179a2a63151868d890";
+    sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr";
+  };
+  ephemeral = fetchHex {
+    pkg = "ephemeral";
+    version = "2.0.4";
+    sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA=";
+  };
+  elvis_core = fetchHex {
+    pkg = "elvis_core";
+    version = "1.1.1";
+    sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI=";
+  };
+  docsh = fetchHex {
+    pkg = "docsh";
+    version = "0.7.2";
+    sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ=";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb7290c3bec..84b5f41d31d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11880,6 +11880,7 @@ in
   erlang_nox = beam_nox.interpreters.erlang;
 
   inherit (beam.packages.erlang)
+    erlang-ls
     rebar rebar3 rebar3WithPlugins
     fetchHex beamPackages
     relxExe;