Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -10768,4 +10768,10 @@
     github = "felixscheinost";
     githubId = 31761492;
   };
+  benneti = {
+    name = "Benedikt Tissot";
+    email = "benedikt.tissot@googlemail.com";
+    github = "benneti";
+    githubId = 11725645;
+  };
 }

pkgs/applications/editors/emacs-modes/melpa-packages.nix

@@ -299,6 +299,14 @@ let
           buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
           nativeBuildInputs = [ pkgs.pkg-config ];
 
+          patches = [
+            (pkgs.fetchpatch {
+              name = "telega-server-bin-store-prefer.patch";
+              url = "https://github.com/zevlg/telega.el/commit/72550f984ca869309d197203ef7de99182d71729.patch";
+              sha256 = "18xvz53bygksak6h5f8cz79y83p2va15i8qz7n4s3g9gsklmkj2p";
+            })
+          ];
+
           postPatch = ''
             substituteInPlace telega-customize.el \
               --replace 'defcustom telega-server-command "telega-server"' \

pkgs/applications/misc/qpdfview/default.nix

@@ -14,11 +14,13 @@ let
   buildInputs = [
     qtbase qtsvg poppler djvulibre libspectre cups file ghostscript
   ];
+  # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104
+  patches = [ ./qpdfview-qt515-compat.patch ];
 in
 mkDerivation {
   pname = s.baseName;
   inherit (s) version;
-  inherit nativeBuildInputs buildInputs;
+  inherit nativeBuildInputs buildInputs patches;
   src = fetchurl {
     inherit (s) url sha256;
   };
@@ -40,7 +42,7 @@ mkDerivation {
   meta = {
     inherit (s) version;
     description = "A tabbed document viewer";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl2Plus;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.linux;
     homepage = "https://launchpad.net/qpdfview";

pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch

@@ -0,0 +1,17 @@
+Fix compatibility with Qt 5.15.
+
+Patch copied from upstream source repository:
+
+https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104
+
+--- a/sources/model.h	2017-04-19 21:01:25 +0000
++++ b/sources/model.h	2020-06-09 06:24:11 +0000
+@@ -24,6 +24,7 @@
+ #define DOCUMENTMODEL_H
+ 
+ #include <QList>
++#include <QPainterPath>
+ #include <QtPlugin>
+ #include <QWidget>
+ #include <QVector>
+

pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix

@@ -23,12 +23,12 @@ let
 
 in mkDerivation rec {
   pname = "telegram-desktop";
-  version = "2.6.0";
+  version = "2.6.1";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "18ifmvll0nnmjf8ba6r23ri9i4fggy7k2dqs3qf4f52cklmlfj06";
+    sha256 = "0wwb18wnh9sbfc6h7m8lj8qmc2n2p0zmp2977ddif6k2gi6qr1y7";
   };
 
   postPatch = ''

pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch

@@ -0,0 +1,29 @@
+diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py
+index 88a33b0349..b3321f0bec 100644
+--- a/src/sage/interfaces/singular.py
++++ b/src/sage/interfaces/singular.py
+@@ -495,24 +495,6 @@ class Singular(ExtraTabCompletion, Expect):
+         """
+         Send an interrupt to Singular. If needed, additional
+         semi-colons are sent until we get back at the prompt.
+-
+-        TESTS:
+-
+-        The following works without restarting Singular::
+-
+-            sage: a = singular(1)
+-            sage: _ = singular._expect.sendline('1+')  # unfinished input
+-            sage: try:
+-            ....:     alarm(0.5)
+-            ....:     singular._expect_expr('>')  # interrupt this
+-            ....: except KeyboardInterrupt:
+-            ....:     pass
+-            Control-C pressed.  Interrupting Singular. Please wait a few seconds...
+-
+-        We can still access a::
+-
+-            sage: 2*a
+-            2
+         """
+         # Work around for Singular bug
+         # http://www.singular.uni-kl.de:8002/trac/ticket/727

pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch

@@ -0,0 +1,16 @@
+diff --git a/src/sage/repl/rich_output/display_manager.py b/src/sage/repl/rich_output/display_manager.py
+index fb21f7a9c9..f39470777d 100644
+--- a/src/sage/repl/rich_output/display_manager.py
++++ b/src/sage/repl/rich_output/display_manager.py
+@@ -749,9 +749,9 @@ class DisplayManager(SageObject):
+             import sage.env
+             import re
+             import os
+-            with open(os.path.join(sage.env.THREEJS_DIR, 'build', 'three.min.js')) as f:
++            with open(os.path.join(sage.env.THREEJS_DIR, 'build', 'three.js')) as f:
+                 text = f.read().replace('\n','')
+-            version = re.search(r'REVISION="(\d+)"', text).group(1)
++            version = re.search(r"REVISION = '(\d+)'", text).group(1)
+             return """
+ <script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r{0}/build/three.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r{0}/examples/js/controls/OrbitControls.js"></script>

pkgs/applications/science/math/sage/sage-src.nix

@@ -71,6 +71,9 @@ stdenv.mkDerivation rec {
 
     # fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052
     ./patches/sagespawn-implicit-casting.patch
+
+    # disable pexpect interrupt test (see https://trac.sagemath.org/ticket/30945)
+    ./patches/disable-pexpect-intermittent-failure.patch
   ];
 
   # Patches needed because of package updates. We could just pin the versions of
@@ -106,6 +109,9 @@ stdenv.mkDerivation rec {
 
     # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985)
     ./patches/sympy-1.7-update.patch
+
+    # workaround until we use sage's fork of threejs, which contains a "version" file
+    ./patches/dont-grep-threejs-version-from-minified-js.patch
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

pkgs/development/compilers/fpc/lazarus.nix

@@ -9,7 +9,7 @@
 #  1. the build date is embedded in the binary through `$I %DATE%` - we should dump that
 
 let
-  version = "2.0.10-2";
+  version = "2.0.12";
 
   # as of 2.0.10 a suffix is being added. That may or may not disappear and then
   # come back, so just leave this here.
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz";
-    sha256 = "sha256-ZNViZGjdJKMzKyBfOr0KWBq33hsGCi1X4hhkBmz9Q7c=";
+    sha256 = "sha256-umzvf4I6LSgWYimYLvySYDnUIxPEDiL+DGd2wT0AFbI=";
   };
 
   postPatch = ''

pkgs/development/interpreters/clips/default.nix

@@ -1,17 +1,19 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  version = "6.30";
+  version = "6.31";
   pname = "clips";
   src = fetchurl {
-    url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z";
+    url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${
-    sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy";
+        builtins.replaceStrings [ "." ] [ "" ] version
+      }.tar.gz";
+    sha256 = "165k0z7dsv04q432sanmw0jxmxwf56cnhsdfw5ffjqxd3lzkjnv6";
   };
-  buildPhase = ''
+  makeFlags = [ "-C" "core" ];
-    make -C core -f ../makefiles/makefile.gcc
-  '';
   installPhase = ''
+    runHook preInstall
     install -D -t $out/bin core/clips
+    runHook postInstall
   '';
   meta = with lib; {
     description = "A Tool for Building Expert Systems";
@@ -23,7 +25,7 @@ stdenv.mkDerivation {
       easier to implement and maintain than an algorithmic solution.
     '';
     license = licenses.publicDomain;
-    maintainers = [maintainers.league];
+    maintainers = [ maintainers.league ];
     platforms = platforms.linux;
   };
 }

pkgs/development/libraries/libressl/default.nix

@@ -63,11 +63,6 @@ let
   };
 
 in {
-  libressl_3_0 = generic {
-    version = "3.0.2";
-    sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz";
-  };
-
   libressl_3_1 = generic {
     version = "3.1.4";
     sha256 = "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21";

pkgs/development/python-modules/google-auth/default.nix

@@ -12,6 +12,7 @@
 , pytest-localserver
 , responses
 , rsa
+, six
 }:
 
 buildPythonPackage rec {
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb";
   };
 
-  propagatedBuildInputs = [ pyasn1-modules cachetools rsa ];
+  propagatedBuildInputs = [ pyasn1-modules cachetools rsa six ];
 
   checkInputs = [
     flask

pkgs/development/python-modules/pytest-timeout/default.nix

@@ -22,6 +22,8 @@ buildPythonPackage rec {
 
   disabledTests = [
     "test_suppresses_timeout_when_pdb_is_entered"
+    # Remove until https://github.com/pytest-dev/pytest/pull/7207 or similar
+    "test_suppresses_timeout_when_debugger_is_entered"
   ];
   pytestFlagsArray = [
     "-ra"

pkgs/development/tools/sourcetrail/default.nix

@@ -1,15 +1,28 @@
-{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, cmake, wrapQtAppsHook
+{ lib, stdenv, fetchFromGitHub, callPackage, writeScript, fetchpatch, cmake
-, boost, qt5, llvmPackages, gcc, jdk, pythonPackages, desktop-file-utils
+, wrapQtAppsHook, qt5, boost, llvmPackages, gcc, jdk, maven, pythonPackages
-, shared-mime-info, imagemagick, which, coreutils, maven, fetchpatch }:
+, coreutils, which, desktop-file-utils, shared-mime-info, imagemagick, libicns
+}:
 
 let
   # TODO: remove when version incompatibility issue with python3Packages.jedi is
   # resolved
-  parso = pythonPackages.callPackage ./parso.nix {};
+  parso = pythonPackages.callPackage ./parso.nix { };
   jedi = pythonPackages.callPackage ./jedi.nix { inherit parso; };
 
-  pythonIndexer = pythonPackages.callPackage ./python.nix { inherit jedi parso; };
+  pythonIndexer =
-  javaIndexer = callPackage ./java.nix {};
+    pythonPackages.callPackage ./python.nix { inherit jedi parso; };
+  javaIndexer = callPackage ./java.nix { };
+
+  appPrefixDir = if stdenv.isDarwin then
+    "$out/Applications/Sourcetrail.app/Contents"
+  else
+    "$out/opt/sourcetrail";
+  appBinDir =
+    if stdenv.isDarwin then "${appPrefixDir}/MacOS" else "${appPrefixDir}/bin";
+  appResourceDir = if stdenv.isDarwin then
+    "${appPrefixDir}/Resources"
+  else
+    "${appPrefixDir}/share";
 
   # Upstream script:
   # https://github.com/CoatiSoftware/Sourcetrail/blob/master/script/update_java_indexer.sh
@@ -17,7 +30,7 @@ let
     #!${stdenv.shell}
 
     cd "$(dirname "$0")/.."
-    dst="$out/opt/sourcetrail/share/data/java/lib"
+    dst="${appResourceDir}/data/java/lib"
 
     mkdir -p "$dst"
     cp "${javaIndexer}/target/java-indexer-1.0.jar" "$dst/java-indexer.jar"
@@ -29,12 +42,12 @@ let
   installPythonIndexer = writeScript "download_python_indexer.sh" ''
     #!${stdenv.shell}
 
-    mkdir -p $out/opt/sourcetrail/share/data
+    mkdir -p ${appResourceDir}/data
-    ln -s "${pythonIndexer}/bin" "$out/opt/sourcetrail/share/data/python"
+    ln -s "${pythonIndexer}/bin" "${appResourceDir}/data/python"
   '';
-in
+in stdenv.mkDerivation rec {
-stdenv.mkDerivation rec {
   pname = "sourcetrail";
+  # NOTE: skip 2020.4.35 https://github.com/CoatiSoftware/Sourcetrail/pull/1136
   version = "2020.2.43";
 
   src = fetchFromGitHub {
@@ -45,7 +58,8 @@ stdenv.mkDerivation rec {
   };
 
   patches = let
-    url = commit: "https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch";
+    url = commit:
+      "https://github.com/CoatiSoftware/Sourcetrail/commit/${commit}.patch";
   in [
     ./disable-updates.patch
     ./disable-failing-tests.patch # FIXME: 5 test cases failing due to sandbox
@@ -69,21 +83,22 @@ stdenv.mkDerivation rec {
     desktop-file-utils
     imagemagick
     javaIndexer # the resulting jar file is copied by our install script
-  ] ++ lib.optionals doCheck testBinPath;
+  ] ++ lib.optional (stdenv.isDarwin) libicns
-  buildInputs = [
+    ++ lib.optionals doCheck testBinPath;
-    boost pythonIndexer shared-mime-info
+  buildInputs = [ boost pythonIndexer shared-mime-info ]
-  ] ++ (with qt5; [ qtbase qtsvg ])
+    ++ (with qt5; [ qtbase qtsvg ]) ++ (with llvmPackages; [ libclang llvm ]);
-    ++ (with llvmPackages; [ libclang llvm ]);
   binPath = [ gcc jdk.jre maven which ];
   testBinPath = binPath ++ [ coreutils ];
 
   cmakeFlags = [
     "-DBoost_USE_STATIC_LIBS=OFF"
     "-DBUILD_CXX_LANGUAGE_PACKAGE=ON"
-    "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
     "-DBUILD_JAVA_LANGUAGE_PACKAGE=ON"
     "-DBUILD_PYTHON_LANGUAGE_PACKAGE=ON"
-  ];
+  ] ++ lib.optional stdenv.isLinux
+    "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
+    ++ lib.optional stdenv.isDarwin
+    "-DClang_DIR=${llvmPackages.clang-unwrapped}";
 
   postPatch = let
     major = lib.versions.major version;
@@ -112,6 +127,8 @@ stdenv.mkDerivation rec {
     ln -sf ${installPythonIndexer} script/download_python_indexer.sh
   '';
 
+  # Directory layout for Linux:
+  #
   # Sourcetrail doesn't use the usual cmake install() commands and instead uses
   # its own bash script for packaging. Since we're not able to reuse the script,
   # we'll have to roll our own in nixpkgs.
@@ -141,7 +158,7 @@ stdenv.mkDerivation rec {
   #
   # nixpkgs
   # ├── bin/
-  # │   └── sourcetrail* (wrapper for opt/sourcetrail/bin/sourcetrail)
+  # │   └── sourcetrail@ (symlink to opt/sourcetrail/bin/sourcetrail)
   # └── opt/sourcetrail/
   #     ├── bin/
   #     │   └── sourcetrail*
@@ -151,35 +168,76 @@ stdenv.mkDerivation rec {
   # Upstream install script:
   # https://github.com/CoatiSoftware/Sourcetrail/blob/master/setup/Linux/createPackages.sh
   installPhase = ''
-    mkdir -p $out/opt/sourcetrail/bin
+    runHook preInstall
-    cp app/Sourcetrail $out/opt/sourcetrail/bin/sourcetrail
+
-    cp app/sourcetrail_indexer $out/opt/sourcetrail/bin/sourcetrail_indexer
+    mkdir -p ${appResourceDir}
+    cp -R ../bin/app/data ${appResourceDir}
+    cp -R ../bin/app/user/projects ${appResourceDir}/data/fallback
+    rm -r ${appResourceDir}/data/install ${appResourceDir}/data/*_template.xml
+
+    mkdir -p "${appBinDir}"
+    cp app/Sourcetrail ${appBinDir}/sourcetrail
+    cp app/sourcetrail_indexer ${appBinDir}/sourcetrail_indexer
+    wrapQtApp ${appBinDir}/sourcetrail \
+      --prefix PATH : ${lib.makeBinPath binPath}
+
+    mkdir -p $out/bin
+  '' + lib.optionalString (stdenv.isLinux) ''
+    ln -sf ${appBinDir}/sourcetrail $out/bin/sourcetrail
 
     desktop-file-install --dir=$out/share/applications \
-      --set-key Exec --set-value $out/bin/sourcetrail \
+      --set-key Exec --set-value ${appBinDir}/sourcetrail \
       ../setup/Linux/data/sourcetrail.desktop
 
     mkdir -p $out/share/mime/packages
     cp ../setup/Linux/data/sourcetrail-mime.xml $out/share/mime/packages/
 
-    mkdir -p $out/opt/sourcetrail/share
-    cp -R ../bin/app/data $out/opt/sourcetrail/share
-    cp -R ../bin/app/user/projects $out/opt/sourcetrail/share/data/fallback
-    rm $out/opt/sourcetrail/share/data/*_template.xml
-    rm -r $out/opt/sourcetrail/share/data/install
-
     for size in 48 64 128 256 512; do
       mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/
-      convert app/data/gui/icon/logo_1024_1024.png -resize ''${size}x''${size} \
+      convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \
+        -resize ''${size}x''${size} \
         $out/share/icons/hicolor/''${size}x''${size}/apps/sourcetrail.png
     done
+  '' + lib.optionalString (stdenv.isDarwin) ''
+    # change case (some people *might* choose a case sensitive Nix store)
+    mv ${appBinDir}/sourcetrail{,.tmp}
+    mv ${appBinDir}/{sourcetrail.tmp,Sourcetrail}
+    mv ${appBinDir}/sourcetrail_indexer ${appResourceDir}/Sourcetrail_indexer
 
-    mkdir -p $out/bin
+    ln -sf ${appBinDir}/Sourcetrail $out/bin/sourcetrail
-    makeQtWrapper $out/opt/sourcetrail/bin/sourcetrail $out/bin/sourcetrail \
+
-      --prefix PATH : ${lib.makeBinPath binPath}
+    cp app/bundle_info.plist ${appPrefixDir}/Info.plist
+
+    mkdir -p ${appResourceDir}/icon.iconset
+    for size in 16 32 128 256 512; do
+      convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \
+        -resize ''${size}x''${size} \
+        ${appResourceDir}/icon.iconset/icon_''${size}x''${size}.png
+      convert ${appResourceDir}/data/gui/icon/logo_1024_1024.png \
+        -resize $(( 2 * size ))x$(( 2 * size )) \
+        ${appResourceDir}/icon.iconset/icon_''${size}x''${size}@2x.png
+    done
+    png2icns ${appResourceDir}/icon.icns \
+      ${appResourceDir}/icon.iconset/icon_{16x16,32x32,128x128,256x256,512x512,512x512@2x}.png
+
+    mkdir -p ${appResourceDir}/project.iconset
+    for size in 16 32 64 128 256 512; do
+      convert ${appResourceDir}/data/gui/icon/project_256_256.png \
+        -resize ''${size}x''${size} \
+        ${appResourceDir}/project.iconset/icon_''${size}x''${size}.png
+      convert ${appResourceDir}/data/gui/icon/project_256_256.png \
+        -resize $(( 2 * size ))x$(( 2 * size )) \
+        ${appResourceDir}/project.iconset/icon_''${size}x''${size}@2x.png
+    done
+    png2icns ${appResourceDir}/project.icns \
+      ${appResourceDir}/project.iconset/icon_{16x16,32x32,128x128,256x256,512x512,512x512@2x}.png
+  '' + ''
+    runHook postInstall
   '';
 
   checkPhase = ''
+    runHook preCheck
+
     rm -rf ../bin/app/data/{python,java/lib}
     ln -s $out/opt/sourcetrail/share/data/python ../bin/app/data/python
     ln -s $out/opt/sourcetrail/share/data/java/lib ../bin/app/data/java/lib
@@ -194,20 +252,24 @@ stdenv.mkDerivation rec {
     popd
 
     rm ../bin/app/data/{python,java/lib}
+
+    runHook postCheck
   '';
 
   # This has to be done manually in the installPhase because the actual binary
   # lives in $out/opt/sourcetrail/bin, which isn't covered by wrapQtAppsHook
   dontWrapQtApps = true;
 
-  # FIXME: some test cases are disabled in the patch phase
+  # FIXME: Some test cases are disabled in the patch phase.
-  doCheck = true;
+  # FIXME: Tests are disabled on some platforms because of faulty detection
+  # logic for libjvm.so. Should work with manual configuration.
+  doCheck = !stdenv.isDarwin && stdenv.isx86_64;
 
   meta = with lib; {
     homepage = "https://www.sourcetrail.com";
     description = "A cross-platform source explorer for C/C++ and Java";
     platforms = platforms.all;
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ midchildan ];
   };
 }

pkgs/development/tools/sourcetrail/python.nix

@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
     make -j $NIX_BUILD_CORES
     popd
     popd
+  '' + lib.optionalString stdenv.isDarwin ''
+    pushd SourcetrailDB/build/bindings_python
+    cp _sourcetraildb.dylib _sourcetraildb.so
+    popd
   '';
 
   checkPhase = ''
@@ -52,7 +56,7 @@ stdenv.mkDerivation rec {
 
     pushd SourcetrailDB/build/bindings_python
     cp sourcetraildb.py $out/libexec
-    cp _sourcetraildb* $out/libexec/_sourcetraildb.so
+    cp _sourcetraildb.so $out/libexec/_sourcetraildb.so
     popd
 
     wrapPythonProgramsIn "$out/libexec" "$pythonPath"
@@ -64,7 +68,5 @@ stdenv.mkDerivation rec {
     description = "Python indexer for Sourcetrail";
     homepage = "https://github.com/CoatiSoftware/SourcetrailPythonIndexer";
     license = licenses.gpl3;
-    broken = stdenv.isDarwin;
-    # https://github.com/NixOS/nixpkgs/pull/107533#issuecomment-751063675
   };
 }

pkgs/development/tools/wasm-pack/default.nix

@@ -18,7 +18,11 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr";
   };
 
-  cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s";
+  cargoPatches = [
+    ./update-deps.patch
+  ];
+
+  cargoSha256 = "0br7r8wz3knzgl3gjpq6z8w33my0yiaq711s1wih9jizhia02y5r";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/servers/mpd/default.nix

@@ -114,13 +114,13 @@ let
 
     in stdenv.mkDerivation rec {
       pname = "mpd";
-      version = "0.22.5";
+      version = "0.22.6";
 
       src = fetchFromGitHub {
         owner  = "MusicPlayerDaemon";
         repo   = "MPD";
         rev    = "v${version}";
-        sha256 = "sha256-CKNw3K/z5UrTIp9ryWq7UaTz768AigaoCIcoJ4iW1j4=";
+        sha256 = "sha256-Xu+MxMxR5u++R3lZHe6UQ+mEmRnWbN6173ZX39KS1A8=";
       };
 
       buildInputs = [
@@ -149,8 +149,6 @@ let
 
       doCheck = true;
 
-      enableParallelBuilding = true;
-
       mesonAutoFeatures = "disabled";
 
       outputs = [ "out" "doc" ]
@@ -173,7 +171,7 @@ let
       meta = with lib; {
         description = "A flexible, powerful daemon for playing music";
         homepage    = "https://www.musicpd.org/";
-        license     = licenses.gpl2;
+        license     = licenses.gpl2Only;
         maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ];
         platforms   = platforms.unix;
 

pkgs/servers/nats-streaming-server/default.nix

@@ -4,14 +4,14 @@ with lib;
 
 buildGoPackage rec {
   pname   = "nats-streaming-server";
-  version = "0.19.0";
+  version = "0.20.0";
   goPackagePath = "github.com/nats-io/${pname}";
 
   src = fetchFromGitHub {
     rev    = "v${version}";
     owner  = "nats-io";
     repo   = pname;
-    sha256 = "1wa2xby7v45f9idnhbkglknipm24wqx7mxmkyqz3amq17j4xfy7c";
+    sha256 = "sha256-vhUj3CVBM5jbwEtnzdgQD3eLguiHQguK01O69JZIUUk=";
   };
 
   meta = {

pkgs/servers/plex/raw.nix

@@ -12,16 +12,16 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.21.4.4054-bab510e86";
+  version = "1.21.4.4079-1b7748a7b";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-    sha256 = "1vxh9yihwxv610q10sak3n8jrq7il6ryhqi6j10nmm7mxn1nkqcx";
+    sha256 = "0843sdl9c6382vjj3ykvcl6rizs2jnb4jqx19ah3phbcvsnjlhdb";
   } else fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-    sha256 = "0dxch4m3ywndrwys2rfvh34p6nsx0w2f6k7xvs7hi20biz6bd344";
+    sha256 = "02v4jf6jajm5gvsilllln1vvnxx30gi2b8ljsby5d3xhhca6kmqx";
   };
 
   outputs = [ "out" "basedb" ];

pkgs/tools/filesystems/e2tools/default.nix

@@ -1,21 +1,23 @@
-{ lib, stdenv, fetchurl, pkg-config, e2fsprogs }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, e2fsprogs }:
 
 stdenv.mkDerivation rec {
   pname = "e2tools";
-  version = "0.0.16";
+  version = "0.1.0";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "http://home.earthlink.net/~k_sheff/sw/${pname}/${pname}-${version}.tar.gz";
+    owner = "e2tools";
-    sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f";
+    repo = "e2tools";
+    rev = "6ee7c2d9015dce7b90c3388096602e307e3bd790";
+    sha256 = "0nlqynrhj6ww7bnfhhfcx6bawii8iyvhgp6vz60zbnpgd68ifcx7";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ e2fsprogs ];
 
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://home.earthlink.net/~k_sheff/sw/e2tools/";
+    homepage = "https://e2tools.github.io/";
     description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;

pkgs/tools/security/gopass/git-credential.nix

@@ -0,0 +1,42 @@
+{ lib
+, makeWrapper
+, buildGoModule
+, fetchFromGitHub
+, gopass
+}:
+
+buildGoModule rec {
+  pname = "git-credential-gopass";
+  version = "1.12.0";
+
+  src = fetchFromGitHub {
+    owner = "gopasspw";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-IvYxpUMclDAKJ/EkRbNrX8eIFyhtY9Q0B0RipweieZA=";
+  };
+
+  vendorSha256 = "sha256-N6eU6KsnUrYBK90ydwUH8LNkR9KRjgc4ciGOGvy7pw8=";
+
+  subPackages = [ "." ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  preBuild = ''
+    buildFlagsArray+=(
+      "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}"
+    )
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/git-credential-gopass --prefix PATH : "${lib.makeBinPath [ gopass ]}"
+  '';
+
+  meta = with lib; {
+    description = "Manage git credentials using gopass";
+    homepage = "https://github.com/gopasspw/git-credential-gopass";
+    license = licenses.mit;
+    maintainers = with maintainers; [ benneti ];
+    platforms = platforms.unix;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -1416,6 +1416,8 @@ in
 
   gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { };
 
+  git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
+
   gospider = callPackage ../tools/security/gospider { };
 
   browserpass = callPackage ../tools/security/browserpass { };
@@ -16252,7 +16254,6 @@ in
   openvdb = callPackage ../development/libraries/openvdb {};
 
   inherit (callPackages ../development/libraries/libressl { })
-    libressl_3_0
     libressl_3_1;
 
   # Please keep this pointed to the latest version. See also
@@ -25143,10 +25144,13 @@ in
 
   libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {});
 
-  sourcetrail = libsForQt5.callPackage ../development/tools/sourcetrail {
+  sourcetrail = let
-    jdk = jdk8;
     llvmPackages = llvmPackages_10;
+  in libsForQt5.callPackage ../development/tools/sourcetrail {
+    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
+    jdk = jdk8;
     pythonPackages = python3Packages;
+    inherit llvmPackages;
   };
 
   spotifywm = callPackage ../applications/audio/spotifywm { };
@@ -25616,7 +25620,7 @@ in
 
   vimv = callPackage ../tools/misc/vimv/default.nix { };
 
-  qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {};
+  qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
 
   qtile = callPackage ../applications/window-managers/qtile {
     inherit (xorg) libxcb;
@@ -29672,9 +29676,6 @@ in
   wasmer = callPackage ../development/interpreters/wasmer { };
 
   wasm-pack = callPackage ../development/tools/wasm-pack {
-    # Wasm-pack depends on a version of rust-openssl which is incompatible with
-    # LibreSSL 3.1, so we explicitly opt for the older version.
-    libressl = libressl_3_0;
     inherit (darwin.apple_sdk.frameworks) Security;
   };