Merge staging-next into staging

2022-11-03 12:02:11 +00:00 · 2022-11-03 12:02:11 +00:00 · 80d6cd3d58
commit 80d6cd3d58
parent 1c0ceeaf2e e0a1f2a2ef
25 changed files with 113 additions and 107 deletions
--- a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
@ -2,6 +2,8 @@
 , trivialBuild
 , fetchFromGitHub
 , emacs
+, evil
+, markdown-mode
 }:

 trivialBuild rec {
@ -15,11 +17,9 @@ trivialBuild rec {
    hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=";
  };

-  buildInputs = [
-    emacs
-  ] ++ propagatedUserEnvPkgs;
+  buildInputs = propagatedUserEnvPkgs;

-  propagatedUserEnvPkgs = with emacs.pkgs; [
+  propagatedUserEnvPkgs = [
    evil
    markdown-mode
  ];
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@ -34,13 +34,13 @@

 stdenv.mkDerivation rec {
  pname = "waybar";
-  version = "0.9.14";
+  version = "0.9.15";

  src = fetchFromGitHub {
    owner = "Alexays";
    repo = "Waybar";
    rev = version;
-    sha256 = "sha256-1tnFBUB7/MjnrCkfKOR2SZ/GB5Ik115zsnwjkNMB05E=";
+    sha256 = "sha256-u2nEMS0lJ/Kf09+mWYWQLji9MVgjYAfUi5bmPEfTfFc=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/gmailctl/default.nix
+++ b/pkgs/applications/networking/gmailctl/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "gmailctl";
-  version = "0.10.5";
+  version = "0.10.6";

  src = fetchFromGitHub {
    owner = "mbrt";
    repo = "gmailctl";
    rev = "v${version}";
-    sha256 = "sha256-H1Nuu/T55e5zWUmofKoyVSA4TaJBdK+JeZtw+G/sC54=";
+    sha256 = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0=";
  };

-  vendorSha256 = "sha256-ivkTtcvoH+i58iQM9T0xio0YUeMhNzDcmrCSuGFljEI=";
+  vendorSha256 = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/development/compilers/hip/default.nix
+++ b/pkgs/development/compilers/hip/default.nix
@ -154,6 +154,11 @@ stdenv.mkDerivation rec {
    "-DHIP_COMMON_DIR=${hip}"
    "-DROCCLR_PATH=${rocclr}"
    "-DHIP_VERSION_BUILD_ID=0"
+    # Temporarily set variables to work around upstream CMakeLists issue
+    # Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed
+    "-DCMAKE_INSTALL_BINDIR=bin"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
  ];

  postInstall = ''
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "cpp-utilities";
-  version = "5.19.0";
+  version = "5.20.0";

  src = fetchFromGitHub {
    owner = "Martchus";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-sygt30x5S2n24ONMBRzNyLZcnl4hM4tUFpX/Yx6ZSMM=";
+    sha256 = "sha256-KOvRNo8qd8nXhh/f3uAN7jOsNMTX8dJRGUHJXP+FdEs=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/science/math/cutensor/generic.nix
+++ b/pkgs/development/libraries/science/math/cutensor/generic.nix
@ -13,6 +13,7 @@
 let
  mostOfVersion = builtins.concatStringsSep "."
    (lib.take 3 (lib.versions.splitVersion version));
+  platform = "${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}";
 in

 stdenv.mkDerivation {
@ -20,7 +21,9 @@ stdenv.mkDerivation {
  inherit version;

  src = fetchurl {
-    url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz";
+    url = if lib.versionOlder mostOfVersion "1.3.3"
+      then "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${platform}-${version}.tar.gz"
+      else "https://developer.download.nvidia.com/compute/cutensor/redist/libcutensor/${platform}/libcutensor-${platform}-${version}-archive.tar.xz";
    inherit hash;
  };

--- a/pkgs/development/python-modules/adax-local/default.nix
+++ b/pkgs/development/python-modules/adax-local/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "adax-local";
-  version = "0.1.4";
+  version = "0.1.5";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@ -17,8 +17,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "Danielhiversen";
    repo = "pyAdaxLocal";
-    rev = version;
-    hash = "sha256-pzhaBRCn02asT0ZLt1EmnaX2g5wr/CoiItWJ/ZYe0Ok=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-V3jSBdYDo32oTAGNTvHJi+GSwlL3keSDhXpNpMoCkWs=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
+++ b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "aliyun-python-sdk-config";
-  version = "2.2.0";
+  version = "2.2.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-FQNj11G2d985KkpVycJyUqugul/EXu4PpuvD/YGPkBc=";
+    hash = "sha256-Me5z68cOfLt8PDHaZ1b/F/KG5mtYAW3LXmNd+0epha8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@ -12,6 +12,7 @@
 , pytest-timeout
 , pytest-xdist
 , pytestCheckHook
+, pythonOlder
 , python-daemon
 , pyyaml
 , six
@ -19,12 +20,14 @@

 buildPythonPackage rec {
  pname = "ansible-runner";
-  version = "2.2.1";
+  version = "2.3.0";
  format = "setuptools";

+  disabled = pythonOlder "3.7";
+
  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-zZtssRdAEbTi4KWZPU0E2SjN5f4iqJk67UQ4STOHwYI=";
+    hash = "sha256-mcTfu+reRGOXvRqeC/BQhz2KBrWSbVXSQIWyld2/Ecs=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@ -9,12 +9,12 @@ let
  inherit (cudaPackages) cudatoolkit cudnn cutensor nccl;
 in buildPythonPackage rec {
  pname = "cupy";
-  version = "11.1.0";
+  version = "11.2.0";
  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-4TtvmQrd172HCQWvQp+tUQhNCFf4YA3TIGod9aRoTt0=";
+    sha256 = "sha256-wzNh8RejR6Y/aZbql0RtF/HAOPGh9TPlAkZCNQdpI+I=";
  };

  # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both
@ -70,8 +70,5 @@ in buildPythonPackage rec {
    license = licenses.mit;
    platforms = [ "x86_64-linux" ];
    maintainers = with maintainers; [ hyphon81 ];
-
-    # See https://github.com/NixOS/nixpkgs/pull/179912#issuecomment-1206265922.
-    broken = true;
  };
 }
--- a/pkgs/development/python-modules/flipr-api/default.nix
+++ b/pkgs/development/python-modules/flipr-api/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "flipr-api";
-  version = "1.4.3";
+  version = "1.4.4";
  format = "pyproject";

  disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "cnico";
    repo = pname;
    rev = version;
-    sha256 = "sha256-aTDZB1kUlvvxoio7EAl2KPHW/JkCcuIEPD4T4NN6FX8=";
+    sha256 = "sha256-LcxLJQ2MAif4yC+/SvO7IEa1lNOV67FgJU1UWT4ope4=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "hahomematic";
-  version = "2022.10.10";
+  version = "2022.11.0";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "danielperna84";
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-msSAZAKJFN4bjnJABuAI+rZ5HJSzKFkq4LV2jat6Tas=";
+    sha256 = "sha256-fEsH5yaGI/y8Qg9WnKm8uCrwEbSwhKlF6kixS3iPVXg=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/prayer-times-calculator/default.nix
+++ b/pkgs/development/python-modules/prayer-times-calculator/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "prayer-times-calculator";
-  version = "0.0.6";
+  version = "0.0.7";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "uchagani";
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-0hXbgzEKrWk79Ldd37fqnkOELa+dAGtc80RQfDZ1JTI=";
+    sha256 = "sha256-fIfv10oi5Lv1dj5Y5CYI94/UdWG3bAY/ENCiMTkO0RE=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pydyf/default.nix
+++ b/pkgs/development/python-modules/pydyf/default.nix
@ -1,49 +1,47 @@
 { lib
 , buildPythonPackage
-, fetchpatch
 , fetchPypi
-, isPy3k
-, pytestCheckHook
-, coverage
+, flit-core
 , ghostscript
 , pillow
+, pytestCheckHook
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "pydyf";
-  version = "0.1.2";
-  disabled = !isPy3k;
+  version = "0.5.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit version;
-    pname = "pydyf";
-    sha256 = "sha256-Hi9d5IF09QXeAlp9HnzwG73ZQiyoq5RReCvwDuF4YCw=";
+    inherit pname version;
+    hash = "sha256-UedRrhUEA3wfwfSBURkTewEYAs1fbDU52wZsRVsUp+E=";
  };

-  patches = [
-    # Fix tests for Ghostscript 9.56
-    # Remove after v0.1.3 has been released
-    (fetchpatch {
-      url = "https://github.com/CourtBouillon/pydyf/commit/d4c34823f1d15368753c9c26f7acc7a24fc2d979.patch";
-      sha256 = "sha256-2hHZW/q5CbStbpSJYbm3b23qKXANEb5jbPGQ83uHC+Q=";
-    })
-  ];
-
  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace "--isort --flake8 --cov --no-cov-on-fail" ""
  '';

+  nativeBuildInputs = [
+    flit-core
+  ];
+
  checkInputs = [
-    pytestCheckHook
-    coverage
    ghostscript
    pillow
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pydyf"
  ];

  meta = with lib; {
-    homepage = "https://doc.courtbouillon.org/pydyf/stable/";
    description = "Low-level PDF generator written in Python and based on PDF specification 1.7";
+    homepage = "https://doc.courtbouillon.org/pydyf/stable/";
    license = licenses.bsd3;
    maintainers = with maintainers; [ rprecenth ];
  };
--- a/pkgs/development/python-modules/pysolcast/default.nix
+++ b/pkgs/development/python-modules/pysolcast/default.nix
@ -12,16 +12,16 @@

 buildPythonPackage rec {
  pname = "pysolcast";
-  version = "1.0.7";
+  version = "1.0.11";
  format = "setuptools";

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";

  src = fetchFromGitHub {
    owner = "mcaulifn";
    repo = "solcast";
    rev = "v${version}";
-    sha256 = "J4D7W89Qz1Nv4DeqOmHVAWfmThlY5puBjSClRkfwhVw=";
+    hash = "sha256-iK3WCpl7K/PUccNkOQK7q4k7JjwHAEydU47c8tb4wvc=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -53,9 +53,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python library for interacting with the Solcast API";
    homepage = "https://github.com/mcaulifn/solcast";
-    # No license statement present
-    # https://github.com/mcaulifn/solcast/issues/70
-    license = with licenses; [ unfree ];
+    license = with licenses; [ asl20 ];
    maintainers = with maintainers; [ fab ];
  };
 }
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "rns";
-  version = "0.3.17";
+  version = "0.3.18";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "markqvist";
    repo = "Reticulum";
    rev = "refs/tags/${version}";
-    hash = "sha256-2e1mUDIDxgjGY4PGfgtbGwkktQfH1LsAczXKVW4jCLA=";
+    hash = "sha256-UKhANqd1QKc1qrN5pjw8GYDJy2UNSKwWJcBYjxMKSKg=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@ -1,39 +1,38 @@
-{ buildPythonPackage
-, fetchPypi
-, fetchpatch
-, pytestCheckHook
+{ lib
+, stdenv
+, buildPythonPackage
 , cairosvg
-, flit-core
-, fonttools
-, pydyf
-, pyphen
 , cffi
 , cssselect2
-, html5lib
-, tinycss2
+, fetchPypi
+, flit-core
+, fontconfig
+, fonttools
+, ghostscript
 , glib
 , harfbuzz
+, html5lib
 , pango
-, fontconfig
-, lib
-, stdenv
-, ghostscript
-, isPy3k
-, substituteAll
 , pillow
+, pydyf
+, pyphen
+, pytestCheckHook
+, pythonOlder
+, substituteAll
+, tinycss2
 }:

 buildPythonPackage rec {
  pname = "weasyprint";
-  version = "54.3";
-  disabled = !isPy3k;
-
+  version = "57.0";
  format = "pyproject";

+  disabled = pythonOlder "3.7";
+
  src = fetchPypi {
    inherit version;
    pname = "weasyprint";
-    sha256 = "sha256-4E2gQGMFZsRMqiAgM/B/hYdl9TZwkEWoCXOfPQSOidY=";
+    hash = "sha256-e29cwTgZ6afYdIwdvw6NJET3pIGKmDOfgtzKqCK/kRs=";
  };

  patches = [
@ -46,12 +45,6 @@ buildPythonPackage rec {
      pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}";
      harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}";
    })
-    # Disable tests for new Ghostscript
-    # Remove when next version is released
-    (fetchpatch {
-      url = "https://github.com/Kozea/WeasyPrint/commit/e544398b00d76bc0317ea7e2abe40dc46b380910.patch";
-      sha256 = "sha256-oQO3j9Mo1x98WaLPROxsOn0qkeYRJrCx5QWWKoHvabE=";
-    })
  ];

  nativeBuildInputs = [
@ -96,9 +89,13 @@ buildPythonPackage rec {
    export HOME=$TMPDIR
  '';

+  pythonImportsCheck = [
+    "weasyprint"
+  ];
+
  meta = with lib; {
-    homepage = "https://weasyprint.org/";
    description = "Converts web documents to PDF";
+    homepage = "https://weasyprint.org/";
    license = licenses.bsd3;
    maintainers = with maintainers; [ elohmeier ];
  };
--- a/pkgs/development/python-modules/weasyprint/library-paths.patch
+++ b/pkgs/development/python-modules/weasyprint/library-paths.patch
@ -1,10 +1,10 @@
 diff --git a/weasyprint/text/ffi.py b/weasyprint/text/ffi.py
-index 0734cbea..22e31a5e 100644
+index 09f614aad..cbe9a73dd 100644
 --- a/weasyprint/text/ffi.py
 +++ b/weasyprint/text/ffi.py
-@@ -387,22 +387,11 @@ def _dlopen(ffi, *names):
-     return ffi.dlopen(names[0])  # pragma: no cover
- 
+@@ -415,22 +415,11 @@ def _dlopen(ffi, *names):
+         with suppress((OSError, FileNotFoundError)):
+             os.add_dll_directory(dll_directory)
 
 -gobject = _dlopen(
 -    ffi, 'gobject-2.0-0', 'gobject-2.0', 'libgobject-2.0-0',
@ -18,7 +18,7 @@ index 0734cbea..22e31a5e 100644
 -    'libharfbuzz-0.dll')
 -fontconfig = _dlopen(
 -    ffi, 'fontconfig-1', 'fontconfig', 'libfontconfig', 'libfontconfig.so.1',
-    'libfontconfig-1.dylib', 'libfontconfig-1.dll')
+-    'libfontconfig.1.dylib', 'libfontconfig-1.dll')
 -pangoft2 = _dlopen(
 -    ffi, 'pangoft2-1.0-0', 'pangoft2-1.0', 'libpangoft2-1.0-0',
 -    'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib', 'libpangoft2-1.0-0.dll')
@ -28,5 +28,4 @@ index 0734cbea..22e31a5e 100644
 +fontconfig = _dlopen(ffi, '@fontconfig@')
 +pangoft2 = _dlopen(ffi, '@pangoft2@')
 
- gobject.g_type_init()
-
+ gobject.g_type_init()
--- a/pkgs/servers/invidious/versions.json
+++ b/pkgs/servers/invidious/versions.json
@ -4,9 +4,9 @@
    "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
  },
  "invidious": {
-    "rev": "9e58bc19c4baf7ca7da97c2f8b164789d041d9b8",
-    "sha256": "sha256-LXCwVcjXx0JQ9yOyiZCqWYkMmD5iCEe4vcuCZTX+S/Y=",
-    "version": "unstable-2022-08-13"
+    "rev": "09942dee6621e7047a63dffcc61b3bbf78cef2c6",
+    "sha256": "sha256-0Cb1Qsn6vnrzd4pZm1GZxlVQNn5dYKUR/xWMCG37GSk=",
+    "version": "unstable-2022-11-02"
  },
  "lsquic": {
    "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",
--- a/pkgs/test/cuda/cuda-library-samples/generic.nix
+++ b/pkgs/test/cuda/cuda-library-samples/generic.nix
@ -54,6 +54,8 @@ in

    src = "${src}/cuTENSOR";

+    buildInputs = [ cutensor ];
+
    cmakeFlags = [
      "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin"
    ];
--- a/pkgs/tools/admin/syft/default.nix
+++ b/pkgs/tools/admin/syft/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "syft";
-  version = "0.59.0";
+  version = "0.60.2";

  src = fetchFromGitHub {
    owner = "anchore";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-jFBYH3xhny+KURoYiuyblntmtKD9XKLp3V2ifqkfHZg=";
+    sha256 = "sha256-qOsKpJwX+8wFvVt/vLdVJ47rfoOn+11phq4HsQVLV6M=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@ -20,7 +20,9 @@ buildGoModule rec {
      find "$out" -name .git -print0 | xargs -0 rm -rf
    '';
  };
-  vendorSha256 = "sha256-xoGraf3Rh14lHyTU12qFxwk1Cv9N6u5FSxtro0zwRJM=";
+  # hash mismatch with darwin
+  proxyVendor = true;
+  vendorSha256 = "sha256-gwj6Tj4JqZCCLOSw+K1DpwKhcWLtJ6YY5No20WbqQHU=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
    sed -i 's,ar ,$(AR) ,g' OOC/Makefile
    # Remove unnecessary -m32 for 32-bit targets
    sed -i 's,-m32,,g' OOC/Makefile
+    # Replace arm64 with aarch64
+    sed -i 's#,arm64#,aarch64#g' Makefile
    # Fix wrong comment character
    sed -i 's,# 32,; 32,g' routines-x86-32bit.asm
    # Fix missing symbol exports for macOS clang
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl
 , pkg-config, makeWrapper, autoreconfHook
-, openldap, python2, pam
+, openldap, python3, pam
 }:

 stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ];
-  buildInputs = [ openldap pam python2 ];
+  buildInputs = [ openldap pam python3 ];

  preConfigure = ''
    substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: "
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "stunnel";
-  version = "5.66";
+  version = "5.67";

  src = fetchurl {
-    url    = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
-    sha256 = "558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c";
+    url    = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz";
+    sha256 = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456";
    # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256",
    # not the output of `nix-prefetch-url`
  };
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@ -28,15 +28,15 @@ let
      "1.2.2.5" = {
        hash = "sha256-lU7iK4DWuC/U3s1Ct/rq2Gr3w4F2U7RYYgpmF05bibY=";
      };
-      "1.3.1.3" = {
-        hash = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8=";
+      "1.5.0.3" = {
+        hash = "sha256-T96+lPC6OTOkIs/z3QWg73oYVSyidN0SVkBWmT9VRx0=";
      };
    };

    inherit (final) cudaMajorMinorVersion cudaMajorVersion;

    cutensor = buildCuTensorPackage rec {
-      version = if cudaMajorMinorVersion == "10.1" then "1.2.2.5" else "1.3.1.3";
+      version = if cudaMajorMinorVersion == "10.1" then "1.2.2.5" else "1.5.0.3";
      inherit (cuTensorVersions.${version}) hash;
      # This can go into generic.nix
      libPath = "lib/${if cudaMajorVersion == "10" then cudaMajorMinorVersion else cudaMajorVersion}";