Merge master into staging-next

pkgs/applications/graphics/pineapple-pictures/default.nix

@@ -0,0 +1,40 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, qtsvg
+, qttools
+, exiv2
+, wrapQtAppsHook
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pineapple-pictures";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "BLumia";
+    repo = "pineapple-pictures";
+    rev = version;
+    sha256 = "sha256-KTYwe6fS/rUHBbC2B9OdK95mFm3zvgDdGODkg7VQ27M=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    qttools
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qtsvg
+    exiv2.lib
+  ];
+
+  meta = with lib; {
+    description = "Homebrew lightweight image viewer";
+    homepage = "https://github.com/BLumia/pineapple-pictures";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ rewine ];
+  };
+}

pkgs/applications/misc/xmr-stak/default.nix

@@ -1,16 +1,11 @@
 { stdenv, stdenvGcc6, lib
 , fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl
-, opencl-headers, ocl-icd, hwloc, cudatoolkit
+, opencl-headers, ocl-icd, hwloc
 , devDonationLevel ? "0.0"
-, cudaSupport ? false
 , openclSupport ? true
 }:
 
-let
+stdenv.mkDerivation rec {
-  stdenv' = if cudaSupport then stdenvGcc6 else stdenv;
-in
-
-stdenv'.mkDerivation rec {
   pname = "xmr-stak";
   version = "2.10.8";
 
@@ -23,12 +18,11 @@ stdenv'.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-O3";
 
-  cmakeFlags = lib.optional (!cudaSupport) "-DCUDA_ENABLE=OFF"
+  cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
     ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ]
-    ++ lib.optional cudaSupport cudatoolkit
     ++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
 
   postPatch = ''

pkgs/applications/virtualization/qemu/utils.nix

@@ -1,4 +1,4 @@
-{ stdenv, installShellFiles, qemu }:
+{ stdenv, installShellFiles, qemu, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
   pname = "qemu-utils";
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ qemu ];
+  disallowedRequisites = [ qemu ];
   unpackPhase = "true";
 
   installPhase = ''
@@ -13,6 +14,7 @@ stdenv.mkDerivation rec {
     cp "${qemu}/bin/qemu-img" "$out/bin/qemu-img"
     cp "${qemu}/bin/qemu-io"  "$out/bin/qemu-io"
     cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd"
+    ${removeReferencesTo}/bin/remove-references-to -t ${qemu} $out/bin/*
 
     installManPage ${qemu}/share/man/man1/qemu-img.1.gz
     installManPage ${qemu}/share/man/man8/qemu-nbd.8.gz

pkgs/development/libraries/phonon/backends/gstreamer.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkg-config
+{ stdenv, lib, fetchurl, fetchpatch, cmake, gst_all_1, phonon, pkg-config
 , extra-cmake-modules, qttools, qtbase, qtx11extras
 , debug ? false
 }:
@@ -22,9 +22,17 @@ stdenv.mkDerivation rec {
     sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5";
   };
 
-  # Hardcode paths to useful plugins so the backend doesn't depend
+  patches = [
-  # on system paths being set.
+    # Hardcode paths to useful plugins so the backend doesn't depend
-  patches = [ ./gst-plugin-paths.patch ];
+    # on system paths being set.
+    ./gst-plugin-paths.patch
+
+    # Work around https://bugs.kde.org/show_bug.cgi?id=445196 until a new release.
+    (fetchpatch {
+      url = "https://invent.kde.org/libraries/phonon-gstreamer/-/commit/bbbb160f30a394655cff9398d17961142388b0f2.patch";
+      sha256 = "sha256-tNBqVt67LNb9SQogS9ol8/xYIZvVSoVUgXQahMfkFh8=";
+    })
+  ];
 
   dontWrapQtApps = true;
 

pkgs/development/libraries/vxl/default.nix

@@ -1,30 +1,18 @@
 { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "vxl";
-  version = "1.17.0-nix1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "vxl";
     repo = "vxl";
-    rev = "777c0beb7c8b30117400f6fc9a6d63bf8cb7c67a";
+    rev = "v${version}";
-    sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8";
+    sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr";
   };
 
   nativeBuildInputs = [ cmake unzip ];
   buildInputs = [ libtiff expat zlib libpng libjpeg ];
 
-  cmakeFlags = [
-    # BUILD_OUL wants old linux headers for videodev.h, not available
-    # in stdenv linux headers
-    "-DBUILD_OUL=OFF"
-    # BUILD_BRL fails to find open()
-    "-DBUILD_BRL=OFF"
-    "-DBUILD_CONTRIB=OFF"
-  ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
-    "-DCMAKE_CXX_FLAGS=-fPIC"
-    "-DCMAKE_C_FLAGS=-fPIC"
-  ];
-
   meta = {
     description = "C++ Libraries for Computer Vision Research and Implementation";
     homepage = "http://vxl.sourceforge.net/";

pkgs/development/python-modules/jarowinkler/default.nix

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "jarowinkler";
-  version = "1.0.5";
+  version = "1.1.0";
 
   disabled = pythonOlder "3.6";
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "JaroWinkler";
     rev = "v${version}";
-    hash = "sha256-5LWJeNfQ0d8wiqjIha+CCcmBf+GU36VTYFqRlg4+6qA=";
+    hash = "sha256-ilkslDrTOaq6mgg+nYMMqxrjvZHXMIcipu25wvV3+Mk=";
   };
 
   nativeBuildInputs = [
@@ -41,6 +41,10 @@ buildPythonPackage rec {
     jarowinkler-cpp
   ];
 
+  preBuild = ''
+    export JAROWINKLER_BUILD_EXTENSION=1
+  '';
+
   dontUseCmakeConfigure = true;
 
   checkInputs = [
@@ -48,11 +52,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = ''
-    # import from $out
-    rm -r jarowinkler
-  '';
-
   pythonImportsCheck = [ "jarowinkler" ];
 
   meta = with lib; {

pkgs/development/python-modules/levenshtein/default.nix

@@ -6,12 +6,13 @@
 , cython
 , pytestCheckHook
 , rapidfuzz
+, rapidfuzz-cpp
 , scikit-build
 }:
 
 buildPythonPackage rec {
   pname = "levenshtein";
-  version = "0.18.1";
+  version = "0.18.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -20,9 +21,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "Levenshtein";
     rev = "v${version}";
-    # https://github.com/maxbachmann/Levenshtein/issues/22
+    hash = "sha256-FmEB0i235rzK6S1MV189iDNB+CYpcBvcdVE+kdclwmE=";
-    fetchSubmodules = true;
-    sha256 = "sha256-WREYdD5MFOpCzH4BSceRpzQZdpi3Xxxn0DpMvDsNlGo=";
   };
 
   nativeBuildInputs = [
@@ -33,6 +32,10 @@ buildPythonPackage rec {
 
   dontUseCmakeConfigure = true;
 
+  buildInputs = [
+    rapidfuzz-cpp
+  ];
+
   propagatedBuildInputs = [
     rapidfuzz
   ];

pkgs/development/python-modules/rapidfuzz/default.nix

@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "rapidfuzz";
-  version = "2.1.0";
+  version = "2.1.2";
 
   disabled = pythonOlder "3.6";
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "RapidFuzz";
     rev = "v${version}";
-    hash = "sha256-bvuT31qxYj/agEtPIJf/6YAOe6CGpEmaKpfNocw4wYQ=";
+    hash = "sha256-7BP22Fon+7a3ZxTCS838uoLXABYdEexMEH2vZ0/KoRQ=";
   };
 
   nativeBuildInputs = [
@@ -50,6 +50,10 @@ buildPythonPackage rec {
     taskflow
   ];
 
+  preBuild = ''
+    export RAPIDFUZZ_BUILD_EXTENSION=1
+  '';
+
   propagatedBuildInputs = [
     jarowinkler
     numpy
@@ -61,11 +65,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = ''
-    # import from $out
-    rm -r rapidfuzz
-  '';
-
   pythonImportsCheck = [
     "rapidfuzz.fuzz"
     "rapidfuzz.string_metric"

pkgs/development/python-modules/skodaconnect/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "skodaconnect";
-  version = "1.1.20";
+  version = "1.1.21";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "lendy007";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-VFbU4KbF/Z8/EiRYZIBXSIfByY5nc84y6YBSOuknqyg=";
+    hash = "sha256-4VM1bOiSkmzlDegtIRUh1O9FG2DPyK77MIQgQcGQ+ZM=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/tools/frece/default.nix

@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "frece";
+  version = "1.0.6";
+
+  src = fetchFromGitHub {
+    owner = "YodaEmbedding";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w=";
+  };
+
+  cargoSha256 = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU=";
+
+  meta = with lib; {
+    description = "Maintain a database sorted by frecency (frequency + recency)";
+    homepage = "https://github.com/YodaEmbedding/frece";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ WeebSorceress ];
+  };
+}

pkgs/os-specific/linux/libtraceevent/default.nix

@@ -1,18 +1,19 @@
-{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
+{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, coreutils }:
 
 stdenv.mkDerivation rec {
   pname = "libtraceevent";
-  version = "1.5.1";
+  version = "1.6.1";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
     rev = "libtraceevent-${version}";
-    sha256 = "sha256-g4dB8QhCG6SgZVAU3TCtb70vYYh1KN7FrcldzTGAUnI=";
+    sha256 = "sha256-Yt7W+ouEZ/pJEKyY2Cgh+mYG0qz0lOIou5JufAD9Zd0=";
   };
 
   # Don't build and install html documentation
   postPatch = ''
     sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile
+    substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd
   '';
 
   outputs = [ "out" "dev" "devman" ];

pkgs/os-specific/linux/libtracefs/default.nix

@@ -15,12 +15,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libtracefs";
-  version = "1.3.0";
+  version = "1.4.1";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git";
     rev = "libtracefs-${version}";
-    sha256 = "sha256-Kg1mPjTZ2UCeco18Fa8GqmLo2R35XvUE/q2J1HAmtEc=";
+    sha256 = "sha256-htif1Hty/AQkx6jALHUVMBF1wIpVwLmdINP8QUZmv/s=";
   };
 
   postPatch = ''

pkgs/os-specific/linux/trace-cmd/default.nix

@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, libxslt, libtraceevent, libtracefs }:
+{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }:
 stdenv.mkDerivation rec {
   pname = "trace-cmd";
-  version = "2.9.7";
+  version = "3.1.1";
 
   src = fetchgit {
     url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
     rev    = "trace-cmd-v${version}";
-    sha256 = "sha256-04qsTlOVYh/jHVWxaGuqYj4DkUpcEYcpfUqnqhphIMg=";
+    sha256 = "sha256-zYw6DObwmroAU3ikUNo9XrwQeDlyLppe7E63WFjn44Q=";
   };
 
   # Don't build and install html documentation
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
        Documentation{,/trace-cmd,/libtracecmd}/Makefile
   '';
 
-  nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto ];
+  nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto docbook_xsl docbook_xml_dtd_45 sourceHighlight ];
 
-  buildInputs = [ libtraceevent libtracefs ];
+  buildInputs = [ libtraceevent libtracefs zstd ];
 
   outputs = [ "out" "lib" "dev" "man" ];
 
@@ -27,19 +27,28 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   makeFlags = [
-    "all" "libs" "doc"
     # The following values appear in the generated .pc file
     "prefix=${placeholder "lib"}"
-    "libdir=${placeholder "lib"}/lib"
-    "includedir=${placeholder "dev"}/include"
   ];
 
-  installTargets = [ "install_cmd" "install_libs" "install_doc" ];
+  # We do not mention targets (like "doc") explicitly in makeFlags
+  # because the Makefile would not print warnings about too old
+  # libraries (see "warning:" in the Makefile)
+  postBuild = ''
+    make libs doc -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
+  '';
+
+  installTargets = [
+    "install_cmd"
+    "install_libs"
+    "install_doc"
+  ];
   installFlags = [
+    "LDCONFIG=false"
     "bindir=${placeholder "out"}/bin"
-    "man_dir=${placeholder "man"}/share/man"
+    "mandir=${placeholder "man"}/share/man"
     "libdir=${placeholder "lib"}/lib"
-    "pkgconfig_dir=${placeholder "lib"}/lib/pkgconfig"
+    "pkgconfig_dir=${placeholder "dev"}/lib/pkgconfig"
     "includedir=${placeholder "dev"}/include"
     "BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions"
   ];

pkgs/tools/networking/networkmanager/dmenu/default.nix

@@ -4,13 +4,13 @@
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
   pname = "networkmanager_dmenu";
-  version = "1.6.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
-    rev = version;
+    rev = "v${version}";
-    sha256 = "1liidqh8c33pxyb07qyj0jkd0fdak73g9r2iwiq62vfzrpik09k0";
+    sha256 = "sha256-btwiKxmb1xDtPSTOIvpHJDQ5SY1gnBWlKnYOzzSLDEY=";
   };
 
   buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ];
@@ -18,8 +18,11 @@ in stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $out/share/applications $out/share/doc/$pname
     cp networkmanager_dmenu $out/bin/
+    cp networkmanager_dmenu.desktop $out/share/applications
+    cp README.md $out/share/doc/$pname/
+    cp config.ini.example $out/share/doc/$pname/
   '';
 
   postFixup = ''

pkgs/tools/security/crlfsuite/default.nix

@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "crlfsuite";
-  version = "2.0";
+  version = "2.1.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Nefcore";
     repo = "CRLFsuite";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "sha256-V/EaOtGDPJQAMu9akOtZN5LKLFd3EQkjn79q7ubV0Mc=";
+    sha256 = "sha256-wWXqeQ6rq4yMG1V9f9JGE91Se8VuU8gpahmYyNTtkmo=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

pkgs/top-level/all-packages.nix

@@ -420,6 +420,8 @@ with pkgs;
 
   firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
 
+  frece = callPackage ../development/tools/frece { };
+
   frugal = callPackage ../development/tools/frugal { };
 
   glade = callPackage ../development/tools/glade { };
@@ -21404,10 +21406,7 @@ with pkgs;
   vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
   vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
 
-  vxl = callPackage ../development/libraries/vxl {
+  vxl = callPackage ../development/libraries/vxl { };
-    libpng = libpng12;
-    stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
-  };
 
   waffle = callPackage ../development/libraries/waffle { };
 
@@ -28562,9 +28561,7 @@ with pkgs;
 
   mod-distortion = callPackage ../applications/audio/mod-distortion { };
 
-  xmr-stak = callPackage ../applications/misc/xmr-stak {
+  xmr-stak = callPackage ../applications/misc/xmr-stak { };
-    stdenvGcc6 = gcc6Stdenv;
-  };
 
   xmrig = callPackage ../applications/misc/xmrig { };
 
@@ -29435,6 +29432,8 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  pineapple-pictures = libsForQt5.callPackage ../applications/graphics/pineapple-pictures { };
+
   pinfo = callPackage ../applications/misc/pinfo { };
 
   pinpoint = callPackage ../applications/office/pinpoint { };
@@ -32355,7 +32354,7 @@ with pkgs;
 
   manaplus = callPackage ../games/manaplus { };
 
-  mars = callPackage ../games/mars { stdenv = gcc10StdenvCompat; };
+  mars = callPackage ../games/mars { };
 
   megaglest = callPackage ../games/megaglest { };